From c893e467c57582de7410bb1f309355aa82466235 Mon Sep 17 00:00:00 2001 From: kialam Date: Thu, 19 Jul 2018 14:27:13 -0400 Subject: [PATCH 1/2] Send emit message sooner from `prompt` controller --- awx/ui/client/src/templates/prompt/prompt.controller.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/awx/ui/client/src/templates/prompt/prompt.controller.js b/awx/ui/client/src/templates/prompt/prompt.controller.js index a849e8b873..1c5c33a6c5 100644 --- a/awx/ui/client/src/templates/prompt/prompt.controller.js +++ b/awx/ui/client/src/templates/prompt/prompt.controller.js @@ -20,6 +20,7 @@ export default [ 'Rest', 'GetBasePath', 'ProcessErrors', 'CredentialTypeModel', vm.actionButtonClicked = false; if(vm.promptData && vm.promptData.triggerModalOpen) { + scope.$emit('launchModalOpen', true); vm.promptDataClone = _.cloneDeep(vm.promptData); vm.steps = { @@ -193,8 +194,6 @@ export default [ 'Rest', 'GetBasePath', 'ProcessErrors', 'CredentialTypeModel', modal.onClose = () => { scope.$emit('launchModalOpen', false); }; - - scope.$emit('launchModalOpen', true); }) .catch(({data, status}) => { ProcessErrors(scope, data, status, null, { From eabdda92b373b6b5d8134d396d04121cc314aa13 Mon Sep 17 00:00:00 2001 From: kialam Date: Thu, 19 Jul 2018 14:29:30 -0400 Subject: [PATCH 2/2] Show "working" message before view refresh --- awx/ui/client/features/templates/templatesList.controller.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/features/templates/templatesList.controller.js b/awx/ui/client/features/templates/templatesList.controller.js index f2058d0376..ec964e7778 100644 --- a/awx/ui/client/features/templates/templatesList.controller.js +++ b/awx/ui/client/features/templates/templatesList.controller.js @@ -180,12 +180,14 @@ function ListTemplatesController( }; function refreshTemplates() { + Wait('start'); let path = GetBasePath('unified_job_templates'); qs.search(path, $state.params.template_search) .then(function(searchResponse) { vm.dataset = searchResponse.data; vm.templates = vm.dataset.results; - }); + }) + .finally(() => Wait('stop')); } function createErrorHandler(path, action) {