Updated delete warnings to indicate resources that may be invalidated as a result of deletion

This commit is contained in:
mabashian
2017-11-08 16:38:34 -05:00
parent 74c9b9cf6a
commit 4cd2f93c31
32 changed files with 807 additions and 133 deletions

View File

@@ -27,6 +27,11 @@ function CredentialsStrings (BaseString) {
ns.permissions = { ns.permissions = {
TITLE: t.s('CREDENTIALS PERMISSIONS') TITLE: t.s('CREDENTIALS PERMISSIONS')
}; };
ns.deleteCredential = {
CONFIRM: t.s('Are you sure you want to delete this credential?'),
INVALIDATE: t.s('Doing so will invalidate the following:')
};
} }
CredentialsStrings.$inject = ['BaseStringService']; CredentialsStrings.$inject = ['BaseStringService'];

View File

@@ -42,7 +42,7 @@
</div> </div>
<div class="Modal-footer"> <div class="Modal-footer">
<a href="#" data-target="#prompt-modal" data-dismiss="modal" id="prompt_cancel_btn" class="btn Modal-defaultButton Modal-footerButton" translate>CANCEL</a> <a href="#" data-target="#prompt-modal" data-dismiss="modal" id="prompt_cancel_btn" class="btn Modal-defaultButton Modal-footerButton" translate>CANCEL</a>
<a href="" ng-class="promptActionBtnClass" ng-click="promptAction()" id="prompt_action_btn" class="btn Modal-footerButton" ng-bind="promptActionText"></a> <a href="" ng-hide="hideActionButton" ng-class="promptActionBtnClass" ng-click="promptAction()" id="prompt_action_btn" class="btn Modal-footerButton" ng-bind="promptActionText"></a>
</div> </div>
</div> </div>
<!-- modal-content --> <!-- modal-content -->

View File

