From d25f1d13571349bbbfc5e9c07e55294e35a571a3 Mon Sep 17 00:00:00 2001 From: Kia Lam Date: Fri, 29 Mar 2019 09:22:15 -0400 Subject: [PATCH] Format jt details for popover use. --- .../src/partials/job-template-details.html | 2 +- .../forms/workflow-node-form.controller.js | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/partials/job-template-details.html b/awx/ui/client/src/partials/job-template-details.html index bbce5ece91..a494140fe5 100644 --- a/awx/ui/client/src/partials/job-template-details.html +++ b/awx/ui/client/src/partials/job-template-details.html @@ -1,4 +1,4 @@
- ?
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js index 82ad803ded..fc4fa837b1 100644 --- a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js +++ b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js @@ -656,6 +656,28 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService }); }; + const formatPopOverDetails = (model) => { + model.popOverDetails = {}; + model.popOverDetails.playbook = model.playbook || i18n._('NONE SELECTED'); + Object.keys(model.summary_fields).forEach(field => { + if (field === 'project') { + model.popOverDetails.project = model.summary_fields[field].name || i18n._('NONE SELECTED'); + } + if (field === 'inventory') { + model.popOverDetails.inventory = model.summary_fields[field].name || i18n._('NONE SELECTED'); + } + if (field === 'credentials') { + if (model.summary_fields[field].length <= 0) { + model.popOverDetails.credentials = i18n._('NONE SELECTED'); + } + else { + const credentialNames = model.summary_fields[field].map(({name}) => name); + model.popOverDetails.credentials = credentialNames.join('
'); + } + } + }); + }; + $scope.openPromptModal = () => { $scope.promptData.triggerModalOpen = true; }; @@ -677,6 +699,9 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService switch($scope.activeTab) { case 'jobs': $scope.wf_maker_templates.forEach((row, i) => { + if (row.type === 'job_template') { + formatPopOverDetails(row); + } if(row.id === unifiedJobTemplateId) { $scope.wf_maker_templates[i].checked = 1; }