diff --git a/ui-ngx/src/app/modules/home/pages/notification-center/targets-table/target-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification-center/targets-table/target-notification-dialog.component.html index bb6e3ba65c..56afc9f879 100644 --- a/ui-ngx/src/app/modules/home/pages/notification-center/targets-table/target-notification-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/notification-center/targets-table/target-notification-dialog.component.html @@ -47,13 +47,14 @@
- + notification.target-type.user-filters - {{ notificationTargetConfigTypeTranslateMap.get(type) | translate }} + {{ notificationTargetConfigTypeInfoMap.get(type).name | translate }} + {{ notificationTargetConfigTypeInfoMap.get(targetNotificationForm.get('configuration.usersFilter.type').value).hint | translate }} diff --git a/ui-ngx/src/app/modules/home/pages/notification-center/targets-table/target-notification-dialog.componet.ts b/ui-ngx/src/app/modules/home/pages/notification-center/targets-table/target-notification-dialog.componet.ts index 84fe44f235..868145a824 100644 --- a/ui-ngx/src/app/modules/home/pages/notification-center/targets-table/target-notification-dialog.componet.ts +++ b/ui-ngx/src/app/modules/home/pages/notification-center/targets-table/target-notification-dialog.componet.ts @@ -17,7 +17,7 @@ import { NotificationTarget, NotificationTargetConfigType, - NotificationTargetConfigTypeTranslateMap, + NotificationTargetConfigTypeInfoMap, NotificationTargetType, NotificationTargetTypeTranslationMap, SlackChanelType, @@ -62,7 +62,7 @@ export class TargetNotificationDialogComponent extends notificationTargetTypeTranslationMap = NotificationTargetTypeTranslationMap; notificationTargetConfigType = NotificationTargetConfigType; notificationTargetConfigTypes: NotificationTargetConfigType[] = this.allowNotificationTargetConfigTypes(); - notificationTargetConfigTypeTranslateMap = NotificationTargetConfigTypeTranslateMap; + notificationTargetConfigTypeInfoMap = NotificationTargetConfigTypeInfoMap; slackChanelTypes = Object.keys(SlackChanelType) as SlackChanelType[]; slackChanelTypesTranslateMap = SlackChanelTypesTranslateMap; diff --git a/ui-ngx/src/app/shared/models/notification.models.ts b/ui-ngx/src/app/shared/models/notification.models.ts index 908efd7fe0..f54d1f6793 100644 --- a/ui-ngx/src/app/shared/models/notification.models.ts +++ b/ui-ngx/src/app/shared/models/notification.models.ts @@ -354,13 +354,44 @@ export enum NotificationTargetConfigType { ACTION_TARGET_USER = 'ACTION_TARGET_USER' } -export const NotificationTargetConfigTypeTranslateMap = new Map([ - [NotificationTargetConfigType.ALL_USERS, 'notification.target-type.all-users'], - [NotificationTargetConfigType.TENANT_ADMINISTRATORS, 'notification.target-type.tenant-administrators'], - [NotificationTargetConfigType.CUSTOMER_USERS, 'notification.target-type.customer-users'], - [NotificationTargetConfigType.USER_LIST, 'notification.target-type.user-list'], - [NotificationTargetConfigType.ORIGINATOR_ENTITY_OWNER_USERS, 'notification.target-type.originator-entity-owner-users'], - [NotificationTargetConfigType.ACTION_TARGET_USER, 'notification.target-type.action-target-user'], +interface NotificationTargetConfigTypeInfo { + name: string; + hint?: string; +} + +export const NotificationTargetConfigTypeInfoMap = new Map([ + [NotificationTargetConfigType.ALL_USERS, + { + name: 'notification.target-type.all-users' + } + ], + [NotificationTargetConfigType.TENANT_ADMINISTRATORS, + { + name: 'notification.target-type.tenant-administrators' + } + ], + [NotificationTargetConfigType.CUSTOMER_USERS, + { + name: 'notification.target-type.customer-users' + } + ], + [NotificationTargetConfigType.USER_LIST, + { + name: 'notification.target-type.user-list' + } + ], + [NotificationTargetConfigType.ORIGINATOR_ENTITY_OWNER_USERS, + { + name: 'notification.target-type.originator-entity-owner-users', + hint: 'notification.target-type.originator-entity-owner-users-hint' + } + ], + [NotificationTargetConfigType.ACTION_TARGET_USER, + { + name: 'notification.target-type.action-target-user', + hint: 'notification.target-type.action-target-user-hint' + } + ] ]); export enum NotificationType { diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index eb3072e1a7..31bc7f4062 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -2873,9 +2873,11 @@ "target-name-required": "Name is required", "target-type": { "action-target-user": "Action target user", + "action-target-user-hint": "Action target user hint", "all-users": "All users", "customer-users": "Customer users", "originator-entity-owner-users": "Users of originator entity owner", + "originator-entity-owner-users-hint": "Users of originator entity owner hint", "tenant-administrators": "Tenant administrators", "user-filters": "User filter", "user-list": "User list"