Dev

.github/workflows/ci-test-custom-script.yml

@@ -254,11 +254,14 @@ jobs:
           chmod a+x ./cypress/setup-test-ci.sh
           ./cypress/setup-test-ci.sh
 
-      - uses: browser-actions/setup-chrome@latest
-        with:
-          chrome-version: stable
-      - run: |
-          echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV
+      - name: Install Google Chrome 129.0.6668.100
+        run: |
+          sudo apt-get remove google-chrome-stable
+          wget -q https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_129.0.6668.100-1_amd64.deb
+          sudo apt-get update
+          sudo apt-get install -y ./google-chrome-stable_129.0.6668.100-1_amd64.deb
+          echo "BROWSER_PATH=$(which google-chrome)" >> $GITHUB_ENV
+          google-chrome --version
 
       - name: Save Git values
         # pass env variables from this step to other steps

.github/workflows/ci-test-limited-with-count.yml

@@ -230,11 +230,14 @@ jobs:
           chmod a+x ./cypress/setup-test-ci.sh
           ./cypress/setup-test-ci.sh
 
-      - uses: browser-actions/setup-chrome@latest
-        with:
-          chrome-version: stable
-      - run: |
-          echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV
+      - name: Install Google Chrome 129.0.6668.100
+        run: |
+          sudo apt-get remove google-chrome-stable
+          wget -q https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_129.0.6668.100-1_amd64.deb
+          sudo apt-get update
+          sudo apt-get install -y ./google-chrome-stable_129.0.6668.100-1_amd64.deb
+          echo "BROWSER_PATH=$(which google-chrome)" >> $GITHUB_ENV
+          google-chrome --version
 
       - name: Save Git values
         # pass env variables from this step to other steps
@@ -348,7 +351,8 @@ jobs:
             cd app/client
             npx cypress-repeat-pro run -n ${{ inputs.run_count }} --force \
                 --spec ${{ env.specs_to_run }} \
-                --config-file "cypress_ci_custom.config.ts"
+                --config-file "cypress_ci_custom.config.ts" \
+                --browser ${{ env.BROWSER_PATH }}
             cat cy-repeat-summary.txt
             # Define the path for the failure flag file
             FAILURE_FLAG_FILE="ci_test_status.txt"

.github/workflows/ci-test-limited.yml

@@ -220,12 +220,15 @@ jobs:
           cd app/client
           chmod a+x ./cypress/setup-test-ci.sh
           ./cypress/setup-test-ci.sh
-
-      - uses: browser-actions/setup-chrome@latest
-        with:
-          chrome-version: stable
-      - run: |
-          echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV
+
+      - name: Install Google Chrome 129.0.6668.100
+        run: |
+          sudo apt-get remove google-chrome-stable
+          wget -q https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_129.0.6668.100-1_amd64.deb
+          sudo apt-get update
+          sudo apt-get install -y ./google-chrome-stable_129.0.6668.100-1_amd64.deb
+          echo "BROWSER_PATH=$(which google-chrome)" >> $GITHUB_ENV
+          google-chrome --version
 
       - name: Save Git values
         # pass env variables from this step to other steps

app/client/cypress/e2e/Regression/ClientSide/ActionExecution/Bug33601_spec.ts

