TF-3181 Display contact support button on web app
(cherry picked from commit cfc027522962fbf7092c8a15876d6c61f0aca6fc)
This commit is contained in:
@@ -9,6 +9,7 @@ import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/http/converter/state_converter.dart';
|
||||
import 'package:jmap_dart_client/http/converter/user_name_converter.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||
import 'package:model/model.dart';
|
||||
@@ -18,6 +19,7 @@ import 'package:tmail_ui_user/features/home/domain/converter/session_capabilitie
|
||||
import 'package:tmail_ui_user/features/home/domain/converter/session_primary_account_converter.dart';
|
||||
|
||||
extension SessionExtensions on Session {
|
||||
static final CapabilityIdentifier linagoraContactSupportCapability = CapabilityIdentifier(Uri.parse('com:linagora:params:jmap:contact:support'));
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final val = <String, dynamic>{};
|
||||
@@ -79,4 +81,18 @@ extension SessionExtensions on Session {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
ContactSupportCapability? getContactSupportCapability(AccountId accountId) {
|
||||
try {
|
||||
final contactSupportCapability = getCapabilityProperties<ContactSupportCapability>(
|
||||
accountId,
|
||||
linagoraContactSupportCapability,
|
||||
);
|
||||
log('SessionExtensions::getContactSupport:contactSupportCapability = $contactSupportCapability');
|
||||
return contactSupportCapability;
|
||||
} catch (e) {
|
||||
logError('SessionExtensions::getContactSupportCapability():[Exception] $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@ import 'package:tmail_ui_user/features/base/widget/scrollbar_list_view.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/composer_view_web.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/email_view.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
|
||||
import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_view_web.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart';
|
||||
@@ -66,7 +67,9 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
|
||||
return const SizedBox.shrink();
|
||||
} else {
|
||||
return NavigationBarWidget(
|
||||
imagePaths: controller.imagePaths,
|
||||
avatarUserName: controller.sessionCurrent?.username.firstCharacter ?? '',
|
||||
contactSupportCapability: controller.sessionCurrent?.getContactSupportCapability(accountId),
|
||||
searchForm: SearchInputFormWidget(),
|
||||
appGridController: controller.appGridDashboardController,
|
||||
onShowAppDashboardAction: controller.showAppDashboardAction,
|
||||
|
||||
+5
-5
@@ -9,15 +9,15 @@ import 'package:tmail_ui_user/main/utils/app_utils.dart';
|
||||
|
||||
class AppGridDashboardIcon extends StatelessWidget {
|
||||
|
||||
final ImagePaths _imagePaths = Get.find<ImagePaths>();
|
||||
|
||||
final ImagePaths imagePaths;
|
||||
final AppGridDashboardController appGridController;
|
||||
final VoidCallback? onShowAppDashboardAction;
|
||||
|
||||
AppGridDashboardIcon({
|
||||
const AppGridDashboardIcon({
|
||||
super.key,
|
||||
required this.imagePaths,
|
||||
required this.appGridController,
|
||||
this.onShowAppDashboardAction
|
||||
this.onShowAppDashboardAction,
|
||||
});
|
||||
|
||||
@override
|
||||
@@ -48,7 +48,7 @@ class AppGridDashboardIcon extends StatelessWidget {
|
||||
}),
|
||||
visible: isAppGridOpen,
|
||||
child: TMailButtonWidget.fromIcon(
|
||||
icon: _imagePaths.icAppDashboard,
|
||||
icon: imagePaths.icAppDashboard,
|
||||
backgroundColor: Colors.transparent,
|
||||
iconSize: 30,
|
||||
padding: const EdgeInsets.all(6),
|
||||
|
||||
+42
-10
@@ -1,16 +1,22 @@
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:core/presentation/resources/image_paths.dart';
|
||||
import 'package:core/presentation/utils/responsive_utils.dart';
|
||||
import 'package:core/presentation/views/button/tmail_button_widget.dart';
|
||||
import 'package:core/presentation/views/image/avatar_builder.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:model/support/contact_support_capability.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/application_logo_with_text_widget.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/app_grid_dashboard_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/navigation_bar_style.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/app_dashboard/app_grid_dashboard_icon.dart';
|
||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||
import 'package:tmail_ui_user/main/utils/app_config.dart';
|
||||
|
||||
class NavigationBarWidget extends StatelessWidget {
|
||||
|
||||
final ImagePaths imagePaths;
|
||||
final String avatarUserName;
|
||||
final ContactSupportCapability? contactSupportCapability;
|
||||
final Widget? searchForm;
|
||||
final AppGridDashboardController? appGridController;
|
||||
final VoidCallback? onTapApplicationLogoAction;
|
||||
@@ -19,7 +25,9 @@ class NavigationBarWidget extends StatelessWidget {
|
||||
|
||||
const NavigationBarWidget({
|
||||
super.key,
|
||||
required this.imagePaths,
|
||||
required this.avatarUserName,
|
||||
this.contactSupportCapability,
|
||||
this.searchForm,
|
||||
this.appGridController,
|
||||
this.onShowAppDashboardAction,
|
||||
@@ -54,12 +62,24 @@ class NavigationBarWidget extends StatelessWidget {
|
||||
child: searchForm
|
||||
),
|
||||
const Spacer(),
|
||||
if (AppConfig.appGridDashboardAvailable && appGridController != null)
|
||||
AppGridDashboardIcon(
|
||||
appGridController: appGridController!,
|
||||
onShowAppDashboardAction: onShowAppDashboardAction,
|
||||
if (contactSupportCapability != null)
|
||||
TMailButtonWidget.fromIcon(
|
||||
icon: imagePaths.icHelp,
|
||||
iconColor: AppColor.messageDialogColor,
|
||||
backgroundColor: Colors.transparent,
|
||||
margin: const EdgeInsetsDirectional.only(end: 8),
|
||||
tooltipMessage: AppLocalizations.of(context).getHelpOrReportABug,
|
||||
onTapActionCallback: () {},
|
||||
),
|
||||
if (AppConfig.appGridDashboardAvailable && appGridController != null)
|
||||
Padding(
|
||||
padding: const EdgeInsetsDirectional.only(end: 16),
|
||||
child: AppGridDashboardIcon(
|
||||
imagePaths: imagePaths,
|
||||
appGridController: appGridController!,
|
||||
onShowAppDashboardAction: onShowAppDashboardAction,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
(AvatarBuilder()
|
||||
..text(avatarUserName)
|
||||
..backgroundColor(Colors.white)
|
||||
@@ -82,12 +102,24 @@ class NavigationBarWidget extends StatelessWidget {
|
||||
else
|
||||
...[
|
||||
const Spacer(),
|
||||
if (AppConfig.appGridDashboardAvailable && appGridController != null)
|
||||
AppGridDashboardIcon(
|
||||
appGridController: appGridController!,
|
||||
onShowAppDashboardAction: onShowAppDashboardAction,
|
||||
if (contactSupportCapability != null)
|
||||
TMailButtonWidget.fromIcon(
|
||||
icon: imagePaths.icHelp,
|
||||
iconColor: AppColor.messageDialogColor,
|
||||
backgroundColor: Colors.transparent,
|
||||
margin: const EdgeInsetsDirectional.only(end: 8),
|
||||
tooltipMessage: AppLocalizations.of(context).getHelpOrReportABug,
|
||||
onTapActionCallback: () {},
|
||||
),
|
||||
if (AppConfig.appGridDashboardAvailable && appGridController != null)
|
||||
Padding(
|
||||
padding: const EdgeInsetsDirectional.only(end: 16),
|
||||
child: AppGridDashboardIcon(
|
||||
imagePaths: imagePaths,
|
||||
appGridController: appGridController!,
|
||||
onShowAppDashboardAction: onShowAppDashboardAction,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
(AvatarBuilder()
|
||||
..text(avatarUserName)
|
||||
..backgroundColor(Colors.white)
|
||||
|
||||
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:model/model.dart';
|
||||
import 'package:tmail_ui_user/features/base/state/banner_state.dart';
|
||||
import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/navigation_bar/navigation_bar_widget.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/always_read_receipt/always_read_receipt_view.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/email_rules/email_rules_view.dart';
|
||||
@@ -41,7 +42,9 @@ class ManageAccountDashBoardView extends GetWidget<ManageAccountDashBoardControl
|
||||
return const SizedBox.shrink();
|
||||
} else {
|
||||
return NavigationBarWidget(
|
||||
imagePaths: controller.imagePaths,
|
||||
avatarUserName: controller.sessionCurrent?.username.firstCharacter ?? '',
|
||||
contactSupportCapability: controller.sessionCurrent?.getContactSupportCapability(accountId),
|
||||
onTapApplicationLogoAction: () => controller.backToMailboxDashBoard(context: context),
|
||||
onTapAvatarAction: (position) => controller.handleClickAvatarAction(context, position),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user