NAS-129891: Webui cache refresh should report progress of cache fill job

(cherry picked from commit dbb15a0)
truenas · Oct 13, 2024 · 1bb4779 · 1bb4779
1 parent 8e83301
commit 1bb4779
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 28 deletions.
diff --git a/src/app/pages/directory-service/components/active-directory/active-directory.component.ts b/src/app/pages/directory-service/components/active-directory/active-directory.component.ts
@@ -96,20 +96,25 @@ export class ActiveDirectoryComponent implements OnInit {
 
   onRebuildCachePressed(): void {
     this.isLoading = true;
-    this.systemGeneralService.refreshDirServicesCache().pipe(untilDestroyed(this)).subscribe({
-      next: () => {
-        this.isLoading = false;
-        this.snackbarService.success(
-          this.translate.instant(helptextActiveDirectory.activedirectory_custactions_clearcache_dialog_message),
-        );
-        this.cdr.markForCheck();
-      },
-      error: (error: unknown) => {
-        this.isLoading = false;
-        this.dialogService.error(this.errorHandler.parseError(error));
-        this.cdr.markForCheck();
-      },
-    });
+    this.dialogService
+      .jobDialog(this.systemGeneralService.refreshDirServicesCache())
+      .afterClosed()
+      .pipe(untilDestroyed(this)).subscribe({
+        next: ({ description }) => {
+          this.isLoading = false;
+          this.snackbarService.success(
+            this.translate.instant(
+              description || helptextActiveDirectory.activedirectory_custactions_clearcache_dialog_message,
+            ),
+          );
+          this.cdr.markForCheck();
+        },
+        error: (error: unknown) => {
+          this.isLoading = false;
+          this.dialogService.error(this.errorHandler.parseError(error));
+          this.cdr.markForCheck();
+        },
+      });
   }
 
   onLeaveDomainPressed(): void {

diff --git a/src/app/pages/directory-service/components/ldap/ldap.component.ts b/src/app/pages/directory-service/components/ldap/ldap.component.ts
@@ -90,20 +90,23 @@ export class LdapComponent implements OnInit {
 
   onRebuildCachePressed(): void {
     this.isLoading = true;
-    this.systemGeneralService.refreshDirServicesCache().pipe(untilDestroyed(this)).subscribe({
-      next: () => {
-        this.isLoading = false;
-        this.snackbar.success(
-          this.translate.instant(helptextLdap.ldap_custactions_clearcache_dialog_message),
-        );
-        this.cdr.markForCheck();
-      },
-      error: (error: unknown) => {
-        this.isLoading = false;
-        this.dialogService.error(this.errorHandler.parseError(error));
-        this.cdr.markForCheck();
-      },
-    });
+    this.dialogService
+      .jobDialog(this.systemGeneralService.refreshDirServicesCache())
+      .afterClosed()
+      .pipe(untilDestroyed(this)).subscribe({
+        next: ({ description }) => {
+          this.isLoading = false;
+          this.snackbar.success(
+            this.translate.instant(description || helptextLdap.ldap_custactions_clearcache_dialog_message),
+          );
+          this.cdr.markForCheck();
+        },
+        error: (error: unknown) => {
+          this.isLoading = false;
+          this.dialogService.error(this.errorHandler.parseError(error));
+          this.cdr.markForCheck();
+        },
+      });
   }
 
   onSubmit(): void {