@@ -77,12 +77,16 @@ function search (params, config) {
}); });
} }
function httpGet (resource) { function httpGet (resource, config) {
const req = { const req = {
method: 'GET', method: 'GET',
url: this.path url: this.path
}; };
if (config && config.params) {
req.params = config.params;
}
if (typeof resource === 'object') { if (typeof resource === 'object') {
this.model.GET = resource; this.model.GET = resource;
@@ -143,6 +147,19 @@ function httpOptions (resource) {
}); });
} }
function httpDelete (resource) {
const req = {
method: 'DELETE',
url: this.path
};
if (resource) {
req.url = `${this.path}${resource}/`;
}
return $http(req).then(res => res);
}
function options (keys) { function options (keys) {
return this.find('options', keys); return this.find('options', keys);
} }
@@ -349,6 +366,32 @@ function graft (id) {
return new this.Constructor('get', item, true); return new this.Constructor('get', item, true);
} }
function getDependentResourceCounts (id) {
if (this.setDependentResources) {
this.setDependentResources(id);
} else {
return Promise.resolve([]);
}
const dependentResourcePromises = [];
this.dependentResources.forEach(dependentResource => {
const config = {};
if (dependentResource.params) {
config.params = dependentResource.params;
}
dependentResourcePromises.push(dependentResource.model.http.get(undefined, config)
.then((val) => ({
label: dependentResource.model.label,
count: val.data.count
})));
});
return Promise.all(dependentResourcePromises);
}
/** /**
* `create` is called on instantiation of every model. Models can be * `create` is called on instantiation of every model. Models can be
* instantiated empty or with `GET` and/or `OPTIONS` requests that yield data. * instantiated empty or with `GET` and/or `OPTIONS` requests that yield data.
@@ -407,12 +450,14 @@ function BaseModel (path, settings) {
this.set = set; this.set = set;
this.unset = unset; this.unset = unset;
this.extend = extend; this.extend = extend;
this.getDependentResourceCounts = getDependentResourceCounts;
this.http = { this.http = {
get: httpGet.bind(this), get: httpGet.bind(this),
options: httpOptions.bind(this), options: httpOptions.bind(this),
post: httpPost.bind(this), post: httpPost.bind(this),
put: httpPut.bind(this), put: httpPut.bind(this),
delete: httpDelete.bind(this)
}; };
this.model = {}; this.model = {};

View File

@@ -1,6 +1,11 @@
const ENCRYPTED_VALUE = '$encrypted$'; const ENCRYPTED_VALUE = '$encrypted$';
let BaseModel; let BaseModel;
let ProjectModel;
let JobTemplateModel;
let InventoryModel;
let InventorySourceModel;
let ModelsStrings;
function createFormSchema (method, config) { function createFormSchema (method, config) {
if (!config) { if (!config) {
@@ -40,22 +45,73 @@ function assignInputGroupValues (inputs) {
}); });
} }
function setDependentResources (id) {
this.dependentResources = [
{
model: new ProjectModel(),
params: {
credential: id
}
},
{
model: new JobTemplateModel(),
params: {
credential: id,
ask_credential_on_launch: false
}
},
{
model: new InventoryModel(),
params: {
insights_credential: id
}
},
{
model: new InventorySourceModel(),
params: {
credential: id
}
}
];
}
function CredentialModel (method, resource, graft) { function CredentialModel (method, resource, graft) {
BaseModel.call(this, 'credentials'); BaseModel.call(this, 'credentials');
this.Constructor = CredentialModel; this.Constructor = CredentialModel;
this.createFormSchema = createFormSchema.bind(this); this.createFormSchema = createFormSchema.bind(this);
this.assignInputGroupValues = assignInputGroupValues.bind(this); this.assignInputGroupValues = assignInputGroupValues.bind(this);
this.setDependentResources = setDependentResources.bind(this);
this.label = ModelsStrings.get('labels.CREDENTIAL');
return this.create(method, resource, graft); return this.create(method, resource, graft);
} }
function CredentialModelLoader (_BaseModel_) { function CredentialModelLoader (
_BaseModel_,
_ProjectModel_,
_JobTemplateModel_,
_InventoryModel_,
_InventorySourceModel_,
_ModelsStrings_
) {
BaseModel = _BaseModel_; BaseModel = _BaseModel_;
ProjectModel = _ProjectModel_;
JobTemplateModel = _JobTemplateModel_;
InventoryModel = _InventoryModel_;
InventorySourceModel = _InventorySourceModel_;
ModelsStrings = _ModelsStrings_;
return CredentialModel; return CredentialModel;
} }
CredentialModelLoader.$inject = ['BaseModel']; CredentialModelLoader.$inject = [
'BaseModel',
'ProjectModel',
'JobTemplateModel',
'InventoryModel',
'InventorySourceModel',
'ModelsStrings'
];
export default CredentialModelLoader; export default CredentialModelLoader;

View File

@@ -1,4 +1,6 @@
let BaseModel; let BaseModel;
let CredentialModel;
let ModelsStrings;
function categorizeByKind () { function categorizeByKind () {
const group = {}; const group = {};
@@ -30,22 +32,45 @@ function mergeInputProperties () {
}); });
} }
function setDependentResources (id) {
this.dependentResources = [
{
model: new CredentialModel(),
params: {
credential_type: id
}
}
];
}
function CredentialTypeModel (method, resource, graft) { function CredentialTypeModel (method, resource, graft) {
BaseModel.call(this, 'credential_types'); BaseModel.call(this, 'credential_types');
this.Constructor = CredentialTypeModel; this.Constructor = CredentialTypeModel;
this.categorizeByKind = categorizeByKind.bind(this); this.categorizeByKind = categorizeByKind.bind(this);
this.mergeInputProperties = mergeInputProperties.bind(this); this.mergeInputProperties = mergeInputProperties.bind(this);
this.setDependentResources = setDependentResources.bind(this);
this.label = ModelsStrings.get('labels.CREDENTIAL_TYPE');
return this.create(method, resource, graft); return this.create(method, resource, graft);
} }
function CredentialTypeModelLoader (_BaseModel_) { function CredentialTypeModelLoader (
_BaseModel_,
_CredentialModel_,
_ModelsStrings_
) {
BaseModel = _BaseModel_; BaseModel = _BaseModel_;
CredentialModel = _CredentialModel_;
ModelsStrings = _ModelsStrings_;
return CredentialTypeModel; return CredentialTypeModel;
} }
CredentialTypeModelLoader.$inject = ['BaseModel']; CredentialTypeModelLoader.$inject = [
'BaseModel',
'CredentialModel',
'ModelsStrings'
];
export default CredentialTypeModelLoader; export default CredentialTypeModelLoader;

View File

@@ -0,0 +1,44 @@
let BaseModel;
let JobTemplateModel;
let ModelsStrings;
function setDependentResources (id) {
this.dependentResources = [
{
model: new JobTemplateModel(),
params: {
inventory: id
}
}
];
}
function InventoryModel (method, resource, graft) {
BaseModel.call(this, 'inventories');
this.Constructor = InventoryModel;
this.setDependentResources = setDependentResources.bind(this);
this.label = ModelsStrings.get('labels.INVENTORY');
return this.create(method, resource, graft);
}
function InventoryModelLoader (
_BaseModel_,
_JobTemplateModel_,
_ModelsStrings_
) {
BaseModel = _BaseModel_;
JobTemplateModel = _JobTemplateModel_;
ModelsStrings = _ModelsStrings_;
return InventoryModel;
}
InventoryModelLoader.$inject = [
'BaseModel',
'JobTemplateModel',
'ModelsStrings'
];
export default InventoryModelLoader;

View File

@@ -0,0 +1,44 @@
let BaseModel;
let InventorySourceModel;
let ModelsStrings;
function setDependentResources (id) {
this.dependentResources = [
{
model: new InventorySourceModel(),
params: {
source_script: id
}
}
];
}
function InventoryScriptModel (method, resource, graft) {
BaseModel.call(this, 'inventory_scripts');
this.Constructor = InventoryScriptModel;
this.setDependentResources = setDependentResources.bind(this);
this.label = ModelsStrings.get('labels.INVENTORY_SCRIPT');
return this.create(method, resource, graft);
}
function InventoryScriptModelLoader (
_BaseModel_,
_InventorySourceModel_,
_ModelsStrings_
) {
BaseModel = _BaseModel_;
InventorySourceModel = _InventorySourceModel_;
ModelsStrings = _ModelsStrings_;
return InventoryScriptModel;
}
InventoryScriptModelLoader.$inject = [
'BaseModel',
'InventorySourceModel',
'ModelsStrings'
];
export default InventoryScriptModelLoader;

View File

@@ -0,0 +1,44 @@
let BaseModel;
let WorkflowJobTemplateNodeModel;
let ModelsStrings;
function setDependentResources (id) {
this.dependentResources = [
{
model: new WorkflowJobTemplateNodeModel(),
params: {
unified_job_template: id
}
}
];
}
function InventorySourceModel (method, resource, graft) {
BaseModel.call(this, 'inventory_sources');
this.Constructor = InventorySourceModel;
this.setDependentResources = setDependentResources.bind(this);
this.label = ModelsStrings.get('labels.INVENTORY_SOURCE');
return this.create(method, resource, graft);
}
function InventorySourceModelLoader (
_BaseModel_,
_WorkflowJobTemplateNodeModel_,
_ModelsStrings_
) {
BaseModel = _BaseModel_;
WorkflowJobTemplateNodeModel = _WorkflowJobTemplateNodeModel_;
ModelsStrings = _ModelsStrings_;
return InventorySourceModel;
}
InventorySourceModelLoader.$inject = [
'BaseModel',
'WorkflowJobTemplateNodeModel',
'ModelsStrings'
];
export default InventorySourceModelLoader;

View File

@@ -0,0 +1,44 @@
let BaseModel;
let WorkflowJobTemplateNodeModel;
let ModelsStrings;
function setDependentResources (id) {
this.dependentResources = [
{
model: new WorkflowJobTemplateNodeModel(),
params: {
unified_job_template: id
}
}
];
}
function JobTemplateModel (method, resource, graft) {
BaseModel.call(this, 'job_templates');
this.Constructor = JobTemplateModel;
this.setDependentResources = setDependentResources.bind(this);
this.label = ModelsStrings.get('labels.JOB_TEMPLATE');
return this.create(method, resource, graft);
}
function JobTemplateModelLoader (
_BaseModel_,
_WorkflowJobTemplateNodeModel_,
_ModelsStrings_
) {
BaseModel = _BaseModel_;
WorkflowJobTemplateNodeModel = _WorkflowJobTemplateNodeModel_;
ModelsStrings = _ModelsStrings_;
return JobTemplateModel;
}
JobTemplateModelLoader.$inject = [
'BaseModel',
'WorkflowJobTemplateNodeModel',
'ModelsStrings'
];
export default JobTemplateModelLoader;

View File

@@ -1,19 +1,28 @@
let BaseModel; let BaseModel;
let ModelsStrings;
function OrganizationModel (method, resource, graft) { function OrganizationModel (method, resource, graft) {
BaseModel.call(this, 'organizations'); BaseModel.call(this, 'organizations');
this.Constructor = OrganizationModel; this.Constructor = OrganizationModel;
this.label = ModelsStrings.get('labels.ORGANIZATION');
return this.create(method, resource, graft); return this.create(method, resource, graft);
} }
function OrganizationModelLoader (_BaseModel_) { function OrganizationModelLoader (
_BaseModel_,
_ModelsStrings_
) {
BaseModel = _BaseModel_; BaseModel = _BaseModel_;
ModelsStrings = _ModelsStrings_;
return OrganizationModel; return OrganizationModel;
} }
OrganizationModelLoader.$inject = ['BaseModel']; OrganizationModelLoader.$inject = [
'BaseModel',
'ModelsStrings'
];
export default OrganizationModelLoader; export default OrganizationModelLoader;

View File

@@ -0,0 +1,64 @@
let BaseModel;
let JobTemplateModel;
let WorkflowJobTemplateNodeModel;
let InventorySourceModel;
let ModelsStrings;
function setDependentResources (id) {
this.dependentResources = [
{
model: new JobTemplateModel(),
params: {
project: id
}
},
{
model: new WorkflowJobTemplateNodeModel(),
params: {
unified_job_template: id
}
},
{
model: new InventorySourceModel(),
params: {
source_project: id
}
}
];
}
function ProjectModel (method, resource, graft) {
BaseModel.call(this, 'projects');
this.Constructor = ProjectModel;
this.setDependentResources = setDependentResources.bind(this);
this.label = ModelsStrings.get('labels.PROJECT');
return this.create(method, resource, graft);
}
function ProjectModelLoader (
_BaseModel_,
_JobTemplateModel_,
_WorkflowJobTemplateNodeModel_,
_InventorySourceModel_,
_ModelsStrings_
) {
BaseModel = _BaseModel_;
JobTemplateModel = _JobTemplateModel_;
WorkflowJobTemplateNodeModel = _WorkflowJobTemplateNodeModel_;
InventorySourceModel = _InventorySourceModel_;
ModelsStrings = _ModelsStrings_;
return ProjectModel;
}
ProjectModelLoader.$inject = [
'BaseModel',
'JobTemplateModel',
'WorkflowJobTemplateNodeModel',
'InventorySourceModel',
'ModelsStrings'
];
export default ProjectModelLoader;

View File

@@ -0,0 +1,28 @@
let BaseModel;
let ModelsStrings;
function WorkflowJobTemplateNodeModel (method, resource, graft) {
BaseModel.call(this, 'workflow_job_template_nodes');
this.Constructor = WorkflowJobTemplateNodeModel;
this.label = ModelsStrings.get('labels.WORKFLOW_JOB_TEMPLATE_NODE');
return this.create(method, resource, graft);
}
function WorkflowJobTemplateNodeModelLoader (
_BaseModel_,
_ModelsStrings_
) {
BaseModel = _BaseModel_;
ModelsStrings = _ModelsStrings_;
return WorkflowJobTemplateNodeModel;
}
WorkflowJobTemplateNodeModelLoader.$inject = [
'BaseModel',
'ModelsStrings'
];
export default WorkflowJobTemplateNodeModelLoader;

View File

@@ -6,6 +6,14 @@ import Credential from '~models/Credential';
import CredentialType from '~models/CredentialType'; import CredentialType from '~models/CredentialType';
import Me from '~models/Me'; import Me from '~models/Me';
import Organization from '~models/Organization'; import Organization from '~models/Organization';
import Project from '~models/Project';
import JobTemplate from '~models/JobTemplate';
import WorkflowJobTemplateNode from '~models/WorkflowJobTemplateNode';
import InventorySource from '~models/InventorySource';
import Inventory from '~models/Inventory';
import InventoryScript from '~models/InventoryScript';
import ModelsStrings from '~models/models.strings';
const MODULE_NAME = 'at.lib.models'; const MODULE_NAME = 'at.lib.models';
@@ -18,6 +26,13 @@ angular
.service('CredentialModel', Credential) .service('CredentialModel', Credential)
.service('CredentialTypeModel', CredentialType) .service('CredentialTypeModel', CredentialType)
.service('MeModel', Me) .service('MeModel', Me)
.service('OrganizationModel', Organization); .service('OrganizationModel', Organization)
.service('ProjectModel', Project)
.service('JobTemplateModel', JobTemplate)
.service('WorkflowJobTemplateNodeModel', WorkflowJobTemplateNode)
.service('InventorySourceModel', InventorySource)
.service('InventoryModel', Inventory)
.service('InventoryScriptModel', InventoryScript)
.service('ModelsStrings', ModelsStrings);
export default MODULE_NAME; export default MODULE_NAME;

View File

@@ -0,0 +1,22 @@
function ModelsStrings (BaseString) {
BaseString.call(this, 'models');
const { t } = this;
const ns = this.models;
ns.labels = {
CREDENTIAL: t.s('Credentials'),
CREDENTIAL_TYPE: t.s('Credential Types'),
INVENTORY: t.s('Inventories'),
INVENTORY_SCRIPT: t.s('Inventory Scripts'),
INVENTORY_SOURCE: t.s('Inventory Sources'),
JOB_TEMPLATE: t.s('Job Templates'),
ORGANIZATION: t.s('Organizations'),
PROJECT: t.s('Projects'),
WORKFLOW_JOB_TEMPLATE_NODE: t.s('Workflow Job Template Nodes')
};
}
ModelsStrings.$inject = ['BaseStringService'];
export default ModelsStrings;

View File

@@ -0,0 +1,15 @@
function CredentialTypesStrings (BaseString) {
BaseString.call(this, 'credential_types');
let t = this.t;
let ns = this.credential_types;
ns.deleteCredentialType = {
CONFIRM: t.s('Are you sure you want to delete this credential type?'),
CREDENTIAL_TYPE_IN_USE: t.s('This credential type is currently being used by one or more credentials. Credentials that use this credential type must be deleted before the credential type can be deleted.')
};
}
CredentialTypesStrings.$inject = ['BaseStringService'];
export default CredentialTypesStrings;

View File

@@ -5,11 +5,16 @@
*************************************************/ *************************************************/
export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList', export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList',
'GetBasePath', 'Rest', 'ProcessErrors', 'Prompt', '$state', '$filter', 'Dataset', 'rbacUiControlService', 'Alert', '$q', 'GetBasePath', 'Rest', 'ProcessErrors', 'Prompt', '$state', '$filter',
'Dataset', 'rbacUiControlService', 'Alert', '$q', 'CredentialTypeModel',
'CredentialTypesStrings', 'i18n',
function( function(
$rootScope, $scope, Wait, CredentialTypesList, $rootScope, $scope, Wait, CredentialTypesList,
GetBasePath, Rest, ProcessErrors, Prompt, $state, $filter, Dataset, rbacUiControlService, Alert, $q GetBasePath, Rest, ProcessErrors, Prompt, $state, $filter,
Dataset, rbacUiControlService, Alert, $q, CredentialType,
CredentialTypesStrings, i18n
) { ) {
let credentialType = new CredentialType();
var defaultUrl = GetBasePath('credential_types'), var defaultUrl = GetBasePath('credential_types'),
list = CredentialTypesList; list = CredentialTypesList;
@@ -58,8 +63,7 @@ export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList',
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
Wait('start'); Wait('start');
var url = defaultUrl + id + '/'; var url = defaultUrl + id + '/';
Rest.setUrl(url); credentialType.request('delete', id)
Rest.destroy()
.then(() => { .then(() => {
let reloadListStateParams = null; let reloadListStateParams = null;
@@ -83,13 +87,29 @@ export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList',
}); });
}; };
var bodyHtml = '<div class="Prompt-bodyQuery">Are you sure you want to delete the credential type below?</div><div class="Prompt-bodyTarget">' + $filter('sanitize')(name) + '</div>'; credentialType.getDependentResourceCounts(id)
Prompt({ .then((counts) => {
hdr: 'Delete', let credentialTypeInUse = false;
body: bodyHtml, let deleteModalBody = `<div class="Prompt-bodyQuery">${CredentialTypesStrings.get('deleteCredentialType.CONFIRM')}</div>`;
action: action,
actionText: 'DELETE' counts.forEach(countObj => {
}); if(countObj.count && countObj.count > 0) {
credentialTypeInUse = true;
}
});
if (credentialTypeInUse) {
deleteModalBody = `<div class="Prompt-bodyQuery">${CredentialTypesStrings.get('deleteCredentialType.CREDENTIAL_TYPE_IN_USE')}</div>`;
}
Prompt({
hdr: i18n._('Delete') + ' ' + $filter('sanitize')(name),
body: deleteModalBody,
action: action,
hideActionButton: credentialTypeInUse ? true : false,
actionText: 'DELETE'
});
});
}; };
$scope.addCredentialType = function() { $scope.addCredentialType = function() {

View File

@@ -10,6 +10,7 @@ import credentialTypesEdit from './edit/main';
import list from './credential-types.list'; import list from './credential-types.list';
import form from './credential-types.form'; import form from './credential-types.form';
import { N_ } from '../i18n'; import { N_ } from '../i18n';
import CredentialTypesStrings from './credential-types.strings';
export default export default
angular.module('credentialTypes', [ angular.module('credentialTypes', [
@@ -19,6 +20,7 @@ angular.module('credentialTypes', [
]) ])
.factory('CredentialTypesList', list) .factory('CredentialTypesList', list)
.factory('CredentialTypesForm', form) .factory('CredentialTypesForm', form)
.service('CredentialTypesStrings', CredentialTypesStrings)
.config(['$stateProvider', 'stateDefinitionsProvider', .config(['$stateProvider', 'stateDefinitionsProvider',
function($stateProvider, stateDefinitionsProvider) { function($stateProvider, stateDefinitionsProvider) {
let stateDefinitions = stateDefinitionsProvider.$get(); let stateDefinitions = stateDefinitionsProvider.$get();

View File

@@ -6,9 +6,12 @@
export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ProcessErrors', 'GetBasePath', export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ProcessErrors', 'GetBasePath',
'Wait', '$state', '$filter', 'rbacUiControlService', 'Dataset', 'credentialType', 'i18n', 'Wait', '$state', '$filter', 'rbacUiControlService', 'Dataset', 'credentialType', 'i18n',
'CredentialModel', 'CredentialsStrings',
function($scope, Rest, CredentialList, Prompt, function($scope, Rest, CredentialList, Prompt,
ProcessErrors, GetBasePath, Wait, $state, $filter, rbacUiControlService, Dataset, ProcessErrors, GetBasePath, Wait, $state, $filter, rbacUiControlService, Dataset,
credentialType, i18n) { credentialType, i18n, Credential, CredentialsStrings) {
let credential = new Credential();
var list = CredentialList, var list = CredentialList,
defaultUrl = GetBasePath('credentials'); defaultUrl = GetBasePath('credentials');
@@ -83,8 +86,7 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ProcessErrors', '
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
Wait('start'); Wait('start');
var url = defaultUrl + id + '/'; var url = defaultUrl + id + '/';
Rest.setUrl(url); credential.request('delete', id)
Rest.destroy()
.then(() => { .then(() => {
let reloadListStateParams = null; let reloadListStateParams = null;
@@ -109,12 +111,31 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ProcessErrors', '
}); });
}; };
Prompt({ credential.getDependentResourceCounts(id)
hdr: i18n._('Delete'), .then((counts) => {
body: '<div class="Prompt-bodyQuery">' + i18n._('Are you sure you want to delete the credential below?') + '</div><div class="Prompt-bodyTarget">' + $filter('sanitize')(name) + '</div>', const invalidateRelatedLines = [];
action: action, let deleteModalBody = `<div class="Prompt-bodyQuery">${CredentialsStrings.get('deleteCredential.CONFIRM')}</div>`;
actionText: i18n._('DELETE')
}); counts.forEach(countObj => {
if(countObj.count && countObj.count > 0) {
invalidateRelatedLines.push(`<div>${countObj.label} <span class="badge List-titleBadge">${countObj.count}</span></div>`);
}
});
if (invalidateRelatedLines && invalidateRelatedLines.length > 0) {
deleteModalBody = `<div class="Prompt-bodyQuery">${CredentialsStrings.get('deleteCredential.CONFIRM')} ${CredentialsStrings.get('deleteCredential.INVALIDATE')}</div>`;
invalidateRelatedLines.forEach(invalidateRelatedLine => {
deleteModalBody += invalidateRelatedLine;
});
}
Prompt({
hdr: i18n._('Delete') + ' ' + $filter('sanitize')(name),
body: deleteModalBody,
action: action,
actionText: 'DELETE'
});
});
}; };
} }
]; ];

View File

@@ -13,7 +13,9 @@
function InventoriesList($scope, function InventoriesList($scope,
$filter, Rest, InventoryList, Prompt, $filter, Rest, InventoryList, Prompt,
ProcessErrors, GetBasePath, Wait, $state, ProcessErrors, GetBasePath, Wait, $state,
Dataset, canAdd, i18n) { Dataset, canAdd, i18n, Inventory, InventoryHostsStrings) {
let inventory = new Inventory();
let list = InventoryList, let list = InventoryList,
defaultUrl = GetBasePath('inventory'); defaultUrl = GetBasePath('inventory');
@@ -83,8 +85,7 @@ function InventoriesList($scope,
var url = defaultUrl + id + '/'; var url = defaultUrl + id + '/';
Wait('start'); Wait('start');
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
Rest.setUrl(url); inventory.request('delete', id)
Rest.destroy()
.then(() => { .then(() => {
Wait('stop'); Wait('stop');
}) })
@@ -95,13 +96,33 @@ function InventoriesList($scope,
}); });
}; };
Prompt({ inventory.getDependentResourceCounts(id)
hdr: 'Delete', .then((counts) => {
body: '<div class="Prompt-bodyQuery">' + i18n._('Are you sure you want to delete the inventory below?') + '</div><div class="Prompt-bodyTarget">' + $filter('sanitize')(name) + '</div>' + const invalidateRelatedLines = [];
'<div class="Prompt-bodyNote"><span class="Prompt-bodyNote--emphasis">Note:</span> ' + i18n._('The inventory will be in a pending status until the final delete is processed.') + '</div>', let deleteModalBody = `<div class="Prompt-bodyQuery">${InventoryHostsStrings.get('deleteInventory.CONFIRM')}</div>`;
action: action,
actionText: i18n._('DELETE') counts.forEach(countObj => {
}); if(countObj.count && countObj.count > 0) {
invalidateRelatedLines.push(`<div>${countObj.label} <span class="badge List-titleBadge">${countObj.count}</span></div>`);
}
});
if (invalidateRelatedLines && invalidateRelatedLines.length > 0) {
deleteModalBody = `<div class="Prompt-bodyQuery">${InventoryHostsStrings.get('deleteInventory.CONFIRM')} ${InventoryHostsStrings.get('deleteInventory.INVALIDATE')}</div>`;
invalidateRelatedLines.forEach(invalidateRelatedLine => {
deleteModalBody += invalidateRelatedLine;
});
}
deleteModalBody += '<div class="Prompt-bodyNote"><span class="Prompt-bodyNote--emphasis">Note:</span> ' + i18n._('The inventory will be in a pending status until the final delete is processed.') + '</div>';
Prompt({
hdr: i18n._('Delete') + ' ' + $filter('sanitize')(name),
body: deleteModalBody,
action: action,
actionText: 'DELETE'
});
});
}; };
$scope.$on(`ws-inventories`, function(e, data){ $scope.$on(`ws-inventories`, function(e, data){
@@ -129,5 +150,6 @@ function InventoriesList($scope,
export default ['$scope', export default ['$scope',
'$filter', 'Rest', 'InventoryList', 'Prompt', '$filter', 'Rest', 'InventoryList', 'Prompt',
'ProcessErrors', 'GetBasePath', 'Wait', 'ProcessErrors', 'GetBasePath', 'Wait',
'$state', 'Dataset', 'canAdd', 'i18n', InventoriesList '$state', 'Dataset', 'canAdd', 'i18n', 'InventoryModel',
'InventoryHostsStrings', InventoriesList
]; ];

View File

@@ -9,12 +9,15 @@
'ViewUpdateStatus', 'rbacUiControlService', 'GetBasePath', 'ViewUpdateStatus', 'rbacUiControlService', 'GetBasePath',
'GetSyncStatusMsg', 'Dataset', 'Find', 'QuerySet', 'GetSyncStatusMsg', 'Dataset', 'Find', 'QuerySet',
'inventoryData', '$filter', 'Prompt', 'Wait', 'SourcesService', 'inventorySourceOptions', 'inventoryData', '$filter', 'Prompt', 'Wait', 'SourcesService', 'inventorySourceOptions',
'canAdd', 'hasSyncableSources', 'i18n', 'canAdd', 'hasSyncableSources', 'i18n', 'InventoryHostsStrings', 'InventorySourceModel',
function($scope, $rootScope, $state, $stateParams, SourcesListDefinition, function($scope, $rootScope, $state, $stateParams, SourcesListDefinition,
InventoryUpdate, CancelSourceUpdate, InventoryUpdate, CancelSourceUpdate,
ViewUpdateStatus, rbacUiControlService, GetBasePath, GetSyncStatusMsg, ViewUpdateStatus, rbacUiControlService, GetBasePath, GetSyncStatusMsg,
Dataset, Find, qs, inventoryData, $filter, Prompt, Dataset, Find, qs, inventoryData, $filter, Prompt,
Wait, SourcesService, inventorySourceOptions, canAdd, hasSyncableSources, i18n){ Wait, SourcesService, inventorySourceOptions, canAdd, hasSyncableSources, i18n,
InventoryHostsStrings, InventorySource){
let inventorySource = new InventorySource();
let list = SourcesListDefinition; let list = SourcesListDefinition;
var inventory_source; var inventory_source;
@@ -117,7 +120,6 @@
$state.go('inventories.edit.inventory_sources.edit', {inventory_source_id: id}); $state.go('inventories.edit.inventory_sources.edit', {inventory_source_id: id});
}; };
$scope.deleteSource = function(inventory_source){ $scope.deleteSource = function(inventory_source){
var body = '<div class=\"Prompt-bodyQuery\">' + i18n._('Are you sure you want to permanently delete the inventory source below from the inventory?') + '</div><div class=\"Prompt-bodyTarget\">' + $filter('sanitize')(inventory_source.name) + '</div>';
var action = function(){ var action = function(){
delete $rootScope.promptActionBtnClass; delete $rootScope.promptActionBtnClass;
Wait('start'); Wait('start');
@@ -137,14 +139,34 @@
Wait('stop'); Wait('stop');
}); });
}; };
// Prompt depends on having $rootScope.promptActionBtnClass available...
Prompt({ inventorySource.getDependentResourceCounts(inventory_source.id)
hdr: i18n._('Delete Source'), .then((counts) => {
body: body, const invalidateRelatedLines = [];
action: action, let deleteModalBody = `<div class="Prompt-bodyQuery">${InventoryHostsStrings.get('deleteSource.CONFIRM')}</div>`;
actionText: i18n._('DELETE'),
}); counts.forEach(countObj => {
$rootScope.promptActionBtnClass = 'Modal-errorButton'; if(countObj.count && countObj.count > 0) {
invalidateRelatedLines.push(`<div>${countObj.label} <span class="badge List-titleBadge">${countObj.count}</span></div>`);
}
});
if (invalidateRelatedLines && invalidateRelatedLines.length > 0) {
deleteModalBody = `<div class="Prompt-bodyQuery">${InventoryHostsStrings.get('deleteSource.CONFIRM')} ${InventoryHostsStrings.get('deleteSource.INVALIDATE')}</div>`;
invalidateRelatedLines.forEach(invalidateRelatedLine => {
deleteModalBody += invalidateRelatedLine;
});
}
Prompt({
hdr: i18n._('Delete Source') + ' ' + $filter('sanitize')(inventory_source.name),
body: deleteModalBody,
action: action,
actionText: 'DELETE'
});
$rootScope.promptActionBtnClass = 'Modal-errorButton';
});
}; };
$scope.updateSource = function(inventory_source) { $scope.updateSource = function(inventory_source) {

View File

@@ -4,6 +4,16 @@ function InventoryHostsStrings (BaseString) {
let t = this.t; let t = this.t;
let ns = this['inventory-hosts']; let ns = this['inventory-hosts'];
ns.deleteInventory = {
CONFIRM: t.s('Are you sure you want to delete this inventory?'),
INVALIDATE: t.s('Doing so will invalidate the following:')
};
ns.deleteSource = {
CONFIRM: t.s('Are you sure you want to delete this inventory source?'),
INVALIDATE: t.s('Doing so will invalidate the following:')
};
ns.deletegroup = { ns.deletegroup = {
GROUP: count => t.p(count, 'group', 'groups'), GROUP: count => t.p(count, 'group', 'groups'),
HOST: count => t.p(count, 'host', 'hosts'), HOST: count => t.p(count, 'host', 'hosts'),

View File

@@ -0,0 +1,15 @@
function InventoryScriptsStrings (BaseString) {
BaseString.call(this, 'inventory_scripts');
let t = this.t;
let ns = this.inventory_scripts;
ns.deleteInventoryScript = {
CONFIRM: t.s('Are you sure you want to delete this inventory script?'),
INVALIDATE: t.s('Doing so will invalidate the following:')
};
}
InventoryScriptsStrings.$inject = ['BaseStringService'];
export default InventoryScriptsStrings;

View File

@@ -5,11 +5,16 @@
*************************************************/ *************************************************/
export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList', export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList',
'GetBasePath', 'Rest', 'ProcessErrors', 'Prompt', '$state', '$filter', 'Dataset', 'rbacUiControlService', 'GetBasePath', 'Rest', 'ProcessErrors', 'Prompt', '$state', '$filter',
'Dataset', 'rbacUiControlService', 'InventoryScriptModel', 'InventoryScriptsStrings',
'i18n',
function( function(
$rootScope, $scope, Wait, InventoryScriptsList, $rootScope, $scope, Wait, InventoryScriptsList,
GetBasePath, Rest, ProcessErrors, Prompt, $state, $filter, Dataset, rbacUiControlService GetBasePath, Rest, ProcessErrors, Prompt, $state, $filter,
Dataset, rbacUiControlService, InventoryScript, InventoryScriptsStrings,
i18n
) { ) {
let inventoryScript = new InventoryScript();
var defaultUrl = GetBasePath('inventory_scripts'), var defaultUrl = GetBasePath('inventory_scripts'),
list = InventoryScriptsList; list = InventoryScriptsList;
@@ -48,8 +53,7 @@ export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList',
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
Wait('start'); Wait('start');
var url = defaultUrl + id + '/'; var url = defaultUrl + id + '/';
Rest.setUrl(url); inventoryScript.request('delete', id)
Rest.destroy()
.then(() => { .then(() => {
let reloadListStateParams = null; let reloadListStateParams = null;
@@ -73,13 +77,31 @@ export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList',
}); });
}; };
var bodyHtml = '<div class="Prompt-bodyQuery">Are you sure you want to delete the inventory script below?</div><div class="Prompt-bodyTarget">' + $filter('sanitize')(name) + '</div>'; inventoryScript.getDependentResourceCounts(id)
Prompt({ .then((counts) => {
hdr: 'Delete', const invalidateRelatedLines = [];
body: bodyHtml, let deleteModalBody = `<div class="Prompt-bodyQuery">${InventoryScriptsStrings.get('deleteInventoryScript.CONFIRM')}</div>`;
action: action,
actionText: 'DELETE' counts.forEach(countObj => {
}); if(countObj.count && countObj.count > 0) {
invalidateRelatedLines.push(`<div>${countObj.label} <span class="badge List-titleBadge">${countObj.count}</span></div>`);
}
});
if (invalidateRelatedLines && invalidateRelatedLines.length > 0) {
deleteModalBody = `<div class="Prompt-bodyQuery">${InventoryScriptsStrings.get('deleteInventoryScript.CONFIRM')} ${InventoryScriptsStrings.get('deleteInventoryScript.INVALIDATE')}</div>`;
invalidateRelatedLines.forEach(invalidateRelatedLine => {
deleteModalBody += invalidateRelatedLine;
});
}
Prompt({
hdr: i18n._('Delete') + ' ' + $filter('sanitize')(name),
body: deleteModalBody,
action: action,
actionText: 'DELETE'
});
});
}; };
$scope.addCustomInv = function() { $scope.addCustomInv = function() {

View File

@@ -10,6 +10,7 @@ import inventoryScriptsEdit from './edit/main';
import list from './inventory-scripts.list'; import list from './inventory-scripts.list';
import form from './inventory-scripts.form'; import form from './inventory-scripts.form';
import { N_ } from '../i18n'; import { N_ } from '../i18n';
import InventoryScriptsStrings from './inventory-scripts.strings';
export default export default
angular.module('inventoryScripts', [ angular.module('inventoryScripts', [
@@ -19,6 +20,7 @@ angular.module('inventoryScripts', [
]) ])
.factory('InventoryScriptsList', list) .factory('InventoryScriptsList', list)
.factory('InventoryScriptsForm', form) .factory('InventoryScriptsForm', form)
.service('InventoryScriptsStrings', InventoryScriptsStrings)
.config(['$stateProvider', 'stateDefinitionsProvider', .config(['$stateProvider', 'stateDefinitionsProvider',
function($stateProvider, stateDefinitionsProvider) { function($stateProvider, stateDefinitionsProvider) {
let stateDefinitions = stateDefinitionsProvider.$get(); let stateDefinitions = stateDefinitionsProvider.$get();

View File

@@ -169,7 +169,7 @@ export default ['$stateParams', '$scope', '$rootScope',
Prompt({ Prompt({
hdr: i18n._('Delete'), hdr: i18n._('Delete'),
body: '<div class="Prompt-bodyQuery">' + i18n._('Are you sure you want to delete the organization below?') + '</div><div class="Prompt-bodyTarget">' + $filter('sanitize')(name) + '</div>', body: '<div class="Prompt-bodyQuery">' + i18n._('Are you sure you want to delete the organization below? This makes everything in this organization unavailable.') + '</div><div class="Prompt-bodyTarget">' + $filter('sanitize')(name) + '</div>',
action: action, action: action,
actionText: i18n._('DELETE') actionText: i18n._('DELETE')
}); });

View File

@@ -7,14 +7,16 @@
export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
'ProjectList', 'Prompt', 'ProcessErrors', 'GetBasePath', 'ProjectUpdate', 'ProjectList', 'Prompt', 'ProcessErrors', 'GetBasePath', 'ProjectUpdate',
'Wait', 'Empty', 'Find', 'GetProjectIcon', 'GetProjectToolTip', '$filter', 'Wait', 'Empty', 'Find', 'GetProjectIcon', 'GetProjectToolTip', '$filter',
'$state', 'rbacUiControlService', 'Dataset', 'i18n', 'QuerySet', '$state', 'rbacUiControlService', 'Dataset', 'i18n', 'QuerySet', 'ProjectModel',
'ProjectsStrings',
function($scope, $rootScope, $log, Rest, Alert, ProjectList, function($scope, $rootScope, $log, Rest, Alert, ProjectList,
Prompt, ProcessErrors, GetBasePath, ProjectUpdate, Wait, Empty, Find, Prompt, ProcessErrors, GetBasePath, ProjectUpdate, Wait, Empty, Find,
GetProjectIcon, GetProjectToolTip, $filter, $state, rbacUiControlService, GetProjectIcon, GetProjectToolTip, $filter, $state, rbacUiControlService,
Dataset, i18n, qs) { Dataset, i18n, qs, Project, ProjectsStrings) {
var list = ProjectList, let project = new Project();
defaultUrl = GetBasePath('projects');
var list = ProjectList;
init(); init();
@@ -176,9 +178,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
var action = function() { var action = function() {
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
Wait('start'); Wait('start');
var url = defaultUrl + id + '/'; project.request('delete', id)
Rest.setUrl(url);
Rest.destroy()
.then(() => { .then(() => {
let reloadListStateParams = null; let reloadListStateParams = null;
@@ -196,19 +196,38 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
}) })
.catch(({data, status}) => { .catch(({data, status}) => {
ProcessErrors($scope, data, status, null, { hdr: i18n._('Error!'), ProcessErrors($scope, data, status, null, { hdr: i18n._('Error!'),
msg: i18n.sprintf(i18n._('Call to %s failed. DELETE returned status: '), url) + status }); msg: i18n.sprintf(i18n._('Call to %s failed. DELETE returned status: '), `${project.path}${id}/`) + status });
}) })
.finally(function() { .finally(function() {
Wait('stop'); Wait('stop');
}); });
}; };
Prompt({ project.getDependentResourceCounts(id)
hdr: i18n._('Delete'), .then((counts) => {
body: '<div class="Prompt-bodyQuery">' + i18n._('Are you sure you want to delete the project below?') + '</div>' + '<div class="Prompt-bodyTarget">' + $filter('sanitize')(name) + '</div>', const invalidateRelatedLines = [];
action: action, let deleteModalBody = `<div class="Prompt-bodyQuery">${ProjectsStrings.get('deleteProject.CONFIRM')}</div>`;
actionText: 'DELETE'
}); counts.forEach(countObj => {
if(countObj.count && countObj.count > 0) {
invalidateRelatedLines.push(`<div>${countObj.label} <span class="badge List-titleBadge">${countObj.count}</span></div>`);
}
});
if (invalidateRelatedLines && invalidateRelatedLines.length > 0) {
deleteModalBody = `<div class="Prompt-bodyQuery">${ProjectsStrings.get('deleteProject.CONFIRM')} ${ProjectsStrings.get('deleteProject.INVALIDATE')}</div>`;
invalidateRelatedLines.forEach(invalidateRelatedLine => {
deleteModalBody += invalidateRelatedLine;
});
}
Prompt({
hdr: i18n._('Delete') + ' ' + $filter('sanitize')(name),
body: deleteModalBody,
action: action,
actionText: 'DELETE'
});
});
}; };
if ($scope.removeCancelUpdate) { if ($scope.removeCancelUpdate) {

View File

@@ -14,6 +14,7 @@ import GetProjectPath from './factories/get-project-path.factory';
import GetProjectIcon from './factories/get-project-icon.factory'; import GetProjectIcon from './factories/get-project-icon.factory';
import GetProjectToolTip from './factories/get-project-tool-tip.factory'; import GetProjectToolTip from './factories/get-project-tool-tip.factory';
import ProjectsTemplatesRoute from './projects-templates.route'; import ProjectsTemplatesRoute from './projects-templates.route';
import ProjectsStrings from './projects.strings';
export default export default
angular.module('Projects', []) angular.module('Projects', [])
@@ -25,6 +26,7 @@ angular.module('Projects', [])
.factory('GetProjectToolTip', GetProjectToolTip) .factory('GetProjectToolTip', GetProjectToolTip)
.factory('ProjectList', ProjectList) .factory('ProjectList', ProjectList)
.factory('ProjectsForm', ProjectsForm) .factory('ProjectsForm', ProjectsForm)
.service('ProjectsStrings', ProjectsStrings)
.config(['$stateProvider', 'stateDefinitionsProvider', '$stateExtenderProvider', .config(['$stateProvider', 'stateDefinitionsProvider', '$stateExtenderProvider',
function($stateProvider, stateDefinitionsProvider,$stateExtenderProvider) { function($stateProvider, stateDefinitionsProvider,$stateExtenderProvider) {
let stateDefinitions = stateDefinitionsProvider.$get(); let stateDefinitions = stateDefinitionsProvider.$get();

View File

@@ -0,0 +1,15 @@
function ProjectsStrings (BaseString) {
BaseString.call(this, 'projects');
let t = this.t;
let ns = this.projects;
ns.deleteProject = {
CONFIRM: t.s('Are you sure you want to delete this project?'),
INVALIDATE: t.s('Doing so will invalidate the following:')
};
}
ProjectsStrings.$inject = ['BaseStringService'];
export default ProjectsStrings;

View File

@@ -42,6 +42,7 @@ angular.module('PromptDialog', ['Utilities'])
scope.promptBody = params.body; scope.promptBody = params.body;
scope.promptAction = params.action; scope.promptAction = params.action;
scope.promptActionText = (params.actionText === null || params.actionText === undefined || params.actionText === '') ? 'YES' : params.actionText; scope.promptActionText = (params.actionText === null || params.actionText === undefined || params.actionText === '') ? 'YES' : params.actionText;
scope.hideActionButton = params.hideActionButton ? true : false;
local_backdrop = (params.backdrop === undefined) ? "static" : params.backdrop; local_backdrop = (params.backdrop === undefined) ? "static" : params.backdrop;

View File

@@ -8,14 +8,16 @@ export default ['$scope', '$rootScope',
'Alert','TemplateList', 'Prompt', 'ProcessErrors', 'Alert','TemplateList', 'Prompt', 'ProcessErrors',
'GetBasePath', 'InitiatePlaybookRun', 'Wait', '$state', '$filter', 'GetBasePath', 'InitiatePlaybookRun', 'Wait', '$state', '$filter',
'Dataset', 'rbacUiControlService', 'TemplatesService','QuerySet', 'Dataset', 'rbacUiControlService', 'TemplatesService','QuerySet',
'TemplateCopyService', 'i18n', 'TemplateCopyService', 'i18n', 'JobTemplateModel', 'TemplatesStrings',
function( function(
$scope, $rootScope, Alert, $scope, $rootScope, Alert,
TemplateList, Prompt, ProcessErrors, GetBasePath, TemplateList, Prompt, ProcessErrors, GetBasePath,
InitiatePlaybookRun, Wait, $state, $filter, Dataset, rbacUiControlService, TemplatesService, InitiatePlaybookRun, Wait, $state, $filter, Dataset, rbacUiControlService, TemplatesService,
qs, TemplateCopyService, i18n qs, TemplateCopyService, i18n, JobTemplate, TemplatesStrings
) { ) {
let jobTemplate = new JobTemplate();
var list = TemplateList; var list = TemplateList;
init(); init();
@@ -98,65 +100,85 @@ export default ['$scope', '$rootScope',
$scope.deleteJobTemplate = function(template) { $scope.deleteJobTemplate = function(template) {
if(template) { if(template) {
Prompt({ var action = function() {
hdr: i18n._('Delete'), function handleSuccessfulDelete(isWorkflow) {
body: `<div class="Prompt-bodyQuery">${i18n._("Are you sure you want to delete the template below?")}</div><div class="Prompt-bodyTarget">${$filter('sanitize')(template.name)}</div>`, let stateParamId = isWorkflow ? $state.params.workflow_job_template_id : $state.params.job_template_id;
action: function() {
function handleSuccessfulDelete(isWorkflow) { let reloadListStateParams = null;
let stateParamId = isWorkflow ? $state.params.workflow_job_template_id : $state.params.job_template_id;
let reloadListStateParams = null; if($scope.templates.length === 1 && $state.params.template_search && !_.isEmpty($state.params.template_search.page) && $state.params.template_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.template_search.page = (parseInt(reloadListStateParams.template_search.page)-1).toString();
}
if($scope.templates.length === 1 && $state.params.template_search && !_.isEmpty($state.params.template_search.page) && $state.params.template_search.page !== '1') { if (parseInt(stateParamId) === template.id) {
reloadListStateParams = _.cloneDeep($state.params); // Move the user back to the templates list
reloadListStateParams.template_search.page = (parseInt(reloadListStateParams.template_search.page)-1).toString(); $state.go("templates", reloadListStateParams, {reload: true});
} } else {
$state.go(".", reloadListStateParams, {reload: true});
}
Wait('stop');
}
if (parseInt(stateParamId) === template.id) { $('#prompt-modal').modal('hide');
// Move the user back to the templates list Wait('start');
$state.go("templates", reloadListStateParams, {reload: true}); if(template.type && (template.type === 'Workflow Job Template' || template.type === 'workflow_job_template')) {
} else { TemplatesService.deleteWorkflowJobTemplate(template.id)
$state.go(".", reloadListStateParams, {reload: true}); .then(function () {
} handleSuccessfulDelete(true);
Wait('stop'); })
} .catch(function (response) {
Wait('stop');
ProcessErrors($scope, response.data, response.status, null, { hdr: 'Error!',
msg: 'Call to delete workflow job template failed. DELETE returned status: ' + response.status + '.'});
});
}
else if(template.type && (template.type === 'Job Template' || template.type === 'job_template')) {
TemplatesService.deleteJobTemplate(template.id)
.then(function () {
handleSuccessfulDelete();
})
.catch(function (response) {
Wait('stop');
ProcessErrors($scope, response.data, response.status, null, { hdr: 'Error!',
msg: 'Call to delete job template failed. DELETE returned status: ' + response.status + '.'});
});
}
else {
Wait('stop');
Alert('Error: Unable to determine template type', 'We were unable to determine this template\'s type while deleting.');
}
};
$('#prompt-modal').modal('hide'); jobTemplate.getDependentResourceCounts(template.id)
Wait('start'); .then((counts) => {
if(template.type && (template.type === 'Workflow Job Template' || template.type === 'workflow_job_template')) { const invalidateRelatedLines = [];
TemplatesService.deleteWorkflowJobTemplate(template.id) let deleteModalBody = `<div class="Prompt-bodyQuery">${TemplatesStrings.get('jobTemplates.deleteJobTemplate.CONFIRM')}</div>`;
.then(function () {
handleSuccessfulDelete(true); counts.forEach(countObj => {
}) if(countObj.count && countObj.count > 0) {
.catch(function (response) { invalidateRelatedLines.push(`<div>${countObj.label} <span class="badge List-titleBadge">${countObj.count}</span></div>`);
Wait('stop'); }
ProcessErrors($scope, response.data, response.status, null, { hdr: 'Error!', });
msg: 'Call to delete workflow job template failed. DELETE returned status: ' + response.status + '.'});
}); if (invalidateRelatedLines && invalidateRelatedLines.length > 0) {
} deleteModalBody = `<div class="Prompt-bodyQuery">${TemplatesStrings.get('jobTemplates.deleteJobTemplate.CONFIRM')} ${TemplatesStrings.get('jobTemplates.deleteJobTemplate.INVALIDATE')}</div>`;
else if(template.type && (template.type === 'Job Template' || template.type === 'job_template')) { invalidateRelatedLines.forEach(invalidateRelatedLine => {
TemplatesService.deleteJobTemplate(template.id) deleteModalBody += invalidateRelatedLine;
.then(function () { });
handleSuccessfulDelete(); }
})
.catch(function (response) { Prompt({
Wait('stop'); hdr: i18n._('Delete') + ' ' + $filter('sanitize')(template.name),
ProcessErrors($scope, response.data, response.status, null, { hdr: 'Error!', body: deleteModalBody,
msg: 'Call to delete job template failed. DELETE returned status: ' + response.status + '.'}); action: action,
}); actionText: 'DELETE'
} });
else { });
Wait('stop'); }
Alert('Error: Unable to determine template type', 'We were unable to determine this template\'s type while deleting.'); else {
} Alert('Error: Unable to delete template', 'Template parameter is missing');
}, }
actionText: i18n._('DELETE')
});
}
else {
Alert('Error: Unable to delete template', 'Template parameter is missing');
}
}; };
$scope.submitJob = function(template) { $scope.submitJob = function(template) {

View File

@@ -21,6 +21,7 @@ import WorkflowForm from './workflows.form';
import CompletedJobsList from './completed-jobs.list'; import CompletedJobsList from './completed-jobs.list';
import InventorySourcesList from './inventory-sources.list'; import InventorySourcesList from './inventory-sources.list';
import TemplateList from './templates.list'; import TemplateList from './templates.list';
import TemplatesStrings from './templates.strings';
export default export default
angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.name, labels.name, workflowAdd.name, workflowEdit.name, angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.name, labels.name, workflowAdd.name, workflowEdit.name,
@@ -33,6 +34,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
.factory('CompletedJobsList', CompletedJobsList) .factory('CompletedJobsList', CompletedJobsList)
.factory('TemplateList', TemplateList) .factory('TemplateList', TemplateList)
.value('InventorySourcesList', InventorySourcesList) .value('InventorySourcesList', InventorySourcesList)
.service('TemplatesStrings', TemplatesStrings)
.config(['$stateProvider', 'stateDefinitionsProvider', '$stateExtenderProvider', .config(['$stateProvider', 'stateDefinitionsProvider', '$stateExtenderProvider',
function($stateProvider, stateDefinitionsProvider, $stateExtenderProvider) { function($stateProvider, stateDefinitionsProvider, $stateExtenderProvider) {
let stateTree, addJobTemplate, editJobTemplate, addWorkflow, editWorkflow, let stateTree, addJobTemplate, editJobTemplate, addWorkflow, editWorkflow,

View File

@@ -0,0 +1,17 @@
function TemplatesStrings (BaseString) {
BaseString.call(this, 'templates');
let t = this.t;
let ns = this.templates;
ns.jobTemplates = {
deleteJobTemplate: {
CONFIRM: t.s('Are you sure you want to delete this job template?'),
INVALIDATE: t.s('Doing so will invalidate the following:')
}
};
}
TemplatesStrings.$inject = ['BaseStringService'];
export default TemplatesStrings;