Merge branch 'release' into chore/debugger-quick-wins-errors

appsmithorg · Nov 27, 2024 · 5143d48 · 5143d48
2 parents 77dddbe + 80c08b1
commit 5143d48
Show file tree

Hide file tree

Showing 27 changed files with 119 additions and 100 deletions.
diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml
@@ -166,10 +166,8 @@ jobs:
             -e APPSMITH_JWT_SECRET=appsmith-cloud-services-jwt-secret-dummy-key \
             -e APPSMITH_ENCRYPTION_SALT=encryption-salt \
             -e APPSMITH_ENCRYPTION_PASSWORD=encryption-password \
-            -e APPSMITH_CLOUD_SERVICES_URL=https://cs-dev.appsmith.com \
             -e APPSMITH_CUSTOMER_PORTAL_URL=https://dev.appsmith.com \
             -e APPSMITH_CLOUD_SERVICES_BASE_URL=https://cs-dev.appsmith.com \
-            -e APPSMITH_CLOUD_SERVER_BASE_URL=https://release.app.appsmith.com \
             -e AUTH0_ISSUER_URL=https://login.release-customer.appsmith.com/ \
             -e AUTH0_CLIENT_ID=dummy-client-id \
             -e AUTH0_CLIENT_SECRET=dummy-secret-id \
@@ -198,7 +196,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: app/client/package.json
-      
+
       - name: Check DB URL
         if: steps.run_result.outputs.run_result != 'success'
         run: |
@@ -457,20 +455,20 @@ jobs:
           name: server-logs-${{ matrix.job }}
           path: app/server/server-logs.log
           overwrite: true
-          
+
       - name: Collect docker log as file
         if: always()
         run: |
           docker logs appsmith >& app/server/docker-logs.log
- 
-      - name: Upload server docker logs bundle on failure 
+
+      - name: Upload server docker logs bundle on failure
         uses: actions/upload-artifact@v4
         if: always()
         with:
             name: docker-logs-${{ matrix.job }}
             path: app/server/docker-logs.log
             overwrite: true
-  
+
       # Set status = success
       - name: Save the status of the run
         run: |

diff --git a/.github/workflows/ci-test-limited-with-count.yml b/.github/workflows/ci-test-limited-with-count.yml
@@ -17,7 +17,7 @@ on:
       run_count:
         description: 'Number of times to repeat the test run'
         required: false
-        type: number 
+        type: number
         default: 1
   workflow_call:
     inputs:
@@ -176,10 +176,8 @@ jobs:
             -e APPSMITH_JWT_SECRET=appsmith-cloud-services-jwt-secret-dummy-key \
             -e APPSMITH_ENCRYPTION_SALT=encryption-salt \
             -e APPSMITH_ENCRYPTION_PASSWORD=encryption-password \
-            -e APPSMITH_CLOUD_SERVICES_URL=https://cs-dev.appsmith.com \
             -e APPSMITH_CUSTOMER_PORTAL_URL=https://dev.appsmith.com \
             -e APPSMITH_CLOUD_SERVICES_BASE_URL=https://cs-dev.appsmith.com \
-            -e APPSMITH_CLOUD_SERVER_BASE_URL=https://release.app.appsmith.com \
             -e AUTH0_ISSUER_URL=https://login.release-customer.appsmith.com/ \
             -e AUTH0_CLIENT_ID=dummy-client-id \
             -e AUTH0_CLIENT_SECRET=dummy-secret-id \
@@ -351,18 +349,18 @@ jobs:
             npx cypress-repeat-pro run -n ${{ inputs.run_count }} --force \
                 --spec ${{ env.specs_to_run }} \
                 --config-file "cypress_ci_custom.config.ts"
-            cat cy-repeat-summary.txt  
+            cat cy-repeat-summary.txt
             # Define the path for the failure flag file
             FAILURE_FLAG_FILE="ci_test_status.txt"
-            
+
             # Check for test results and store the status in the file
             if ! grep -q "Total Failed: 0" cy-repeat-summary.txt; then
                 echo "ci_test_failed=true" > "$FAILURE_FLAG_FILE"
             else
                 echo "ci_test_failed=false" > "$FAILURE_FLAG_FILE"
             fi
             cat "$FAILURE_FLAG_FILE"
-            
+
       - name: Trim number of cypress log files
         if: failure()
         run: |
@@ -375,7 +373,7 @@ jobs:
           name: cypress-repeat-logs
           path: ${{ github.workspace }}/app/client/cy-repeat-summary.txt
           overwrite: true
