NAS-128451: Port WidgetSysInfoComponent to new dashboard

truenas · May 15, 2024 · 4bff083 · 4bff083
1 parent d254468
commit 4bff083
Show file tree

Hide file tree

Showing 96 changed files with 130 additions and 31 deletions.
diff --git a/src/app/pages/dashboard/services/widget-resources.service.ts b/src/app/pages/dashboard/services/widget-resources.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { sub } from 'date-fns';
-import { Observable, forkJoin, interval } from 'rxjs';
+import { Observable, forkJoin, timer } from 'rxjs';
 import {
   combineLatestWith,
   map, shareReplay, switchMap,
@@ -27,7 +27,7 @@ import { waitForSystemInfo } from 'app/store/system-info/system-info.selectors';
 export class WidgetResourcesService {
   // TODO: nosub is emitted for some reason
   readonly realtimeUpdates$ = this.ws.subscribe('reporting.realtime');
-  readonly refreshInteval$ = interval(10000);
+  readonly refreshInteval$ = timer(0, 10000);
 
   readonly backups$ = forkJoin([
     this.ws.call('replication.query'),

diff --git a/src/app/pages/dashboard/widgets/system/common/product-image/product-image.component.scss b/src/app/pages/dashboard/widgets/system/common/product-image/product-image.component.scss
@@ -8,7 +8,7 @@
 
   .product-image-placeholder {
     display: flex;
-    min-height: auto;
+    min-height: 100px;
     min-width: 150px;
     place-content: center;
     place-items: center;

diff --git a/src/app/pages/dashboard/widgets/system/common/product-image/product-image.component.ts b/src/app/pages/dashboard/widgets/system/common/product-image/product-image.component.ts
@@ -23,6 +23,7 @@ export class ProductImageComponent {
   isHaLicensed = input.required<boolean>();
   isIxHardware = input.required<boolean>();
 
+  isUnsupportedHardware = computed(() => this.isEnterprise() && !this.isIxHardware() && !this.isHaLicensed());
   isCertified = computed(() => this.systemProduct()?.includes('CERTIFIED'));
   product = computed(() => getServerProduct(this.systemProduct()));
   productImage = computed(() => getProductImage(this.systemProduct()));
@@ -33,8 +34,6 @@ export class ProductImageComponent {
     return getProductEnclosure(this.systemProduct());
   });
 
-  isUnsupportedHardware = computed(() => this.isEnterprise() && !this.isIxHardware());
-
   constructor(private router: Router) { }
 
   goToEnclosure(): void {

diff --git a/src/app/pages/dashboard/widgets/system/common/widget-sys-info.utils.ts b/src/app/pages/dashboard/widgets/system/common/widget-sys-info.utils.ts
@@ -23,7 +23,7 @@ export function getProductImage(systemProduct: string): string {
     product = getServerProduct(systemProduct) ? `servers/${getServerProduct(systemProduct)}.png` : 'ix-original.svg';
   }
 
-  return `assets/images/${product}`;
+  return product ? `assets/images/${product}` : '';
 }
 
 export function isRackmount(systemProduct: string): boolean {

diff --git a/...ges/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.html b/...ges/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.html
@@ -24,6 +24,7 @@
             [ixTest]="['widget-sysinfo', 'update-running']"
             [disabled]="true"
           >{{ 'Update in Progress' | translate }}</button>
+
           <button
             *ngIf="updateAvailable() && !isUpdateRunning()"
             mat-button
@@ -81,17 +82,22 @@ <h3>{{ 'System Information' | translate }}</h3>
             </div>
           </mat-list-item>
 
-          <mat-list-item *ngIf="systemInfo()?.license">
+          <mat-list-item>
             <strong>{{ 'License' | translate }}:</strong>
-            <span>
-              {{
-                '{license} contract, expires {date}' | translate:
-                {
-                  license: systemInfo().license.contract_type | titlecase,
-                  date: systemInfo().license.contract_end.$value,
-                }
-              }}
-            </span>
+            <ng-container *ngIf="isLoaded(); else inlineLoader">
+              <span *ngIf="systemInfo()?.license">
+                {{
+                  '{license} contract, expires {date}' | translate:
+                  {
+                    license: systemInfo().license.contract_type | titlecase,
+                    date: systemInfo().license.contract_end.$value,
+                  }
+                }}
+              </span>
+              <span *ngIf="!systemInfo()?.license">
+                {{ 'No License' | translate }}
+              </span>
+            </ng-container>
           </mat-list-item>
 
           <mat-list-item *ngIf="systemInfo()?.system_serial && isIxHardware()">

diff --git a/...pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.ts b/...pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.ts
@@ -34,9 +34,9 @@ export class WidgetSysInfoActiveComponent {
   elapsedTenSecondsInterval = toSignal(this.resources.refreshInteval$);
 
   version = computed(() => getSystemVersion(this.systemInfo().version, this.systemInfo().codename));
-  uptime = computed(() => this.systemInfo().uptime_seconds + this.elapsedTenSecondsInterval());
-  datetime = computed(() => this.systemInfo().datetime.$date + (this.elapsedTenSecondsInterval() * 1000));
-  isLoaded = computed(() => this.systemInfo() && this.uptime() && this.datetime());
+  uptime = computed(() => this.systemInfo().uptime_seconds + (this.elapsedTenSecondsInterval() * 10));
+  datetime = computed(() => this.systemInfo().datetime.$date + (this.elapsedTenSecondsInterval() * 10 * 1000));
+  isLoaded = computed(() => this.systemInfo());
 
   constructor(
     private resources: WidgetResourcesService,

diff --git a/...s/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.html b/...s/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.html
@@ -79,16 +79,22 @@ <h3>{{ 'System Information' | translate }} <small>{{ 'standby' | translate }}</s
             </div>
           </mat-list-item>
 
-          <mat-list-item *ngIf="systemInfo()?.license">
+          <mat-list-item>
             <strong>{{ 'License' | translate }}:</strong>
-            <span>
-              {{ '{license} contract, expires {date}' | translate:
-                {
-                  license: systemInfo().license.contract_type | titlecase,
-                  date: systemInfo().license.contract_end.$value
-                }
-              }}
-            </span>
+            <ng-container *ngIf="isLoaded(); else inlineLoader">
+              <span *ngIf="systemInfo()?.license">
+                {{
+                  '{license} contract, expires {date}' | translate:
+                  {
+                    license: systemInfo().license.contract_type | titlecase,
+                    date: systemInfo().license.contract_end.$value,
+                  }
+                }}
+              </span>
+              <span *ngIf="!systemInfo()?.license">
+                {{ 'No License' | translate }}
+              </span>
+            </ng-container>
           </mat-list-item>
 
           <mat-list-item *ngIf="systemInfo()?.system_serial && isIxHardware()">

diff --git a/...ges/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.ts b/...ges/dashboard/widgets/system/widget-sys-info-passive/widget-sys-info-passive.component.ts
@@ -44,9 +44,9 @@ export class WidgetSysInfoPassiveComponent {
   systemInfo = toSignal(this.resources.systemInfo$.pipe(map((sysInfo) => sysInfo.remote_info)));
 
   version = computed(() => getSystemVersion(this.systemInfo().version, this.systemInfo().codename));
-  uptime = computed(() => this.systemInfo().uptime_seconds + this.elapsedTenSecondsInterval());
-  datetime = computed(() => this.systemInfo().datetime.$date + (this.elapsedTenSecondsInterval() * 1000));
-  isLoaded = computed(() => this.systemInfo() && this.uptime() && this.datetime());
+  uptime = computed(() => this.systemInfo().uptime_seconds + (this.elapsedTenSecondsInterval() * 10));
+  datetime = computed(() => this.systemInfo().datetime.$date + (this.elapsedTenSecondsInterval() * 10 * 1000));
+  isLoaded = computed(() => this.systemInfo());
 
   constructor(
     private resources: WidgetResourcesService,

diff --git a/src/assets/i18n/af.json b/src/assets/i18n/af.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/ast.json b/src/assets/i18n/ast.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/be.json b/src/assets/i18n/be.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/br.json b/src/assets/i18n/br.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/bs.json b/src/assets/i18n/bs.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json
@@ -2236,6 +2236,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/cy.json b/src/assets/i18n/cy.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -1854,6 +1854,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Pods Found": "",
   "No Pools Found": "",
   "No Propagate Inherit": "",

diff --git a/src/assets/i18n/dsb.json b/src/assets/i18n/dsb.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/el.json b/src/assets/i18n/el.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/en-au.json b/src/assets/i18n/en-au.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/en-gb.json b/src/assets/i18n/en-gb.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/eo.json b/src/assets/i18n/eo.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/es-ar.json b/src/assets/i18n/es-ar.json
@@ -1045,6 +1045,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Pods Found": "",
   "No Pools Found": "",
   "No Propagate Inherit": "",

diff --git a/src/assets/i18n/es-co.json b/src/assets/i18n/es-co.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/es-mx.json b/src/assets/i18n/es-mx.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/es-ni.json b/src/assets/i18n/es-ni.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/es-ve.json b/src/assets/i18n/es-ve.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
@@ -2357,6 +2357,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/et.json b/src/assets/i18n/et.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/eu.json b/src/assets/i18n/eu.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/fa.json b/src/assets/i18n/fa.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/fi.json b/src/assets/i18n/fi.json
@@ -2530,6 +2530,7 @@
   "No Inherit": "",
   "No Isolated GPU Device(s) configured": "",
   "No Item": "",
+  "No License": "",
   "No Logs": "",
   "No Pods Found": "",
   "No Pools": "",

diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
@@ -236,6 +236,7 @@
   "New Privilege": "",
   "New View Enclosure": "",
   "No Enclosure Dispersal Strategy": "",
+  "No License": "",
   "No available licensed Expansion Shelves ": "",
   "No logs available": "",
   "No results found in {section}": "",