Merge pull request #7630 from ToolJet/main

Merge main back to develop (v2.19.2)

.version

@@ -1 +1 @@
-2.19.0
+2.19.2

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"`);

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);

frontend/.version

@@ -1 +1 @@
-2.19.0
+2.19.2

frontend/src/Editor/Components/Table/Table.jsx

@@ -1528,7 +1528,8 @@ export function Table({
                 ) : (
                   !loadingState && (
                     <span data-cy={`footer-number-of-records`} className="font-weight-500 color-slate11">
-                      {`${globalFilteredRows.length} Records`}
+                      {clientSidePagination && !serverSidePagination && `${globalFilteredRows.length} Records`}
+                      {serverSidePagination && totalRecords ? `${totalRecords} Records` : ''}
                     </span>
                   )
                 ))}

frontend/src/_components/CopyToClipboard/CopyToClipboard.jsx

@@ -31,7 +31,14 @@ export const CopyToClipboardComponent = ({ data, callback }) => {
         }}
       >
         <span style={{ height: '13px', width: '13px', marginBottom: '2px' }} className="mx-1 copy-to-clipboard">
-          <svg width="13" height="13" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+          <svg
+            width="13"
+            height="13"
+            viewBox="0 0 24 24"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+            data-cy="copy-path-to-clipboard"
+          >
             <path
               fill-rule="evenodd"
               clip-rule="evenodd"

frontend/src/_ui/JSONTreeViewer/JSONNode.jsx

@@ -246,6 +246,7 @@ export const JSONNode = ({ data, ...restProps }) => {
             onClick={() => {
               moreActions['actions'][0].dispatchAction(data, currentNode);
             }}
+            data-cy={`copy-value-to-clicpboard`}
           >
             <SolidIcon width="12" height="12" name="copy" />
           </span>

server/.version

@@ -1 +1 @@
-2.19.0
+2.19.2