NAS-131244: Fix Roles card on datasets is missing "System Dataset" te…

…xt (#10731)
truenas · Sep 23, 2024 · a012d4e · a012d4e
1 parent b23474a
commit a012d4e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/src/app/pages/datasets/components/dataset-management/dataset-management.component.html b/src/app/pages/datasets/components/dataset-management/dataset-management.component.html
@@ -119,7 +119,10 @@
             [loading]="isLoading$ | async"
           ></ix-fake-progress-bar>
         }
-        <ix-dataset-details-panel [dataset]="dataset"></ix-dataset-details-panel>
+        <ix-dataset-details-panel
+          [dataset]="dataset"
+          [systemDataset]="systemDataset()"
+        ></ix-dataset-details-panel>
       </div>
     }
   </div>

diff --git a/src/app/pages/datasets/components/dataset-management/dataset-management.component.spec.ts b/src/app/pages/datasets/components/dataset-management/dataset-management.component.spec.ts
@@ -29,7 +29,9 @@ describe('DatasetsManagementComponent', () => {
     imports: [TreeModule, SearchInput1Component, EmptyComponent],
     providers: [
       mockAuth(),
-      mockWebSocket([mockCall('systemdataset.config', {} as SystemDatasetConfig)]),
+      mockWebSocket([
+        mockCall('systemdataset.config', { pool: 'Second Dataset' } as SystemDatasetConfig),
+      ]),
       mockProvider(DatasetTreeStore, {
         datasets$,
         error$,

diff --git a/src/app/pages/datasets/components/dataset-management/dataset-management.component.ts b/src/app/pages/datasets/components/dataset-management/dataset-management.component.ts
@@ -70,7 +70,7 @@ export class DatasetsManagementComponent implements OnInit, AfterViewInit, OnDes
   selectedDataset$ = this.datasetStore.selectedDataset$;
   @HostBinding('class.details-overlay') showMobileDetails = false;
   isMobileView = false;
-  systemDataset: string;
+  systemDataset = toSignal(this.ws.call('systemdataset.config').pipe(map((config) => config.pool)));
   isLoading = true;
   subscription = new Subscription();
   ixTreeHeaderWidth: number | null = null;
@@ -154,7 +154,6 @@ export class DatasetsManagementComponent implements OnInit, AfterViewInit, OnDes
 
   ngOnInit(): void {
     this.datasetStore.loadDatasets();
-    this.loadSystemDatasetConfig();
     this.setupTree();
     this.listenForRouteChanges();
     this.listenForLoading();
@@ -183,21 +182,6 @@ export class DatasetsManagementComponent implements OnInit, AfterViewInit, OnDes
     }
   }
 
-  loadSystemDatasetConfig(): void {
-    this.ws
-      .call('systemdataset.config')
-      .pipe(
-        map((config) => config.pool),
-        untilDestroyed(this),
-      )
-      .subscribe({
-        next: (systemDataset) => {
-          this.systemDataset = systemDataset;
-        },
-        error: this.handleError,
-      });
-  }
-
   listenForLoading(): void {
     this.isLoading$.pipe(untilDestroyed(this)).subscribe((isLoading) => {
       this.isLoading = isLoading;
@@ -214,7 +198,7 @@ export class DatasetsManagementComponent implements OnInit, AfterViewInit, OnDes
   };
 
   isSystemDataset(dataset: DatasetDetails): boolean {
-    return dataset.name.split('/').length === 1 && this.systemDataset === dataset.name;
+    return dataset.name.split('/').length === 1 && this.systemDataset() === dataset.name;
   }
 
   treeHeaderScrolled(): void {