External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-11 03:17:38 -02:30
Code Issues Packages Projects Releases Wiki 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
1 changed files with 13 additions and 6 deletions
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.initialItems = credential.get('related.input_sources.results');
vm.inputSources.items = []; vm.inputSources.items = [];
vm.inputSources.changedInputFields = [];
if (credential.get('credential_type') === credentialType.get('id')) { if (credential.get('credential_type') === credentialType.get('id')) {
vm.inputSources.items = credential.get('related.input_sources.results'); vm.inputSources.items = credential.get('related.input_sources.results');
} }
@@ -198,6 +199,7 @@ function AddEditCredentialsController (
credentialId: null, credentialId: null,
credentialName: null, credentialName: null,
metadataInputs: null, metadataInputs: null,
changedInputFields: [],
initialItems: credential.get('related.input_sources.results'), initialItems: credential.get('related.input_sources.results'),
items: credential.get('related.input_sources.results'), items: credential.get('related.input_sources.results'),
}; };
@@ -224,6 +226,7 @@ function AddEditCredentialsController (
vm.form[field]._tagValue = ''; vm.form[field]._tagValue = '';
vm.inputSources.items = vm.inputSources.items vm.inputSources.items = vm.inputSources.items
.filter(({ input_field_name }) => input_field_name !== field); .filter(({ input_field_name }) => input_field_name !== field);
vm.inputSources.changedInputFields.push(field);
}; };
vm.onInputSourceOpen = (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 // 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. // for this field, we clear the state for the source credential lookup and metadata form.
vm.inputSources.field = null; vm.inputSources.field = null;
@@ -502,15 +507,17 @@ function AddEditCredentialsController (
const updatedLinkedFieldNames = vm.inputSources.items const updatedLinkedFieldNames = vm.inputSources.items
.map(({ input_field_name }) => input_field_name); .map(({ input_field_name }) => input_field_name);
const fieldsToDisassociate = [...initialLinkedFieldNames] const fieldsToDisassociate = initialLinkedFieldNames
.filter(name => !updatedLinkedFieldNames.includes(name)); .filter(name => !updatedLinkedFieldNames.includes(name))
const fieldsToAssociate = [...updatedLinkedFieldNames] .concat(updatedLinkedFieldNames)
.filter(name => !initialLinkedFieldNames.includes(name)); .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 .map(name => vm.inputSources.initialItems
.find(({ input_field_name }) => input_field_name === name)); .find(({ input_field_name }) => input_field_name === name));
const sourcesToAssociate = [...fieldsToAssociate] const sourcesToAssociate = fieldsToAssociate
.map(name => vm.inputSources.items .map(name => vm.inputSources.items
.find(({ input_field_name }) => input_field_name === name)); .find(({ input_field_name }) => input_field_name === name));