Merge branch 'release' into test/frameworkfunctions

appsmithorg · Dec 11, 2024 · fd8d5e2 · fd8d5e2
2 parents c6250d0 + dcdd52f
commit fd8d5e2
Show file tree

Hide file tree

Showing 184 changed files with 2,857 additions and 2,211 deletions.
diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml
@@ -41,20 +41,15 @@ jobs:
 
     # Service containers to run with this job. Required for running tests
     services:
-      # Label used to access the service container
       redis:
-        # Docker Hub image for Redis
         image: redis
         ports:
-          # Opens tcp port 6379 on the host and service container
           - 6379:6379
       postgres:
-        if: github.base_ref == 'pg' || github.ref_name == 'pg'
         image: postgres:14
         ports:
           - 5432:5432
       mongo:
-        if: github.base_ref == 'release' || github.ref_name == 'release'
         image: mongo
         ports:
           - 27017:27017

diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml
@@ -249,7 +249,7 @@ jobs:
           cp ../../../../../build.tar ./
           git lfs track "build.tar"
           git add  build.tar
-          git commit -m "Update Latest build.tar"
+          git commit --allow-empty -m "Update Latest build.tar"
           git push
 
       # Set status = success

diff --git a/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts b/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
@@ -126,7 +126,7 @@ describe.skip(
         dataSourceName,
         spreadSheetName,
       );
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(0, GSHEET_DATA[0].uniq_id);
       dataSources.AssertQueryTableResponse(1, "ホーンビィ 2014 カタログ"); // Asserting other language
       dataSources.AssertQueryTableResponse(2, "₹, $, €, ¥, £"); // Asserting different symbols
