From 327455305d661baf6257926941f598ecee82a554 Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Fri, 6 Dec 2024 17:48:37 +0200
Subject: [PATCH] UI: Debug Settings fixes refactoring

---
 .../debug-settings/debug-settings-button.component.html   | 4 ++--
 .../debug-settings/debug-settings-panel.component.html    | 4 ++--
 .../home/pages/rulechain/rulechain-page.component.ts      | 8 ++++----
 .../app/shared/pipe/milliseconds-to-time-string.pipe.ts   | 2 +-
 ui-ngx/src/assets/locale/locale.constant-lt_LT.json       | 1 -
 ui-ngx/src/assets/locale/locale.constant-uk_UA.json       | 3 ++-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.html b/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.html
index d20fa2e90d..de765556e4 100644
--- a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.html
+++ b/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.html
@@ -24,8 +24,8 @@
         (click)="openDebugStrategyPanel($event, matButton)">
   <mat-icon [color]="debugSettingsFormGroup.disabled ? 'inherit' : 'primary'">bug_report</mat-icon>
   @if (isDebugAllActive$ | async) {
-    {{ !allEnabled() ? (allEnabledUntil | durationLeft) : (maxDebugModeDuration | milliSecondsToTimeString: true : true).trim() }}
+    {{ !allEnabled() ? (allEnabledUntil | durationLeft) : (maxDebugModeDuration | milliSecondsToTimeString: true : true) }}
   } @else {
-    {{ failuresEnabled ? ('debug-config.failures' | translate) : ('common.disabled' | translate) }}
+    {{ failuresEnabled ? 'debug-config.failures' : 'common.disabled' | translate }}
   }
 </button>
diff --git a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.html
index f088fc38ac..d47ee69091 100644
--- a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.html
@@ -20,7 +20,7 @@
   <div class="hint-container">
     <div class="tb-form-hint tb-primary-fill tb-flex center">
       @if (debugLimitsConfiguration) {
-        {{ 'debug-config.hint.main-limited' | translate: { msg: maxMessagesCount, time: (maxTimeFrameDuration | milliSecondsToTimeString: true : true).trim() } }}
+        {{ 'debug-config.hint.main-limited' | translate: { msg: maxMessagesCount, time: (maxTimeFrameDuration | milliSecondsToTimeString: true : true) } }}
       } @else {
         {{ 'debug-config.hint.main' | translate }}
       }
@@ -35,7 +35,7 @@
     <div class="align-center flex justify-between">
       <mat-slide-toggle class="mat-slide" [formControl]="debugAllControl">
         <div tb-hint-tooltip-icon="{{ 'debug-config.hint.all-messages' | translate }}">
-          {{ 'debug-config.all-messages' | translate: { time: (isDebugAllActive$ | async) && !allEnabled ? (allEnabledUntil | durationLeft) : (maxDebugModeDuration | milliSecondsToTimeString: true : true).trim() } }}
+          {{ 'debug-config.all-messages' | translate: { time: (isDebugAllActive$ | async) && !allEnabled ? (allEnabledUntil | durationLeft) : (maxDebugModeDuration | milliSecondsToTimeString: true : true) } }}
         </div>
       </mat-slide-toggle>
       <button mat-icon-button *ngIf="(isDebugAllActive$ | async) && !allEnabled"
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
index 2d440ed28c..20257c53d8 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
@@ -1417,7 +1417,7 @@ export class RuleChainPageComponent extends PageComponent
   }
 
   isDebugSettingsEnabled(): boolean {
-    const res = this.ruleChainModel.nodes.find(({ debugSettings }) => debugSettings && this.isDebugSettingsActive(debugSettings));
+    const res = this.ruleChainModel.nodes.find((node) => node?.debugSettings && this.isDebugSettingsActive(node.debugSettings));
     return typeof res !== 'undefined';
   }
 
@@ -1425,7 +1425,7 @@ export class RuleChainPageComponent extends PageComponent
     let changed = false;
     this.ruleChainModel.nodes.forEach((node) => {
       if (node.component.type !== RuleNodeType.INPUT) {
-        const nodeHasActiveDebugSettings = node.debugSettings && this.isDebugSettingsActive(node.debugSettings);
+        const nodeHasActiveDebugSettings = node?.debugSettings && this.isDebugSettingsActive(node.debugSettings);
         changed = changed || nodeHasActiveDebugSettings;
         if (nodeHasActiveDebugSettings) {
           node.debugSettings = { allEnabled: false, failuresEnabled: false, allEnabledUntil: 0 };
@@ -1437,8 +1437,8 @@ export class RuleChainPageComponent extends PageComponent
     }
   }
 
-  private isDebugSettingsActive({ allEnabled = false, failuresEnabled = false, allEnabledUntil = 0 }: DebugSettings): boolean {
-    return allEnabled || failuresEnabled || allEnabledUntil > new Date().getTime();
+  private isDebugSettingsActive(debugSettings: DebugSettings): boolean {
+    return debugSettings.allEnabled || debugSettings.failuresEnabled || debugSettings.allEnabledUntil > new Date().getTime();
   }
 
   validate() {
diff --git a/ui-ngx/src/app/shared/pipe/milliseconds-to-time-string.pipe.ts b/ui-ngx/src/app/shared/pipe/milliseconds-to-time-string.pipe.ts
index d8884992bf..8e8a0344ae 100644
--- a/ui-ngx/src/app/shared/pipe/milliseconds-to-time-string.pipe.ts
+++ b/ui-ngx/src/app/shared/pipe/milliseconds-to-time-string.pipe.ts
@@ -62,7 +62,7 @@ export class MillisecondsToTimeStringPipe implements PipeTransform {
       if (value > 0) {
         timeString += this.translate.instant(shortFormat ? `timewindow.${shortKey}` : `timewindow.${key}`, { [key]: value });
         if (onlyFirstDigit) {
-          return timeString;
+          return timeString.trim();
         }
       }
     }
diff --git a/ui-ngx/src/assets/locale/locale.constant-lt_LT.json b/ui-ngx/src/assets/locale/locale.constant-lt_LT.json
index 1d2a672326..89191ea064 100644
--- a/ui-ngx/src/assets/locale/locale.constant-lt_LT.json
+++ b/ui-ngx/src/assets/locale/locale.constant-lt_LT.json
@@ -4504,7 +4504,6 @@
         "output": "Output",
         "test": "Test",
         "help": "Help",
-        "reset-debug-settings": "Reset debug settings in all nodes",
         "test-with-this-message": "{{test}} with this message"
     },
     "role": {
diff --git a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
index 09cf86bc21..acb837a587 100644
--- a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
+++ b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
@@ -1978,7 +1978,8 @@
         "metadata-required": "Записи метаданих не можуть бути порожніми.",
         "output": "Вихід",
         "test": "Тест",
-        "help": "Допомога"
+        "help": "Допомога",
+        "reset-debug-settings": "Вимкнути налаштування налагодження у всіх правилах"
     },
     "scheduler": {
         "scheduler": "Планувальник",