UI: Entities and alarm tables improvements

@@ -119,7 +119,7 @@
           </mat-cell>
           </mat-cell>
         </ng-container>
         </ng-container>
         <mat-header-row [ngClass]="{'mat-row-select': enableSelection}" *matHeaderRowDef="displayedColumns; sticky: true"></mat-header-row>
         <mat-header-row [ngClass]="{'mat-row-select': enableSelection}" *matHeaderRowDef="displayedColumns; sticky: true"></mat-header-row>
-        <mat-row [ngClass]="{'mat-row-select': enableSelection,
+        <mat-row [fxShow]="!alarmsDatasource.dataLoading" [ngClass]="{'mat-row-select': enableSelection,
                              'mat-selected': alarmsDatasource.isSelected(alarm),
                              'mat-selected': alarmsDatasource.isSelected(alarm),
                              'tb-current-entity': alarmsDatasource.isCurrentAlarm(alarm)}"
                              'tb-current-entity': alarmsDatasource.isCurrentAlarm(alarm)}"
                  *matRowDef="let alarm; columns: displayedColumns;"
                  *matRowDef="let alarm; columns: displayedColumns;"

@@ -368,7 +368,12 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
         dataKey.title = this.utils.customTranslation(dataKey.label, dataKey.label);
         dataKey.title = this.utils.customTranslation(dataKey.label, dataKey.label);
         dataKey.def = 'def' + this.columns.length;
         dataKey.def = 'def' + this.columns.length;
         const keySettings: TableWidgetDataKeySettings = dataKey.settings;
         const keySettings: TableWidgetDataKeySettings = dataKey.settings;
-
+        if (dataKey.type === DataKeyType.alarm && !isDefined(keySettings.columnWidth)) {
+          const alarmField = alarmFields[dataKey.name];
+          if (alarmField && alarmField.time) {
+            keySettings.columnWidth = '120px';
+          }
+        }
         this.stylesInfo[dataKey.def] = getCellStyleInfo(keySettings);
         this.stylesInfo[dataKey.def] = getCellStyleInfo(keySettings);
         this.contentsInfo[dataKey.def] = getCellContentInfo(keySettings, 'value, alarm, ctx');
         this.contentsInfo[dataKey.def] = getCellContentInfo(keySettings, 'value, alarm, ctx');
         this.columnWidth[dataKey.def] = getColumnWidth(keySettings);
         this.columnWidth[dataKey.def] = getColumnWidth(keySettings);
@@ -863,7 +868,7 @@ class AlarmsDatasource implements DataSource<AlarmDataInfo> {
 
 
   loadAlarms(pageLink: AlarmDataPageLink, sortOrderLabel: string, keyFilters: KeyFilter[]) {
   loadAlarms(pageLink: AlarmDataPageLink, sortOrderLabel: string, keyFilters: KeyFilter[]) {
     this.dataLoading = true;
     this.dataLoading = true;
-    this.clear();
+    // this.clear();
     this.appliedPageLink = pageLink;
     this.appliedPageLink = pageLink;
     this.appliedSortOrderLabel = sortOrderLabel;
     this.appliedSortOrderLabel = sortOrderLabel;
     this.subscription.subscribeForAlarms(pageLink, keyFilters);
     this.subscription.subscribeForAlarms(pageLink, keyFilters);

@@ -82,7 +82,7 @@
           </mat-cell>
           </mat-cell>
         </ng-container>
         </ng-container>
         <mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></mat-header-row>
         <mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></mat-header-row>
-        <mat-row [ngClass]="{'tb-current-entity': entityDatasource.isCurrentEntity(entity)}"
+        <mat-row [fxShow]="!entityDatasource.dataLoading" [ngClass]="{'tb-current-entity': entityDatasource.isCurrentEntity(entity)}"
                  *matRowDef="let entity; columns: displayedColumns;"
                  *matRowDef="let entity; columns: displayedColumns;"
                  (click)="onRowClick($event, entity)" (dblclick)="onRowClick($event, entity, true)"></mat-row>
                  (click)="onRowClick($event, entity)" (dblclick)="onRowClick($event, entity, true)"></mat-row>
       </table>
       </table>

@@ -87,6 +87,7 @@ import {
 import { sortItems } from '@shared/models/page/page-link';
 import { sortItems } from '@shared/models/page/page-link';
 import { entityFields } from '@shared/models/entity.models';
 import { entityFields } from '@shared/models/entity.models';
 import { DatePipe } from '@angular/common';
 import { DatePipe } from '@angular/common';
+import { alarmFields } from '@shared/models/alarm.models';
 
 
 interface EntitiesTableWidgetSettings extends TableWidgetSettings {
 interface EntitiesTableWidgetSettings extends TableWidgetSettings {
   entitiesTitle: string;
   entitiesTitle: string;
@@ -348,6 +349,13 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
         dataKey.title = this.utils.customTranslation(dataKey.label, dataKey.label);
         dataKey.title = this.utils.customTranslation(dataKey.label, dataKey.label);
         dataKey.def = 'def' + this.columns.length;
         dataKey.def = 'def' + this.columns.length;
         const keySettings: TableWidgetDataKeySettings = dataKey.settings;
         const keySettings: TableWidgetDataKeySettings = dataKey.settings;
+        if (dataKey.type === DataKeyType.entityField &&
+          !isDefined(keySettings.columnWidth) || keySettings.columnWidth === '0px') {
+          const entityField = entityFields[dataKey.name];
+          if (entityField && entityField.time) {
+            keySettings.columnWidth = '120px';
+          }
+        }
 
 
         this.stylesInfo[dataKey.def] = getCellStyleInfo(keySettings);
         this.stylesInfo[dataKey.def] = getCellStyleInfo(keySettings);
         this.contentsInfo[dataKey.def] = getCellContentInfo(keySettings, 'value, entity, ctx');
         this.contentsInfo[dataKey.def] = getCellContentInfo(keySettings, 'value, entity, ctx');
@@ -595,7 +603,7 @@ class EntityDatasource implements DataSource<EntityData> {
 
 
   loadEntities(pageLink: EntityDataPageLink, sortOrderLabel: string, keyFilters: KeyFilter[]) {
   loadEntities(pageLink: EntityDataPageLink, sortOrderLabel: string, keyFilters: KeyFilter[]) {
     this.dataLoading = true;
     this.dataLoading = true;
-    this.clear();
+    // this.clear();
     this.appliedPageLink = pageLink;
     this.appliedPageLink = pageLink;
     this.appliedSortOrderLabel = sortOrderLabel;
     this.appliedSortOrderLabel = sortOrderLabel;
     this.subscription.subscribeForPaginatedData(0, pageLink, keyFilters);
     this.subscription.subscribeForPaginatedData(0, pageLink, keyFilters);