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

🐛 Fix error when opening ftp/sftp credentials (#2298)

Browse source 
* n8n-2513 fix error when opening credentials

* clean up validation logic
This commit is contained in:
Mutasem Aldmour 2021-10-09 20:42:30 +02:00 committed by GitHub
parent d72d6b4b41
commit d1824b9dd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
View file

@ -208,14 +208,16 @@ export default mixins(showMessage, nodeHelpers).extend({
activeNode: this.$store.getters.activeNode,
});
if (this.credentialId) {
if (!this.requiredPropertiesFilled) {
this.showValidationWarning = true;
setTimeout(() => {
if (this.credentialId) {
if (!this.requiredPropertiesFilled) {
this.showValidationWarning = true;
}
else {
this.retestCredential();
}
}
else {
this.retestCredential();
}
}
}, 0);
this.loading = false;
},
@ -329,7 +331,11 @@ export default mixins(showMessage, nodeHelpers).extend({
continue;
}
if (!this.credentialData[property.name]) {
if (property.type === 'string' && !this.credentialData[property.name]) {
return false;
}
if (property.type === 'number' && typeof this.credentialData[property.name] !== 'number') {
return false;
}
}

16
packages/editor-ui/src/components/ParameterInputExpanded.vue
View file

@ -53,7 +53,21 @@ export default Vue.extend({
},
computed: {
showRequiredErrors(): boolean {
return this.$props.parameter.type !== 'boolean' && !this.value && this.$props.parameter.required && (this.blurred || this.showValidationWarnings);
if (!this.$props.parameter.required) {
return false;
}
if (this.blurred || this.showValidationWarnings) {
if (this.$props.parameter.type === 'string') {
return !this.value;
}
if (this.$props.parameter.type === 'number') {
return typeof this.value !== 'number';
}
}
return false;
},
},
methods: {