shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity

don't replace input source unless changed

Browse Source
This commit is contained in:
Jake McDermott 2019-03-13 18:35:50 -04:00
parent 215c3c87e5
commit 43456d13c4
No known key found for this signature in database
GPG Key ID: 9A6F084352C3A0B7
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
awx/ui/client/features/credentials/add-edit-credentials.controller.js
View File

@ -141,6 +141,7 @@ function AddEditCredentialsController (
vm.inputSources.initialItems = credential.get('related.input_sources.results');
vm.inputSources.items = [];
vm.inputSources.changedInputFields = [];
if (credential.get('credential_type') === credentialType.get('id')) {
vm.inputSources.items = credential.get('related.input_sources.results');
}
@ -198,6 +199,7 @@ function AddEditCredentialsController (
credentialId: null,
credentialName: null,
metadataInputs: null,
changedInputFields: [],
initialItems: credential.get('related.input_sources.results'),
items: credential.get('related.input_sources.results'),
};
@ -224,6 +226,7 @@ function AddEditCredentialsController (
vm.form[field]._tagValue = '';
vm.inputSources.items = vm.inputSources.items
.filter(({ input_field_name }) => input_field_name !== field);
vm.inputSources.changedInputFields.push(field);
};
vm.onInputSourceOpen = (field) => {
@ -325,6 +328,8 @@ function AddEditCredentialsController (
}
},
}]);
// Record that this field was changed
vm.inputSources.changedInputFields.push(field);
// Now that we've extracted and stored the selected source credential and metadata values
// for this field, we clear the state for the source credential lookup and metadata form.
vm.inputSources.field = null;
@ -502,15 +507,17 @@ function AddEditCredentialsController (
const updatedLinkedFieldNames = vm.inputSources.items
.map(({ input_field_name }) => input_field_name);
const fieldsToDisassociate = [...initialLinkedFieldNames]
.filter(name => !updatedLinkedFieldNames.includes(name));
const fieldsToAssociate = [...updatedLinkedFieldNames]
.filter(name => !initialLinkedFieldNames.includes(name));
const fieldsToDisassociate = initialLinkedFieldNames
.filter(name => !updatedLinkedFieldNames.includes(name))
.concat(updatedLinkedFieldNames)
.filter(name => vm.inputSources.changedInputFields.includes(name));
const fieldsToAssociate = updatedLinkedFieldNames
.filter(name => vm.inputSources.changedInputFields.includes(name));
const sourcesToDisassociate = [...fieldsToDisassociate]
const sourcesToDisassociate = fieldsToDisassociate
.map(name => vm.inputSources.initialItems
.find(({ input_field_name }) => input_field_name === name));
const sourcesToAssociate = [...fieldsToAssociate]
const sourcesToAssociate = fieldsToAssociate
.map(name => vm.inputSources.items
.find(({ input_field_name }) => input_field_name === name));