From 2df35949b715870800d28a922bac743df91e73f0 Mon Sep 17 00:00:00 2001
From: Hetu Nandu <hetunandu@gmail.com>
Date: Tue, 5 Nov 2024 16:39:46 +0530
Subject: [PATCH 1/4] Sync changes from EE excluding enterprise directory

---
 .../editorComponents/form/fields/KeyValueFieldArray.tsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
index 8e5e514dc38a..ef5f2e472166 100644
--- a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
+++ b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
@@ -33,7 +33,7 @@ const KeyValueStackContainer = styled.div<CustomStack>`
 // `;
 const FormRowWithLabel = styled(FormRow)`
   flex-wrap: wrap;
-  margin-bottom: ${(props) => props.theme.spaces[2] - 1}px;
+  margin-bottom: var(--ads-v2-spaces-3);
   ${FormLabel} {
     width: 100%;
   }
@@ -52,7 +52,7 @@ const Flex = styled.div<{ size: number }>`
   ${(props) =>
     props.size === 3
       ? `
-    margin-left: 5px;
+    margin-left: 8px;
   `
       : null};
 `;
@@ -81,7 +81,7 @@ const DynamicTextFieldWithDropdownWrapper = styled.div`
 
 const DynamicDropdownFieldWrapper = styled.div`
   position: relative;
-  margin-left: 5px;
+  margin-left: var(--ads-v2-spaces-3);
   border-color: var(--ads-v2-color-border);
   color: var(--ads-v2-color-fg);
 

From 8ac2c1d2947a8c2c6797ac4b23c8e1d7dda326f4 Mon Sep 17 00:00:00 2001
From: Hetu Nandu <hetunandu@gmail.com>
Date: Tue, 5 Nov 2024 16:42:35 +0530
Subject: [PATCH 2/4] chore: Update ADS button min width

---
 .../packages/design-system/ads/src/Button/Button.styles.tsx    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/client/packages/design-system/ads/src/Button/Button.styles.tsx b/app/client/packages/design-system/ads/src/Button/Button.styles.tsx
index b5e58e42b28d..90051b39d44e 100644
--- a/app/client/packages/design-system/ads/src/Button/Button.styles.tsx
+++ b/app/client/packages/design-system/ads/src/Button/Button.styles.tsx
@@ -229,8 +229,7 @@ export const StyledButton = styled.button<{
     padding: 0;
     box-sizing: border-box;
     overflow: hidden;
-    min-width: ${({ isIconButton }) =>
-      isIconButton ? "unset" : "fit-content"};
+    min-width: ${({ isIconButton }) => (isIconButton ? "unset" : "60px")};
 
     /* button disabled style */
     &[data-disabled="true"] {

From 9d2bac75a679511e9a25b299ad96c9e5b49c52e0 Mon Sep 17 00:00:00 2001
From: Hetu Nandu <hetunandu@gmail.com>
Date: Tue, 12 Nov 2024 15:18:32 +0530
Subject: [PATCH 3/4] min width based on sizes

---
 .../design-system/ads/src/Button/Button.styles.tsx         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/client/packages/design-system/ads/src/Button/Button.styles.tsx b/app/client/packages/design-system/ads/src/Button/Button.styles.tsx
index 90051b39d44e..1fd71a2ca84f 100644
--- a/app/client/packages/design-system/ads/src/Button/Button.styles.tsx
+++ b/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;
@@ -229,7 +233,8 @@ export const StyledButton = styled.button<{
     padding: 0;
     box-sizing: border-box;
     overflow: hidden;
-    min-width: ${({ isIconButton }) => (isIconButton ? "unset" : "60px")};
+    min-width: ${({ isIconButton }) =>
+      isIconButton ? "unset" : "fit-content"};
 
     /* button disabled style */
     &[data-disabled="true"] {

From 224483d356083468d27acc5bb6a3d2b059ba8146 Mon Sep 17 00:00:00 2001
From: Hetu Nandu <hetunandu@gmail.com>
Date: Wed, 13 Nov 2024 08:27:19 +0530
Subject: [PATCH 4/4] fix create workspace icon button

---
 app/client/src/ce/pages/Applications/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx
index df8d6176a5d1..5c3e54af7fbd 100644
--- a/app/client/src/ce/pages/Applications/index.tsx
+++ b/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"