mgr/dashboard: do a little clean-up of the component

- order component methods alphabetically
- add missing newline
- uncheck checkbox and clear validations if a new profile has been choosen

Signed-off-by: Tatjana Dehler <tdehler@suse.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html
index 79dc580a7563f97046c56c63e9f4f53e341ec574..884a1c56daef114911ea4309307ac37c8a3cb5e8 100755 (executable)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html
@@ -45,6 +45,7 @@
             </div>
           </div>
         </div>
+
         <!-- Priority values -->
         <div class="form-group" *ngFor="let attr of priorityAttrs | keyvalue"
              [ngClass]="{'has-error': osdRecvSpeedForm.getValue('customizePriority') &&

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts
index b8fd4897b29bc95bf741a4d8722c1f93cf8855ce..860ad1bcf331d38fc5da4856a075ef9fff529e41 100755 (executable)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts
@@ -94,6 +94,27 @@ export class OsdRecvSpeedModalComponent implements OnInit {
       });
   }
 
+  getStoredPriority(configOptionValues: any, callbackFn: Function) {
+    const priority = _.find(this.priorities, (p) => {
+      return _.isEqual(p.values, configOptionValues);
+    });
+
+    this.osdRecvSpeedForm.controls.customizePriority.setValue(false);
+
+    if (priority) {
+      return callbackFn(priority);
+    }
+
+    if (Object.entries(configOptionValues).length === 4) {
+      this.osdRecvSpeedForm.controls.customizePriority.setValue(true);
+      return callbackFn(
+        Object({ name: 'custom', text: this.i18n('Custom'), values: configOptionValues })
+      );
+    }
+
+    return callbackFn(this.priorities[0]);
+  }
+
   setDescription(configOptions: Array<any>) {
     configOptions.forEach((configOption) => {
       if (configOption.desc !== '') {
@@ -136,37 +157,18 @@ export class OsdRecvSpeedModalComponent implements OnInit {
       };
       this.setPriority(customPriority);
     } else {
+      Object.keys(this.priorityAttrs).forEach((configOptionName) => {
+        this.osdRecvSpeedForm.get(configOptionName).reset();
+      });
       this.setPriority(this.priorities[0]);
     }
   }
 
-  getStoredPriority(configOptionValues: any, callbackFn: Function) {
-    const priority = _.find(this.priorities, (p) => {
-      return _.isEqual(p.values, configOptionValues);
-    });
-
-    this.osdRecvSpeedForm.controls.customizePriority.setValue(false);
-
-    if (priority) {
-      return callbackFn(priority);
-    }
-
-    if (Object.entries(configOptionValues).length === 4) {
-      this.osdRecvSpeedForm.controls.customizePriority.setValue(true);
-      return callbackFn(
-        Object({ name: 'custom', text: this.i18n('Custom'), values: configOptionValues })
-      );
-    }
-
-    return callbackFn(this.priorities[0]);
-  }
-
   onPriorityChange(selectedPriorityName) {
     const selectedPriority =
       _.find(this.priorities, (p) => {
         return p.name === selectedPriorityName;
       }) || this.priorities[0];
-
     this.setPriority(selectedPriority);
   }
 

diff --git a/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf b/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf
index 021d07415851bf9952418b0601481e5b86a8713a..8c73162c6732df58a0adb280c36b21a8c65f0bef 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf
+++ b/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf
@@ -863,7 +863,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">79</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.html</context>
@@ -919,7 +919,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">75</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.html</context>
@@ -951,7 +951,7 @@
         <source>This field is required!</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">67</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html</context>