mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-24 20:24:05 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

⚡ Fix some minor issues

Browse source
This commit is contained in:
Jan Oberhauser 2020-02-08 18:46:41 -08:00
parent 5594543ec8
commit 15e92ca494
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/editor-ui/src/components/CredentialsInput.vue
View file

@ -255,6 +255,9 @@ export default mixins(
} else { } else {
// Exists already but got maybe changed. So save first // Exists already but got maybe changed. So save first
credentialData = await this.updateCredentials(false) as ICredentialsDecryptedResponse; credentialData = await this.updateCredentials(false) as ICredentialsDecryptedResponse;
if (credentialData === null) {
return;
}
} }
try { try {
@ -279,8 +282,8 @@ export default mixins(
// As data does not get displayed directly it does not matter what data. // As data does not get displayed directly it does not matter what data.
if (this.credentialData === null) { if (this.credentialData === null) {
// Are new credentials so did not get send via "credentialData" // Are new credentials so did not get send via "credentialData"
this.credentialDataTemp = credentialData as ICredentialsDecryptedResponse; Vue.set(this, 'credentialDataTemp', credentialData);
Vue.set(this.credentialDataTemp.data, 'oauthTokenData', {}); Vue.set(this.credentialDataTemp!.data!, 'oauthTokenData', {});
} else { } else {
// Credentials did already exist so can be set directly // Credentials did already exist so can be set directly
Vue.set(this.credentialData.data, 'oauthTokenData', {}); Vue.set(this.credentialData.data, 'oauthTokenData', {});
@ -311,7 +314,7 @@ export default mixins(
window.addEventListener('message', receiveMessage, false); window.addEventListener('message', receiveMessage, false);
}, },
async updateCredentials (closeDialog: boolean): Promise<ICredentialsResponse> { async updateCredentials (closeDialog: boolean): Promise<ICredentialsResponse | null> {
const nodesAccess: ICredentialNodeAccess[] = []; const nodesAccess: ICredentialNodeAccess[] = [];
const addedNodeTypes: string[] = []; const addedNodeTypes: string[] = [];
@ -345,7 +348,7 @@ export default mixins(
result = await this.restApi().updateCredentials((this.credentialDataDynamic as ICredentialsDecryptedResponse).id as string, newCredentials); result = await this.restApi().updateCredentials((this.credentialDataDynamic as ICredentialsDecryptedResponse).id as string, newCredentials);
} catch (error) { } catch (error) {
this.$showError(error, 'Problem Updating Credentials', 'There was a problem updating the credentials:'); this.$showError(error, 'Problem Updating Credentials', 'There was a problem updating the credentials:');
return; return null;
} }
// Update also in local store // Update also in local store

2
packages/editor-ui/src/components/NodeCredentials.vue
View file

@ -136,7 +136,7 @@ export default mixins(
this.credentialNewDialogVisible = false; this.credentialNewDialogVisible = false;
}, },
async credentialsCreated (eventData: ICredentialsCreatedEvent) { async credentialsCreated (eventData: ICredentialsCreatedEvent) {
await this.credentialsUpdated(eventData.data as ICredentialsResponse); await this.credentialsUpdated(eventData);
}, },
credentialsUpdated (eventData: ICredentialsCreatedEvent) { credentialsUpdated (eventData: ICredentialsCreatedEvent) {
if (!this.credentialTypesNode.includes(eventData.data.type)) { if (!this.credentialTypesNode.includes(eventData.data.type)) {