mgr/dashboard: Cleanup OSD components

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html
index eadca94e47a8577b93888cab44fc916acabc8701..1264bad635496ac0331d4a8cd6288688ee56b63e 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html
@@ -6,7 +6,7 @@
   </tab>
   <tab heading="Metadata">
     <cd-table-key-value *ngIf="osd.loaded && osd.details.osd_metadata; else noMetaData"
-                        (fetchData)="osd.autoRefresh()"
+                        (fetchData)="refresh()"
                         [data]="osd.details.osd_metadata">
     </cd-table-key-value>
     <ng-template #noMetaData>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts
index 07c969a1b2dda5a502446126884d2600cc4aff68..d4ace9fb3775a93e15e473bd36488ef380c5acb5 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts
@@ -24,9 +24,6 @@ export class OsdDetailsComponent implements OnChanges {
     };
     if (this.selection.hasSelection) {
       this.osd = this.selection.first();
-      this.osd.autoRefresh = () => {
-        this.refresh();
-      };
       this.refresh();
     }
   }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts
index fce5b2c310b87ff3f6a41b2c25e1287306c9cd49..ee549602aec49357e54bcb42480252d10a700540 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts
@@ -34,6 +34,13 @@ export class OsdListComponent implements OnInit {
   columns: CdTableColumn[];
   selection = new CdTableSelection();
 
+  protected static collectStates(osd) {
+    return [
+      osd['in'] ? 'in' : 'out',
+      osd['up'] ? 'up' : 'out',
+    ];
+  }
+
   constructor(
     private authStorageService: AuthStorageService,
     private osdService: OsdService,
@@ -87,7 +94,7 @@ export class OsdListComponent implements OnInit {
     this.osdService.getList().subscribe((data: any[]) => {
       this.osds = data;
       data.map((osd) => {
-        osd.collectedStates = this.collectStates(osd);
+        osd.collectedStates = OsdListComponent.collectStates(osd);
         osd.stats_history.out_bytes = osd.stats_history.op_out_bytes.map((i) => i[1]);
         osd.stats_history.in_bytes = osd.stats_history.op_in_bytes.map((i) => i[1]);
         osd.cdIsBinary = true;
@@ -96,15 +103,6 @@ export class OsdListComponent implements OnInit {
     });
   }
 
-  collectStates(osd) {
-    const select = (onState, offState) => (osd[onState] ? onState : offState);
-    return [select('up', 'down'), select('in', 'out')];
-  }
-
-  beforeShowDetails(selection: CdTableSelection) {
-    return selection.hasSingleSelection;
-  }
-
   scrubAction(deep) {
     if (!this.tableComponent.selection.hasSelection) {
       return;