Dev

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

@@ -148,6 +148,7 @@ jobs:
         working-directory: "."
         run: |
           sudo /etc/init.d/ssh stop ;
+          sudo systemctl disable --now ssh.socket
           mkdir -p ~/git-server/keys
           ted_tag="${{inputs.ted_tag}}"
           docker run --name test-event-driver -d -p 22:22 -p 5001:5001 -p 3306:3306 \

.github/workflows/server-build.yml

@@ -23,6 +23,27 @@ on:
         type: string
         default: "false"
 
+  workflow_dispatch:
+    inputs:
+      pr:
+        description: "PR number for the workflow"
+        required: false
+        type: number
+      skip-tests:
+        description: "Skip tests flag"
+        required: false
+        type: string
+        default: "false"
+      branch:
+        description: "Branch for the build"
+        required: false
+        type: string
+      is-pg-build:
+        description: "Flag for PG build"
+        required: false
+        type: string
+        default: "false"
+
 # Change the working directory for all the jobs in this workflow
 defaults:
   run:

.github/workflows/test-vulnerabilities-data.yml

@@ -29,85 +29,6 @@ jobs:
       - name: Install pg
         run: npm install pg
 
-      - name: Fetch vulnerability data
-        id: vulnerability_data
-        env:
-          DB_HOST: ${{ secrets.CYPRESS_DB_HOST }}
-          DB_NAME: ${{ secrets.CYPRESS_DB_NAME }}
-          DB_USER: ${{ secrets.CYPRESS_DB_USER }}
-          DB_PWD: ${{ secrets.CYPRESS_DB_PWD }}
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const { Pool } = require("pg");
-            const fs = require('fs');
-            const path = require('path');
-            const { DB_HOST, DB_NAME, DB_USER, DB_PWD } = process.env;
-
-            const pool = new Pool({
-              user: DB_USER,
-              host: DB_HOST,
-              database: DB_NAME,
-              password: DB_PWD,
-              port: 5432,
-              connectionTimeoutMillis: 60000,
-            });
-
-            (async () => {
-              const client = await pool.connect();
-              try {
-                // Fetch vurn_id, product, scanner_tool, and priority from the database
-                const result = await client.query(`SELECT vurn_id, product, scanner_tool, priority FROM vulnerability_tracking`);
-                console.log('Vulnerability Data:', result.rows);
-
-                // Extract relevant fields from the result
-                const extractedData = result.rows.map(({ vurn_id, product, scanner_tool, priority }) => ({
-                  vurn_id,
-                  product,
-                  scanner_tool,
-                  priority
-                }));
-                console.log('Extracted Vulnerability Data:', extractedData);
-
-                // Prepare CSV content
-                const csvContent = [
-                  ['vurn_id', 'product', 'scanner_tool', 'priority'],  // Add priority column header
-                  ...extractedData.map(row => [row.vurn_id, row.product, row.scanner_tool, row.priority])
-                ]
-                .map(e => e.join(',')) // Join columns
-                .join('\n'); // Join rows
-
-                // Write to CSV file in workspace
-                const csvFilePath = path.join(process.env.GITHUB_WORKSPACE, 'vulnerability_base_data.csv');
-                fs.writeFileSync(csvFilePath, csvContent);
-                console.log(`Data successfully written to ${csvFilePath}`);
-
-                // Prepare TXT content
-                const txtContent = extractedData
-                  .map(row => `vurn_id: ${row.vurn_id}, product: ${row.product}, scanner_tool: ${row.scanner_tool}, priority: ${row.priority}`)
-                  .join('\n'); // Join rows
-
-                // Write to TXT file in workspace
-                const txtFilePath = path.join(process.env.GITHUB_WORKSPACE, 'vulnerability_base_data.txt');
-                fs.writeFileSync(txtFilePath, txtContent);
-                console.log(`Data successfully written to ${txtFilePath}`);
-
-                client.release();
-                return extractedData; // Return the extracted data
-              } catch (err) {
-                console.error('Error fetching vulnerability data:', err);
-                client.release();
-              }
-            })();
-
-      - name: Upload Vulnerability Data
-        uses: actions/upload-artifact@v3
-        with:
-          name: vulnerability-data
-          path: |
-            vulnerability_base_data.csv
-            vulnerability_base_data.txt      
-
       # Run Scout vulnerability data script
       - name: Run Scout vulnerability data script
         if: always()
