UI: Minor improvements

ui-ngx/src/app/core/services/utils.service.ts

@@ -41,7 +41,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { customTranslationsPrefix, i18nPrefix } from '@app/shared/models/constants';
 import { DataKey, Datasource, DatasourceType, KeyInfo } from '@shared/models/widget.models';
 import { DataKeyType } from '@app/shared/models/telemetry/telemetry.models';
-import { alarmFields } from '@shared/models/alarm.models';
+import { alarmFields, alarmSeverityTranslations, alarmStatusTranslations } from '@shared/models/alarm.models';
 import { materialColors } from '@app/shared/models/material.models';
 import { WidgetInfo } from '@home/models/widget-component.models';
 import jsonSchemaDefaults from 'json-schema-defaults';
@@ -55,6 +55,8 @@ import {
   TelemetryType
 } from '@shared/models/telemetry/telemetry.models';
 import { EntityId } from '@shared/models/id/entity-id';
+import { DatePipe } from '@angular/common';
+import { entityTypeTranslations } from '@shared/models/entity-type.models';
 
 const i18nRegExp = new RegExp(`{${i18nPrefix}:[^{}]+}`, 'g');
 
@@ -115,6 +117,7 @@ export class UtilsService {
 
   constructor(@Inject(WINDOW) private window: Window,
               private zone: NgZone,
+              private datePipe: DatePipe,
               private translate: TranslateService) {
     let frame: Element = null;
     try {
@@ -170,6 +173,27 @@ export class UtilsService {
     return deepClone(this.defaultAlarmDataKeys);
   }
 
+  public defaultAlarmFieldContent(key: DataKey | {name: string}, value: any): string {
+    if (isDefined(value)) {
+      const alarmField = alarmFields[key.name];
+      if (alarmField) {
+        if (alarmField.time) {
+          return value ? this.datePipe.transform(value, 'yyyy-MM-dd HH:mm:ss') : '';
+        } else if (alarmField === alarmFields.severity) {
+          return this.translate.instant(alarmSeverityTranslations.get(value));
+        } else if (alarmField === alarmFields.status) {
+          return alarmStatusTranslations.get(value) ? this.translate.instant(alarmStatusTranslations.get(value)) : value;
+        } else if (alarmField === alarmFields.originatorType) {
+          return this.translate.instant(entityTypeTranslations.get(value).type);
+        } else if (alarmField.value === alarmFields.assignee.value) {
+          return '';
+        }
+      }
+      return value;
+    }
+    return '';
+  }
+
   public generateObjectFromJsonSchema(schema: any): any {
     const obj = jsonSchemaDefaults(schema);
     deleteNullProperties(obj);

ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts

@@ -23,6 +23,7 @@ import {
   Injector,
   Input,
   NgZone,
+  OnDestroy,
   OnInit,
   StaticProvider,
   ViewChild,
@@ -52,7 +53,6 @@ import { Direction } from '@shared/models/page/sort-order';
 import { CollectionViewer, DataSource, SelectionModel } from '@angular/cdk/collections';
 import { BehaviorSubject, forkJoin, fromEvent, merge, Observable, Subscription } from 'rxjs';
 import { emptyPageData, PageData } from '@shared/models/page/page-data';
-import { entityTypeTranslations } from '@shared/models/entity-type.models';
 import { debounceTime, distinctUntilChanged, map, take, tap } from 'rxjs/operators';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort, SortDirection } from '@angular/material/sort';
@@ -92,15 +92,7 @@ import {
   DisplayColumnsPanelComponent,
   DisplayColumnsPanelData
 } from '@home/components/widget/lib/display-columns-panel.component';
-import {
-  AlarmDataInfo,
-  alarmFields,
-  AlarmInfo,
-  alarmSeverityColors,
-  alarmSeverityTranslations,
-  AlarmStatus,
-  alarmStatusTranslations
-} from '@shared/models/alarm.models';
+import { AlarmDataInfo, alarmFields, AlarmInfo, alarmSeverityColors, AlarmStatus } from '@shared/models/alarm.models';
 import { DatePipe } from '@angular/common';
 import {
   AlarmDetailsDialogComponent,
@@ -139,7 +131,6 @@ import {
   AlarmFilterConfigData
 } from '@home/components/alarm/alarm-filter-config.component';
 import { getCurrentAuthUser } from '@core/auth/auth.selectors';
-import { UserId } from '@shared/models/id/user-id';
 
 interface AlarmsTableWidgetSettings extends TableWidgetSettings {
   alarmsTitle: string;
@@ -167,7 +158,7 @@ interface AlarmWidgetActionDescriptor extends TableCellButtonActionDescriptor {
   templateUrl: './alarms-table-widget.component.html',
   styleUrls: ['./alarms-table-widget.component.scss', './table-widget.scss']
 })
-export class AlarmsTableWidgetComponent extends PageComponent implements OnInit, AfterViewInit {
+export class AlarmsTableWidgetComponent extends PageComponent implements OnInit, OnDestroy, AfterViewInit {
 
   @Input()
   ctx: WidgetContext;
@@ -431,7 +422,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
             keySettings.columnWidth = '120px';
           }
           if (alarmField && alarmField.keyName  === alarmFields.assignee.keyName) {
-            keySettings.columnWidth = '120px'
+            keySettings.columnWidth = '120px';
           }
         }
         this.stylesInfo[dataKey.def] = getCellStyleInfo(keySettings, 'value, alarm, ctx');
@@ -543,14 +534,12 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
       overlayRef.dispose();
     });
 
-    const columns: DisplayColumn[] = this.columns.map(column => {
-      return {
+    const columns: DisplayColumn[] = this.columns.map(column => ({
         title: column.title,
         def: column.def,
         display: this.displayedColumns.indexOf(column.def) > -1,
         selectable: this.columnSelectionAvailability[column.def]
-      };
-    });
+      }));
 
     const providers: StaticProvider[] = [
       {
@@ -1010,7 +999,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
           data: {
             alarmId: alarm.id.id
           }
-        }).afterClosed()
+        }).afterClosed();
     }
   }
 
@@ -1018,20 +1007,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
     if (isDefined(value)) {
       const alarmField = alarmFields[key.name];
       if (alarmField) {
-        if (alarmField.time) {
-          return value ? this.datePipe.transform(value, 'yyyy-MM-dd HH:mm:ss') : '';
-        } else if (alarmField.value === alarmFields.severity.value) {
-          return this.translate.instant(alarmSeverityTranslations.get(value));
-        } else if (alarmField.value === alarmFields.status.value) {
-          return alarmStatusTranslations.get(value) ? this.translate.instant(alarmStatusTranslations.get(value)) : value;
-        } else if (alarmField.value === alarmFields.originatorType.value) {
-          return this.translate.instant(entityTypeTranslations.get(value).type);
-        } else if (alarmField.value === alarmFields.assignee.value) {
-          return '';
-        }
-        else {
-          return value;
-        }
+        return this.utils.defaultAlarmFieldContent(key, value);
       }
       const entityField = entityFields[key.name];
       if (entityField) {