From 8cf1cc311261fa543e08f3dbeef0fdaaad9f8eb1 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Wed, 22 Mar 2023 13:11:16 +0200
Subject: [PATCH] UI: Minor change in notification

---
 .../recipient/recipient-notification-dialog.componet.scss   | 6 +-----
 .../sent/sent-notification-dialog.component.html            | 2 +-
 .../notification/sent/sent-notification-dialog.componet.ts  | 6 ++++++
 .../pages/notification/sent/sent-table-config.resolver.ts   | 5 ++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-notification-dialog.componet.scss b/ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-notification-dialog.componet.scss
index 25d51c040b..8406cae3fe 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-notification-dialog.componet.scss
+++ b/ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-notification-dialog.componet.scss
@@ -42,12 +42,8 @@
     .mat-mdc-radio-button {
       flex: 1 1 100%;
       padding: 4px;
-      border: 1px solid rgba(0, 0, 0, 0.1);
+      border: 1px solid rgba(0, 0, 0, 0.12);
       border-radius: 6px;
-
-      &.mat-mdc-radio-checked {
-        border-color: map_get($tb-accent, 500);
-      }
     }
   }
 
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
index 3d7f0b8ef3..dfe68d6c26 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
@@ -112,7 +112,7 @@
             <mat-form-field>
               <mat-label translate>notification.time</mat-label>
               <mat-datetimepicker-toggle [for]="startTimePicker" matPrefix></mat-datetimepicker-toggle>
-              <mat-datetimepicker #startTimePicker type="datetime" openOnFocus="true" timeInterval="1"></mat-datetimepicker>
+              <mat-datetimepicker #startTimePicker type="datetime" openOnFocus="true" [timeInterval]="1"></mat-datetimepicker>
               <input required matInput fxFlex formControlName="time" [min]="minDate()" [max]="maxDate()" [matDatetimepicker]="startTimePicker">
             </mat-form-field>
           </div>
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
index b910a4cb99..66ed42a3b7 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
@@ -129,7 +129,13 @@ export class SentNotificationDialogComponent extends
       this.dialogTitle = 'notification.new-notification';
     }
     if (data.request) {
+      this.notificationRequestForm.reset({}, {emitEvent: false});
       this.notificationRequestForm.patchValue(this.data.request, {emitEvent: false});
+      // eslint-disable-next-line guard-for-in
+      for (const method in this.data.request.template.configuration.deliveryMethodsTemplates) {
+        this.deliveryMethodFormsMap.get(NotificationDeliveryMethod[method])
+          .patchValue(this.data.request.template.configuration.deliveryMethodsTemplates[method]);
+      }
     }
   }
 
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 a71951a28b..285d6c1434 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
@@ -173,7 +173,7 @@ export class SentTableConfigResolver implements Resolve<EntityTableConfig<Notifi
     if (countError === 0) {
       return '';
     }
-    return `<div style="border-radius: 12px; height: 24px; line-height: 24px; padding: 0 10px; width: max-content;
+    return `<div style="border-radius: 12px; height: 24px; line-height: 24px; padding: 0 10px; width: max-content; cursor: pointer;
                         background-color: #D12730; color: #fff; font-weight: 500; margin-left: 8px" class="stats">
                 ${countError} ${this.translate.instant('notification.fails')} >
             </div>`;
@@ -182,8 +182,7 @@ export class SentTableConfigResolver implements Resolve<EntityTableConfig<Notifi
   private requestStatusStyle(status: NotificationRequestStatus): object {
     const styleObj = {
       fontSize: '14px',
-      color: '#198038',
-      cursor: 'pointer'
+      color: '#198038'
     };
     switch (status) {
       case NotificationRequestStatus.SCHEDULED: