diff --git a/.version b/.version index ef0f38abe1..17bdb70fa8 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.19.0 +2.19.2 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/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); diff --git a/frontend/.version b/frontend/.version index ef0f38abe1..17bdb70fa8 100644 --- a/frontend/.version +++ b/frontend/.version @@ -1 +1 @@ -2.19.0 +2.19.2 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` : ''} ) ))} 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`} > diff --git a/server/.version b/server/.version index ef0f38abe1..17bdb70fa8 100644 --- a/server/.version +++ b/server/.version @@ -1 +1 @@ -2.19.0 +2.19.2