From ca0ba75fc675f9deae005f733501dafd6ec22df0 Mon Sep 17 00:00:00 2001 From: cstns Date: Mon, 20 Oct 2025 18:11:35 +0300 Subject: [PATCH 1/3] qf selector --- test/e2e/frontend/cypress/tests/invitations.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/frontend/cypress/tests/invitations.spec.js b/test/e2e/frontend/cypress/tests/invitations.spec.js index 699a1ea36a..c77e881600 100644 --- a/test/e2e/frontend/cypress/tests/invitations.spec.js +++ b/test/e2e/frontend/cypress/tests/invitations.spec.js @@ -27,7 +27,7 @@ describe('FlowFuse platform invitees', () => { }) cy.get('[data-el="notifications-drawer"]').should('be.visible') - cy.get('[data-el="invitation-message"]').eq(0).click() + cy.get('[data-el="invitation-message"]:first .body').click() // user should see a message From 5d496c784d14882fb02825dd51521d2a200b4e01 Mon Sep 17 00:00:00 2001 From: cstns Date: Mon, 20 Oct 2025 19:10:45 +0300 Subject: [PATCH 2/3] fix blueprint deployment sending flows as empty string causing backend check to fail --- .../MultiStepApplicationsInstanceForm.vue | 18 +++++++++++++----- .../instance/MultiStepInstanceForm.vue | 12 +++++++++--- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/multi-step-forms/instance/MultiStepApplicationsInstanceForm.vue b/frontend/src/components/multi-step-forms/instance/MultiStepApplicationsInstanceForm.vue index 2b0f0ae95b..f8f0169c35 100644 --- a/frontend/src/components/multi-step-forms/instance/MultiStepApplicationsInstanceForm.vue +++ b/frontend/src/components/multi-step-forms/instance/MultiStepApplicationsInstanceForm.vue @@ -177,6 +177,7 @@ export default { methods: { updateForm (payload, stepKey) { this.currentStepKey = stepKey + console.log('zzz', payload) this.form = { ...this.form, ...payload } }, async onSubmit () { @@ -233,15 +234,22 @@ export default { }) .then((application) => { if (this.instanceFollowUp && !this.shouldHideInstanceSteps) { - return instanceApi.create({ + const payload = { applicationId: application.id, name: this.form[INSTANCE_SLUG].input.name, projectType: this.form[INSTANCE_SLUG].input.instanceType, stack: this.form[INSTANCE_SLUG].input.nodeREDVersion, - template: this.form[INSTANCE_SLUG].input.template, - flowBlueprintId: this.form[FLOWS_SLUG].blueprint?.id ?? '', - flows: this.form[FLOWS_SLUG].flows ?? '' - }) + template: this.form[INSTANCE_SLUG].input.template + } + + if (this.form[FLOWS_SLUG].blueprint?.id) { + payload.flowBlueprintId = this.form[FLOWS_SLUG].blueprint?.id + } + + if (this.form[FLOWS_SLUG].flows) { + payload.flows = this.form[FLOWS_SLUG].flows + } + return instanceApi.create(payload) } }) .catch(err => { diff --git a/frontend/src/components/multi-step-forms/instance/MultiStepInstanceForm.vue b/frontend/src/components/multi-step-forms/instance/MultiStepInstanceForm.vue index f66284d057..9e10433371 100644 --- a/frontend/src/components/multi-step-forms/instance/MultiStepInstanceForm.vue +++ b/frontend/src/components/multi-step-forms/instance/MultiStepInstanceForm.vue @@ -118,9 +118,15 @@ export default { name: this.form[INSTANCE_SLUG].input.name, projectType: this.form[INSTANCE_SLUG].input.instanceType, stack: this.form[INSTANCE_SLUG].input.nodeREDVersion, - template: this.form[INSTANCE_SLUG].input.template, - flowBlueprintId: this.form[FLOWS_SLUG].blueprint?.id ?? '', - flows: this.form[FLOWS_SLUG].flows ?? '' + template: this.form[INSTANCE_SLUG].input.template + } + + if (this.form[FLOWS_SLUG].blueprint?.id) { + payload.flowBlueprintId = this.form[FLOWS_SLUG].blueprint?.id + } + + if (this.form[FLOWS_SLUG].flows) { + payload.flows = this.form[FLOWS_SLUG].flows } return instanceApi.create(payload) From 9c56ca6972317b7481a7a72a0f1d9620f5498367 Mon Sep 17 00:00:00 2001 From: cstns Date: Mon, 20 Oct 2025 19:11:28 +0300 Subject: [PATCH 3/3] remove log --- .../instance/MultiStepApplicationsInstanceForm.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/components/multi-step-forms/instance/MultiStepApplicationsInstanceForm.vue b/frontend/src/components/multi-step-forms/instance/MultiStepApplicationsInstanceForm.vue index f8f0169c35..5581ecf64c 100644 --- a/frontend/src/components/multi-step-forms/instance/MultiStepApplicationsInstanceForm.vue +++ b/frontend/src/components/multi-step-forms/instance/MultiStepApplicationsInstanceForm.vue @@ -177,7 +177,6 @@ export default { methods: { updateForm (payload, stepKey) { this.currentStepKey = stepKey - console.log('zzz', payload) this.form = { ...this.form, ...payload } }, async onSubmit () {