From 1aed15db9f360b126ef636d14b4e9bb17f2f4d44 Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Sat, 15 Feb 2020 20:29:38 +0000 Subject: [PATCH] Add loading indicator for Workload resource stats --- .../helm-release-summary-tab.component.html | 19 +++++++++++++++---- .../helm-release-summary-tab.component.ts | 8 ++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html index 893a819405..f69faf6ea9 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html +++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html @@ -56,11 +56,22 @@ -
- - +
+
+ + +
+ +
+
+ Updating Resource Information + + +
+
+
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts index be62056bf6..43b268b89a 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts @@ -28,6 +28,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy { private busyDeletingSubject = new ReplaySubject(); public isBusy$: Observable; public hasResources$: Observable; + public hasAllResources$: Observable; private readonly DEFAULT_LOADING_MESSAGE = 'Retrieving Release Details'; public loadingMessage = this.DEFAULT_LOADING_MESSAGE; @@ -134,6 +135,13 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy { map(([chartData, resources]) => !!chartData && !!resources) ); + this.hasAllResources$ = combineLatest([ + this.resources$, + this.hasResources$ + ]).pipe( + map(([resources, hasSome]) => hasSome && resources && resources.length > 0) + ); + this.deleteReleaseConfirmation = new ConfirmationDialogConfig( `Delete Workload`, {