-      
+
       - name: Upload ci_test_status.txt artifact
         if: always()
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml
@@ -166,10 +166,8 @@ jobs:
             -e APPSMITH_JWT_SECRET=appsmith-cloud-services-jwt-secret-dummy-key \
             -e APPSMITH_ENCRYPTION_SALT=encryption-salt \
             -e APPSMITH_ENCRYPTION_PASSWORD=encryption-password \
-            -e APPSMITH_CLOUD_SERVICES_URL=https://cs-dev.appsmith.com \
             -e APPSMITH_CUSTOMER_PORTAL_URL=https://dev.appsmith.com \
             -e APPSMITH_CLOUD_SERVICES_BASE_URL=https://cs-dev.appsmith.com \
-            -e APPSMITH_CLOUD_SERVER_BASE_URL=https://release.app.appsmith.com \
             -e AUTH0_ISSUER_URL=https://login.release-customer.appsmith.com/ \
             -e AUTH0_CLIENT_ID=dummy-client-id \
             -e AUTH0_CLIENT_SECRET=dummy-secret-id \

diff --git a/app/client/docker/templates/nginx-app.conf.template b/app/client/docker/templates/nginx-app.conf.template
@@ -37,7 +37,6 @@ server {
         sub_filter __APPSMITH_VERSION_RELEASE_DATE__ '${APPSMITH_VERSION_RELEASE_DATE}';
         sub_filter __APPSMITH_INTERCOM_APP_ID__ '${APPSMITH_INTERCOM_APP_ID}';
         sub_filter __APPSMITH_MAIL_ENABLED__ '${APPSMITH_MAIL_ENABLED}';
-        sub_filter __APPSMITH_CLOUD_SERVICES_BASE_URL__ '${APPSMITH_CLOUD_SERVICES_BASE_URL}';
         sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '${APPSMITH_RECAPTCHA_SITE_KEY}';
         sub_filter __APPSMITH_DISABLE_INTERCOM__ '${APPSMITH_DISABLE_INTERCOM}';
         sub_filter __APPSMITH_ZIPY_SDK_KEY__ '${APPSMITH_ZIPY_SDK_KEY}';

diff --git a/app/client/public/index.html b/app/client/public/index.html
@@ -263,9 +263,6 @@
         },
         intercomAppID: INTERCOM_APP_ID,
         mailEnabled: parseConfig('{{env "APPSMITH_MAIL_ENABLED"}}'),
