15/11/24 Daily Promotion

.github/workflows/sync-release-to-pg.yml

@@ -50,7 +50,36 @@ jobs:
       - name: Push changes
         if: env.MERGE_CONFLICT == 'false'
         run: |
-          git push origin pg
+          set -e
+          git push https://${{ secrets.PAT_GITHUB }}@github.com/${{ github.repository }} HEAD:pg || echo "PUSH_FAILURE=true" >> $GITHUB_ENV
+
+      - name: Capture push failure message
+        if: env.PUSH_FAILURE == 'true'
+        run: |
+          # Capture the last git error message
+          push_error_message=$(git push https://${{ secrets.PAT_GITHUB }}@github.com/${{ github.repository }} HEAD:pg 2>&1 | tail -n 1)
+          echo "PUSH_ERROR_MESSAGE=$push_error_message" >> $GITHUB_ENV
+
+      - name: Notify on push failure
+        if: env.PUSH_FAILURE == 'true'
+        env:
+          SLACK_MESSAGE: "Push to pg branch failed: ${{ env.PUSH_ERROR_MESSAGE }}"
+        run: |
+          # Format the Slack message
+          slack_message="${{ env.SLACK_MESSAGE }}"
+
+          # Set the Slack message body with channel ID and text
+          body="$(jq -nc \
+            --arg channel C07JMLWEXDJ \
+            --arg text "$slack_message" \
+            '$ARGS.named'
+          )"
+
+          # Send the message to Slack
+          curl -v https://slack.com/api/chat.postMessage \
+            --header "Authorization: Bearer ${{ secrets.SLACK_APPSMITH_ALERTS_TOKEN }}" \
+            --header "Content-Type: application/json; charset=utf-8" \
+            --data-raw "$body"
 
       - name: Notify on merge conflicts
         if: env.MERGE_CONFLICT == 'true'
@@ -59,9 +88,9 @@ jobs:
           CONFLICTING_COMMIT: ${{ env.CONFLICTING_COMMIT }}
         run: |
           # Prepare the message for Slack
-          message="Merge conflict detected while merging release into pg branch. Conflicted commits:\n"
+          message="Merge conflict detected while merging release into pg branch. Conflicted commits:"
           commit_url="$REPOSITORY_URL/commit/$CONFLICTING_COMMIT"
-          message+="$commit_url\n"
+          message+="$commit_url"
 
           # Send the message to Slack
           # This unwieldy horror of a sed command, converts standard Markdown links to Slack's unwieldy link syntax.

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

@@ -65,16 +65,20 @@ jobs:
       - name: Check for new vulnerabilities in Scout and Trivy files
         if: always()
         run: |
-          # Check if Scout vulnerabilities file is not empty
-          if [ -s "scout_new_vulnerabilities.csv" ]; then
+          # 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 is not empty
-          if [ -s "trivy_new_vulnerabilities.csv" ]; then
+                  
+          # 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

app/client/cypress/support/commands.js