@@ -135,7 +135,7 @@ describe.skip(
       // Update query to fetch only 1 column and verify
       gsheetHelper.SelectMultiDropDownValue("Columns", "product_name");
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(0, GSHEET_DATA[0].product_name);
 
       //Remove column filter and add Sort By Ascending and verify
@@ -145,7 +145,7 @@ describe.skip(
         directInput: false,
         inputFieldName: "Sort By",
       });
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(
         0,
         "5afbaf65680c9f378af5b3a3ae22427e",
@@ -161,7 +161,7 @@ describe.skip(
       dataSources.ClearSortByOption(); //clearing previous sort option
       dataSources.EnterSortByValues("price", "Descending");
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(
         1,
         "ホーンビー ゲージ ウェスタン エクスプレス デジタル トレイン セット (eLink および TTS ロコ トレイン セット付き)",
@@ -181,7 +181,7 @@ describe.skip(
         dataSources._nestedWhereClauseValue(0),
       );
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(8);
+      dataSources.runQueryAndVerifyResponseViews({ count: 8 });
       dataSources.AssertQueryTableResponse(
         0,
         "87bbb472ef9d90dcef140a551665c929",
@@ -199,7 +199,7 @@ describe.skip(
         inputFieldName: "Cell range",
       });
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(4);
+      dataSources.runQueryAndVerifyResponseViews({ count: 4 });
       dataSources.AssertQueryTableResponse(
         0,
         "eac7efa5dbd3d667f26eb3d3ab504464",
@@ -246,7 +246,7 @@ describe.skip(
         0,
         true,
       );
-      dataSources.RunQueryNVerifyResponseViews(10);
+      dataSources.runQueryAndVerifyResponseViews({ count: 10 });
       dataSources.AssertQueryTableResponse(
         0,
         "eac7efa5dbd3d667f26eb3d3ab504464",
@@ -281,7 +281,7 @@ describe.skip(
         true,
       ); // Converting the field to dropdown
       dataSources.ValidateNSelectDropdown("Sheet name", "", "Sheet1");
-      dataSources.RunQueryNVerifyResponseViews(10);
+      dataSources.runQueryAndVerifyResponseViews({ count: 10 });
       dataSources.AssertQueryTableResponse(
         0,
         "eac7efa5dbd3d667f26eb3d3ab504464",

diff --git a/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts b/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts
@@ -90,7 +90,7 @@ describe.skip(
       dataSources.ValidateNSelectDropdown("Entity", "Sheet Row(s)");
       dataSources.ValidateNSelectDropdown("Spreadsheet", "", spreadSheetName);
       dataSources.ValidateNSelectDropdown("Sheet name", "", "Sheet1");
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryResponseHeaders(columnHeaders);
       dataSources.AssertQueryTableResponse(0, GSHEET_DATA[0].uniq_id);
       dataSources.AssertQueryTableResponse(1, "ホーンビィ 2014 カタログ"); // Asserting other language
@@ -104,7 +104,7 @@ describe.skip(
       dataSources.ValidateNSelectDropdown("Entity", "Sheet Row(s)");
       dataSources.ValidateNSelectDropdown("Spreadsheet", "", spreadSheetName);
       dataSources.ValidateNSelectDropdown("Sheet name", "", "Sheet1");
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryResponseHeaders(columnHeaders);
       dataSources.AssertQueryTableResponse(0, GSHEET_DATA[0].uniq_id);
       dataSources.AssertQueryTableResponse(1, "ホーンビィ 2014 カタログ"); // Asserting other language

diff --git a/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts b/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
@@ -128,15 +128,15 @@ describe.skip(
         dataSourceName.readNWrite,
         spreadSheetName,
       );
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(0, GSHEET_DATA[0].uniq_id);
       dataSources.AssertQueryTableResponse(1, "ホーンビィ 2014 カタログ"); // Asserting other language
       dataSources.AssertQueryTableResponse(2, "₹, $, €, ¥, £"); // Asserting different symbols
       dataSources.AssertQueryTableResponse(3, "!@#$%^&*"); // Asserting special chars
       // Update query to fetch only 1 column and verify
       gsheetHelper.SelectMultiDropDownValue("Columns", "product_name");
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(0, GSHEET_DATA[0].product_name);
       //Remove column filter and add Sort By Ascending and verify
       gsheetHelper.SelectMultiDropDownValue("Columns", "product_name"); //unselect the Columns dd value
@@ -145,7 +145,7 @@ describe.skip(
         directInput: false,
         inputFieldName: "Sort By",
       });
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(
         0,
         "5afbaf65680c9f378af5b3a3ae22427e",
@@ -160,7 +160,7 @@ describe.skip(
       dataSources.ClearSortByOption(); //clearing previous sort option
       dataSources.EnterSortByValues("price", "Descending");
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(
         1,
         "ホーンビー ゲージ ウェスタン エクスプレス デジタル トレイン セット (eLink および TTS ロコ トレイン セット付き)",
@@ -179,7 +179,7 @@ describe.skip(
         dataSources._nestedWhereClauseValue(0),
       );
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(8);
+      dataSources.runQueryAndVerifyResponseViews({ count: 8 });
       dataSources.AssertQueryTableResponse(
         0,
         "87bbb472ef9d90dcef140a551665c929",
@@ -196,7 +196,7 @@ describe.skip(
         inputFieldName: "Cell range",
       });
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(4);
+      dataSources.runQueryAndVerifyResponseViews({ count: 4 });
       dataSources.AssertQueryTableResponse(
         0,
         "eac7efa5dbd3d667f26eb3d3ab504464",
@@ -242,7 +242,7 @@ describe.skip(
         0,
         true,
       );
-      dataSources.RunQueryNVerifyResponseViews(10);
+      dataSources.runQueryAndVerifyResponseViews({ count: 10 });
       dataSources.AssertQueryTableResponse(
         0,
         "eac7efa5dbd3d667f26eb3d3ab504464",
@@ -275,7 +275,7 @@ describe.skip(
         true,
       ); // Converting the field to dropdown
       dataSources.ValidateNSelectDropdown("Sheet name", "", "Sheet1");
-      dataSources.RunQueryNVerifyResponseViews(10);
+      dataSources.runQueryAndVerifyResponseViews({ count: 10 });
       dataSources.AssertQueryTableResponse(
         0,
         "eac7efa5dbd3d667f26eb3d3ab504464",

diff --git a/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts b/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
@@ -136,15 +136,15 @@ describe.skip(
         dataSourceName.readOnly,
         spreadSheetName,
       );
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(0, GSHEET_DATA[0].uniq_id);
       dataSources.AssertQueryTableResponse(1, "ホーンビィ 2014 カタログ"); // Asserting other language
       dataSources.AssertQueryTableResponse(2, "₹, $, €, ¥, £"); // Asserting different symbols
       dataSources.AssertQueryTableResponse(3, "!@#$%^&*"); // Asserting special chars
       // Update query to fetch only 1 column and verify
       gsheetHelper.SelectMultiDropDownValue("Columns", "product_name");
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(0, GSHEET_DATA[0].product_name);
       //Remove column filter and add Sort By Ascending and verify
       gsheetHelper.SelectMultiDropDownValue("Columns", "product_name"); //unselect the Columns dd value
@@ -153,7 +153,7 @@ describe.skip(
         directInput: false,
         inputFieldName: "Sort By",
       });
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(
         0,
         "5afbaf65680c9f378af5b3a3ae22427e",
@@ -168,7 +168,7 @@ describe.skip(
       dataSources.ClearSortByOption(); //clearing previous sort option
       dataSources.EnterSortByValues("price", "Descending");
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(
         1,
         "ホーンビー ゲージ ウェスタン エクスプレス デジタル トレイン セット (eLink および TTS ロコ トレイン セット付き)",
@@ -187,7 +187,7 @@ describe.skip(
         dataSources._nestedWhereClauseValue(0),
       );
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(8);
+      dataSources.runQueryAndVerifyResponseViews({ count: 8 });
       dataSources.AssertQueryTableResponse(
         0,
         "87bbb472ef9d90dcef140a551665c929",
@@ -204,7 +204,7 @@ describe.skip(
         inputFieldName: "Cell range",
       });
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(4);
+      dataSources.runQueryAndVerifyResponseViews({ count: 4 });
       dataSources.AssertQueryTableResponse(
         0,
         "eac7efa5dbd3d667f26eb3d3ab504464",
@@ -224,7 +224,7 @@ describe.skip(
         0,
         true,
       );
-      dataSources.RunQueryNVerifyResponseViews(10);
+      dataSources.runQueryAndVerifyResponseViews({ count: 10 });
       dataSources.AssertQueryTableResponse(
         0,
         "eac7efa5dbd3d667f26eb3d3ab504464",
@@ -257,7 +257,7 @@ describe.skip(
         true,
       ); // Converting the field to dropdown
       dataSources.ValidateNSelectDropdown("Sheet name", "", "Sheet1");
-      dataSources.RunQueryNVerifyResponseViews(10);
+      dataSources.runQueryAndVerifyResponseViews({ count: 10 });
       dataSources.AssertQueryTableResponse(
         0,
         "eac7efa5dbd3d667f26eb3d3ab504464",

diff --git a/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts b/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts
@@ -114,7 +114,7 @@ describe(
         dataSourceName,
         spreadSheetName,
       );
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(0, GSHEET_DATA[0].uniq_id);
       dataSources.AssertQueryTableResponse(1, "ホーンビィ 2014 カタログ"); // Asserting other language
       dataSources.AssertQueryTableResponse(2, "₹, $, €, ¥, £"); // Asserting different symbols
@@ -123,7 +123,7 @@ describe(
       // Update query to fetch only 1 column and verify
       gsheetHelper.SelectMultiDropDownValue("Columns", "product_name");
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(0, GSHEET_DATA[0].product_name);
 
       //Remove column filter and add Sort By Ascending and verify
@@ -133,7 +133,7 @@ describe(
         directInput: false,
         inputFieldName: "Sort By",
       });
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(
         0,
         "5afbaf65680c9f378af5b3a3ae22427e",
@@ -149,7 +149,7 @@ describe(
       dataSources.ClearSortByOption(); //clearing previous sort option
       dataSources.EnterSortByValues("price", "Descending");
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(GSHEET_DATA.length);
+      dataSources.runQueryAndVerifyResponseViews({ count: GSHEET_DATA.length });
       dataSources.AssertQueryTableResponse(
         1,
         "ホーンビー ゲージ ウェスタン エクスプレス デジタル トレイン セット (eLink および TTS ロコ トレイン セット付き)",
@@ -169,7 +169,7 @@ describe(
         dataSources._nestedWhereClauseValue(0),
       );
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(8);
+      dataSources.runQueryAndVerifyResponseViews({ count: 8 });
       dataSources.AssertQueryTableResponse(
         0,
         "87bbb472ef9d90dcef140a551665c929",
@@ -187,7 +187,7 @@ describe(
         inputFieldName: "Cell range",
       });
       dataSources.RunQuery();
-      dataSources.RunQueryNVerifyResponseViews(4);
+      dataSources.runQueryAndVerifyResponseViews({ count: 4 });
       dataSources.AssertQueryTableResponse(
         0,
         "eac7efa5dbd3d667f26eb3d3ab504464",
@@ -237,7 +237,7 @@ describe(
         0,
         true,
       );
-      dataSources.RunQueryNVerifyResponseViews(10);
+      dataSources.runQueryAndVerifyResponseViews({ count: 10 });
       dataSources.AssertQueryTableResponse(
         0,
         "eac7efa5dbd3d667f26eb3d3ab504464",
@@ -272,7 +272,7 @@ describe(
         true,
       ); // Converting the field to dropdown
       dataSources.ValidateNSelectDropdown("Sheet name", "", "Sheet1");
-      dataSources.RunQueryNVerifyResponseViews(10);
+      dataSources.runQueryAndVerifyResponseViews({ count: 10 });
       dataSources.AssertQueryTableResponse(
         0,
         "eac7efa5dbd3d667f26eb3d3ab504464",

diff --git a/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts b/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
@@ -57,7 +57,7 @@ describe.skip(
         dataSourceName,
         spreadSheetName,
       );
-      dataSources.RunQueryNVerifyResponseViews(10);
+      dataSources.runQueryAndVerifyResponseViews({ count: 10 });
 
       // Adding suggested widgets and verify
       dataSources.AddSuggestedWidget(Widgets.Table);

diff --git a/app/client/cypress/e2e/GSheet/WidgetBinding_SelectedAccess_Spec.ts b/app/client/cypress/e2e/GSheet/WidgetBinding_SelectedAccess_Spec.ts
@@ -57,7 +57,7 @@ describe(
         dataSourceName,
         spreadSheetName,
       );
-      dataSources.RunQueryNVerifyResponseViews(10);
+      dataSources.runQueryAndVerifyResponseViews({ count: 10 });
 
       // Adding suggested widgets and verify
       dataSources.AddSuggestedWidget(Widgets.Table);

diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/StoreValue_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/StoreValue_spec.ts
@@ -248,9 +248,9 @@ describe(
       debuggerHelper.OpenDebugger();
       debuggerHelper.ClickLogsTab();
       debuggerHelper.changeLogsGroup("System logs");
-      debuggerHelper.DoesConsoleLogExist("storeValue('xyz', '123', true)");
-      debuggerHelper.DoesConsoleLogExist("removeValue('xyz')");
-      debuggerHelper.DoesConsoleLogExist("clearStore()");
+      debuggerHelper.DoesConsoleLogExist("storeValue triggered");
+      debuggerHelper.DoesConsoleLogExist("removeValue triggered");
+      debuggerHelper.DoesConsoleLogExist("clearStore triggered");
     });
   },
 );
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/API_with_List_Widget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/API_with_List_Widget_spec.js
@@ -12,6 +12,8 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 
+import BottomTabs from "../../../../support/Pages/IDE/BottomTabs";
+
 describe(
   "Test Create Api and Bind to List widget",
   { tags: ["@tag.Binding"] },
@@ -24,7 +26,7 @@ describe(
     it("1. Test_Add users api and execute api", function () {
       apiPage.CreateAndFillApi(this.dataSet.userApi + "/mock-api?records=10");
       cy.RunAPI();
-      cy.get(apiLocators.jsonResponseTab).click();
+      BottomTabs.response.selectResponseResponseTypeFromMenu("JSON");
       cy.get(apiLocators.responseBody)
         .contains("name")
         .siblings("span")