diff --git a/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts b/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts index 60e3046e1b..43449f0db5 100644 --- a/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts +++ b/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts @@ -173,21 +173,20 @@ describe("GSheet-Functional Tests With All Access", function () { dataSources.RunQueryNVerifyResponseViews(8); dataSources.AssertQueryTableResponse(0, "87bbb472ef9d90dcef140a551665c929"); - // Currently commenting this until https://github.com/appsmithorg/appsmith/issues/25447 is fixed. // Filter by cell range and verify - // dataSources.ValidateNSelectDropdown( - // "Filter Format", - // "Where Clause", - // "Cell range", - // ); - // agHelper.EnterValue("A2:A5", { - // propFieldName: "", - // directInput: false, - // inputFieldName: "Cell range", - // }); - // dataSources.RunQuery(); - // dataSources.RunQueryNVerifyResponseViews(8); - // dataSources.AssertQueryTableResponse(0, "eac7efa5dbd3d667f26eb3d3ab504464"); + dataSources.ValidateNSelectDropdown( + "Filter Format", + "Where Clause", + "Cell range", + ); + agHelper.EnterValue("A2:A5", { + propFieldName: "", + directInput: false, + inputFieldName: "Cell range", + }); + dataSources.RunQuery(); + dataSources.RunQueryNVerifyResponseViews(8); + dataSources.AssertQueryTableResponse(0, "eac7efa5dbd3d667f26eb3d3ab504464"); }); it("5. Update a record which is not present and verify the error", () => { diff --git a/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts b/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts index a3743dea56..1db69b8feb 100644 --- a/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts +++ b/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts @@ -170,21 +170,20 @@ describe("GSheet-Functional Tests With Read/Write Access", function () { dataSources.RunQuery(); dataSources.RunQueryNVerifyResponseViews(8); dataSources.AssertQueryTableResponse(0, "87bbb472ef9d90dcef140a551665c929"); - // Currently commenting this until https://github.com/appsmithorg/appsmith/issues/25447 is fixed. // Filter by cell range and verify - // dataSources.ValidateNSelectDropdown( - // "Filter Format", - // "Where Clause", - // "Cell range", - // ); - // agHelper.EnterValue("A2:A5", { - // propFieldName: "", - // directInput: false, - // inputFieldName: "Cell range", - // }); - // dataSources.RunQuery(); - // dataSources.RunQueryNVerifyResponseViews(8); - // dataSources.AssertQueryTableResponse(0, "eac7efa5dbd3d667f26eb3d3ab504464"); + dataSources.ValidateNSelectDropdown( + "Filter Format", + "Where Clause", + "Cell range", + ); + agHelper.EnterValue("A2:A5", { + propFieldName: "", + directInput: false, + inputFieldName: "Cell range", + }); + dataSources.RunQuery(); + dataSources.RunQueryNVerifyResponseViews(8); + dataSources.AssertQueryTableResponse(0, "eac7efa5dbd3d667f26eb3d3ab504464"); }); it("5. Update a record which is not present and verify the error", () => { diff --git a/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts b/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts index 37caa2df32..0c936470a2 100644 --- a/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts +++ b/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts @@ -178,21 +178,20 @@ describe("GSheet-Functional Tests With Read Access", function () { dataSources.RunQuery(); dataSources.RunQueryNVerifyResponseViews(8); dataSources.AssertQueryTableResponse(0, "87bbb472ef9d90dcef140a551665c929"); - // Currently commenting this until https://github.com/appsmithorg/appsmith/issues/25447 is fixed. // Filter by cell range and verify - // dataSources.ValidateNSelectDropdown( - // "Filter Format", - // "Where Clause", - // "Cell range", - // ); - // agHelper.EnterValue("A2:A5", { - // propFieldName: "", - // directInput: false, - // inputFieldName: "Cell range", - // }); - // dataSources.RunQuery(); - // dataSources.RunQueryNVerifyResponseViews(8); - // dataSources.AssertQueryTableResponse(0, "eac7efa5dbd3d667f26eb3d3ab504464"); + dataSources.ValidateNSelectDropdown( + "Filter Format", + "Where Clause", + "Cell range", + ); + agHelper.EnterValue("A2:A5", { + propFieldName: "", + directInput: false, + inputFieldName: "Cell range", + }); + dataSources.RunQuery(); + dataSources.RunQueryNVerifyResponseViews(8); + dataSources.AssertQueryTableResponse(0, "eac7efa5dbd3d667f26eb3d3ab504464"); }); it("5. Convert field to JS and verify", () => { diff --git a/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts b/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts index 362de01329..6bbc774f63 100644 --- a/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts +++ b/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts @@ -161,21 +161,20 @@ describe("GSheet-Functional Tests With Selected Access", function () { dataSources.RunQueryNVerifyResponseViews(8); dataSources.AssertQueryTableResponse(0, "87bbb472ef9d90dcef140a551665c929"); - // Currently commenting this until https://github.com/appsmithorg/appsmith/issues/25447 is fixed. // Filter by cell range and verify - // dataSources.ValidateNSelectDropdown( - // "Filter Format", - // "Where Clause", - // "Cell range", - // ); - // agHelper.EnterValue("A2:A5", { - // propFieldName: "", - // directInput: false, - // inputFieldName: "Cell range", - // }); - // dataSources.RunQuery(); - // dataSources.RunQueryNVerifyResponseViews(8); - // dataSources.AssertQueryTableResponse(0, "eac7efa5dbd3d667f26eb3d3ab504464"); + dataSources.ValidateNSelectDropdown( + "Filter Format", + "Where Clause", + "Cell range", + ); + agHelper.EnterValue("A2:A5", { + propFieldName: "", + directInput: false, + inputFieldName: "Cell range", + }); + dataSources.RunQuery(); + dataSources.RunQueryNVerifyResponseViews(8); + dataSources.AssertQueryTableResponse(0, "eac7efa5dbd3d667f26eb3d3ab504464"); }); it("5. Update a record which is not present and verify the error", () => { diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/RowsGetMethod.java b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/RowsGetMethod.java index bf007ac06b..155fbe5c2e 100644 --- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/RowsGetMethod.java +++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/java/com/external/config/RowsGetMethod.java @@ -179,7 +179,9 @@ public class RowsGetMethod implements ExecutionMethod, TemplateMethod, TriggerMe ArrayNode preFilteringResponse = this.objectMapper.valueToTree(collectedCells); - if (isWhereConditionConfigured(methodConfig)) { + // where condition needs to applied only when the filter format is where clause + // For filter format of cell range, we do not need to apply where clause + if (isWhereConditionConfigured(methodConfig) && "ROWS".equalsIgnoreCase(methodConfig.getQueryFormat())) { return filterDataService.filterDataNew( preFilteringResponse, new UQIDataFilterParams(