Merge pull request #43661 from rhcs-dashboard/review-page-fix

mgr/dashboard: Cluster expansion review page minor bug fixes Reviewed-by: Alfonso Martínez <almartin@redhat.com> Reviewed-by: Avan Thakkar <athakkar@redhat.com> Reviewed-by: Nizamudeen A <nia@redhat.com> Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
ceph · Oct 27, 2021 · b03183b · b03183b
2 parents 2bce57f + 8143025
commit b03183b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/...shboard/frontend/src/app/ceph/cluster/create-cluster/create-cluster-review.component.html b/...shboard/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/...dashboard/frontend/src/app/ceph/cluster/create-cluster/create-cluster-review.component.ts b/...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
@@ -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
@@ -68,6 +68,9 @@ export class HostsComponent extends ListWithDetails implements OnDestroy, OnInit
   @Input()
   hasTableDetails = true;
 
+  @Input()
+  hideToolHeader = false;
+
   @Input()
   showGeneralActionsOnly = false;