From: Kiefer Chang <kiefer.chang@suse.com>
Date: Wed, 2 Dec 2020 06:11:43 +0000 (+0800)
Subject: mgr/dashboard: fix the exception when displaying OSD preview modal
X-Git-Tag: v16.1.0~301^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d965b85c91e7f80916ea50d1d39f405723bcb176;p=ceph.git

mgr/dashboard: fix the exception when displaying OSD preview modal

Adapt changes in https://github.com/ceph/ceph/pull/37994.
- The preview button should not spin.
- The preview button should be enabled again after destroying the
  preview modal.

Fixes: https://tracker.ceph.com/issues/48421
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.html
index 8907b161605e..0f1a5de6dee8 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.html
@@ -122,7 +122,8 @@
         </fieldset>
       </div>
       <div class="card-footer">
-        <cd-form-button-panel (submitActionEvent)="submit()"
+        <cd-form-button-panel #previewButtonPanel
+                              (submitActionEvent)="submit()"
                               [form]="form"
                               [disabled]="dataDeviceSelectionGroups.devices.length === 0"
                               [submitText]="actionLabels.PREVIEW"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts
index 71bec7adfc1e..1421c9277a35 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts
@@ -6,7 +6,7 @@ import _ from 'lodash';
 
 import { InventoryDevice } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-device.model';
 import { OrchestratorService } from '~/app/shared/api/orchestrator.service';
-import { SubmitButtonComponent } from '~/app/shared/components/submit-button/submit-button.component';
+import { FormButtonPanelComponent } from '~/app/shared/components/form-button-panel/form-button-panel.component';
 import { ActionLabelsI18n } from '~/app/shared/constants/app.constants';
 import { Icons } from '~/app/shared/enum/icons.enum';
 import { CdForm } from '~/app/shared/forms/cd-form';
@@ -36,8 +36,8 @@ export class OsdFormComponent extends CdForm implements OnInit {
   @ViewChild('dbDeviceSelectionGroups')
   dbDeviceSelectionGroups: OsdDevicesSelectionGroupsComponent;
 
-  @ViewChild('previewButton')
-  previewButton: SubmitButtonComponent;
+  @ViewChild('previewButtonPanel')
+  previewButtonPanel: FormButtonPanelComponent;
 
   icons = Icons;
 
@@ -209,6 +209,6 @@ export class OsdFormComponent extends CdForm implements OnInit {
     modalRef.componentInstance.submitAction.subscribe(() => {
       this.router.navigate(['/osd']);
     });
-    this.previewButton.loading = false;
+    this.previewButtonPanel.submitButton.loading = false;
   }
 }
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-button-panel/form-button-panel.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-button-panel/form-button-panel.component.ts
index 7684d1915632..0d48f63c05b6 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-button-panel/form-button-panel.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-button-panel/form-button-panel.component.ts
@@ -1,9 +1,10 @@
 import { Location } from '@angular/common';
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
 import { FormGroup, NgForm } from '@angular/forms';
 
 import { ActionLabelsI18n } from '~/app/shared/constants/app.constants';
 import { ModalService } from '~/app/shared/services/modal.service';
+import { SubmitButtonComponent } from '../submit-button/submit-button.component';
 
 @Component({
   selector: 'cd-form-button-panel',
@@ -11,6 +12,9 @@ import { ModalService } from '~/app/shared/services/modal.service';
   styleUrls: ['./form-button-panel.component.scss']
 })
 export class FormButtonPanelComponent {
+  @ViewChild(SubmitButtonComponent)
+  submitButton: SubmitButtonComponent;
+
   @Output()
   submitActionEvent = new EventEmitter();
   @Output()