diff --git a/awx/ui/client/src/access/permissions-list.controller.js b/awx/ui/client/src/access/permissions-list.controller.js index f36ee5fa64..3e190625ba 100644 --- a/awx/ui/client/src/access/permissions-list.controller.js +++ b/awx/ui/client/src/access/permissions-list.controller.js @@ -21,7 +21,7 @@ export default ['$scope', 'ListDefinition', 'Dataset', 'Wait', 'Rest', 'ProcessE Wait('start'); Rest.setUrl(url); Rest.post({ "disassociate": true, "id": Number(userId) }) - .success(function() { + .then(() => { Wait('stop'); $state.go('.', null, {reload: true}); }) @@ -54,7 +54,7 @@ export default ['$scope', 'ListDefinition', 'Dataset', 'Wait', 'Rest', 'ProcessE Wait('start'); Rest.setUrl(url); Rest.post({ "disassociate": true, "id": teamId }) - .success(function() { + .then(() => { Wait('stop'); $state.go('.', null, {reload: true}); }) diff --git a/awx/ui/client/src/access/rbac-role-column/roleList.directive.js b/awx/ui/client/src/access/rbac-role-column/roleList.directive.js index ec3b79754d..4f750ee1b5 100644 --- a/awx/ui/client/src/access/rbac-role-column/roleList.directive.js +++ b/awx/ui/client/src/access/rbac-role-column/roleList.directive.js @@ -53,7 +53,7 @@ export default Rest.setUrl(url); Rest.post({ "disassociate": true, "id": entry.id }) - .success(function() { + .then(() => { Wait('stop'); $state.go('.', null, { reload: true }); }) diff --git a/awx/ui/client/src/configuration/configuration.service.js b/awx/ui/client/src/configuration/configuration.service.js index a26b0996a4..d4ec6a7da2 100644 --- a/awx/ui/client/src/configuration/configuration.service.js +++ b/awx/ui/client/src/configuration/configuration.service.js @@ -15,7 +15,7 @@ export default ['$rootScope', 'GetBasePath', 'ProcessErrors', '$q', '$http', 'Re Rest.setUrl(url); Rest.options() - .success(function(data) { + .then(({data}) => { // Compare GET actions with PUT actions and flag discrepancies // for disabling in the UI var getActions = data.actions.GET; @@ -47,7 +47,7 @@ export default ['$rootScope', 'GetBasePath', 'ProcessErrors', '$q', '$http', 'Re Rest.setUrl(url); Rest.patch(body) - .success(function(data) { + .then(({data}) => { deferred.resolve(data); }) .error(function(error) { @@ -61,7 +61,7 @@ export default ['$rootScope', 'GetBasePath', 'ProcessErrors', '$q', '$http', 'Re var deferred = $q.defer(); Rest.setUrl(url); Rest.get() - .success(function(data) { + .then(({data}) => { deferred.resolve(data); }) .error(function(error) { diff --git a/awx/ui/client/src/credential-types/add/add.controller.js b/awx/ui/client/src/credential-types/add/add.controller.js index bc7e284fd2..0929716d6b 100644 --- a/awx/ui/client/src/credential-types/add/add.controller.js +++ b/awx/ui/client/src/credential-types/add/add.controller.js @@ -99,7 +99,7 @@ export default ['Rest', 'Wait', inputs: inputs, injectors: injectors }) - .success(function(data) { + .then(({data}) => { $state.go('credentialTypes.edit', { credential_type_id: data.id }, { reload: true }); Wait('stop'); }) diff --git a/awx/ui/client/src/credential-types/edit/edit.controller.js b/awx/ui/client/src/credential-types/edit/edit.controller.js index 42cd0ebadd..95266cec78 100644 --- a/awx/ui/client/src/credential-types/edit/edit.controller.js +++ b/awx/ui/client/src/credential-types/edit/edit.controller.js @@ -173,7 +173,7 @@ export default ['Rest', 'Wait', inputs: inputs, injectors: injectors }) - .success(function() { + .then(() => { $state.go($state.current, null, { reload: true }); Wait('stop'); }) diff --git a/awx/ui/client/src/credential-types/list/list.controller.js b/awx/ui/client/src/credential-types/list/list.controller.js index 912a8b01a9..3a14a33513 100644 --- a/awx/ui/client/src/credential-types/list/list.controller.js +++ b/awx/ui/client/src/credential-types/list/list.controller.js @@ -60,7 +60,7 @@ export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList', var url = defaultUrl + id + '/'; Rest.setUrl(url); Rest.destroy() - .success(function() { + .then(() => { let reloadListStateParams = null; diff --git a/awx/ui/client/src/credentials/factories/credential-form-save.factory.js b/awx/ui/client/src/credentials/factories/credential-form-save.factory.js index ec47648497..496a95e3ae 100644 --- a/awx/ui/client/src/credentials/factories/credential-form-save.factory.js +++ b/awx/ui/client/src/credentials/factories/credential-form-save.factory.js @@ -51,7 +51,7 @@ export default url = GetBasePath("credentials"); Rest.setUrl(url); Rest.post(data) - .success(function (data) { + .then(({data}) => { scope.addedItem = data.id; Wait('stop'); @@ -83,7 +83,7 @@ export default url = GetBasePath('credentials') + scope.id + '/'; Rest.setUrl(url); Rest.put(data) - .success(function () { + .then(() => { Wait('stop'); $state.go($state.current, {}, {reload: true}); }) diff --git a/awx/ui/client/src/credentials/list/credentials-list.controller.js b/awx/ui/client/src/credentials/list/credentials-list.controller.js index 924f58e367..e006b76fe2 100644 --- a/awx/ui/client/src/credentials/list/credentials-list.controller.js +++ b/awx/ui/client/src/credentials/list/credentials-list.controller.js @@ -85,7 +85,7 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ProcessErrors', ' var url = defaultUrl + id + '/'; Rest.setUrl(url); Rest.destroy() - .success(function() { + .then(() => { let reloadListStateParams = null; diff --git a/awx/ui/client/src/home/home.controller.js b/awx/ui/client/src/home/home.controller.js index 3b70235c84..57e53d208f 100644 --- a/awx/ui/client/src/home/home.controller.js +++ b/awx/ui/client/src/home/home.controller.js @@ -14,7 +14,7 @@ export default ['$scope', '$rootScope','Wait', $scope.$on('ws-jobs', function () { Rest.setUrl(GetBasePath('dashboard')); Rest.get() - .success(function (data) { + .then(({data}) => { $scope.dashboardData = data; }) .error(function (data, status) { @@ -23,7 +23,7 @@ export default ['$scope', '$rootScope','Wait', Rest.setUrl(GetBasePath("unified_jobs") + "?order_by=-finished&page_size=5&finished__isnull=false&type=workflow_job,job"); Rest.get() - .success(function (data) { + .then(({data}) => { $scope.dashboardJobsListData = data.results; }) .error(function (data, status) { @@ -32,7 +32,7 @@ export default ['$scope', '$rootScope','Wait', Rest.setUrl(GetBasePath("unified_job_templates") + "?order_by=-last_job_run&page_size=5&last_job_run__isnull=false&type=workflow_job_template,job_template"); Rest.get() - .success(function (data) { + .then(({data}) => { $scope.dashboardJobTemplatesListData = data.results; }) .error(function (data, status) { @@ -90,7 +90,7 @@ export default ['$scope', '$rootScope','Wait', Wait('start'); Rest.setUrl(GetBasePath('dashboard')); Rest.get() - .success(function (data) { + .then(({data}) => { $scope.dashboardData = data; $scope.$emit('dashboardReady', data); }) @@ -99,7 +99,7 @@ export default ['$scope', '$rootScope','Wait', }); Rest.setUrl(GetBasePath("unified_jobs") + "?order_by=-finished&page_size=5&finished__isnull=false&type=workflow_job,job"); Rest.get() - .success(function (data) { + .then(({data}) => { data = data.results; $scope.$emit('dashboardJobsListReady', data); }) @@ -108,7 +108,7 @@ export default ['$scope', '$rootScope','Wait', }); Rest.setUrl(GetBasePath("unified_job_templates") + "?order_by=-last_job_run&page_size=5&last_job_run__isnull=false&type=workflow_job_template,job_template"); Rest.get() - .success(function (data) { + .then(({data}) => { data = data.results; $scope.$emit('dashboardJobTemplatesListReady', data); }) diff --git a/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js index 86534a5871..490d05a7b9 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js @@ -239,7 +239,7 @@ function adhocController($q, $scope, $stateParams, // Launch the adhoc job Rest.setUrl(GetBasePath('inventory') + id + '/ad_hoc_commands/'); Rest.post(data) - .success(function (data) { + .then(({data}) => { Wait('stop'); $state.go('adHocJobStdout', {id: data.id}); }) diff --git a/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.controller.js b/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.controller.js index 8dd449df82..53e56e0163 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.controller.js @@ -10,7 +10,7 @@ export default [ '$scope', 'Empty', 'Wait', 'GetBasePath', 'Rest', 'ProcessError url += "&order_by=-finished&page_size=5"; Rest.setUrl(url); Rest.get() - .success( function(data) { + .then(({data}) => { $scope.generateTable(data, event); }) .error( function(data, status) { diff --git a/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js index f6d8e0534f..76a63dcdd2 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js @@ -85,7 +85,7 @@ function InventoriesList($scope, $('#prompt-modal').modal('hide'); Rest.setUrl(url); Rest.destroy() - .success(function () { + .then(() => { Wait('stop'); }) .error(function (data, status) { diff --git a/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.controller.js b/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.controller.js index 0b32903df8..77303ce704 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.controller.js @@ -6,7 +6,7 @@ export default [ '$scope', 'Wait', 'Empty', 'Rest', 'ProcessErrors', '$state', Wait('start'); Rest.setUrl($scope.inventory.related.inventory_sources + '?order_by=-last_job_run&page_size=5'); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.generateTable(data, event); }) .error(function(data, status) { diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js index e115871c4a..eacda2b133 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js @@ -22,7 +22,7 @@ export default var getNext = function(data, arr, resolve) { Rest.setUrl(data.next); Rest.get() - .success(function (data) { + .then(({data}) => { if (data.next) { getNext(data, arr.concat(data.results), resolve); } else { @@ -35,7 +35,7 @@ export default var seeMoreResolve = $q.defer(); Rest.setUrl(`${scope[scope.$parent.list.iterator].related.groups}?order_by=id`); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.next) { getNext(data, data.results, seeMoreResolve); } else { @@ -65,7 +65,7 @@ export default if(url) { Rest.setUrl(url); Rest.post({"disassociate": true, "id": host.id}) - .success(function () { + .then(() => { Wait('stop'); $state.go('.', null, {reload: true}); }) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js index 248ecbff60..9faa35e62d 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js @@ -36,7 +36,7 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition', Wait('start'); Rest.setUrl(url); Rest.get() - .success(function (data) { + .then(({data}) => { $scope.inventory_files = data; $scope.inventory_files.push("/ (project root)"); sync_inventory_file_select2(); diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js index 4728e2747a..1d4d965be4 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js @@ -116,7 +116,7 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', Wait('start'); Rest.setUrl(url); Rest.get() - .success(function (data) { + .then(({data}) => { $scope.inventory_files = data; $scope.inventory_files.push("/ (project root)"); diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/cancel-source-update.factory.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/cancel-source-update.factory.js index a0fb73e7eb..d89c5fca5e 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/cancel-source-update.factory.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/cancel-source-update.factory.js @@ -16,18 +16,18 @@ export default Wait('start'); Rest.setUrl(inventory_source.url); Rest.get() - .success(function (data) { + .then(({data}) => { // Check that we have access to cancelling an update var url = (data.related.current_update) ? data.related.current_update : data.related.last_update; url += 'cancel/'; Rest.setUrl(url); Rest.get() - .success(function (data) { + .then(({data}) => { if (data.can_cancel) { // Cancel the update process Rest.setUrl(url); Rest.post() - .success(function () { + .then(() => { Wait('stop'); //Alert('Inventory Sync Cancelled', 'Request to cancel the sync process was submitted to the task manger. ' + // 'Click the button to monitor the status.', 'alert-info'); diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-source-type-options.factory.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-source-type-options.factory.js index 659c1c112a..3d98a9ed5e 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-source-type-options.factory.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-source-type-options.factory.js @@ -8,7 +8,7 @@ export default scope[variable] = []; Rest.setUrl(GetBasePath('inventory_sources')); Rest.options() - .success(function (data) { + .then(({data}) => { var i, choices = data.actions.GET.source.choices; for (i = 0; i < choices.length; i++) { if (choices[i][0] !== 'file' && choices[i][0] !== "") { diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/view-update-status.factory.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/view-update-status.factory.js index 5a746aa075..0543681644 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/view-update-status.factory.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/view-update-status.factory.js @@ -13,7 +13,7 @@ export default Wait('start'); Rest.setUrl(inventory_source.url); Rest.get() - .success(function (data) { + .then(({data}) => { // Get the ID from the correct summary field var update_id = (data.summary_fields.current_update) ? data.summary_fields.current_update.id : data.summary_fields.last_update.id; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js index 8ae2d144b7..71bbebdfdb 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js @@ -23,7 +23,7 @@ export default this.url = GetBasePath('inventory_sources') + '?' + this.stringifyParams(params); Rest.setUrl(this.url); return Rest.get() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -32,7 +32,7 @@ export default this.url = GetBasePath('inventory_sources'); Rest.setUrl(this.url); return Rest.post(inventory_source) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -41,7 +41,7 @@ export default this.url = GetBasePath('inventory_sources') + inventory_source.id; Rest.setUrl(this.url); return Rest.put(inventory_source) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -50,7 +50,7 @@ export default this.url = GetBasePath('inventory_sources') + id; Rest.setUrl(this.url); return Rest.destroy() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -58,7 +58,7 @@ export default this.url = GetBasePath('inventory_sources'); Rest.setUrl(this.url); return Rest.options() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)); }, getCredential: function(id){ @@ -66,7 +66,7 @@ export default this.url = GetBasePath('credentials') + id; Rest.setUrl(this.url); return Rest.get() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -75,7 +75,7 @@ export default this.url = GetBasePath('inventory_sources') + '?' + this.stringifyParams(params); Rest.setUrl(this.url); return Rest.get() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -84,7 +84,7 @@ export default this.url = url; Rest.setUrl(this.url); return Rest.put(params) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -94,7 +94,7 @@ export default this.url = GetBasePath('groups') + target + '/children/'; Rest.setUrl(this.url); return Rest.post(group) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -103,7 +103,7 @@ export default this.url = GetBasePath('groups') + parent + '/children/'; Rest.setUrl(this.url); return Rest.post({id: group, disassociate: 1}) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -112,7 +112,7 @@ export default this.url = GetBasePath('inventory') + inventory + '/groups/'; Rest.setUrl(this.url); return Rest.post({id: group, disassociate: 1}) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, diff --git a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/add/smart-inventory-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/add/smart-inventory-add.controller.js index 533bf256a9..4c00bc92b2 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/add/smart-inventory-add.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/add/smart-inventory-add.controller.js @@ -60,7 +60,7 @@ function SmartInventoryAdd($scope, $location, Rest.setUrl(defaultUrl); Rest.post(data) - .success(function(data) { + .then(({data}) => { const inventory_id = data.id, instance_group_url = data.related.instance_groups; diff --git a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/edit/smart-inventory-edit.controller.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/edit/smart-inventory-edit.controller.js index 3621413cd8..8b235842a8 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/edit/smart-inventory-edit.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/edit/smart-inventory-edit.controller.js @@ -77,7 +77,7 @@ function SmartInventoryEdit($scope, $location, Rest.setUrl(defaultUrl + inventory_id + '/'); Rest.put(data) - .success(function() { + .then(() => { InstanceGroupsService.editInstanceGroups(instance_group_url, $scope.instance_groups) .then(() => { Wait('stop'); diff --git a/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.route.js b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.route.js index cbac4735db..045fe535dd 100644 --- a/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.route.js +++ b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.route.js @@ -18,7 +18,7 @@ export default { let ansibleFactsUrl = GetBasePath('hosts') + $stateParams.host_id + '/ansible_facts'; Rest.setUrl(ansibleFactsUrl); return Rest.get() - .success(function(data) { + .then(({data}) => { return data; }); } diff --git a/awx/ui/client/src/inventories-hosts/shared/groups.service.js b/awx/ui/client/src/inventories-hosts/shared/groups.service.js index b3d947a832..491600ee72 100644 --- a/awx/ui/client/src/inventories-hosts/shared/groups.service.js +++ b/awx/ui/client/src/inventories-hosts/shared/groups.service.js @@ -23,7 +23,7 @@ export default this.url = GetBasePath('groups') + '?' + this.stringifyParams(params); Rest.setUrl(this.url); return Rest.get() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -32,7 +32,7 @@ export default this.url = GetBasePath('groups'); Rest.setUrl(this.url); return Rest.post(group) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -41,7 +41,7 @@ export default this.url = GetBasePath('groups') + group.id; Rest.setUrl(this.url); return Rest.put(group) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -50,7 +50,7 @@ export default this.url = GetBasePath('groups') + id; Rest.setUrl(this.url); return Rest.destroy() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -59,7 +59,7 @@ export default this.url = GetBasePath('credentials') + id; Rest.setUrl(this.url); return Rest.get() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -68,7 +68,7 @@ export default this.url = GetBasePath('inventory_sources') + '?' + this.stringifyParams(params); Rest.setUrl(this.url); return Rest.get() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -77,7 +77,7 @@ export default this.url = url; Rest.setUrl(this.url); return Rest.put(params) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -87,7 +87,7 @@ export default this.url = GetBasePath('groups') + target + '/children/'; Rest.setUrl(this.url); return Rest.post(group) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -96,7 +96,7 @@ export default this.url = GetBasePath('groups') + parent + '/children/'; Rest.setUrl(this.url); return Rest.post({id: group, disassociate: 1}) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -105,7 +105,7 @@ export default this.url = GetBasePath('groups') + target + '/hosts/'; Rest.setUrl(this.url); return Rest.post(host) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -114,7 +114,7 @@ export default this.url = GetBasePath('groups') + group + '/hosts/'; Rest.setUrl(this.url); return Rest.post({id: host, disassociate: 1}) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -123,7 +123,7 @@ export default this.url = GetBasePath('inventory') + inventory + '/groups/'; Rest.setUrl(this.url); return Rest.post({id: group, disassociate: 1}) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); } diff --git a/awx/ui/client/src/inventories-hosts/shared/hosts.service.js b/awx/ui/client/src/inventories-hosts/shared/hosts.service.js index 5e6a8cc0c9..20ba74a809 100644 --- a/awx/ui/client/src/inventories-hosts/shared/hosts.service.js +++ b/awx/ui/client/src/inventories-hosts/shared/hosts.service.js @@ -30,7 +30,7 @@ this.url = GetBasePath('hosts') + '?' + this.stringifyParams(params); Rest.setUrl(this.url); return Rest.get() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -39,7 +39,7 @@ this.url = GetBasePath('hosts'); Rest.setUrl(this.url); return Rest.post(host) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -48,7 +48,7 @@ this.url = GetBasePath('hosts') + host.id; Rest.setUrl(this.url); return Rest.put(host) - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -57,7 +57,7 @@ this.url = GetBasePath('hosts') + id; Rest.setUrl(this.url); return Rest.destroy() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); } diff --git a/awx/ui/client/src/inventories-hosts/shared/inventories.service.js b/awx/ui/client/src/inventories-hosts/shared/inventories.service.js index 9ca46ba998..370895f07f 100644 --- a/awx/ui/client/src/inventories-hosts/shared/inventories.service.js +++ b/awx/ui/client/src/inventories-hosts/shared/inventories.service.js @@ -25,7 +25,7 @@ this.url = GetBasePath('inventory') + id; Rest.setUrl(this.url); return Rest.get() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -36,7 +36,7 @@ }).join(''); Rest.setUrl(this.url); return Rest.get() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)) .finally(Wait('stop')); }, @@ -60,21 +60,21 @@ this.url = GetBasePath('inventory') + inventoryId + '/inventory_sources'; Rest.setUrl(this.url); return Rest.options() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)); }, updateInventorySourcesGet: function(inventoryId) { this.url = GetBasePath('inventory') + inventoryId + '/update_inventory_sources'; Rest.setUrl(this.url); return Rest.get() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)); }, getHost: function(inventoryId, hostId) { this.url = GetBasePath('inventory') + inventoryId + '/hosts?id=' + hostId; Rest.setUrl(this.url); return Rest.get() - .success(this.success.bind(this)) + .then(this.then.bind(this)) .error(this.error.bind(this)); } }; diff --git a/awx/ui/client/src/inventory-scripts/add/add.controller.js b/awx/ui/client/src/inventory-scripts/add/add.controller.js index 5b162c2c4c..26e6d6801b 100644 --- a/awx/ui/client/src/inventory-scripts/add/add.controller.js +++ b/awx/ui/client/src/inventory-scripts/add/add.controller.js @@ -19,7 +19,7 @@ export default ['Rest', 'Wait', function init() { Rest.setUrl(url); Rest.options() - .success(function(data) { + .then(({data}) => { if (!data.actions.POST) { $state.go("^"); Alert('Permission Error', 'You do not have permission to add an inventory script.', 'alert-info'); @@ -43,7 +43,7 @@ export default ['Rest', 'Wait', organization: $scope.organization, script: $scope.script }) - .success(function() { + .then(() => { $state.go('inventoryScripts', null, { reload: true }); Wait('stop'); }) diff --git a/awx/ui/client/src/inventory-scripts/edit/edit.controller.js b/awx/ui/client/src/inventory-scripts/edit/edit.controller.js index 44b58fe197..6655a529bd 100644 --- a/awx/ui/client/src/inventory-scripts/edit/edit.controller.js +++ b/awx/ui/client/src/inventory-scripts/edit/edit.controller.js @@ -59,7 +59,7 @@ export default ['Rest', 'Wait', organization: $scope.organization, script: $scope.script }) - .success(function() { + .then(() => { $state.go('inventoryScripts', null, { reload: true }); Wait('stop'); }) diff --git a/awx/ui/client/src/inventory-scripts/list/list.controller.js b/awx/ui/client/src/inventory-scripts/list/list.controller.js index cd28c440d4..0108ae1549 100644 --- a/awx/ui/client/src/inventory-scripts/list/list.controller.js +++ b/awx/ui/client/src/inventory-scripts/list/list.controller.js @@ -50,7 +50,7 @@ export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList', var url = defaultUrl + id + '/'; Rest.setUrl(url); Rest.destroy() - .success(function() { + .then(() => { let reloadListStateParams = null; diff --git a/awx/ui/client/src/job-results/job-results.route.js b/awx/ui/client/src/job-results/job-results.route.js index c648558779..b7c453358d 100644 --- a/awx/ui/client/src/job-results/job-results.route.js +++ b/awx/ui/client/src/job-results/job-results.route.js @@ -76,7 +76,7 @@ export default { Rest.setUrl(jobData.related.job_events + "?event=playbook_on_stats"); Rest.get() - .success(function(data) { + .then(({data}) => { if(!data.results[0]){ defer.resolve({val: { ok: 0, @@ -131,7 +131,7 @@ export default { var getNext = function(data, arr, resolve) { Rest.setUrl(data.next); Rest.get() - .success(function (data) { + .then(({data}) => { if (data.next) { getNext(data, arr.concat(data.results), resolve); } else { @@ -145,7 +145,7 @@ export default { Rest.setUrl(GetBasePath('jobs') + $stateParams.id + '/labels/'); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.next) { getNext(data, data.results, seeMoreResolve); } else { diff --git a/awx/ui/client/src/job-results/job-results.service.js b/awx/ui/client/src/job-results/job-results.service.js index 0db4d4cca4..b1c40bab10 100644 --- a/awx/ui/client/src/job-results/job-results.service.js +++ b/awx/ui/client/src/job-results/job-results.service.js @@ -73,7 +73,7 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo Rest.setUrl(url); Rest.get() - .success(function(data) { + .then(({data}) => { val.resolve({results: data.results, next: data.next}); }) @@ -101,7 +101,7 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo Wait('start'); Rest.setUrl(job.url); Rest.destroy() - .success(function() { + .then(() => { Wait('stop'); $('#prompt-modal').modal('hide'); $state.go('jobs'); @@ -123,7 +123,7 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo var doCancel = function() { Rest.setUrl(job.url + 'cancel'); Rest.post({}) - .success(function() { + .then(() => { Wait('stop'); $('#prompt-modal').modal('hide'); }) @@ -150,7 +150,7 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo Wait('start'); Rest.setUrl(job.url + 'cancel'); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.can_cancel === true) { doCancel(); } else { @@ -239,7 +239,7 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo url = url + id + '/job_events/?' + this.stringifyParams(params); Rest.setUrl(url); return Rest.get() - .success(function(data){ + .then(({data}) => { return data; }) .error(function(data, status) { diff --git a/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js index 333fe5caae..dde8e79b36 100644 --- a/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js +++ b/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js @@ -59,7 +59,7 @@ Wait('start'); Rest.setUrl(GetBasePath('ad_hoc_commands') + new_job_id + '/'); Rest.destroy() - .success(function() { + .then(() => { Wait('stop'); }) .error(function (data, status) { @@ -86,7 +86,7 @@ // Re-launch the adhoc job Rest.setUrl(url); Rest.post(postData) - .success(function (data) { + .then(({data}) => { Wait('stop'); if($location.path().replace(/^\//, '').split('/')[0] !== 'jobs') { $state.go('adHocJobStdout', {id: data.id}); @@ -133,7 +133,7 @@ url = GetBasePath('ad_hoc_commands') + id + '/relaunch/'; Rest.setUrl(url); Rest.get() - .success(function (data) { + .then(({data}) => { new_job_id = data.id; scope.passwords_needed_to_start = data.passwords_needed_to_start; diff --git a/awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js index 850b043663..9da4dd2042 100644 --- a/awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js +++ b/awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js @@ -9,7 +9,7 @@ export default if (!Empty(credential)) { Rest.setUrl(GetBasePath('credentials')+credential); Rest.get() - .success(function (data) { + .then(({data}) => { credentialTypesLookup() .then(kinds => { if(data.credential_type === kinds.Machine && data.inputs){ diff --git a/awx/ui/client/src/job-submission/job-submission-factories/getsurveyquestions.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/getsurveyquestions.factory.js index 4b633d3eaa..4d18d3fdcf 100644 --- a/awx/ui/client/src/job-submission/job-submission-factories/getsurveyquestions.factory.js +++ b/awx/ui/client/src/job-submission/job-submission-factories/getsurveyquestions.factory.js @@ -20,7 +20,7 @@ export default Rest.setUrl(survey_url); Rest.get() - .success(function (data) { + .then(({data}) => { if(!Empty(data)){ scope.survey_name = data.name; scope.survey_description = data.description; diff --git a/awx/ui/client/src/job-submission/job-submission-factories/inventory-update.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/inventory-update.factory.js index f6fb49c727..3ed55607e5 100644 --- a/awx/ui/client/src/job-submission/job-submission-factories/inventory-update.factory.js +++ b/awx/ui/client/src/job-submission/job-submission-factories/inventory-update.factory.js @@ -42,7 +42,7 @@ export default Wait('start'); Rest.setUrl(url); Rest.get() - .success(function (data) { + .then(({data}) => { if(params.updateAllSources) { scope.$emit('StartTheUpdate', {}); } diff --git a/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js index 22059756cc..96f79304f4 100644 --- a/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js +++ b/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js @@ -139,7 +139,7 @@ export default Rest.setUrl(url); Rest.post(job_launch_data) - .success(function(data) { + .then(({data}) => { Wait('stop'); var job = data.job || data.system_job || data.project_update || data.inventory_update || data.ad_hoc_command; if(base !== 'portal' && Empty(data.system_job) || (base === 'home')){ @@ -200,7 +200,7 @@ export default var getExtraVars = function() { Rest.setUrl(vars_url); Rest.get() - .success(function (data) { + .then(({data}) => { if(!Empty(data.extra_vars)){ data.extra_vars = ToJSON('yaml', data.extra_vars, false); $.each(data.extra_vars, function(key,value){ diff --git a/awx/ui/client/src/job-submission/job-submission-factories/project-update.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/project-update.factory.js index b089127600..5e69365cd6 100644 --- a/awx/ui/client/src/job-submission/job-submission-factories/project-update.factory.js +++ b/awx/ui/client/src/job-submission/job-submission-factories/project-update.factory.js @@ -43,7 +43,7 @@ export default Wait('start'); Rest.setUrl(url); Rest.get() - .success(function (data) { + .then(({data}) => { project = data; if (project.can_update) { if (project.passwords_needed_to_updated) { diff --git a/awx/ui/client/src/job-submission/job-submission.controller.js b/awx/ui/client/src/job-submission/job-submission.controller.js index 9fb0ece241..5bc21c793c 100644 --- a/awx/ui/client/src/job-submission/job-submission.controller.js +++ b/awx/ui/client/src/job-submission/job-submission.controller.js @@ -152,7 +152,7 @@ export default Wait('start'); Rest.setUrl(launch_url); Rest.get() - .success(function (data) { + .then(({data}) => { // Put all the data that we get back about the launch onto scope angular.extend($scope, data); diff --git a/awx/ui/client/src/jobs/factories/delete-job.factory.js b/awx/ui/client/src/jobs/factories/delete-job.factory.js index 7157b9fa93..7829d7637a 100644 --- a/awx/ui/client/src/jobs/factories/delete-job.factory.js +++ b/awx/ui/client/src/jobs/factories/delete-job.factory.js @@ -42,7 +42,7 @@ Rest.setUrl(url); if (action_label === 'cancel') { Rest.post() - .success(function () { + .then(() => { $('#prompt-modal').modal('hide'); if (callback) { scope.$emit(callback, action_label); @@ -64,7 +64,7 @@ }); } else { Rest.destroy() - .success(function () { + .then(() => { $('#prompt-modal').modal('hide'); if (callback) { scope.$emit(callback, action_label); @@ -119,7 +119,7 @@ if (action_label === 'cancel') { Rest.setUrl(url); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.can_cancel) { scope.$emit('CancelJob'); } diff --git a/awx/ui/client/src/jobs/factories/relaunch-inventory.factory.js b/awx/ui/client/src/jobs/factories/relaunch-inventory.factory.js index 0630c27419..2070da46d6 100644 --- a/awx/ui/client/src/jobs/factories/relaunch-inventory.factory.js +++ b/awx/ui/client/src/jobs/factories/relaunch-inventory.factory.js @@ -7,7 +7,7 @@ export default Wait('start'); Rest.setUrl(url); Rest.get() - .success(function (data) { + .then(({data}) => { InventoryUpdate({ scope: scope, url: data.related.update diff --git a/awx/ui/client/src/license/license.controller.js b/awx/ui/client/src/license/license.controller.js index 25911b28e2..c5b5fcf532 100644 --- a/awx/ui/client/src/license/license.controller.js +++ b/awx/ui/client/src/license/license.controller.js @@ -86,7 +86,7 @@ export default $scope.submit = function(){ Wait('start'); CheckLicense.post($scope.newLicense.file, $scope.newLicense.eula) - .success(function(){ + .then(() => { reset(); ConfigService.delete(); ConfigService.getConfig().then(function(config){ diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js index 0ad7817a82..419c8c3734 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.controller.js +++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js @@ -139,7 +139,7 @@ export default ['$log', '$cookies', '$compile', '$rootScope', scope.removeAuthorizationGetUser = scope.$on('AuthorizationGetUser', function() { // Get all the profile/access info regarding the logged in user Authorization.getUser() - .success(function (data) { + .then(({data}) => { Authorization.setUserInfo(data); Timer.init().then(function(timer){ $rootScope.sessionTimer = timer; diff --git a/awx/ui/client/src/management-jobs/card/card.controller.js b/awx/ui/client/src/management-jobs/card/card.controller.js index a422782b04..a7de633af1 100644 --- a/awx/ui/client/src/management-jobs/card/card.controller.js +++ b/awx/ui/client/src/management-jobs/card/card.controller.js @@ -20,7 +20,7 @@ export default var getManagementJobs = function(){ Rest.setUrl(defaultUrl); Rest.get() - .success(function(data){ + .then(({data}) => { $scope.mgmtCards = data.results; Wait('stop'); }) @@ -128,7 +128,7 @@ export default Rest.setUrl(defaultUrl); Rest.post(data) - .success(function(data) { + .then(({data}) => { Wait('stop'); $("#prompt-for-days-facts").dialog("close"); $("#configure-dialog").dialog('close'); @@ -218,7 +218,7 @@ export default Rest.setUrl(defaultUrl); Rest.post(data) - .success(function(data) { + .then(({data}) => { Wait('stop'); $("#prompt-for-days").dialog("close"); // $("#configure-dialog").dialog('close'); diff --git a/awx/ui/client/src/notifications/add/add.controller.js b/awx/ui/client/src/notifications/add/add.controller.js index e0d2759acc..a7fafa4e77 100644 --- a/awx/ui/client/src/notifications/add/add.controller.js +++ b/awx/ui/client/src/notifications/add/add.controller.js @@ -24,7 +24,7 @@ export default ['Rest', 'Wait', 'NotificationsFormObject', function init() { Rest.setUrl(GetBasePath('projects')); Rest.options() - .success(function(data) { + .then(({data}) => { if (!data.actions.POST) { $state.go("^"); Alert('Permission Error', 'You do not have permission to add a notification template.', 'alert-info'); @@ -48,7 +48,7 @@ export default ['Rest', 'Wait', 'NotificationsFormObject', Rest.setUrl(url); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.organization_name = data.name; }) .error(function(data, status) { @@ -213,7 +213,7 @@ export default ['Rest', 'Wait', 'NotificationsFormObject', Wait('start'); Rest.setUrl(url); Rest.post(params) - .success(function() { + .then(() => { $state.go('notifications', {}, { reload: true }); Wait('stop'); }) diff --git a/awx/ui/client/src/notifications/edit/edit.controller.js b/awx/ui/client/src/notifications/edit/edit.controller.js index a87d273313..bed35b562f 100644 --- a/awx/ui/client/src/notifications/edit/edit.controller.js +++ b/awx/ui/client/src/notifications/edit/edit.controller.js @@ -59,7 +59,7 @@ export default ['Rest', 'Wait', Wait('start'); Rest.setUrl(url + id + '/'); Rest.get() - .success(function(data) { + .then(({data}) => { var fld; for (fld in form.fields) { if (data[fld]) { @@ -280,7 +280,7 @@ export default ['Rest', 'Wait', Wait('start'); Rest.setUrl(url + id + '/'); Rest.put(params) - .success(function() { + .then(() => { $state.go('notifications', {}, { reload: true }); Wait('stop'); }) diff --git a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js index ba11f5cd9d..cb20e18d17 100644 --- a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js +++ b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js @@ -164,7 +164,7 @@ var url = defaultUrl + id + '/'; Rest.setUrl(url); Rest.destroy() - .success(function() { + .then(() => { let reloadListStateParams = null; diff --git a/awx/ui/client/src/notifications/shared/notification-list-init.factory.js b/awx/ui/client/src/notifications/shared/notification-list-init.factory.js index 981e7721a3..a51169942c 100644 --- a/awx/ui/client/src/notifications/shared/notification-list-init.factory.js +++ b/awx/ui/client/src/notifications/shared/notification-list-init.factory.js @@ -26,7 +26,7 @@ export default ['Wait', 'GetBasePath', 'ProcessErrors', 'Rest', 'GetChoices', Rest.setUrl($rootScope.current_user.related.admin_of_organizations); Rest.get() - .success(function(data) { + .then(({data}) => { scope.current_user_admin_orgs = data.results.map(i => i.name); }); diff --git a/awx/ui/client/src/notifications/shared/toggle-notification.factory.js b/awx/ui/client/src/notifications/shared/toggle-notification.factory.js index c2638f76b1..3e32b13a0e 100644 --- a/awx/ui/client/src/notifications/shared/toggle-notification.factory.js +++ b/awx/ui/client/src/notifications/shared/toggle-notification.factory.js @@ -39,7 +39,7 @@ export default ['Wait', 'ProcessErrors', 'Rest', Wait('start'); Rest.setUrl(url); Rest.post(params) - .success( function(data) { + .then(({data}) => { if (callback) { scope.$emit(callback, data.id); notifier[column] = !notifier[column]; diff --git a/awx/ui/client/src/organizations/add/organizations-add.controller.js b/awx/ui/client/src/organizations/add/organizations-add.controller.js index fbd0957153..009f9240e6 100644 --- a/awx/ui/client/src/organizations/add/organizations-add.controller.js +++ b/awx/ui/client/src/organizations/add/organizations-add.controller.js @@ -12,7 +12,7 @@ export default ['$scope', '$rootScope', '$location', '$stateParams', Rest.setUrl(GetBasePath('organizations')); Rest.options() - .success(function(data) { + .then(({data}) => { if (!data.actions.POST) { $state.go("^"); Alert('Permission Error', 'You do not have permission to add an organization.', 'alert-info'); diff --git a/awx/ui/client/src/organizations/edit/organizations-edit.controller.js b/awx/ui/client/src/organizations/edit/organizations-edit.controller.js index 7c74e1e3cb..431521c033 100644 --- a/awx/ui/client/src/organizations/edit/organizations-edit.controller.js +++ b/awx/ui/client/src/organizations/edit/organizations-edit.controller.js @@ -36,7 +36,7 @@ export default ['$scope', '$location', '$stateParams', Wait('start'); Rest.setUrl(defaultUrl + id + '/'); Rest.get() - .success(function(data) { + .then(({data}) => { let fld; $scope.organization_name = data.name; @@ -124,7 +124,7 @@ export default ['$scope', '$location', '$stateParams', var url = defaultUrl + $stateParams.organization_id + '/' + set + '/'; Rest.setUrl(url); Rest.post({ id: itm_id, disassociate: 1 }) - .success(function() { + .then(() => { $('#prompt-modal').modal('hide'); }) .error(function(data, status) { diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-admins.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-admins.controller.js index c7de39ca84..fc7e9bb08a 100644 --- a/awx/ui/client/src/organizations/linkout/controllers/organizations-admins.controller.js +++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-admins.controller.js @@ -24,7 +24,7 @@ export default ['$stateParams', '$scope', 'Rest', '$state', Rest.setUrl(orgBase + $stateParams.organization_id); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.organization_name = data.name; $scope.name = data.name; $scope.org_id = data.id; @@ -51,7 +51,7 @@ export default ['$stateParams', '$scope', 'Rest', '$state', Rest.post({ id: id, disassociate: true - }).success(function() { + }).then(() => { $state.go('.', null, { reload: true }); }) .error(function(data, status) { diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js index 44bf60bb62..fd8cf0c193 100644 --- a/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js +++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js @@ -28,7 +28,7 @@ export default ['$scope', '$rootScope', '$location', $rootScope.flashMessage = null; Rest.setUrl(orgBase + $stateParams.organization_id); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.organization_name = data.name; $scope.name = data.name; @@ -194,7 +194,7 @@ export default ['$scope', '$rootScope', '$location', Wait('start'); Rest.setUrl(inventory.related.inventory_sources + '?or__source=ec2&or__source=rax&order_by=-last_job_run&page_size=5'); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.$emit('GroupSummaryReady', event, inventory, data); }) .error(function(data, status) { @@ -218,7 +218,7 @@ export default ['$scope', '$rootScope', '$location', url += "&order_by=-finished&page_size=5"; Rest.setUrl(url); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.$emit('HostSummaryReady', event, data); }) .error(function(data, status) { diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js index 682ceb477e..f58c1364ee 100644 --- a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js +++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js @@ -34,7 +34,7 @@ export default ['$scope', '$rootScope', $scope[list.name] = $scope[`${list.iterator}_dataset`].results; Rest.setUrl(orgBase + $stateParams.organization_id); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.organization_name = data.name; $scope.name = data.name; $scope.org_id = data.id; diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js index e1bc8e72eb..6311ccaf5c 100644 --- a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js +++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js @@ -99,7 +99,7 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert', // Go out and get the organization Rest.setUrl(orgBase + $stateParams.organization_id); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.organization_name = data.name; $scope.name = data.name; $scope.org_id = data.id; @@ -205,7 +205,7 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert', // Refresh what we have in memory to insure we're accessing the most recent status record Rest.setUrl(project.url); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.$emit('GoTojobResults', data); }) .error(function(data, status) { @@ -224,7 +224,7 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert', // Cancel the project update process Rest.setUrl(url); Rest.post() - .success(function() { + .then(() => { Alert('SCM Update Cancel', 'Your request to cancel the update was submitted to the task manager.', 'alert-info'); $scope.refresh(); }) @@ -241,7 +241,7 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert', var url = data.related.cancel; Rest.setUrl(url); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.can_cancel) { $scope.$emit('Cancel_Update', url); } else { @@ -257,11 +257,11 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert', $scope.cancelUpdate = function(id, name) { Rest.setUrl(GetBasePath("projects") + id); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.related.current_update) { Rest.setUrl(data.related.current_update); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.$emit('Check_Cancel', data); }) .error(function(data, status) { diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-teams.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-teams.controller.js index d706ffb75c..c4b9435d1d 100644 --- a/awx/ui/client/src/organizations/linkout/controllers/organizations-teams.controller.js +++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-teams.controller.js @@ -30,7 +30,7 @@ export default ['$scope', '$stateParams', 'OrgTeamList', 'Rest', 'OrgTeamsDatase Rest.setUrl(orgBase + $stateParams.organization_id); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.organization_name = data.name; $scope.name = data.name; diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-users.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-users.controller.js index ed2fbeeaa9..bc2ed1c7a2 100644 --- a/awx/ui/client/src/organizations/linkout/controllers/organizations-users.controller.js +++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-users.controller.js @@ -23,7 +23,7 @@ export default ['$stateParams', '$scope', 'OrgUserList','Rest', '$state', Rest.setUrl(orgBase + $stateParams.organization_id); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.organization_name = data.name; $scope.name = data.name; $scope.org_id = data.id; @@ -50,7 +50,7 @@ export default ['$stateParams', '$scope', 'OrgUserList','Rest', '$state', Rest.post({ id: id, disassociate: true - }).success(function() { + }).then(() => { $state.go('.', null, { reload: true }); }) .error(function(data, status) { diff --git a/awx/ui/client/src/organizations/list/organizations-list.controller.js b/awx/ui/client/src/organizations/list/organizations-list.controller.js index c47da2c5fd..4b700a218b 100644 --- a/awx/ui/client/src/organizations/list/organizations-list.controller.js +++ b/awx/ui/client/src/organizations/list/organizations-list.controller.js @@ -143,7 +143,7 @@ export default ['$stateParams', '$scope', '$rootScope', var url = defaultUrl + id + '/'; Rest.setUrl(url); Rest.destroy() - .success(function() { + .then(() => { Wait('stop'); let reloadListStateParams = null; diff --git a/awx/ui/client/src/projects/add/projects-add.controller.js b/awx/ui/client/src/projects/add/projects-add.controller.js index 1891c92ff6..64e044989e 100644 --- a/awx/ui/client/src/projects/add/projects-add.controller.js +++ b/awx/ui/client/src/projects/add/projects-add.controller.js @@ -23,7 +23,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm', $scope.canEditOrg = true; Rest.setUrl(GetBasePath('projects')); Rest.options() - .success(function(data) { + .then(({data}) => { if (!data.actions.POST) { $state.go("^"); Alert(i18n._('Permission Error'), i18n._('You do not have permission to add a project.'), 'alert-info'); @@ -99,7 +99,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm', Wait('start'); Rest.setUrl(url); Rest.post(data) - .success(function(data) { + .then(({data}) => { $scope.addedItem = data.id; $state.go('projects.edit', { project_id: data.id }, { reload: true }); }) diff --git a/awx/ui/client/src/projects/edit/projects-edit.controller.js b/awx/ui/client/src/projects/edit/projects-edit.controller.js index 4ac43a8160..d694eeb592 100644 --- a/awx/ui/client/src/projects/edit/projects-edit.controller.js +++ b/awx/ui/client/src/projects/edit/projects-edit.controller.js @@ -85,7 +85,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest', // Retrieve detail record and prepopulate the form Rest.setUrl(defaultUrl); Rest.get({ params: { id: id } }) - .success(function(data) { + .then(({data}) => { var fld, i; for (fld in form.fields) { if (form.fields[fld].type === 'checkbox_group') { @@ -214,7 +214,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest', Rest.setUrl(defaultUrl); Rest.put(params) - .success(function() { + .then(() => { Wait('stop'); $state.go($state.current, {}, { reload: true }); }) @@ -230,7 +230,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest', $rootScope.flashMessage = null; Rest.setUrl(url); Rest.post({ id: itm_id, disassociate: 1 }) - .success(function() { + .then(() => { $('#prompt-modal').modal('hide'); }) .error(function(data, status) { diff --git a/awx/ui/client/src/projects/factories/get-project-path.factory.js b/awx/ui/client/src/projects/factories/get-project-path.factory.js index 1a48772ff9..414385c7be 100644 --- a/awx/ui/client/src/projects/factories/get-project-path.factory.js +++ b/awx/ui/client/src/projects/factories/get-project-path.factory.js @@ -26,7 +26,7 @@ export default Rest.setUrl(GetBasePath('config')); Rest.get() - .success(function (data) { + .then(({data}) => { var opts = [], i; if (data.project_local_paths) { for (i = 0; i < data.project_local_paths.length; i++) { diff --git a/awx/ui/client/src/projects/list/projects-list.controller.js b/awx/ui/client/src/projects/list/projects-list.controller.js index 9ce0f5b807..aca57f2649 100644 --- a/awx/ui/client/src/projects/list/projects-list.controller.js +++ b/awx/ui/client/src/projects/list/projects-list.controller.js @@ -162,7 +162,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', // Refresh what we have in memory to insure we're accessing the most recent status record Rest.setUrl(project.url); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.$emit('GoTojobResults', data); }) .error(function(data, status) { @@ -179,7 +179,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', var url = defaultUrl + id + '/'; Rest.setUrl(url); Rest.destroy() - .success(function() { + .then(() => { let reloadListStateParams = null; @@ -218,7 +218,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', // Cancel the project update process Rest.setUrl(url); Rest.post() - .success(function () { + .then(() => { Alert(i18n._('SCM Update Cancel'), i18n._('Your request to cancel the update was submitted to the task manager.'), 'alert-info'); }) .error(function (data, status) { @@ -234,7 +234,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', var url = data.related.cancel; Rest.setUrl(url); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.can_cancel) { $scope.$emit('Cancel_Update', url); } else { @@ -251,11 +251,11 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', project.pending_cancellation = true; Rest.setUrl(GetBasePath("projects") + project.id); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.related.current_update) { Rest.setUrl(data.related.current_update); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.$emit('Check_Cancel', data); }) .error(function (data, status) { diff --git a/awx/ui/client/src/rest/restServices.factory.js b/awx/ui/client/src/rest/restServices.factory.js index 148a1a8994..08c4ea9ca0 100644 --- a/awx/ui/client/src/rest/restServices.factory.js +++ b/awx/ui/client/src/rest/restServices.factory.js @@ -38,7 +38,7 @@ * var url = GetBasePath('inventories') + $stateParams.id + '/'; * Rest.setUrl(url); * Rest.get() - * .success(function(data) { + * .then(({data}) => { * // review the data object and take action * }) * .error(function(status, data) { diff --git a/awx/ui/client/src/scheduler/factories/delete-schedule.factory.js b/awx/ui/client/src/scheduler/factories/delete-schedule.factory.js index 45b8eca7bb..537f9146bf 100644 --- a/awx/ui/client/src/scheduler/factories/delete-schedule.factory.js +++ b/awx/ui/client/src/scheduler/factories/delete-schedule.factory.js @@ -22,7 +22,7 @@ export default Wait('start'); Rest.setUrl(url); Rest.destroy() - .success(function () { + .then(() => { $('#prompt-modal').modal('hide'); scope.$emit(callback, id); diff --git a/awx/ui/client/src/scheduler/factories/edit-schedule.factory.js b/awx/ui/client/src/scheduler/factories/edit-schedule.factory.js index de591aee08..9ca2d5191a 100644 --- a/awx/ui/client/src/scheduler/factories/edit-schedule.factory.js +++ b/awx/ui/client/src/scheduler/factories/edit-schedule.factory.js @@ -121,7 +121,7 @@ export default // Get the existing record Rest.setUrl(url); Rest.get() - .success(function(data) { + .then(({data}) => { schedule = data; try { schedule.extra_data = JSON.parse(schedule.extra_data); diff --git a/awx/ui/client/src/scheduler/factories/schedule-post.factory.js b/awx/ui/client/src/scheduler/factories/schedule-post.factory.js index 2c636f8b89..e3609516bb 100644 --- a/awx/ui/client/src/scheduler/factories/schedule-post.factory.js +++ b/awx/ui/client/src/scheduler/factories/schedule-post.factory.js @@ -35,7 +35,7 @@ export default Rest.setUrl(url); if (mode === 'add') { Rest.post(schedule) - .success(function(){ + .then(() => { if (callback) { scope.$emit(callback); } @@ -50,7 +50,7 @@ export default } else { Rest.put(schedule) - .success(function(){ + .then(() => { if (callback) { scope.$emit(callback, schedule); } diff --git a/awx/ui/client/src/scheduler/factories/toggle-schedule.factory.js b/awx/ui/client/src/scheduler/factories/toggle-schedule.factory.js index 423c92227a..d7abe88380 100644 --- a/awx/ui/client/src/scheduler/factories/toggle-schedule.factory.js +++ b/awx/ui/client/src/scheduler/factories/toggle-schedule.factory.js @@ -12,7 +12,7 @@ export default scope.removeScheduleFound = scope.$on('ScheduleFound', function(e, data) { data.enabled = (data.enabled) ? false : true; Rest.put(data) - .success( function() { + .then(() => { Wait('stop'); $state.go('.', null, {reload: true}); }) @@ -27,7 +27,7 @@ export default // Get the schedule Rest.setUrl(url); Rest.get() - .success(function(data) { + .then(({data}) => { scope.$emit('ScheduleFound', data); }) .error(function(data,status){ diff --git a/awx/ui/client/src/shared/Utilities.js b/awx/ui/client/src/shared/Utilities.js index 08bdff71aa..d69b762e8d 100644 --- a/awx/ui/client/src/shared/Utilities.js +++ b/awx/ui/client/src/shared/Utilities.js @@ -750,7 +750,7 @@ angular.module('Utilities', ['RestServices', 'Utilities']) if (!options) { Rest.setUrl(url); Rest.options() - .success(function(data) { + .then(({data}) => { withOptions(data); }) .error(function(data, status) { diff --git a/awx/ui/client/src/shared/api-loader.js b/awx/ui/client/src/shared/api-loader.js index 1dd41529d2..93fc604ab8 100644 --- a/awx/ui/client/src/shared/api-loader.js +++ b/awx/ui/client/src/shared/api-loader.js @@ -29,10 +29,10 @@ angular.module('ApiLoader', ['Utilities']) return function () { $http({ method: 'GET', url:'/api/', headers: { 'Authorization': "" } }) - .success(function (data) { + .then(({data}) => { var base = data.current_version; $http({ method: 'GET', url:base, headers: { 'Authorization': "" } }) - .success(function (data) { + .then(({data}) => { data.base = base; $rootScope.defaultUrls = data; Store('api', data); diff --git a/awx/ui/client/src/shared/directives.js b/awx/ui/client/src/shared/directives.js index 5bb0d30f96..2013c4392c 100644 --- a/awx/ui/client/src/shared/directives.js +++ b/awx/ui/client/src/shared/directives.js @@ -556,7 +556,7 @@ function(ConfigurationUtils, i18n, $rootScope) { Rest.setUrl(`${basePath}` + query); Rest.get() - .success(function (data) { + .then(({data}) => { if (data.count === 1) { scope[modelKey] = data.results[0].name; scope[modelName] = data.results[0].id; diff --git a/awx/ui/client/src/shared/org-admin-lookup/org-admin-lookup.factory.js b/awx/ui/client/src/shared/org-admin-lookup/org-admin-lookup.factory.js index aa200ef984..12bea302cc 100644 --- a/awx/ui/client/src/shared/org-admin-lookup/org-admin-lookup.factory.js +++ b/awx/ui/client/src/shared/org-admin-lookup/org-admin-lookup.factory.js @@ -14,7 +14,7 @@ export default if(Authorization.getUserInfo('is_superuser') !== true) { Rest.setUrl(GetBasePath('users') + $rootScope.current_user.id + '/admin_of_organizations'); Rest.get({ params: { id: params.organization } }) - .success(function(data) { + .then(({data}) => { if(data.count && data.count > 0) { deferred.resolve(true); } diff --git a/awx/ui/client/src/shared/rbacUiControl.js b/awx/ui/client/src/shared/rbacUiControl.js index ee74951d43..84d053c5b6 100644 --- a/awx/ui/client/src/shared/rbacUiControl.js +++ b/awx/ui/client/src/shared/rbacUiControl.js @@ -18,7 +18,7 @@ export default Wait("start"); Rest.options() - .success(function(data) { + .then(({data}) => { if (data.actions.POST) { canAddVal.resolve({canAdd: true, options: data}); } else { diff --git a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js index bf8a8f89ef..c8f0c2abea 100644 --- a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js +++ b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js @@ -98,7 +98,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce Rest.setUrl($scope.stdoutEndpoint + '?format=json&start_line=0&end_line=' + page_size); Rest.get() - .success(function(data) { + .then(({data}) => { Wait('stop'); if (data.content) { api_complete = true; @@ -134,7 +134,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce $('#stdoutMoreRowsBottom').fadeIn(); Rest.setUrl(url); Rest.get() - .success( function(data) { + .then(({data}) => { if ($('#pre-container-content').html() === "Waiting for results...") { $('#pre-container-content').html(data.content); } else { @@ -166,7 +166,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce '&end_line=' + (current_range.end + page_size); Rest.setUrl(url); Rest.get() - .success(function(data){ + .then(({data}) => { $('#pre-container-content').append(data.content); current_range = data.range; }) diff --git a/awx/ui/client/src/standard-out/standard-out-factories/lookup-name.factory.js b/awx/ui/client/src/standard-out/standard-out-factories/lookup-name.factory.js index 7d2f865268..0cf174dfcc 100644 --- a/awx/ui/client/src/standard-out/standard-out-factories/lookup-name.factory.js +++ b/awx/ui/client/src/standard-out/standard-out-factories/lookup-name.factory.js @@ -13,7 +13,7 @@ callback = params.callback; Rest.setUrl(url); Rest.get() - .success(function(data) { + .then(({data}) => { if (scope_var === 'inventory_source') { scope.inventory = data.inventory; } diff --git a/awx/ui/client/src/standard-out/standard-out.controller.js b/awx/ui/client/src/standard-out/standard-out.controller.js index 97b85f68b2..e79c18bb0a 100644 --- a/awx/ui/client/src/standard-out/standard-out.controller.js +++ b/awx/ui/client/src/standard-out/standard-out.controller.js @@ -79,7 +79,7 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams, // of stdout jobs. Rest.setUrl(GetBasePath('base') + jobType + '/' + job_id + '/'); Rest.get() - .success(function(data) { + .then(({data}) => { $scope.job = data; $scope.job_template_name = data.name; $scope.created_by = data.summary_fields.created_by; diff --git a/awx/ui/client/src/teams/add/teams-add.controller.js b/awx/ui/client/src/teams/add/teams-add.controller.js index c309947b4d..873abcdb7a 100644 --- a/awx/ui/client/src/teams/add/teams-add.controller.js +++ b/awx/ui/client/src/teams/add/teams-add.controller.js @@ -11,7 +11,7 @@ export default ['$scope', '$rootScope', 'TeamForm', 'GenerateForm', 'Rest', Rest.setUrl(GetBasePath('teams')); Rest.options() - .success(function(data) { + .then(({data}) => { if (!data.actions.POST) { $state.go("^"); Alert('Permission Error', 'You do not have permission to add a team.', 'alert-info'); @@ -43,7 +43,7 @@ export default ['$scope', '$rootScope', 'TeamForm', 'GenerateForm', 'Rest', data[fld] = $scope[fld]; } Rest.post(data) - .success(function(data) { + .then(({data}) => { Wait('stop'); $rootScope.flashMessage = "New team successfully created!"; $rootScope.$broadcast("EditIndicatorChange", "users", data.id); diff --git a/awx/ui/client/src/teams/edit/teams-edit.controller.js b/awx/ui/client/src/teams/edit/teams-edit.controller.js index 77166dfad5..35394b975d 100644 --- a/awx/ui/client/src/teams/edit/teams-edit.controller.js +++ b/awx/ui/client/src/teams/edit/teams-edit.controller.js @@ -19,7 +19,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'TeamForm', 'Rest', $scope.team_id = id; Rest.setUrl(defaultUrl); Wait('start'); - Rest.get(defaultUrl).success(function(data) { + Rest.get(defaultUrl).then(({data}) => { setScopeFields(data); $scope.organization_name = data.summary_fields.organization.name; @@ -74,7 +74,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'TeamForm', 'Rest', if ($scope[form.name + '_form'].$valid) { var data = processNewData(form.fields); Rest.setUrl(defaultUrl); - Rest.put(data).success(function() { + Rest.put(data).then(() => { $state.go($state.current, null, { reload: true }); }) .error(function(data, status) { diff --git a/awx/ui/client/src/teams/list/teams-list.controller.js b/awx/ui/client/src/teams/list/teams-list.controller.js index 80ed78c241..e8dff3f0cc 100644 --- a/awx/ui/client/src/teams/list/teams-list.controller.js +++ b/awx/ui/client/src/teams/list/teams-list.controller.js @@ -48,7 +48,7 @@ export default ['$scope', 'Rest', 'TeamList', 'Prompt', var url = defaultUrl + id + '/'; Rest.setUrl(url); Rest.destroy() - .success(function() { + .then(() => { Wait('stop'); $('#prompt-modal').modal('hide'); diff --git a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js index 9cd73e1da7..3c0cd0d3ab 100644 --- a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js +++ b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js @@ -146,7 +146,7 @@ url = GetBasePath('projects') + $scope.project + '/playbooks/'; Rest.setUrl(url); Rest.get() - .success(function (data) { + .then(({data}) => { var i, opts = []; for (i = 0; i < data.length; i++) { opts.push(data[i]); @@ -172,7 +172,7 @@ if (oldValue !== newValue && !Empty($scope.project)) { Rest.setUrl(GetBasePath('projects') + $scope.project + '/'); Rest.get() - .success(function (data) { + .then(({data}) => { var msg; switch (data.status) { case 'failed': @@ -394,7 +394,7 @@ Rest.setUrl(GetBasePath("organizations")); Rest.get() - .success(function(data) { + .then(({data}) => { orgDefer.resolve(data.results[0].id); }); @@ -434,7 +434,7 @@ Rest.post({ name: $scope.survey_name, description: $scope.survey_description, spec: $scope.survey_questions }) - .success(function () { + .then(() => { Wait('stop'); }) .error(function (data, diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js index fa5d74219a..23b0bb4bf0 100644 --- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js +++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js @@ -81,7 +81,7 @@ export default Wait('start'); Rest.setUrl(url); promises.push(Rest.get() - .success(function (data) { + .then(({data}) => { $scope.disablePlaybookBecausePermissionDenied = false; $scope.playbook_options = []; var playbookNotFound = true; @@ -112,7 +112,7 @@ export default Rest.setUrl(GetBasePath('projects') + $scope.project + '/'); promises.push(Rest.get() - .success(function (data) { + .then(({data}) => { var msg; switch (data.status) { case 'failed': @@ -539,7 +539,7 @@ export default var getNext = function(data, arr, resolve) { Rest.setUrl(data.next); Rest.get() - .success(function (data) { + .then(({data}) => { if (data.next) { getNext(data, arr.concat(data.results), resolve); } else { @@ -551,7 +551,7 @@ export default Rest.setUrl(data.related.labels); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.next) { getNext(data, data.results, associatedLabelsDefer); } else { @@ -578,7 +578,7 @@ export default Rest.setUrl(GetBasePath("organizations")); Rest.get() - .success(function(data) { + .then(({data}) => { orgDefer.resolve(data.results[0].id); }); @@ -722,7 +722,7 @@ export default Rest.setUrl(defaultUrl + $state.params.job_template_id); Rest.put(data) - .success(function (data) { + .then(({data}) => { $scope.$emit('templateSaveSuccess', data); }) .error(function (data, status) { diff --git a/awx/ui/client/src/templates/labels/labelsList.directive.js b/awx/ui/client/src/templates/labels/labelsList.directive.js index ba7bc06d1b..2dfe6ae061 100644 --- a/awx/ui/client/src/templates/labels/labelsList.directive.js +++ b/awx/ui/client/src/templates/labels/labelsList.directive.js @@ -21,7 +21,7 @@ export default var getNext = function(data, arr, resolve) { Rest.setUrl(data.next); Rest.get() - .success(function (data) { + .then(({data}) => { if (data.next) { getNext(data, arr.concat(data.results), resolve); } else { @@ -34,7 +34,7 @@ export default var seeMoreResolve = $q.defer(); Rest.setUrl(scope[scope.$parent.list.iterator].related.labels); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.next) { getNext(data, data.results, seeMoreResolve); } else { @@ -71,7 +71,7 @@ export default if(url) { Rest.setUrl(url); Rest.post({"disassociate": true, "id": label.id}) - .success(function () { + .then(() => { Wait('stop'); $state.go('.', null, {reload: true}); }) diff --git a/awx/ui/client/src/templates/survey-maker/surveys/delete.factory.js b/awx/ui/client/src/templates/survey-maker/surveys/delete.factory.js index 48565727f4..c02d3733b8 100644 --- a/awx/ui/client/src/templates/survey-maker/surveys/delete.factory.js +++ b/awx/ui/client/src/templates/survey-maker/surveys/delete.factory.js @@ -41,7 +41,7 @@ export default Rest.setUrl(url); Rest.destroy() - .success(function () { + .then(() => { scope.$emit("SurveyDeleted"); }) diff --git a/awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js b/awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js index 2f2cf2b754..526a2bde4c 100644 --- a/awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js +++ b/awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js @@ -31,7 +31,7 @@ export default // Get the existing record Rest.setUrl(url); Rest.get() - .success(function (data) { + .then(({data}) => { if(!Empty(data)){ ShowSurveyModal({ title: "Edit Survey", scope: scope, callback: 'DialogReady' }); scope.survey_name = data.name; diff --git a/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js b/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js index 0a834febc3..a98428c828 100644 --- a/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js +++ b/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js @@ -81,7 +81,7 @@ export default Rest.setUrl(GetBasePath('workflow_job_templates') + id + '/survey_spec/'); } return Rest.post({name: scope.survey_name, description: scope.survey_description, spec: scope.survey_questions }) - .success(function () { + .then(() => { }) .error(function (data, status) { @@ -98,7 +98,7 @@ export default Rest.setUrl(GetBasePath('workflow_job_templates') + id+ '/'); } return Rest.patch({"survey_enabled": scope.survey_enabled}) - .success(function () { + .then(() => { }) .error(function (data, status) { diff --git a/awx/ui/client/src/templates/templates.service.js b/awx/ui/client/src/templates/templates.service.js index 1c9940cb0f..77c4ac215c 100644 --- a/awx/ui/client/src/templates/templates.service.js +++ b/awx/ui/client/src/templates/templates.service.js @@ -259,7 +259,7 @@ export default ['Rest', 'GetBasePath', '$q', 'NextPage', function(Rest, GetBaseP Rest.setUrl(url); Rest.options() - .success(function(data) { + .then(({data}) => { deferred.resolve(data); }).error(function(msg, code) { deferred.reject(msg, code); @@ -274,7 +274,7 @@ export default ['Rest', 'GetBasePath', '$q', 'NextPage', function(Rest, GetBaseP Rest.setUrl(url); Rest.options() - .success(function(data) { + .then(({data}) => { deferred.resolve(data); }).error(function(msg, code) { deferred.reject(msg, code); diff --git a/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js b/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js index 6fdbff391d..c725dbf1c6 100644 --- a/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js +++ b/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js @@ -112,7 +112,7 @@ export default [ Rest.setUrl(GetBasePath("organizations")); Rest.get() - .success(function(data) { + .then(({data}) => { orgDefer.resolve(data.results[0].id); }); diff --git a/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js b/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js index 71257b99e2..eead433902 100644 --- a/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js +++ b/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js @@ -181,7 +181,7 @@ export default [ var getNext = function(data, arr, resolve) { Rest.setUrl(data.next); Rest.get() - .success(function (data) { + .then(({data}) => { if (data.next) { getNext(data, arr.concat(data.results), resolve); } else { @@ -193,7 +193,7 @@ export default [ Rest.setUrl($scope.workflow_job_template_obj.related.labels); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.next) { getNext(data, data.results, associatedLabelsDefer); } else { @@ -220,7 +220,7 @@ export default [ Rest.setUrl(GetBasePath("organizations")); Rest.get() - .success(function(data) { + .then(({data}) => { orgDefer.resolve(data.results[0].id); }); diff --git a/awx/ui/client/src/users/add/users-add.controller.js b/awx/ui/client/src/users/add/users-add.controller.js index 0f425bb316..76bb739986 100644 --- a/awx/ui/client/src/users/add/users-add.controller.js +++ b/awx/ui/client/src/users/add/users-add.controller.js @@ -37,7 +37,7 @@ export default ['$scope', '$rootScope', 'UserForm', 'GenerateForm', 'Rest', Rest.setUrl(GetBasePath('users')); Rest.options() - .success(function(data) { + .then(({data}) => { if (!data.actions.POST) { $state.go("^"); Alert(i18n._('Permission Error'), i18n._('You do not have permission to add a user.'), 'alert-info'); @@ -85,7 +85,7 @@ export default ['$scope', '$rootScope', 'UserForm', 'GenerateForm', 'Rest', data.is_system_auditor = $scope.is_system_auditor; Wait('start'); Rest.post(data) - .success(function(data) { + .then(({data}) => { var base = $location.path().replace(/^\//, '').split('/')[0]; if (base === 'users') { $rootScope.flashMessage = i18n._('New user successfully created!'); diff --git a/awx/ui/client/src/users/edit/users-edit.controller.js b/awx/ui/client/src/users/edit/users-edit.controller.js index dcef70314e..c5b958ed77 100644 --- a/awx/ui/client/src/users/edit/users-edit.controller.js +++ b/awx/ui/client/src/users/edit/users-edit.controller.js @@ -38,7 +38,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'UserForm', 'Rest', $scope.$watch('is_superuser', hidePermissionsTabSmartSearchAndPaginationIfSuperUser($scope)); Rest.setUrl(defaultUrl); Wait('start'); - Rest.get(defaultUrl).success(function(data) { + Rest.get(defaultUrl).then(({data}) => { $scope.user_id = id; $scope.ldap_user = (data.ldap_dn !== null && data.ldap_dn !== undefined && data.ldap_dn !== '') ? true : false; $scope.not_ldap_user = !$scope.ldap_user; @@ -172,7 +172,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'UserForm', 'Rest', if ($scope[form.name + '_form'].$valid) { Rest.setUrl(defaultUrl + '/'); var data = processNewData(form.fields); - Rest.put(data).success(function() { + Rest.put(data).then(() => { $state.go($state.current, null, { reload: true }); }) .error(function(data, status) { diff --git a/awx/ui/client/src/users/list/users-list.controller.js b/awx/ui/client/src/users/list/users-list.controller.js index d3dd6a7df8..38e4995cbe 100644 --- a/awx/ui/client/src/users/list/users-list.controller.js +++ b/awx/ui/client/src/users/list/users-list.controller.js @@ -62,7 +62,7 @@ export default ['$scope', '$rootScope', 'Rest', 'UserList', 'Prompt', var url = defaultUrl + id + '/'; Rest.setUrl(url); Rest.destroy() - .success(function() { + .then(() => { let reloadListStateParams = null; diff --git a/awx/ui/client/src/workflow-results/workflow-results.route.js b/awx/ui/client/src/workflow-results/workflow-results.route.js index 168f0b8329..fb54118aa4 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.route.js +++ b/awx/ui/client/src/workflow-results/workflow-results.route.js @@ -51,7 +51,7 @@ export default { var defer = $q.defer(); Rest.setUrl(workflowData.related.workflow_nodes + '?order_by=id'); Rest.get() - .success(function(data) { + .then(({data}) => { if(data.next) { let allNodes = data.results; let getNodes = function(nextUrl){ @@ -101,7 +101,7 @@ export default { var getNext = function(data, arr, resolve) { Rest.setUrl(data.next); Rest.get() - .success(function (data) { + .then(({data}) => { if (data.next) { getNext(data, arr.concat(data.results), resolve); } else { @@ -115,7 +115,7 @@ export default { Rest.setUrl(GetBasePath('workflow_jobs') + $stateParams.id + '/labels/'); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.next) { getNext(data, data.results, seeMoreResolve); } else { diff --git a/awx/ui/client/src/workflow-results/workflow-results.service.js b/awx/ui/client/src/workflow-results/workflow-results.service.js index f6cf877596..22b4bd0a0b 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.service.js +++ b/awx/ui/client/src/workflow-results/workflow-results.service.js @@ -45,7 +45,7 @@ export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErr Wait('start'); Rest.setUrl(workflow.url); Rest.destroy() - .success(function() { + .then(() => { Wait('stop'); $('#prompt-modal').modal('hide'); $state.go('jobs'); @@ -67,7 +67,7 @@ export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErr var doCancel = function() { Rest.setUrl(workflow.url + 'cancel'); Rest.post({}) - .success(function() { + .then(() => { Wait('stop'); $('#prompt-modal').modal('hide'); }) @@ -94,7 +94,7 @@ export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErr Wait('start'); Rest.setUrl(workflow.url + 'cancel'); Rest.get() - .success(function(data) { + .then(({data}) => { if (data.can_cancel === true) { doCancel(); } else {