From 25dc3f8778c11ef7d27a811ca40982df01bf97be Mon Sep 17 00:00:00 2001 From: mabashian Date: Fri, 10 Nov 2017 11:29:46 -0500 Subject: [PATCH] Update delete modals and fixed unit test failures --- awx/ui/client/index.template.ejs | 5 +- .../list/credentials-list.controller.js | 5 +- .../list/inventory-list.controller.js | 5 +- .../sources/list/sources-list.controller.js | 5 +- .../inventory-scripts/list/list.controller.js | 5 +- .../src/job-results/job-results.service.js | 12 ++-- .../src/jobs/factories/delete-job.factory.js | 5 +- .../list.controller.js | 5 +- .../list/organizations-list.controller.js | 3 +- .../projects/list/projects-list.controller.js | 5 +- .../factories/delete-schedule.factory.js | 3 +- awx/ui/client/src/shared/modal/modal.less | 4 ++ awx/ui/client/src/shared/prompt-dialog.js | 1 + awx/ui/client/src/shared/prompt/prompt.less | 4 ++ .../src/teams/list/teams-list.controller.js | 7 ++- .../list/templates-list.controller.js | 61 +++++++++++-------- .../client/src/templates/templates.strings.js | 6 ++ .../workflow-maker.partial.html | 10 ++- .../src/users/list/users-list.controller.js | 3 +- .../workflow-results.service.js | 12 ++-- .../templates-list.controller-test.js | 34 +++++++++++ 21 files changed, 136 insertions(+), 64 deletions(-) diff --git a/awx/ui/client/index.template.ejs b/awx/ui/client/index.template.ejs index 5b082eb6e7..0301d42da0 100644 --- a/awx/ui/client/index.template.ejs +++ b/awx/ui/client/index.template.ejs @@ -33,7 +33,10 @@
- +
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 efb3bfb9d1..da2b27858b 100644 --- a/awx/ui/client/src/credentials/list/credentials-list.controller.js +++ b/awx/ui/client/src/credentials/list/credentials-list.controller.js @@ -118,7 +118,7 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ProcessErrors', ' counts.forEach(countObj => { if(countObj.count && countObj.count > 0) { - invalidateRelatedLines.push(`
${countObj.label} ${countObj.count}
`); + invalidateRelatedLines.push(`
${countObj.label}${countObj.count}
`); } }); @@ -130,7 +130,8 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ProcessErrors', ' } Prompt({ - hdr: i18n._('Delete') + ' ' + $filter('sanitize')(name), + hdr: i18n._('Delete'), + resourceName: $filter('sanitize')(name), body: deleteModalBody, action: action, actionText: 'DELETE' 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 1653946a56..75456e89f4 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 @@ -103,7 +103,7 @@ function InventoriesList($scope, counts.forEach(countObj => { if(countObj.count && countObj.count > 0) { - invalidateRelatedLines.push(`
${countObj.label} ${countObj.count}
`); + invalidateRelatedLines.push(`
${countObj.label}${countObj.count}
`); } }); @@ -117,7 +117,8 @@ function InventoriesList($scope, deleteModalBody += '
Note: ' + i18n._('The inventory will be in a pending status until the final delete is processed.') + '
'; Prompt({ - hdr: i18n._('Delete') + ' ' + $filter('sanitize')(name), + hdr: i18n._('Delete'), + resourceName: $filter('sanitize')(name), body: deleteModalBody, action: action, actionText: 'DELETE' diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js index d606a01b8d..b65c0433aa 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js @@ -147,7 +147,7 @@ counts.forEach(countObj => { if(countObj.count && countObj.count > 0) { - invalidateRelatedLines.push(`
${countObj.label} ${countObj.count}
`); + invalidateRelatedLines.push(`
${countObj.label}${countObj.count}
`); } }); @@ -159,7 +159,8 @@ } Prompt({ - hdr: i18n._('Delete Source') + ' ' + $filter('sanitize')(inventory_source.name), + hdr: i18n._('Delete Source'), + resourceName: $filter('sanitize')(inventory_source.name), body: deleteModalBody, action: action, actionText: 'DELETE' 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 8f8156951e..b6630b7c2a 100644 --- a/awx/ui/client/src/inventory-scripts/list/list.controller.js +++ b/awx/ui/client/src/inventory-scripts/list/list.controller.js @@ -84,7 +84,7 @@ export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList', counts.forEach(countObj => { if(countObj.count && countObj.count > 0) { - invalidateRelatedLines.push(`
${countObj.label} ${countObj.count}
`); + invalidateRelatedLines.push(`
${countObj.label}${countObj.count}
`); } }); @@ -96,7 +96,8 @@ export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList', } Prompt({ - hdr: i18n._('Delete') + ' ' + $filter('sanitize')(name), + hdr: i18n._('Delete'), + resourceName: $filter('sanitize')(name), body: deleteModalBody, action: action, actionText: 'DELETE' 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 8846620f73..5175aa373e 100644 --- a/awx/ui/client/src/job-results/job-results.service.js +++ b/awx/ui/client/src/job-results/job-results.service.js @@ -91,11 +91,9 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo deleteJob: function(job) { Prompt({ hdr: i18n._("Delete Job"), + resourceName: `#${job.id} ` + $filter('sanitize')(job.name), body: `
- ${i18n._("Are you sure you want to delete the job below?")} -
-
- #${job.id} ${$filter('sanitize')(job.name)} + ${i18n._("Are you sure you want to delete this job?")}
`, action: function() { Wait('start'); @@ -140,11 +138,9 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo Prompt({ hdr: i18n._('Cancel Job'), + resourceName: `#${job.id} ` + $filter('sanitize')(job.name), body: `
- ${i18n._("Are you sure you want to cancel the job below?")} -
-
- #${job.id} ${$filter('sanitize')(job.name)} + ${i18n._("Are you sure you want to cancel this job?")}
`, action: function() { Wait('start'); 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 d6c3a0d4f1..3900fc0da1 100644 --- a/awx/ui/client/src/jobs/factories/delete-job.factory.js +++ b/awx/ui/client/src/jobs/factories/delete-job.factory.js @@ -106,10 +106,11 @@ scope.removeCancelJob(); } scope.removeCancelJob = scope.$on('CancelJob', function() { - var cancelBody = "
" + i18n._("Submit the request to cancel?") + "
"; - var deleteBody = "
" + i18n._("Are you sure you want to delete the job below?") + "
#" + id + " " + $filter('sanitize')(job.name) + "
"; + var cancelBody = "
" + i18n._("Are you sure you want to submit the request to cancel this job?") + "
"; + var deleteBody = "
" + i18n._("Are you sure you want to delete this job?") + "
"; Prompt({ hdr: hdr, + resourceName: `#${job.id} ` + $filter('sanitize')(job.name), body: (action_label === 'cancel' || job.status === 'new') ? cancelBody : deleteBody, action: action, actionText: (action_label === 'cancel' || job.status === 'new') ? i18n._("OK") : i18n._("DELETE") 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 6a6cf071e4..6c3eb4b5bf 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 @@ -193,10 +193,11 @@ }); }); }; - var bodyHtml = '
' + i18n._('Are you sure you want to delete the notification template below?') + '
' + $filter('sanitize')(name) + '
'; + Prompt({ hdr: i18n._('Delete'), - body: bodyHtml, + resourceName: $filter('sanitize')(name), + body: '
' + i18n._('Are you sure you want to delete this notification template?') + '
', action: action, actionText: i18n._('DELETE') }); 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 dd938c5f47..6838b9cbd6 100644 --- a/awx/ui/client/src/organizations/list/organizations-list.controller.js +++ b/awx/ui/client/src/organizations/list/organizations-list.controller.js @@ -169,7 +169,8 @@ export default ['$stateParams', '$scope', '$rootScope', Prompt({ hdr: i18n._('Delete'), - body: '
' + i18n._('Are you sure you want to delete the organization below? This makes everything in this organization unavailable.') + '
' + $filter('sanitize')(name) + '
', + resourceName: $filter('sanitize')(name), + body: '
' + i18n._('Are you sure you want to delete this organization? This makes everything in this organization unavailable.') + '
', action: action, actionText: i18n._('DELETE') }); 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 32f0c13179..267eebe887 100644 --- a/awx/ui/client/src/projects/list/projects-list.controller.js +++ b/awx/ui/client/src/projects/list/projects-list.controller.js @@ -210,7 +210,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', counts.forEach(countObj => { if(countObj.count && countObj.count > 0) { - invalidateRelatedLines.push(`
${countObj.label} ${countObj.count}
`); + invalidateRelatedLines.push(`
${countObj.label}${countObj.count}
`); } }); @@ -222,7 +222,8 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', } Prompt({ - hdr: i18n._('Delete') + ' ' + $filter('sanitize')(name), + hdr: i18n._('Delete'), + resourceName: $filter('sanitize')(name), body: deleteModalBody, action: action, actionText: 'DELETE' 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 e1f9376b48..2321028055 100644 --- a/awx/ui/client/src/scheduler/factories/delete-schedule.factory.js +++ b/awx/ui/client/src/scheduler/factories/delete-schedule.factory.js @@ -54,7 +54,8 @@ export default Prompt({ hdr: hdr, - body: '
Are you sure you want to delete the schedule below?
' + $filter('sanitize')(schedule.name) + '
', + resourceName: $filter('sanitize')(schedule.name), + body: '
Are you sure you want to delete this schedule?
', action: action, actionText: 'DELETE', backdrop: false diff --git a/awx/ui/client/src/shared/modal/modal.less b/awx/ui/client/src/shared/modal/modal.less index 9c741f4131..46cdd03031 100644 --- a/awx/ui/client/src/shared/modal/modal.less +++ b/awx/ui/client/src/shared/modal/modal.less @@ -123,3 +123,7 @@ .Modal-footerButton + .Modal-footerButton { margin-left: 20px; } + +.Modal-titleResourceName { + color: @default-err; +} diff --git a/awx/ui/client/src/shared/prompt-dialog.js b/awx/ui/client/src/shared/prompt-dialog.js index dcb1812f78..2d5cc58ddf 100644 --- a/awx/ui/client/src/shared/prompt-dialog.js +++ b/awx/ui/client/src/shared/prompt-dialog.js @@ -39,6 +39,7 @@ angular.module('PromptDialog', ['Utilities']) scope = dialog.scope(), cls, local_backdrop; scope.promptHeader = params.hdr; + scope.promptResourceName = params.resourceName; scope.promptBody = params.body; scope.promptAction = params.action; scope.promptActionText = (params.actionText === null || params.actionText === undefined || params.actionText === '') ? 'YES' : params.actionText; diff --git a/awx/ui/client/src/shared/prompt/prompt.less b/awx/ui/client/src/shared/prompt/prompt.less index 18c655de99..b2ad010803 100644 --- a/awx/ui/client/src/shared/prompt/prompt.less +++ b/awx/ui/client/src/shared/prompt/prompt.less @@ -23,3 +23,7 @@ font-weight: bold; text-transform: uppercase; } + +.Prompt-warningResourceTitle { + margin-right: 10px; +} 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 b4d0176213..32b90528f8 100644 --- a/awx/ui/client/src/teams/list/teams-list.controller.js +++ b/awx/ui/client/src/teams/list/teams-list.controller.js @@ -6,9 +6,9 @@ export default ['$scope', 'Rest', 'TeamList', 'Prompt', 'ProcessErrors', 'GetBasePath', 'Wait', '$state', '$filter', - 'rbacUiControlService', 'Dataset', + 'rbacUiControlService', 'Dataset', 'i18n', function($scope, Rest, TeamList, Prompt, ProcessErrors, - GetBasePath, Wait, $state, $filter, rbacUiControlService, Dataset) { + GetBasePath, Wait, $state, $filter, rbacUiControlService, Dataset, i18n) { var list = TeamList, defaultUrl = GetBasePath('teams'); @@ -77,7 +77,8 @@ export default ['$scope', 'Rest', 'TeamList', 'Prompt', Prompt({ hdr: 'Delete', - body: '
Are you sure you want to delete the team below?
' + $filter('sanitize')(name) + '
', + resourceName: $filter('sanitize')(name), + body: '
' + i18n._('Are you sure you want to delete this team?') + '
', action: action, actionText: 'DELETE' }); diff --git a/awx/ui/client/src/templates/list/templates-list.controller.js b/awx/ui/client/src/templates/list/templates-list.controller.js index 9ecdecdd9d..bd25143132 100644 --- a/awx/ui/client/src/templates/list/templates-list.controller.js +++ b/awx/ui/client/src/templates/list/templates-list.controller.js @@ -150,31 +150,44 @@ export default ['$scope', '$rootScope', } }; - jobTemplate.getDependentResourceCounts(template.id) - .then((counts) => { - const invalidateRelatedLines = []; - let deleteModalBody = `
${TemplatesStrings.get('jobTemplates.deleteJobTemplate.CONFIRM')}
`; - - counts.forEach(countObj => { - if(countObj.count && countObj.count > 0) { - invalidateRelatedLines.push(`
${countObj.label} ${countObj.count}
`); - } - }); - - if (invalidateRelatedLines && invalidateRelatedLines.length > 0) { - deleteModalBody = `
${TemplatesStrings.get('jobTemplates.deleteJobTemplate.CONFIRM')} ${TemplatesStrings.get('jobTemplates.deleteJobTemplate.INVALIDATE')}
`; - invalidateRelatedLines.forEach(invalidateRelatedLine => { - deleteModalBody += invalidateRelatedLine; - }); - } - - Prompt({ - hdr: i18n._('Delete') + ' ' + $filter('sanitize')(template.name), - body: deleteModalBody, - action: action, - actionText: 'DELETE' - }); + if(template.type && (template.type === 'Workflow Job Template' || template.type === 'workflow_job_template')) { + Prompt({ + hdr: i18n._('Delete'), + resourceName: $filter('sanitize')(template.name), + body: TemplatesStrings.get('workflowJobTemplates.deleteWorkflowJobTemplate.CONFIRM'), + action: action, + actionText: 'DELETE' }); + } + else if(template.type && (template.type === 'Job Template' || template.type === 'job_template')) { + + jobTemplate.getDependentResourceCounts(template.id) + .then((counts) => { + const invalidateRelatedLines = []; + let deleteModalBody = `
${TemplatesStrings.get('jobTemplates.deleteJobTemplate.CONFIRM')}
`; + + counts.forEach(countObj => { + if(countObj.count && countObj.count > 0) { + invalidateRelatedLines.push(`
${countObj.label}${countObj.count}
`); + } + }); + + if (invalidateRelatedLines && invalidateRelatedLines.length > 0) { + deleteModalBody = `
${TemplatesStrings.get('jobTemplates.deleteJobTemplate.CONFIRM')} ${TemplatesStrings.get('jobTemplates.deleteJobTemplate.INVALIDATE')}
`; + invalidateRelatedLines.forEach(invalidateRelatedLine => { + deleteModalBody += invalidateRelatedLine; + }); + } + + Prompt({ + hdr: i18n._('Delete'), + resourceName: $filter('sanitize')(template.name), + body: deleteModalBody, + action: action, + actionText: 'DELETE' + }); + }); + } } else { Alert('Error: Unable to delete template', 'Template parameter is missing'); diff --git a/awx/ui/client/src/templates/templates.strings.js b/awx/ui/client/src/templates/templates.strings.js index d8150b0d73..2391ea8134 100644 --- a/awx/ui/client/src/templates/templates.strings.js +++ b/awx/ui/client/src/templates/templates.strings.js @@ -10,6 +10,12 @@ function TemplatesStrings (BaseString) { INVALIDATE: t.s('Doing so will invalidate the following:') } }; + + ns.workflowJobTemplates = { + deleteWorkflowJobTemplate: { + CONFIRM: t.s('Are you sure you want to delete this workflow job template?') + } + }; } TemplatesStrings.$inject = ['BaseStringService']; diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html index 57e1344ac0..a52e878e71 100644 --- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html +++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html @@ -1,8 +1,12 @@