@@ -937,9 +937,6 @@ Cypress.Commands.add("SignupFromAPI", (uname, pword) => {
   cy.request({
     method: "POST",
     url: "api/v1/users",
-    headers: {
-      "content-type": "application/json",
-    },
     followRedirect: false,
     form: true,
     body: {

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

@@ -29,6 +29,7 @@ const getSizes = (size: ButtonSizes, isIconButton?: boolean) => {
         ? "var(--ads-v2-spaces-2)"
         : "var(--ads-v2-spaces-2) var(--ads-v2-spaces-3)"};
       --button-gap: var(--ads-v2-spaces-2);
+      --button-min-width: 60px;
     `,
     md: css`
       --button-font-weight: 600;
@@ -37,6 +38,7 @@ const getSizes = (size: ButtonSizes, isIconButton?: boolean) => {
         ? "var(--ads-v2-spaces-3)"
         : "var(--ads-v2-spaces-3) var(--ads-v2-spaces-4)"};
       --button-gap: var(--ads-v2-spaces-3);
+      --button-min-width: 80px;
     `,
   };
 
@@ -175,6 +177,8 @@ export const ButtonContent = styled.div<{
   box-sizing: border-box;
   padding: var(--button-padding);
   border-radius: inherit;
+  min-width: ${({ isIconButton }) =>
+    isIconButton ? "unset" : "var(--button-min-width)"};
 
   & > .${ButtonContentChildrenClassName} {
     display: flex;

app/client/packages/design-system/ads/src/Documentation/components/CodeBlock.tsx

@@ -16,7 +16,7 @@ function CodeBlock({ code }: CodeBlockProps) {
       }}
     >
       <Code>{code}</Code>
-      <Button kind="tertiary" startIcon="copy-control" />
+      <Button isIconButton kind="tertiary" startIcon="copy-control" />
     </Wrapper>
   );
 }

app/client/packages/dsl/src/migrate/helpers/widget-configs.json

@@ -7311,7 +7311,7 @@
             "controlType": "OPEN_CONFIG_PANEL",
             "buttonConfig": {
               "label": "Configure",
-              "icon": "settings-2-line"
+              "icon": "settings-v3"
             },
             "label": "Configure menu items",
             "isBindProperty": false,
@@ -47874,7 +47874,7 @@
                       "controlType": "OPEN_CONFIG_PANEL",
                       "buttonConfig": {
                         "label": "Configure",
-                        "icon": "settings-2-line"
+                        "icon": "settings-v3"
                       },
                       "label": "Configure menu items",
                       "isBindProperty": false,

app/client/packages/rts/src/constants/routes.ts

@@ -0,0 +1,9 @@
+const BASE_API_URL = "http://localhost:8091";
+
+export const RTS_BASE_PATH = "/rts";
+export const RTS_BASE_API_PATH = "/rts-api/v1";
+export const RTS_BASE_API_URL = `${BASE_API_URL}${RTS_BASE_API_PATH}`;
+
+export const BASE_APPSMITH_API_URL =
+  process.env.APPSMITH_API_BASE_URL || "http://localhost:8080/api/v1";
+export const INTERNAL_BASE_URL = "http://localhost:8080/internal/v1";

app/client/packages/rts/src/middlewares/socket-auth.ts

@@ -2,7 +2,7 @@ import type { Socket } from "socket.io";
 import log from "loglevel";
 import axios from "axios";
 
-const API_BASE_URL = process.env.APPSMITH_API_BASE_URL;
+import { BASE_APPSMITH_API_URL } from "@constants/routes";
 
 export async function tryAuth(socket: Socket) {
   /* ********************************************************* */
@@ -35,7 +35,7 @@ export async function tryAuth(socket: Socket) {
   try {
     response = await axios.request({
       method: "GET",
-      url: API_BASE_URL + "/users/me",
+      url: BASE_APPSMITH_API_URL + "/users/me",
       headers: {
         Cookie: sessionCookie,
       },

app/client/packages/rts/src/server.ts

@@ -12,23 +12,14 @@ import ast_routes from "./routes/ast_routes";
 import dsl_routes from "./routes/dsl_routes";
 import health_check_routes from "./routes/health_check_routes";
 
-const RTS_BASE_PATH = "/rts";
-
-export const RTS_BASE_API_PATH = "/rts-api/v1";
+import { RTS_BASE_PATH, RTS_BASE_API_PATH } from "@constants/routes";
 
 // Setting the logLevel for all log messages
 const logLevel: LogLevelDesc = (process.env.APPSMITH_LOG_LEVEL ||
   "debug") as LogLevelDesc;
 
 log.setLevel(logLevel);
 
-const API_BASE_URL = process.env.APPSMITH_API_BASE_URL;
-
-if (API_BASE_URL == null || API_BASE_URL === "") {
-  log.error("Please provide a valid value for `APPSMITH_API_BASE_URL`.");
-  process.exit(1);
-}
-
 const APPSMITH_RTS_PORT = process.env.APPSMITH_RTS_PORT || 8091;
 
 //Disable x-powered-by header to prevent information disclosure

app/client/packages/rts/src/test/server.test.ts

@@ -1,4 +1,5 @@
-import app, { RTS_BASE_API_PATH } from "../server";
+import app from "../server";
+import { RTS_BASE_API_PATH } from "@constants/routes";
 import supertest from "supertest";
 
 const singleScript = {

app/client/src/IDE/Components/ToolbarSettingsPopover.tsx

@@ -45,7 +45,7 @@ export const ToolbarSettingsPopover = (props: Props) => {
         <ToggleButton
           data-testid={props.dataTestId}
           disabled={props.disabled}
-          icon="settings-2-line"
+          icon="settings-v3"
           isSelected={isOpen}
           onClick={handleButtonClick}
           size="md"