From 81430251edbb07e73155c7b194cfe3d6d60c7905 Mon Sep 17 00:00:00 2001
From: Nizamudeen A <nia@redhat.com>
Date: Tue, 26 Oct 2021 13:16:51 +0530
Subject: [PATCH] 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>
---
 .../create-cluster/create-cluster-review.component.html        | 1 +
 .../cluster/create-cluster/create-cluster-review.component.ts  | 1 -
 .../frontend/src/app/ceph/cluster/hosts/hosts.component.html   | 3 ++-
 .../frontend/src/app/ceph/cluster/hosts/hosts.component.ts     | 3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)

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 f59cf6baceb51..812598f6ccab0 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 3e0f44f958a83..8960f399a77eb 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 a4d30918cc562..3b310d4565027 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 fe0b797bd1d7c..6026c180242bc 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;
 
-- 
2.47.3