mgr/dashboard: Save button doesn't prevent saving an invalid form

Fixes: http://tracker.ceph.com/issues/36426
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
index ea467161a3089b319ccd42357a64868132aa455f..e2025fc33c17ec4cead261880fb82d70f9fd260a 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
@@ -101,7 +101,7 @@
         </div>
 
         <!-- Values -->
-        <div class="col-sm-12">
+        <div class="col-sm-12" formGroupName="values">
           <h2 i18n
               class="page-header">Values</h2>
           <div class="row" *ngFor="let section of availSections">

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts
index 53e059ffbe0c4a5a528202afbfa912b65c51bab3..b383eaa00270ae9fa8f3739fc9956db00776a022 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts
@@ -49,7 +49,7 @@ export class ConfigurationFormComponent implements OnInit {
     };
 
     this.availSections.forEach((section) => {
-      formControls.values.controls[section] = new FormControl(null);
+      formControls.values.addControl(section, new FormControl(null));
     });
 
     this.configForm = new CdFormGroup(formControls);