Merge pull request #6291 from himdel/bz1744413

DialogUser - use DialogData.outputConversion before submit and refresh
ManageIQ · Nov 4, 2019 · c5c9ebd · c5c9ebd
2 parents 966a6c6 + d46b0ad
commit c5c9ebd
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 25 deletions.
diff --git a/app/assets/javascripts/controllers/dialog_user/dialog_user_controller.js b/app/assets/javascripts/controllers/dialog_user/dialog_user_controller.js
@@ -1,4 +1,4 @@
-ManageIQ.angular.app.controller('dialogUserController', ['API', 'dialogFieldRefreshService', 'miqService', 'dialogUserSubmitErrorHandlerService', 'dialogId', 'apiSubmitEndpoint', 'apiAction', 'finishSubmitEndpoint', 'cancelEndpoint', 'resourceActionId', 'targetId', 'targetType', 'realTargetType', 'openUrl', '$http', '$window', 'dialogReplaceData', function(API, dialogFieldRefreshService, miqService, dialogUserSubmitErrorHandlerService, dialogId, apiSubmitEndpoint, apiAction, finishSubmitEndpoint, cancelEndpoint, resourceActionId, targetId, targetType, realTargetType, openUrl, $http, $window, dialogReplaceData) {
+ManageIQ.angular.app.controller('dialogUserController', ['API', 'dialogFieldRefreshService', 'miqService', 'dialogUserSubmitErrorHandlerService', 'dialogId', 'apiSubmitEndpoint', 'apiAction', 'finishSubmitEndpoint', 'cancelEndpoint', 'resourceActionId', 'targetId', 'targetType', 'realTargetType', 'openUrl', '$http', '$window', 'dialogReplaceData', 'DialogData', function(API, dialogFieldRefreshService, miqService, dialogUserSubmitErrorHandlerService, dialogId, apiSubmitEndpoint, apiAction, finishSubmitEndpoint, cancelEndpoint, resourceActionId, targetId, targetType, realTargetType, openUrl, $http, $window, dialogReplaceData, DialogData) {
   var vm = this;
 
   vm.$onInit = function() {
@@ -68,14 +68,14 @@ ManageIQ.angular.app.controller('dialogUserController', ['API', 'dialogFieldRefr
   function submitButtonClicked() {
     vm.dialogData.action = apiAction;
     miqService.sparkleOn();
-    var apiData;
+
+    var apiData = DialogData.outputConversion(vm.dialogData);
     if (apiSubmitEndpoint.match(/generic_objects/)) {
-      apiData = {action: apiAction, parameters: _.omit(vm.dialogData, 'action')};
+      apiData = {action: apiAction, parameters: _.omit(apiData, 'action')};
     } else if (apiAction === 'reconfigure') {
-      apiData = {action: apiAction, resource: _.omit(vm.dialogData, 'action')};
-    } else {
-      apiData = vm.dialogData;
+      apiData = {action: apiAction, resource: _.omit(apiData, 'action')};
     }
+
     return API.post(apiSubmitEndpoint, apiData, {skipErrors: [400]})
       .then(function(response) {
 

diff --git a/app/assets/javascripts/controllers/dialog_user/dialog_user_reconfigure_controller.js b/app/assets/javascripts/controllers/dialog_user/dialog_user_reconfigure_controller.js
@@ -1,4 +1,4 @@
-ManageIQ.angular.app.controller('dialogUserReconfigureController', ['API', 'dialogFieldRefreshService', 'miqService', 'dialogUserSubmitErrorHandlerService', 'resourceActionId', 'targetId', function(API, dialogFieldRefreshService, miqService, dialogUserSubmitErrorHandlerService, resourceActionId, targetId) {
+ManageIQ.angular.app.controller('dialogUserReconfigureController', ['API', 'dialogFieldRefreshService', 'miqService', 'dialogUserSubmitErrorHandlerService', 'resourceActionId', 'targetId', 'DialogData', function(API, dialogFieldRefreshService, miqService, dialogUserSubmitErrorHandlerService, resourceActionId, targetId, DialogData) {
   var vm = this;
 
   vm.$onInit = function() {
@@ -46,7 +46,10 @@ ManageIQ.angular.app.controller('dialogUserReconfigureController', ['API', 'dial
   function submitButtonClicked() {
     miqService.sparkleOn();
 
-    var apiData = {action: 'reconfigure', resource: _.omit(vm.dialogData, 'action')};
+    var apiData = {
+      action: 'reconfigure',
+      resource: _.omit(DialogData.outputConversion(vm.dialogData), 'action'),
+    };
     var apiSubmitEndpoint = '/api/services/' + targetId;
 
     return API.post(apiSubmitEndpoint, apiData, {skipErrors: [400]}).then(function() {

diff --git a/app/assets/javascripts/services/dialog_field_refresh_service.js b/app/assets/javascripts/services/dialog_field_refresh_service.js
@@ -1,25 +1,29 @@
-ManageIQ.angular.app.service('dialogFieldRefreshService', ['API', function(API) {
-  this.refreshField = function(dialogData, dialogField, url, idList) {
-    this.areFieldsBeingRefreshed = true;
-    var data = angular.toJson({
+ManageIQ.angular.app.service('dialogFieldRefreshService', ['API', 'DialogData', function(API, DialogData) {
+  var self = this;
+
+  self.refreshField = function(dialogData, dialogField, url, idList) {
+    self.areFieldsBeingRefreshed = true;
+
+    var data = {
       action: 'refresh_dialog_fields',
       resource: {
-        dialog_fields: dialogData,
+        dialog_fields: DialogData.outputConversion(dialogData),
         fields: dialogField,
         resource_action_id: idList.resourceActionId,
         target_id: idList.targetId,
         target_type: idList.targetType,
         real_target_type: idList.realTargetType,
       },
-    });
+    };
 
-    return new Promise(function(resolve) {
-      API.post(url + idList.dialogId, data).then(function(response) {
-        resolve(response.result[dialogField]);
+    return API.post(url + idList.dialogId, angular.toJson(data))
+      .then(function(response) {
+        // FIXME: API requests don't actually count towards $.active
         if ($.active < 1) {
-          this.areFieldsBeingRefreshed = false;
+          self.areFieldsBeingRefreshed = false;
         }
-      }.bind(this));
-    }.bind(this));
+
+        return response.result[dialogField];
+      });
   };
 }]);
diff --git a/spec/javascripts/controllers/dialog_user/dialog_user_controller_spec.js b/spec/javascripts/controllers/dialog_user/dialog_user_controller_spec.js
@@ -7,7 +7,8 @@ describe('dialogUserController', function() {
                              _API_,
                              _dialogFieldRefreshService_,
                              _dialogUserSubmitErrorHandlerService_,
-                             _miqService_) {
+                             _miqService_,
+                             DialogData) {
     API = _API_;
     dialogFieldRefreshService = _dialogFieldRefreshService_;
     dialogUserSubmitErrorHandlerService = _dialogUserSubmitErrorHandlerService_;
@@ -44,6 +45,10 @@ describe('dialogUserController', function() {
       openUrl: false,
       dialogReplaceData: null,
     });
+
+    DialogData.data = {
+      fields: {},
+    };
   }));
 
   describe('$onInit', function() {

diff --git a/spec/javascripts/services/dialog_field_refresh_service_spec.js b/spec/javascripts/services/dialog_field_refresh_service_spec.js
@@ -3,7 +3,7 @@ describe('dialogFieldRefreshService', function() {
 
   beforeEach(module('ManageIQ'));
 
-  beforeEach(inject(function(dialogFieldRefreshService, _API_) {
+  beforeEach(inject(function(dialogFieldRefreshService, _API_, DialogData) {
     testDialogFieldRefreshService = dialogFieldRefreshService;
     API = _API_;
 
@@ -14,12 +14,16 @@ describe('dialogFieldRefreshService', function() {
     };
 
     spyOn(API, 'post').and.callFake(function() {
-      return {then: function(response) { response(responseResult); }};
+      return Promise.resolve(responseResult);
     });
+
+    DialogData.data = {
+      fields: {},
+    };
   }));
 
   describe('#refreshField', function() {
-    var data = 'the data';
+    var data = { "the field": "data1" };
     var field = 'the field';
     var url = 'url';
     var idList = {
@@ -49,7 +53,7 @@ describe('dialogFieldRefreshService', function() {
       var requestData = {
         action: 'refresh_dialog_fields',
         resource: {
-          dialog_fields: 'the data',
+          dialog_fields: data,
           fields: 'the field',
           resource_action_id: '321',
           target_id: '456',