Merge branch 'release' of github.com:appsmithorg/appsmith into feat/b…

…ackup-restore-pg

.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 origin 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 origin 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'

.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/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/src/ce/pages/Applications/index.tsx

@@ -318,6 +318,7 @@ export function LeftPaneSection(props: {
             <Button
               data-testid="t--workspace-new-workspace-auto-create"
               isDisabled={props.isFetchingWorkspaces}
+              isIconButton
               kind="tertiary"
               onClick={createNewWorkspace}
               startIcon="add-line"