Merge pull request #491 from jeffibm/fix-refresh-in-progress

Disable all fields when a refresh action is in progress

Author: Fryguy

src/dialog-user/components/dialog-user/dialog.html

@@ -13,7 +13,7 @@ <h2 translate>No Provisioning Dialog Available.</h2>
               </div>
               <div class="panel-body">
                 <div ng-repeat="field in buttonGroup.dialog_fields">
-                  <dialog-field on-update="vm.updateDialogField(dialogFieldName, value)" single-refresh="vm.refreshSingleField(field)" field="vm.dialogFields[field.name]" input-disabled="vm.inputDisabled" reconfigure-mode="vm.reconfigureMode"></dialog-field>
+                  <dialog-field on-update="vm.updateDialogField(dialogFieldName, value)" single-refresh="vm.refreshSingleField(field)" field="vm.dialogFields[field.name]" input-disabled="vm.inputDisabled" reconfigure-mode="vm.reconfigureMode" are-fields-being-refreshed="vm.areFieldsBeingRefreshed"></dialog-field>
                 </div>
               </div>
             </div>

src/dialog-user/components/dialog-user/dialogField.html

@@ -15,7 +15,7 @@
   <div ng-switch on="vm.dialogField.type">
     <div class="col-sm-4" ng-switch-when="DialogFieldTextBox">
       <input ng-model="vm.dialogField.default_value"
-             ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
+             ng-disabled="vm.isFieldDisabled()"
              ng-change="vm.changesHappened()"
              ng-model-options="{debounce: {'default': 500}}"
              class="form-control"
@@ -29,7 +29,7 @@
 
     <div class="col-sm-8" ng-switch-when="DialogFieldTextAreaBox">
       <textarea ng-model="vm.dialogField.default_value"
-                ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
+                ng-disabled="vm.isFieldDisabled()"
                 ng-change="vm.changesHappened()"
                 ng-model-options="{debounce: {'default': 500}}"
                 class="form-control"
@@ -46,7 +46,7 @@
       <input ng-model="vm.dialogField.default_value"
              ng-true-value="'t'"
              ng-false-value="'f'"
-             ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
+             ng-disabled="vm.isFieldDisabled()"
              ng-change="vm.changesHappened()"
              type="checkbox"
              uib-tooltip="{{ ::inputTitle }}"
@@ -62,7 +62,7 @@
               ng-model="vm.dialogField.default_value"
               watch-model="vm.dialogField.values"
               ng-change="vm.changesHappened()"
-              ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
+              ng-disabled="vm.isFieldDisabled()"
               class="form-control"
               data-container="body"
               id="{{ vm.dialogField.name }}"
@@ -77,7 +77,7 @@
               ng-model="vm.dialogField.default_value"
               watch-model="vm.dialogField.values"
               ng-change="vm.changesHappened()"
-              ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
+              ng-disabled="vm.isFieldDisabled()"
               input-id="{{ vm.dialogField.name }}"
               ng-options="value[0] as value[1] for value in vm.dialogField.values"
               miq-options="{ 'data-tokens': value[0] + ' ' + value[1] }"
@@ -92,7 +92,7 @@
               ng-model="vm.dialogField.default_value"
               watch-model="vm.dialogField.values"
               ng-change="vm.changesHappened()"
-              ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
+              ng-disabled="vm.isFieldDisabled()"
               class="form-control"
               data-container="body"
               id="{{ vm.dialogField.name }}"
@@ -105,7 +105,7 @@
               ng-model="vm.dialogField.default_value"
               watch-model="vm.dialogField.values"
               ng-change="vm.changesHappened()"
-              ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
+              ng-disabled="vm.isFieldDisabled()"
               class="form-control"
               id="{{ vm.dialogField.name }}"
               ng-options="fieldValue.id as fieldValue.description for fieldValue in vm.dialogField.values"
@@ -125,7 +125,7 @@
           <input type="radio"
                  ng-model="vm.dialogField.default_value"
                  ng-change="vm.changesHappened()"
-                 ng-disabled="vm.dialogField.read_only || vm.inputDisabled || vm.dialogField.disabled"
+                 ng-disabled="vm.isFieldDisabled()"
                  name="{{ vm.dialogField.name }}"
                  value="{{ ::fieldValue[0] }}"
                  id="{{ vm.dialogField.name }}"/>

src/dialog-user/components/dialog-user/dialogField.ts

@@ -20,6 +20,7 @@ export class DialogFieldController {
   public validation: any;
   public minDate: any;
   public clonedDialogField: any;
+  public areFieldsBeingRefreshed: boolean;
 
   /* @ngInject */
   constructor(DialogData: any) {
@@ -87,13 +88,15 @@ export class DialogFieldController {
    * @function changesHappened
    */
   public changesHappened() {
-    this.validateField();
-
-    const field = this.dialogField;
-    this.onUpdate({
-      dialogFieldName: field.name,
-      value: field.default_value,
-    });
+    if (!this.areFieldsBeingRefreshed) {
+      this.validateField();
+
+      const field = this.dialogField;
+      this.onUpdate({
+        dialogFieldName: field.name,
+        value: field.default_value,
+      });
+    }
   }
 
   /**
@@ -138,6 +141,10 @@ export class DialogFieldController {
   public refreshSingleField() {
     this.singleRefresh({ field: this.field.name });
   }
+
+  public isFieldDisabled() {
+    return this.areFieldsBeingRefreshed || this.dialogField.read_only || this.inputDisabled || this.dialogField.disabled;
+  }
 }
 
 export default class DialogField {
@@ -151,6 +158,7 @@ export default class DialogField {
     singleRefresh: '&',
     options: '=?',
     inputDisabled: '=?',
-    reconfigureMode: '<'
+    reconfigureMode: '<',
+    areFieldsBeingRefreshed: '<',
   };
 }

src/dialog-user/components/dialog-user/dialogUser.ts

@@ -294,6 +294,7 @@ export default class DialogUser {
     refreshField: '&',
     onUpdate: '&',
     inputDisabled: '=?',
-    reconfigureMode: '<'
+    reconfigureMode: '<',
+    areFieldsBeingRefreshed: '<',
   };
 }