diff --git a/src/app/pages/dashboard/services/widget-resources.service.ts b/src/app/pages/dashboard/services/widget-resources.service.ts index 3c55e23e3f1..cf13c831552 100644 --- 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 index 3c499895e0e..93a2b2a9ef2 100644 --- 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 index 9aaa8b5bf7f..2a870aaf1a6 100644 --- 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(); isIxHardware = input.required(); + 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 index f54bcd208f6..b5c2187f303 100644 --- 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/src/app/pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.html b/src/app/pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.html index c6f5a0a34ba..e561088e5e2 100644 --- a/src/app/pages/dashboard/widgets/system/widget-sys-info-active/widget-sys-info-active.component.html +++ b/src/app/pages/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 }} +