TF-3181 Display contact support button on web app
(cherry picked from commit cfc027522962fbf7092c8a15876d6c61f0aca6fc)
This commit is contained in:
@@ -0,0 +1,3 @@
|
|||||||
|
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path d="M11 18H13V16H11V18ZM12 2C6.48 2 2 6.48 2 12C2 17.52 6.48 22 12 22C17.52 22 22 17.52 22 12C22 6.48 17.52 2 12 2ZM12 20C7.59 20 4 16.41 4 12C4 7.59 7.59 4 12 4C16.41 4 20 7.59 20 12C20 16.41 16.41 20 12 20ZM12 6C9.79 6 8 7.79 8 10H10C10 8.9 10.9 8 12 8C13.1 8 14 8.9 14 10C14 12 11 11.75 11 15H13C13 12.75 16 12.5 16 10C16 7.79 14.21 6 12 6Z" fill="#007AFF"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 470 B |
@@ -221,6 +221,7 @@ class ImagePaths {
|
|||||||
String get icBadSignature => _getImagePath('ic_bad_signature.svg');
|
String get icBadSignature => _getImagePath('ic_bad_signature.svg');
|
||||||
String get icDeleteSelection => _getImagePath('ic_delete_selection.svg');
|
String get icDeleteSelection => _getImagePath('ic_delete_selection.svg');
|
||||||
String get icLogoTwakeWelcome => _getImagePath('ic_logo_twake_welcome.svg');
|
String get icLogoTwakeWelcome => _getImagePath('ic_logo_twake_welcome.svg');
|
||||||
|
String get icHelp => _getImagePath('ic_help.svg');
|
||||||
|
|
||||||
String _getImagePath(String imageName) {
|
String _getImagePath(String imageName) {
|
||||||
return AssetsPaths.images + imageName;
|
return AssetsPaths.images + imageName;
|
||||||
|
|||||||
@@ -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/state_converter.dart';
|
||||||
import 'package:jmap_dart_client/http/converter/user_name_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/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/session/session.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||||
import 'package:model/model.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';
|
import 'package:tmail_ui_user/features/home/domain/converter/session_primary_account_converter.dart';
|
||||||
|
|
||||||
extension SessionExtensions on Session {
|
extension SessionExtensions on Session {
|
||||||
|
static final CapabilityIdentifier linagoraContactSupportCapability = CapabilityIdentifier(Uri.parse('com:linagora:params:jmap:contact:support'));
|
||||||
|
|
||||||
Map<String, dynamic> toJson() {
|
Map<String, dynamic> toJson() {
|
||||||
final val = <String, dynamic>{};
|
final val = <String, dynamic>{};
|
||||||
@@ -79,4 +81,18 @@ extension SessionExtensions on Session {
|
|||||||
return null;
|
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/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/email_view.dart';
|
||||||
import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.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/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/action/dashboard_action.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.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();
|
return const SizedBox.shrink();
|
||||||
} else {
|
} else {
|
||||||
return NavigationBarWidget(
|
return NavigationBarWidget(
|
||||||
|
imagePaths: controller.imagePaths,
|
||||||
avatarUserName: controller.sessionCurrent?.username.firstCharacter ?? '',
|
avatarUserName: controller.sessionCurrent?.username.firstCharacter ?? '',
|
||||||
|
contactSupportCapability: controller.sessionCurrent?.getContactSupportCapability(accountId),
|
||||||
searchForm: SearchInputFormWidget(),
|
searchForm: SearchInputFormWidget(),
|
||||||
appGridController: controller.appGridDashboardController,
|
appGridController: controller.appGridDashboardController,
|
||||||
onShowAppDashboardAction: controller.showAppDashboardAction,
|
onShowAppDashboardAction: controller.showAppDashboardAction,
|
||||||
|
|||||||
+5
-5
@@ -9,15 +9,15 @@ import 'package:tmail_ui_user/main/utils/app_utils.dart';
|
|||||||
|
|
||||||
class AppGridDashboardIcon extends StatelessWidget {
|
class AppGridDashboardIcon extends StatelessWidget {
|
||||||
|
|
||||||
final ImagePaths _imagePaths = Get.find<ImagePaths>();
|
final ImagePaths imagePaths;
|
||||||
|
|
||||||
final AppGridDashboardController appGridController;
|
final AppGridDashboardController appGridController;
|
||||||
final VoidCallback? onShowAppDashboardAction;
|
final VoidCallback? onShowAppDashboardAction;
|
||||||
|
|
||||||
AppGridDashboardIcon({
|
const AppGridDashboardIcon({
|
||||||
super.key,
|
super.key,
|
||||||
|
required this.imagePaths,
|
||||||
required this.appGridController,
|
required this.appGridController,
|
||||||
this.onShowAppDashboardAction
|
this.onShowAppDashboardAction,
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -48,7 +48,7 @@ class AppGridDashboardIcon extends StatelessWidget {
|
|||||||
}),
|
}),
|
||||||
visible: isAppGridOpen,
|
visible: isAppGridOpen,
|
||||||
child: TMailButtonWidget.fromIcon(
|
child: TMailButtonWidget.fromIcon(
|
||||||
icon: _imagePaths.icAppDashboard,
|
icon: imagePaths.icAppDashboard,
|
||||||
backgroundColor: Colors.transparent,
|
backgroundColor: Colors.transparent,
|
||||||
iconSize: 30,
|
iconSize: 30,
|
||||||
padding: const EdgeInsets.all(6),
|
padding: const EdgeInsets.all(6),
|
||||||
|
|||||||
+42
-10
@@ -1,16 +1,22 @@
|
|||||||
import 'package:core/presentation/extensions/color_extension.dart';
|
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/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:core/presentation/views/image/avatar_builder.dart';
|
||||||
import 'package:flutter/material.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/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/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/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/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';
|
import 'package:tmail_ui_user/main/utils/app_config.dart';
|
||||||
|
|
||||||
class NavigationBarWidget extends StatelessWidget {
|
class NavigationBarWidget extends StatelessWidget {
|
||||||
|
|
||||||
|
final ImagePaths imagePaths;
|
||||||
final String avatarUserName;
|
final String avatarUserName;
|
||||||
|
final ContactSupportCapability? contactSupportCapability;
|
||||||
final Widget? searchForm;
|
final Widget? searchForm;
|
||||||
final AppGridDashboardController? appGridController;
|
final AppGridDashboardController? appGridController;
|
||||||
final VoidCallback? onTapApplicationLogoAction;
|
final VoidCallback? onTapApplicationLogoAction;
|
||||||
@@ -19,7 +25,9 @@ class NavigationBarWidget extends StatelessWidget {
|
|||||||
|
|
||||||
const NavigationBarWidget({
|
const NavigationBarWidget({
|
||||||
super.key,
|
super.key,
|
||||||
|
required this.imagePaths,
|
||||||
required this.avatarUserName,
|
required this.avatarUserName,
|
||||||
|
this.contactSupportCapability,
|
||||||
this.searchForm,
|
this.searchForm,
|
||||||
this.appGridController,
|
this.appGridController,
|
||||||
this.onShowAppDashboardAction,
|
this.onShowAppDashboardAction,
|
||||||
@@ -54,12 +62,24 @@ class NavigationBarWidget extends StatelessWidget {
|
|||||||
child: searchForm
|
child: searchForm
|
||||||
),
|
),
|
||||||
const Spacer(),
|
const Spacer(),
|
||||||
if (AppConfig.appGridDashboardAvailable && appGridController != null)
|
if (contactSupportCapability != null)
|
||||||
AppGridDashboardIcon(
|
TMailButtonWidget.fromIcon(
|
||||||
appGridController: appGridController!,
|
icon: imagePaths.icHelp,
|
||||||
onShowAppDashboardAction: onShowAppDashboardAction,
|
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()
|
(AvatarBuilder()
|
||||||
..text(avatarUserName)
|
..text(avatarUserName)
|
||||||
..backgroundColor(Colors.white)
|
..backgroundColor(Colors.white)
|
||||||
@@ -82,12 +102,24 @@ class NavigationBarWidget extends StatelessWidget {
|
|||||||
else
|
else
|
||||||
...[
|
...[
|
||||||
const Spacer(),
|
const Spacer(),
|
||||||
if (AppConfig.appGridDashboardAvailable && appGridController != null)
|
if (contactSupportCapability != null)
|
||||||
AppGridDashboardIcon(
|
TMailButtonWidget.fromIcon(
|
||||||
appGridController: appGridController!,
|
icon: imagePaths.icHelp,
|
||||||
onShowAppDashboardAction: onShowAppDashboardAction,
|
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()
|
(AvatarBuilder()
|
||||||
..text(avatarUserName)
|
..text(avatarUserName)
|
||||||
..backgroundColor(Colors.white)
|
..backgroundColor(Colors.white)
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/base/state/banner_state.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/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/always_read_receipt/always_read_receipt_view.dart';
|
||||||
import 'package:tmail_ui_user/features/manage_account/presentation/email_rules/email_rules_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();
|
return const SizedBox.shrink();
|
||||||
} else {
|
} else {
|
||||||
return NavigationBarWidget(
|
return NavigationBarWidget(
|
||||||
|
imagePaths: controller.imagePaths,
|
||||||
avatarUserName: controller.sessionCurrent?.username.firstCharacter ?? '',
|
avatarUserName: controller.sessionCurrent?.username.firstCharacter ?? '',
|
||||||
|
contactSupportCapability: controller.sessionCurrent?.getContactSupportCapability(accountId),
|
||||||
onTapApplicationLogoAction: () => controller.backToMailboxDashBoard(context: context),
|
onTapApplicationLogoAction: () => controller.backToMailboxDashBoard(context: context),
|
||||||
onTapAvatarAction: (position) => controller.handleClickAvatarAction(context, position),
|
onTapAvatarAction: (position) => controller.handleClickAvatarAction(context, position),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -4071,5 +4071,11 @@
|
|||||||
"type": "text",
|
"type": "text",
|
||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
|
},
|
||||||
|
"getHelpOrReportABug": "Get help or report a bug",
|
||||||
|
"@getHelpOrReportABug": {
|
||||||
|
"type": "text",
|
||||||
|
"placeholders_order": [],
|
||||||
|
"placeholders": {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4273,4 +4273,11 @@ class AppLocalizations {
|
|||||||
name: 'createTwakeIdFailed',
|
name: 'createTwakeIdFailed',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String get getHelpOrReportABug {
|
||||||
|
return Intl.message(
|
||||||
|
'Get help or report a bug',
|
||||||
|
name: 'getHelpOrReportABug',
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,3 +80,5 @@ export 'oidc/token_oidc.dart';
|
|||||||
// Upload
|
// Upload
|
||||||
export 'upload/file_info.dart';
|
export 'upload/file_info.dart';
|
||||||
export 'upload/upload_response.dart';
|
export 'upload/upload_response.dart';
|
||||||
|
// Support
|
||||||
|
export 'support/contact_support_capability.dart';
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
|
||||||
|
import 'package:jmap_dart_client/jmap/core/capability/capability_properties.dart';
|
||||||
|
import 'package:json_annotation/json_annotation.dart';
|
||||||
|
|
||||||
|
part 'contact_support_capability.g.dart';
|
||||||
|
|
||||||
|
@JsonSerializable(explicitToJson: true, includeIfNull: false)
|
||||||
|
class ContactSupportCapability extends CapabilityProperties {
|
||||||
|
final String? httpLink;
|
||||||
|
final String? supportMailAddress;
|
||||||
|
|
||||||
|
ContactSupportCapability({this.httpLink, this.supportMailAddress});
|
||||||
|
|
||||||
|
factory ContactSupportCapability.fromJson(Map<String, dynamic> json) => _$ContactSupportCapabilityFromJson(json);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => _$ContactSupportCapabilityToJson(this);
|
||||||
|
|
||||||
|
static ContactSupportCapability deserialize(Map<String, dynamic> json) {
|
||||||
|
return ContactSupportCapability.fromJson(json);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [httpLink, supportMailAddress];
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user