From e1da2b29c1370187892ae34eb64f913fc2e17dc2 Mon Sep 17 00:00:00 2001 From: Akshay Sasidharan Date: Tue, 3 Oct 2023 13:20:20 +0530 Subject: [PATCH 1/5] bump to v2.19.1 --- .version | 2 +- frontend/.version | 2 +- server/.version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.version b/.version index ef0f38abe1..b8e248f40b 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.19.0 +2.19.1 diff --git a/frontend/.version b/frontend/.version index ef0f38abe1..b8e248f40b 100644 --- a/frontend/.version +++ b/frontend/.version @@ -1 +1 @@ -2.19.0 +2.19.1 diff --git a/server/.version b/server/.version index ef0f38abe1..b8e248f40b 100644 --- a/server/.version +++ b/server/.version @@ -1 +1 @@ -2.19.0 +2.19.1 From 663e3d18cd0633e6de3e8d312f7d03700569f938 Mon Sep 17 00:00:00 2001 From: Kavin Venkatachalam Date: Wed, 4 Oct 2023 14:52:21 +0530 Subject: [PATCH 2/5] Bump version --- .version | 2 +- frontend/.version | 2 +- server/.version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.version b/.version index b8e248f40b..17bdb70fa8 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.19.1 +2.19.2 diff --git a/frontend/.version b/frontend/.version index b8e248f40b..17bdb70fa8 100644 --- a/frontend/.version +++ b/frontend/.version @@ -1 +1 @@ -2.19.1 +2.19.2 diff --git a/server/.version b/server/.version index b8e248f40b..17bdb70fa8 100644 --- a/server/.version +++ b/server/.version @@ -1 +1 @@ -2.19.1 +2.19.2 From b7378a4d808f94b63a049a775e46761e30bda72d Mon Sep 17 00:00:00 2001 From: Midhun Kumar E Date: Wed, 4 Oct 2023 15:58:01 +0530 Subject: [PATCH 3/5] Fix app builder automation for 2.19.2 (#7587) * Add data-cy * Fix spec --- .../cypress/e2e/editor/inspectorHappypath.cy.js | 6 ++---- .../src/_components/CopyToClipboard/CopyToClipboard.jsx | 9 ++++++++- frontend/src/_ui/JSONTreeViewer/JSONNode.jsx | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cypress-tests/cypress/e2e/editor/inspectorHappypath.cy.js b/cypress-tests/cypress/e2e/editor/inspectorHappypath.cy.js index c518a1ea40..f821183964 100644 --- a/cypress-tests/cypress/e2e/editor/inspectorHappypath.cy.js +++ b/cypress-tests/cypress/e2e/editor/inspectorHappypath.cy.js @@ -129,7 +129,7 @@ describe("Editor- Inspector", () => { verifyValue("key", "String", `"value"`); cy.get(`[data-cy="inspector-node-key"] > .mx-1`).realHover(); - cy.get("[data-cy='copy-icon']").realClick(); + cy.get('[data-cy="copy-path-to-clipboard"]').realClick(); cy.realPress("Escape"); cy.window().then((win) => { @@ -138,10 +138,8 @@ describe("Editor- Inspector", () => { }); }); - cy.get(".action-icons-group > .d-flex > :nth-child(2)").click(); - cy.get(".list-group-item").click(); + cy.get('[data-cy="copy-value-to-clicpboard"]').realClick(); cy.realPress("Escape"); - cy.window().then((win) => { win.navigator.clipboard.readText().then((text) => { expect(text).to.eq(`"value"`); diff --git a/frontend/src/_components/CopyToClipboard/CopyToClipboard.jsx b/frontend/src/_components/CopyToClipboard/CopyToClipboard.jsx index 263b0e40b1..3a85e0ee67 100644 --- a/frontend/src/_components/CopyToClipboard/CopyToClipboard.jsx +++ b/frontend/src/_components/CopyToClipboard/CopyToClipboard.jsx @@ -31,7 +31,14 @@ export const CopyToClipboardComponent = ({ data, callback }) => { }} > - + { onClick={() => { moreActions['actions'][0].dispatchAction(data, currentNode); }} + data-cy={`copy-value-to-clicpboard`} > From ddadf1a552ddaa3f9bda900e450bf39aba45482d Mon Sep 17 00:00:00 2001 From: Ajith KV Date: Thu, 5 Oct 2023 09:29:32 +0530 Subject: [PATCH 4/5] Fix faileing dashboard spec (#7620) --- cypress-tests/cypress/e2e/workspace/dashboard.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress-tests/cypress/e2e/workspace/dashboard.cy.js b/cypress-tests/cypress/e2e/workspace/dashboard.cy.js index 8ac3e7bae4..3a9274b1a7 100644 --- a/cypress-tests/cypress/e2e/workspace/dashboard.cy.js +++ b/cypress-tests/cypress/e2e/workspace/dashboard.cy.js @@ -284,7 +284,7 @@ describe("dashboard", () => { commonSelectors.toastMessage, dashboardText.appClonedToast ); - cy.waitForAppLoad(); + // cy.waitForAppLoad(); cy.wait(2000); cy.clearAndType(commonSelectors.appNameInput, data.cloneAppName); cy.dragAndDropWidget("button", 25, 25); From d656de65ecabc9584804919582923ee54e577d65 Mon Sep 17 00:00:00 2001 From: Manish Kushare <37823141+manishkushare@users.noreply.github.com> Date: Thu, 5 Oct 2023 15:46:58 +0530 Subject: [PATCH 5/5] rolling back to previous logic for displaying total count with respect to serverside pagination (#7625) --- frontend/src/Editor/Components/Table/Table.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/Editor/Components/Table/Table.jsx b/frontend/src/Editor/Components/Table/Table.jsx index f2f0509edf..2a9c252700 100644 --- a/frontend/src/Editor/Components/Table/Table.jsx +++ b/frontend/src/Editor/Components/Table/Table.jsx @@ -1528,7 +1528,8 @@ export function Table({ ) : ( !loadingState && ( - {`${globalFilteredRows.length} Records`} + {clientSidePagination && !serverSidePagination && `${globalFilteredRows.length} Records`} + {serverSidePagination && totalRecords ? `${totalRecords} Records` : ''} ) ))}