From b20578cd53f37a4d68b0370396e79aa7ccb510e1 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Wed, 17 Jan 2024 13:34:18 -0800 Subject: [PATCH 1/2] Fix group order --- src/components/vue-form-builder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue index b13a83791..cb28b7089 100644 --- a/src/components/vue-form-builder.vue +++ b/src/components/vue-form-builder.vue @@ -883,7 +883,7 @@ export default { return order; }, setGroupOrder(orderConfig) { - this.groupOrder = { ...orderConfig }; + this.groupOrder = { ...this.groupOrder, ...orderConfig }; }, toggleCollapse(index) { if (this.collapse[index] && this.collapse[index] === true) { From b5b0b5106e8870b27890226fb293b60414cb2835 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Wed, 17 Jan 2024 15:07:17 -0800 Subject: [PATCH 2/2] Fix tests --- tests/e2e/specs/DeviceVisivilityInspector.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/specs/DeviceVisivilityInspector.spec.js b/tests/e2e/specs/DeviceVisivilityInspector.spec.js index b6e358cff..c6710efb6 100644 --- a/tests/e2e/specs/DeviceVisivilityInspector.spec.js +++ b/tests/e2e/specs/DeviceVisivilityInspector.spec.js @@ -53,7 +53,7 @@ describe('Device Visiblility Inspector', () => { }); it('Verify if a FileDownload has device visiblility settings', () => { cy.visit('/'); - cy.openAcordeon("collapse-4"); + cy.openAcordeon("collapse-5"); cy.get('[data-cy=controls-FileDownload]').drag('[data-cy=screen-drop-zone]', 'bottom'); cy.get('[data-cy=screen-element-container]').click(); cy.get('[data-cy=accordion-Advanced]').click(); @@ -67,7 +67,7 @@ describe('Device Visiblility Inspector', () => { }); it('Verify if a FileUpload has device visiblility settings', () => { cy.visit('/'); - cy.openAcordeon("collapse-4"); + cy.openAcordeon("collapse-5"); cy.get('[data-cy=controls-FileUpload]').drag('[data-cy=screen-drop-zone]', 'bottom'); cy.get('[data-cy=screen-element-container]').click(); cy.get('[data-cy=accordion-Advanced]').click();