External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 09:57:33 -02:30
Code Issues Packages Projects Releases Wiki Activity

Added generic error handling to promises in relaunch button component

Browse Source
This commit is contained in:
mabashian
2018-04-06 15:52:29 -04:00
parent aa464fdcc8
commit 0f07f4f956
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
View File

@@ -117,6 +117,11 @@ function atRelaunchCtrl (
const relaunchType = launchRes.data.type === 'job' ? 'playbook' : launchRes.data.type; const relaunchType = launchRes.data.type === 'job' ? 'playbook' : launchRes.data.type;
$state.go('jobz', { id: launchRes.data.id, type: relaunchType }, { reload: true }); $state.go('jobz', { id: launchRes.data.id, type: relaunchType }, { reload: true });
} }
}).catch(({ data, status, config }) => {
ProcessErrors($scope, data, status, null, {
hdr: strings.get('error.HEADER'),
msg: strings.get('error.CALL', { path: `${config.url}`, status })
});
}); });
} }
}); });
@@ -165,6 +170,11 @@ function atRelaunchCtrl (
if (!$state.includes('jobs')) { if (!$state.includes('jobs')) {
$state.go('jobz', { id: postUpdateRes.data.id, type: 'inventory' }, { reload: true }); $state.go('jobz', { id: postUpdateRes.data.id, type: 'inventory' }, { reload: true });
} }
}).catch(({ data, status, config }) => {
ProcessErrors($scope, data, status, null, {
hdr: strings.get('error.HEADER'),
msg: strings.get('error.CALL', { path: `${config.url}`, status })
});
}); });
} else { } else {
Alert( Alert(
@@ -184,6 +194,11 @@ function atRelaunchCtrl (
if (!$state.includes('jobs')) { if (!$state.includes('jobs')) {
$state.go('jobz', { id: postUpdateRes.data.id, type: 'project' }, { reload: true }); $state.go('jobz', { id: postUpdateRes.data.id, type: 'project' }, { reload: true });
} }
}).catch(({ data, status, config }) => {
ProcessErrors($scope, data, status, null, {
hdr: strings.get('error.HEADER'),
msg: strings.get('error.CALL', { path: `${config.url}`, status })
});
}); });
} else { } else {
Alert( Alert(
@@ -201,6 +216,11 @@ function atRelaunchCtrl (
if (!$state.includes('jobs')) { if (!$state.includes('jobs')) {
$state.go('workflowResults', { id: launchRes.data.id }, { reload: true }); $state.go('workflowResults', { id: launchRes.data.id }, { reload: true });
} }
}).catch(({ data, status, config }) => {
ProcessErrors($scope, data, status, null, {
hdr: strings.get('error.HEADER'),
msg: strings.get('error.CALL', { path: `${config.url}`, status })
});
}); });
} else if (vm.job.type === 'ad_hoc_command') { } else if (vm.job.type === 'ad_hoc_command') {
const adHocCommand = new AdHocCommand(); const adHocCommand = new AdHocCommand();
@@ -220,6 +240,11 @@ function atRelaunchCtrl (
if (!$state.includes('jobs')) { if (!$state.includes('jobs')) {
$state.go('jobz', { id: launchRes.data.id, type: 'command' }, { reload: true }); $state.go('jobz', { id: launchRes.data.id, type: 'command' }, { reload: true });
} }
}).catch(({ data, status, config }) => {
ProcessErrors($scope, data, status, null, {
hdr: strings.get('error.HEADER'),
msg: strings.get('error.CALL', { path: `${config.url}`, status })
});
}); });
} }
}); });

14
awx/ui/client/src/shared/Utilities.js
View File

@@ -222,14 +222,14 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
} else if (typeof data === 'object' && data !== null) { } else if (typeof data === 'object' && data !== null) {
if (Object.keys(data).length > 0) { if (Object.keys(data).length > 0) {
keys = Object.keys(data); keys = Object.keys(data);
if (Array.isArray(data[keys[0]])) { msg = "";
msg = data[keys[0]][0]; _.forOwn(data, function(value, key) {
} else { if (Array.isArray(data[key])) {
msg = ""; msg += `${key}: ${data[key][0]}`;
_.forOwn(data, function(value, key) { } else {
msg += `${key} : ${value} `; msg += `${key} : ${value} `;
}); }
} });
Alert(defaultMsg.hdr, msg); Alert(defaultMsg.hdr, msg);
} else { } else {
Alert(defaultMsg.hdr, defaultMsg.msg); Alert(defaultMsg.hdr, defaultMsg.msg);