@@ -0,0 +1,74 @@
+import {
+  agHelper,
+  appSettings,
+  assertHelper,
+  deployMode,
+  homePage,
+  locators,
+} from "../../../../support/Objects/ObjectsCore";
+import EditorNavigation, {
+  EntityType,
+  PageLeftPane,
+} from "../../../../support/Pages/EditorNavigation";
+
+describe(
+  "Bug:33601: resetWidget function causes the next async method to be undefined",
+  { tags: ["@tag.JS"] },
+  () => {
+    it("1. Bug 33601", () => {
+      homePage.NavigateToHome();
+      homePage.ImportApp("resetWidgetBug33601.json");
+      EditorNavigation.SelectEntityByName("List1", EntityType.Widget);
+      PageLeftPane.expandCollapseItem("List1");
+      PageLeftPane.expandCollapseItem("Container1");
+      EditorNavigation.SelectEntityByName("Input1", EntityType.Widget);
+
+      agHelper.EnterInputText("Label", "Widget Input2");
+      EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+      cy.get(locators._widgetInputSelector("inputwidgetv2"))
+        .first()
+        .invoke("attr", "value")
+        .should("contain", "Widget Input2");
+      agHelper
+        .GetAttribute(locators._imgWidgetInsideList, "src")
+        .then((labelValue) => {
+          expect(labelValue).not.to.contain("data:image/png;base64");
+        });
+
+      agHelper.ClickButton("Submit");
+      cy.get(locators._widgetInputSelector("inputwidgetv2"))
+        .first()
+        .invoke("attr", "value")
+        .should("be.empty");
+      assertHelper.WaitForNetworkCall("@postExecute");
+      agHelper
+        .GetAttribute(locators._imgWidgetInsideList, "src")
+        .then((labelValue) => {
+          expect(labelValue).to.contain("data:image/png;base64");
+        });
+
+      deployMode.DeployApp();
+      agHelper.AssertElementVisibility(appSettings.locators._header);
+      agHelper.EnterInputText("Label", "Widget Input2");
+      cy.get(locators._widgetInputSelector("inputwidgetv2"))
+        .first()
+        .invoke("attr", "value")
+        .should("contain", "Widget Input2");
+      agHelper
+        .GetAttribute(locators._imgWidgetInsideList, "src")
+        .then((labelValue) => {
+          expect(labelValue).not.to.contain("data:image/png;base64");
+        });
+      agHelper.ClickButton("Submit");
+      cy.get(locators._widgetInputSelector("inputwidgetv2"))
+        .first()
+        .invoke("attr", "value")
+        .should("be.empty");
+      agHelper
+        .GetAttribute(locators._imgWidgetInsideList, "src")
+        .then((labelValue) => {
+          expect(labelValue).to.contain("data:image/png;base64");
+        });
+    });
+  },
+);

app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js

