feat(editor): Allow partial template credential setup (no-changelog) (#7899)

Enable continue button even if all credentials havent been setup
This commit is contained in:
Tomi Turtiainen
2023-12-04 09:30:34 +02:00
committed by GitHub
parent a8049a0def
commit a78729b12f
4 changed files with 8 additions and 28 deletions

View File

@@ -92,7 +92,7 @@ describe('Template credentials setup', () => {
it('can create credentials and workflow from the template', () => {
templateCredentialsSetupPage.actions.visit(testTemplate.id);
templateCredentialsSetupPage.getters.continueButton().should('be.disabled');
templateCredentialsSetupPage.getters.continueButton().should('be.enabled');
templateCredentialsSetupPage.getters.createAppCredentialsButton('Shopify').click();
credentialsModal.getters.editCredentialModal().find('input:first()').type('test');

View File

@@ -2281,6 +2281,5 @@
"templateSetup.instructions": "You need {0} account to setup this template",
"templateSetup.skip": "Skip",
"templateSetup.continue.button": "Continue",
"templateSetup.continue.tooltip": "Connect to {numLeft} more app to continue | Connect to {numLeft} more apps to continue",
"templateSetup.credential.description": "The credential you select will be used in the {0} node of the workflow template. | The credential you select will be used in the {0} nodes of the workflow template."
}

View File

@@ -38,15 +38,6 @@ const skipSetupUrl = computed(() => {
return resolvedRoute.fullPath;
});
const buttonTooltip = computed(() => {
const numLeft = setupTemplateStore.numCredentialsLeft;
return i18n.baseText('templateSetup.continue.tooltip', {
adjustToNumber: numLeft,
interpolate: { numLeft: numLeft.toString() },
});
});
//#endregion Computed
//#region Watchers
@@ -137,19 +128,14 @@ onMounted(async () => {
$locale.baseText('templateSetup.skip')
}}</n8n-link>
<n8n-tooltip
<n8n-button
v-if="isReady"
:content="buttonTooltip"
:disabled="setupTemplateStore.numCredentialsLeft === 0"
>
<n8n-button
size="large"
:label="$locale.baseText('templateSetup.continue.button')"
:disabled="setupTemplateStore.numCredentialsLeft > 0 || setupTemplateStore.isSaving"
@click="setupTemplateStore.createWorkflow($router)"
data-test-id="continue-button"
/>
</n8n-tooltip>
size="large"
:label="$locale.baseText('templateSetup.continue.button')"
:disabled="setupTemplateStore.isSaving"
@click="setupTemplateStore.createWorkflow($router)"
data-test-id="continue-button"
/>
<div v-else>
<n8n-loading variant="button" />
</div>

View File

@@ -227,10 +227,6 @@ export const useSetupTemplateStore = defineStore('setupTemplate', () => {
return overrides;
});
const numCredentialsLeft = computed(() => {
return credentialUsages.value.length - Object.keys(selectedCredentialIdByKey.value).length;
});
//#endregion Getters
//#region Actions
@@ -375,7 +371,6 @@ export const useSetupTemplateStore = defineStore('setupTemplate', () => {
template,
credentialUsages,
selectedCredentialIdByKey,
numCredentialsLeft,
credentialOverrides,
createWorkflow,
skipSetup,