mgr/dashboard: fix the missing injectors for child formgroup tpl

Fixes: https://tracker.ceph.com/issues/75657
Signed-off-by: Nizamudeen A <nia@redhat.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-list/cephfs-subvolume-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-list/cephfs-subvolume-list.component.html
index afc8172b7775daa1d50e01168419f724872f736f..4cec98e31c6bb87b47d295dc9dbb5a6c17f2b73b 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-list/cephfs-subvolume-list.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-list/cephfs-subvolume-list.component.html
@@ -89,20 +89,19 @@
                       type="error">
               {{errorMessage}}
       </cd-alert-panel>
-      <div class="form-group">
-        <div class="custom-control custom-checkbox">
-          <input type="checkbox"
-                 class="custom-control-input"
-                 name="retainSnapshots"
-                 id="retainSnapshots"
-                 formControlName="retainSnapshots">
-          <label class="custom-control-label"
-                 for="retainSnapshots"
-                 i18n>Retain snapshots <cd-helper>The subvolume can be removed retaining
+      <div class="form-item cds-pt-3">
+        <cds-checkbox id="retainSnapshots"
+                      formControlName="retainSnapshots"
+                      autofocus
+                      [required]="true"
+                      modal-primary-focus
+                      ariaLabel="confirmation"
+                      i18n>Retain snapshots
+          <cd-help-text>The subvolume can be removed retaining
                   existing snapshots using this option.
                    If snapshots are retained, the subvolume is considered empty for all
-                    operations not involving the retained snapshots.</cd-helper></label>
-        </div>
+                    operations not involving the retained snapshots.</cd-help-text>
+        </cds-checkbox>
       </div>
     </ng-container>
   </ng-container>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
index 70c91b26e26ada6067bcb34735dd653898d1b887..bbb6449fc6a3597c0c2d09c54667609dabfe26ab 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
@@ -144,17 +144,12 @@
              let-form="form">
   <ng-container [formGroup]="form">
     <ng-container formGroupName="child">
-      <div class="form-group">
-        <div class="custom-control custom-checkbox">
-          <input type="checkbox"
-                 class="custom-control-input"
-                 name="preserve"
-                 id="preserve"
-                 formControlName="preserve">
-          <label class="custom-control-label"
-                 for="preserve"
-                 i18n>Preserve OSD ID(s) for replacement.</label>
-        </div>
+      <div class="form-item cds-pt-3">
+        <cds-checkbox id="preserve"
+                      formControlName="preserve"
+                      modal-primary-focus
+                      ariaLabel="preserve"
+                      i18n>Preserve OSD ID(s) for replacement.</cds-checkbox>
       </div>
     </ng-container>
   </ng-container>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.ts
index 4b34d02a10ff490f0d4df66bed5347fed2024761..9ba8adc9310fee0d291552b3835cb9a51c42d2bb 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.ts
@@ -21,8 +21,6 @@ export class DeleteConfirmationModalComponent extends BaseModal implements OnIni
   submitButton: SubmitButtonComponent;
   deletionForm: CdFormGroup;
   impactEnum = DeletionImpact;
-  childFormGroup: CdFormGroup;
-  childFormGroupTemplate: TemplateRef<any>;
   submitDisabled$: Observable<boolean> = of(false);
   constructor(
     @Optional() @Inject('impact') public impact: DeletionImpact,
@@ -43,7 +41,9 @@ export class DeleteConfirmationModalComponent extends BaseModal implements OnIni
     @Optional()
     @Inject('callBackAtionObservable')
     public callBackAtionObservable?: () => Observable<any>,
-    @Optional() @Inject('hideDefaultWarning') public hideDefaultWarning?: boolean
+    @Optional() @Inject('hideDefaultWarning') public hideDefaultWarning?: boolean,
+    @Optional() @Inject('childFormGroup') public childFormGroup?: CdFormGroup,
+    @Optional() @Inject('childFormGroupTemplate') public childFormGroupTemplate?: TemplateRef<any>
   ) {
     super();
     this.actionDescription = actionDescription || 'delete';