-        cloudServicesBaseUrl:
-          parseConfig('{{env "APPSMITH_CLOUD_SERVICES_BASE_URL"}}') ||
-          "https://cs.appsmith.com",
         googleRecaptchaSiteKey: parseConfig('{{env "APPSMITH_RECAPTCHA_SITE_KEY"}}'),
         hideWatermark: parseConfig('{{env "APPSMITH_HIDE_WATERMARK"}}'),
         disableIframeWidgetSandbox: parseConfig(

diff --git a/app/client/src/IDE/Components/FileTab/styles.tsx b/app/client/src/IDE/Components/FileTab/styles.tsx
@@ -20,6 +20,7 @@ export const Tab = styled.div`
   border-left: 1px solid transparent;
   border-right: 1px solid transparent;
   border-top: 2px solid transparent;
+  flex-shrink: 0;
 
   &.active {
     background: var(--ads-v2-colors-control-field-default-bg);

diff --git a/app/client/src/IDE/Components/HeaderDropdown.tsx b/app/client/src/IDE/Components/HeaderDropdown.tsx
@@ -6,10 +6,6 @@ const Container = styled(Flex)`
   & .t--entity-item {
     grid-template-columns: 0 auto 1fr auto auto auto auto auto;
     height: 32px;
-
-    & .t--entity-name {
-      padding-left: var(--ads-v2-spaces-3);
-    }
   }
 `;
 

diff --git a/app/client/src/api/CloudServicesApi.ts b/app/client/src/api/CloudServicesApi.ts
@@ -1,6 +1,2 @@
-import { getAppsmithConfigs } from "ee/configs";
-
-const { cloudServicesBaseUrl: BASE_URL } = getAppsmithConfigs();
-
 export const authorizeDatasourceWithAppsmithToken = (appsmithToken: string) =>
-  `${BASE_URL}/api/v1/integrations/oauth/authorize?appsmithToken=${appsmithToken}`;
+  `/api/v1/saas/authorize?appsmithToken=${appsmithToken}`;
diff --git a/app/client/src/ce/configs/index.ts b/app/client/src/ce/configs/index.ts
@@ -43,7 +43,6 @@ export interface INJECTED_CONFIGS {
   };
   intercomAppID: string;
   mailEnabled: boolean;
-  cloudServicesBaseUrl: string;
   googleRecaptchaSiteKey: string;
   supportEmail: string;
   disableIframeWidgetSandbox: boolean;
@@ -116,7 +115,6 @@ export const getConfigsFromEnvVars = (): INJECTED_CONFIGS => {
     mailEnabled: process.env.REACT_APP_MAIL_ENABLED
       ? process.env.REACT_APP_MAIL_ENABLED.length > 0
       : false,
-    cloudServicesBaseUrl: process.env.REACT_APP_CLOUD_SERVICES_BASE_URL || "",
     googleRecaptchaSiteKey:
       process.env.REACT_APP_GOOGLE_RECAPTCHA_SITE_KEY || "",
     supportEmail: process.env.APPSMITH_SUPPORT_EMAIL || "support@appsmith.com",
@@ -287,10 +285,6 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
       ENV_CONFIG.intercomAppID || APPSMITH_FEATURE_CONFIGS?.intercomAppID || "",
     mailEnabled:
       ENV_CONFIG.mailEnabled || APPSMITH_FEATURE_CONFIGS?.mailEnabled || false,
-    cloudServicesBaseUrl:
-      ENV_CONFIG.cloudServicesBaseUrl ||
-      APPSMITH_FEATURE_CONFIGS?.cloudServicesBaseUrl ||
-      "",
     appsmithSupportEmail: ENV_CONFIG.supportEmail,
     disableIframeWidgetSandbox:
       ENV_CONFIG.disableIframeWidgetSandbox ||

diff --git a/app/client/src/ce/configs/types.ts b/app/client/src/ce/configs/types.ts
@@ -56,8 +56,6 @@ export interface AppsmithUIConfigs {
   intercomAppID: string;
   mailEnabled: boolean;
 
-  cloudServicesBaseUrl: string;
-
   googleRecaptchaSiteKey: {
     enabled: boolean;
     apiKey: string;

diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts
@@ -25,7 +25,6 @@ export const FEATURE_FLAG = {
   ab_one_click_learning_popover_enabled:
     "ab_one_click_learning_popover_enabled",
   release_side_by_side_ide_enabled: "release_side_by_side_ide_enabled",
-  release_global_add_pane_enabled: "release_global_add_pane_enabled",
   ab_appsmith_ai_query: "ab_appsmith_ai_query",
   release_actions_redesign_enabled: "release_actions_redesign_enabled",
   rollout_remove_feature_walkthrough_enabled:
@@ -68,7 +67,6 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
   license_widget_rtl_support_enabled: false,
   ab_one_click_learning_popover_enabled: false,
   release_side_by_side_ide_enabled: false,
-  release_global_add_pane_enabled: false,
   ab_appsmith_ai_query: false,
   release_actions_redesign_enabled: false,
   rollout_remove_feature_walkthrough_enabled: true,

diff --git a/...t/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts b/...t/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
@@ -12765,7 +12765,6 @@ export const defaultAppState = {
           rollout_app_sidebar_enabled: false,
           ab_one_click_learning_popover_enabled: false,
           release_side_by_side_ide_enabled: false,
-          release_global_add_pane_enabled: false,
           license_git_unlimited_repo_enabled: false,
           ask_ai_js: false,
           license_connection_pool_size_enabled: false,

diff --git a/app/client/src/pages/Editor/Explorer/Entity/index.tsx b/app/client/src/pages/Editor/Explorer/Entity/index.tsx
@@ -149,6 +149,10 @@ export const EntityItem = styled.div<{
     height: 36px;
   }
 
+  & .t--entity-name {
+    padding-left: var(--ads-v2-spaces-3);
+  }
+
   & .${EntityClassNames.COLLAPSE_TOGGLE} {
     svg {
       path {

diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetIcon.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetIcon.tsx
@@ -1,4 +1,3 @@
-import { IconWrapper } from "constants/IconConstants";
 import type { WidgetType } from "constants/WidgetConstants";
 import React from "react";
 import useWidgetConfig from "utils/hooks/useWidgetConfig";
@@ -14,11 +13,7 @@ function WidgetIcon(props: {
   const svg = useWidgetConfig(type, "iconSVG");
 
   if (svg) {
-    return (
-      <IconWrapper height={height} width={width}>
-        <img src={svg} />
-      </IconWrapper>
-    );
+    return <img height={height} src={svg} width={width} />;
   }
 
   return null;

diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
@@ -28,10 +28,6 @@ const JSContainer = styled(Flex)`
   & .t--entity-item {
     grid-template-columns: 0 auto 1fr auto auto auto auto auto;
     height: 32px;
-
-    & .t--entity-name {
-      padding-left: var(--ads-v2-spaces-3);
-    }
   }
 `;
 

diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/Explorer.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/Explorer.tsx
@@ -10,10 +10,6 @@ const QueriesContainer = styled(Flex)`
   & .t--entity-item {
     grid-template-columns: 0 auto 1fr auto auto auto auto auto;
     height: 32px;
-
-    & .t--entity-name {
-      padding-left: var(--ads-v2-spaces-3);
-    }
   }
 `;
 

diff --git a/app/client/src/pages/Editor/IDE/EditorPane/UI/List.tsx b/app/client/src/pages/Editor/IDE/EditorPane/UI/List.tsx
@@ -20,9 +20,6 @@ import styled from "styled-components";
 const ListContainer = styled(Flex)`
   & .t--entity-item {
     height: 32px;
-    & .t--entity-name {
-      padding-left: var(--ads-v2-spaces-3);
-    }
   }
 `;
 

diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx
@@ -1,35 +1,17 @@
 import React from "react";
-import { Button, Flex, SegmentedControl } from "@appsmith/ads";
+import { Flex, SegmentedControl } from "@appsmith/ads";
 import { createMessage, EDITOR_PANE_TEXTS } from "ee/constants/messages";
 import { EditorEntityTab } from "ee/entities/IDE/constants";
-import history from "utils/history";
-import { globalAddURL } from "ee/RouteBuilder";
-import { useSelector } from "react-redux";
 import { useCurrentEditorState, useSegmentNavigation } from "../../hooks";
 import styled from "styled-components";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { getCurrentBasePageId } from "selectors/editorSelectors";
 
 const Container = styled(Flex)`
   #editor-pane-segment-control {
     max-width: 247px;
   }