@@ -140,4 +61,24 @@ jobs:
             "${{ github.event.pull_request.number }}" \
             "${{ github.event.pull_request.html_url }}" \
             "${{ github.run_id }}"
-
+
+      - name: Check for new vulnerabilities in Scout and Trivy files
+        if: always()
+        run: |
+          # Check if Scout vulnerabilities file has data after the header
+          if [ $(tail -n +2 scout_new_vulnerabilities.csv | wc -l) -gt 0 ]; then
+            echo "Scout vulnerabilities detected."
+            cat scout_new_vulnerabilities.csv
+            exit 1  # Fail the job if data exists
+          else
+            echo "No new Scout vulnerabilities detected."
+          fi
+
+          # Check if Trivy vulnerabilities file has data after the header
+          if [ $(tail -n +2 trivy_new_vulnerabilities.csv | wc -l) -gt 0 ]; then
+            echo "Trivy vulnerabilities detected."
+            cat trivy_new_vulnerabilities.csv
+            exit 1  # Fail the job if data exists
+          else
+            echo "No new Trivy vulnerabilities detected."
+          fi

Dockerfile

@@ -17,18 +17,10 @@ RUN <<END
     exit 1
   fi
 
-  if ! [ -f server/mongo/server.jar && -f server/pg/server.jar ]; then
+  if ! [ -f server/mongo/server.jar -a -f server/pg/server.jar ]; then
     echo "Missing one or both server.jar files in the right place. Are you using the build script?" >&2
     exit 1
   fi
-
-  mkdir -p ./editor ./rts
-
-  # Ensure all *.sh scripts are executable.
-  find . -name node_modules -prune -or -type f -name '*.sh' -print -exec chmod +x '{}' ';'
-
-  # Ensure all custom command-scripts have executable permission
-  chmod +x /opt/bin/*
 END
 
 # Add client UI - Application Layer
@@ -39,13 +31,28 @@ COPY ./app/client/packages/rts/dist rts/
 
 ENV PATH /opt/bin:/opt/appsmith/utils/node_modules/.bin:/opt/java/bin:/opt/node/bin:$PATH
 
-RUN cd ./utils && npm install --only=prod && npm install --only=prod -g . && cd - \
-  && chmod +x /opt/bin/* *.sh /watchtower-hooks/*.sh \
+RUN <<END
+  set -o errexit
+
+  cd ./utils
+  npm install --only=prod
+  npm install --only=prod -g .
+  rm -rf utils/node_modules/resolve/test
+  cd -
+
+  # Make all `*.sh` files executable, excluding `node_modules`.
+  find . \( -name node_modules -prune \) -o \( -type f -name '*.sh' \) -exec chmod +x '{}' +
+
+  # Ensure all custom command-scripts have executable permission
+  chmod +x /opt/bin/* /watchtower-hooks/*.sh
+
   # Disable setuid/setgid bits for the files inside container.
-  && find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -print -exec chmod -s '{}' + \) || true \
-  && mkdir -p /.mongodb/mongosh /appsmith-stacks \
-  && chmod ugo+w /etc /appsmith-stacks \
-  && chmod -R ugo+w /var/run /.mongodb /etc/ssl /usr/local/share
+  find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -exec chmod -s '{}' + \) || true
+
+  mkdir -p /.mongodb/mongosh /appsmith-stacks
+  chmod ugo+w /etc /appsmith-stacks
+  chmod -R ugo+w /var/run /.mongodb /etc/ssl /usr/local/share
+END
 
 LABEL com.centurylinklabs.watchtower.lifecycle.pre-check=/watchtower-hooks/pre-check.sh
 LABEL com.centurylinklabs.watchtower.lifecycle.pre-update=/watchtower-hooks/pre-update.sh

app/client/.eslintrc.base.json

@@ -11,6 +11,7 @@
   ],
   "plugins": [
     "react",
+    "eslint-plugin-react-compiler",
     "@typescript-eslint",
     "prettier",
     "sort-destructure-keys",
@@ -41,6 +42,7 @@
     "project": "./tsconfig.json"
   },
   "rules": {
+    "react-compiler/react-compiler": "warn",
     "padding-line-between-statements": [
       "error",
       { "blankLine": "always", "prev": "*", "next": "return" },

app/client/cypress/e2e/Regression/ClientSide/Binding/DatePicker_Text_spec.js

@@ -14,7 +14,7 @@ describe(
       _.agHelper.AddDsl("uiBindDsl");
     });
     // Skipping tests due to issue - https://www.notion.so/appsmith/f353d8c6bd664f79ad858a42010cdfc8?v=f04cde23f6424aeb9d5a6e389cd172bd&p=0717892d43684c40bae4e2c87b8308cb&pm=s
-    it.skip("1. DatePicker-Text, Validate selectedDate functionality", function () {
+    it("1. DatePicker-Text, Validate selectedDate functionality", function () {
       /**
        * Bind DatePicker1 to Text for "selectedDate"
        */
