chore: external merge request from Contributor

app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/checkboxCell_spec.js

@@ -145,6 +145,7 @@ describe(
           .contains("This is a test message")
           .should("be.visible");
       });
+      _.agHelper.ClickButton("Discard", { index: 0 }); // discard changes
     });
 
     it("4. Verify filter condition", () => {
@@ -159,7 +160,17 @@ describe(
 
       // filter and verify checked rows
       cy.getTableV2DataSelector("0", "4").then((selector) => {
-        cy.get(selector + checkboxSelector).should("be.checked");
+        _.agHelper.AssertExistingCheckedState(
+          selector + checkboxSelector,
+          "true",
+        );
+      });
+
+      cy.getTableV2DataSelector("1", "4").then((selector) => {
+        _.agHelper.AssertExistingCheckedState(
+          selector + checkboxSelector,
+          "true",
+        );
       });
 
       // Filter and verify unchecked rows
@@ -170,10 +181,10 @@ describe(
       cy.get(publishPage.applyFiltersBtn).click();
 
       cy.getTableV2DataSelector("0", "4").then((selector) => {
-        cy.get(selector + checkboxSelector).should("not.be.checked");
-      });
-      cy.getTableV2DataSelector("1", "4").then((selector) => {
-        cy.get(selector + checkboxSelector).should("not.be.checked");
+        _.agHelper.AssertExistingCheckedState(
+          selector + checkboxSelector,
+          "false",
+        );
       });
     });
 

app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/switchCell_spec.js

@@ -137,6 +137,7 @@ describe(
         cy.wait(100);
         agHelper.ValidateToastMessage("This is a test message");
       });
+      agHelper.ClickButton("Discard", { index: 0 }); // discard changes
     });
 
     it("4. Verify filter condition", () => {
@@ -151,7 +152,11 @@ describe(
 
       // filter and verify checked rows
       cy.getTableV2DataSelector("0", "4").then((selector) => {
-        cy.get(selector + switchSelector).should("be.checked");
+        agHelper.AssertExistingCheckedState(selector + switchSelector, "true");
+      });
+
+      cy.getTableV2DataSelector("1", "4").then((selector) => {
+        agHelper.AssertExistingCheckedState(selector + switchSelector, "true");
       });
 
       // Filter and verify unchecked rows
@@ -162,10 +167,7 @@ describe(
       cy.get(publishPage.applyFiltersBtn).click();
 
       cy.getTableV2DataSelector("0", "4").then((selector) => {
-        cy.get(selector + switchSelector).should("not.be.checked");
-      });
-      cy.getTableV2DataSelector("1", "4").then((selector) => {
-        cy.get(selector + switchSelector).should("not.be.checked");
+        agHelper.AssertExistingCheckedState(selector + switchSelector, "false");
       });
     });
 

app/client/src/widgets/TableWidgetV2/widget/derived.js

@@ -446,25 +446,42 @@ export default {
 
       sortedTableData = transformedTableDataForSorting.sort((a, b) => {
         if (_.isPlainObject(a) && _.isPlainObject(b)) {
+          let [processedA, processedB] = [a, b];
+
+          if (!selectColumnKeysWithSortByLabel.length) {
+            const originalA = (props.tableData ??
+              transformedTableDataForSorting)[a.__originalIndex__];
+            const originalB = (props.tableData ??
+              transformedTableDataForSorting)[b.__originalIndex__];
+
+            [processedA, processedB] = [
+              { ...a, ...originalA },
+              { ...b, ...originalB },
+            ];
+          }
+
           if (
-            isEmptyOrNil(a[sortByColumnOriginalId]) ||
-            isEmptyOrNil(b[sortByColumnOriginalId])
+            isEmptyOrNil(processedA[sortByColumnOriginalId]) ||
+            isEmptyOrNil(processedB[sortByColumnOriginalId])
           ) {
             /* push null, undefined and "" values to the bottom. */
-            return isEmptyOrNil(a[sortByColumnOriginalId]) ? 1 : -1;
+            return isEmptyOrNil(processedA[sortByColumnOriginalId]) ? 1 : -1;
           } else {
             switch (columnType) {
               case "number":
               case "currency":
                 return sortByOrder(
-                  Number(a[sortByColumnOriginalId]) >
-                    Number(b[sortByColumnOriginalId]),
+                  Number(processedA[sortByColumnOriginalId]) >
+                    Number(processedB[sortByColumnOriginalId]),
                 );
               case "date":
                 try {
                   return sortByOrder(
-                    moment(a[sortByColumnOriginalId], inputFormat).isAfter(
-                      moment(b[sortByColumnOriginalId], inputFormat),
+                    moment(
+                      processedA[sortByColumnOriginalId],
+                      inputFormat,
+                    ).isAfter(
+                      moment(processedB[sortByColumnOriginalId], inputFormat),
                     ),
                   );
                 } catch (e) {
@@ -489,8 +506,8 @@ export default {
                 }
               default:
                 return sortByOrder(
-                  a[sortByColumnOriginalId].toString().toLowerCase() >
-                    b[sortByColumnOriginalId].toString().toLowerCase(),
+                  processedA[sortByColumnOriginalId].toString().toLowerCase() >
+                    processedB[sortByColumnOriginalId].toString().toLowerCase(),
                 );
             }
           }
@@ -676,6 +693,9 @@ export default {
 
     const finalTableData = sortedTableData.filter((row) => {
       let isSearchKeyFound = true;
+      const originalRow = (props.tableData ?? sortedTableData)[
+        row.__originalIndex__
+      ];
       const columnWithDisplayText = Object.values(props.primaryColumns).filter(
         (column) => column.columnType === "url" && column.displayText,
       );
@@ -780,7 +800,10 @@ export default {
       };
 
       if (searchKey) {
-        isSearchKeyFound = Object.values(_.omit(displayedRow, hiddenColumns))
+        isSearchKeyFound = [
+          ...Object.values(_.omit(displayedRow, hiddenColumns)),
+          ...Object.values(_.omit(originalRow, hiddenColumns)),
+        ]
           .join(", ")
           .toLowerCase()
           .includes(searchKey);
@@ -811,10 +834,15 @@ export default {
             ConditionFunctions[props.filters[i].condition];
 
           if (conditionFunction) {
-            filterResult = conditionFunction(
-              displayedRow[props.filters[i].column],
-              props.filters[i].value,
-            );
+            filterResult =
+              conditionFunction(
+                originalRow[props.filters[i].column],
+                props.filters[i].value,
+              ) ||
+              conditionFunction(
+                displayedRow[props.filters[i].column],
+                props.filters[i].value,
+              );
           }
         } catch (e) {
           filterResult = false;