@@ -48,12 +48,9 @@ describe("Embed settings options", { tags: ["@tag.Settings"] }, function () {
       .click()
       .wait(1000);
     _.agHelper.ClickButton("Copy application url");
-    cy.window()
-      .its("navigator.clipboard")
-      .invoke("readText")
-      .then((text) => {
-        cy.wrap(text).as("deployUrl");
-      });
+    cy.window().then((win) => {
+      cy.stub(win.navigator.clipboard, "writeText").as("deployUrl").resolves();
+    });
     cy.enablePublicAccess();
     cy.wait(8000); //adding wait time for iframe to load fully!
     _.agHelper.RefreshPage();

app/client/cypress/e2e/Sanity/Datasources/RestApiOAuth2Validation_spec.ts

@@ -8,7 +8,7 @@ import {
   dataManager,
 } from "../../../support/Objects/ObjectsCore";
 
-describe(
+describe.skip(
   "Datasource form OAuth2 client credentials related tests",
   {
     tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
@@ -42,7 +42,7 @@ describe(
       });
     });
 
-    it("2. Validate save and Authorise", function () {
+    it.skip("2. Validate save and Authorise", function () {
       agHelper.GetNClick(dataSources._saveDs);
 
       //Accept consent

app/client/cypress/support/Objects/CommonLocators.ts

@@ -86,7 +86,7 @@ export class CommonLocators {
   _anvilDnDHighlight = "[data-type=anvil-dnd-highlight]";
   _editPage = "[data-testid=onboarding-tasks-datasource-text], .t--drop-target";
   _crossBtn = "span.cancel-icon";
-  _createNew = ".t--add-item";
+  _createNew = "[data-testid='t--add-item']";
   _uploadFiles = "div.uppy-Dashboard-AddFiles input";
   _uploadBtn = "button.uppy-StatusBar-actionBtn--upload";
   _errorTab = "[data-testid=t--tab-ERROR_TAB]";

app/client/cypress/support/Pages/IDE/ListView.ts

@@ -4,7 +4,7 @@ class ListView {
   public locators = {
     list: "[data-testid='t--ide-list']",
     listItem: "[data-testid='t--ide-list-item']",
-    addItem: "button.t--add-item",
+    addItem: "[data-testid='t--add-item']",
   };
 
   public assertListVisibility() {

app/client/jest.config.js

@@ -23,17 +23,19 @@ module.exports = {
           before: [
             {
               path: "node_modules/ts-jest-mock-import-meta",
-              options: { metaObjectReplacement: { url: "https://www.url.com" } },
+              options: {
+                metaObjectReplacement: { url: "https://www.url.com" },
+              },
             },
           ],
         },
-      }
+      },
     ],
   },
   testEnvironment: "jsdom",
   testTimeout: 9000,
   setupFilesAfterEnv: ["<rootDir>/test/setup.ts"],
-  testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(tsx|ts|js)?$",
+  testRegex: "\\.(test|spec)\\.(tsx|ts|js)?$",
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node", "css"],
   moduleDirectories: ["node_modules", "src", "test"],
   transformIgnorePatterns: [
@@ -68,8 +70,7 @@ module.exports = {
       "<rootDir>/node_modules/@blueprintjs/select/lib/esnext",
     "@appsmith/ads": "<rootDir>/node_modules/@appsmith/ads",
     "^canvas$": "jest-canvas-mock",
-    "^entities/(.*)$": "<rootDir>/src/entities/$1",  // Match 'entities/*'
-
+    "^entities/(.*)$": "<rootDir>/src/entities/$1", // Match 'entities/*'
   },
   globals: {
     APPSMITH_FEATURE_CONFIGS: {

app/client/packages/design-system/ads/src/NumberInput/NumberInput.stories.tsx

@@ -4,7 +4,7 @@ import type { NumberInputProps } from "./NumberInput.types";
 import type { StoryObj } from "@storybook/react";
 
 export default {
-  title: "ADS/Components/Input/NumberInput",
+  title: "ADS/Components/Input/Number Input",
   component: NumberInput,
   decorators: [
     (Story: () => React.ReactNode) => (

app/client/packages/design-system/ads/src/SearchInput/SearchInput.stories.tsx

@@ -4,7 +4,7 @@ import type { SearchInputProps } from "./SearchInput.types";
 import type { StoryObj } from "@storybook/react";
 
 export default {
-  title: "ADS/Components/Input/SearchInput",
+  title: "ADS/Components/Input/Search Input",
   component: SearchInput,
   decorators: [
     (Story: () => React.ReactNode) => (

app/client/packages/design-system/ads/src/SegmentedControl/SegmentedControl.styles.tsx

@@ -55,6 +55,10 @@ export const StyledControlContainer = styled.div`
   cursor: pointer;
   height: 100%;
 
+  &[data-selected="false"]:hover {
+    background-color: var(--ads-v2-color-bg-muted);
+  }
+
   &:focus-visible {
     outline: var(--ads-v2-border-width-outline) solid
       var(--ads-v2-color-outline);
@@ -77,7 +81,7 @@ export const StyledControlContainer = styled.div`
 
   /* Select all segments which is not a selected and last child */
   /* seperator */
-  &:not(:last-child):not([data-selected="true"]):not(
+  &:not(:hover):not(:last-child):not([data-selected="true"]):not(
       :has(+ [data-selected="true"])
     ):after {
     content: "";
@@ -87,15 +91,4 @@ export const StyledControlContainer = styled.div`
     height: 16px;
     background-color: var(--ads-v2-colors-control-field-default-border);
   }
-
-  /* This before is to mask the separator in left side of selected control */
-  /* Mask the seperator with track background color */
-  &[data-selected="true"]:not(:first-child):after {
-    content: "";
-    position: absolute;
-    left: -7px;
-    width: 2px;
-    height: 16px;
-    background-color: var(--ads-v2-colors-control-track-default-bg);
-  }
 `;

app/client/packages/design-system/ads/src/Templates/EntityExplorer/EditorSegments/EditorSegments.mdx

@@ -0,0 +1,25 @@
+import { Canvas, Meta } from "@storybook/blocks";
+
+import * as EditorSegmentsStories from "./EditorSegments.stories";
+
+<Meta of={EditorSegmentsStories} />
+
+# Editor Segments
+
+Editor Segments is is built on top of the ADS component - Segmented Control. It is a preset template built for Entity Explorer which has a `max-width of 247px` and has extra padding around each of the segments.
+
+Editor Segments present a range of options, and should be used when the user can execute those options instantaneously. It can also accept `children` to add more UI controls, if needed. These will be placed on the right side of the segments. It takes `options`, `selectedSegment` and `onSegmentChange` props to handle the value and onChange functionalities of Segmented Control component.
+
+The options presented should not be binary. If you have a `yes | no` scenario, use a switch, instead.
+
+## Anatomy
+
+### Default implementation
+
+Note: The `options` needs to be passed as required, the UI shown below are not default values being provided to the Editor segments. It also means the `selectedSegment` and `onSegmentChange` props needs to be passed as well.
+
+<Canvas of={EditorSegmentsStories.EditorSegmentsStory} />
+
+### More UI controls
+
+<Canvas of={EditorSegmentsStories.EditorSegmentsStoryWithChildren} />