@@ -25,9 +25,8 @@ describe(
        * Set the Calender for today's date in DatePicker1
        */
       cy.openPropertyPane("datepickerwidget");
-      cy.get(formWidgetsPage.defaultDate).click();
-      cy.ClearDateFooter();
-      cy.SetDateToToday();
+      cy.get(formWidgetsPage.datepickerWidget).first().click();
+      cy.get(formWidgetsPage.datepickerFooter).contains("Today").click();
 
       cy.getDate(1, "YYYY-MM-DD").then((date) => {
         cy.log("retured date" + date);
@@ -43,15 +42,15 @@ describe(
         cy.get(publishPage.datepickerWidget + commonlocators.inputField)
           .eq(0)
           .click();
-        cy.ClearDateFooter();
-        cy.setDate(1, "ddd MMM DD YYYY");
+        cy.SetDateToToday();
+        cy.setDate(1, "ddd MMM DD YYYY", "v1");
         cy.get(commonlocators.labelTextStyle).should("contain", nextDay);
       });
 
       cy.get(commonlocators.backToEditor).click();
     });
 
-    it.skip("2. DatePicker1-text: Change the date in DatePicker1 and Validate the same in text widget", function () {
+    it("2. DatePicker1-text: Change the date in DatePicker1 and Validate the same in text widget", function () {
       cy.openPropertyPane("textwidget");
 
       /**
@@ -75,9 +74,9 @@ describe(
        */
       cy.openPropertyPane("datepickerwidget");
       cy.get(formWidgetsPage.defaultDate).click();
-      cy.ClearDateFooter();
-      cy.setDate(1, "ddd MMM DD YYYY");
-      // cy.get(commonlocators.onDateSelectedField).click();
+      cy.get(formWidgetsPage.dayPickerToday).click();
+      cy.get(formWidgetsPage.defaultDate).click();
+      cy.setDate(1);
 
       /**
        *Validate the date in text widget
@@ -89,7 +88,7 @@ describe(
       });
     });
 
-    it.skip("3. Validate the Date is not changed in DatePicker2", function () {
+    it("3. Validate the Date is not changed in DatePicker2", function () {
       cy.log("dateDp2:" + dateDp2);
       cy.get(formWidgetsPage.datepickerWidget + commonlocators.inputField)
         .eq(1)
@@ -124,7 +123,7 @@ describe(
       _.deployMode.NavigateBacktoEditor();
     });
 
-    it.skip("5. Checks if on deselection of date triggers the onDateSelected action or not.", function () {
+    it("5. Checks if on deselection of date triggers the onDateSelected action or not.", function () {
       /**
        * bind datepicker to show a message "Hello" on date selected
        */
@@ -135,7 +134,6 @@ describe(
        * checking if on selecting the date triggers the message
        */
       cy.get(formWidgetsPage.datepickerWidget).first().click();
-      cy.ClearDateFooter();
       cy.SetDateToToday();
       cy.get(commonlocators.toastmsg).contains("hello");
 

app/client/cypress/e2e/Regression/ClientSide/Binding/JSObjectToListWidget_Spec.ts

@@ -2,6 +2,8 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
+import BottomPane from "../../../../support/Pages/IDE/BottomPane";
+
 let valueToTest: any, jsName: any;
 
 describe(
@@ -17,7 +19,7 @@ describe(
         _.dataManager.dsValues[_.dataManager.defaultEnviorment].mockApiUrl,
       );
       _.apiPage.RunAPI();
-      _.agHelper.GetNClick(_.dataSources._queryResponse("JSON"));
+      BottomPane.response.switchResponseType("JSON");
       _.apiPage.ReadApiResponsebyKey("name");
       cy.get("@apiResp").then((value) => {
         valueToTest = value;

app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_1_Spec.ts

@@ -172,7 +172,7 @@ return WhatTrumpThinks.run().then((res) => { showAlert("Today's Trump quote for
     );
     agHelper.ValidateToastMessage(
       "will be executed automatically on page load",
-    ); //Validating 'Run API on Page Load' is set once api response is mapped
+    ); //Validating 'Run the API on Page Load' is set once api response is mapped
     EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
     propPane.EnterJSContext(
       "onClick",

app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28287_Spec.ts

@@ -8,6 +8,7 @@ import {
 import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
+import BottomPane from "../../../../support/Pages/IDE/BottomPane";
 
 let dsName: any;
 let queryName: string;
@@ -43,7 +44,11 @@ describe(
 
         EditorNavigation.SelectEntityByName(queryName, EntityType.Query);
 
-        agHelper.AssertElementVisibility(dataSources._queryResponse("TABLE"));
+        BottomPane.response.switchToResponseTab();
+
+        agHelper.AssertElementVisibility(
+          BottomPane.response.getResponseTypeSelector("TABLE"),
+        );
       });
     });
   },

app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js

@@ -31,7 +31,7 @@ describe(
       cy.xpath(queryLocators.querySettingsTab).click();
 
       cy.get(".label-icon-wrapper")
-        .contains("Run query on page load")
+        .contains("Run the query on page load")
         .parent()
         .then(($el) => {
           cy.window().then((win) => {
@@ -45,7 +45,7 @@ describe(
         });
 
       cy.get(".label-icon-wrapper")
-        .contains("Request confirmation before running query")
+        .contains("Request confirmation before running this query")
         .parent()
         .then(($el) => {
           cy.window().then((win) => {

app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/ParitalImportAppNegative_spec.ts

@@ -0,0 +1,22 @@
+import {
+  homePage,
+  partialImportExport,
+  agHelper,
+} from "../../../../support/Objects/ObjectsCore";
+
+describe(
+  "Partial import App",
+  { tags: ["@tag.ImportExport", "@tag.Git"] },
+  () => {
+    beforeEach(() => {
+      partialImportExport.OpenImportModal();
+    });
+
+    it("1. Verify Importing App into Page shows error message for incompatible json file ", () => {
+      homePage.ImportApp("PartialImportAppNegative.json", "", true);
+      agHelper.ValidateToastMessage(
+        "Unable to import artifact in workspace The file is not compatible with the current partial import operation. Please check the file and try again.. {1}",
+      );
+    });
+  },
+);