-
-  button {
-    flex-shrink: 0;
-    flex-basis: auto;
-  }
 `;
 
 const SegmentedHeader = () => {
-  const isGlobalAddPaneEnabled = useFeatureFlag(
-    FEATURE_FLAG.release_global_add_pane_enabled,
-  );
-  const basePageId = useSelector(getCurrentBasePageId);
-  const onAddButtonClick = () => {
-    history.push(globalAddURL({ basePageId }));
-  };
   const { segment } = useCurrentEditorState();
   const { onSegmentChange } = useSegmentNavigation();
 
@@ -61,16 +43,6 @@ const SegmentedHeader = () => {
         ]}
         value={segment}
       />
-      {isGlobalAddPaneEnabled ? (
-        <Button
-          className={"t--add-editor-button"}
-          isIconButton
-          kind="primary"
-          onClick={onAddButtonClick}
-          size="sm"
-          startIcon="add-line"
-        />
-      ) : null}
     </Container>
   );
 };

diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/AddTab.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/AddTab.tsx
@@ -6,6 +6,7 @@ import {
   EditorEntityTab,
   EditorEntityTabState,
 } from "ee/entities/IDE/constants";
+import { Text } from "@appsmith/ads";
 
 const AddTab = ({
   isListActive,
@@ -34,7 +35,7 @@ const AddTab = ({
       onClose={(e) => onCloseClick(e)}
       title={content}
     >
-      {content}
+      <Text kind="body-s">{content}</Text>
     </FileTab>
   );
 };

diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx
@@ -14,10 +14,6 @@ const ListContainer = styled(Flex)`
   & .t--entity-item {
     grid-template-columns: 0 auto 1fr auto auto auto auto auto;
     height: 32px;
-
-    & .t--entity-name {
-      padding-left: var(--ads-v2-spaces-3);
-    }
   }
 `;
 

diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/old/JSFunctionRun.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/old/JSFunctionRun.tsx
@@ -26,8 +26,8 @@ const DropdownWithCTAWrapper = styled.div<DropdownWithCTAWrapperProps>`
   display: flex;
   gap: var(--ads-v2-spaces-3);
 
-  &&&&& .function-select-dropdown {
-    width: 230px;
+  .rc-select-selector {
+    min-width: unset;
   }
 `;
 

diff --git a/app/client/src/pages/Editor/QueryEditor/DatasourceSelector.tsx b/app/client/src/pages/Editor/QueryEditor/DatasourceSelector.tsx
@@ -21,6 +21,10 @@ import { getCurrentAppWorkspace } from "ee/selectors/selectedWorkspaceSelectors"
 const DropdownSelect = styled.div`
   font-size: 14px;
   width: 230px;
+
+  .rc-select-selector {
+    min-width: unset;
+  }
 `;
 
 const CreateDatasource = styled.div`