diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java index b6d976e57a..7cc5dad289 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java @@ -186,7 +186,7 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS NotificationTemplate ruleEngineComponentLifecycleFailureNotificationTemplate = createTemplate(tenantId, "Rule chain/node lifecycle failure notification", NotificationType.RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT, "${componentType} '${componentName}' failed to ${action}", "Rule chain '${ruleChainName}' - ${action} failure:
${error}", - "warning", "Go to Rule chain", "/ruleChains/${ruleChainId}"); + "warning", "Go to Rule chain", "/features/ruleChains/${ruleChainId}"); RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig ruleEngineComponentLifecycleEventRuleTriggerConfig = new RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig(); ruleEngineComponentLifecycleEventRuleTriggerConfig.setRuleChains(null); ruleEngineComponentLifecycleEventRuleTriggerConfig.setRuleChainEvents(Set.of(ComponentLifecycleEvent.STARTED, ComponentLifecycleEvent.UPDATED, ComponentLifecycleEvent.STOPPED)); diff --git a/ui-ngx/src/app/core/services/menu.service.ts b/ui-ngx/src/app/core/services/menu.service.ts index 0348ef8e88..bcf44ae792 100644 --- a/ui-ngx/src/app/core/services/menu.service.ts +++ b/ui-ngx/src/app/core/services/menu.service.ts @@ -212,13 +212,6 @@ export class MenuService { icon: 'mdi:message-badge', isMdiIcon: true }, - { - id: guid(), - name: 'notification.notification', - type: 'link', - path: '/settings/notification', - icon: 'notifications' - }, { id: guid(), name: 'admin.queues', @@ -311,11 +304,6 @@ export class MenuService { icon: 'sms', path: '/settings/sms-provider' }, - { - name: 'notification.notification', - icon: 'notifications', - path: '/settings/notification' - }, { name: 'admin.security-settings', icon: 'security', @@ -585,13 +573,6 @@ export class MenuService { path: '/settings/home', icon: 'settings_applications' }, - { - id: guid(), - name: 'notification.notification', - type: 'link', - path: '/settings/notification', - icon: 'notifications' - }, { id: guid(), name: 'admin.repository', @@ -767,11 +748,6 @@ export class MenuService { icon: 'settings_applications', path: '/settings/home' }, - { - name: 'notification.notification', - icon: 'notifications', - path: '/settings/notification' - }, { name: 'resource.resources-library', icon: 'folder', diff --git a/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts b/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts index a5215cabfc..7b3fb8664e 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts @@ -39,7 +39,6 @@ import { TwoFactorAuthSettingsComponent } from '@home/pages/admin/two-factor-aut import { widgetsBundlesRoutes } from '@home/pages/widget/widget-library-routing.module'; import { RouterTabsComponent } from '@home/components/router-tabs.component'; import { auditLogsRoutes } from '@home/pages/audit-log/audit-log-routing.module'; -import { NotificationSettingsComponent } from '@home/pages/admin/notification-settings.component'; @Injectable() export class OAuth2LoginProcessingUrlResolver implements Resolve { diff --git a/ui-ngx/src/app/modules/home/pages/admin/admin.module.ts b/ui-ngx/src/app/modules/home/pages/admin/admin.module.ts index aa2b8957f6..02a4bf5867 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/admin.module.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/admin.module.ts @@ -32,7 +32,6 @@ import { QueueComponent } from '@home/pages/admin/queue/queue.component'; import { RepositoryAdminSettingsComponent } from '@home/pages/admin/repository-admin-settings.component'; import { AutoCommitAdminSettingsComponent } from '@home/pages/admin/auto-commit-admin-settings.component'; import { TwoFactorAuthSettingsComponent } from '@home/pages/admin/two-factor-auth-settings.component'; -import { NotificationSettingsComponent } from '@home/pages/admin/notification-settings.component'; @NgModule({ declarations: @@ -48,8 +47,7 @@ import { NotificationSettingsComponent } from '@home/pages/admin/notification-se QueueComponent, RepositoryAdminSettingsComponent, AutoCommitAdminSettingsComponent, - TwoFactorAuthSettingsComponent, - NotificationSettingsComponent + TwoFactorAuthSettingsComponent ], imports: [ CommonModule, diff --git a/ui-ngx/src/app/modules/home/pages/admin/notification-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/notification-settings.component.html deleted file mode 100644 index f5fa148993..0000000000 --- a/ui-ngx/src/app/modules/home/pages/admin/notification-settings.component.html +++ /dev/null @@ -1,49 +0,0 @@ - -
- - - -
- admin.notification.notification-settings -
- - - - -
- -
-
-
- admin.notification.slack - - admin.notification.slack-api-token - - -
-
- -
-
-
- - -
diff --git a/ui-ngx/src/app/modules/home/pages/admin/notification-settings.component.ts b/ui-ngx/src/app/modules/home/pages/admin/notification-settings.component.ts deleted file mode 100644 index 07f626f7f1..0000000000 --- a/ui-ngx/src/app/modules/home/pages/admin/notification-settings.component.ts +++ /dev/null @@ -1,86 +0,0 @@ -/// -/// Copyright © 2016-2023 The Thingsboard Authors -/// -/// Licensed under the Apache License, Version 2.0 (the "License"); -/// you may not use this file except in compliance with the License. -/// You may obtain a copy of the License at -/// -/// http://www.apache.org/licenses/LICENSE-2.0 -/// -/// Unless required by applicable law or agreed to in writing, software -/// distributed under the License is distributed on an "AS IS" BASIS, -/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -/// See the License for the specific language governing permissions and -/// limitations under the License. -/// - -import { Component, OnInit } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { AppState } from '@core/core.state'; -import { PageComponent } from '@shared/components/page.component'; -import { FormBuilder, FormGroup } from '@angular/forms'; -import { HasConfirmForm } from '@core/guards/confirm-on-exit.guard'; -import { NotificationService } from '@core/http/notification.service'; -import { NotificationSettings } from '@shared/models/notification.models'; -import { deepTrim, isEmptyStr } from '@core/utils'; - -@Component({ - selector: 'tb-notification-settings', - templateUrl: './notification-settings.component.html', - styleUrls: ['./settings-card.scss'] -}) -export class NotificationSettingsComponent extends PageComponent implements OnInit, HasConfirmForm { - - notificationSettingsForm: FormGroup; - private notificationSettings: NotificationSettings; - - constructor(protected store: Store, - private notificationService: NotificationService, - public fb: FormBuilder) { - super(store); - } - - ngOnInit() { - this.buildGeneralServerSettingsForm(); - this.notificationService.getNotificationSettings().subscribe( - (settings) => { - this.notificationSettings = settings; - this.notificationSettingsForm.reset(this.notificationSettings); - } - ); - } - - buildGeneralServerSettingsForm() { - this.notificationSettingsForm = this.fb.group({ - deliveryMethodsConfigs: this.fb.group({ - SLACK: this.fb.group({ - botToken: [''] - }) - }) - }); - } - - save(): void { - this.notificationSettings = deepTrim({ - ...this.notificationSettings, - ...this.notificationSettingsForm.value - }); - for (const method in this.notificationSettings.deliveryMethodsConfigs) { - const keys = Object.keys(this.notificationSettings.deliveryMethodsConfigs[method]); - if (keys.some(item => isEmptyStr(this.notificationSettings.deliveryMethodsConfigs[method][item]))) { - delete this.notificationSettings.deliveryMethodsConfigs[method]; - } else { - this.notificationSettings.deliveryMethodsConfigs[method].method = method; - } - } - this.notificationService.saveNotificationSettings(this.notificationSettings).subscribe(setting => { - this.notificationSettings = setting; - this.notificationSettingsForm.reset(this.notificationSettings); - }); - } - - confirmForm(): FormGroup { - return this.notificationSettingsForm; - } - -} diff --git a/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.html b/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.html index ff83599f60..fc86fd06ad 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.html +++ b/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.html @@ -47,4 +47,34 @@ + + + + + + + + + + +
+ +
+
+
+ admin.slack + + admin.slack-api-token + + +
+
+ +
+
+
+ + diff --git a/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.ts b/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.ts index 6d15487b6c..d8cbe0548d 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.ts @@ -19,12 +19,15 @@ import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { PageComponent } from '@shared/components/page.component'; import { Router } from '@angular/router'; -import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AdminSettings, SmsProviderConfiguration } from '@shared/models/settings.models'; import { AdminService } from '@core/http/admin.service'; import { HasConfirmForm } from '@core/guards/confirm-on-exit.guard'; import { MatDialog } from '@angular/material/dialog'; import { SendTestSmsDialogComponent, SendTestSmsDialogData } from '@home/pages/admin/send-test-sms-dialog.component'; +import { NotificationSettings } from '@shared/models/notification.models'; +import { deepTrim, isEmptyStr } from '@core/utils'; +import { NotificationService } from '@core/http/notification.service'; @Component({ selector: 'tb-sms-provider', @@ -33,35 +36,46 @@ import { SendTestSmsDialogComponent, SendTestSmsDialogData } from '@home/pages/a }) export class SmsProviderComponent extends PageComponent implements OnInit, HasConfirmForm { - smsProvider: UntypedFormGroup; + smsProvider: FormGroup; adminSettings: AdminSettings; + notificationSettingsForm: FormGroup; + private notificationSettings: NotificationSettings; + constructor(protected store: Store, private router: Router, private adminService: AdminService, + private notificationService: NotificationService, private dialog: MatDialog, - public fb: UntypedFormBuilder) { + public fb: FormBuilder) { super(store); } ngOnInit() { this.buildSmsProviderForm(); - this.adminService.getAdminSettings('sms', {ignoreErrors: true}).subscribe( - (adminSettings) => { + this.buildGeneralServerSettingsForm(); + this.notificationService.getNotificationSettings().subscribe( + (settings) => { + this.notificationSettings = settings; + this.notificationSettingsForm.reset(this.notificationSettings); + } + ); + this.adminService.getAdminSettings('sms', {ignoreErrors: true}).subscribe({ + next: adminSettings => { this.adminSettings = adminSettings; this.smsProvider.reset({configuration: this.adminSettings.jsonValue}); }, - () => { + error: () => { this.adminSettings = { key: 'sms', jsonValue: null }; this.smsProvider.reset({configuration: this.adminSettings.jsonValue}); } - ); + }); } - buildSmsProviderForm() { + private buildSmsProviderForm() { this.smsProvider = this.fb.group({ configuration: [null, [Validators.required]] }); @@ -88,8 +102,38 @@ export class SmsProviderComponent extends PageComponent implements OnInit, HasCo ); } - confirmForm(): UntypedFormGroup { - return this.smsProvider; + confirmForm(): FormGroup { + return this.smsProvider.dirty ? this.smsProvider : this.notificationSettingsForm; + } + + private buildGeneralServerSettingsForm() { + this.notificationSettingsForm = this.fb.group({ + deliveryMethodsConfigs: this.fb.group({ + SLACK: this.fb.group({ + botToken: [''] + }) + }) + }); + } + + saveNotification(): void { + this.notificationSettings = deepTrim({ + ...this.notificationSettings, + ...this.notificationSettingsForm.value + }); + // eslint-disable-next-line guard-for-in + for (const method in this.notificationSettings.deliveryMethodsConfigs) { + const keys = Object.keys(this.notificationSettings.deliveryMethodsConfigs[method]); + if (keys.some(item => isEmptyStr(this.notificationSettings.deliveryMethodsConfigs[method][item]))) { + delete this.notificationSettings.deliveryMethodsConfigs[method]; + } else { + this.notificationSettings.deliveryMethodsConfigs[method].method = method; + } + } + this.notificationService.saveNotificationSettings(this.notificationSettings).subscribe(setting => { + this.notificationSettings = setting; + this.notificationSettingsForm.reset(this.notificationSettings); + }); } } diff --git a/ui-ngx/src/app/modules/home/pages/notification/notification.module.ts b/ui-ngx/src/app/modules/home/pages/notification/notification.module.ts index 53fbb095dd..48751e08ba 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/notification.module.ts +++ b/ui-ngx/src/app/modules/home/pages/notification/notification.module.ts @@ -36,6 +36,7 @@ import { EscalationFormComponent } from '@home/pages/notification/rule/escalatio import { EscalationsComponent } from '@home/pages/notification/rule/escalations.component'; import { RuleNotificationDialogComponent } from '@home/pages/notification/rule/rule-notification-dialog.component'; import { RuleTableHeaderComponent } from '@home/pages/notification/rule/rule-table-header.component'; +import { SentTableHeaderComponent } from '@home/pages/notification/sent/sent-table-header.component'; @NgModule({ declarations: [ @@ -51,7 +52,8 @@ import { RuleTableHeaderComponent } from '@home/pages/notification/rule/rule-tab EscalationFormComponent, EscalationsComponent, RuleNotificationDialogComponent, - RuleTableHeaderComponent + RuleTableHeaderComponent, + SentTableHeaderComponent ], imports: [ CommonModule, diff --git a/ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-table-config.resolver.ts index d616ed67b0..bc9d7fae22 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-table-config.resolver.ts +++ b/ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-table-config.resolver.ts @@ -16,6 +16,7 @@ import { CellActionDescriptor, + DateEntityTableColumn, EntityTableColumn, EntityTableConfig } from '@home/models/entity/entities-table-config.models'; @@ -33,6 +34,7 @@ import { EntityAction } from '@home/models/entity/entity-component.models'; import { RecipientTableHeaderComponent } from '@home/pages/notification/recipient/recipient-table-header.component'; import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; import { Injectable } from '@angular/core'; +import { DatePipe } from '@angular/common'; @Injectable() export class RecipientTableConfigResolver implements Resolve> { @@ -41,7 +43,8 @@ export class RecipientTableConfigResolver implements Resolve this.onTargetAction(action); - this.config.defaultSortOrder = {property: 'name', direction: Direction.ASC}; + this.config.defaultSortOrder = {property: 'createdTime', direction: Direction.DESC}; this.config.handleRowClick = ($event, target) => { this.editTarget($event, target); @@ -73,6 +76,7 @@ export class RecipientTableConfigResolver implements Resolve('createdTime', 'notification.created-time', this.datePipe, '170px'), new EntityTableColumn('name', 'notification.notification-target', '20%'), new EntityTableColumn('configuration.type', 'notification.type', '20%', (target) => this.translate.instant(NotificationTargetTypeTranslationMap.get(target.configuration.type)), diff --git a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-table-config.resolver.ts index 50b7b20990..91e90bb221 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-table-config.resolver.ts +++ b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-table-config.resolver.ts @@ -16,6 +16,7 @@ import { CellActionDescriptor, + DateEntityTableColumn, EntityTableColumn, EntityTableConfig } from '@home/models/entity/entities-table-config.models'; @@ -33,6 +34,7 @@ import { } from '@home/pages/notification/rule/rule-notification-dialog.component'; import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; import { Injectable } from '@angular/core'; +import { DatePipe } from '@angular/common'; @Injectable() export class RuleTableConfigResolver implements Resolve> { @@ -41,7 +43,8 @@ export class RuleTableConfigResolver implements Resolve this.onTargetAction(action); - this.config.defaultSortOrder = {property: 'name', direction: Direction.ASC}; + this.config.defaultSortOrder = {property: 'createdTime', direction: Direction.DESC}; this.config.handleRowClick = ($event, rule) => { this.editRule($event, rule); @@ -72,6 +75,7 @@ export class RuleTableConfigResolver implements Resolve('createdTime', 'notification.created-time', this.datePipe, '170px'), new EntityTableColumn('name', 'notification.rule-name', '30%'), new EntityTableColumn('templateName', 'notification.template', '20%'), new EntityTableColumn('triggerType', 'notification.trigger.trigger', '20%', diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts index 2274332950..a71951a28b 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts +++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts @@ -47,6 +47,7 @@ import { } from '@home/pages/notification/sent/sent-error-dialog.component'; import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; import { Injectable } from '@angular/core'; +import { SentTableHeaderComponent } from '@home/pages/notification/sent/sent-table-header.component'; @Injectable() export class SentTableConfigResolver implements Resolve> { @@ -77,6 +78,7 @@ export class SentTableConfigResolver implements Resolve this.onRequestAction(action); this.config.handleRowClick = (event, entity) => { diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-header.component.html b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-header.component.html new file mode 100644 index 0000000000..45738d09fe --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-header.component.html @@ -0,0 +1,24 @@ + +
+ +
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-header.component.scss b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-header.component.scss new file mode 100644 index 0000000000..33537b4b23 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-header.component.scss @@ -0,0 +1,18 @@ +/** + * Copyright © 2016-2023 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +:host{ + width: 10000px; +} diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-header.component.ts b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-header.component.ts new file mode 100644 index 0000000000..7de3b536a5 --- /dev/null +++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-header.component.ts @@ -0,0 +1,39 @@ +/// +/// Copyright © 2016-2023 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { Component } from '@angular/core'; +import { EntityTableHeaderComponent } from '@home/components/entity/entity-table-header.component'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { NotificationRequest, NotificationRequestInfo } from '@shared/models/notification.models'; +import { PageLink } from '@shared/models/page/page-link'; + +@Component({ + selector: 'tb-sent-table-header', + templateUrl: './sent-table-header.component.html', + styleUrls: ['sent-table-header.component.scss'] +}) +export class SentTableHeaderComponent extends EntityTableHeaderComponent { + + constructor(protected store: Store) { + super(store); + } + + sendNotification($event: Event) { + this.entitiesTableConfig.onEntityAction({event: $event, action: 'add', entity: null}); + } + +} diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/template-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/notification/template/template-table-config.resolver.ts index de66a563ee..fe14fe23ec 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/template/template-table-config.resolver.ts +++ b/ui-ngx/src/app/modules/home/pages/notification/template/template-table-config.resolver.ts @@ -16,6 +16,7 @@ import { CellActionDescriptor, + DateEntityTableColumn, EntityTableColumn, EntityTableConfig } from '@home/models/entity/entities-table-config.models'; @@ -33,6 +34,7 @@ import { TranslateService } from '@ngx-translate/core'; import { TemplateTableHeaderComponent } from '@home/pages/notification/template/template-table-header.component'; import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { DatePipe } from '@angular/common'; @Injectable() export class TemplateTableConfigResolver implements Resolve> { @@ -41,7 +43,8 @@ export class TemplateTableConfigResolver implements Resolve this.onTemplateAction(action); - this.config.defaultSortOrder = {property: 'notificationType', direction: Direction.ASC}; + this.config.defaultSortOrder = {property: 'createdTime', direction: Direction.DESC}; this.config.handleRowClick = ($event, template) => { this.editTemplate($event, template); @@ -73,6 +76,7 @@ export class TemplateTableConfigResolver implements Resolve('createdTime', 'notification.created-time', this.datePipe, '170px'), new EntityTableColumn('notificationType', 'notification.type', '15%', (template) => this.translate.instant(NotificationTemplateTypeTranslateMap.get(template.notificationType).name)), new EntityTableColumn('name', 'notification.template', '25%'), diff --git a/ui-ngx/src/app/shared/components/notification/notification.component.scss b/ui-ngx/src/app/shared/components/notification/notification.component.scss index 94f6486904..ec72e21b12 100644 --- a/ui-ngx/src/app/shared/components/notification/notification.component.scss +++ b/ui-ngx/src/app/shared/components/notification/notification.component.scss @@ -29,6 +29,7 @@ .content { letter-spacing: .25px; + word-break: break-word; .title { margin-bottom: 4px; font-weight: 500; @@ -37,7 +38,6 @@ font-size: 14px; line-height: 16px; color: rgba(0, 0, 0, 0.76); - word-break: break-word; } .button { 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 978973bae6..c127224749 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -415,11 +415,8 @@ "resources": "Resources", "notifications": "Notifications", "notifications-settings": "Notifications settings", - "notification": { - "notification-settings": "Notification settings", - "slack-api-token": "Slack api token", - "slack": "Slack" - } + "slack-api-token": "Slack api token", + "slack": "Slack" }, "alarm": { "alarm": "Alarm",