From: Nizamudeen A <nia@redhat.com>
Date: Tue, 26 Oct 2021 07:46:51 +0000 (+0530)
Subject: mgr/dashboard: Cluster expansion review page minor bug fixes
X-Git-Tag: v16.2.7~52^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f63086df1f1c0b711aad884e4e013638076197e9;p=ceph.git

mgr/dashboard: Cluster expansion review page minor bug fixes

Fix the Total Memory coming up as NaN Undefined
Remove `Add` Button in the Cluster Details table

Fixes: https://tracker.ceph.com/issues/53038
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 81430251edbb07e73155c7b194cfe3d6d60c7905)
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/create-cluster/create-cluster-review.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/create-cluster/create-cluster-review.component.html
index f59cf6baceb5..812598f6ccab 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/create-cluster/create-cluster-review.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/create-cluster/create-cluster-review.component.html
@@ -42,6 +42,7 @@
 <legend i18n
         class="cd-header">Host Details</legend>
 <cd-hosts [hiddenColumns]="['services', 'status']"
+          [hideToolHeader]="true"
           [hideTitle]="true"
           [hideSubmitBtn]="true"
           [hasTableDetails]="false"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/create-cluster/create-cluster-review.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/create-cluster/create-cluster-review.component.ts
index 3e0f44f958a8..8960f399a77e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/create-cluster/create-cluster-review.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/create-cluster/create-cluster-review.component.ts
@@ -73,7 +73,6 @@ export class CreateClusterReviewComponent implements OnInit {
           (this.serviceOccurrences[serviceKey['service_type']] || 0) + 1;
         this.uniqueServices.add(serviceKey['service_type']);
       });
-      this.totalMemory = this.dimlessBinary.transform(this.totalMemory);
 
       this.uniqueServices.forEach((serviceType) => {
         this.hostsCountPerService.push({
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html
index a4d30918cc56..3b310d456502 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html
@@ -13,7 +13,8 @@
                 selectionType="single"
                 [hasDetails]="hasTableDetails"
                 (setExpandedRow)="setExpandedRow($event)"
-                (updateSelection)="updateSelection($event)">
+                (updateSelection)="updateSelection($event)"
+                [toolHeader]="!hideToolHeader">
         <div class="table-actions btn-toolbar">
           <cd-table-actions [permission]="permissions.hosts"
                             [selection]="selection"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts
index fe0b797bd1d7..6026c180242b 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts
@@ -68,6 +68,9 @@ export class HostsComponent extends ListWithDetails implements OnDestroy, OnInit
   @Input()
   hasTableDetails = true;
 
+  @Input()
+  hideToolHeader = false;
+
   @Input()
   showGeneralActionsOnly = false;