diff --git a/app/client/jest.config.js b/app/client/jest.config.js index 95aaa2fa70..bdab9f890b 100644 --- a/app/client/jest.config.js +++ b/app/client/jest.config.js @@ -17,7 +17,7 @@ module.exports = { moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node", "css"], moduleDirectories: ["node_modules", "src", "test"], transformIgnorePatterns: [ - "/node_modules/(?!codemirror|konva|design-system|react-dnd|dnd-core|@babel|(@blueprintjs)|@github|lodash-es|@draft-js-plugins|react-documents|linkedom|assert-never|axios)", + "/node_modules/(?!codemirror|konva|react-dnd|dnd-core|@babel|(@blueprintjs)|@github|lodash-es|@draft-js-plugins|react-documents|linkedom|assert-never|axios)", ], moduleNameMapper: { "\\.(css|less)$": "/test/__mocks__/styleMock.js", @@ -49,7 +49,7 @@ module.exports = { "/node_modules/@blueprintjs/popover2/lib/esnext", "^@blueprintjs/select$": "/node_modules/@blueprintjs/select/lib/esnext", - "design-system": "/node_modules/design-system", + "@appsmith/ads": "/node_modules/@appsmith/ads", "^canvas$": "jest-canvas-mock", }, globals: { diff --git a/app/client/package.json b/app/client/package.json index d7a4e1986e..13fe62a77e 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -48,6 +48,7 @@ "cypress:snapshot:docker:build": "docker build . -f cypress/Dockerfile -t cypress-snapshot" }, "dependencies": { + "@appsmith/ads": "workspace:^", "@appsmith/ads-old": "workspace:^", "@aws-sdk/client-s3": "^3.622.0", "@aws-sdk/lib-storage": "^3.622.0", @@ -123,7 +124,6 @@ "d3-geo": "^3.1.0", "dayjs": "^1.10.6", "deep-diff": "^1.0.2", - "design-system": "workspace:^", "downloadjs": "^1.4.7", "echarts": "^5.4.2", "fast-deep-equal": "^3.1.3", diff --git a/app/client/packages/design-system/ads-old/package.json b/app/client/packages/design-system/ads-old/package.json index 9d365b290e..a5617c98bc 100644 --- a/app/client/packages/design-system/ads-old/package.json +++ b/app/client/packages/design-system/ads-old/package.json @@ -12,14 +12,8 @@ }, "contributors": [ "Albin ", - "Rohit Agarwal ", - "Tanvi Bhakta " + "Rohit Agarwal " ], - "repository": { - "type": "git", - "url": "https://github.com/appsmithorg/design-system.git", - "directory": "packages/design-system" - }, "license": "Apache-2.0", "devDependencies": { "@types/loadable__component": "^5.13.4", diff --git a/app/client/packages/design-system/ads-old/src/FilePickerV2/index.tsx b/app/client/packages/design-system/ads-old/src/FilePickerV2/index.tsx index d834f3df5c..7b43cf5f2c 100644 --- a/app/client/packages/design-system/ads-old/src/FilePickerV2/index.tsx +++ b/app/client/packages/design-system/ads-old/src/FilePickerV2/index.tsx @@ -7,7 +7,7 @@ import Button, { Category, IconPositions, Size } from "../Button"; import type { IconName } from "../Icon"; import Icon, { IconSize } from "../Icon"; import Text, { TextType } from "../Text"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import TooltipComponent from "../Tooltip"; import { createMessage, diff --git a/app/client/packages/design-system/ads/package.json b/app/client/packages/design-system/ads/package.json index e0b216dabe..582a192301 100644 --- a/app/client/packages/design-system/ads/package.json +++ b/app/client/packages/design-system/ads/package.json @@ -1,5 +1,5 @@ { - "name": "design-system", + "name": "@appsmith/ads", "version": "2.1.43", "description": "This is the package for the design system that powers the Appsmith platform", "main": "src/index.ts", diff --git a/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx b/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx index 266192af96..4b51272b2c 100644 --- a/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx +++ b/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx @@ -1468,7 +1468,7 @@ export function IconProvider(props: { iconName, " not found. If you haven't made a typo, the icon probably does not exit " + "in our database - check the lookup here: " + - "https://github.com/appsmithorg/design-system/blob/c6c2d821c45e459fcb0522fccb273fccbce41664/packages/design-system/src/Icon/Icon.provider.tsx#L292", + "https://github.com/appsmithorg/appsmith/blob/release/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx#L1078", ); } return Icon && ; diff --git a/app/client/packages/design-system/ads/src/List/List.stories.tsx b/app/client/packages/design-system/ads/src/List/List.stories.tsx index 551c611159..90f21cabc6 100644 --- a/app/client/packages/design-system/ads/src/List/List.stories.tsx +++ b/app/client/packages/design-system/ads/src/List/List.stories.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { List, ListItem, Icon } from "design-system"; +import { List, ListItem, Icon } from "@appsmith/ads"; import type { StoryObj } from "@storybook/react"; -import type { ListItemProps, ListProps } from "design-system"; +import type { ListItemProps, ListProps } from "@appsmith/ads"; export default { title: "ADS/Components/List", diff --git a/app/client/packages/storybook/.storybook/styles.css b/app/client/packages/storybook/.storybook/styles.css index 82a2464b0a..8bb321fa17 100644 --- a/app/client/packages/storybook/.storybook/styles.css +++ b/app/client/packages/storybook/.storybook/styles.css @@ -8,7 +8,7 @@ @import url("https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap"); -@import url("design-system/src/__theme__/default/index.css"); /* This is to make theme variable available for stories */ +@import url("@appsmith/ads/src/__theme__/default/index.css"); /* This is to make theme variable available for stories */ html, body, diff --git a/app/client/src/AppErrorBoundry.tsx b/app/client/src/AppErrorBoundry.tsx index b01a1228c0..d59a0a53ef 100644 --- a/app/client/src/AppErrorBoundry.tsx +++ b/app/client/src/AppErrorBoundry.tsx @@ -4,7 +4,7 @@ import AppCrashImage from "assets/images/404-image.png"; import * as Sentry from "@sentry/react"; import log from "loglevel"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; const Wrapper = styled.div` display: flex; diff --git a/app/client/src/IDE/Components/BottomView.tsx b/app/client/src/IDE/Components/BottomView.tsx index 19bddbe3d7..022a4fe89a 100644 --- a/app/client/src/IDE/Components/BottomView.tsx +++ b/app/client/src/IDE/Components/BottomView.tsx @@ -5,7 +5,7 @@ import Resizer, { } from "components/editorComponents/Debugger/Resizer"; import { CodeEditorWithGutterStyles } from "pages/Editor/JSEditor/styledComponents"; import { ViewDisplayMode, ViewHideBehaviour } from "IDE/Interfaces/View"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; const VIEW_MIN_HEIGHT = 38; diff --git a/app/client/src/IDE/Components/FileTab.tsx b/app/client/src/IDE/Components/FileTab.tsx index 9adbf76867..9d8912d44b 100644 --- a/app/client/src/IDE/Components/FileTab.tsx +++ b/app/client/src/IDE/Components/FileTab.tsx @@ -2,7 +2,7 @@ import React from "react"; import styled from "styled-components"; import clsx from "classnames"; -import { Flex, Icon } from "design-system"; +import { Flex, Icon } from "@appsmith/ads"; import { sanitizeString } from "utils/URLUtils"; interface FileTabProps { diff --git a/app/client/src/IDE/Components/HeaderDropdown.tsx b/app/client/src/IDE/Components/HeaderDropdown.tsx index 6ad1b0ec46..28777fc3f8 100644 --- a/app/client/src/IDE/Components/HeaderDropdown.tsx +++ b/app/client/src/IDE/Components/HeaderDropdown.tsx @@ -1,4 +1,4 @@ -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import React from "react"; import styled from "styled-components"; diff --git a/app/client/src/IDE/Components/HeaderEditorSwitcher.tsx b/app/client/src/IDE/Components/HeaderEditorSwitcher.tsx index 77525671ab..a7baa07442 100644 --- a/app/client/src/IDE/Components/HeaderEditorSwitcher.tsx +++ b/app/client/src/IDE/Components/HeaderEditorSwitcher.tsx @@ -1,4 +1,4 @@ -import { Flex, Icon, Text } from "design-system"; +import { Flex, Icon, Text } from "@appsmith/ads"; import React from "react"; import styled from "styled-components"; diff --git a/app/client/src/IDE/Components/HeaderTitle.tsx b/app/client/src/IDE/Components/HeaderTitle.tsx index df62a10a10..7423cb338e 100644 --- a/app/client/src/IDE/Components/HeaderTitle.tsx +++ b/app/client/src/IDE/Components/HeaderTitle.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Flex, Text } from "design-system"; +import { Flex, Text } from "@appsmith/ads"; /** * Handy little styled component that can be used to render the title in the IDEHeader component diff --git a/app/client/src/IDE/Components/Sidebar/Sidebar.tsx b/app/client/src/IDE/Components/Sidebar/Sidebar.tsx index 59595bdcc6..0ef87910dd 100644 --- a/app/client/src/IDE/Components/Sidebar/Sidebar.tsx +++ b/app/client/src/IDE/Components/Sidebar/Sidebar.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import SidebarButton from "./SidebarButton"; import type { EditorState } from "ee/entities/IDE/constants"; import type { SidebarButtonProps } from "./SidebarButton/SidebarButton"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; const Container = styled(Flex)` width: 50px; diff --git a/app/client/src/IDE/Components/Sidebar/SidebarButton/SidebarButton.tsx b/app/client/src/IDE/Components/Sidebar/SidebarButton/SidebarButton.tsx index a5c57ff97d..8b252d22d0 100644 --- a/app/client/src/IDE/Components/Sidebar/SidebarButton/SidebarButton.tsx +++ b/app/client/src/IDE/Components/Sidebar/SidebarButton/SidebarButton.tsx @@ -1,5 +1,5 @@ import React, { useCallback } from "react"; -import { Flex, Icon, Text, Tooltip } from "design-system"; +import { Flex, Icon, Text, Tooltip } from "@appsmith/ads"; import styled from "styled-components"; import { Condition } from "../../../enums"; diff --git a/app/client/src/IDE/Structure/Header.tsx b/app/client/src/IDE/Structure/Header.tsx index b389b501a4..53de646437 100644 --- a/app/client/src/IDE/Structure/Header.tsx +++ b/app/client/src/IDE/Structure/Header.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Divider, Flex } from "design-system"; +import { Divider, Flex } from "@appsmith/ads"; import { AppsmithLink } from "pages/Editor/AppsmithLink"; interface ChildrenProps { diff --git a/app/client/src/ce/actions/applicationActions.ts b/app/client/src/ce/actions/applicationActions.ts index a31bd30e2b..1f8b23ff7e 100644 --- a/app/client/src/ce/actions/applicationActions.ts +++ b/app/client/src/ce/actions/applicationActions.ts @@ -7,7 +7,7 @@ import type { } from "ee/api/ApplicationApi"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import type { NavigationSetting, ThemeSetting } from "constants/AppConstants"; -import type { IconNames } from "design-system"; +import type { IconNames } from "@appsmith/ads"; import type { Datasource } from "entities/Datasource"; export enum ApplicationVersion { diff --git a/app/client/src/ce/api/ApplicationApi.tsx b/app/client/src/ce/api/ApplicationApi.tsx index 304ced0327..e11cc2baf0 100644 --- a/app/client/src/ce/api/ApplicationApi.tsx +++ b/app/client/src/ce/api/ApplicationApi.tsx @@ -6,7 +6,7 @@ import type { AxiosProgressEvent, AxiosPromise } from "axios"; import type { NavigationSetting, ThemeSetting } from "constants/AppConstants"; import type { AppColorCode } from "constants/DefaultTheme"; import type { EvaluationVersion } from "constants/EvalConstants"; -import type { IconNames } from "design-system"; +import type { IconNames } from "@appsmith/ads"; import type { Action, BaseAction } from "entities/Action"; import type { APP_MODE } from "entities/App"; import type { Datasource } from "entities/Datasource"; diff --git a/app/client/src/ce/components/DSDataFilter/index.tsx b/app/client/src/ce/components/DSDataFilter/index.tsx index 1f6bc5985a..059ea4a27f 100644 --- a/app/client/src/ce/components/DSDataFilter/index.tsx +++ b/app/client/src/ce/components/DSDataFilter/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import styled from "styled-components"; -import { Link, Tag, Text, Tooltip } from "design-system"; +import { Link, Tag, Text, Tooltip } from "@appsmith/ads"; import { BUSINESS_TAG, createMessage } from "ee/constants/messages"; import { capitalizeFirstLetter } from "utils/helpers"; import { getRampLink, showProductRamps } from "ee/selectors/rampSelectors"; diff --git a/app/client/src/ce/components/SwitchEnvironment/index.tsx b/app/client/src/ce/components/SwitchEnvironment/index.tsx index 3a365b58bd..07ac7a4b1c 100644 --- a/app/client/src/ce/components/SwitchEnvironment/index.tsx +++ b/app/client/src/ce/components/SwitchEnvironment/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; import { useSelector } from "react-redux"; import styled from "styled-components"; -import { Icon, Link, Option, Select, Text, Tooltip } from "design-system"; +import { Icon, Link, Option, Select, Text, Tooltip } from "@appsmith/ads"; import { capitalizeFirstLetter } from "utils/helpers"; import { BUSINESS_EDITION_TEXT, diff --git a/app/client/src/ce/components/WorkspaceSettingsTabs/index.tsx b/app/client/src/ce/components/WorkspaceSettingsTabs/index.tsx index 033cc0fe97..b2c82b8fd5 100644 --- a/app/client/src/ce/components/WorkspaceSettingsTabs/index.tsx +++ b/app/client/src/ce/components/WorkspaceSettingsTabs/index.tsx @@ -7,7 +7,7 @@ import { } from "react-router-dom"; import MemberSettings from "ee/pages/workspace/Members"; import { GeneralSettings } from "pages/workspace/General"; -import { Tabs, Tab, TabsList, TabPanel } from "design-system"; +import { Tabs, Tab, TabsList, TabPanel } from "@appsmith/ads"; import { navigateToTab } from "ee/pages/workspace/helpers"; import styled from "styled-components"; diff --git a/app/client/src/ce/components/gitComponents/GitSettingsCDTab/UnlicensedGitCD.tsx b/app/client/src/ce/components/gitComponents/GitSettingsCDTab/UnlicensedGitCD.tsx index bb958e1faa..4ffa883ea1 100644 --- a/app/client/src/ce/components/gitComponents/GitSettingsCDTab/UnlicensedGitCD.tsx +++ b/app/client/src/ce/components/gitComponents/GitSettingsCDTab/UnlicensedGitCD.tsx @@ -4,7 +4,7 @@ import { TRY_APPSMITH_ENTERPRISE, createMessage, } from "ee/constants/messages"; -import { Button, Text } from "design-system"; +import { Button, Text } from "@appsmith/ads"; import { useAppsmithEnterpriseLink } from "pages/Editor/gitSync/GitSettingsModal/TabBranch/hooks"; import React from "react"; import styled from "styled-components"; diff --git a/app/client/src/ce/hooks/datasourceEditorHooks.tsx b/app/client/src/ce/hooks/datasourceEditorHooks.tsx index ac6946ec36..2f7e64d65b 100644 --- a/app/client/src/ce/hooks/datasourceEditorHooks.tsx +++ b/app/client/src/ce/hooks/datasourceEditorHooks.tsx @@ -12,7 +12,7 @@ import { getHasCreatePagePermission, hasCreateDSActionPermissionInApp, } from "ee/utils/BusinessFeatures/permissionPageHelpers"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import type { Datasource } from "entities/Datasource"; import type { ApiDatasourceForm } from "entities/Datasource/RestAPIForm"; import NewActionButton from "pages/Editor/DataSourceEditor/NewActionButton"; diff --git a/app/client/src/ce/pages/AdminSettings/Branding/UpgradeBanner.tsx b/app/client/src/ce/pages/AdminSettings/Branding/UpgradeBanner.tsx index 9b341df370..24ea876f11 100644 --- a/app/client/src/ce/pages/AdminSettings/Branding/UpgradeBanner.tsx +++ b/app/client/src/ce/pages/AdminSettings/Branding/UpgradeBanner.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { ContentBox } from "pages/AdminSettings/components"; import { ADMIN_BRANDING_SETTINGS_SUBTITLE_UPGRADE, diff --git a/app/client/src/ce/pages/AdminSettings/config/types.ts b/app/client/src/ce/pages/AdminSettings/config/types.ts index 91b42d6d6f..5b28097a9e 100644 --- a/app/client/src/ce/pages/AdminSettings/config/types.ts +++ b/app/client/src/ce/pages/AdminSettings/config/types.ts @@ -2,7 +2,7 @@ import type React from "react"; import type { ReduxAction } from "ee/constants/ReduxActionConstants"; import type { Dispatch } from "react"; import type { RadioOptionProps } from "pages/AdminSettings/FormGroup/Radio"; -import type { CalloutKind, SelectOptionProps } from "design-system"; +import type { CalloutKind, SelectOptionProps } from "@appsmith/ads"; type ControlType = { [K in keyof ControlPropsType]: { diff --git a/app/client/src/ce/pages/Applications/ApplicationCardList.tsx b/app/client/src/ce/pages/Applications/ApplicationCardList.tsx index 13f1b14266..023fe608fc 100644 --- a/app/client/src/ce/pages/Applications/ApplicationCardList.tsx +++ b/app/client/src/ce/pages/Applications/ApplicationCardList.tsx @@ -1,6 +1,6 @@ import type { ReactNode } from "react"; import React from "react"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { useSelector } from "react-redux"; import CardList from "pages/Applications/CardList"; diff --git a/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx b/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx index d8c0191aac..4dde6fcd1a 100644 --- a/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx +++ b/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx @@ -20,7 +20,7 @@ import { ModalBody, ModalContent, ModalHeader, -} from "design-system"; +} from "@appsmith/ads"; import { isEmpty } from "lodash"; import { TemplateView } from "pages/Templates/TemplateView"; import TemplatesListLayoutSwitcher from "pages/Templates/TemplatesModal/TemplatesListLayoutSwitcher"; diff --git a/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx b/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx index 9de66eaccf..13d164e974 100644 --- a/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx +++ b/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx @@ -12,7 +12,7 @@ import { resetCurrentPluginIdForCreateNewApp, } from "actions/onboardingActions"; import { fetchPlugins } from "actions/pluginActions"; -import { Flex, Link, Text } from "design-system"; +import { Flex, Link, Text } from "@appsmith/ads"; import CreateNewDatasourceTab from "pages/Editor/IntegrationEditor/CreateNewDatasourceTab"; import { getApplicationsOfWorkspace } from "ee/selectors/selectedWorkspaceSelectors"; import { default as React, useEffect } from "react"; diff --git a/app/client/src/ce/pages/Applications/EmbedSnippetTab.tsx b/app/client/src/ce/pages/Applications/EmbedSnippetTab.tsx index 4e2de9a6c0..6e3aa1820b 100644 --- a/app/client/src/ce/pages/Applications/EmbedSnippetTab.tsx +++ b/app/client/src/ce/pages/Applications/EmbedSnippetTab.tsx @@ -1,7 +1,7 @@ import React, { useState } from "react"; import { useSelector } from "react-redux"; import styled from "styled-components"; -import { Switch, Icon, Tooltip, Link, Text } from "design-system"; +import { Switch, Icon, Tooltip, Link, Text } from "@appsmith/ads"; import useUpdateEmbedSnippet from "pages/Applications/EmbedSnippet/useUpdateEmbedSnippet"; import EmbedCodeSnippet from "pages/Applications/EmbedSnippet/Snippet"; import { createMessage, IN_APP_EMBED_SETTING } from "ee/constants/messages"; diff --git a/app/client/src/ce/pages/Applications/ResourceListLoader.tsx b/app/client/src/ce/pages/Applications/ResourceListLoader.tsx index c204c0510b..8ef1c86103 100644 --- a/app/client/src/ce/pages/Applications/ResourceListLoader.tsx +++ b/app/client/src/ce/pages/Applications/ResourceListLoader.tsx @@ -3,7 +3,7 @@ import { noop } from "lodash"; import Card from "components/common/Card"; import CardList from "pages/Applications/CardList"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { PaddingWrapper } from "pages/Applications/CommonElements"; import type { ApplicationPayload } from "ee/constants/ReduxActionConstants"; diff --git a/app/client/src/ce/pages/Applications/StartWithTemplatesWrapper.tsx b/app/client/src/ce/pages/Applications/StartWithTemplatesWrapper.tsx index e4dfdd1bae..cf3a12818a 100644 --- a/app/client/src/ce/pages/Applications/StartWithTemplatesWrapper.tsx +++ b/app/client/src/ce/pages/Applications/StartWithTemplatesWrapper.tsx @@ -4,7 +4,7 @@ import { createMessage, } from "ee/constants/messages"; import type { Template } from "api/TemplatesApi"; -import { Flex, Text } from "design-system"; +import { Flex, Text } from "@appsmith/ads"; import TemplatesLayoutWithFilters from "pages/Templates/TemplatesLayoutWithFilters"; import React from "react"; import { useSelector } from "react-redux"; diff --git a/app/client/src/ce/pages/Applications/WorkspaceAction.tsx b/app/client/src/ce/pages/Applications/WorkspaceAction.tsx index 89b3c10b5f..9a65cf535f 100644 --- a/app/client/src/ce/pages/Applications/WorkspaceAction.tsx +++ b/app/client/src/ce/pages/Applications/WorkspaceAction.tsx @@ -5,7 +5,7 @@ import { MenuContent, MenuItem, MenuTrigger, -} from "design-system"; +} from "@appsmith/ads"; import React, { useCallback, useState } from "react"; import { useSelector } from "react-redux"; diff --git a/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx b/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx index ac31b73d91..d79aec1e15 100644 --- a/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx +++ b/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Button, Icon, Menu, MenuContent, MenuTrigger } from "design-system"; +import { Button, Icon, Menu, MenuContent, MenuTrigger } from "@appsmith/ads"; import { EditInteractionKind, EditableText, diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx index c68dde14f4..6f59bfb22a 100644 --- a/app/client/src/ce/pages/Applications/index.tsx +++ b/app/client/src/ce/pages/Applications/index.tsx @@ -51,7 +51,7 @@ import { Select, Tooltip, Tag, -} from "design-system"; +} from "@appsmith/ads"; import { AppIconCollection, Classes, diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx index baba85b7fa..6f4852577f 100644 --- a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx +++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/ListItem.tsx @@ -1,7 +1,7 @@ import React from "react"; import ExplorerJSCollectionEntity from "pages/Editor/Explorer/JSActions/JSActionEntity"; import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import type { EntityItem } from "ee/entities/IDE/constants"; export interface JSListItemProps { diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx index d2cfa41939..40a815306c 100644 --- a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx +++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx @@ -30,7 +30,7 @@ import AddQuery from "pages/Editor/IDE/EditorPane/Query/Add"; import type { AppState } from "ee/reducers"; import keyBy from "lodash/keyBy"; import { getPluginEntityIcon } from "pages/Editor/Explorer/ExplorerIcons"; -import type { ListItemProps } from "design-system"; +import type { ListItemProps } from "@appsmith/ads"; import { createAddClassName } from "pages/Editor/IDE/EditorPane/utils"; import { QueriesBlankState } from "pages/Editor/QueryEditor/QueriesBlankState"; diff --git a/app/client/src/ce/pages/Editor/NavigationSettings/DeleteLogoButton.tsx b/app/client/src/ce/pages/Editor/NavigationSettings/DeleteLogoButton.tsx index dbe220b4ab..64408ef73b 100644 --- a/app/client/src/ce/pages/Editor/NavigationSettings/DeleteLogoButton.tsx +++ b/app/client/src/ce/pages/Editor/NavigationSettings/DeleteLogoButton.tsx @@ -1,4 +1,4 @@ -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import React from "react"; export const DeleteLogoButton = ({ diff --git a/app/client/src/ce/pages/Upgrade/Carousel.tsx b/app/client/src/ce/pages/Upgrade/Carousel.tsx index 0cfae1f499..17baaa0e33 100644 --- a/app/client/src/ce/pages/Upgrade/Carousel.tsx +++ b/app/client/src/ce/pages/Upgrade/Carousel.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; import React, { useEffect, useState } from "react"; -import { Icon, Text } from "design-system"; +import { Icon, Text } from "@appsmith/ads"; import type { CarouselProps } from "./types"; const CarouselContainer = styled.div` diff --git a/app/client/src/ce/pages/Upgrade/Footer.tsx b/app/client/src/ce/pages/Upgrade/Footer.tsx index 073076435f..4b69d96d8f 100644 --- a/app/client/src/ce/pages/Upgrade/Footer.tsx +++ b/app/client/src/ce/pages/Upgrade/Footer.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; import React from "react"; -import { Button, Text } from "design-system"; +import { Button, Text } from "@appsmith/ads"; import type { FooterProps } from "./types"; import { AVAILABLE_ON_BUSINESS, diff --git a/app/client/src/ce/pages/Upgrade/Header.tsx b/app/client/src/ce/pages/Upgrade/Header.tsx index 1b844286c2..6eded02112 100644 --- a/app/client/src/ce/pages/Upgrade/Header.tsx +++ b/app/client/src/ce/pages/Upgrade/Header.tsx @@ -1,7 +1,7 @@ import styled from "styled-components"; import React from "react"; import type { HeaderProps } from "./types"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; export const HeaderContainer = styled.div` padding: 32px 32px 20px; diff --git a/app/client/src/ce/pages/workspace/InviteUsersForm.tsx b/app/client/src/ce/pages/workspace/InviteUsersForm.tsx index 04f8f88eb0..9b2a32c425 100644 --- a/app/client/src/ce/pages/workspace/InviteUsersForm.tsx +++ b/app/client/src/ce/pages/workspace/InviteUsersForm.tsx @@ -27,8 +27,8 @@ import { } from "ee/constants/messages"; import { isEmail } from "utils/formhelpers"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import type { SelectOptionProps } from "design-system"; -import { Callout, Checkbox } from "design-system"; +import type { SelectOptionProps } from "@appsmith/ads"; +import { Callout, Checkbox } from "@appsmith/ads"; import { Button, Icon, @@ -38,7 +38,7 @@ import { Tooltip, toast, Link, -} from "design-system"; +} from "@appsmith/ads"; import { fetchRolesForWorkspace, fetchUsersForWorkspace, diff --git a/app/client/src/ce/pages/workspace/Members.tsx b/app/client/src/ce/pages/workspace/Members.tsx index 6b9763b6e5..a00c727d48 100644 --- a/app/client/src/ce/pages/workspace/Members.tsx +++ b/app/client/src/ce/pages/workspace/Members.tsx @@ -16,8 +16,8 @@ import { changeWorkspaceUserRole, deleteWorkspaceUser, } from "ee/actions/workspaceActions"; -import type { SelectOptionProps } from "design-system"; -import { Avatar, Button, Option, Select, Text } from "design-system"; +import type { SelectOptionProps } from "@appsmith/ads"; +import { Avatar, Button, Option, Select, Text } from "@appsmith/ads"; import styled from "styled-components"; import DeleteConfirmationModal from "pages/workspace/DeleteConfirmationModal"; import { useMediaQuery } from "react-responsive"; diff --git a/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx b/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx index a6f93d97fa..f94454f9e7 100644 --- a/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx +++ b/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx @@ -19,7 +19,7 @@ import type { import type { CreateApplicationFormValues } from "pages/Applications/helpers"; import type { AppLayoutConfig } from "reducers/entityReducers/pageListReducer"; import type { ConnectToGitResponse } from "actions/gitSyncActions"; -import type { IconNames } from "design-system"; +import type { IconNames } from "@appsmith/ads"; import type { NavigationSetting, ThemeSetting } from "constants/AppConstants"; import { defaultNavigationSetting, diff --git a/app/client/src/ce/sagas/ApplicationSagas.tsx b/app/client/src/ce/sagas/ApplicationSagas.tsx index d3b55ed5f0..e48e0f6e88 100644 --- a/app/client/src/ce/sagas/ApplicationSagas.tsx +++ b/app/client/src/ce/sagas/ApplicationSagas.tsx @@ -101,13 +101,13 @@ import DatasourcesApi from "api/DatasourcesApi"; import type { SetDefaultPageActionPayload } from "actions/pageActions"; import { resetApplicationWidgets } from "actions/pageActions"; import { setCanvasCardsState } from "actions/editorActions"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import type { User } from "constants/userConstants"; import { ANONYMOUS_USERNAME } from "constants/userConstants"; import { getCurrentUser } from "selectors/usersSelectors"; import { ERROR_CODES } from "ee/constants/ApiConstants"; import { safeCrashAppRequest } from "actions/errorActions"; -import type { IconNames } from "design-system"; +import type { IconNames } from "@appsmith/ads"; import { defaultNavigationSetting, keysOfNavigationSetting, diff --git a/app/client/src/ce/sagas/JSActionSagas.ts b/app/client/src/ce/sagas/JSActionSagas.ts index bbf002afdc..a152a8acd2 100644 --- a/app/client/src/ce/sagas/JSActionSagas.ts +++ b/app/client/src/ce/sagas/JSActionSagas.ts @@ -68,7 +68,7 @@ import { checkAndLogErrorsIfCyclicDependency, getFromServerWhenNoPrefetchedResult, } from "sagas/helper"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { updateAndSaveLayout } from "actions/pageActions"; import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer"; import { getWidgets } from "sagas/selectors"; diff --git a/app/client/src/ce/sagas/PageSagas.tsx b/app/client/src/ce/sagas/PageSagas.tsx index dcceb4cb6a..4605bd9dcd 100644 --- a/app/client/src/ce/sagas/PageSagas.tsx +++ b/app/client/src/ce/sagas/PageSagas.tsx @@ -130,7 +130,7 @@ import { getUsedActionNames } from "selectors/actionSelectors"; import { getPageList } from "ee/selectors/entitiesSelector"; import { setPreviewModeAction } from "actions/editorActions"; import { SelectionRequestType } from "sagas/WidgetSelectUtils"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { getCurrentGitBranch } from "selectors/gitSyncSelectors"; import type { MainCanvasReduxState } from "reducers/uiReducers/mainCanvasReducer"; import { UserCancelledActionExecutionError } from "sagas/ActionExecution/errorUtils"; diff --git a/app/client/src/ce/sagas/SuperUserSagas.tsx b/app/client/src/ce/sagas/SuperUserSagas.tsx index f3a963798f..0fbf0f60ac 100644 --- a/app/client/src/ce/sagas/SuperUserSagas.tsx +++ b/app/client/src/ce/sagas/SuperUserSagas.tsx @@ -22,7 +22,7 @@ import { } from "ee/constants/messages"; import { getCurrentUser } from "selectors/usersSelectors"; import { EMAIL_SETUP_DOC } from "constants/ThirdPartyConstants"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { MIGRATION_STATUS, diff --git a/app/client/src/ce/sagas/WorkspaceSagas.ts b/app/client/src/ce/sagas/WorkspaceSagas.ts index e6962e789e..a5ee61b37d 100644 --- a/app/client/src/ce/sagas/WorkspaceSagas.ts +++ b/app/client/src/ce/sagas/WorkspaceSagas.ts @@ -39,7 +39,7 @@ import { createMessage, DELETE_WORKSPACE_SUCCESSFUL, } from "ee/constants/messages"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { failFastApiCalls } from "sagas/InitSagas"; import { getWorkspaceEntitiesActions } from "ee/utils/workspaceHelpers"; import type { SearchApiResponse } from "ee/types/ApiResponseTypes"; diff --git a/app/client/src/ce/sagas/tenantSagas.tsx b/app/client/src/ce/sagas/tenantSagas.tsx index 876d49b286..48ea91bc2d 100644 --- a/app/client/src/ce/sagas/tenantSagas.tsx +++ b/app/client/src/ce/sagas/tenantSagas.tsx @@ -11,7 +11,7 @@ import { validateResponse } from "sagas/ErrorSagas"; import { safeCrashAppRequest } from "actions/errorActions"; import { ERROR_CODES } from "ee/constants/ApiConstants"; import { defaultBrandingConfig as CE_defaultBrandingConfig } from "ee/reducers/tenantReducer"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { getFromServerWhenNoPrefetchedResult } from "sagas/helper"; diff --git a/app/client/src/ce/sagas/userSagas.tsx b/app/client/src/ce/sagas/userSagas.tsx index dcae341ddf..731ad0f4e7 100644 --- a/app/client/src/ce/sagas/userSagas.tsx +++ b/app/client/src/ce/sagas/userSagas.tsx @@ -78,7 +78,7 @@ import type { SegmentState } from "reducers/uiReducers/analyticsReducer"; import type { FeatureFlags } from "ee/entities/FeatureFlag"; import { DEFAULT_FEATURE_FLAG_VALUE } from "ee/entities/FeatureFlag"; import UsagePulse from "usagePulse"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { isAirgapped } from "ee/utils/airgapHelpers"; import { USER_PROFILE_PICTURE_UPLOAD_FAILED, diff --git a/app/client/src/components/BottomBar/ManualUpgrades.tsx b/app/client/src/components/BottomBar/ManualUpgrades.tsx index dbe10e17cc..f268d5ff91 100644 --- a/app/client/src/components/BottomBar/ManualUpgrades.tsx +++ b/app/client/src/components/BottomBar/ManualUpgrades.tsx @@ -11,7 +11,7 @@ import { ModalHeader, ModalFooter, Callout, -} from "design-system"; +} from "@appsmith/ads"; import { Text, TextType } from "@appsmith/ads-old"; import type { ReactNode } from "react"; import React, { useState } from "react"; diff --git a/app/client/src/components/BottomBar/index.tsx b/app/client/src/components/BottomBar/index.tsx index 89f16777a4..1c358dc6ec 100644 --- a/app/client/src/components/BottomBar/index.tsx +++ b/app/client/src/components/BottomBar/index.tsx @@ -3,7 +3,7 @@ import QuickGitActions from "pages/Editor/gitSync/QuickGitActions"; import { DebuggerTrigger } from "components/editorComponents/Debugger"; import HelpButton from "pages/Editor/HelpButton"; import ManualUpgrades from "./ManualUpgrades"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import SwitchEnvironment from "ee/components/SwitchEnvironment"; import { Container, Wrapper } from "./components"; import { useSelector } from "react-redux"; diff --git a/app/client/src/components/BusinessTag.tsx b/app/client/src/components/BusinessTag.tsx index 8622fd9468..7debeb40a1 100644 --- a/app/client/src/components/BusinessTag.tsx +++ b/app/client/src/components/BusinessTag.tsx @@ -1,6 +1,6 @@ import React from "react"; -import type { TagSizes } from "design-system"; -import { Tag } from "design-system"; +import type { TagSizes } from "@appsmith/ads"; +import { Tag } from "@appsmith/ads"; import { BUSINESS_TAG, createMessage } from "ee/constants/messages"; const BusinessTag = ({ diff --git a/app/client/src/components/EnterpriseTag.tsx b/app/client/src/components/EnterpriseTag.tsx index dd76a6c41f..35841d53d8 100644 --- a/app/client/src/components/EnterpriseTag.tsx +++ b/app/client/src/components/EnterpriseTag.tsx @@ -1,6 +1,6 @@ import React from "react"; -import type { TagSizes } from "design-system"; -import { Tag } from "design-system"; +import type { TagSizes } from "@appsmith/ads"; +import { Tag } from "@appsmith/ads"; import { ENTERPRISE_TAG, createMessage } from "ee/constants/messages"; const EnterpriseTag = ({ diff --git a/app/client/src/components/common/BackToCanvas.tsx b/app/client/src/components/common/BackToCanvas.tsx index d58813c409..7c858df874 100644 --- a/app/client/src/components/common/BackToCanvas.tsx +++ b/app/client/src/components/common/BackToCanvas.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useContext } from "react"; import styled from "styled-components"; -import { Link } from "design-system"; +import { Link } from "@appsmith/ads"; import history from "utils/history"; import WalkthroughContext from "components/featureWalkthrough/walkthroughContext"; diff --git a/app/client/src/components/common/Card.tsx b/app/client/src/components/common/Card.tsx index b4ab016516..8d7b30336b 100644 --- a/app/client/src/components/common/Card.tsx +++ b/app/client/src/components/common/Card.tsx @@ -5,7 +5,7 @@ import { omit } from "lodash"; import { AppIcon, Size, TextType, Text } from "@appsmith/ads-old"; import type { PropsWithChildren } from "react"; import type { HTMLDivProps, ICardProps } from "@blueprintjs/core"; -import { Button, type MenuItemProps } from "design-system"; +import { Button, type MenuItemProps } from "@appsmith/ads"; import GitConnectedBadge from "./GitConnectedBadge"; diff --git a/app/client/src/components/common/Collapsible.tsx b/app/client/src/components/common/Collapsible.tsx index 824bf0ef37..180cdd8399 100644 --- a/app/client/src/components/common/Collapsible.tsx +++ b/app/client/src/components/common/Collapsible.tsx @@ -2,7 +2,7 @@ import type { ReactNode } from "react"; import React, { useEffect, useState } from "react"; import styled from "styled-components"; import { Collapse, Classes as BPClasses } from "@blueprintjs/core"; -import { Icon, Text, Tooltip } from "design-system"; +import { Icon, Text, Tooltip } from "@appsmith/ads"; import { Classes, getTypographyByKey } from "@appsmith/ads-old"; import type { Datasource } from "entities/Datasource"; diff --git a/app/client/src/components/common/GitConnectedBadge.tsx b/app/client/src/components/common/GitConnectedBadge.tsx index 4c059390a3..37505bffab 100644 --- a/app/client/src/components/common/GitConnectedBadge.tsx +++ b/app/client/src/components/common/GitConnectedBadge.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Icon, Tooltip } from "design-system"; +import { Icon, Tooltip } from "@appsmith/ads"; import { CONNECTED_TO_GIT, createMessage } from "ee/constants/messages"; diff --git a/app/client/src/components/designSystems/appsmith/SignPostingBanner.tsx b/app/client/src/components/designSystems/appsmith/SignPostingBanner.tsx index 258a04a9d5..d5f185e850 100644 --- a/app/client/src/components/designSystems/appsmith/SignPostingBanner.tsx +++ b/app/client/src/components/designSystems/appsmith/SignPostingBanner.tsx @@ -1,7 +1,7 @@ import React from "react"; import type { ReactNode } from "react"; import styled from "styled-components"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; export interface SignPostingBannerProps { iconName: string; diff --git a/app/client/src/components/designSystems/appsmith/StepComponent.tsx b/app/client/src/components/designSystems/appsmith/StepComponent.tsx index f587dc8df8..8a54f9f120 100644 --- a/app/client/src/components/designSystems/appsmith/StepComponent.tsx +++ b/app/client/src/components/designSystems/appsmith/StepComponent.tsx @@ -1,4 +1,4 @@ -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import React from "react"; import styled from "styled-components"; diff --git a/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx b/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx index 9bfa95447b..3257d96222 100644 --- a/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx +++ b/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx @@ -1,6 +1,6 @@ import type { ReactNode } from "react"; import React from "react"; -import { Menu, MenuItem, MenuContent, MenuTrigger } from "design-system"; +import { Menu, MenuItem, MenuContent, MenuTrigger } from "@appsmith/ads"; import { useSelector, useDispatch } from "react-redux"; import { getIsGitConnected } from "selectors/gitSyncSelectors"; import { setIsGitSyncModalOpen } from "actions/gitSyncActions"; @@ -10,7 +10,7 @@ import { CONNECT_TO_GIT_OPTION, CURRENT_DEPLOY_PREVIEW_OPTION, } from "ee/constants/messages"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { KBEditorMenuItem } from "ee/pages/Editor/KnowledgeBase/KBEditorMenuItem"; import { useHasConnectToGitPermission } from "pages/Editor/gitSync/hooks/gitPermissionHooks"; import { getIsAnvilEnabledInCurrentApplication } from "layoutSystems/anvil/integrations/selectors"; diff --git a/app/client/src/components/editorComponents/ActionCreator/helpers.tsx b/app/client/src/components/editorComponents/ActionCreator/helpers.tsx index 84232f0345..316b7b0628 100644 --- a/app/client/src/components/editorComponents/ActionCreator/helpers.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/helpers.tsx @@ -13,7 +13,7 @@ import { isEntityAction, } from "ee/workers/Evaluation/evaluationUtils"; import type { TreeDropdownOption } from "@appsmith/ads-old"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import { PluginType } from "entities/Action"; import type { JSAction, Variable } from "entities/JSCollection"; import keyBy from "lodash/keyBy"; diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionCard.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionCard.tsx index 43390754eb..d4fce8519a 100644 --- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionCard.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionCard.tsx @@ -1,6 +1,6 @@ import React from "react"; import clsx from "classnames"; -import { Text, Tag } from "design-system"; +import { Text, Tag } from "@appsmith/ads"; import { ActionCreatorContext } from "../.."; import { AppsmithFunction } from "../../constants"; import type { TActionBlock, VariantType } from "../../types"; diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx index 4cc681afde..b0872af46c 100644 --- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx @@ -1,7 +1,7 @@ import { Popover2 } from "@blueprintjs/popover2"; import { isModalOpenSelector } from "components/editorComponents/GlobalSearch"; import type { TreeDropdownOption } from "@appsmith/ads-old"; -import { Text, Button } from "design-system"; +import { Text, Button } from "@appsmith/ads"; import React, { useCallback, useRef } from "react"; import { useSelector } from "react-redux"; import { getWidgetOptionsTree } from "sagas/selectors"; diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx index 72b30b8240..f169877253 100644 --- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; import TreeStructure from "components/utils/TreeStructure"; -import { Text, Icon, Button, Tooltip } from "design-system"; +import { Text, Icon, Button, Tooltip } from "@appsmith/ads"; import { klona } from "klona/lite"; import React, { useCallback, useEffect } from "react"; import { ActionCreatorContext } from "../.."; diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx index 0507b3959a..801c029e82 100644 --- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionBlockTree/utils.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import { AppsmithFunction, FieldType } from "../../constants"; import type { ActionTree } from "../../types"; import { FIELD_GROUP_CONFIG } from "../../FieldGroup/FieldGroupConfig"; diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionSelectorView/index.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionSelectorView/index.tsx index 99abb77bf2..1355e76a92 100644 --- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionSelectorView/index.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionSelectorView/index.tsx @@ -1,7 +1,7 @@ import React, { useState, useMemo, useEffect } from "react"; import type { TreeDropdownOption } from "@appsmith/ads-old"; import { TreeDropdown } from "@appsmith/ads-old"; -import { Input } from "design-system"; +import { Input } from "@appsmith/ads"; import { debounce } from "lodash"; import { FIELD_CONFIG } from "../../Field/FieldConfig"; import { AppsmithFunction, FieldType } from "../../constants"; diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/KeyValueView/index.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/KeyValueView/index.tsx index cd0a0ceab6..720190b905 100644 --- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/KeyValueView/index.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/KeyValueView/index.tsx @@ -2,7 +2,7 @@ import React from "react"; import type { KeyValueViewProps } from "../../types"; import { ControlWrapper } from "components/propertyControls/StyledControls"; import { KeyValueComponent } from "components/propertyControls/KeyValueComponent"; -import type { SegmentedControlOption } from "design-system"; +import type { SegmentedControlOption } from "@appsmith/ads"; export function KeyValueView(props: KeyValueViewProps) { return ( diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/TabView/index.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/TabView/index.tsx index 0fe6b27d41..71e0e7dfaa 100644 --- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/TabView/index.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/TabView/index.tsx @@ -3,7 +3,7 @@ import { ControlWrapper, FieldWrapper, } from "components/propertyControls/StyledControls"; -import { SegmentedControl } from "design-system"; +import { SegmentedControl } from "@appsmith/ads"; import React from "react"; interface Option { diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/TextView/index.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/TextView/index.tsx index 2d8129895d..5eea973092 100644 --- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/TextView/index.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/TextView/index.tsx @@ -19,7 +19,7 @@ import { Collapsible, CollapsibleContent, CollapsibleHeader, -} from "design-system"; +} from "@appsmith/ads"; export function TextView(props: TextViewProps) { const id = useMemo(() => generateReactKey(), []); diff --git a/app/client/src/components/editorComponents/ActionExecutionInProgressView.tsx b/app/client/src/components/editorComponents/ActionExecutionInProgressView.tsx index 7375317727..64af215f18 100644 --- a/app/client/src/components/editorComponents/ActionExecutionInProgressView.tsx +++ b/app/client/src/components/editorComponents/ActionExecutionInProgressView.tsx @@ -5,7 +5,7 @@ import { createMessage, } from "ee/constants/messages"; import ActionAPI from "api/ActionAPI"; -import { Button, Spinner, Text } from "design-system"; +import { Button, Spinner, Text } from "@appsmith/ads"; import styled from "styled-components"; import type { EditorTheme } from "./CodeEditor/EditorConfig"; import LoadingOverlayScreen from "./LoadingOverlayScreen"; diff --git a/app/client/src/components/editorComponents/ActionNameEditor.tsx b/app/client/src/components/editorComponents/ActionNameEditor.tsx index e5919f6b18..8467855f47 100644 --- a/app/client/src/components/editorComponents/ActionNameEditor.tsx +++ b/app/client/src/components/editorComponents/ActionNameEditor.tsx @@ -9,7 +9,7 @@ import { removeSpecialChars } from "utils/helpers"; import type { AppState } from "ee/reducers"; import { saveActionName } from "actions/pluginActionActions"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import { getActionByBaseId, getPlugin } from "ee/selectors/entitiesSelector"; import NameEditorComponent, { IconBox, diff --git a/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx b/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx index b28f7d1283..713341cb10 100644 --- a/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx +++ b/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx @@ -12,7 +12,7 @@ import { OUTGOING_ENTITIES, } from "ee/constants/messages"; import { Connection } from "../Debugger/EntityDependecies"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import Collapsible from "components/common/Collapsible"; const ConnectionType = styled.span` diff --git a/app/client/src/components/editorComponents/ApiResponseMeta.tsx b/app/client/src/components/editorComponents/ApiResponseMeta.tsx index 410fe96e49..2dbebb00e0 100644 --- a/app/client/src/components/editorComponents/ApiResponseMeta.tsx +++ b/app/client/src/components/editorComponents/ApiResponseMeta.tsx @@ -1,6 +1,6 @@ import type { PropsWithChildren } from "react"; import React from "react"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import { Text, TextType } from "@appsmith/ads-old"; import { formatBytes } from "../../utils/helpers"; import { isEmpty } from "lodash"; diff --git a/app/client/src/components/editorComponents/ApiResponseView.tsx b/app/client/src/components/editorComponents/ApiResponseView.tsx index 439fafeec4..0c552d2e26 100644 --- a/app/client/src/components/editorComponents/ApiResponseView.tsx +++ b/app/client/src/components/editorComponents/ApiResponseView.tsx @@ -23,7 +23,7 @@ import DebuggerLogs from "./Debugger/DebuggerLogs"; import ErrorLogs from "./Debugger/Errors"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { Classes, Text, TextType } from "@appsmith/ads-old"; -import { Button, Callout, Flex, SegmentedControl } from "design-system"; +import { Button, Callout, Flex, SegmentedControl } from "@appsmith/ads"; import type { BottomTab } from "./EntityBottomTabs"; import EntityBottomTabs from "./EntityBottomTabs"; import { DEBUGGER_TAB_KEYS } from "./Debugger/helpers"; diff --git a/app/client/src/components/editorComponents/BetaCard.tsx b/app/client/src/components/editorComponents/BetaCard.tsx index d49018165f..e87d6fa7ae 100644 --- a/app/client/src/components/editorComponents/BetaCard.tsx +++ b/app/client/src/components/editorComponents/BetaCard.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Tag } from "design-system"; +import { Tag } from "@appsmith/ads"; function BetaCard() { return ( diff --git a/app/client/src/components/editorComponents/CloseEditor.tsx b/app/client/src/components/editorComponents/CloseEditor.tsx index cfe065295c..e57f9083ff 100644 --- a/app/client/src/components/editorComponents/CloseEditor.tsx +++ b/app/client/src/components/editorComponents/CloseEditor.tsx @@ -13,7 +13,7 @@ import { import { useSelector } from "react-redux"; import { getCurrentBasePageId } from "selectors/editorSelectors"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { Link } from "design-system"; +import { Link } from "@appsmith/ads"; import styled from "styled-components"; import type { AppsmithLocationState } from "../../utils/history"; import { NavigationMethod } from "../../utils/history"; diff --git a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx index 7e3d069e66..7337b1ebd3 100644 --- a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx +++ b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx @@ -27,7 +27,7 @@ import { setDebuggerSelectedTab, showDebugger } from "actions/debuggerActions"; import { modText } from "utils/helpers"; import { getEntityNameAndPropertyPath } from "ee/workers/Evaluation/evaluationUtils"; import { getPathNavigationUrl } from "selectors/navigationSelectors"; -import { Button, Icon, Link, toast, Tooltip } from "design-system"; +import { Button, Icon, Link, toast, Tooltip } from "@appsmith/ads"; import type { EvaluationError } from "utils/DynamicBindingUtils"; import { DEBUGGER_TAB_KEYS } from "../Debugger/helpers"; diff --git a/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/PeekOverlayPopup.tsx b/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/PeekOverlayPopup.tsx index 47fdd1506c..1885ab8aee 100644 --- a/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/PeekOverlayPopup.tsx +++ b/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/PeekOverlayPopup.tsx @@ -7,7 +7,7 @@ import { componentWillAppendToBody } from "react-append-to-body"; import _, { debounce } from "lodash"; import { zIndexLayers } from "constants/CanvasEditorConstants"; import { objectCollapseAnalytics, textSelectAnalytics } from "./Analytics"; -import { Divider } from "design-system"; +import { Divider } from "@appsmith/ads"; import { useSelector } from "react-redux"; import { getConfigTree, getDataTree } from "selectors/dataTreeSelectors"; import { filterInternalProperties } from "utils/FilterInternalProperties"; diff --git a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx index 91bc11ca65..1903c4ac4e 100644 --- a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx +++ b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx @@ -9,7 +9,7 @@ import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; import { EntityIcon, JsFileIconV2 } from "pages/Editor/Explorer/ExplorerIcons"; import { getAssetUrl } from "ee/utils/airgapHelpers"; import type { FeatureFlags } from "ee/entities/FeatureFlag"; -import { Button, Icon } from "design-system"; +import { Button, Icon } from "@appsmith/ads"; import { APPSMITH_AI } from "ee/components/editorComponents/GPT/trigger"; import { DatasourceCreateEntryPoints } from "constants/Datasource"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx index c859b8e048..f191e7842a 100644 --- a/app/client/src/components/editorComponents/CodeEditor/index.tsx +++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx @@ -73,7 +73,7 @@ import { } from "components/editorComponents/CodeEditor/hintHelpers"; import { showBindingPrompt } from "./BindingPromptHelper"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import "codemirror/addon/fold/brace-fold"; import "codemirror/addon/fold/foldgutter"; import "codemirror/addon/fold/foldgutter.css"; diff --git a/app/client/src/components/editorComponents/ContextDropdown.tsx b/app/client/src/components/editorComponents/ContextDropdown.tsx index 28e20d2b8f..3adb1da872 100644 --- a/app/client/src/components/editorComponents/ContextDropdown.tsx +++ b/app/client/src/components/editorComponents/ContextDropdown.tsx @@ -13,7 +13,7 @@ import { import { noop } from "utils/AppsmithUtils"; import type { Intent } from "constants/DefaultTheme"; import type { DropdownOption } from "components/constants"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; export type ContextDropdownOption = DropdownOption & { onSelect: (event: React.MouseEvent) => void; diff --git a/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx b/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx index 1e4a66da22..d4f30bbc26 100644 --- a/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx +++ b/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx @@ -19,7 +19,7 @@ import { MenuItem, MenuTrigger, Tooltip, -} from "design-system"; +} from "@appsmith/ads"; import type { FieldEntityInformation } from "../CodeEditor/EditorConfig"; import { DocsLink, openDoc } from "../../../constants/DocumentationLinks"; diff --git a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx index bb165bd30a..9aafa87a24 100644 --- a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx +++ b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx @@ -9,7 +9,7 @@ import type { Message } from "entities/AppsmithConsole"; import ContextualMenu from "./ContextualMenu"; import { DEBUGGER_TAB_KEYS } from "./helpers"; import type { FieldEntityInformation } from "../CodeEditor/EditorConfig"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; const EVDebugButton = styled(Button)` ${getTypographyByKey("btnSmall")}; diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerEntityLink.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerEntityLink.tsx index ab20d7811e..222f549ee5 100644 --- a/app/client/src/components/editorComponents/Debugger/DebuggerEntityLink.tsx +++ b/app/client/src/components/editorComponents/Debugger/DebuggerEntityLink.tsx @@ -2,7 +2,7 @@ import type { Message, SourceEntity } from "entities/AppsmithConsole"; import React, { useCallback } from "react"; import type LOG_TYPE from "entities/AppsmithConsole/logtype"; import type { Plugin } from "api/PluginApi"; -import { Link } from "design-system"; +import { Link } from "@appsmith/ads"; import type { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils"; export enum DebuggerLinkUI { diff --git a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx index 55b0bfa070..bbe3e43bbe 100644 --- a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx +++ b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx @@ -19,7 +19,7 @@ import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { thinScrollbar } from "constants/DefaultTheme"; import { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils"; import { useGetEntityInfo } from "./hooks/useGetEntityInfo"; -import { Button, Icon, Tooltip } from "design-system"; +import { Button, Icon, Tooltip } from "@appsmith/ads"; import { importSvg } from "@appsmith/ads-old"; const LongArrowSVG = importSvg( diff --git a/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx b/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx index 12ba9e9178..0dabf9c8ff 100644 --- a/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx +++ b/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx @@ -15,7 +15,7 @@ import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import moment from "moment"; import LogHelper from "./components/LogHelper"; import { toggleExpandErrorLogItem } from "actions/debuggerActions"; -import { Button, Icon } from "design-system"; +import { Button, Icon } from "@appsmith/ads"; const InnerWrapper = styled.div` display: flex; diff --git a/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx b/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx index ab320b25b5..2d62643e80 100644 --- a/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx +++ b/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx @@ -1,5 +1,5 @@ import type { PluginErrorDetails } from "api/ActionAPI"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import type { SourceEntity } from "entities/AppsmithConsole"; import type LOG_TYPE from "entities/AppsmithConsole/logtype"; import React from "react"; diff --git a/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx b/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx index 925c264603..f3223b983a 100644 --- a/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx +++ b/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx @@ -14,7 +14,7 @@ import { Select, Tooltip, Text, -} from "design-system"; +} from "@appsmith/ads"; const Wrapper = styled.div` flex-direction: row; diff --git a/app/client/src/components/editorComponents/Debugger/LogItem.tsx b/app/client/src/components/editorComponents/Debugger/LogItem.tsx index 723db1c785..90d76e7a95 100644 --- a/app/client/src/components/editorComponents/Debugger/LogItem.tsx +++ b/app/client/src/components/editorComponents/Debugger/LogItem.tsx @@ -10,7 +10,7 @@ import EntityLink from "./EntityLink"; import { getLogIcon } from "./helpers"; import { Classes, getTypographyByKey } from "@appsmith/ads-old"; import ContextualMenu from "./ContextualMenu"; -import { Button, Icon } from "design-system"; +import { Button, Icon } from "@appsmith/ads"; import moment from "moment"; import classNames from "classnames"; import { DebuggerLinkUI } from "components/editorComponents/Debugger/DebuggerEntityLink"; diff --git a/app/client/src/components/editorComponents/Debugger/Schema.tsx b/app/client/src/components/editorComponents/Debugger/Schema.tsx index aeaee3fe2c..da77feca81 100644 --- a/app/client/src/components/editorComponents/Debugger/Schema.tsx +++ b/app/client/src/components/editorComponents/Debugger/Schema.tsx @@ -1,4 +1,4 @@ -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import React, { useEffect, useState } from "react"; import type { DatasourceColumns, DatasourceKeys } from "entities/Datasource"; import { DatasourceStructureContext } from "entities/Datasource"; diff --git a/app/client/src/components/editorComponents/Debugger/index.tsx b/app/client/src/components/editorComponents/Debugger/index.tsx index 2cf4fa833c..036a3d4a4e 100644 --- a/app/client/src/components/editorComponents/Debugger/index.tsx +++ b/app/client/src/components/editorComponents/Debugger/index.tsx @@ -3,7 +3,7 @@ import { useDispatch, useSelector } from "react-redux"; import DebuggerTabs from "./DebuggerTabs"; import { setErrorCount } from "actions/debuggerActions"; import { getMessageCount, showDebuggerFlag } from "selectors/debuggerSelectors"; -import { Button, Tooltip } from "design-system"; +import { Button, Tooltip } from "@appsmith/ads"; import useDebuggerTriggerClick from "./hooks/useDebuggerTriggerClick"; function Debugger() { diff --git a/app/client/src/components/editorComponents/EditableText.tsx b/app/client/src/components/editorComponents/EditableText.tsx index 95f6bbd582..7d60d9c396 100644 --- a/app/client/src/components/editorComponents/EditableText.tsx +++ b/app/client/src/components/editorComponents/EditableText.tsx @@ -6,7 +6,7 @@ import { } from "@blueprintjs/core"; import styled from "styled-components"; import _ from "lodash"; -import { Button, Spinner, toast, Tooltip } from "design-system"; +import { Button, Spinner, toast, Tooltip } from "@appsmith/ads"; import { INVALID_NAME_ERROR, createMessage } from "ee/constants/messages"; export enum EditInteractionKind { diff --git a/app/client/src/components/editorComponents/EntityBottomTabs.tsx b/app/client/src/components/editorComponents/EntityBottomTabs.tsx index 11a1c7d610..df4a388112 100644 --- a/app/client/src/components/editorComponents/EntityBottomTabs.tsx +++ b/app/client/src/components/editorComponents/EntityBottomTabs.tsx @@ -2,7 +2,7 @@ import React from "react"; import type { CollapsibleTabProps } from "@appsmith/ads-old"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { DEBUGGER_TAB_KEYS } from "./Debugger/helpers"; -import { Tab, TabPanel, Tabs, TabsList } from "design-system"; +import { Tab, TabPanel, Tabs, TabsList } from "@appsmith/ads"; import styled from "styled-components"; import { LIST_HEADER_HEIGHT, FOOTER_MARGIN } from "./Debugger/DebuggerLogs"; diff --git a/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx b/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx index aab04c4c6a..915651e99c 100644 --- a/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx +++ b/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx @@ -19,7 +19,7 @@ import { getExplorerWidth, } from "selectors/explorerSelector"; import { tailwindLayers } from "constants/Layers"; -import { Tooltip } from "design-system"; +import { Tooltip } from "@appsmith/ads"; import useHorizontalResize from "utils/hooks/useHorizontalResize"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { SIDEBAR_ID } from "constants/Explorer"; diff --git a/app/client/src/components/editorComponents/GlobalSearch/ActionLink.tsx b/app/client/src/components/editorComponents/GlobalSearch/ActionLink.tsx index 24b46bdb6a..0cbcbf4fd9 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/ActionLink.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/ActionLink.tsx @@ -3,7 +3,7 @@ import { useContext } from "react"; import styled from "styled-components"; import SearchContext from "./GlobalSearchContext"; import type { SearchItem } from "./utils"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; export const StyledActionLink = styled.span<{ isActiveItem?: boolean }>` visibility: ${(props) => (props.isActiveItem ? "visible" : "hidden")}; diff --git a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx index 57373c6ee7..e05c5bdb78 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx @@ -2,7 +2,7 @@ import React from "react"; import styled from "styled-components"; import { connect, useSelector } from "react-redux"; import { getTypographyByKey, Text, TextType } from "@appsmith/ads-old"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import { setGlobalSearchCategory } from "actions/globalSearchActions"; import { HELPBAR_PLACEHOLDER } from "ee/constants/messages"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; diff --git a/app/client/src/components/editorComponents/GlobalSearch/Highlight.tsx b/app/client/src/components/editorComponents/GlobalSearch/Highlight.tsx index 12afbe1125..3848ef0e0a 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/Highlight.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/Highlight.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; function Highlight({ className, diff --git a/app/client/src/components/editorComponents/GlobalSearch/SearchBox.tsx b/app/client/src/components/editorComponents/GlobalSearch/SearchBox.tsx index c4262e38fe..eb43225e1a 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/SearchBox.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/SearchBox.tsx @@ -10,7 +10,7 @@ import { } from "ee/constants/messages"; import type { SearchCategory } from "./utils"; import { isMenu, SEARCH_CATEGORY_ID } from "./utils"; -import { Button, Icon } from "design-system"; +import { Button, Icon } from "@appsmith/ads"; const Container = styled.div` background: var(--ads-v2-color-bg); diff --git a/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx b/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx index 309d1aa12a..56d5ece013 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { ModalBody, ModalContent, Modal } from "design-system"; +import { ModalBody, ModalContent, Modal } from "@appsmith/ads"; const StyledDocsSearchModal = styled(ModalContent)` text-rendering: auto; diff --git a/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx b/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx index bfc7f37987..e03d30d120 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx @@ -27,7 +27,7 @@ import { keyBy, noop } from "lodash"; import { getPageList } from "selectors/editorSelectors"; import { PluginType } from "entities/Action"; import WidgetIcon from "pages/Editor/Explorer/Widgets/WidgetIcon"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; const overflowCSS = css` overflow: hidden; diff --git a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx index 87c3378d72..5c4f6aa068 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx @@ -22,7 +22,7 @@ import type { EventLocation } from "ee/utils/analyticsUtilTypes"; import { isMacOrIOS, modText, shiftText } from "utils/helpers"; import { FocusEntity } from "navigation/FocusEntity"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers"; import { createNewAPIBasedOnParentEntity, diff --git a/app/client/src/components/editorComponents/JSResponseView.tsx b/app/client/src/components/editorComponents/JSResponseView.tsx index 64c8206c5f..877e7a7c22 100644 --- a/app/client/src/components/editorComponents/JSResponseView.tsx +++ b/app/client/src/components/editorComponents/JSResponseView.tsx @@ -19,7 +19,7 @@ import type { EditorTheme } from "./CodeEditor/EditorConfig"; import DebuggerLogs from "./Debugger/DebuggerLogs"; import type { JSAction } from "entities/JSCollection"; import ReadOnlyEditor from "components/editorComponents/ReadOnlyEditor"; -import { Flex, Text } from "design-system"; +import { Flex, Text } from "@appsmith/ads"; import LoadingOverlayScreen from "components/editorComponents/LoadingOverlayScreen"; import type { JSCollectionData } from "ee/reducers/entityReducers/jsActionsReducer"; import type { EvaluationError } from "utils/DynamicBindingUtils"; diff --git a/app/client/src/components/editorComponents/LazyCodeEditor/CodeEditorFallback.tsx b/app/client/src/components/editorComponents/LazyCodeEditor/CodeEditorFallback.tsx index a329bfca37..0ca7cc2a5f 100644 --- a/app/client/src/components/editorComponents/LazyCodeEditor/CodeEditorFallback.tsx +++ b/app/client/src/components/editorComponents/LazyCodeEditor/CodeEditorFallback.tsx @@ -11,7 +11,7 @@ import type { EditorProps, EditorStyleProps, } from "components/editorComponents/CodeEditor"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; import { JS_OBJECT_START_STATEMENT } from "plugins/Linting/constants"; export default function CodeEditorFallback({ diff --git a/app/client/src/components/editorComponents/LazyCodeEditor/index.tsx b/app/client/src/components/editorComponents/LazyCodeEditor/index.tsx index e951698e92..f3e182490e 100644 --- a/app/client/src/components/editorComponents/LazyCodeEditor/index.tsx +++ b/app/client/src/components/editorComponents/LazyCodeEditor/index.tsx @@ -10,7 +10,7 @@ import CodeEditorFallback from "./CodeEditorFallback"; import { CODE_EDITOR_LOADING_ERROR } from "ee/constants/messages"; import assertNever from "assert-never/index"; import log from "loglevel"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; let CachedCodeEditor: typeof CodeEditor | undefined; diff --git a/app/client/src/components/editorComponents/LightningMenu/LightningMenuTrigger.tsx b/app/client/src/components/editorComponents/LightningMenu/LightningMenuTrigger.tsx index fd492c3cb6..d1ac5e2974 100644 --- a/app/client/src/components/editorComponents/LightningMenu/LightningMenuTrigger.tsx +++ b/app/client/src/components/editorComponents/LightningMenu/LightningMenuTrigger.tsx @@ -7,7 +7,7 @@ import { import type { Theme } from "constants/DefaultTheme"; import { Skin } from "constants/DefaultTheme"; import styled from "styled-components"; -import { Icon, Tooltip } from "design-system"; +import { Icon, Tooltip } from "@appsmith/ads"; const LightningIconWrapper = styled.span<{ background: string; diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/EntityCheckboxSelector.tsx b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/EntityCheckboxSelector.tsx index 5b4baac28c..f1802cac27 100644 --- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/EntityCheckboxSelector.tsx +++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/EntityCheckboxSelector.tsx @@ -1,4 +1,4 @@ -import { Checkbox } from "design-system"; +import { Checkbox } from "@appsmith/ads"; import React from "react"; import { CheckBoxGrid, CheckboxWrapper } from "./StyledSheet"; diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/JSObjectsNQueriesExport.tsx b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/JSObjectsNQueriesExport.tsx index 9a4c63298c..7444546c73 100644 --- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/JSObjectsNQueriesExport.tsx +++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/JSObjectsNQueriesExport.tsx @@ -4,7 +4,7 @@ import { CollapsibleContent, CollapsibleHeader, Text, -} from "design-system"; +} from "@appsmith/ads"; import type { Datasource } from "entities/Datasource"; import { keyBy } from "lodash"; import { getPluginIcon } from "pages/Editor/Explorer/ExplorerIcons"; diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/WidgetsExport.tsx b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/WidgetsExport.tsx index fb8a48bf9b..bd89159bad 100644 --- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/WidgetsExport.tsx +++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/WidgetsExport.tsx @@ -1,4 +1,4 @@ -import { Checkbox, Text } from "design-system"; +import { Checkbox, Text } from "@appsmith/ads"; import WidgetIcon from "pages/Editor/Explorer/Widgets/WidgetIcon"; import React from "react"; import type { CanvasStructure } from "reducers/uiReducers/pageCanvasStructureReducer"; diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/index.tsx b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/index.tsx index 36b4fc7815..3883995f9c 100644 --- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/index.tsx +++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/index.tsx @@ -21,7 +21,7 @@ import { ModalFooter, ModalHeader, Text, -} from "design-system"; +} from "@appsmith/ads"; import { ControlIcons } from "icons/ControlIcons"; import { MenuIcons } from "icons/MenuIcons"; import { useAppWideAndOtherDatasource } from "ee/pages/Editor/Explorer/hooks"; diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialImportModal/index.tsx b/app/client/src/components/editorComponents/PartialImportExport/PartialImportModal/index.tsx index 9b4f57527a..526eeff285 100644 --- a/app/client/src/components/editorComponents/PartialImportExport/PartialImportModal/index.tsx +++ b/app/client/src/components/editorComponents/PartialImportExport/PartialImportModal/index.tsx @@ -14,7 +14,7 @@ import { getIsImportingPartialApplication, getPartialImportExportLoadingState, } from "ee/selectors/applicationSelectors"; -import { Icon, Modal, ModalContent, ModalHeader, Text } from "design-system"; +import { Icon, Modal, ModalContent, ModalHeader, Text } from "@appsmith/ads"; import type { SetProgress } from "@appsmith/ads-old"; import { FilePickerV2, FileType } from "@appsmith/ads-old"; import Statusbar from "pages/Editor/gitSync/components/Statusbar"; diff --git a/app/client/src/components/editorComponents/ProductAlertBanner.tsx b/app/client/src/components/editorComponents/ProductAlertBanner.tsx index 9182decffd..2ccfff8a7d 100644 --- a/app/client/src/components/editorComponents/ProductAlertBanner.tsx +++ b/app/client/src/components/editorComponents/ProductAlertBanner.tsx @@ -1,13 +1,13 @@ import React, { useCallback, useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import styled from "styled-components"; -import { Callout, Text } from "design-system"; +import { Callout, Text } from "@appsmith/ads"; import type { ProductAlertConfig, ProductAlertState, } from "reducers/uiReducers/usersReducer"; import { setMessageConfig } from "ee/sagas/userSagas"; -import type { CalloutLinkProps } from "design-system"; +import type { CalloutLinkProps } from "@appsmith/ads"; import moment from "moment/moment"; import { createMessage, I_UNDERSTAND, LEARN_MORE } from "ee/constants/messages"; import { getIsFirstTimeUserOnboardingEnabled } from "selectors/onboardingSelectors"; diff --git a/app/client/src/components/editorComponents/RadioButtonGroup.tsx b/app/client/src/components/editorComponents/RadioButtonGroup.tsx index cc39f22b71..cb7aa028b5 100644 --- a/app/client/src/components/editorComponents/RadioButtonGroup.tsx +++ b/app/client/src/components/editorComponents/RadioButtonGroup.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState, useRef } from "react"; import styled from "styled-components"; -import { Text, Button } from "design-system"; +import { Text, Button } from "@appsmith/ads"; import type { WrappedFieldMetaProps, WrappedFieldInputProps } from "redux-form"; interface RadioButtonGroupProps { diff --git a/app/client/src/components/editorComponents/StoreAsDatasource.tsx b/app/client/src/components/editorComponents/StoreAsDatasource.tsx index 11d5c39891..84c2f5111a 100644 --- a/app/client/src/components/editorComponents/StoreAsDatasource.tsx +++ b/app/client/src/components/editorComponents/StoreAsDatasource.tsx @@ -13,7 +13,7 @@ import { EDIT_DATASOURCE, SAVE_DATASOURCE, } from "ee/constants/messages"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; interface storeDataSourceProps { datasourceId?: string; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/ColumnSelectorModal/EditFieldsTable.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/ColumnSelectorModal/EditFieldsTable.tsx index 4536da3727..e5f28460fc 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/ColumnSelectorModal/EditFieldsTable.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/ColumnSelectorModal/EditFieldsTable.tsx @@ -1,7 +1,7 @@ import { useTable, useSortBy, useExpanded } from "react-table"; import React from "react"; import styled from "styled-components"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; const Styles = styled.div` table { diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/ColumnSelectorModal/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/ColumnSelectorModal/index.tsx index 51af708631..0e337521fa 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/ColumnSelectorModal/index.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/ColumnSelectorModal/index.tsx @@ -9,7 +9,7 @@ import { ModalHeader, Text, Tooltip, -} from "design-system"; +} from "@appsmith/ads"; import { EditFieldsButton } from "../../styles"; import styled from "styled-components"; import { useColumns } from "../../WidgetSpecificControls/ColumnDropdown/useColumns"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx index 9732bd31e9..740af870f6 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx @@ -1,4 +1,4 @@ -import { Icon, MenuItem } from "design-system"; +import { Icon, MenuItem } from "@appsmith/ads"; import React from "react"; import styled from "styled-components"; import { DEFAULT_QUERY_OPTIONS_COUNTS_TO_SHOW } from "../../constants"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/index.tsx index 01a51c1623..5d4e95b9a3 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/index.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/index.tsx @@ -10,7 +10,7 @@ import { MenuTrigger, SearchInput, Text, -} from "design-system"; +} from "@appsmith/ads"; import { DropdownOption, LoadMoreOptions } from "./DropdownOption"; import styled from "styled-components"; import type { DropdownOptionType } from "../../types"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx index 46cf2de14b..928c51029c 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx @@ -1,5 +1,5 @@ import React, { useContext, useMemo } from "react"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import history from "utils/history"; import { integrationEditorURL } from "ee/RouteBuilder"; import { INTEGRATION_TABS } from "constants/routes"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx index 91581a272c..ad169cdb28 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx @@ -1,7 +1,7 @@ import React, { memo, useContext } from "react"; import { ErrorMessage, Label, LabelWrapper, SelectWrapper } from "../../styles"; import { useTableOrSpreadsheet } from "./useTableOrSpreadsheet"; -import { Select, Option, Tooltip } from "design-system"; +import { Select, Option, Tooltip } from "@appsmith/ads"; import { DropdownOption } from "../DatasourceDropdown/DropdownOption"; import type { DefaultOptionType } from "rc-select/lib/Select"; import { ColumnSelectorModal } from "../ColumnSelectorModal"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/index.tsx index d4990d0552..d1e3396a77 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/index.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/index.tsx @@ -3,7 +3,7 @@ import { Label, SelectWrapper, } from "components/editorComponents/WidgetQueryGeneratorForm/styles"; -import { Tooltip, Select } from "design-system"; +import { Tooltip, Select } from "@appsmith/ads"; import React, { memo } from "react"; import { useSheets } from "./useSheets"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/TableHeaderIndex/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/TableHeaderIndex/index.tsx index 8462648b9f..cb17e30845 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/TableHeaderIndex/index.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/TableHeaderIndex/index.tsx @@ -4,13 +4,13 @@ import { GEN_CRUD_TABLE_HEADER_TOOLTIP_DESC, } from "ee/constants/messages"; import { Colors } from "constants/Colors"; -import { Icon } from "design-system"; -import { Tooltip } from "design-system"; +import { Icon } from "@appsmith/ads"; +import { Tooltip } from "@appsmith/ads"; import React, { memo } from "react"; import { Label, Row, RowHeading, SelectWrapper } from "../../../styles"; import styled from "styled-components"; import { useTableHeaderIndex } from "./useTableHeader"; -import { Input } from "design-system"; +import { Input } from "@appsmith/ads"; const RoundBg = styled.div` width: 16px; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx index e2e51a09fa..51b4b7f853 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx @@ -1,4 +1,4 @@ -import { Option, Select } from "design-system"; +import { Option, Select } from "@appsmith/ads"; import type { DefaultOptionType } from "rc-select/lib/Select"; import React, { memo } from "react"; import { DropdownOption } from "../../CommonControls/DatasourceDropdown/DropdownOption"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/Dropdown.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/Dropdown.tsx index 3e99e34770..5679d6b03d 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/Dropdown.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/Dropdown.tsx @@ -5,7 +5,7 @@ import { Label, SelectWrapper, } from "../../../../styles"; -import { Select } from "design-system"; +import { Select } from "@appsmith/ads"; import type { DefaultOptionType } from "rc-select/lib/Select"; import type { OtherField } from "../../../../types"; import { useDropdown } from "./useDropdown"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx index 66e7f3fac0..200165e877 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx @@ -5,7 +5,7 @@ import React, { useMemo, useState, } from "react"; -import { Option } from "design-system"; +import { Option } from "@appsmith/ads"; import { DropdownOption } from "../../../../CommonControls/DatasourceDropdown/DropdownOption"; import { WidgetQueryGeneratorFormContext } from "../../../../index"; import { useColumns } from "../../../ColumnDropdown/useColumns"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/styles.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/styles.tsx index 0a8c51c772..211f0b170c 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/styles.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/styles.tsx @@ -1,4 +1,4 @@ -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import styled from "styled-components"; import { DROPDOWN_TRIGGER_DIMENSION } from "./constants"; diff --git a/app/client/src/components/editorComponents/form/CredentialsTooltip.tsx b/app/client/src/components/editorComponents/form/CredentialsTooltip.tsx index a79f3c8292..222f94cb2a 100644 --- a/app/client/src/components/editorComponents/form/CredentialsTooltip.tsx +++ b/app/client/src/components/editorComponents/form/CredentialsTooltip.tsx @@ -2,7 +2,7 @@ import React from "react"; import { Popover, PopoverInteractionKind } from "@blueprintjs/core"; import styled, { createGlobalStyle } from "styled-components"; import { Colors } from "constants/Colors"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; const CredentialTooltipWrapper = styled.div` .credentialTooltipContainer { diff --git a/app/client/src/components/editorComponents/form/FormDialogComponent.tsx b/app/client/src/components/editorComponents/form/FormDialogComponent.tsx index 4abe020eb4..22616310db 100644 --- a/app/client/src/components/editorComponents/form/FormDialogComponent.tsx +++ b/app/client/src/components/editorComponents/form/FormDialogComponent.tsx @@ -5,7 +5,7 @@ import { ModalBody, ModalContent, ModalHeader, -} from "design-system"; +} from "@appsmith/ads"; interface FormDialogComponentProps { isOpen?: boolean; diff --git a/app/client/src/components/editorComponents/form/ToggleComponentToJson.tsx b/app/client/src/components/editorComponents/form/ToggleComponentToJson.tsx index ddcc9df15c..def220df07 100644 --- a/app/client/src/components/editorComponents/form/ToggleComponentToJson.tsx +++ b/app/client/src/components/editorComponents/form/ToggleComponentToJson.tsx @@ -15,7 +15,7 @@ import { bindActionCreators } from "redux"; import { change } from "redux-form"; import { get } from "lodash"; import { JS_TOGGLE_DISABLED_MESSAGE } from "ee/constants/messages"; -import { ToggleButton, Tooltip } from "design-system"; +import { ToggleButton, Tooltip } from "@appsmith/ads"; import styled from "styled-components"; interface Props { diff --git a/app/client/src/components/editorComponents/form/fields/DropdownField.tsx b/app/client/src/components/editorComponents/form/fields/DropdownField.tsx index 8068d53992..85c3413368 100644 --- a/app/client/src/components/editorComponents/form/fields/DropdownField.tsx +++ b/app/client/src/components/editorComponents/form/fields/DropdownField.tsx @@ -3,8 +3,8 @@ import _ from "lodash"; import type { BaseFieldProps, WrappedFieldProps } from "redux-form"; import { Field } from "redux-form"; import { replayHighlightClass } from "globalStyles/portals"; -import type { SelectOptionProps, SelectProps } from "design-system"; -import { Select, Option } from "design-system"; +import type { SelectOptionProps, SelectProps } from "@appsmith/ads"; +import { Select, Option } from "@appsmith/ads"; import styled from "styled-components"; import { getAssetUrl } from "ee/utils/airgapHelpers"; diff --git a/app/client/src/components/editorComponents/form/fields/DropdownFieldWrapper.tsx b/app/client/src/components/editorComponents/form/fields/DropdownFieldWrapper.tsx index e534b36470..7dc1ea75e4 100644 --- a/app/client/src/components/editorComponents/form/fields/DropdownFieldWrapper.tsx +++ b/app/client/src/components/editorComponents/form/fields/DropdownFieldWrapper.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; -import type { SelectOptionProps } from "design-system"; -import { Select, Option } from "design-system"; +import type { SelectOptionProps } from "@appsmith/ads"; +import { Select, Option } from "@appsmith/ads"; type DropdownFieldWrapperProps = SelectOptionProps & { placeholder?: string }; diff --git a/app/client/src/components/editorComponents/form/fields/DropdownWrapper.tsx b/app/client/src/components/editorComponents/form/fields/DropdownWrapper.tsx index 4aa138a9eb..d79fe9d8f6 100644 --- a/app/client/src/components/editorComponents/form/fields/DropdownWrapper.tsx +++ b/app/client/src/components/editorComponents/form/fields/DropdownWrapper.tsx @@ -1,5 +1,5 @@ -import type { SelectOptionProps } from "design-system"; -import { Text, Option, Select } from "design-system"; +import type { SelectOptionProps } from "@appsmith/ads"; +import { Text, Option, Select } from "@appsmith/ads"; import React, { useEffect, useState } from "react"; import type { DropdownOnSelect } from "./SelectField"; diff --git a/app/client/src/components/editorComponents/form/fields/DynamicDropdownField.tsx b/app/client/src/components/editorComponents/form/fields/DynamicDropdownField.tsx index 36a47c3990..0e742f58e5 100644 --- a/app/client/src/components/editorComponents/form/fields/DynamicDropdownField.tsx +++ b/app/client/src/components/editorComponents/form/fields/DynamicDropdownField.tsx @@ -1,8 +1,8 @@ import React from "react"; import type { BaseFieldProps } from "redux-form"; import { Field } from "redux-form"; -import type { SelectProps } from "design-system"; -import { Select } from "design-system"; +import type { SelectProps } from "@appsmith/ads"; +import { Select } from "@appsmith/ads"; type DynamicDropdownFieldProps = BaseFieldProps & SelectProps; class DynamicDropdownField extends React.Component { diff --git a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx index 61f38b539f..88be211315 100644 --- a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx +++ b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx @@ -45,7 +45,7 @@ import { } from "ee/selectors/entitiesSelector"; import { extractApiUrlPath } from "transformers/RestActionTransformer"; import { getCurrentAppWorkspace } from "ee/selectors/selectedWorkspaceSelectors"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { TEMP_DATASOURCE_ID } from "constants/Datasource"; import LazyCodeEditor from "components/editorComponents/LazyCodeEditor"; import { getCodeMirrorNamespaceFromEditor } from "utils/getCodeMirrorNamespace"; diff --git a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx index 5bea414ec4..b62e2bc284 100644 --- a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx +++ b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx @@ -18,7 +18,7 @@ import { DEFAULT_MULTI_PART_DROPDOWN_PLACEHOLDER, MULTI_PART_DROPDOWN_OPTIONS, } from "constants/ApiEditorConstants/CommonApiConstants"; -import { Button, Text } from "design-system"; +import { Button, Text } from "@appsmith/ads"; import RequestDropdownField from "./RequestDropdownField"; interface CustomStack { diff --git a/app/client/src/components/editorComponents/form/fields/RadioGroupWrapper.tsx b/app/client/src/components/editorComponents/form/fields/RadioGroupWrapper.tsx index 34a34dc087..545885a559 100644 --- a/app/client/src/components/editorComponents/form/fields/RadioGroupWrapper.tsx +++ b/app/client/src/components/editorComponents/form/fields/RadioGroupWrapper.tsx @@ -1,4 +1,4 @@ -import { Radio, RadioGroup } from "design-system"; +import { Radio, RadioGroup } from "@appsmith/ads"; import React, { useEffect, useState } from "react"; import type { WrappedFieldInputProps } from "redux-form"; import styled from "styled-components"; diff --git a/app/client/src/components/editorComponents/form/fields/RequestDropdownField.tsx b/app/client/src/components/editorComponents/form/fields/RequestDropdownField.tsx index 85c17e664f..23d2d36aa4 100644 --- a/app/client/src/components/editorComponents/form/fields/RequestDropdownField.tsx +++ b/app/client/src/components/editorComponents/form/fields/RequestDropdownField.tsx @@ -3,7 +3,7 @@ import _ from "lodash"; import type { WrappedFieldProps } from "redux-form"; import { Field } from "redux-form"; import DropdownFieldWrapper from "components/editorComponents/form/fields/DropdownFieldWrapper"; -import type { SelectOptionProps } from "design-system"; +import type { SelectOptionProps } from "@appsmith/ads"; const renderComponent = ( componentProps: WrappedFieldProps & SelectOptionProps, diff --git a/app/client/src/components/editorComponents/form/fields/SelectField.tsx b/app/client/src/components/editorComponents/form/fields/SelectField.tsx index 323b76ebc4..34cce6d4d3 100644 --- a/app/client/src/components/editorComponents/form/fields/SelectField.tsx +++ b/app/client/src/components/editorComponents/form/fields/SelectField.tsx @@ -2,7 +2,7 @@ import React from "react"; import type { WrappedFieldMetaProps, WrappedFieldInputProps } from "redux-form"; import { Field } from "redux-form"; import DropdownWrapper from "./DropdownWrapper"; -import type { SelectOptionProps } from "design-system"; +import type { SelectOptionProps } from "@appsmith/ads"; const renderComponent = ( componentProps: SelectFieldProps & { diff --git a/app/client/src/components/editorComponents/form/fields/TextField.tsx b/app/client/src/components/editorComponents/form/fields/TextField.tsx index 39819d280d..778cd70d9f 100644 --- a/app/client/src/components/editorComponents/form/fields/TextField.tsx +++ b/app/client/src/components/editorComponents/form/fields/TextField.tsx @@ -1,8 +1,8 @@ import React from "react"; import type { BaseFieldProps } from "redux-form"; import { Field } from "redux-form"; -import type { InputProps } from "design-system"; -import { Input } from "design-system"; +import type { InputProps } from "@appsmith/ads"; +import { Input } from "@appsmith/ads"; interface FieldProps { type?: string; diff --git a/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx b/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx index 6254621e2b..975c6f9fc9 100644 --- a/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx +++ b/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx @@ -1,4 +1,4 @@ -import { Icon, Text, Button, Divider } from "design-system"; +import { Icon, Text, Button, Divider } from "@appsmith/ads"; import React, { useContext, useEffect, useState } from "react"; import styled from "styled-components"; import { PADDING_HIGHLIGHT, getPosition } from "./utils"; diff --git a/app/client/src/components/formControls/CheckboxControl.tsx b/app/client/src/components/formControls/CheckboxControl.tsx index c30dadc837..ece1664912 100644 --- a/app/client/src/components/formControls/CheckboxControl.tsx +++ b/app/client/src/components/formControls/CheckboxControl.tsx @@ -1,6 +1,6 @@ import React from "react"; -import type { CheckboxProps } from "design-system"; -import { Checkbox } from "design-system"; +import type { CheckboxProps } from "@appsmith/ads"; +import { Checkbox } from "@appsmith/ads"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; import type { ControlType } from "constants/PropertyControlConstants"; diff --git a/app/client/src/components/formControls/DropDownControl.tsx b/app/client/src/components/formControls/DropDownControl.tsx index cd5d53fcf0..18e02ebc21 100644 --- a/app/client/src/components/formControls/DropDownControl.tsx +++ b/app/client/src/components/formControls/DropDownControl.tsx @@ -16,8 +16,8 @@ import { MATCH_ACTION_CONFIG_PROPERTY, } from "workers/Evaluation/formEval"; import type { Action } from "entities/Action"; -import type { SelectOptionProps } from "design-system"; -import { Icon, Option, Select } from "design-system"; +import type { SelectOptionProps } from "@appsmith/ads"; +import { Icon, Option, Select } from "@appsmith/ads"; const DropdownSelect = styled.div<{ width: string; diff --git a/app/client/src/components/formControls/FieldArrayControl.tsx b/app/client/src/components/formControls/FieldArrayControl.tsx index 622711ae5b..14a62f9f3e 100644 --- a/app/client/src/components/formControls/FieldArrayControl.tsx +++ b/app/client/src/components/formControls/FieldArrayControl.tsx @@ -3,7 +3,7 @@ import FormControl from "pages/Editor/FormControl"; import styled from "styled-components"; import { FieldArray } from "redux-form"; import type { ControlProps } from "./BaseControl"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; const CenteredIconButton = styled(Button)<{ alignSelf?: string; diff --git a/app/client/src/components/formControls/FilePickerControl.tsx b/app/client/src/components/formControls/FilePickerControl.tsx index 85c9f3db7c..f37ac80ce1 100644 --- a/app/client/src/components/formControls/FilePickerControl.tsx +++ b/app/client/src/components/formControls/FilePickerControl.tsx @@ -10,7 +10,7 @@ import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form"; import { Field } from "redux-form"; import { useEffect, useCallback } from "react"; import { replayHighlightClass } from "globalStyles/portals"; -import { Button, Modal, ModalBody, ModalContent } from "design-system"; +import { Button, Modal, ModalBody, ModalContent } from "@appsmith/ads"; const StyledDiv = styled.div` flex: 1; diff --git a/app/client/src/components/formControls/FormTemplateControl.tsx b/app/client/src/components/formControls/FormTemplateControl.tsx index 9ac5e26ea4..1c8540c08c 100644 --- a/app/client/src/components/formControls/FormTemplateControl.tsx +++ b/app/client/src/components/formControls/FormTemplateControl.tsx @@ -3,8 +3,8 @@ import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; import type { ControlType } from "constants/PropertyControlConstants"; import styled from "styled-components"; -import { Button, Flex } from "design-system"; -import type { ButtonProps } from "design-system"; +import { Button, Flex } from "@appsmith/ads"; +import type { ButtonProps } from "@appsmith/ads"; import { change, getFormValues } from "redux-form"; import { connect } from "react-redux"; import { get, omit } from "lodash"; diff --git a/app/client/src/components/formControls/InputTextControl.tsx b/app/client/src/components/formControls/InputTextControl.tsx index 4967d354d6..9443cd4a39 100644 --- a/app/client/src/components/formControls/InputTextControl.tsx +++ b/app/client/src/components/formControls/InputTextControl.tsx @@ -5,11 +5,11 @@ import type { ControlType } from "constants/PropertyControlConstants"; import type { AppState } from "ee/reducers"; import styled from "styled-components"; import type { InputType } from "components/constants"; -import type { InputTypes as DSInputType } from "design-system"; +import type { InputTypes as DSInputType } from "@appsmith/ads"; import type { WrappedFieldMetaProps, WrappedFieldInputProps } from "redux-form"; import { Field, formValueSelector } from "redux-form"; import { connect } from "react-redux"; -import { Input } from "design-system"; +import { Input } from "@appsmith/ads"; export const StyledInfo = styled.span` font-weight: normal; diff --git a/app/client/src/components/formControls/KeyValueArrayControl.tsx b/app/client/src/components/formControls/KeyValueArrayControl.tsx index f03fb7b503..3d0969572e 100644 --- a/app/client/src/components/formControls/KeyValueArrayControl.tsx +++ b/app/client/src/components/formControls/KeyValueArrayControl.tsx @@ -10,10 +10,10 @@ import type { ControlProps, ControlData } from "./BaseControl"; import BaseControl from "./BaseControl"; import type { ControlType } from "constants/PropertyControlConstants"; import DynamicTextField from "components/editorComponents/form/fields/DynamicTextField"; -import type { InputProps } from "design-system"; +import type { InputProps } from "@appsmith/ads"; import { setDefaultKeyValPairFlag } from "actions/datasourceActions"; import { useDispatch } from "react-redux"; -import { Button, Icon, Input, Text, Tooltip } from "design-system"; +import { Button, Icon, Input, Text, Tooltip } from "@appsmith/ads"; export interface KeyValueArrayControlProps extends ControlProps { name: string; label: string; diff --git a/app/client/src/components/formControls/MultiFilePickerControl.tsx b/app/client/src/components/formControls/MultiFilePickerControl.tsx index 4bedd41450..ef3ea1ae09 100644 --- a/app/client/src/components/formControls/MultiFilePickerControl.tsx +++ b/app/client/src/components/formControls/MultiFilePickerControl.tsx @@ -6,7 +6,7 @@ import BaseControl from "./BaseControl"; import type { ControlType } from "constants/PropertyControlConstants"; import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form"; import { Field, getFormValues } from "redux-form"; -import { Button, Tag, Text, toast } from "design-system"; +import { Button, Tag, Text, toast } from "@appsmith/ads"; import type { AppState } from "ee/reducers"; import type { Datasource } from "entities/Datasource"; import type { Action } from "entities/Action"; diff --git a/app/client/src/components/formControls/SegmentedControl.tsx b/app/client/src/components/formControls/SegmentedControl.tsx index cd776820c3..e9c711a32f 100644 --- a/app/client/src/components/formControls/SegmentedControl.tsx +++ b/app/client/src/components/formControls/SegmentedControl.tsx @@ -11,8 +11,8 @@ import type { AppState } from "ee/reducers"; import { getDynamicFetchedValues } from "selectors/formSelectors"; import { change, getFormValues } from "redux-form"; import type { Action } from "entities/Action"; -import type { SelectOptionProps } from "design-system"; -import { SegmentedControl } from "design-system"; +import type { SelectOptionProps } from "@appsmith/ads"; +import { SegmentedControl } from "@appsmith/ads"; const SegmentedControlWrapper = styled.div<{ width: string; diff --git a/app/client/src/components/formControls/SortingControl.tsx b/app/client/src/components/formControls/SortingControl.tsx index 0a63e17f1b..5f92252b90 100644 --- a/app/client/src/components/formControls/SortingControl.tsx +++ b/app/client/src/components/formControls/SortingControl.tsx @@ -9,7 +9,7 @@ import { getBindingOrConfigPathsForSortingControl } from "entities/Action/action import { SortingSubComponent } from "./utils"; import { get, isArray } from "lodash"; import useResponsiveBreakpoints from "utils/hooks/useResponsiveBreakpoints"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; // sorting's order dropdown values enum OrderDropDownValues { diff --git a/app/client/src/components/formControls/SwitchControl.tsx b/app/client/src/components/formControls/SwitchControl.tsx index c2eb8562bd..c7e5c6f38b 100644 --- a/app/client/src/components/formControls/SwitchControl.tsx +++ b/app/client/src/components/formControls/SwitchControl.tsx @@ -1,7 +1,7 @@ import React from "react"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; -import { Switch } from "design-system"; +import { Switch } from "@appsmith/ads"; import type { ControlType } from "constants/PropertyControlConstants"; import type { WrappedFieldProps } from "redux-form"; import { Field } from "redux-form"; diff --git a/app/client/src/components/formControls/WhereClauseControl.tsx b/app/client/src/components/formControls/WhereClauseControl.tsx index 2abc877af1..cb53964992 100644 --- a/app/client/src/components/formControls/WhereClauseControl.tsx +++ b/app/client/src/components/formControls/WhereClauseControl.tsx @@ -8,7 +8,7 @@ import { useSelector } from "react-redux"; import { getBindingOrConfigPathsForWhereClauseControl } from "entities/Action/actionProperties"; import { WhereClauseSubComponent } from "./utils"; import useResponsiveBreakpoints from "utils/hooks/useResponsiveBreakpoints"; -import { Button, Tooltip } from "design-system"; +import { Button, Tooltip } from "@appsmith/ads"; //Dropdwidth and Icon have fixed widths const DropdownWidth = 82; //pixel value diff --git a/app/client/src/components/propertyControls/BorderRadiusOptionsControl.tsx b/app/client/src/components/propertyControls/BorderRadiusOptionsControl.tsx index 244922d69f..b9bf7c4936 100644 --- a/app/client/src/components/propertyControls/BorderRadiusOptionsControl.tsx +++ b/app/client/src/components/propertyControls/BorderRadiusOptionsControl.tsx @@ -4,7 +4,7 @@ import type { ControlData, ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; import { borderRadiusOptions } from "constants/ThemeConstants"; import type { DSEventDetail } from "utils/AppsmithUtils"; -import { SegmentedControl, Tooltip } from "design-system"; +import { SegmentedControl, Tooltip } from "@appsmith/ads"; import { DSEventTypes, DS_EVENT, diff --git a/app/client/src/components/propertyControls/BoxShadowOptionsControl.tsx b/app/client/src/components/propertyControls/BoxShadowOptionsControl.tsx index 2416620e98..bc1df83a65 100644 --- a/app/client/src/components/propertyControls/BoxShadowOptionsControl.tsx +++ b/app/client/src/components/propertyControls/BoxShadowOptionsControl.tsx @@ -2,7 +2,7 @@ import * as React from "react"; import type { ControlData, ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; -import { Icon, SegmentedControl } from "design-system"; +import { Icon, SegmentedControl } from "@appsmith/ads"; import { boxShadowOptions, sizeMappings } from "constants/ThemeConstants"; import type { DSEventDetail } from "utils/AppsmithUtils"; import { diff --git a/app/client/src/components/propertyControls/ButtonBorderRadiusControl.tsx b/app/client/src/components/propertyControls/ButtonBorderRadiusControl.tsx index 96a3e3869f..179b943423 100644 --- a/app/client/src/components/propertyControls/ButtonBorderRadiusControl.tsx +++ b/app/client/src/components/propertyControls/ButtonBorderRadiusControl.tsx @@ -6,7 +6,7 @@ import { Button, ButtonGroup } from "@blueprintjs/core"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; import type { ThemeProp } from "WidgetProvider/constants"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; export enum ButtonBorderRadiusTypes { SHARP = "SHARP", diff --git a/app/client/src/components/propertyControls/ButtonControl.tsx b/app/client/src/components/propertyControls/ButtonControl.tsx index 87aac80525..83957b5200 100644 --- a/app/client/src/components/propertyControls/ButtonControl.tsx +++ b/app/client/src/components/propertyControls/ButtonControl.tsx @@ -2,7 +2,7 @@ import React from "react"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import type { WidgetProps } from "widgets/BaseWidget"; export interface OnButtonClickProps { diff --git a/app/client/src/components/propertyControls/ButtonListControl.tsx b/app/client/src/components/propertyControls/ButtonListControl.tsx index ecbd27d531..da14e79016 100644 --- a/app/client/src/components/propertyControls/ButtonListControl.tsx +++ b/app/client/src/components/propertyControls/ButtonListControl.tsx @@ -5,7 +5,7 @@ import { generateReactKey } from "utils/generators"; import orderBy from "lodash/orderBy"; import isString from "lodash/isString"; import isUndefined from "lodash/isUndefined"; -import { Button, Flex } from "design-system"; +import { Button, Flex } from "@appsmith/ads"; import { ButtonPlacementTypes } from "components/constants"; import { DraggableListControl } from "pages/Editor/PropertyPane/DraggableListControl"; import { DraggableListCard } from "components/propertyControls/DraggableListCard"; diff --git a/app/client/src/components/propertyControls/ButtonTabControl.tsx b/app/client/src/components/propertyControls/ButtonTabControl.tsx index be248515dc..7206d8b20e 100644 --- a/app/client/src/components/propertyControls/ButtonTabControl.tsx +++ b/app/client/src/components/propertyControls/ButtonTabControl.tsx @@ -1,8 +1,8 @@ import React from "react"; import type { ControlData, ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; -import type { ToggleGroupOption } from "design-system"; -import { ToggleButtonGroup } from "design-system"; +import type { ToggleGroupOption } from "@appsmith/ads"; +import { ToggleButtonGroup } from "@appsmith/ads"; import produce from "immer"; import type { DSEventDetail } from "utils/AppsmithUtils"; import { diff --git a/app/client/src/components/propertyControls/ChartDataControl.tsx b/app/client/src/components/propertyControls/ChartDataControl.tsx index e143f66dfe..8c1efe92c4 100644 --- a/app/client/src/components/propertyControls/ChartDataControl.tsx +++ b/app/client/src/components/propertyControls/ChartDataControl.tsx @@ -11,7 +11,7 @@ import { EditorSize, TabBehaviour, } from "components/editorComponents/CodeEditor/EditorConfig"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import type { AllChartData, ChartData } from "widgets/ChartWidget/constants"; import { generateReactKey } from "utils/generators"; import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType"; diff --git a/app/client/src/components/propertyControls/ColorPickerComponentV2.tsx b/app/client/src/components/propertyControls/ColorPickerComponentV2.tsx index 566fc639b6..0c6ee76260 100644 --- a/app/client/src/components/propertyControls/ColorPickerComponentV2.tsx +++ b/app/client/src/components/propertyControls/ColorPickerComponentV2.tsx @@ -6,7 +6,7 @@ import React, { useCallback, } from "react"; import styled from "styled-components"; -import { Switch } from "design-system"; +import { Switch } from "@appsmith/ads"; import { Popover, InputGroup, diff --git a/app/client/src/components/propertyControls/ColumnActionSelectorControl.tsx b/app/client/src/components/propertyControls/ColumnActionSelectorControl.tsx index c202dcafdb..9d3639ca96 100644 --- a/app/client/src/components/propertyControls/ColumnActionSelectorControl.tsx +++ b/app/client/src/components/propertyControls/ColumnActionSelectorControl.tsx @@ -6,7 +6,7 @@ import BaseControl from "./BaseControl"; import { generateReactKey } from "utils/generators"; import { InputText } from "components/propertyControls/InputTextControl"; import ActionCreator from "components/editorComponents/ActionCreator"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; export interface ColumnAction { label?: string; diff --git a/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx b/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx index 987029fa45..c2e7b79bef 100644 --- a/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx +++ b/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx @@ -2,7 +2,7 @@ import React from "react"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; -import { Button, Input, Icon } from "design-system"; +import { Button, Input, Icon } from "@appsmith/ads"; import type { WidgetProps } from "widgets/BaseWidget"; import styled from "styled-components"; import { CUSTOM_WIDGET_FEATURE, createMessage } from "ee/constants/messages"; diff --git a/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx b/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx index 714c885895..eefcd05222 100644 --- a/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx +++ b/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx @@ -2,7 +2,7 @@ import React from "react"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; -import { Button, Icon } from "design-system"; +import { Button, Icon } from "@appsmith/ads"; import { CUSTOM_WIDGET_BUILDER_EVENTS } from "pages/Editor/CustomWidgetBuilder/constants"; import { CUSTOM_WIDGET_FEATURE, createMessage } from "ee/constants/messages"; import CustomWidgetBuilderService from "utils/CustomWidgetBuilderService"; diff --git a/app/client/src/components/propertyControls/DatePickerControl.tsx b/app/client/src/components/propertyControls/DatePickerControl.tsx index 5470746641..101d5a78e7 100644 --- a/app/client/src/components/propertyControls/DatePickerControl.tsx +++ b/app/client/src/components/propertyControls/DatePickerControl.tsx @@ -5,7 +5,7 @@ import moment from "moment"; import { TimePrecision } from "@blueprintjs/datetime"; import type { WidgetProps } from "widgets/BaseWidget"; import { ISO_DATE_FORMAT } from "constants/WidgetValidation"; -import { DatePicker } from "design-system"; +import { DatePicker } from "@appsmith/ads"; import { isDynamicValue } from "utils/DynamicBindingUtils"; class DatePickerControl extends BaseControl< diff --git a/app/client/src/components/propertyControls/DraggableListCard.tsx b/app/client/src/components/propertyControls/DraggableListCard.tsx index ae25fd30b7..9a7877777f 100644 --- a/app/client/src/components/propertyControls/DraggableListCard.tsx +++ b/app/client/src/components/propertyControls/DraggableListCard.tsx @@ -6,7 +6,7 @@ import { StyledActionContainer, InputGroup, } from "components/propertyControls/StyledControls"; -import { Button, Checkbox } from "design-system"; +import { Button, Checkbox } from "@appsmith/ads"; const ItemWrapper = styled.div` display: flex; diff --git a/app/client/src/components/propertyControls/DropDownControl.tsx b/app/client/src/components/propertyControls/DropDownControl.tsx index 618871bade..d18a579397 100644 --- a/app/client/src/components/propertyControls/DropDownControl.tsx +++ b/app/client/src/components/propertyControls/DropDownControl.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Option, Select, Text, Icon } from "design-system"; +import { Option, Select, Text, Icon } from "@appsmith/ads"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; import { isNil } from "lodash"; diff --git a/app/client/src/components/propertyControls/FieldConfigurationControl.tsx b/app/client/src/components/propertyControls/FieldConfigurationControl.tsx index 807a28c6a5..89791db0fc 100644 --- a/app/client/src/components/propertyControls/FieldConfigurationControl.tsx +++ b/app/client/src/components/propertyControls/FieldConfigurationControl.tsx @@ -10,7 +10,7 @@ import SchemaParser, { } from "widgets/JSONFormWidget/schemaParser"; import type { Schema } from "widgets/JSONFormWidget/constants"; import { ARRAY_ITEM_KEY } from "widgets/JSONFormWidget/constants"; -import { Button, Text } from "design-system"; +import { Button, Text } from "@appsmith/ads"; import type { BaseItemProps } from "./DraggableListComponent"; import { DraggableListCard } from "components/propertyControls/DraggableListCard"; import { getNextEntityName } from "utils/AppsmithUtils"; diff --git a/app/client/src/components/propertyControls/HTMLDocumentBuilderControl.tsx b/app/client/src/components/propertyControls/HTMLDocumentBuilderControl.tsx index 1aed661df9..cd80cb6293 100644 --- a/app/client/src/components/propertyControls/HTMLDocumentBuilderControl.tsx +++ b/app/client/src/components/propertyControls/HTMLDocumentBuilderControl.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; diff --git a/app/client/src/components/propertyControls/IconSelectControl.tsx b/app/client/src/components/propertyControls/IconSelectControl.tsx index d24c0c59f3..c4014d8495 100644 --- a/app/client/src/components/propertyControls/IconSelectControl.tsx +++ b/app/client/src/components/propertyControls/IconSelectControl.tsx @@ -14,7 +14,7 @@ import { replayHighlightClass } from "globalStyles/portals"; import _ from "lodash"; import { generateReactKey } from "utils/generators"; import { emitInteractionAnalyticsEvent } from "utils/AppsmithUtils"; -import { Tooltip } from "design-system"; +import { Tooltip } from "@appsmith/ads"; const IconSelectContainerStyles = createGlobalStyle<{ targetWidth: number | undefined; diff --git a/app/client/src/components/propertyControls/IconSelectControlV2.tsx b/app/client/src/components/propertyControls/IconSelectControlV2.tsx index 17ac78579b..2ad63d4ac5 100644 --- a/app/client/src/components/propertyControls/IconSelectControlV2.tsx +++ b/app/client/src/components/propertyControls/IconSelectControlV2.tsx @@ -12,7 +12,7 @@ import { replayHighlightClass } from "globalStyles/portals"; import _ from "lodash"; import { generateReactKey } from "utils/generators"; import { emitInteractionAnalyticsEvent } from "utils/AppsmithUtils"; -import { Tooltip } from "design-system"; +import { Tooltip } from "@appsmith/ads"; import { ICONS, Icon } from "@design-system/widgets"; import type { IconProps } from "@design-system/widgets"; diff --git a/app/client/src/components/propertyControls/IconTabControl.tsx b/app/client/src/components/propertyControls/IconTabControl.tsx index e699c4f550..12cda5a321 100644 --- a/app/client/src/components/propertyControls/IconTabControl.tsx +++ b/app/client/src/components/propertyControls/IconTabControl.tsx @@ -2,8 +2,8 @@ import React from "react"; import styled from "styled-components"; import type { ControlData, ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; -import type { SegmentedControlOption } from "design-system"; -import { SegmentedControl } from "design-system"; +import type { SegmentedControlOption } from "@appsmith/ads"; +import { SegmentedControl } from "@appsmith/ads"; import type { DSEventDetail } from "utils/AppsmithUtils"; import { DSEventTypes, diff --git a/app/client/src/components/propertyControls/KeyValueComponent.tsx b/app/client/src/components/propertyControls/KeyValueComponent.tsx index 934f2d1755..0ec815db0e 100644 --- a/app/client/src/components/propertyControls/KeyValueComponent.tsx +++ b/app/client/src/components/propertyControls/KeyValueComponent.tsx @@ -1,8 +1,8 @@ import React, { useState, useEffect, useCallback } from "react"; import styled from "styled-components"; import { ControlWrapper, InputGroup } from "./StyledControls"; -import type { SegmentedControlOption } from "design-system"; -import { Button } from "design-system"; +import type { SegmentedControlOption } from "@appsmith/ads"; +import { Button } from "@appsmith/ads"; import { generateReactKey } from "utils/generators"; import { debounce } from "lodash"; import { getNextEntityName } from "utils/AppsmithUtils"; diff --git a/app/client/src/components/propertyControls/LabelAlignmentOptionsControl.tsx b/app/client/src/components/propertyControls/LabelAlignmentOptionsControl.tsx index 11fa1e5cfd..d807ce2f80 100644 --- a/app/client/src/components/propertyControls/LabelAlignmentOptionsControl.tsx +++ b/app/client/src/components/propertyControls/LabelAlignmentOptionsControl.tsx @@ -1,7 +1,7 @@ import React from "react"; import { Alignment } from "@blueprintjs/core"; -import type { SegmentedControlOption } from "design-system"; -import { SegmentedControl } from "design-system"; +import type { SegmentedControlOption } from "@appsmith/ads"; +import { SegmentedControl } from "@appsmith/ads"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; import type { DSEventDetail } from "utils/AppsmithUtils"; diff --git a/app/client/src/components/propertyControls/MenuItemsControl.tsx b/app/client/src/components/propertyControls/MenuItemsControl.tsx index 7525e02c53..c323b54997 100644 --- a/app/client/src/components/propertyControls/MenuItemsControl.tsx +++ b/app/client/src/components/propertyControls/MenuItemsControl.tsx @@ -7,7 +7,7 @@ import isString from "lodash/isString"; import isUndefined from "lodash/isUndefined"; import { DraggableListControl } from "pages/Editor/PropertyPane/DraggableListControl"; import { DraggableListCard } from "components/propertyControls/DraggableListCard"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; interface State { focusedIndex: number | null; diff --git a/app/client/src/components/propertyControls/NumericInputControl.tsx b/app/client/src/components/propertyControls/NumericInputControl.tsx index c449845941..f9387a26fe 100644 --- a/app/client/src/components/propertyControls/NumericInputControl.tsx +++ b/app/client/src/components/propertyControls/NumericInputControl.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { NumberInput } from "design-system"; +import { NumberInput } from "@appsmith/ads"; import type { ControlData, ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; diff --git a/app/client/src/components/propertyControls/OpenConfigPanelControl.tsx b/app/client/src/components/propertyControls/OpenConfigPanelControl.tsx index 8adec62cd8..eccefbb514 100644 --- a/app/client/src/components/propertyControls/OpenConfigPanelControl.tsx +++ b/app/client/src/components/propertyControls/OpenConfigPanelControl.tsx @@ -1,7 +1,7 @@ import React from "react"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; class OpenConfigPanelControl extends BaseControl { constructor(props: OpenConfigPanelControlProps) { diff --git a/app/client/src/components/propertyControls/OptionControl.tsx b/app/client/src/components/propertyControls/OptionControl.tsx index a1618852f2..e49dc38801 100644 --- a/app/client/src/components/propertyControls/OptionControl.tsx +++ b/app/client/src/components/propertyControls/OptionControl.tsx @@ -4,7 +4,7 @@ import BaseControl from "./BaseControl"; import type { DropdownOption } from "components/constants"; import { KeyValueComponent } from "./KeyValueComponent"; import { isDynamicValue } from "utils/DynamicBindingUtils"; -import type { SegmentedControlOption } from "design-system"; +import type { SegmentedControlOption } from "@appsmith/ads"; class OptionControl extends BaseControl { render() { diff --git a/app/client/src/components/propertyControls/PrimaryColumnDropdownControl.tsx b/app/client/src/components/propertyControls/PrimaryColumnDropdownControl.tsx index 5ad4714548..07bfe52a73 100644 --- a/app/client/src/components/propertyControls/PrimaryColumnDropdownControl.tsx +++ b/app/client/src/components/propertyControls/PrimaryColumnDropdownControl.tsx @@ -2,8 +2,8 @@ import React from "react"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; import type { ColumnProperties } from "widgets/TableWidget/component/Constants"; -import type { SegmentedControlOption } from "design-system"; -import { Select, Option } from "design-system"; +import type { SegmentedControlOption } from "@appsmith/ads"; +import { Select, Option } from "@appsmith/ads"; import type { DSEventDetail } from "utils/AppsmithUtils"; import { DSEventTypes, diff --git a/app/client/src/components/propertyControls/PrimaryColumnsControl.tsx b/app/client/src/components/propertyControls/PrimaryColumnsControl.tsx index e4a40a56d4..fa5a267414 100644 --- a/app/client/src/components/propertyControls/PrimaryColumnsControl.tsx +++ b/app/client/src/components/propertyControls/PrimaryColumnsControl.tsx @@ -24,7 +24,7 @@ import { getEvalErrorPath } from "utils/DynamicBindingUtils"; import { getNextEntityName } from "utils/AppsmithUtils"; import { DraggableListControl } from "pages/Editor/PropertyPane/DraggableListControl"; import { DraggableListCard } from "components/propertyControls/DraggableListCard"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; interface ReduxStateProps { dynamicData: DataTree; diff --git a/app/client/src/components/propertyControls/PrimaryColumnsControlV2.tsx b/app/client/src/components/propertyControls/PrimaryColumnsControlV2.tsx index 95ad00a0c1..f6c061a0f8 100644 --- a/app/client/src/components/propertyControls/PrimaryColumnsControlV2.tsx +++ b/app/client/src/components/propertyControls/PrimaryColumnsControlV2.tsx @@ -5,7 +5,7 @@ import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig import EvaluatedValuePopup from "components/editorComponents/CodeEditor/EvaluatedValuePopup"; import { DraggableListCard } from "components/propertyControls/DraggableListCard"; import type { Indices } from "constants/Layers"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import type { DataTree } from "entities/DataTree/dataTreeTypes"; import _, { toString as lodashToString } from "lodash"; import { DraggableListControl } from "pages/Editor/PropertyPane/DraggableListControl"; diff --git a/app/client/src/components/propertyControls/StepControl.tsx b/app/client/src/components/propertyControls/StepControl.tsx index 83e74136cb..64377023fa 100644 --- a/app/client/src/components/propertyControls/StepControl.tsx +++ b/app/client/src/components/propertyControls/StepControl.tsx @@ -1,7 +1,7 @@ import React from "react"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; -import { NumberInput } from "design-system"; +import { NumberInput } from "@appsmith/ads"; import type { DSEventDetail } from "utils/AppsmithUtils"; import { DSEventTypes, diff --git a/app/client/src/components/propertyControls/StyledControls.tsx b/app/client/src/components/propertyControls/StyledControls.tsx index 0838bc9da7..2c24244393 100644 --- a/app/client/src/components/propertyControls/StyledControls.tsx +++ b/app/client/src/components/propertyControls/StyledControls.tsx @@ -2,7 +2,7 @@ import * as React from "react"; import styled from "styled-components"; import type { TextInputProps } from "@appsmith/ads-old"; import type { ContainerOrientation } from "constants/WidgetConstants"; -import { Input, Icon } from "design-system"; +import { Input, Icon } from "@appsmith/ads"; import useInteractionAnalyticsEvent from "utils/hooks/useInteractionAnalyticsEvent"; interface ControlWrapperProps { diff --git a/app/client/src/components/propertyControls/SwitchControl.tsx b/app/client/src/components/propertyControls/SwitchControl.tsx index 51942b9b82..50d661e9b5 100644 --- a/app/client/src/components/propertyControls/SwitchControl.tsx +++ b/app/client/src/components/propertyControls/SwitchControl.tsx @@ -2,7 +2,7 @@ import React from "react"; import styled from "styled-components"; import type { ControlData, ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; -import { Switch } from "design-system"; +import { Switch } from "@appsmith/ads"; import type { DSEventDetail } from "utils/AppsmithUtils"; import { DSEventTypes, diff --git a/app/client/src/components/propertyControls/TabControl.tsx b/app/client/src/components/propertyControls/TabControl.tsx index 94539ab914..397bfbc94d 100644 --- a/app/client/src/components/propertyControls/TabControl.tsx +++ b/app/client/src/components/propertyControls/TabControl.tsx @@ -15,7 +15,7 @@ import { useDispatch } from "react-redux"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { DraggableListControl } from "pages/Editor/PropertyPane/DraggableListControl"; import { DraggableListCard } from "components/propertyControls/DraggableListCard"; -import { Button, Tag } from "design-system"; +import { Button, Tag } from "@appsmith/ads"; // TODO: Fix this the next time the file is edited // eslint-disable-next-line @typescript-eslint/no-explicit-any diff --git a/app/client/src/components/propertyControls/ZoneStepperControl.tsx b/app/client/src/components/propertyControls/ZoneStepperControl.tsx index 0cb6ce68ea..af5dd2ac3f 100644 --- a/app/client/src/components/propertyControls/ZoneStepperControl.tsx +++ b/app/client/src/components/propertyControls/ZoneStepperControl.tsx @@ -1,7 +1,7 @@ import React from "react"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; -import { NumberInput } from "design-system"; +import { NumberInput } from "@appsmith/ads"; import type { DSEventDetail } from "utils/AppsmithUtils"; import { DSEventTypes, diff --git a/app/client/src/components/utils/CollapseComponent.tsx b/app/client/src/components/utils/CollapseComponent.tsx index 6bfcf4465b..36a40d0e6e 100644 --- a/app/client/src/components/utils/CollapseComponent.tsx +++ b/app/client/src/components/utils/CollapseComponent.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import { Collapse } from "@blueprintjs/core"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; const CollapseWrapper = styled.div` position: relative; diff --git a/app/client/src/components/utils/ReduxFormTextField.tsx b/app/client/src/components/utils/ReduxFormTextField.tsx index 0bc5f20ebf..e62af75257 100644 --- a/app/client/src/components/utils/ReduxFormTextField.tsx +++ b/app/client/src/components/utils/ReduxFormTextField.tsx @@ -2,7 +2,7 @@ import React from "react"; import type { WrappedFieldMetaProps, WrappedFieldInputProps } from "redux-form"; import { Field } from "redux-form"; import type { InputType } from "@appsmith/ads-old"; -import { Input, NumberInput } from "design-system"; +import { Input, NumberInput } from "@appsmith/ads"; import type { Intent } from "constants/DefaultTheme"; import { SettingSubtype } from "ee/pages/AdminSettings/config/types"; diff --git a/app/client/src/components/utils/formComponents.tsx b/app/client/src/components/utils/formComponents.tsx index 5e5b114e72..1cd96e7797 100644 --- a/app/client/src/components/utils/formComponents.tsx +++ b/app/client/src/components/utils/formComponents.tsx @@ -1,4 +1,4 @@ -import { Menu } from "design-system"; +import { Menu } from "@appsmith/ads"; import styled from "styled-components"; export const MenuWrapper = styled.div` diff --git a/app/client/src/components/utils/helperComponents.tsx b/app/client/src/components/utils/helperComponents.tsx index 9376d9c5e3..95a49683dc 100644 --- a/app/client/src/components/utils/helperComponents.tsx +++ b/app/client/src/components/utils/helperComponents.tsx @@ -2,7 +2,7 @@ import React from "react"; import styled, { createGlobalStyle } from "styled-components"; import { useHistory } from "react-router-dom"; import { truncateTextUsingEllipsis } from "constants/DefaultTheme"; -import { Link, Text } from "design-system"; +import { Link, Text } from "@appsmith/ads"; export const HelpPopoverStyle = createGlobalStyle` .bp3-portal { diff --git a/app/client/src/constants/DefaultTheme.tsx b/app/client/src/constants/DefaultTheme.tsx index f8245f2ff3..bbfbbf7e02 100644 --- a/app/client/src/constants/DefaultTheme.tsx +++ b/app/client/src/constants/DefaultTheme.tsx @@ -12,7 +12,7 @@ import { TABLE_SCROLLBAR_HEIGHT, TABLE_SCROLLBAR_WIDTH, } from "widgets/TableWidgetV2/component/Constants"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import React from "react"; export type FontFamily = (typeof FontFamilies)[keyof typeof FontFamilies]; diff --git a/app/client/src/icons/MenuIcons.tsx b/app/client/src/icons/MenuIcons.tsx index 33eb122531..56c1e2fe5f 100644 --- a/app/client/src/icons/MenuIcons.tsx +++ b/app/client/src/icons/MenuIcons.tsx @@ -4,7 +4,7 @@ import { IconWrapper } from "constants/IconConstants"; import { Icon } from "@blueprintjs/core"; import styled from "styled-components"; import { Colors } from "constants/Colors"; -import { Icon as DSIcon } from "design-system"; +import { Icon as DSIcon } from "@appsmith/ads"; import { importRemixIcon, importSvg } from "@appsmith/ads-old"; const ApisIcon = importSvg(async () => import("assets/icons/menu/api.svg")); diff --git a/app/client/src/index.tsx b/app/client/src/index.tsx index 61b26f646f..2a950f2c8d 100755 --- a/app/client/src/index.tsx +++ b/app/client/src/index.tsx @@ -7,7 +7,7 @@ import ReactDOM from "react-dom"; import { Provider } from "react-redux"; import "./index.css"; import "@appsmith/ads-old/src/themes/default/index.css"; -import "design-system/src/__theme__/default/index.css"; +import "@appsmith/ads/src/__theme__/default/index.css"; import { ThemeProvider } from "styled-components"; import { appInitializer } from "utils/AppUtils"; import store, { runSagaMiddleware } from "./store"; @@ -17,7 +17,7 @@ import * as Sentry from "@sentry/react"; import { getCurrentThemeDetails } from "selectors/themeSelectors"; import { connect } from "react-redux"; import type { AppState } from "ee/reducers"; -import { Toast } from "design-system"; +import { Toast } from "@appsmith/ads"; import "./assets/styles/index.css"; import "./polyfills"; import GlobalStyles from "globalStyles"; diff --git a/app/client/src/layoutSystems/anvil/editor/canvasArenas/AnvilDragPreview/AnvilDragPreviewComponent.tsx b/app/client/src/layoutSystems/anvil/editor/canvasArenas/AnvilDragPreview/AnvilDragPreviewComponent.tsx index 74e2ca442c..dce20b4e68 100644 --- a/app/client/src/layoutSystems/anvil/editor/canvasArenas/AnvilDragPreview/AnvilDragPreviewComponent.tsx +++ b/app/client/src/layoutSystems/anvil/editor/canvasArenas/AnvilDragPreview/AnvilDragPreviewComponent.tsx @@ -1,7 +1,7 @@ import React, { useCallback, useEffect, useRef } from "react"; import styled from "styled-components"; import { Wrapper } from "pages/Editor/widgetSidebar/WidgetCard"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; const StyledWidgetCardPreviewWrapper = styled.div` position: absolute; diff --git a/app/client/src/layoutSystems/common/dropTarget/buildingBlockExplorerDropTarget/index.tsx b/app/client/src/layoutSystems/common/dropTarget/buildingBlockExplorerDropTarget/index.tsx index 336bad7799..cbff4fa87a 100644 --- a/app/client/src/layoutSystems/common/dropTarget/buildingBlockExplorerDropTarget/index.tsx +++ b/app/client/src/layoutSystems/common/dropTarget/buildingBlockExplorerDropTarget/index.tsx @@ -1,6 +1,6 @@ import { importSvg } from "@design-system/widgets-old/src/utils/icon-loadables"; import { EMPTY_CANVAS_HINTS, createMessage } from "ee/constants/messages"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import React from "react"; import styled from "styled-components"; diff --git a/app/client/src/layoutSystems/common/widgetName/DeleteControl.tsx b/app/client/src/layoutSystems/common/widgetName/DeleteControl.tsx index 30d300d9fd..4a7a1653af 100644 --- a/app/client/src/layoutSystems/common/widgetName/DeleteControl.tsx +++ b/app/client/src/layoutSystems/common/widgetName/DeleteControl.tsx @@ -2,7 +2,7 @@ import React from "react"; import { Tooltip } from "@blueprintjs/core"; import styled from "styled-components"; import { Colors } from "constants/Colors"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; const StyledDeleteIcon = styled.div` justify-self: flex-start; diff --git a/app/client/src/layoutSystems/common/widgetName/HelpControl.tsx b/app/client/src/layoutSystems/common/widgetName/HelpControl.tsx index 5e21c4e78f..7e305c0a53 100644 --- a/app/client/src/layoutSystems/common/widgetName/HelpControl.tsx +++ b/app/client/src/layoutSystems/common/widgetName/HelpControl.tsx @@ -9,7 +9,7 @@ import { setHelpModalVisibility, } from "actions/helpActions"; import type { WidgetType } from "constants/WidgetConstants"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; const StyledHelpIcon = styled.div` justify-self: flex-start; diff --git a/app/client/src/layoutSystems/common/widgetName/SettingsControl.tsx b/app/client/src/layoutSystems/common/widgetName/SettingsControl.tsx index ff017a4a3d..6fd1e8944e 100644 --- a/app/client/src/layoutSystems/common/widgetName/SettingsControl.tsx +++ b/app/client/src/layoutSystems/common/widgetName/SettingsControl.tsx @@ -4,7 +4,7 @@ import React from "react"; import { useSelector } from "react-redux"; import { snipingModeSelector } from "selectors/editorSelectors"; import styled from "styled-components"; -import { Icon, Text, Tooltip } from "design-system"; +import { Icon, Text, Tooltip } from "@appsmith/ads"; // I honestly can't think of a better name for this enum export enum Activities { diff --git a/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx b/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx index e6c33144eb..87254d2a1e 100644 --- a/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx +++ b/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx @@ -23,7 +23,7 @@ import type { AppState } from "ee/reducers"; import { useWidgetDragResize } from "utils/hooks/dragResizeHooks"; import { getBoundariesFromSelectedWidgets } from "sagas/WidgetOperationUtils"; import { CONTAINER_GRID_PADDING } from "constants/WidgetConstants"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; const POPUP_HEIGHT = 122; const POPUP_WIDTH = 38; diff --git a/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx b/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx index 98542c1aa8..a31d1692ad 100644 --- a/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx +++ b/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx @@ -11,7 +11,7 @@ import { UPGRADE, AUTHENTICATION_METHOD_ENABLED, } from "ee/constants/messages"; -import { Button, Callout, Divider, Icon, Text, Tooltip } from "design-system"; +import { Button, Callout, Divider, Icon, Text, Tooltip } from "@appsmith/ads"; import { adminSettingsCategoryUrl } from "ee/RouteBuilder"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import useOnUpgrade from "utils/hooks/useOnUpgrade"; diff --git a/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx b/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx index b42eb74326..4208d38776 100644 --- a/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx +++ b/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx @@ -8,7 +8,7 @@ import type { UseFormResetField, } from "react-hook-form"; import { Controller } from "react-hook-form"; -import { Button, Icon, Text, Tooltip } from "design-system"; +import { Button, Icon, Text, Tooltip } from "@appsmith/ads"; import type { Inputs } from "./BrandingPage"; import { diff --git a/app/client/src/pages/AdminSettings/Branding/previews/AppPreview.tsx b/app/client/src/pages/AdminSettings/Branding/previews/AppPreview.tsx index cdb143d21b..bca91db9d4 100644 --- a/app/client/src/pages/AdminSettings/Branding/previews/AppPreview.tsx +++ b/app/client/src/pages/AdminSettings/Branding/previews/AppPreview.tsx @@ -3,7 +3,7 @@ import React from "react"; import type { PreviewsProps } from "."; import PreviewBox from "./PreviewBox"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; const AppPreview = (props: PreviewsProps) => { const { logo, shades } = props; diff --git a/app/client/src/pages/AdminSettings/Branding/previews/DashboardThumbnail.tsx b/app/client/src/pages/AdminSettings/Branding/previews/DashboardThumbnail.tsx index 8b99cf7666..bf3b05b183 100644 --- a/app/client/src/pages/AdminSettings/Branding/previews/DashboardThumbnail.tsx +++ b/app/client/src/pages/AdminSettings/Branding/previews/DashboardThumbnail.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import PreviewBox from "./PreviewBox"; import type { PreviewsProps } from "."; import { ContentBox } from "pages/AdminSettings/components"; diff --git a/app/client/src/pages/AdminSettings/Branding/previews/EmailPreview.tsx b/app/client/src/pages/AdminSettings/Branding/previews/EmailPreview.tsx index 7ab156fd1b..195d80ef96 100644 --- a/app/client/src/pages/AdminSettings/Branding/previews/EmailPreview.tsx +++ b/app/client/src/pages/AdminSettings/Branding/previews/EmailPreview.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import type { PreviewsProps } from "."; import PreviewBox from "./PreviewBox"; import { ContentBox } from "pages/AdminSettings/components"; diff --git a/app/client/src/pages/AdminSettings/Branding/previews/FaviconPreview.tsx b/app/client/src/pages/AdminSettings/Branding/previews/FaviconPreview.tsx index c7e3bcf5a8..fd4ded527b 100644 --- a/app/client/src/pages/AdminSettings/Branding/previews/FaviconPreview.tsx +++ b/app/client/src/pages/AdminSettings/Branding/previews/FaviconPreview.tsx @@ -1,6 +1,6 @@ import React from "react"; import PreviewBox from "./PreviewBox"; -import { Icon, Text } from "design-system"; +import { Icon, Text } from "@appsmith/ads"; import type { PreviewsProps } from "."; import { ContentBox } from "pages/AdminSettings/components"; diff --git a/app/client/src/pages/AdminSettings/Branding/previews/LinkPreview.tsx b/app/client/src/pages/AdminSettings/Branding/previews/LinkPreview.tsx index 832952c2b1..98a258d23f 100644 --- a/app/client/src/pages/AdminSettings/Branding/previews/LinkPreview.tsx +++ b/app/client/src/pages/AdminSettings/Branding/previews/LinkPreview.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import type { PreviewsProps } from "."; import PreviewBox from "./PreviewBox"; import { ContentBox } from "pages/AdminSettings/components"; diff --git a/app/client/src/pages/AdminSettings/Branding/previews/NotFoundPreview.tsx b/app/client/src/pages/AdminSettings/Branding/previews/NotFoundPreview.tsx index a265911a14..a9db5b28f2 100644 --- a/app/client/src/pages/AdminSettings/Branding/previews/NotFoundPreview.tsx +++ b/app/client/src/pages/AdminSettings/Branding/previews/NotFoundPreview.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import PreviewBox from "./PreviewBox"; import type { PreviewsProps } from "."; import { ContentBox } from "pages/AdminSettings/components"; diff --git a/app/client/src/pages/AdminSettings/Branding/previews/PreviewBox.tsx b/app/client/src/pages/AdminSettings/Branding/previews/PreviewBox.tsx index da7ca73332..40f10e09c8 100644 --- a/app/client/src/pages/AdminSettings/Branding/previews/PreviewBox.tsx +++ b/app/client/src/pages/AdminSettings/Branding/previews/PreviewBox.tsx @@ -1,6 +1,6 @@ import React from "react"; import { ContentBox } from "pages/AdminSettings/components"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; interface PreviewBoxProps { title?: string; diff --git a/app/client/src/pages/AdminSettings/DisconnectService.tsx b/app/client/src/pages/AdminSettings/DisconnectService.tsx index b63ff01898..4a713c7f27 100644 --- a/app/client/src/pages/AdminSettings/DisconnectService.tsx +++ b/app/client/src/pages/AdminSettings/DisconnectService.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; import styled from "styled-components"; -import { Button, Callout, Text } from "design-system"; +import { Button, Callout, Text } from "@appsmith/ads"; import { createMessage, DANGER_ZONE, diff --git a/app/client/src/pages/AdminSettings/FormGroup/Accordion.tsx b/app/client/src/pages/AdminSettings/FormGroup/Accordion.tsx index 3b1370d3d6..a5c2a9a152 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/Accordion.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/Accordion.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import type { Setting } from "ee/pages/AdminSettings/config/types"; import Group from "./group"; -import { Icon, Text } from "design-system"; +import { Icon, Text } from "@appsmith/ads"; const AccordionWrapper = styled.div` margin-top: 40px; diff --git a/app/client/src/pages/AdminSettings/FormGroup/Button.tsx b/app/client/src/pages/AdminSettings/FormGroup/Button.tsx index c25ccac3e9..3d6dcb2ee2 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/Button.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/Button.tsx @@ -1,6 +1,6 @@ import { SETTINGS_FORM_NAME } from "ee/constants/forms"; import React from "react"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { useDispatch, useSelector } from "react-redux"; import { getFormValues } from "redux-form"; import styled from "styled-components"; diff --git a/app/client/src/pages/AdminSettings/FormGroup/Checkbox.tsx b/app/client/src/pages/AdminSettings/FormGroup/Checkbox.tsx index 9107633a93..f6aa9c5db3 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/Checkbox.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/Checkbox.tsx @@ -4,7 +4,7 @@ import { Field, getFormValues } from "redux-form"; import styled from "styled-components"; import { FormGroup, type SettingComponentProps } from "./Common"; import type { FormTextFieldProps } from "components/utils/ReduxFormTextField"; -import { Checkbox } from "design-system"; +import { Checkbox } from "@appsmith/ads"; import { useSelector } from "react-redux"; import { SETTINGS_FORM_NAME } from "ee/constants/forms"; import { isTenantConfig } from "ee/utils/adminSettingsHelpers"; diff --git a/app/client/src/pages/AdminSettings/FormGroup/ColorInput.tsx b/app/client/src/pages/AdminSettings/FormGroup/ColorInput.tsx index 1d90744023..d1d506b8ed 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/ColorInput.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/ColorInput.tsx @@ -4,7 +4,7 @@ import { Field } from "redux-form"; import { startCase } from "lodash"; import tinycolor from "tinycolor2"; import styled from "styled-components"; -import { Icon, Text, Tooltip } from "design-system"; +import { Icon, Text, Tooltip } from "@appsmith/ads"; import { InputGroup, Classes } from "@blueprintjs/core"; import Color from "colorjs.io"; diff --git a/app/client/src/pages/AdminSettings/FormGroup/Common.tsx b/app/client/src/pages/AdminSettings/FormGroup/Common.tsx index 0350949b65..2bfd316456 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/Common.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/Common.tsx @@ -1,7 +1,7 @@ import { createMessage } from "ee/constants/messages"; import React from "react"; import styled from "styled-components"; -import { Icon, Tooltip, Text } from "design-system"; +import { Icon, Tooltip, Text } from "@appsmith/ads"; import type { Setting } from "ee/pages/AdminSettings/config/types"; import EnterpriseTag from "components/EnterpriseTag"; import BusinessTag from "components/BusinessTag"; diff --git a/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx b/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx index 272a6d2229..54cfff3095 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx @@ -2,7 +2,7 @@ import React, { useMemo } from "react"; import styled from "styled-components"; import copy from "copy-to-clipboard"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { Icon, Input, Text, toast, Tooltip } from "design-system"; +import { Icon, Input, Text, toast, Tooltip } from "@appsmith/ads"; export const BodyContainer = styled.div` width: 100%; diff --git a/app/client/src/pages/AdminSettings/FormGroup/Dropdown.tsx b/app/client/src/pages/AdminSettings/FormGroup/Dropdown.tsx index 8931404c65..6fe71e8f23 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/Dropdown.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/Dropdown.tsx @@ -2,7 +2,7 @@ import React from "react"; import type { SettingComponentProps } from "./Common"; import { FormGroup } from "./Common"; import SelectField from "components/editorComponents/form/fields/SelectField"; -import type { SelectOptionProps } from "design-system"; +import type { SelectOptionProps } from "@appsmith/ads"; export default function DropDown( props: { diff --git a/app/client/src/pages/AdminSettings/FormGroup/ImageInput.tsx b/app/client/src/pages/AdminSettings/FormGroup/ImageInput.tsx index 53c01c8c03..e71cf9deb4 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/ImageInput.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/ImageInput.tsx @@ -1,6 +1,6 @@ import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form"; import { Field } from "redux-form"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import React, { memo, useRef, useState, useEffect } from "react"; import type { FormTextFieldProps } from "components/utils/ReduxFormTextField"; diff --git a/app/client/src/pages/AdminSettings/FormGroup/Link.tsx b/app/client/src/pages/AdminSettings/FormGroup/Link.tsx index ee46c242fe..76c9137c7c 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/Link.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/Link.tsx @@ -1,5 +1,5 @@ import { Icon } from "@blueprintjs/core"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { createMessage, LEARN_MORE } from "ee/constants/messages"; import React from "react"; import { useDispatch } from "react-redux"; diff --git a/app/client/src/pages/AdminSettings/FormGroup/Radio.tsx b/app/client/src/pages/AdminSettings/FormGroup/Radio.tsx index f66d5d725c..0c8e8bad49 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/Radio.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/Radio.tsx @@ -7,8 +7,8 @@ import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form"; import { Field } from "redux-form"; import styled, { createGlobalStyle } from "styled-components"; import { Position } from "@blueprintjs/core"; -import type { RadioProps } from "design-system"; -import { Icon, Link, Radio, RadioGroup, Tag, Text } from "design-system"; +import type { RadioProps } from "@appsmith/ads"; +import { Icon, Link, Radio, RadioGroup, Tag, Text } from "@appsmith/ads"; type RadioOption = { node?: ReactElement; diff --git a/app/client/src/pages/AdminSettings/FormGroup/Text.tsx b/app/client/src/pages/AdminSettings/FormGroup/Text.tsx index 121c191bd8..f6c57a1176 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/Text.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/Text.tsx @@ -1,4 +1,4 @@ -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import React from "react"; import { getSettings } from "selectors/settingsSelectors"; import { useSelector } from "react-redux"; diff --git a/app/client/src/pages/AdminSettings/FormGroup/TextAreaField.tsx b/app/client/src/pages/AdminSettings/FormGroup/TextAreaField.tsx index 0aaf2061c7..1704204f43 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/TextAreaField.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/TextAreaField.tsx @@ -3,7 +3,7 @@ import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form"; import { Field } from "redux-form"; import type { Intent } from "constants/DefaultTheme"; import { FieldError } from "@appsmith/ads-old"; -import { Input } from "design-system"; +import { Input } from "@appsmith/ads"; import type { Setting } from "ee/pages/AdminSettings/config/types"; const renderComponent = ( diff --git a/app/client/src/pages/AdminSettings/FormGroup/Toggle.tsx b/app/client/src/pages/AdminSettings/FormGroup/Toggle.tsx index 6d8af84b3e..f2a999b07d 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/Toggle.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/Toggle.tsx @@ -5,7 +5,7 @@ import styled from "styled-components"; import type { SettingComponentProps } from "./Common"; import type { FormTextFieldProps } from "components/utils/ReduxFormTextField"; import { createMessage } from "ee/constants/messages"; -import { Switch, Text } from "design-system"; +import { Switch, Text } from "@appsmith/ads"; import { SETTINGS_FORM_NAME } from "ee/constants/forms"; import { useSelector } from "react-redux"; diff --git a/app/client/src/pages/AdminSettings/FormGroup/group.tsx b/app/client/src/pages/AdminSettings/FormGroup/group.tsx index 0893b5861b..285d9bc7a9 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/group.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/group.tsx @@ -10,7 +10,7 @@ import { getFormValues } from "redux-form"; import { SETTINGS_FORM_NAME } from "ee/constants/forms"; import { useDispatch, useSelector } from "react-redux"; import { createMessage, LEARN_MORE } from "ee/constants/messages"; -import { Callout, Text } from "design-system"; +import { Callout, Text } from "@appsmith/ads"; import CopyUrlForm from "./CopyUrlForm"; import Accordion from "./Accordion"; import TagInputField from "./TagInputField"; diff --git a/app/client/src/pages/AdminSettings/LeftPane.tsx b/app/client/src/pages/AdminSettings/LeftPane.tsx index a88ded46e2..5635724b36 100644 --- a/app/client/src/pages/AdminSettings/LeftPane.tsx +++ b/app/client/src/pages/AdminSettings/LeftPane.tsx @@ -8,7 +8,7 @@ import { import { adminSettingsCategoryUrl } from "ee/RouteBuilder"; import { useParams } from "react-router"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { Link, Text } from "design-system"; +import { Link, Text } from "@appsmith/ads"; import { useDispatch, useSelector } from "react-redux"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { getCurrentUser } from "selectors/usersSelectors"; diff --git a/app/client/src/pages/AdminSettings/RestartBanner.tsx b/app/client/src/pages/AdminSettings/RestartBanner.tsx index 98d33c8255..f0ee12f614 100644 --- a/app/client/src/pages/AdminSettings/RestartBanner.tsx +++ b/app/client/src/pages/AdminSettings/RestartBanner.tsx @@ -1,6 +1,6 @@ import React from "react"; import { hexToRgba } from "@appsmith/ads-old"; -import { Button, Icon, Spinner, Text } from "design-system"; +import { Button, Icon, Spinner, Text } from "@appsmith/ads"; import { getIsRestartFailed, getRestartingState, diff --git a/app/client/src/pages/AdminSettings/SaveSettings.tsx b/app/client/src/pages/AdminSettings/SaveSettings.tsx index c1989bfa55..980088e874 100644 --- a/app/client/src/pages/AdminSettings/SaveSettings.tsx +++ b/app/client/src/pages/AdminSettings/SaveSettings.tsx @@ -6,7 +6,7 @@ import { SAVE_BUTTON, createMessage, } from "ee/constants/messages"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import styled from "styled-components"; const SettingsButtonWrapper = styled.div` diff --git a/app/client/src/pages/AdminSettings/SettingsForm.tsx b/app/client/src/pages/AdminSettings/SettingsForm.tsx index c55260f251..574da3492a 100644 --- a/app/client/src/pages/AdminSettings/SettingsForm.tsx +++ b/app/client/src/pages/AdminSettings/SettingsForm.tsx @@ -40,7 +40,7 @@ import { SettingsFormWrapper, } from "./components"; import { BackButton } from "components/utils/helperComponents"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { getIsFormLoginEnabled, getThirdPartyAuths, diff --git a/app/client/src/pages/AdminSettings/components.tsx b/app/client/src/pages/AdminSettings/components.tsx index 78a6f2b796..db9385eb43 100644 --- a/app/client/src/pages/AdminSettings/components.tsx +++ b/app/client/src/pages/AdminSettings/components.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; import { Classes } from "@blueprintjs/core"; -import { Link, Text } from "design-system"; +import { Link, Text } from "@appsmith/ads"; export const Wrapper = styled.div` flex-basis: calc(100% - ${(props) => props.theme.homePage.leftPane.width}px); diff --git a/app/client/src/pages/AdminSettings/index.tsx b/app/client/src/pages/AdminSettings/index.tsx index 4622fc16e5..36828beb46 100644 --- a/app/client/src/pages/AdminSettings/index.tsx +++ b/app/client/src/pages/AdminSettings/index.tsx @@ -12,7 +12,7 @@ import bootIntercom from "utils/bootIntercom"; import { LoaderContainer } from "pages/AdminSettings/components"; import { useParams } from "react-router"; import AdminConfig from "ee/pages/AdminSettings/config"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; const FlexContainer = styled.div` display: flex; diff --git a/app/client/src/pages/AppViewer/BrandingBadge.tsx b/app/client/src/pages/AppViewer/BrandingBadge.tsx index a2b8697732..9f14ebeddd 100644 --- a/app/client/src/pages/AppViewer/BrandingBadge.tsx +++ b/app/client/src/pages/AppViewer/BrandingBadge.tsx @@ -1,7 +1,7 @@ import React from "react"; import { importSvg } from "@appsmith/ads-old"; import styled from "styled-components"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; const AppsmithLogo = importSvg( async () => import("assets/svg/appsmith-logo-no-pad.svg"), ); diff --git a/app/client/src/pages/AppViewer/Navigation/TopStacked.styled.tsx b/app/client/src/pages/AppViewer/Navigation/TopStacked.styled.tsx index 39906fe0b9..c13eac286e 100644 --- a/app/client/src/pages/AppViewer/Navigation/TopStacked.styled.tsx +++ b/app/client/src/pages/AppViewer/Navigation/TopStacked.styled.tsx @@ -1,6 +1,6 @@ import type { NavigationSetting } from "constants/AppConstants"; import { NAVIGATION_SETTINGS } from "constants/AppConstants"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import styled from "styled-components"; import { getMenuContainerBackgroundColor, diff --git a/app/client/src/pages/AppViewer/Navigation/components/ApplicationName.tsx b/app/client/src/pages/AppViewer/Navigation/components/ApplicationName.tsx index 80fb5a93e5..e8f2f8514f 100644 --- a/app/client/src/pages/AppViewer/Navigation/components/ApplicationName.tsx +++ b/app/client/src/pages/AppViewer/Navigation/components/ApplicationName.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from "react"; import type { NavigationSetting } from "constants/AppConstants"; import { StyledApplicationName } from "./ApplicationName.styled"; import { isEllipsisActive } from "utils/helpers"; -import { Tooltip } from "design-system"; +import { Tooltip } from "@appsmith/ads"; import { useIsMobileDevice } from "utils/hooks/useDeviceDetect"; interface ApplicationNameProps { diff --git a/app/client/src/pages/AppViewer/Navigation/components/BackToAppsButton.tsx b/app/client/src/pages/AppViewer/Navigation/components/BackToAppsButton.tsx index 92c3ecb12b..1610cda872 100644 --- a/app/client/src/pages/AppViewer/Navigation/components/BackToAppsButton.tsx +++ b/app/client/src/pages/AppViewer/Navigation/components/BackToAppsButton.tsx @@ -13,7 +13,7 @@ import styled from "styled-components"; import { getCurrentUser } from "selectors/usersSelectors"; import type { User } from "constants/userConstants"; import { ANONYMOUS_USERNAME } from "constants/userConstants"; -import { Icon, Tooltip } from "design-system"; +import { Icon, Tooltip } from "@appsmith/ads"; interface BackToAppsButtonProps { currentApplicationDetails?: ApplicationPayload; diff --git a/app/client/src/pages/AppViewer/Navigation/components/MobileNavToggle.tsx b/app/client/src/pages/AppViewer/Navigation/components/MobileNavToggle.tsx index fb2b17c462..9666431786 100644 --- a/app/client/src/pages/AppViewer/Navigation/components/MobileNavToggle.tsx +++ b/app/client/src/pages/AppViewer/Navigation/components/MobileNavToggle.tsx @@ -1,7 +1,7 @@ import React from "react"; import { getMenuItemTextColor } from "pages/AppViewer/utils"; import type { NavigationSetting } from "constants/AppConstants"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; interface MobileNavToggleProps { isMenuOpen: boolean; diff --git a/app/client/src/pages/AppViewer/Navigation/components/MoreDropdownButton.tsx b/app/client/src/pages/AppViewer/Navigation/components/MoreDropdownButton.tsx index fe8ce9b1e8..9ef093650e 100644 --- a/app/client/src/pages/AppViewer/Navigation/components/MoreDropdownButton.tsx +++ b/app/client/src/pages/AppViewer/Navigation/components/MoreDropdownButton.tsx @@ -4,7 +4,7 @@ import { NAVIGATION_SETTINGS } from "constants/AppConstants"; import { get } from "lodash"; import { useSelector } from "react-redux"; import { getSelectedAppTheme } from "selectors/appThemingSelectors"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import MenuText from "./MenuText"; import classNames from "classnames"; import { diff --git a/app/client/src/pages/AppViewer/Navigation/components/ShareButton.tsx b/app/client/src/pages/AppViewer/Navigation/components/ShareButton.tsx index fe615be307..8dc30737a5 100644 --- a/app/client/src/pages/AppViewer/Navigation/components/ShareButton.tsx +++ b/app/client/src/pages/AppViewer/Navigation/components/ShareButton.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; import Button from "../../AppViewerButton"; -import { Icon, Tooltip } from "design-system"; +import { Icon, Tooltip } from "@appsmith/ads"; import AppInviteUsersForm from "pages/workspace/AppInviteUsersForm"; import { useSelector } from "react-redux"; import { getSelectedAppTheme } from "selectors/appThemingSelectors"; diff --git a/app/client/src/pages/AppViewer/PrimaryCTA.tsx b/app/client/src/pages/AppViewer/PrimaryCTA.tsx index 88e22cef17..2f97cc01c5 100644 --- a/app/client/src/pages/AppViewer/PrimaryCTA.tsx +++ b/app/client/src/pages/AppViewer/PrimaryCTA.tsx @@ -21,7 +21,7 @@ import { viewerURL } from "ee/RouteBuilder"; import { useHistory, useLocation } from "react-router"; import { useHref } from "pages/Editor/utils"; import type { NavigationSetting } from "constants/AppConstants"; -import { Icon, Tooltip } from "design-system"; +import { Icon, Tooltip } from "@appsmith/ads"; import { getApplicationNameTextColor } from "./utils"; import { ButtonVariantTypes } from "components/constants"; import { setPreviewModeInitAction } from "actions/editorActions"; diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx index 894d6bb4e6..87dbf30e3c 100644 --- a/app/client/src/pages/Applications/ApplicationCard.tsx +++ b/app/client/src/pages/Applications/ApplicationCard.tsx @@ -25,7 +25,7 @@ import { IconSelector, SavingState, } from "@appsmith/ads-old"; -import type { MenuItemProps } from "design-system"; +import type { MenuItemProps } from "@appsmith/ads"; import { Button, Menu, @@ -33,7 +33,7 @@ import { MenuContent, MenuItem, MenuTrigger, -} from "design-system"; +} from "@appsmith/ads"; import { useDispatch, useSelector } from "react-redux"; import type { ApplicationPagePayload, @@ -48,7 +48,7 @@ import { getExportAppAPIRoute } from "ee/constants/ApiConstants"; import { builderURL, viewerURL } from "ee/RouteBuilder"; import history from "utils/history"; import urlBuilder from "ee/entities/URLRedirect/URLAssembly"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { getCurrentUser } from "actions/authActions"; import Card, { ContextMenuTrigger } from "components/common/Card"; import { generateEditedByText } from "./helpers"; diff --git a/app/client/src/pages/Applications/CommonElements.tsx b/app/client/src/pages/Applications/CommonElements.tsx index f675df2a93..bff3ec9d1c 100644 --- a/app/client/src/pages/Applications/CommonElements.tsx +++ b/app/client/src/pages/Applications/CommonElements.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { Classes as BlueprintClasses } from "@blueprintjs/core"; type ResourceHeadingProps = React.PropsWithChildren<{ diff --git a/app/client/src/pages/Applications/EmbedSnippet/DimensionsInput.tsx b/app/client/src/pages/Applications/EmbedSnippet/DimensionsInput.tsx index 2f96cb9410..2b3ad0fa1b 100644 --- a/app/client/src/pages/Applications/EmbedSnippet/DimensionsInput.tsx +++ b/app/client/src/pages/Applications/EmbedSnippet/DimensionsInput.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Input } from "design-system"; +import { Input } from "@appsmith/ads"; const StyledInput = styled(Input)` > .ads-v2-input__input-section > div { diff --git a/app/client/src/pages/Applications/EmbedSnippet/PrivateEmbeddingContent.tsx b/app/client/src/pages/Applications/EmbedSnippet/PrivateEmbeddingContent.tsx index 7cf917f87d..d75bea78d6 100644 --- a/app/client/src/pages/Applications/EmbedSnippet/PrivateEmbeddingContent.tsx +++ b/app/client/src/pages/Applications/EmbedSnippet/PrivateEmbeddingContent.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Text, Link, Button, Icon } from "design-system"; +import { Text, Link, Button, Icon } from "@appsmith/ads"; import { createMessage, IN_APP_EMBED_SETTING } from "ee/constants/messages"; import { isPermitted, PERMISSION_TYPE } from "ee/utils/permissionHelpers"; import { diff --git a/app/client/src/pages/Applications/EmbedSnippet/Snippet.tsx b/app/client/src/pages/Applications/EmbedSnippet/Snippet.tsx index 69f58e8a01..55cae45f77 100644 --- a/app/client/src/pages/Applications/EmbedSnippet/Snippet.tsx +++ b/app/client/src/pages/Applications/EmbedSnippet/Snippet.tsx @@ -2,7 +2,7 @@ import React from "react"; import copy from "copy-to-clipboard"; import { createMessage, IN_APP_EMBED_SETTING } from "ee/constants/messages"; import styled from "styled-components"; -import { Icon, Text, toast } from "design-system"; +import { Icon, Text, toast } from "@appsmith/ads"; const StyledText = styled(Text)``; diff --git a/app/client/src/pages/Applications/ForkApplicationModal.tsx b/app/client/src/pages/Applications/ForkApplicationModal.tsx index 38b647e0ff..fa4327ef47 100644 --- a/app/client/src/pages/Applications/ForkApplicationModal.tsx +++ b/app/client/src/pages/Applications/ForkApplicationModal.tsx @@ -11,7 +11,7 @@ import { Spinner, Select, Option, -} from "design-system"; +} from "@appsmith/ads"; import { ButtonWrapper, SpinnerWrapper } from "./ForkModalStyles"; import { CANCEL, diff --git a/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx b/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx index 2b04dba363..5c570a0e5e 100644 --- a/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx +++ b/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx @@ -2,7 +2,7 @@ import React, { useState, useRef, useEffect, useCallback } from "react"; import styled from "styled-components"; import moment from "moment"; import "@github/g-emoji-element"; -import { Divider, Text, Button, Tag } from "design-system"; +import { Divider, Text, Button, Tag } from "@appsmith/ads"; const StyledContainer = styled.div` color: ${(props) => props.theme.colors.text.normal}; diff --git a/app/client/src/pages/Applications/ProductUpdatesModal/UpdatesButton.tsx b/app/client/src/pages/Applications/ProductUpdatesModal/UpdatesButton.tsx index 8abfcb873c..d5dbd43ffc 100644 --- a/app/client/src/pages/Applications/ProductUpdatesModal/UpdatesButton.tsx +++ b/app/client/src/pages/Applications/ProductUpdatesModal/UpdatesButton.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import { Colors } from "constants/Colors"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; const StyledUpdatesButton = styled.div` position: absolute; diff --git a/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx b/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx index 8b83e97148..6671e7fcc2 100644 --- a/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx +++ b/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx @@ -8,7 +8,7 @@ import { resetReleasesCount } from "actions/releasesActions"; import type { Release } from "./ReleaseComponent"; import ReleaseComponent from "./ReleaseComponent"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; -import { Modal, ModalBody, ModalContent, ModalHeader } from "design-system"; +import { Modal, ModalBody, ModalContent, ModalHeader } from "@appsmith/ads"; import { isAirgapped } from "ee/utils/airgapHelpers"; const Container = styled.div` diff --git a/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx b/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx index b0e310cc1e..f59b6a2029 100644 --- a/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx +++ b/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx @@ -15,7 +15,7 @@ import { } from "ee/constants/messages"; import StoreAsDatasource from "components/editorComponents/StoreAsDatasource"; import { getCurrentAppWorkspace } from "ee/selectors/selectedWorkspaceSelectors"; -import { Icon, Text } from "design-system"; +import { Icon, Text } from "@appsmith/ads"; import { getCurrentEnvironmentId } from "ee/selectors/environmentSelectors"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; diff --git a/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx b/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx index 689e1c1c4e..0bd2e93cff 100644 --- a/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx +++ b/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx @@ -12,7 +12,7 @@ import { setApiRightPaneSelectedTab } from "actions/apiPaneActions"; import { useDispatch, useSelector } from "react-redux"; import { getApiRightPaneSelectedTab } from "selectors/apiPaneSelectors"; import isUndefined from "lodash/isUndefined"; -import { Button, Tab, TabPanel, Tabs, TabsList, Tag } from "design-system"; +import { Button, Tab, TabPanel, Tabs, TabsList, Tag } from "@appsmith/ads"; import type { Datasource } from "entities/Datasource"; import { getCurrentEnvironmentId } from "ee/selectors/environmentSelectors"; import type { SuggestedWidget } from "api/ActionAPI"; diff --git a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx index b4755ad941..0f4ec5387b 100644 --- a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx +++ b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx @@ -34,7 +34,7 @@ import { TabPanel, Tooltip, Text, -} from "design-system"; +} from "@appsmith/ads"; import { API_EDITOR_TAB_TITLES, API_PANE_AUTO_GENERATED_HEADER, diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx index bc5861f4a0..992c3d24d5 100644 --- a/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx +++ b/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx @@ -21,7 +21,7 @@ import { } from "utils/editor/EditorBindingPaths"; import { log } from "loglevel"; import { PaginationSubComponent } from "components/formControls/utils"; -import { Select, Option, Checkbox, Text, Tooltip, Link } from "design-system"; +import { Select, Option, Checkbox, Text, Tooltip, Link } from "@appsmith/ads"; const PAGINATION_PREFIX = "actionConfiguration.pluginSpecifiedTemplates[2].value"; diff --git a/app/client/src/pages/Editor/APIEditor/Pagination.tsx b/app/client/src/pages/Editor/APIEditor/Pagination.tsx index be79bf3a08..d188cd0aa5 100644 --- a/app/client/src/pages/Editor/APIEditor/Pagination.tsx +++ b/app/client/src/pages/Editor/APIEditor/Pagination.tsx @@ -6,7 +6,7 @@ import FormRow from "components/editorComponents/FormRow"; import { PaginationType } from "entities/Action"; import RadioFieldGroup from "components/editorComponents/form/fields/RadioGroupField"; import { Classes, Text, TextType } from "@appsmith/ads-old"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; import { CodeEditorBorder } from "components/editorComponents/CodeEditor/EditorConfig"; import { GifPlayer } from "@appsmith/ads-old"; diff --git a/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx b/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx index 800b8071fc..a874d99c8a 100644 --- a/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx +++ b/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx @@ -23,7 +23,7 @@ import { updateBodyContentType } from "actions/apiPaneActions"; import type { CodeEditorExpected } from "components/editorComponents/CodeEditor"; import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType"; import { createMessage, API_PANE_NO_BODY } from "ee/constants/messages"; -import { Select, Option } from "design-system"; +import { Select, Option } from "@appsmith/ads"; const PostBodyContainer = styled.div` display: flex; diff --git a/app/client/src/pages/Editor/APIEditor/index.tsx b/app/client/src/pages/Editor/APIEditor/index.tsx index 8efdb92483..9288eef2ef 100644 --- a/app/client/src/pages/Editor/APIEditor/index.tsx +++ b/app/client/src/pages/Editor/APIEditor/index.tsx @@ -36,7 +36,7 @@ import ConvertToModuleInstanceCTA from "ee/pages/Editor/EntityEditor/ConvertToMo import { MODULE_TYPE } from "ee/constants/ModuleConstants"; import Disabler from "pages/common/Disabler"; import ConvertEntityNotification from "ee/pages/common/ConvertEntityNotification"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import { resolveIcon } from "../utils"; import { ENTITY_ICON_SIZE, EntityIcon } from "../Explorer/ExplorerIcons"; import { getIDEViewMode } from "selectors/ideSelectors"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/DraggablePageList.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/DraggablePageList.tsx index 74c0433987..459ffb8e9b 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/DraggablePageList.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/DraggablePageList.tsx @@ -7,7 +7,7 @@ import { MenuIcons } from "icons/MenuIcons"; import React, { useRef } from "react"; import { useDispatch, useSelector } from "react-redux"; import { getCurrentApplicationId } from "selectors/editorSelectors"; -import { Flex, Icon } from "design-system"; +import { Flex, Icon } from "@appsmith/ads"; const DefaultPageIcon = MenuIcons.DEFAULT_HOMEPAGE_ICON; const PageIcon = MenuIcons.PAGE_ICON; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/MakeApplicationForkable.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/MakeApplicationForkable.tsx index 6ef5d118af..e4c2d7b1af 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/MakeApplicationForkable.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/MakeApplicationForkable.tsx @@ -8,7 +8,7 @@ import { Text, Button, Switch, -} from "design-system"; +} from "@appsmith/ads"; import { createMessage, IN_APP_EMBED_SETTING } from "ee/constants/messages"; import PropertyHelpLabel from "pages/Editor/PropertyPane/PropertyHelpLabel"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx index 74c6f4fb56..681266da5f 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx @@ -1,5 +1,5 @@ import { changeAppViewAccessInit } from "ee/actions/applicationActions"; -import { Switch, Divider } from "design-system"; +import { Switch, Divider } from "@appsmith/ads"; import React from "react"; import { useDispatch, useSelector } from "react-redux"; import { diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/GeneralSettings.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/GeneralSettings.tsx index d0381b77e4..fb7021edf7 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/GeneralSettings.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/GeneralSettings.tsx @@ -7,7 +7,7 @@ import { } from "ee/constants/messages"; import classNames from "classnames"; import type { AppIconName } from "@appsmith/ads-old"; -import { Input, Text } from "design-system"; +import { Input, Text } from "@appsmith/ads"; import { IconSelector } from "@appsmith/ads-old"; import { debounce } from "lodash"; import React, { useCallback, useState } from "react"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/ImportAppSettings.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/ImportAppSettings.tsx index ea2165fb10..1f8e9450bc 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/ImportAppSettings.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/ImportAppSettings.tsx @@ -3,7 +3,7 @@ import { createMessage, } from "ee/constants/messages"; import { getCurrentAppWorkspace } from "ee/selectors/selectedWorkspaceSelectors"; -import { Text, Button } from "design-system"; +import { Text, Button } from "@appsmith/ads"; import ImportModal from "pages/common/ImportModal"; import React from "react"; import { useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ButtonGroupSetting.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ButtonGroupSetting.tsx index c57abcc206..609af9894b 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ButtonGroupSetting.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ButtonGroupSetting.tsx @@ -1,8 +1,8 @@ import React from "react"; import styled from "styled-components"; import { TextType, Text } from "@appsmith/ads-old"; -import type { SegmentedControlOption } from "design-system"; -import { SegmentedControl } from "design-system"; +import type { SegmentedControlOption } from "@appsmith/ads"; +import { SegmentedControl } from "@appsmith/ads"; import type { NavigationSetting, StringsFromNavigationSetting, diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ImageInput.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ImageInput.tsx index d986f4a938..2ee241f465 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ImageInput.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ImageInput.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from "react"; import { useSelector } from "react-redux"; import styled from "styled-components"; import classNames from "classnames"; -import { Button, Spinner } from "design-system"; +import { Button, Spinner } from "@appsmith/ads"; import { getAssetUrl } from "ee/utils/airgapHelpers"; import { getIsDeletingNavigationLogo, diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/SwitchSetting.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/SwitchSetting.tsx index 3033d9c133..17dc69dab9 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/SwitchSetting.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/SwitchSetting.tsx @@ -4,7 +4,7 @@ import type { StringsFromNavigationSetting, } from "constants/AppConstants"; import StyledPropertyHelpLabel from "./StyledPropertyHelpLabel"; -import { Switch } from "design-system"; +import { Switch } from "@appsmith/ads"; import type { UpdateSetting } from "."; import kebabCase from "lodash/kebabCase"; import { logEvent } from "./utils"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/SwitchSettingForLogoConfiguration.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/SwitchSettingForLogoConfiguration.tsx index 648d08c068..9e294c9c40 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/SwitchSettingForLogoConfiguration.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/SwitchSettingForLogoConfiguration.tsx @@ -1,6 +1,6 @@ import React from "react"; import type { Dispatch, SetStateAction } from "react"; -import { Switch } from "design-system"; +import { Switch } from "@appsmith/ads"; import type { LogoConfigurationSwitches } from "."; import kebabCase from "lodash/kebabCase"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/index.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/index.tsx index 5139681051..e5204e386c 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/index.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/index.tsx @@ -17,7 +17,7 @@ import type { UpdateApplicationPayload } from "ee/api/ApplicationApi"; import equal from "fast-deep-equal"; import { getCurrentApplicationId } from "selectors/editorSelectors"; import { updateApplication } from "ee/actions/applicationActions"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; import LogoInput from "pages/Editor/NavigationSettings/LogoInput"; import SwitchSettingForLogoConfiguration from "./SwitchSettingForLogoConfiguration"; import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts index b2faf06494..bb527a07db 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts @@ -5,7 +5,7 @@ import type { import { keysOfNavigationSetting } from "constants/AppConstants"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { APP_NAVIGATION_SETTING, createMessage } from "ee/constants/messages"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; export const logEvent = ( keyName: keyof StringsFromNavigationSetting, diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/PageSettings.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/PageSettings.tsx index 6052eb93bd..13ee62cc18 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/PageSettings.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/PageSettings.tsx @@ -17,7 +17,7 @@ import { } from "ee/constants/messages"; import type { Page } from "ee/constants/ReduxActionConstants"; import classNames from "classnames"; -import { Input, Switch } from "design-system"; +import { Input, Switch } from "@appsmith/ads"; import ManualUpgrades from "components/BottomBar/ManualUpgrades"; import PropertyHelpLabel from "pages/Editor/PropertyPane/PropertyHelpLabel"; import React, { useCallback, useEffect, useState } from "react"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/SectionHeader.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/SectionHeader.tsx index 25caba7e6f..c48ad80ee1 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/SectionHeader.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/SectionHeader.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; export interface SectionHeaderProps { id: string; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx index 1ecee86df9..c44a374889 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx @@ -29,7 +29,7 @@ import EmbedSettings from "./EmbedSettings"; import NavigationSettings from "./NavigationSettings"; import { updateAppSettingsPaneSelectedTabAction } from "actions/appSettingsPaneActions"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { Divider } from "design-system"; +import { Divider } from "@appsmith/ads"; import { ImportAppSettings } from "./ImportAppSettings"; import { getIsAnvilLayout } from "layoutSystems/anvil/integrations/selectors"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/Components/TextLoaderIcon.tsx b/app/client/src/pages/Editor/AppSettingsPane/Components/TextLoaderIcon.tsx index 693e21b903..208a2149e5 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/Components/TextLoaderIcon.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/Components/TextLoaderIcon.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; import React from "react"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; const Wrapper = styled.div` position: absolute; diff --git a/app/client/src/pages/Editor/AppsmithLink.tsx b/app/client/src/pages/Editor/AppsmithLink.tsx index b39a76c418..7d458ebbfd 100644 --- a/app/client/src/pages/Editor/AppsmithLink.tsx +++ b/app/client/src/pages/Editor/AppsmithLink.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Link, Tooltip } from "design-system"; +import { Link, Tooltip } from "@appsmith/ads"; import styled from "styled-components"; import { LOGO_TOOLTIP, createMessage } from "ee/constants/messages"; import { APPLICATIONS_URL } from "constants/routes"; diff --git a/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionButton.tsx b/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionButton.tsx index 14ddfd8f1f..46f3fb9282 100644 --- a/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionButton.tsx +++ b/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionButton.tsx @@ -6,7 +6,7 @@ import { ModalContent, ModalHeader, ModalBody, -} from "design-system"; +} from "@appsmith/ads"; import { ConversionForm } from "./ConversionForm"; import { useDispatch, useSelector } from "react-redux"; import { getIsAutoLayout } from "selectors/canvasSelectors"; diff --git a/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionCompleteLayout.tsx b/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionCompleteLayout.tsx index aef3493263..cc83948d53 100644 --- a/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionCompleteLayout.tsx +++ b/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionCompleteLayout.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; -import { Callout, Icon, Text } from "design-system"; +import { Callout, Icon, Text } from "@appsmith/ads"; import { AlertType } from "reducers/uiReducers/layoutConversionReducer"; const AlertIcons = { diff --git a/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionForm.tsx b/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionForm.tsx index 69be2ecf10..4122d3b619 100644 --- a/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionForm.tsx +++ b/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionForm.tsx @@ -2,7 +2,7 @@ import React from "react"; import styled from "styled-components"; import type { InfoBlockProps } from "./InfoBlock"; import { InfoBlock } from "./InfoBlock"; -import type { CalloutKind, SegmentedControlOption } from "design-system"; +import type { CalloutKind, SegmentedControlOption } from "@appsmith/ads"; import { Button, SegmentedControl, @@ -10,7 +10,7 @@ import { Callout, Icon, Text, -} from "design-system"; +} from "@appsmith/ads"; import type { ConversionCompleteLayoutProps } from "./ConversionCompleteLayout"; import { ConversionCompleteLayout } from "./ConversionCompleteLayout"; diff --git a/app/client/src/pages/Editor/CanvasLayoutConversion/InfoBlock.tsx b/app/client/src/pages/Editor/CanvasLayoutConversion/InfoBlock.tsx index a67ebf5a26..b24bc38fc5 100644 --- a/app/client/src/pages/Editor/CanvasLayoutConversion/InfoBlock.tsx +++ b/app/client/src/pages/Editor/CanvasLayoutConversion/InfoBlock.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Icon, Text } from "design-system"; +import { Icon, Text } from "@appsmith/ads"; export interface InfoBlockProps { icon: string; diff --git a/app/client/src/pages/Editor/CanvasLayoutConversion/SnapShotBannerCTA.tsx b/app/client/src/pages/Editor/CanvasLayoutConversion/SnapShotBannerCTA.tsx index e7e9420617..0b2b598f0c 100644 --- a/app/client/src/pages/Editor/CanvasLayoutConversion/SnapShotBannerCTA.tsx +++ b/app/client/src/pages/Editor/CanvasLayoutConversion/SnapShotBannerCTA.tsx @@ -25,7 +25,7 @@ import { ModalBody, Callout, Text, -} from "design-system"; +} from "@appsmith/ads"; import { getReadableSnapShotDetails } from "../../../layoutSystems/autolayout/utils/AutoLayoutUtils"; import { getSnapshotUpdatedTime } from "selectors/autoLayoutSelectors"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/CommunityTemplatesPublishInfo.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/CommunityTemplatesPublishInfo.tsx index 7977de378c..2c5220ca5a 100644 --- a/app/client/src/pages/Editor/CommunityTemplates/Modals/CommunityTemplatesPublishInfo.tsx +++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/CommunityTemplatesPublishInfo.tsx @@ -5,7 +5,7 @@ import { } from "ee/constants/messages"; import { getCurrentApplication } from "ee/selectors/applicationSelectors"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; -import { Button, Icon, Text } from "design-system"; +import { Button, Icon, Text } from "@appsmith/ads"; import React, { useCallback, useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx index 0af0b6a52f..857824400f 100644 --- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx +++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx @@ -1,6 +1,6 @@ import { COMMUNITY_TEMPLATES, createMessage } from "ee/constants/messages"; import { publishCommunityTemplate } from "actions/communityTemplateActions"; -import { Button, Checkbox } from "design-system"; +import { Button, Checkbox } from "@appsmith/ads"; import React, { useEffect, useMemo, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { getCurrentBasePageId } from "selectors/editorSelectors"; diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/ApplicationSettings.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/ApplicationSettings.tsx index 1996bff432..1cbd8e008f 100644 --- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/ApplicationSettings.tsx +++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/ApplicationSettings.tsx @@ -1,5 +1,5 @@ import { COMMUNITY_TEMPLATES, createMessage } from "ee/constants/messages"; -import { Switch, Text } from "design-system"; +import { Switch, Text } from "@appsmith/ads"; import React from "react"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/AuthorDetailsInput.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/AuthorDetailsInput.tsx index 862b915df5..307627c785 100644 --- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/AuthorDetailsInput.tsx +++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/AuthorDetailsInput.tsx @@ -3,7 +3,7 @@ import { FORM_VALIDATION_INVALID_EMAIL, createMessage, } from "ee/constants/messages"; -import { Input, Text } from "design-system"; +import { Input, Text } from "@appsmith/ads"; import { emailValidator } from "@appsmith/ads-old"; import React, { useMemo } from "react"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/PublishedInfo.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/PublishedInfo.tsx index edd49830d4..0243a5b0bd 100644 --- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/PublishedInfo.tsx +++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/PublishedInfo.tsx @@ -1,5 +1,5 @@ import { COMMUNITY_TEMPLATES, createMessage } from "ee/constants/messages"; -import { Icon, Text } from "design-system"; +import { Icon, Text } from "@appsmith/ads"; import React, { useCallback } from "react"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateCardPreview.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateCardPreview.tsx index f0f0352473..6ec500a1f0 100644 --- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateCardPreview.tsx +++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateCardPreview.tsx @@ -1,5 +1,5 @@ import { COMMUNITY_TEMPLATES, createMessage } from "ee/constants/messages"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import ProfileImage from "pages/common/ProfileImage"; import React from "react"; import { useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateInfoForm.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateInfoForm.tsx index 67b28a2661..e379332eaa 100644 --- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateInfoForm.tsx +++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateInfoForm.tsx @@ -4,7 +4,7 @@ import { TemplateInfoFormFieldWrapper, TemplateInfoFormWrapper, } from "../StyledComponents"; -import { Input, Select, Option } from "design-system"; +import { Input, Select, Option } from "@appsmith/ads"; import { COMMUNITY_TEMPLATES, createMessage } from "ee/constants/messages"; import { useSelector } from "react-redux"; import { allTemplatesFiltersSelector } from "selectors/templatesSelectors"; diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/index.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/index.tsx index 3883a0ba52..4dff0bc7ac 100644 --- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/index.tsx +++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/index.tsx @@ -5,7 +5,7 @@ import { ModalContent, ModalHeader, Text, -} from "design-system"; +} from "@appsmith/ads"; import React from "react"; import CommunityTemplateForm from "./CommunityTemplateForm"; import { PublishPageHeaderContainer } from "./StyledComponents"; diff --git a/app/client/src/pages/Editor/CurlImport/ModalControls.tsx b/app/client/src/pages/Editor/CurlImport/ModalControls.tsx index b1a41b0c73..df0e15ed55 100644 --- a/app/client/src/pages/Editor/CurlImport/ModalControls.tsx +++ b/app/client/src/pages/Editor/CurlImport/ModalControls.tsx @@ -17,7 +17,7 @@ import { ModalContent, ModalFooter, ModalHeader, -} from "design-system"; +} from "@appsmith/ads"; import styled from "styled-components"; const ActionButtons = styled.div` diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/HTMLEditor.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/HTMLEditor.tsx index e74a1493a8..f3c185643b 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/HTMLEditor.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/HTMLEditor.tsx @@ -11,7 +11,7 @@ import { import { CustomWidgetBuilderContext } from "../.."; import LazyCodeEditor from "components/editorComponents/LazyCodeEditor"; import styles from "./styles.module.css"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; import { CUSTOM_WIDGET_FEATURE, createMessage } from "ee/constants/messages"; export default function HTMLEditor(props: ContentProps) { diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/JSEditor.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/JSEditor.tsx index 0c0f0d3662..d5c78aa821 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/JSEditor.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/JSEditor.tsx @@ -15,7 +15,7 @@ import { getAppsmithScriptSchema } from "widgets/CustomWidget/component/constant // import { PropertyEvaluationErrorType } from "utils/DynamicBindingUtils"; // import { Severity } from "entities/AppsmithConsole"; import CodemirrorTernService from "utils/autocomplete/CodemirrorTernService"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; import { CUSTOM_WIDGET_FEATURE, createMessage } from "ee/constants/messages"; import { DebuggerLogType } from "../../types"; import type { LintError } from "utils/DynamicBindingUtils"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/StyleEditor.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/StyleEditor.tsx index e2637d006b..2d404979eb 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/StyleEditor.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/StyleEditor.tsx @@ -9,7 +9,7 @@ import { } from "components/editorComponents/CodeEditor/EditorConfig"; import { CustomWidgetBuilderContext } from "../.."; import LazyCodeEditor from "components/editorComponents/LazyCodeEditor"; -import { Icon, Tooltip, Spinner } from "design-system"; +import { Icon, Tooltip, Spinner } from "@appsmith/ads"; import styles from "./styles.module.css"; import { CUSTOM_WIDGET_FEATURE, createMessage } from "ee/constants/messages"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx index 76b45ee826..0fda263bf2 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx @@ -11,7 +11,7 @@ import { ModalBody, ModalFooter, Text, -} from "design-system"; +} from "@appsmith/ads"; import React, { useContext, useState } from "react"; import codeTemplates from "./Templates"; import { CustomWidgetBuilderContext } from "pages/Editor/CustomWidgetBuilder"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx index 0a843a4afe..1b748d6c58 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx @@ -1,4 +1,4 @@ -import { SegmentedControl } from "design-system"; +import { SegmentedControl } from "@appsmith/ads"; import React, { useContext } from "react"; import { CustomWidgetBuilderContext } from "../.."; import styles from "./styles.module.css"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx index 665f38b3e8..5db61407c1 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx @@ -1,4 +1,4 @@ -import { Icon, Tooltip } from "design-system"; +import { Icon, Tooltip } from "@appsmith/ads"; import React, { useContext } from "react"; import { CustomWidgetBuilderContext } from "../.."; import styles from "./styles.module.css"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/SplitLayout/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/SplitLayout/index.tsx index 804fc8ce89..9f0b9d6f2f 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/SplitLayout/index.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/SplitLayout/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useMemo, useRef, useState } from "react"; import styles from "./styles.module.css"; import type { ContentProps } from "../../CodeEditors/types"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import { set } from "lodash"; import classNames from "classnames"; import { useLocalStorage } from "utils/hooks/localstorage"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/TabsLayout/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/TabsLayout/index.tsx index 329f861f59..42bab0b497 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/TabsLayout/index.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Layouts/TabsLayout/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useRef, useState } from "react"; import styles from "./styles.module.css"; -import { Tab, TabPanel, Tabs, TabsList } from "design-system"; +import { Tab, TabPanel, Tabs, TabsList } from "@appsmith/ads"; import type { ContentProps } from "../../CodeEditors/types"; import useLocalStorageState from "utils/hooks/useLocalStorageState"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/collapsible.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/collapsible.tsx index c89a8920b4..a42bba322b 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/collapsible.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/collapsible.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; import styles from "./styles.module.css"; -import { Icon, Tooltip } from "design-system"; +import { Icon, Tooltip } from "@appsmith/ads"; interface Props { label: string; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx index adc8175019..1b433b76fb 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useContext, useState } from "react"; import styles from "./styles.module.css"; -import { Icon, Text } from "design-system"; +import { Icon, Text } from "@appsmith/ads"; import { EditorModes, EditorSize, diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/help.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/help.tsx index d930ca5c17..12fc623036 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/help.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/help.tsx @@ -1,4 +1,4 @@ -import { Button, Text } from "design-system"; +import { Button, Text } from "@appsmith/ads"; import styles from "./styles.module.css"; import React from "react"; import { CUSTOM_WIDGET_FEATURE, createMessage } from "ee/constants/messages"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/counter.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/counter.tsx index cba4a5f082..060332ed4f 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/counter.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/counter.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import styles from "./styles.module.css"; export default function Counter(props: { diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/debuggerItem.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/debuggerItem.tsx index e2656bcdf3..bd21c156f4 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/debuggerItem.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/debuggerItem.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import styles from "./styles.module.css"; import HelpDropdown from "./helpDropdown"; import { DebuggerLogType, type DebuggerLog } from "../../types"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/helpDropdown.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/helpDropdown.tsx index 296bdf7d97..e050643192 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/helpDropdown.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/helpDropdown.tsx @@ -6,7 +6,7 @@ import { PopoverTrigger, PopoverContent, List, -} from "design-system"; +} from "@appsmith/ads"; import styles from "./styles.module.css"; import type { DebuggerLog } from "../../types"; import { CUSTOM_WIDGET_FEATURE, createMessage } from "ee/constants/messages"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx index 765dd020ad..decb0d9569 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useContext, useEffect } from "react"; -import { Tabs, TabsList, Tab, TabPanel, Icon, Tooltip } from "design-system"; +import { Tabs, TabsList, Tab, TabPanel, Icon, Tooltip } from "@appsmith/ads"; import DebuggerItem from "./debuggerItem"; import styles from "./styles.module.css"; import Counter from "./counter"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/index.tsx index 376505d7c0..6a120df32a 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/index.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/index.tsx @@ -1,7 +1,7 @@ import React, { useContext, useEffect, useRef, useState } from "react"; import CustomComponent from "widgets/CustomWidget/component"; import { CustomWidgetBuilderContext } from "../index"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import Debugger from "./Debugger"; import { CUSTOM_WIDGET_FEATURE, createMessage } from "ee/constants/messages"; import type { AppThemeProperties } from "entities/AppTheming"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/header.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/header.tsx index fc66ea0198..08256ec204 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/header.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/header.tsx @@ -7,7 +7,7 @@ import { } from "../commons/EditorHeaderComponents"; import { AppsmithLink } from "../AppsmithLink"; import styles from "./styles.module.css"; -import { Button, Icon, Text } from "design-system"; +import { Button, Icon, Text } from "@appsmith/ads"; import clsx from "clsx"; import { CustomWidgetBuilderContext } from "."; import { createMessage, CUSTOM_WIDGET_FEATURE } from "ee/constants/messages"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/index.tsx index be66f0c99b..cb3b72a461 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/index.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/index.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useRef } from "react"; import Header from "./header"; import styles from "./styles.module.css"; import Preview from "./Preview"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; import Editor from "./Editor"; import type { CustomWidgetBuilderContextType } from "./types"; import ConnectionLost from "./connectionLost"; diff --git a/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx b/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx index 07157ef815..37aa986b67 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx @@ -5,7 +5,7 @@ import { builderURL, generateTemplateFormURL } from "ee/RouteBuilder"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { useSelector } from "react-redux"; import { getCurrentBasePageId } from "selectors/editorSelectors"; -import { Link } from "design-system"; +import { Link } from "@appsmith/ads"; import type { AppsmithLocationState } from "utils/history"; import { NavigationMethod } from "utils/history"; import { useHistory } from "react-router-dom"; diff --git a/app/client/src/pages/Editor/DataSourceEditor/Collapsible.tsx b/app/client/src/pages/Editor/DataSourceEditor/Collapsible.tsx index b7a7cf08d3..a35c0b9646 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/Collapsible.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/Collapsible.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; const SectionLabel = styled.div` font-weight: 500; diff --git a/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx index 1ce1327fba..e6670a12e3 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx @@ -15,7 +15,7 @@ import type { JSONtoFormProps } from "./JSONtoForm"; import { JSONtoForm } from "./JSONtoForm"; import { TEMP_DATASOURCE_ID } from "constants/Datasource"; import { DocsLink, openDoc } from "../../../constants/DocumentationLinks"; -import { Callout } from "design-system"; +import { Callout } from "@appsmith/ads"; import store from "store"; const { cloudHosting } = getAppsmithConfigs(); diff --git a/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx b/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx index 5185e9c4a4..2c263cdaaa 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx @@ -17,7 +17,7 @@ import { debounce } from "lodash"; import type { ApiDatasourceForm } from "entities/Datasource/RestAPIForm"; import { MenuWrapper, StyledMenu } from "components/utils/formComponents"; import styled from "styled-components"; -import { Button, MenuContent, MenuItem, MenuTrigger } from "design-system"; +import { Button, MenuContent, MenuItem, MenuTrigger } from "@appsmith/ads"; import { DatasourceEditEntryPoints } from "constants/Datasource"; import { DB_NOT_SUPPORTED, diff --git a/app/client/src/pages/Editor/DataSourceEditor/DatasourceBlankState.tsx b/app/client/src/pages/Editor/DataSourceEditor/DatasourceBlankState.tsx index 9a59c8322d..069fb071ea 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/DatasourceBlankState.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/DatasourceBlankState.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import { importSvg } from "@appsmith/ads-old"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { createMessage, DATASOURCE_BLANK_STATE_MESSAGE, diff --git a/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx b/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx index 63597acf51..e09cacd3a5 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx @@ -19,7 +19,7 @@ import { EnvConfigSection } from "ee/components/EnvConfigSection"; import { getCurrentEnvironmentId } from "ee/selectors/environmentSelectors"; import { isMultipleEnvEnabled } from "ee/utils/planHelpers"; import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { Table } from "@appsmith/ads-old"; const Key = styled.div` diff --git a/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx b/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx index e27bb80273..474f503b30 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx @@ -10,7 +10,7 @@ import { Text, MenuSeparator, Tag, -} from "design-system"; +} from "@appsmith/ads"; import { createMessage, ERROR_ADD_API_INVALID_URL, diff --git a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx index 65b9833e5b..d58092f5ae 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx @@ -9,7 +9,7 @@ import FormControl from "pages/Editor/FormControl"; import { StyledInfo } from "components/formControls/InputTextControl"; import { connect } from "react-redux"; import type { AppState } from "ee/reducers"; -import { Callout } from "design-system"; +import { Callout } from "@appsmith/ads"; import { createDatasourceFromForm, toggleSaveActionFlag, diff --git a/app/client/src/pages/Editor/DataSourceEditor/SaveOrDiscardDatasourceModal.tsx b/app/client/src/pages/Editor/DataSourceEditor/SaveOrDiscardDatasourceModal.tsx index cdbdd28ffd..e5d296e78c 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/SaveOrDiscardDatasourceModal.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/SaveOrDiscardDatasourceModal.tsx @@ -13,7 +13,7 @@ import { ModalFooter, ModalHeader, Text, -} from "design-system"; +} from "@appsmith/ads"; import { TEMP_DATASOURCE_ID } from "constants/Datasource"; import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; diff --git a/app/client/src/pages/Editor/DataSourceEditor/index.tsx b/app/client/src/pages/Editor/DataSourceEditor/index.tsx index 30ed06a79e..ea66049160 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/index.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/index.tsx @@ -59,7 +59,7 @@ import { getQueryParams } from "utils/URLUtils"; import { TEMP_DATASOURCE_ID } from "constants/Datasource"; import SaveOrDiscardDatasourceModal from "./SaveOrDiscardDatasourceModal"; -import { toast, Callout } from "design-system"; +import { toast, Callout } from "@appsmith/ads"; import styled from "styled-components"; import { isDatasourceAuthorizedForQueryCreation, @@ -88,7 +88,7 @@ import { PluginPackageName } from "entities/Action"; import DSDataFilter from "ee/components/DSDataFilter"; import { DEFAULT_ENV_ID } from "ee/api/ApiUtils"; import { isStorageEnvironmentCreated } from "ee/utils/Environments"; -import type { CalloutKind } from "design-system"; +import type { CalloutKind } from "@appsmith/ads"; import type { FeatureFlags } from "ee/entities/FeatureFlag"; import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors"; diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasorceTabs.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasorceTabs.tsx index 388f9710ef..5771adb85d 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasorceTabs.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasorceTabs.tsx @@ -1,6 +1,6 @@ import React from "react"; import { VIEW_MODE_TABS } from "constants/DatasourceEditorConstants"; -import { Tabs, Tab, TabsList, TabPanel } from "design-system"; +import { Tabs, Tab, TabsList, TabPanel } from "@appsmith/ads"; import styled from "styled-components"; import { DATASOURCE_CONFIGURATIONS_TAB, diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceField.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceField.tsx index 0ccf2546e9..ec9fd5e23d 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceField.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceField.tsx @@ -5,7 +5,7 @@ import { } from "../Explorer/ExplorerIcons"; import styled from "styled-components"; import type { DatasourceColumns, DatasourceKeys } from "entities/Datasource"; -import { Tooltip } from "design-system"; +import { Tooltip } from "@appsmith/ads"; import { isEllipsisActive } from "utils/helpers"; const Wrapper = styled.div<{ step: number }>` diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx index 8471e573ba..e5ffc892e2 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx @@ -10,7 +10,7 @@ import { useSelector } from "react-redux"; import type { AppState } from "ee/reducers"; import { getDatasource, getPlugin } from "ee/selectors/entitiesSelector"; import { getPagePermissions } from "selectors/editorSelectors"; -import { Menu, MenuTrigger, Button, Tooltip, MenuContent } from "design-system"; +import { Menu, MenuTrigger, Button, Tooltip, MenuContent } from "@appsmith/ads"; import { SHOW_TEMPLATES, createMessage } from "ee/constants/messages"; import styled from "styled-components"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx index eabe938da3..7d69704b5f 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx @@ -9,7 +9,7 @@ import { DatasourceStructureContext } from "entities/Datasource"; import type { ReactElement } from "react"; import React, { memo, useCallback, useEffect, useState } from "react"; import DatasourceStructure from "./DatasourceStructure"; -import { Button, Flex, SearchInput, Text } from "design-system"; +import { Button, Flex, SearchInput, Text } from "@appsmith/ads"; import { getIsFetchingDatasourceStructure } from "ee/selectors/entitiesSelector"; import { useDispatch, useSelector } from "react-redux"; import type { AppState } from "ee/reducers"; diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureHeader.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureHeader.tsx index 12162178b8..463b978766 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureHeader.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureHeader.tsx @@ -1,6 +1,6 @@ import React, { useCallback } from "react"; import { useDispatch, useSelector } from "react-redux"; -import { Button, Text } from "design-system"; +import { Button, Text } from "@appsmith/ads"; import styled from "styled-components"; import { refreshDatasourceStructure } from "actions/datasourceActions"; import { diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureNotFound.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureNotFound.tsx index aa99fefb86..80e51e02c8 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureNotFound.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureNotFound.tsx @@ -1,7 +1,7 @@ import React from "react"; import { useSelector } from "react-redux"; import styled from "styled-components"; -import { Text, Button } from "design-system"; +import { Text, Button } from "@appsmith/ads"; import type { APIResponseError } from "api/ApiResponses"; import { EDIT_DATASOURCE, createMessage } from "ee/constants/messages"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx index 8b878763a4..f7bb63c49a 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx @@ -8,7 +8,7 @@ import { getSelectedTableName, } from "ee/selectors/entitiesSelector"; import DatasourceStructureHeader from "./DatasourceStructureHeader"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { DATASOURCE_GENERATE_PAGE_BUTTON, createMessage, diff --git a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx index 116db429fd..8eb2e5b019 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx @@ -1,7 +1,7 @@ import React, { useState, useEffect, useRef } from "react"; import { useDispatch, useSelector } from "react-redux"; import type { DropdownOption } from "@appsmith/ads-old"; -import { Button, SearchInput } from "design-system"; +import { Button, SearchInput } from "@appsmith/ads"; import { useSheetData, useSheetsList, diff --git a/app/client/src/pages/Editor/DatasourceInfo/ItemLoadingIndicator.tsx b/app/client/src/pages/Editor/DatasourceInfo/ItemLoadingIndicator.tsx index a25e488eff..4827e6bf81 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/ItemLoadingIndicator.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/ItemLoadingIndicator.tsx @@ -6,7 +6,7 @@ import { GSHEET_SPREADSHEET_LOADING, LOADING_SCHEMA, } from "ee/constants/messages"; -import { Spinner, Text } from "design-system"; +import { Spinner, Text } from "@appsmith/ads"; import { MessageWrapper } from "./SchemaViewModeCSS"; type LoadingItemType = "SPREADSHEET" | "SHEET" | "DATA" | "SCHEMA"; diff --git a/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx b/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx index b2c7880a9a..15e2c13a9a 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx @@ -18,7 +18,7 @@ import { getPlugin, } from "ee/selectors/entitiesSelector"; import { integrationEditorURL } from "ee/RouteBuilder"; -import { MenuItem, Tag } from "design-system"; +import { MenuItem, Tag } from "@appsmith/ads"; import type { Plugin } from "api/PluginApi"; import WalkthroughContext from "components/featureWalkthrough/walkthroughContext"; diff --git a/app/client/src/pages/Editor/DatasourceInfo/RenderInterimDataState.tsx b/app/client/src/pages/Editor/DatasourceInfo/RenderInterimDataState.tsx index 2ca49f28d9..27a65c385e 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/RenderInterimDataState.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/RenderInterimDataState.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Spinner, Text } from "design-system"; +import { Spinner, Text } from "@appsmith/ads"; import { EMPTY_TABLE_TITLE_TEXT, EMPTY_TABLE_MESSAGE_TEXT, diff --git a/app/client/src/pages/Editor/EditorHeader.tsx b/app/client/src/pages/Editor/EditorHeader.tsx index 0febd30ead..e378d7e0e5 100644 --- a/app/client/src/pages/Editor/EditorHeader.tsx +++ b/app/client/src/pages/Editor/EditorHeader.tsx @@ -38,7 +38,7 @@ import { TabsList, Tab, TabPanel, -} from "design-system"; +} from "@appsmith/ads"; import { getTheme, ThemeMode } from "selectors/themeSelectors"; import ToggleModeButton from "pages/Editor/ToggleModeButton"; import { showConnectGitModal } from "actions/gitSyncActions"; diff --git a/app/client/src/pages/Editor/EditorName/NavigationMenu.tsx b/app/client/src/pages/Editor/EditorName/NavigationMenu.tsx index 880f7d942f..f30f69b801 100644 --- a/app/client/src/pages/Editor/EditorName/NavigationMenu.tsx +++ b/app/client/src/pages/Editor/EditorName/NavigationMenu.tsx @@ -3,7 +3,7 @@ import React from "react"; import type { noop } from "lodash"; import type { MenuItemData } from "./NavigationMenuItem"; -import { MenuContent } from "design-system"; +import { MenuContent } from "@appsmith/ads"; import { NavigationMenuItem } from "./NavigationMenuItem"; interface NavigationMenuProps { diff --git a/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx b/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx index cbf5a28574..d0d0caf2e6 100644 --- a/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx +++ b/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx @@ -7,7 +7,7 @@ import { MenuSubTrigger, MenuSubContent, MenuSeparator, -} from "design-system"; +} from "@appsmith/ads"; import type { noop } from "lodash"; import type { CommonComponentProps } from "@appsmith/ads-old"; diff --git a/app/client/src/pages/Editor/EditorName/components.ts b/app/client/src/pages/Editor/EditorName/components.ts index 4d6e26bf71..8152ecf304 100644 --- a/app/client/src/pages/Editor/EditorName/components.ts +++ b/app/client/src/pages/Editor/EditorName/components.ts @@ -1,7 +1,7 @@ import styled from "styled-components"; import { Classes } from "@blueprintjs/core"; import { getTypographyByKey } from "@appsmith/ads-old"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; export const Container = styled.div` display: flex; diff --git a/app/client/src/pages/Editor/EditorName/index.tsx b/app/client/src/pages/Editor/EditorName/index.tsx index e69aae47ed..abb3fd5743 100644 --- a/app/client/src/pages/Editor/EditorName/index.tsx +++ b/app/client/src/pages/Editor/EditorName/index.tsx @@ -8,7 +8,7 @@ import type { import { SavingState } from "@appsmith/ads-old"; import EditableName from "./EditableName"; import { NavigationMenu } from "./NavigationMenu"; -import { Menu, toast, MenuTrigger } from "design-system"; +import { Menu, toast, MenuTrigger } from "@appsmith/ads"; import type { Theme } from "constants/DefaultTheme"; import ForkApplicationModal from "pages/Applications/ForkApplicationModal"; import { Container, StyledIcon } from "./components"; diff --git a/app/client/src/pages/Editor/EditorName/useNavigationMenuData.ts b/app/client/src/pages/Editor/EditorName/useNavigationMenuData.ts index 977201950c..c1001c5501 100644 --- a/app/client/src/pages/Editor/EditorName/useNavigationMenuData.ts +++ b/app/client/src/pages/Editor/EditorName/useNavigationMenuData.ts @@ -20,7 +20,7 @@ import { getCurrentApplication } from "ee/selectors/applicationSelectors"; import { Colors } from "constants/Colors"; import { getCurrentApplicationId } from "selectors/editorSelectors"; import type { ThemeProp } from "WidgetProvider/constants"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { DOCS_BASE_URL } from "constants/ThirdPartyConstants"; import { getAppsmithConfigs } from "ee/configs"; import { getCurrentUser } from "selectors/usersSelectors"; diff --git a/app/client/src/pages/Editor/EditorSaveIndicator.tsx b/app/client/src/pages/Editor/EditorSaveIndicator.tsx index 965fbd5b8c..f442369545 100644 --- a/app/client/src/pages/Editor/EditorSaveIndicator.tsx +++ b/app/client/src/pages/Editor/EditorSaveIndicator.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import { TextType, Text } from "@appsmith/ads-old"; import { Colors } from "constants/Colors"; import { createMessage, EDITOR_HEADER } from "ee/constants/messages"; -import { Icon, Spinner } from "design-system"; +import { Icon, Spinner } from "@appsmith/ads"; const SaveStatusContainer = styled.div` align-items: center; diff --git a/app/client/src/pages/Editor/EditorShareButton.tsx b/app/client/src/pages/Editor/EditorShareButton.tsx index b1b1898734..f0b38106ec 100644 --- a/app/client/src/pages/Editor/EditorShareButton.tsx +++ b/app/client/src/pages/Editor/EditorShareButton.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button, Tooltip } from "design-system"; +import { Button, Tooltip } from "@appsmith/ads"; import { EDITOR_HEADER, SHARE_BUTTON_TOOLTIP, diff --git a/app/client/src/pages/Editor/EntityNotFoundPane.tsx b/app/client/src/pages/Editor/EntityNotFoundPane.tsx index ae260c1298..0884ed068c 100644 --- a/app/client/src/pages/Editor/EntityNotFoundPane.tsx +++ b/app/client/src/pages/Editor/EntityNotFoundPane.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import PageUnavailableImage from "assets/images/invalid-page.png"; import { PAGE_NOT_FOUND_ERROR, diff --git a/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx b/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx index b42be834b6..4311feaf45 100644 --- a/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx @@ -25,7 +25,7 @@ import { MenuSubContent, MenuSubTrigger, MenuTrigger, -} from "design-system"; +} from "@appsmith/ads"; import { useToggle } from "@mantine/hooks"; import { convertToPageIdSelector } from "selectors/pageListSelectors"; diff --git a/app/client/src/pages/Editor/Explorer/ContextMenu.tsx b/app/client/src/pages/Editor/Explorer/ContextMenu.tsx index 49fb323208..39523f475c 100644 --- a/app/client/src/pages/Editor/Explorer/ContextMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/ContextMenu.tsx @@ -10,7 +10,7 @@ import { MenuSubContent, Tooltip, MenuSeparator, -} from "design-system"; +} from "@appsmith/ads"; import { createMessage, ENTITY_MORE_ACTIONS_TOOLTIP, diff --git a/app/client/src/pages/Editor/Explorer/Datasources.tsx b/app/client/src/pages/Editor/Explorer/Datasources.tsx index 71bc9393c0..8c8c962282 100644 --- a/app/client/src/pages/Editor/Explorer/Datasources.tsx +++ b/app/client/src/pages/Editor/Explorer/Datasources.tsx @@ -9,7 +9,7 @@ import { EMPTY_DATASOURCE_MAIN_TEXT, } from "ee/constants/messages"; import styled from "styled-components"; -import { Icon, Button } from "design-system"; +import { Icon, Button } from "@appsmith/ads"; import { AddEntity, EmptyComponent } from "./common"; import { getCurrentAppWorkspace } from "ee/selectors/selectedWorkspaceSelectors"; diff --git a/app/client/src/pages/Editor/Explorer/Entity/AddButton.tsx b/app/client/src/pages/Editor/Explorer/Entity/AddButton.tsx index cde6adb752..6240403d29 100644 --- a/app/client/src/pages/Editor/Explorer/Entity/AddButton.tsx +++ b/app/client/src/pages/Editor/Explorer/Entity/AddButton.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; -import type { ButtonSizes } from "design-system"; -import { Button } from "design-system"; +import type { ButtonSizes } from "@appsmith/ads"; +import { Button } from "@appsmith/ads"; const Wrapper = styled.div<{ isSizePassed?: boolean }>` ${({ isSizePassed }) => diff --git a/app/client/src/pages/Editor/Explorer/Entity/CollapseToggle.tsx b/app/client/src/pages/Editor/Explorer/Entity/CollapseToggle.tsx index ae8a0a1f73..652b161c11 100644 --- a/app/client/src/pages/Editor/Explorer/Entity/CollapseToggle.tsx +++ b/app/client/src/pages/Editor/Explorer/Entity/CollapseToggle.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; export function CollapseToggle(props: { isOpen: boolean; diff --git a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx index 9c544c1199..fc780df1a2 100644 --- a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx +++ b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx @@ -12,7 +12,7 @@ import styled from "styled-components"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { EntityClassNames } from "."; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { getEntityProperties } from "ee/pages/Editor/Explorer/Entity/getEntityProperties"; import store from "store"; import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; diff --git a/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx b/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx index c1a2ad2c05..860d34dcbb 100644 --- a/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx +++ b/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx @@ -10,7 +10,7 @@ import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig import useClipboard from "utils/hooks/useClipboard"; import { Skin } from "constants/DefaultTheme"; import { EntityClassNames } from "."; -import { Tooltip, Icon } from "design-system"; +import { Tooltip, Icon } from "@appsmith/ads"; import { COPY_ELEMENT, createMessage } from "ee/constants/messages"; import CollapseToggle from "./CollapseToggle"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; diff --git a/app/client/src/pages/Editor/Explorer/Entity/Name.tsx b/app/client/src/pages/Editor/Explorer/Entity/Name.tsx index ac33c92b40..80d53a990c 100644 --- a/app/client/src/pages/Editor/Explorer/Entity/Name.tsx +++ b/app/client/src/pages/Editor/Explorer/Entity/Name.tsx @@ -13,7 +13,7 @@ import { ACTION_ID_NOT_FOUND_IN_URL, ENTITY_EXPLORER_ACTION_NAME_CONFLICT_ERROR, } from "ee/constants/messages"; -import { Tooltip } from "design-system"; +import { Tooltip } from "@appsmith/ads"; import { useSelector } from "react-redux"; import { getSavingStatusForActionName } from "selectors/actionSelectors"; diff --git a/app/client/src/pages/Editor/Explorer/Entity/index.tsx b/app/client/src/pages/Editor/Explorer/Entity/index.tsx index 757522be91..673854b9fa 100644 --- a/app/client/src/pages/Editor/Explorer/Entity/index.tsx +++ b/app/client/src/pages/Editor/Explorer/Entity/index.tsx @@ -24,7 +24,7 @@ import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { getEntityCollapsibleState } from "selectors/editorContextSelectors"; import type { AppState } from "ee/reducers"; import { setEntityCollapsibleState } from "actions/editorContextActions"; -import { Tooltip, Tag, Spinner } from "design-system"; +import { Tooltip, Tag, Spinner } from "@appsmith/ads"; import { createMessage, EXPLORER_BETA_ENTITY } from "ee/constants/messages"; import classNames from "classnames"; diff --git a/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx b/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx index 575b4e06e9..e9bbb6d527 100644 --- a/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx +++ b/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx @@ -7,7 +7,7 @@ import styled from "styled-components"; import type { HTTP_METHOD } from "constants/ApiEditorConstants/CommonApiConstants"; import { HTTP_METHODS_COLOR } from "constants/ApiEditorConstants/CommonApiConstants"; import { PRIMARY_KEY, FOREIGN_KEY } from "constants/DatasourceEditorConstants"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import { getAssetUrl } from "ee/utils/airgapHelpers"; import { importSvg } from "@appsmith/ads-old"; diff --git a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx index 63aac6ab49..5eef379279 100644 --- a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx @@ -22,7 +22,7 @@ import { Tooltip, SearchInput, Text, -} from "design-system"; +} from "@appsmith/ads"; const SubMenuContainer = styled.div` width: 250px; diff --git a/app/client/src/pages/Editor/Explorer/Files/index.tsx b/app/client/src/pages/Editor/Explorer/Files/index.tsx index 7119bc68c4..60c8d524b1 100644 --- a/app/client/src/pages/Editor/Explorer/Files/index.tsx +++ b/app/client/src/pages/Editor/Explorer/Files/index.tsx @@ -23,7 +23,7 @@ import { } from "ee/pages/Editor/Explorer/helpers"; import { AddEntity, EmptyComponent } from "../common"; import ExplorerSubMenu from "./Submenu"; -import { Icon, Text } from "design-system"; +import { Icon, Text } from "@appsmith/ads"; import styled from "styled-components"; import { useFilteredFileOperations } from "components/editorComponents/GlobalSearch/GlobalSearchHooks"; import { SEARCH_ITEM_TYPES } from "components/editorComponents/GlobalSearch/utils"; diff --git a/app/client/src/pages/Editor/Explorer/Libraries/Installer.tsx b/app/client/src/pages/Editor/Explorer/Libraries/Installer.tsx index eb67134f20..b390c1ca1c 100644 --- a/app/client/src/pages/Editor/Explorer/Libraries/Installer.tsx +++ b/app/client/src/pages/Editor/Explorer/Libraries/Installer.tsx @@ -18,7 +18,7 @@ import { Avatar, Callout, Tooltip, -} from "design-system"; +} from "@appsmith/ads"; import { createMessage, customJSLibraryMessages } from "ee/constants/messages"; import { useDispatch, useSelector } from "react-redux"; import { diff --git a/app/client/src/pages/Editor/Explorer/Libraries/index.tsx b/app/client/src/pages/Editor/Explorer/Libraries/index.tsx index b1a5de0fdb..4159a91027 100644 --- a/app/client/src/pages/Editor/Explorer/Libraries/index.tsx +++ b/app/client/src/pages/Editor/Explorer/Libraries/index.tsx @@ -12,7 +12,7 @@ import { Spinner, toast, Tooltip, -} from "design-system"; +} from "@appsmith/ads"; import Entity, { AddButtonWrapper, EntityClassNames } from "../Entity"; import { createMessage, customJSLibraryMessages } from "ee/constants/messages"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx index 6adcfe9289..ab8ab3a0ee 100644 --- a/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx @@ -17,7 +17,7 @@ import { GENERATE_PAGE_ACTION_TITLE, } from "ee/constants/messages"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import type { ButtonSizes } from "design-system"; +import type { ButtonSizes } from "@appsmith/ads"; import { Menu, MenuContent, @@ -25,7 +25,7 @@ import { MenuItem, Tooltip, Text, -} from "design-system"; +} from "@appsmith/ads"; import { isAirgapped } from "ee/utils/airgapHelpers"; import { TOOLTIP_HOVER_ON_DELAY_IN_S } from "constants/AppConstants"; import { diff --git a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx index 1246421901..e1c787492e 100644 --- a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx @@ -10,7 +10,7 @@ import { updatePageAction, } from "actions/pageActions"; import styled from "styled-components"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import { CONTEXT_RENAME, CONTEXT_CLONE, diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx index 1f2bee8d71..b7d4e542ed 100644 --- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx +++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx @@ -21,7 +21,7 @@ import { } from "ee/pages/Editor/Explorer/helpers"; import { AddEntity, EmptyComponent } from "../common"; import { noop } from "lodash"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; import { getHasManagePagePermission } from "ee/utils/BusinessFeatures/permissionPageHelpers"; diff --git a/app/client/src/pages/Editor/Explorer/common.tsx b/app/client/src/pages/Editor/Explorer/common.tsx index ea0e567b4a..58f33592f2 100644 --- a/app/client/src/pages/Editor/Explorer/common.tsx +++ b/app/client/src/pages/Editor/Explorer/common.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import Entity from "./Entity"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; const ECContainer = styled.div` display: flex; diff --git a/app/client/src/pages/Editor/Explorer/index.tsx b/app/client/src/pages/Editor/Explorer/index.tsx index 3d0d9b62bc..97d8f21424 100644 --- a/app/client/src/pages/Editor/Explorer/index.tsx +++ b/app/client/src/pages/Editor/Explorer/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from "react"; import { toggleInOnboardingWidgetSelection } from "actions/onboardingActions"; import { forceOpenWidgetPanel } from "actions/widgetSidebarActions"; -import { SegmentedControl } from "design-system"; +import { SegmentedControl } from "@appsmith/ads"; import { useDispatch, useSelector } from "react-redux"; import { useLocation } from "react-router"; import type { AppState } from "ee/reducers"; diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/AnonymousDataPopup.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/AnonymousDataPopup.tsx index a5be78bcb7..f3522aef19 100644 --- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/AnonymousDataPopup.tsx +++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/AnonymousDataPopup.tsx @@ -1,5 +1,5 @@ import React, { useEffect } from "react"; -import { Callout } from "design-system"; +import { Callout } from "@appsmith/ads"; import { ADMIN_SETTINGS, LEARN_MORE, diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx index 2a5bb5fe18..012dc75bfb 100644 --- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx +++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useRef } from "react"; -import { Button, Divider, Text, Tooltip } from "design-system"; +import { Button, Divider, Text, Tooltip } from "@appsmith/ads"; import styled from "styled-components"; import { useDispatch, useSelector } from "react-redux"; import { diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx index 4c1f2c6845..6411b23435 100644 --- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx +++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Text, Button } from "design-system"; +import { Text, Button } from "@appsmith/ads"; import { getAppsmithConfigs } from "ee/configs"; import { APPSMITH_DISPLAY_VERSION, createMessage } from "ee/constants/messages"; import moment from "moment"; diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Modal.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Modal.tsx index 0ec2858603..a0a70f11d6 100644 --- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Modal.tsx +++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Modal.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { MenuContent } from "design-system"; +import { MenuContent } from "@appsmith/ads"; import styled from "styled-components"; import Checklist from "./Checklist"; import HelpMenu from "./HelpMenu"; diff --git a/app/client/src/pages/Editor/FormConfig.tsx b/app/client/src/pages/Editor/FormConfig.tsx index 6cdd7caeed..a4529dbaff 100644 --- a/app/client/src/pages/Editor/FormConfig.tsx +++ b/app/client/src/pages/Editor/FormConfig.tsx @@ -23,7 +23,7 @@ import { } from "utils/editorContextUtils"; import { getIsInputFieldFocused } from "selectors/editorContextSelectors"; import { setFocusableInputField } from "actions/editorContextActions"; -import { Icon, Tooltip } from "design-system"; +import { Icon, Tooltip } from "@appsmith/ads"; const FlexWrapper = styled.div` display: flex; diff --git a/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx b/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx index 23ce7426ff..cb261e438b 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx @@ -10,7 +10,7 @@ import { ModalContent, ModalBody, ModalFooter, -} from "design-system"; +} from "@appsmith/ads"; import { getCrudInfoModalData } from "selectors/crudInfoModalSelectors"; import { setCrudInfoModalData } from "actions/crudInfoModalActions"; diff --git a/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx b/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx index 5091fcabdf..cb9d31b922 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx @@ -8,7 +8,7 @@ import type { } from "@appsmith/ads-old"; import { Classes, Text, TextType } from "@appsmith/ads-old"; import _ from "lodash"; -import { Tooltip, Icon } from "design-system"; +import { Tooltip, Icon } from "@appsmith/ads"; import { getAssetUrl } from "ee/utils/airgapHelpers"; // ---------- Helpers and constants ---------- diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx index 1bae8ee878..63b98174e7 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx @@ -24,7 +24,7 @@ import DataSourceOption, { } from "../DataSourceOption"; import { getQueryStringfromObject } from "ee/entities/URLRedirect/URLAssembly"; import type { DropdownOption } from "@appsmith/ads-old"; -import { Button, Icon, Text, Select, Option, Tooltip } from "design-system"; +import { Button, Icon, Text, Select, Option, Tooltip } from "@appsmith/ads"; import GoogleSheetForm from "./GoogleSheetForm"; import { GENERATE_PAGE_FORM_TITLE, diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx index d0d4e9c1c7..42481152c9 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx @@ -23,7 +23,7 @@ import { GEN_CRUD_NO_COLUMNS, GEN_CRUD_TABLE_HEADER_TOOLTIP_DESC, } from "ee/constants/messages"; -import { Icon, Option, Select, Input, Tooltip } from "design-system"; +import { Icon, Option, Select, Input, Tooltip } from "@appsmith/ads"; interface Props { googleSheetPluginId: string; diff --git a/app/client/src/pages/Editor/GeneratePage/index.tsx b/app/client/src/pages/Editor/GeneratePage/index.tsx index 2dc50710f7..92f7245ed6 100644 --- a/app/client/src/pages/Editor/GeneratePage/index.tsx +++ b/app/client/src/pages/Editor/GeneratePage/index.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import PageContent from "./components/PageContent"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { BackButton } from "components/utils/helperComponents"; const Container = styled.div` diff --git a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.test.tsx b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.test.tsx index 3501ee361b..7aa486cdec 100644 --- a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.test.tsx +++ b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.test.tsx @@ -6,7 +6,7 @@ import { } from "ee/constants/messages"; import { all } from "@redux-saga/core/effects"; import { redoAction, undoAction } from "actions/pageActions"; -import { Toast } from "design-system"; +import { Toast } from "@appsmith/ads"; import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants"; import { MemoryRouter } from "react-router-dom"; import * as utilities from "selectors/editorSelectors"; diff --git a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx index c2f9ea9845..9f8f193342 100644 --- a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx +++ b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx @@ -41,7 +41,7 @@ import { GitSyncModalTab } from "entities/GitSync"; import { matchBuilderPath } from "constants/routes"; import { toggleInstaller } from "actions/JSLibraryActions"; import { SelectionRequestType } from "sagas/WidgetSelectUtils"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { showDebuggerFlag } from "selectors/debuggerSelectors"; import { getIsFirstTimeUserOnboardingEnabled } from "selectors/onboardingSelectors"; import WalkthroughContext from "components/featureWalkthrough/walkthroughContext"; diff --git a/app/client/src/pages/Editor/HelpButton.tsx b/app/client/src/pages/Editor/HelpButton.tsx index a7f2059dc7..82063bd8f2 100644 --- a/app/client/src/pages/Editor/HelpButton.tsx +++ b/app/client/src/pages/Editor/HelpButton.tsx @@ -21,7 +21,7 @@ import { Tooltip, MenuSeparator, Text, -} from "design-system"; +} from "@appsmith/ads"; import { getAppsmithConfigs } from "ee/configs"; import moment from "moment/moment"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Editor.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Editor.tsx index beda471366..e3390b6a1a 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/Editor.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/Editor.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import { Switch, useRouteMatch } from "react-router"; import { SentryRoute } from "ee/AppRouter"; import { diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Explorer.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Explorer.tsx index 2137702b5b..f54695d3ca 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/Explorer.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/Explorer.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import { Switch, useRouteMatch } from "react-router"; import { SentryRoute } from "ee/AppRouter"; import { diff --git a/app/client/src/pages/Editor/IDE/EditorPane/GlobalAdd.tsx b/app/client/src/pages/Editor/IDE/EditorPane/GlobalAdd.tsx index 046f2af8ae..60bf74e781 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/GlobalAdd.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/GlobalAdd.tsx @@ -1,7 +1,7 @@ import UIEntitySidebar from "pages/Editor/widgetSidebar/UIEntitySidebar"; import React, { useCallback } from "react"; import styled from "styled-components"; -import { Button, Flex, Icon, Text } from "design-system"; +import { Button, Flex, Icon, Text } from "@appsmith/ads"; import { useDispatch, useSelector } from "react-redux"; import { getCurrentBasePageId } from "selectors/editorSelectors"; import history from "utils/history"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/Add.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/Add.tsx index 210f129179..33db8864bb 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/JS/Add.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/JS/Add.tsx @@ -1,8 +1,8 @@ import React, { useCallback, useState } from "react"; import SegmentAddHeader from "../components/SegmentAddHeader"; import { EDITOR_PANE_TEXTS, createMessage } from "ee/constants/messages"; -import type { ListItemProps } from "design-system"; -import { Flex, SearchInput } from "design-system"; +import type { ListItemProps } from "@appsmith/ads"; +import { Flex, SearchInput } from "@appsmith/ads"; import { useDispatch, useSelector } from "react-redux"; import { getCurrentPageId } from "selectors/editorSelectors"; import GroupedList from "../components/GroupedList"; @@ -16,7 +16,7 @@ import { FocusEntity } from "navigation/FocusEntity"; import type { GroupedListProps } from "../components/types"; import { EmptySearchResult } from "../components/EmptySearchResult"; import { getIDEViewMode } from "selectors/ideSelectors"; -import type { FlexProps } from "design-system"; +import type { FlexProps } from "@appsmith/ads"; import { EditorViewMode } from "ee/entities/IDE/constants"; const AddJS = () => { diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx index dffd07a444..ed048d4446 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; import { useSelector } from "react-redux"; -import { Flex, Text } from "design-system"; +import { Flex, Text } from "@appsmith/ads"; import styled from "styled-components"; import type { EditorSegmentList } from "ee/selectors/appIDESelectors"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/PagesSection.tsx b/app/client/src/pages/Editor/IDE/EditorPane/PagesSection.tsx index 491927a62e..9af6c1c573 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/PagesSection.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/PagesSection.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useMemo, useState } from "react"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { useDispatch, useSelector } from "react-redux"; import { useLocation } from "react-router"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/Add.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/Add.tsx index 3171cc9499..60d2051c52 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/Query/Add.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/Add.tsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { Flex, SearchInput } from "design-system"; +import { Flex, SearchInput } from "@appsmith/ads"; import { createMessage, EDITOR_PANE_TEXTS } from "ee/constants/messages"; import SegmentAddHeader from "../components/SegmentAddHeader"; @@ -14,7 +14,7 @@ import type { GroupedListProps } from "../components/types"; import { EmptySearchResult } from "../components/EmptySearchResult"; import { useSelector } from "react-redux"; import { getIDEViewMode } from "selectors/ideSelectors"; -import type { FlexProps } from "design-system"; +import type { FlexProps } from "@appsmith/ads"; import { EditorViewMode } from "ee/entities/IDE/constants"; const AddQuery = () => { diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/Explorer.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/Explorer.tsx index d4e2fcf113..72b03a12bc 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/Query/Explorer.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/Explorer.tsx @@ -1,7 +1,7 @@ import React from "react"; import List from "./List"; import styled from "styled-components"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import { useSelector } from "react-redux"; import { getIDEViewMode } from "selectors/ideSelectors"; import { EditorViewMode } from "ee/entities/IDE/constants"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx index f961cf4584..edbbcbd71c 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { Flex, Text } from "design-system"; +import { Flex, Text } from "@appsmith/ads"; import { useSelector } from "react-redux"; import { getHasCreateActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/UI/Add.tsx b/app/client/src/pages/Editor/IDE/EditorPane/UI/Add.tsx index d3e8b5830e..6b37d8c406 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/UI/Add.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/UI/Add.tsx @@ -1,5 +1,5 @@ import React, { useCallback } from "react"; -import { Button, Flex, Text } from "design-system"; +import { Button, Flex, Text } from "@appsmith/ads"; import { useSelector } from "react-redux"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/UI/List.tsx b/app/client/src/pages/Editor/IDE/EditorPane/UI/List.tsx index f19720edfc..c54f15a401 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/UI/List.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/UI/List.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useEffect, useMemo } from "react"; -import { Button, Flex } from "design-system"; +import { Button, Flex } from "@appsmith/ads"; import WidgetEntity from "pages/Editor/Explorer/Widgets/WidgetEntity"; import { useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/UI/index.tsx b/app/client/src/pages/Editor/IDE/EditorPane/UI/index.tsx index 932f4f2c96..32ac9bc524 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/UI/index.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/UI/index.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import { Switch, useRouteMatch } from "react-router"; import { SentryRoute } from "ee/AppRouter"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/ActionEditor.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/ActionEditor.tsx index 4c87893b47..e8335837bb 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/ActionEditor.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/ActionEditor.tsx @@ -1,4 +1,4 @@ -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import React, { useCallback, useState } from "react"; import ActionToolbar from "./ActionToolbar"; import ActionDrawer from "./ActionDrawer"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/ActionToolbar.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/ActionToolbar.tsx index 2c43515832..3d2be46ca6 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/ActionToolbar.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/ActionToolbar.tsx @@ -1,4 +1,4 @@ -import { Button, Flex, Tooltip } from "design-system"; +import { Button, Flex, Tooltip } from "@appsmith/ads"; import React from "react"; import styled from "styled-components"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/AddAndSearchbar.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/AddAndSearchbar.tsx index 4e1bb22282..690c608088 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/AddAndSearchbar.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/AddAndSearchbar.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Flex, Button, SearchInput } from "design-system"; +import { Flex, Button, SearchInput } from "@appsmith/ads"; interface Props { onAddClick: () => void; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/Announcement.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/Announcement.tsx index 2af11d886e..354a70a481 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/Announcement.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/Announcement.tsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { AnnouncementModal, Button } from "design-system"; +import { AnnouncementModal, Button } from "@appsmith/ads"; import localStorage, { LOCAL_STORAGE_KEYS } from "utils/localStorage"; import { SPLITPANE_ANNOUNCEMENT, createMessage } from "ee/constants/messages"; import { getAssetUrl } from "ee/utils/airgapHelpers"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/EmptySearchResult.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/EmptySearchResult.tsx index 6b0b702cb3..007aee2e14 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/EmptySearchResult.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/EmptySearchResult.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { EDITOR_PANE_TEXTS, createMessage } from "ee/constants/messages"; const EmptySearchResult = ({ type }: { type: string }) => { diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/EmptyState.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/EmptyState.tsx index 778eaf3217..8347215b93 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/EmptyState.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/EmptyState.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button, Flex, Text, Icon } from "design-system"; +import { Button, Flex, Text, Icon } from "@appsmith/ads"; interface EmptyStateProps { icon: string; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/Group.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/Group.tsx index 571e5b447f..b308b27955 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/Group.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/Group.tsx @@ -1,7 +1,7 @@ import React, { useMemo, useState } from "react"; import type { GroupedListProps } from "./types"; import { DEFAULT_GROUP_LIST_SIZE } from "./constants"; -import { Flex, List, Text } from "design-system"; +import { Flex, List, Text } from "@appsmith/ads"; import styled from "styled-components"; interface GroupProps { diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/GroupedList.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/GroupedList.tsx index 960b245961..1436f378d5 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/GroupedList.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/GroupedList.tsx @@ -1,6 +1,6 @@ import React from "react"; -import type { FlexProps } from "design-system"; -import { Flex } from "design-system"; +import type { FlexProps } from "@appsmith/ads"; +import { Flex } from "@appsmith/ads"; import styled from "styled-components"; import type { GroupedListProps } from "./types"; import { Group } from "./Group"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/MinimalTab.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/MinimalTab.tsx index 99daf43035..897508925f 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/MinimalTab.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/MinimalTab.tsx @@ -1,6 +1,6 @@ import React from "react"; -import type { FlexProps } from "design-system"; -import { Flex } from "design-system"; +import type { FlexProps } from "@appsmith/ads"; +import { Flex } from "@appsmith/ads"; const MinimalTab = ({ children, ...rest }: FlexProps) => { return ( diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentAddHeader.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentAddHeader.tsx index 800c8c6f75..42d42848d4 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentAddHeader.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentAddHeader.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button, Flex, Text } from "design-system"; +import { Button, Flex, Text } from "@appsmith/ads"; import { createMessage } from "ee/constants/messages"; import { useSelector } from "react-redux"; import { getIsSideBySideEnabled } from "selectors/ideSelectors"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx index a437614c11..0d0154a119 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button, Flex, SegmentedControl } from "design-system"; +import { Button, 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"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/types.ts b/app/client/src/pages/Editor/IDE/EditorPane/components/types.ts index 2ad6e33c09..f31eb1151b 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/types.ts +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/types.ts @@ -1,4 +1,4 @@ -import type { ListItemProps } from "design-system"; +import type { ListItemProps } from "@appsmith/ads"; export interface GroupedListProps { groupTitle?: string; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/index.tsx b/app/client/src/pages/Editor/IDE/EditorPane/index.tsx index 1d83da95ac..2b3171fd24 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/index.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/index.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import { useEditorPaneWidth } from "../hooks"; import EditorPaneExplorer from "./Explorer"; import Editor from "./Editor"; diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/AddButton.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/AddButton.tsx index 9a87422ba3..ad12ea776e 100644 --- a/app/client/src/pages/Editor/IDE/EditorTabs/AddButton.tsx +++ b/app/client/src/pages/Editor/IDE/EditorTabs/AddButton.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Flex, Spinner, Button } from "design-system"; +import { Flex, Spinner, Button } from "@appsmith/ads"; import { useCurrentEditorState, useIDETabClickHandlers } from "../hooks"; import { useIsJSAddLoading } from "ee/pages/Editor/IDE/EditorPane/JS/hooks"; import { EditorEntityTabState } from "ee/entities/IDE/constants"; diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/Container.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/Container.tsx index c02710d2e0..eaeaffa32e 100644 --- a/app/client/src/pages/Editor/IDE/EditorTabs/Container.tsx +++ b/app/client/src/pages/Editor/IDE/EditorTabs/Container.tsx @@ -1,6 +1,6 @@ import type { ReactNode } from "react"; import React from "react"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import { EDITOR_TABS_HEIGHT } from "../EditorPane/constants"; const Container = (props: { children: ReactNode }) => { diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx index 9ec8096bcf..0884b47f77 100644 --- a/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx +++ b/app/client/src/pages/Editor/IDE/EditorTabs/List.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import { useCurrentEditorState } from "../hooks"; import { EditorEntityTab } from "ee/entities/IDE/constants"; diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/ListButton.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/ListButton.tsx index d97bd60d74..35c648dbc5 100644 --- a/app/client/src/pages/Editor/IDE/EditorTabs/ListButton.tsx +++ b/app/client/src/pages/Editor/IDE/EditorTabs/ListButton.tsx @@ -8,7 +8,7 @@ import { MenuItem, MenuTrigger, Text, -} from "design-system"; +} from "@appsmith/ads"; import { ListIconContainer, ListTitle } from "./StyledComponents"; interface Props { diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx index 4ee5aa78a4..7d89cc652f 100644 --- a/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx +++ b/app/client/src/pages/Editor/IDE/EditorTabs/ScreenModeToggle.tsx @@ -1,6 +1,6 @@ import React, { useCallback } from "react"; import { useDispatch, useSelector } from "react-redux"; -import { Button, Tooltip } from "design-system"; +import { Button, Tooltip } from "@appsmith/ads"; import { getIDEViewMode } from "selectors/ideSelectors"; import { EditorViewMode } from "ee/entities/IDE/constants"; diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx index 2963bf0e01..9024d599a4 100644 --- a/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx +++ b/app/client/src/pages/Editor/IDE/EditorTabs/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import { shallowEqual, useSelector } from "react-redux"; -import { Flex, ScrollArea, ToggleButton } from "design-system"; +import { Flex, ScrollArea, ToggleButton } from "@appsmith/ads"; import { getIDEViewMode, getIsSideBySideEnabled } from "selectors/ideSelectors"; import type { EntityItem } from "ee/entities/IDE/constants"; import { diff --git a/app/client/src/pages/Editor/IDE/Header/EditorTitle.tsx b/app/client/src/pages/Editor/IDE/Header/EditorTitle.tsx index 3b3673d197..47ef103076 100644 --- a/app/client/src/pages/Editor/IDE/Header/EditorTitle.tsx +++ b/app/client/src/pages/Editor/IDE/Header/EditorTitle.tsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { Popover, PopoverTrigger, PopoverContent } from "design-system"; +import { Popover, PopoverTrigger, PopoverContent } from "@appsmith/ads"; import { createMessage, HEADER_TITLES } from "ee/constants/messages"; import { PagesSection } from "../EditorPane/PagesSection"; diff --git a/app/client/src/pages/Editor/IDE/Header/index.tsx b/app/client/src/pages/Editor/IDE/Header/index.tsx index 2ec47bc699..f05e8fcc40 100644 --- a/app/client/src/pages/Editor/IDE/Header/index.tsx +++ b/app/client/src/pages/Editor/IDE/Header/index.tsx @@ -13,7 +13,7 @@ import { TabPanel, Button, Link, -} from "design-system"; +} from "@appsmith/ads"; import { useDispatch, useSelector } from "react-redux"; import { EditInteractionKind, SavingState } from "@appsmith/ads-old"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/IDE/LeftPane/AddLibraryPopover.tsx b/app/client/src/pages/Editor/IDE/LeftPane/AddLibraryPopover.tsx index 9b061e1f7b..078db43ce3 100644 --- a/app/client/src/pages/Editor/IDE/LeftPane/AddLibraryPopover.tsx +++ b/app/client/src/pages/Editor/IDE/LeftPane/AddLibraryPopover.tsx @@ -5,7 +5,7 @@ import { PopoverContent, PopoverHeader, PopoverTrigger, -} from "design-system"; +} from "@appsmith/ads"; import React, { useCallback, useState } from "react"; import { createMessage, customJSLibraryMessages } from "ee/constants/messages"; import { Installer } from "../../Explorer/Libraries/Installer"; diff --git a/app/client/src/pages/Editor/IDE/LeftPane/CreateDatasourcePopover.tsx b/app/client/src/pages/Editor/IDE/LeftPane/CreateDatasourcePopover.tsx index 428bd45f3f..00ccf0289e 100644 --- a/app/client/src/pages/Editor/IDE/LeftPane/CreateDatasourcePopover.tsx +++ b/app/client/src/pages/Editor/IDE/LeftPane/CreateDatasourcePopover.tsx @@ -1,4 +1,4 @@ -import { Button, Popover, PopoverTrigger } from "design-system"; +import { Button, Popover, PopoverTrigger } from "@appsmith/ads"; import React from "react"; import history from "utils/history"; import { builderURL } from "ee/RouteBuilder"; diff --git a/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx b/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx index d7842a7d0f..5dfef259d9 100644 --- a/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx +++ b/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useEffect, useState } from "react"; import styled from "styled-components"; -import { Flex, List, Text } from "design-system"; +import { Flex, List, Text } from "@appsmith/ads"; import { useSelector } from "react-redux"; import { getDatasourceUsageCountForApp, diff --git a/app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx b/app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx index 26734a16e0..55724e8700 100644 --- a/app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx +++ b/app/client/src/pages/Editor/IDE/LeftPane/LibrarySidePane.tsx @@ -5,7 +5,7 @@ import { useSelector } from "react-redux"; import { selectLibrariesForExplorer } from "ee/selectors/entitiesSelector"; import { animated, useTransition } from "react-spring"; import { LibraryEntity } from "pages/Editor/Explorer/Libraries"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import { DEFAULT_EXPLORER_PANE_WIDTH } from "constants/AppConstants"; const LibrarySidePane = () => { diff --git a/app/client/src/pages/Editor/IDE/LeftPane/PaneHeader.tsx b/app/client/src/pages/Editor/IDE/LeftPane/PaneHeader.tsx index 34a84f59f1..78f27e3fb0 100644 --- a/app/client/src/pages/Editor/IDE/LeftPane/PaneHeader.tsx +++ b/app/client/src/pages/Editor/IDE/LeftPane/PaneHeader.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; interface Props { title: string; diff --git a/app/client/src/pages/Editor/IDE/ProtectedCallout.tsx b/app/client/src/pages/Editor/IDE/ProtectedCallout.tsx index f80313221a..b890e22ba5 100644 --- a/app/client/src/pages/Editor/IDE/ProtectedCallout.tsx +++ b/app/client/src/pages/Editor/IDE/ProtectedCallout.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Callout } from "design-system"; +import { Callout } from "@appsmith/ads"; import styled from "styled-components"; import { useDispatch, useSelector } from "react-redux"; import { diff --git a/app/client/src/pages/Editor/IDE/RightPane/components/CreateNewQueryModal.tsx b/app/client/src/pages/Editor/IDE/RightPane/components/CreateNewQueryModal.tsx index d543361f2c..08b7b5cc13 100644 --- a/app/client/src/pages/Editor/IDE/RightPane/components/CreateNewQueryModal.tsx +++ b/app/client/src/pages/Editor/IDE/RightPane/components/CreateNewQueryModal.tsx @@ -1,5 +1,5 @@ import React, { useEffect } from "react"; -import { Modal, ModalContent, ModalHeader, ModalBody } from "design-system"; +import { Modal, ModalContent, ModalHeader, ModalBody } from "@appsmith/ads"; import { useDispatch, useSelector } from "react-redux"; import { CREATE_A_NEW_ITEM, createMessage } from "ee/constants/messages"; diff --git a/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx b/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx index 2cb18d267e..298161f741 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx @@ -5,7 +5,7 @@ import type { AppState } from "ee/reducers"; import type { Datasource } from "entities/Datasource"; import DatasourceCard from "./DatasourceCard"; import { Text, TextType } from "@appsmith/ads-old"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { thinScrollbar } from "constants/DefaultTheme"; import { keyBy } from "lodash"; import { diff --git a/app/client/src/pages/Editor/IntegrationEditor/AddDatasourceSecurely.tsx b/app/client/src/pages/Editor/IntegrationEditor/AddDatasourceSecurely.tsx index 4f3e48976f..243e22077a 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/AddDatasourceSecurely.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/AddDatasourceSecurely.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Flex, Text } from "design-system"; +import { Flex, Text } from "@appsmith/ads"; import { getAssetUrl } from "ee/utils/airgapHelpers"; import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants"; import { diff --git a/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx b/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx index 097ee1ec1c..4d89c885ad 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx @@ -18,7 +18,7 @@ import { import { connect } from "react-redux"; import type { Datasource, MockDatasource } from "entities/Datasource"; import scrollIntoView from "scroll-into-view-if-needed"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import MockDataSources from "./MockDataSources"; import NewApiScreen from "./NewApi"; import NewQueryScreen from "./NewQuery"; @@ -30,7 +30,7 @@ import { CREATE_NEW_DATASOURCE_MOST_POPULAR_HEADER, SAMPLE_DATASOURCES, } from "ee/constants/messages"; -import { Divider } from "design-system"; +import { Divider } from "@appsmith/ads"; import { getApplicationByIdFromWorkspaces, getCurrentApplicationIdForCreateNewApp, diff --git a/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx index b5f0c37a6c..3d9c527de1 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx @@ -13,7 +13,7 @@ import type { AppState } from "ee/reducers"; import history from "utils/history"; import RenderDatasourceInformation from "pages/Editor/DataSourceEditor/DatasourceSection"; import { getQueryParams } from "utils/URLUtils"; -import { Button, MenuContent, MenuItem, MenuTrigger } from "design-system"; +import { Button, MenuContent, MenuItem, MenuTrigger } from "@appsmith/ads"; import { deleteDatasource } from "actions/datasourceActions"; import { getGenerateCRUDEnabledPluginMap } from "ee/selectors/entitiesSelector"; import type { GenerateCRUDEnabledPluginMap, Plugin } from "api/PluginApi"; diff --git a/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx index 596a1b1ecb..fb606ad2c2 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx @@ -24,7 +24,7 @@ import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil"; import { getAssetUrl } from "ee/utils/airgapHelpers"; import { ApiCard, API_ACTION, CardContentWrapper } from "./NewApi"; import { PluginPackageName, PluginType } from "entities/Action"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; import PlusLogo from "assets/images/Plus-logo.svg"; import { createMessage, diff --git a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx index c709bb5ae9..442aa8f3c6 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx @@ -22,7 +22,7 @@ import { getCurrentApplicationId } from "selectors/editorSelectors"; import { integrationEditorURL } from "ee/RouteBuilder"; import { getCurrentAppWorkspace } from "ee/selectors/selectedWorkspaceSelectors"; -import { Tab, TabPanel, Tabs, TabsList } from "design-system"; +import { Tab, TabPanel, Tabs, TabsList } from "@appsmith/ads"; import Debugger, { ResizerContentContainer, ResizerMainContainer, diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx index b48e37ba98..2404da0264 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx @@ -15,7 +15,7 @@ import { getQueryParams } from "utils/URLUtils"; import { getGenerateCRUDEnabledPluginMap } from "ee/selectors/entitiesSelector"; import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil"; import { getAssetUrl } from "ee/utils/airgapHelpers"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; import { useEditorType } from "ee/hooks"; import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks"; import { createNewApiActionBasedOnEditorType } from "ee/actions/helpers"; diff --git a/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx b/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx index a2e587b468..ef7b267e22 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx @@ -7,7 +7,7 @@ import { ModalContent, ModalHeader, ModalFooter, -} from "design-system"; +} from "@appsmith/ads"; import { UNSUPPORTED_PLUGIN_DIALOG_MAIN_HEADING } from "ee/constants/messages"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { diff --git a/app/client/src/pages/Editor/JSEditor/Form.tsx b/app/client/src/pages/Editor/JSEditor/Form.tsx index c8433b6d58..cd9ae89513 100644 --- a/app/client/src/pages/Editor/JSEditor/Form.tsx +++ b/app/client/src/pages/Editor/JSEditor/Form.tsx @@ -61,7 +61,7 @@ import history from "utils/history"; import { CursorPositionOrigin } from "ee/reducers/uiReducers/editorContextReducer"; import LazyCodeEditor from "components/editorComponents/LazyCodeEditor"; import styled from "styled-components"; -import { Tab, TabPanel, Tabs, TabsList } from "design-system"; +import { Tab, TabPanel, Tabs, TabsList } from "@appsmith/ads"; import { JSEditorTab } from "reducers/uiReducers/jsPaneReducer"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; diff --git a/app/client/src/pages/Editor/JSEditor/JSBlankState.tsx b/app/client/src/pages/Editor/JSEditor/JSBlankState.tsx index 036164138a..acf141ca0b 100644 --- a/app/client/src/pages/Editor/JSEditor/JSBlankState.tsx +++ b/app/client/src/pages/Editor/JSEditor/JSBlankState.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Flex, Text } from "design-system"; +import { Flex, Text } from "@appsmith/ads"; import { importSvg } from "@appsmith/ads-old"; import { createMessage, EDITOR_PANE_TEXTS } from "ee/constants/messages"; diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorContextMenu.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorContextMenu.tsx index f7f1f3a2ba..534f805cc8 100644 --- a/app/client/src/pages/Editor/JSEditor/JSEditorContextMenu.tsx +++ b/app/client/src/pages/Editor/JSEditor/JSEditorContextMenu.tsx @@ -11,7 +11,7 @@ import { MenuSubTrigger, MenuTrigger, Text, -} from "design-system"; +} from "@appsmith/ads"; export interface ContextMenuOption { id?: string; diff --git a/app/client/src/pages/Editor/JSEditor/JSFunctionRun.tsx b/app/client/src/pages/Editor/JSEditor/JSFunctionRun.tsx index 7a78b44235..43083bc612 100644 --- a/app/client/src/pages/Editor/JSEditor/JSFunctionRun.tsx +++ b/app/client/src/pages/Editor/JSEditor/JSFunctionRun.tsx @@ -1,8 +1,8 @@ import React from "react"; import styled from "styled-components"; import type { JSCollection } from "entities/JSCollection"; -import type { SelectProps } from "design-system"; -import { Button, Option, Select, Tooltip, Text } from "design-system"; +import type { SelectProps } from "@appsmith/ads"; +import { Button, Option, Select, Tooltip, Text } from "@appsmith/ads"; import { createMessage, NO_JS_FUNCTION_TO_RUN } from "ee/constants/messages"; import type { JSActionDropdownOption } from "./utils"; import { RUN_BUTTON_DEFAULTS, testLocators } from "./constants"; diff --git a/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx b/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx index a4f6fe49bd..3e44fe7bf7 100644 --- a/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx +++ b/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx @@ -8,7 +8,7 @@ import React, { useCallback, useState } from "react"; import styled from "styled-components"; import { CONFIRM_BEFORE_CALLING_HEADING, SETTINGS_HEADINGS } from "./constants"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { Icon, Tooltip, Switch } from "design-system"; +import { Icon, Tooltip, Switch } from "@appsmith/ads"; import RemoveConfirmationModal from "./RemoveConfirmBeforeCallingDialog"; interface SettingsHeadingProps { diff --git a/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx b/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx index d8497f9221..f82860f134 100644 --- a/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx +++ b/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx @@ -16,7 +16,7 @@ import { import EditableText, { EditInteractionKind, } from "components/editorComponents/EditableText"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import { getAssetUrl } from "ee/utils/airgapHelpers"; import NameEditorComponent, { IconBox, diff --git a/app/client/src/pages/Editor/JSEditor/RemoveConfirmBeforeCallingDialog.tsx b/app/client/src/pages/Editor/JSEditor/RemoveConfirmBeforeCallingDialog.tsx index e9791e7ac6..f9466d2a1c 100644 --- a/app/client/src/pages/Editor/JSEditor/RemoveConfirmBeforeCallingDialog.tsx +++ b/app/client/src/pages/Editor/JSEditor/RemoveConfirmBeforeCallingDialog.tsx @@ -7,7 +7,7 @@ import { ModalHeader, ModalFooter, Text, -} from "design-system"; +} from "@appsmith/ads"; import { REMOVE_CONFIRM_BEFORE_CALLING_HEADING, REMOVE_CONFIRM_BEFORE_CALLING_DESCRIPTION, diff --git a/app/client/src/pages/Editor/MainContainerWidthToggles.tsx b/app/client/src/pages/Editor/MainContainerWidthToggles.tsx index d7366bdf01..65621e923b 100644 --- a/app/client/src/pages/Editor/MainContainerWidthToggles.tsx +++ b/app/client/src/pages/Editor/MainContainerWidthToggles.tsx @@ -11,7 +11,7 @@ import { getCurrentApplicationId, getCurrentApplicationLayout, } from "selectors/editorSelectors"; -import { Icon, SegmentedControl, Tooltip } from "design-system"; +import { Icon, SegmentedControl, Tooltip } from "@appsmith/ads"; const StyledSegmentedControl = styled(SegmentedControl)` > .ads-v2-segmented-control__segments-container { diff --git a/app/client/src/pages/Editor/MultiSelectPropertyPane/index.tsx b/app/client/src/pages/Editor/MultiSelectPropertyPane/index.tsx index cb163f5303..1da57618fd 100644 --- a/app/client/src/pages/Editor/MultiSelectPropertyPane/index.tsx +++ b/app/client/src/pages/Editor/MultiSelectPropertyPane/index.tsx @@ -5,7 +5,7 @@ import { MULTI_SELECT_PROPERTY_PANE_MESSAGE, WIDGET_MULTI_SELECT, } from "ee/constants/messages"; -import { Text, Button } from "design-system"; +import { Text, Button } from "@appsmith/ads"; import { useSelector } from "react-redux"; import { getCanvasWidgets } from "ee/selectors/entitiesSelector"; import { getSelectedWidgets } from "selectors/ui"; diff --git a/app/client/src/pages/Editor/NavigationSettings/LogoInput.tsx b/app/client/src/pages/Editor/NavigationSettings/LogoInput.tsx index dbf845ad6f..ff28941fa5 100644 --- a/app/client/src/pages/Editor/NavigationSettings/LogoInput.tsx +++ b/app/client/src/pages/Editor/NavigationSettings/LogoInput.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import { ImageInput } from "pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ImageInput"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { createMessage, APP_NAVIGATION_SETTING } from "ee/constants/messages"; import type { UpdateSetting } from "pages/Editor/AppSettingsPane/AppSettings/NavigationSettings"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/Popper.tsx b/app/client/src/pages/Editor/Popper.tsx index b03c852aeb..90f634a801 100644 --- a/app/client/src/pages/Editor/Popper.tsx +++ b/app/client/src/pages/Editor/Popper.tsx @@ -1,5 +1,5 @@ import type { AppState } from "ee/reducers"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import type { Placement, PopperOptions } from "popper.js"; import PopperJS from "popper.js"; import React, { useEffect, useMemo, useRef } from "react"; diff --git a/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx b/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx index 60e6e45fad..3fb10a1f46 100644 --- a/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx +++ b/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button, Text } from "design-system"; +import { Button, Text } from "@appsmith/ads"; import type { AppState } from "ee/reducers"; import styled from "styled-components"; import { useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/PropertyPane/EmptySearchResult.tsx b/app/client/src/pages/Editor/PropertyPane/EmptySearchResult.tsx index 2d0c9ed76d..5d0a1c49cb 100644 --- a/app/client/src/pages/Editor/PropertyPane/EmptySearchResult.tsx +++ b/app/client/src/pages/Editor/PropertyPane/EmptySearchResult.tsx @@ -1,6 +1,6 @@ import React from "react"; import { PROPERTY_PANE_EMPTY_SEARCH_RESULT_MESSAGE } from "ee/constants/messages"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; export function EmptySearchResult() { return ( diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx index 3dd8a09348..16904c1043 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx @@ -4,7 +4,7 @@ import equal from "fast-deep-equal/es6"; import * as log from "loglevel"; import { ControlWrapper } from "components/propertyControls/StyledControls"; -import { ToggleButton, Tooltip, Button } from "design-system"; +import { ToggleButton, Tooltip, Button } from "@appsmith/ads"; import PropertyControlFactory from "utils/PropertyControlFactory"; import PropertyHelpLabel from "pages/Editor/PropertyPane/PropertyHelpLabel"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyHelpLabel.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyHelpLabel.tsx index 94d7691cc6..86d0ea5b5c 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyHelpLabel.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyHelpLabel.tsx @@ -1,7 +1,7 @@ import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; import React from "react"; import styled from "styled-components"; -import { Tooltip } from "design-system"; +import { Tooltip } from "@appsmith/ads"; const Label = styled.label` color: var(--ads-v2-color-fg); diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx index a8dd861c6b..06b87bcb1d 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx @@ -24,7 +24,7 @@ import { import equal from "fast-deep-equal"; import { mapValues, pick } from "lodash"; import { createSelector } from "reselect"; -import type { TooltipPlacement } from "design-system"; +import type { TooltipPlacement } from "@appsmith/ads"; import { Button, Menu, @@ -34,7 +34,7 @@ import { MenuSeparator, Text, Tooltip, -} from "design-system"; +} from "@appsmith/ads"; interface DropdownOption { label?: string; diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneSearchInput.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneSearchInput.tsx index bc86533933..d764f7c8d7 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneSearchInput.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneSearchInput.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useRef, useCallback } from "react"; import styled from "styled-components"; -import { SearchInput } from "design-system"; +import { SearchInput } from "@appsmith/ads"; import { useSelector } from "react-redux"; import { getShouldFocusPanelPropertySearch, diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneTab.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneTab.tsx index a54bd52846..1548bac17e 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneTab.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneTab.tsx @@ -2,7 +2,7 @@ import React, { useCallback } from "react"; import styled from "styled-components"; import { useDispatch, useSelector } from "react-redux"; -import { Tabs, TabsList, Tab, TabPanel } from "design-system"; +import { Tabs, TabsList, Tab, TabPanel } from "@appsmith/ads"; import { getSelectedPropertyTabIndex } from "selectors/editorContextSelectors"; import { setSelectedPropertyTabIndex } from "actions/editorContextActions"; import type { AppState } from "ee/reducers"; diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx index 58fc7587be..ef599656e2 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx @@ -8,8 +8,8 @@ import { EditInteractionKind, SavingState, } from "@appsmith/ads-old"; -import type { TooltipPlacement } from "design-system"; -import { Tooltip, Button } from "design-system"; +import type { TooltipPlacement } from "@appsmith/ads"; +import { Tooltip, Button } from "@appsmith/ads"; import { updateWidgetName } from "actions/propertyPaneActions"; import type { AppState } from "ee/reducers"; import { getExistingWidgetNames } from "sagas/selectors"; diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx index fcdf70d5ac..1d2a66af30 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx @@ -26,7 +26,7 @@ import WalkthroughContext from "components/featureWalkthrough/walkthroughContext import { FEATURE_WALKTHROUGH_KEYS } from "constants/WalkthroughConstants"; import type { WidgetType } from "constants/WidgetConstants"; import { WIDGET_ID_SHOW_WALKTHROUGH } from "constants/WidgetConstants"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { SelectionRequestType } from "sagas/WidgetSelectUtils"; import { getWidgets } from "sagas/selectors"; import { getCurrentUser } from "selectors/usersSelectors"; diff --git a/app/client/src/pages/Editor/PropertyPane/PropertySection.tsx b/app/client/src/pages/Editor/PropertyPane/PropertySection.tsx index d8bd06078e..6329c2ee07 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertySection.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertySection.tsx @@ -10,7 +10,7 @@ import React, { import { Collapse } from "@blueprintjs/core"; import styled from "styled-components"; import { Colors } from "constants/Colors"; -import { Icon, Tag } from "design-system"; +import { Icon, Tag } from "@appsmith/ads"; import type { AppState } from "ee/reducers"; import { useDispatch, useSelector } from "react-redux"; import { getPropertySectionState } from "selectors/editorContextSelectors"; diff --git a/app/client/src/pages/Editor/PropertyPane/helpers.tsx b/app/client/src/pages/Editor/PropertyPane/helpers.tsx index e510d57523..8307db5b8a 100644 --- a/app/client/src/pages/Editor/PropertyPane/helpers.tsx +++ b/app/client/src/pages/Editor/PropertyPane/helpers.tsx @@ -5,7 +5,7 @@ import type { PropertyPaneControlConfig, PropertyPaneSectionConfig, } from "constants/PropertyControlConstants"; -import { Callout } from "design-system"; +import { Callout } from "@appsmith/ads"; import { debounce } from "lodash"; import React, { useCallback, useState } from "react"; import { layoutSystemBasedPropertyFilter } from "sagas/WidgetEnhancementHelpers"; diff --git a/app/client/src/pages/Editor/PropertyPaneHelpButton.tsx b/app/client/src/pages/Editor/PropertyPaneHelpButton.tsx index 532eb26ec1..ded7f93f3e 100644 --- a/app/client/src/pages/Editor/PropertyPaneHelpButton.tsx +++ b/app/client/src/pages/Editor/PropertyPaneHelpButton.tsx @@ -8,7 +8,7 @@ import { import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import WidgetFactory from "WidgetProvider/factory"; import { getSelectedWidget } from "sagas/selectors"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; function PropertyPaneHelpButton() { const selectedWidget = useSelector(getSelectedWidget); diff --git a/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx b/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx index ed5dff00fe..e7b83e79c7 100644 --- a/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx +++ b/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx @@ -8,7 +8,7 @@ import { Text, MenuSeparator, Flex, -} from "design-system"; +} from "@appsmith/ads"; import { ADD_NEW_WIDGET, CONNECT_EXISTING_WIDGET_LABEL, diff --git a/app/client/src/pages/Editor/QueryEditor/DatasourceSelector.tsx b/app/client/src/pages/Editor/QueryEditor/DatasourceSelector.tsx index 687f210dee..dabd69a821 100644 --- a/app/client/src/pages/Editor/QueryEditor/DatasourceSelector.tsx +++ b/app/client/src/pages/Editor/QueryEditor/DatasourceSelector.tsx @@ -1,6 +1,6 @@ import React from "react"; import { useSelector } from "react-redux"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import DropdownField from "components/editorComponents/form/fields/DropdownField"; import { CREATE_NEW_DATASOURCE, createMessage } from "ee/constants/messages"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx index 0e309d2474..a3c97d624f 100644 --- a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx +++ b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx @@ -6,7 +6,7 @@ import type { Datasource } from "entities/Datasource"; import type { Action, QueryAction, SaaSAction } from "entities/Action"; import { useDispatch, useSelector } from "react-redux"; import ActionSettings from "pages/Editor/ActionSettings"; -import { Button, Tab, TabPanel, Tabs, TabsList, Tooltip } from "design-system"; +import { Button, Tab, TabPanel, Tabs, TabsList, Tooltip } from "@appsmith/ads"; import styled from "styled-components"; import FormRow from "components/editorComponents/FormRow"; import { diff --git a/app/client/src/pages/Editor/QueryEditor/FormRender.tsx b/app/client/src/pages/Editor/QueryEditor/FormRender.tsx index 57c3b546d5..f45e305da3 100644 --- a/app/client/src/pages/Editor/QueryEditor/FormRender.tsx +++ b/app/client/src/pages/Editor/QueryEditor/FormRender.tsx @@ -22,7 +22,7 @@ import { import { isValidFormConfig } from "reducers/evaluationReducers/formEvaluationReducer"; import FormControl from "../FormControl"; import type { ControlProps } from "components/formControls/BaseControl"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; import type { QueryAction, SaaSAction } from "entities/Action"; interface Props { diff --git a/app/client/src/pages/Editor/QueryEditor/QueriesBlankState.tsx b/app/client/src/pages/Editor/QueryEditor/QueriesBlankState.tsx index 3ab95b5fc3..2b6aae11ce 100644 --- a/app/client/src/pages/Editor/QueryEditor/QueriesBlankState.tsx +++ b/app/client/src/pages/Editor/QueryEditor/QueriesBlankState.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Flex, Text } from "design-system"; +import { Flex, Text } from "@appsmith/ads"; import { importSvg } from "@appsmith/ads-old"; import { createMessage, EDITOR_PANE_TEXTS } from "ee/constants/messages"; diff --git a/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx b/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx index 23206d5c6c..2918c9df87 100644 --- a/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx +++ b/app/client/src/pages/Editor/QueryEditor/QueryEditorHeader.tsx @@ -1,6 +1,6 @@ import React, { useContext } from "react"; import ActionNameEditor from "components/editorComponents/ActionNameEditor"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { StyledFormRow } from "./EditorJSONtoForm"; import styled from "styled-components"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; diff --git a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx b/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx index 21b595c404..cb0e18711a 100644 --- a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx +++ b/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx @@ -13,7 +13,7 @@ import LogAdditionalInfo from "components/editorComponents/Debugger/ErrorLogs/co import LogHelper from "components/editorComponents/Debugger/ErrorLogs/components/LogHelper"; import LOG_TYPE from "entities/AppsmithConsole/logtype"; import { JsonWrapper } from "components/editorComponents/Debugger/ErrorLogs/components/LogCollapseData"; -import { Callout, Flex, SegmentedControl } from "design-system"; +import { Callout, Flex, SegmentedControl } from "@appsmith/ads"; import styled from "styled-components"; import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; diff --git a/app/client/src/pages/Editor/QueryEditor/index.tsx b/app/client/src/pages/Editor/QueryEditor/index.tsx index 6b99aef06f..c6135365ec 100644 --- a/app/client/src/pages/Editor/QueryEditor/index.tsx +++ b/app/client/src/pages/Editor/QueryEditor/index.tsx @@ -36,7 +36,7 @@ import ConvertToModuleInstanceCTA from "ee/pages/Editor/EntityEditor/ConvertToMo import { MODULE_TYPE } from "ee/constants/ModuleConstants"; import ConvertEntityNotification from "ee/pages/common/ConvertEntityNotification"; import { PluginType } from "entities/Action"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import { resolveIcon } from "../utils"; import { ENTITY_ICON_SIZE, EntityIcon } from "../Explorer/ExplorerIcons"; import { getIDEViewMode } from "selectors/ideSelectors"; diff --git a/app/client/src/pages/Editor/RealtimeAppEditors.tsx b/app/client/src/pages/Editor/RealtimeAppEditors.tsx index 353ca63aa7..e19964923a 100644 --- a/app/client/src/pages/Editor/RealtimeAppEditors.tsx +++ b/app/client/src/pages/Editor/RealtimeAppEditors.tsx @@ -12,7 +12,7 @@ import { } from "actions/appCollabActions"; import { getCurrentPageId } from "selectors/editorSelectors"; import { getIsAppLevelSocketConnected } from "selectors/websocketSelectors"; -import { Tooltip } from "design-system"; +import { Tooltip } from "@appsmith/ads"; const UserImageContainer = styled.div` display: flex; diff --git a/app/client/src/pages/Editor/RequestConfirmationModal.tsx b/app/client/src/pages/Editor/RequestConfirmationModal.tsx index 1586b5a065..f50310b9a6 100644 --- a/app/client/src/pages/Editor/RequestConfirmationModal.tsx +++ b/app/client/src/pages/Editor/RequestConfirmationModal.tsx @@ -14,7 +14,7 @@ import { ModalContent, ModalFooter, ModalHeader, -} from "design-system"; +} from "@appsmith/ads"; import { createMessage, QUERY_CONFIRMATION_MODAL_MESSAGE, diff --git a/app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx b/app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx index d31deeaafe..d309a9f135 100644 --- a/app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx +++ b/app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx @@ -18,7 +18,7 @@ import RenderDatasourceInformation from "pages/Editor/DataSourceEditor/Datasourc import { BaseButton } from "components/designSystems/appsmith/BaseButton"; import { saasEditorDatasourceIdURL } from "ee/RouteBuilder"; import { getAssetUrl } from "ee/utils/airgapHelpers"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; const Wrapper = styled.div` border: 2px solid #d6d6d6; diff --git a/app/client/src/pages/Editor/ThemePropertyPane/DeleteThemeModal.tsx b/app/client/src/pages/Editor/ThemePropertyPane/DeleteThemeModal.tsx index b653e5109a..a3dc7484ff 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/DeleteThemeModal.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/DeleteThemeModal.tsx @@ -13,7 +13,7 @@ import { ModalFooter, Text, ModalBody, -} from "design-system"; +} from "@appsmith/ads"; interface DeleteThemeModalProps { isOpen: boolean; diff --git a/app/client/src/pages/Editor/ThemePropertyPane/SettingSection.tsx b/app/client/src/pages/Editor/ThemePropertyPane/SettingSection.tsx index 758f0e6377..8496125b85 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/SettingSection.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/SettingSection.tsx @@ -3,7 +3,7 @@ import type { ComponentPropsWithoutRef } from "react"; import React, { useState } from "react"; import { Collapse } from "@blueprintjs/core"; import styled from "styled-components"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; const SettingsWrapper = styled.div` color: var(--ads-v2-color-fg); diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeBetaCard.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeBetaCard.tsx index 87077b524b..e318055ddb 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeBetaCard.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeBetaCard.tsx @@ -7,7 +7,7 @@ import { APP_THEME_BETA_CARD_HEADING, APP_THEME_BETA_CARD_CONTENT, } from "ee/constants/messages"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; export function ThemeBetaCard() { const dispatch = useDispatch(); diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx index 82fdd8c626..1e63890a73 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx @@ -26,7 +26,7 @@ import { MenuContent, MenuTrigger, MenuItem, -} from "design-system"; +} from "@appsmith/ads"; import ThemeBoxShadowControl from "./controls/ThemeShadowControl"; import { getCurrentApplicationId } from "selectors/editorSelectors"; import ThemeBorderRadiusControl from "./controls/ThemeBorderRadiusControl"; diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeSelector.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeSelector.tsx index a98d120afd..d192ffef18 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeSelector.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeSelector.tsx @@ -10,7 +10,7 @@ import { ThemeCard } from "./ThemeCard"; import { SettingSection } from "./SettingSection"; import { setAppThemingModeStackAction } from "actions/appThemingActions"; import styled from "styled-components"; -import { Link } from "design-system"; +import { Link } from "@appsmith/ads"; const Title = styled.h3` color: var(--ads-v2-color-fg-emphasis); diff --git a/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeBorderRadiusControl.tsx b/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeBorderRadiusControl.tsx index 798da1a67c..782caea647 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeBorderRadiusControl.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeBorderRadiusControl.tsx @@ -6,7 +6,7 @@ import { SegmentedControl, type SegmentedControlOption, Tooltip, -} from "design-system"; +} from "@appsmith/ads"; interface ThemeBorderRadiusControlProps { options: { diff --git a/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeColorControl.tsx b/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeColorControl.tsx index 5099c9cac9..c8814af64b 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeColorControl.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeColorControl.tsx @@ -3,7 +3,7 @@ import React, { useState } from "react"; import styled from "styled-components"; import type { AppTheme } from "entities/AppTheming"; -import { Tooltip } from "design-system"; +import { Tooltip } from "@appsmith/ads"; import ColorPickerComponent from "components/propertyControls/ColorPickerComponentV2"; import { capitalizeFirstLetter } from "utils/helpers"; diff --git a/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeFontControl.tsx b/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeFontControl.tsx index a7315ba17c..3f60251505 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeFontControl.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeFontControl.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Select, Option } from "design-system"; +import { Select, Option } from "@appsmith/ads"; import type { AppTheme } from "entities/AppTheming"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeShadowControl.tsx b/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeShadowControl.tsx index 498976e7bf..ba36a533ac 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeShadowControl.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/controls/ThemeShadowControl.tsx @@ -1,11 +1,11 @@ import React, { useCallback } from "react"; import type { AppTheme } from "entities/AppTheming"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import { invertedBoxShadowOptions, sizeMappings, } from "constants/ThemeConstants"; -import { SegmentedControl } from "design-system"; +import { SegmentedControl } from "@appsmith/ads"; interface ThemeBoxShadowControlProps { options: { diff --git a/app/client/src/pages/Editor/ToggleModeButton.tsx b/app/client/src/pages/Editor/ToggleModeButton.tsx index 8aa04592f5..570c0f29b0 100644 --- a/app/client/src/pages/Editor/ToggleModeButton.tsx +++ b/app/client/src/pages/Editor/ToggleModeButton.tsx @@ -1,6 +1,6 @@ import React, { useCallback } from "react"; import { useDispatch, useSelector } from "react-redux"; -import { Tooltip, ToggleButton } from "design-system"; +import { Tooltip, ToggleButton } from "@appsmith/ads"; import type { AppState } from "ee/reducers"; import { APP_MODE } from "entities/App"; diff --git a/app/client/src/pages/Editor/WDSThemePropertyPane/components/AppMaxWidthSelect.tsx b/app/client/src/pages/Editor/WDSThemePropertyPane/components/AppMaxWidthSelect.tsx index e62b6aaf71..7c50e894ce 100644 --- a/app/client/src/pages/Editor/WDSThemePropertyPane/components/AppMaxWidthSelect.tsx +++ b/app/client/src/pages/Editor/WDSThemePropertyPane/components/AppMaxWidthSelect.tsx @@ -1,5 +1,5 @@ import { APP_MAX_WIDTH } from "@design-system/theming"; -import { Option, Select } from "design-system"; +import { Option, Select } from "@appsmith/ads"; import React from "react"; interface AppMaxWidthSelectProps { diff --git a/app/client/src/pages/Editor/WDSThemePropertyPane/index.tsx b/app/client/src/pages/Editor/WDSThemePropertyPane/index.tsx index 0d7b2e98a4..a5323a37a9 100644 --- a/app/client/src/pages/Editor/WDSThemePropertyPane/index.tsx +++ b/app/client/src/pages/Editor/WDSThemePropertyPane/index.tsx @@ -13,7 +13,7 @@ import { LeftIcon, StyledInputGroup, } from "components/propertyControls/ColorPickerComponentV2"; -import { SegmentedControl, Tooltip, Select, Option, Icon } from "design-system"; +import { SegmentedControl, Tooltip, Select, Option, Icon } from "@appsmith/ads"; import styles from "./styles.module.css"; diff --git a/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx b/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx index bfd292f576..78a9daf0bd 100644 --- a/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx +++ b/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx @@ -1,4 +1,4 @@ -import { Tooltip } from "design-system"; +import { Tooltip } from "@appsmith/ads"; import React, { useEffect, useState } from "react"; import { modText } from "utils/helpers"; import { useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/WidgetsEditor/components/MainContainerWrapper.tsx b/app/client/src/pages/Editor/WidgetsEditor/components/MainContainerWrapper.tsx index b652780ecc..8c61bfd651 100644 --- a/app/client/src/pages/Editor/WidgetsEditor/components/MainContainerWrapper.tsx +++ b/app/client/src/pages/Editor/WidgetsEditor/components/MainContainerWrapper.tsx @@ -13,7 +13,7 @@ import { getCanvasClassName } from "utils/generators"; import { forceOpenWidgetPanel } from "actions/widgetSidebarActions"; import classNames from "classnames"; import Centered from "components/designSystems/appsmith/CenteredWrapper"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; import equal from "fast-deep-equal/es6"; import { WidgetGlobaStyles } from "globalStyles/WidgetGlobalStyles"; import { useDispatch } from "react-redux"; diff --git a/app/client/src/pages/Editor/commons/LockEntityExplorer.tsx b/app/client/src/pages/Editor/commons/LockEntityExplorer.tsx index 056c1dec40..214c3a1b48 100644 --- a/app/client/src/pages/Editor/commons/LockEntityExplorer.tsx +++ b/app/client/src/pages/Editor/commons/LockEntityExplorer.tsx @@ -1,5 +1,5 @@ import React, { useCallback } from "react"; -import { Button, Icon, Tooltip } from "design-system"; +import { Button, Icon, Tooltip } from "@appsmith/ads"; import { CLOSE_ENTITY_EXPLORER_MESSAGE, LOCK_ENTITY_EXPLORER_MESSAGE, diff --git a/app/client/src/pages/Editor/gitSync/DisableAutocommitModal.tsx b/app/client/src/pages/Editor/gitSync/DisableAutocommitModal.tsx index 95307419c1..ac54f35b09 100644 --- a/app/client/src/pages/Editor/gitSync/DisableAutocommitModal.tsx +++ b/app/client/src/pages/Editor/gitSync/DisableAutocommitModal.tsx @@ -16,7 +16,7 @@ import { ModalFooter, ModalHeader, Text, -} from "design-system"; +} from "@appsmith/ads"; import React from "react"; import { useSelector, useDispatch } from "react-redux"; import { diff --git a/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx b/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx index 3919c18e84..b48dc63311 100644 --- a/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx +++ b/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx @@ -21,7 +21,7 @@ import { ModalFooter, ModalHeader, Text, -} from "design-system"; +} from "@appsmith/ads"; import { APPLICATION_NAME, createMessage, diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx index 180aefe113..0155690815 100644 --- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx @@ -6,7 +6,7 @@ import { createMessage, } from "ee/constants/messages"; import { updateGitDefaultBranch } from "actions/gitSyncActions"; -import { Button, Link, Option, Select, Text } from "design-system"; +import { Button, Link, Option, Select, Text } from "@appsmith/ads"; import React, { useEffect, useMemo, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { getGitBranches } from "selectors/gitSyncSelectors"; diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitProtectedBranches.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitProtectedBranches.tsx index 723d0435ca..096d8b4cda 100644 --- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitProtectedBranches.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitProtectedBranches.tsx @@ -7,7 +7,7 @@ import { createMessage, } from "ee/constants/messages"; import { updateGitProtectedBranchesInit } from "actions/gitSyncActions"; -import { Button, Link, Option, Select, Text } from "design-system"; +import { Button, Link, Option, Select, Text } from "@appsmith/ads"; import { xor } from "lodash"; import React, { useEffect, useMemo, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx index 8d081683e2..d7f5a87014 100644 --- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx @@ -16,7 +16,7 @@ import { setGitSettingsModalOpenAction, } from "actions/gitSyncActions"; import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; -import { Button, Divider, Text } from "design-system"; +import { Button, Divider, Text } from "@appsmith/ads"; import React from "react"; import { useDispatch, useSelector } from "react-redux"; import { diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/GitUserSettings.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/GitUserSettings.tsx index 4fd687f7a0..d485852acb 100644 --- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/GitUserSettings.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/GitUserSettings.tsx @@ -12,7 +12,7 @@ import { createMessage, } from "ee/constants/messages"; import styled, { keyframes } from "styled-components"; -import { Button, Input, Switch, Text } from "design-system"; +import { Button, Input, Switch, Text } from "@appsmith/ads"; import { getGlobalGitConfig, getLocalGitConfig, diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/index.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/index.tsx index ce9f8c2bd6..bfaaa76f3a 100644 --- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/index.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/index.tsx @@ -6,7 +6,7 @@ import { import { useDispatch, useSelector } from "react-redux"; import { setGitSettingsModalOpenAction } from "actions/gitSyncActions"; -import { Modal, ModalBody, ModalContent, ModalHeader } from "design-system"; +import { Modal, ModalBody, ModalContent, ModalHeader } from "@appsmith/ads"; import styled from "styled-components"; import Menu from "../Menu"; import { GitSettingsTab } from "reducers/uiReducers/gitSyncReducer"; diff --git a/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV1.tsx b/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV1.tsx index a2fdbce6de..0ee3a632f5 100644 --- a/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV1.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV1.tsx @@ -16,7 +16,7 @@ import GitConnection from "../Tabs/GitConnection"; import GitErrorPopup from "../components/GitErrorPopup"; import styled from "styled-components"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { Modal, ModalContent, ModalHeader } from "design-system"; +import { Modal, ModalContent, ModalHeader } from "@appsmith/ads"; import { createMessage, GIT_CONNECTION, diff --git a/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV2.tsx b/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV2.tsx index df4572b10a..915e63aac2 100644 --- a/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV2.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV2.tsx @@ -23,7 +23,7 @@ import { IMPORT_APP, } from "ee/constants/messages"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { Modal, ModalContent, ModalHeader } from "design-system"; +import { Modal, ModalContent, ModalHeader } from "@appsmith/ads"; import GitConnectionV2 from "../Tabs/GitConnectionV2"; import { GitSyncModalTab } from "entities/GitSync"; import ConnectionSuccess from "../Tabs/ConnectionSuccess"; diff --git a/app/client/src/pages/Editor/gitSync/ImportSuccessModal.tsx b/app/client/src/pages/Editor/gitSync/ImportSuccessModal.tsx index 3e8a8ede0b..bea5a7726b 100644 --- a/app/client/src/pages/Editor/gitSync/ImportSuccessModal.tsx +++ b/app/client/src/pages/Editor/gitSync/ImportSuccessModal.tsx @@ -14,7 +14,7 @@ import { ModalFooter, ModalHeader, Text, -} from "design-system"; +} from "@appsmith/ads"; const BodyContainer = styled.div` display: flex; diff --git a/app/client/src/pages/Editor/gitSync/Menu.tsx b/app/client/src/pages/Editor/gitSync/Menu.tsx index 80d53f5c33..3dde67ab96 100644 --- a/app/client/src/pages/Editor/gitSync/Menu.tsx +++ b/app/client/src/pages/Editor/gitSync/Menu.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Tab, Tabs, TabsList } from "design-system"; +import { Tab, Tabs, TabsList } from "@appsmith/ads"; import styled from "styled-components"; interface Props { diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx index c76a29f688..ac603c1937 100644 --- a/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx +++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx @@ -15,7 +15,7 @@ import { showBranchPopupSelector, } from "selectors/gitSyncSelectors"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { Button, Icon, Tooltip } from "design-system"; +import { Button, Icon, Tooltip } from "@appsmith/ads"; import { isEllipsisActive } from "utils/helpers"; import { importRemixIcon } from "@appsmith/ads-old"; import { setShowBranchPopupAction } from "actions/gitSyncActions"; diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx index a58fb4861b..b70cd6363e 100644 --- a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx +++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx @@ -41,7 +41,7 @@ import { } from "selectors/gitSyncSelectors"; import SpinnerLoader from "pages/common/SpinnerLoader"; import { getTypographyByKey } from "@appsmith/ads-old"; -import { Button, Icon, Tooltip } from "design-system"; +import { Button, Icon, Tooltip } from "@appsmith/ads"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; diff --git a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx index 30c3b47140..8045363c0c 100644 --- a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx +++ b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx @@ -58,7 +58,7 @@ import { toast, Button, Text, -} from "design-system"; +} from "@appsmith/ads"; import { isEnvironmentConfigured } from "ee/utils/Environments"; import { keyBy } from "lodash"; import type { Plugin } from "api/PluginApi"; diff --git a/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx b/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx index 2fa846027c..f642a86342 100644 --- a/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx +++ b/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx @@ -17,7 +17,7 @@ import { ModalContent, ModalHeader, Text, -} from "design-system"; +} from "@appsmith/ads"; import { Colors } from "constants/Colors"; import { CONTACT_SALES_MESSAGE_ON_INTERCOM, diff --git a/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx b/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx index ad17133658..b5c8e15c9e 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx @@ -22,7 +22,7 @@ import { Text, Link, Tooltip, -} from "design-system"; +} from "@appsmith/ads"; import React, { useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx index 86d78163cc..b6795e47dc 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx @@ -22,7 +22,7 @@ import { ModalFooter, Text, Tooltip, -} from "design-system"; +} from "@appsmith/ads"; import { getConflictFoundDocUrlDeploy, getGitCommitAndPushError, diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx index b47b308c01..cf59d997d4 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx @@ -67,7 +67,7 @@ import { Link, ModalBody, ModalFooter, -} from "design-system"; +} from "@appsmith/ads"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { GIT_DOC_URLs, isValidGitRemoteUrl } from "../utils"; import { useGitConnect, useSSHKeyPair } from "../hooks"; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx index 4c6d77d238..d70ac524d3 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx @@ -20,7 +20,7 @@ import { Select, Text, toast, -} from "design-system"; +} from "@appsmith/ads"; import styled from "styled-components"; import { CopyButton } from "../../components/CopyButton"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx index a8cd836e16..8295558df5 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx @@ -18,7 +18,7 @@ import { Radio, RadioGroup, Text, -} from "design-system"; +} from "@appsmith/ads"; import styled from "styled-components"; import { GIT_DEMO_GIF } from "./constants"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/GenerateSSH.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/GenerateSSH.tsx index 2fc724d127..293a8daa25 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/GenerateSSH.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/GenerateSSH.tsx @@ -16,7 +16,7 @@ import { Icon, Input, Text, -} from "design-system"; +} from "@appsmith/ads"; import { isValidGitRemoteUrl } from "../../utils"; import { COPY_SSH_URL_MESSAGE, diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/Steps.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/Steps.tsx index e702e2ce3e..743d3d2c24 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/Steps.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/Steps.tsx @@ -1,4 +1,4 @@ -import { Button, Divider, Text } from "design-system"; +import { Button, Divider, Text } from "@appsmith/ads"; import noop from "lodash/noop"; import React, { Fragment } from "react"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx index 9c7ecc29ad..79378e85ab 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { Button, ModalBody, ModalFooter } from "design-system"; +import { Button, ModalBody, ModalFooter } from "@appsmith/ads"; import Steps from "./Steps"; import type { GitProvider } from "./ChooseGitProvider"; import ChooseGitProvider from "./ChooseGitProvider"; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/styles.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/styles.tsx index e117c45258..34592a07e0 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/styles.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/styles.tsx @@ -1,4 +1,4 @@ -import { Callout, Text } from "design-system"; +import { Callout, Text } from "@appsmith/ads"; import styled from "styled-components"; export const WellContainer = styled.div` diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx index 487796eebc..af733b4782 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx @@ -51,7 +51,7 @@ import { Icon, ModalFooter, ModalBody, -} from "design-system"; +} from "@appsmith/ads"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import type { Theme } from "constants/DefaultTheme"; diff --git a/app/client/src/pages/Editor/gitSync/components/BranchList.tsx b/app/client/src/pages/Editor/gitSync/components/BranchList.tsx index eb4936f9d1..b7b7cc4717 100644 --- a/app/client/src/pages/Editor/gitSync/components/BranchList.tsx +++ b/app/client/src/pages/Editor/gitSync/components/BranchList.tsx @@ -37,7 +37,7 @@ import { Button, SearchInput, Text, -} from "design-system"; +} from "@appsmith/ads"; import { get } from "lodash"; import { isLocalBranch, diff --git a/app/client/src/pages/Editor/gitSync/components/BranchListItem.tsx b/app/client/src/pages/Editor/gitSync/components/BranchListItem.tsx index e73801f324..36b1a73d68 100644 --- a/app/client/src/pages/Editor/gitSync/components/BranchListItem.tsx +++ b/app/client/src/pages/Editor/gitSync/components/BranchListItem.tsx @@ -4,7 +4,7 @@ import { BranchListItemContainer } from "./BranchListItemContainer"; import DefaultTag from "./DefaultTag"; import { useHover } from "../hooks"; import BranchMoreMenu from "./BranchMoreMenu"; -import { Tooltip, Text, Spinner } from "design-system"; +import { Tooltip, Text, Spinner } from "@appsmith/ads"; import { isEllipsisActive } from "utils/helpers"; import { useSelector } from "react-redux"; import { getBranchSwitchingDetails } from "selectors/gitSyncSelectors"; diff --git a/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx b/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx index 971815899c..221160ffbf 100644 --- a/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx +++ b/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx @@ -18,7 +18,7 @@ import { MenuItem, MenuTrigger, toast, -} from "design-system"; +} from "@appsmith/ads"; interface Props { branchName: string; diff --git a/app/client/src/pages/Editor/gitSync/components/ConflictInfo.tsx b/app/client/src/pages/Editor/gitSync/components/ConflictInfo.tsx index 30e2bf007d..2e7c076454 100644 --- a/app/client/src/pages/Editor/gitSync/components/ConflictInfo.tsx +++ b/app/client/src/pages/Editor/gitSync/components/ConflictInfo.tsx @@ -6,7 +6,7 @@ import { LEARN_MORE, OPEN_REPO, } from "ee/constants/messages"; -import { Button, Callout } from "design-system"; +import { Button, Callout } from "@appsmith/ads"; import { Space } from "./StyledComponents"; const Row = styled.div` diff --git a/app/client/src/pages/Editor/gitSync/components/CopyButton.tsx b/app/client/src/pages/Editor/gitSync/components/CopyButton.tsx index 9a7e4560ad..4d14a39ae8 100644 --- a/app/client/src/pages/Editor/gitSync/components/CopyButton.tsx +++ b/app/client/src/pages/Editor/gitSync/components/CopyButton.tsx @@ -1,6 +1,6 @@ import type { CSSProperties } from "react"; import React, { useRef, useState } from "react"; -import { Button, Icon, Tooltip } from "design-system"; +import { Button, Icon, Tooltip } from "@appsmith/ads"; import styled from "styled-components"; import copy from "copy-to-clipboard"; import noop from "lodash/noop"; diff --git a/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx b/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx index 8c986a0e3e..a32476ec34 100644 --- a/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx +++ b/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx @@ -11,7 +11,7 @@ import React, { useState, useEffect, useCallback } from "react"; import styled from "styled-components"; import { CREDENTIAL_MODE } from "../constants"; import { DOCS_BASE_URL } from "constants/ThirdPartyConstants"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; const Container = styled.div` margin-top: ${(props) => props.theme.spaces[7]}px; diff --git a/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx b/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx index 78600a5ec4..6971596687 100644 --- a/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx +++ b/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx @@ -1,6 +1,6 @@ import React from "react"; import { Text, TextType } from "@appsmith/ads-old"; -import { Icon, Tooltip } from "design-system"; +import { Icon, Tooltip } from "@appsmith/ads"; import type { Datasource } from "entities/Datasource"; import styled from "styled-components"; import { getAssetUrl } from "ee/utils/airgapHelpers"; diff --git a/app/client/src/pages/Editor/gitSync/components/DefaultTag.tsx b/app/client/src/pages/Editor/gitSync/components/DefaultTag.tsx index 3faf42673b..d56c12ab43 100644 --- a/app/client/src/pages/Editor/gitSync/components/DefaultTag.tsx +++ b/app/client/src/pages/Editor/gitSync/components/DefaultTag.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Tag } from "design-system"; +import { Tag } from "@appsmith/ads"; export default function DefaultTag() { return ( diff --git a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx index 59a9642ef1..0feb1fc806 100644 --- a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx +++ b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx @@ -15,7 +15,7 @@ import SuccessTick from "pages/common/SuccessTick"; import { howMuchTimeBeforeText } from "utils/helpers"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { viewerURL } from "ee/RouteBuilder"; -import { Link, Text } from "design-system"; +import { Link, Text } from "@appsmith/ads"; import { importSvg } from "@appsmith/ads-old"; const CloudyIcon = importSvg( diff --git a/app/client/src/pages/Editor/gitSync/components/DiscardChangesError.tsx b/app/client/src/pages/Editor/gitSync/components/DiscardChangesError.tsx index 5bee93c45b..bfcb9bc265 100644 --- a/app/client/src/pages/Editor/gitSync/components/DiscardChangesError.tsx +++ b/app/client/src/pages/Editor/gitSync/components/DiscardChangesError.tsx @@ -1,8 +1,8 @@ import React from "react"; import type { GitErrorType } from "reducers/uiReducers/gitSyncReducer"; import styled from "styled-components"; -import { Callout } from "design-system"; -import type { CalloutProps } from "design-system"; +import { Callout } from "@appsmith/ads"; +import type { CalloutProps } from "@appsmith/ads"; const Container = styled.div` margin: 8px 0 16px; diff --git a/app/client/src/pages/Editor/gitSync/components/DiscardChangesWarning.tsx b/app/client/src/pages/Editor/gitSync/components/DiscardChangesWarning.tsx index bd26cc3ac6..730a419655 100644 --- a/app/client/src/pages/Editor/gitSync/components/DiscardChangesWarning.tsx +++ b/app/client/src/pages/Editor/gitSync/components/DiscardChangesWarning.tsx @@ -4,7 +4,7 @@ import { DISCARD_CHANGES_WARNING, DISCARD_MESSAGE, } from "ee/constants/messages"; -import { Callout, Text } from "design-system"; +import { Callout, Text } from "@appsmith/ads"; import styled from "styled-components"; const Container = styled.div` diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList/ExpandableChange.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList/ExpandableChange.tsx index cf3f83aa91..8eee0232ce 100644 --- a/app/client/src/pages/Editor/gitSync/components/GitChangesList/ExpandableChange.tsx +++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList/ExpandableChange.tsx @@ -4,7 +4,7 @@ import { CollapsibleHeader, Icon, Text, -} from "design-system"; +} from "@appsmith/ads"; import React from "react"; import type { GitStatusData } from "reducers/uiReducers/gitSyncReducer"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList/PageChanges.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList/PageChanges.tsx index 0a088a6553..c45bb10a4d 100644 --- a/app/client/src/pages/Editor/gitSync/components/GitChangesList/PageChanges.tsx +++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList/PageChanges.tsx @@ -4,7 +4,7 @@ import { CollapsibleHeader, Icon, Text, -} from "design-system"; +} from "@appsmith/ads"; import React, { useMemo } from "react"; import type { GitStatusData } from "reducers/uiReducers/gitSyncReducer"; import { ExpandableChange, ExpandableChangeKind } from "./ExpandableChange"; diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx index c2793797e9..4484266550 100644 --- a/app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx +++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx @@ -1,6 +1,6 @@ import React from "react"; import type { GitStatusData } from "reducers/uiReducers/gitSyncReducer"; -import { Icon, Text } from "design-system"; +import { Icon, Text } from "@appsmith/ads"; import { NOT_PUSHED_YET, TRY_TO_PULL, diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList/index.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList/index.tsx index 9080e53e8a..bbb0ee34c5 100644 --- a/app/client/src/pages/Editor/gitSync/components/GitChangesList/index.tsx +++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList/index.tsx @@ -5,7 +5,7 @@ import { getGitStatus, getIsFetchingGitStatus, } from "selectors/gitSyncSelectors"; -import { Callout } from "design-system"; +import { Callout } from "@appsmith/ads"; import { ExpandableChange, ExpandableChangeKind } from "./ExpandableChange"; import StaticChange, { StaticChangeKind } from "./StaticChange"; import PageChanges from "./PageChanges"; diff --git a/app/client/src/pages/Editor/gitSync/components/GitConnectError.tsx b/app/client/src/pages/Editor/gitSync/components/GitConnectError.tsx index 88a728d548..608c68633a 100644 --- a/app/client/src/pages/Editor/gitSync/components/GitConnectError.tsx +++ b/app/client/src/pages/Editor/gitSync/components/GitConnectError.tsx @@ -4,7 +4,7 @@ import { getConnectingErrorDocUrl, getGitConnectError, } from "selectors/gitSyncSelectors"; -import { Callout, Text } from "design-system"; +import { Callout, Text } from "@appsmith/ads"; import styled from "styled-components"; const Container = styled.div` diff --git a/app/client/src/pages/Editor/gitSync/components/GitErrorPopup.tsx b/app/client/src/pages/Editor/gitSync/components/GitErrorPopup.tsx index 4d3b22a908..181714cb73 100644 --- a/app/client/src/pages/Editor/gitSync/components/GitErrorPopup.tsx +++ b/app/client/src/pages/Editor/gitSync/components/GitErrorPopup.tsx @@ -16,7 +16,7 @@ import { Colors } from "constants/Colors"; import ConflictInfo from "../components/ConflictInfo"; import { getCurrentAppGitMetaData } from "ee/selectors/applicationSelectors"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; const StyledGitErrorPopup = styled.div` & { diff --git a/app/client/src/pages/Editor/gitSync/components/Link.tsx b/app/client/src/pages/Editor/gitSync/components/Link.tsx index 27c5ff86f1..0a3bde07c7 100644 --- a/app/client/src/pages/Editor/gitSync/components/Link.tsx +++ b/app/client/src/pages/Editor/gitSync/components/Link.tsx @@ -2,7 +2,7 @@ import React from "react"; import { Colors } from "constants/Colors"; import styled from "styled-components"; import { Classes, Text, Case, FontWeight, TextType } from "@appsmith/ads-old"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; const LinkText = styled.div<{ color?: string }>` cursor: pointer; diff --git a/app/client/src/pages/Editor/gitSync/components/LocalBranchList.tsx b/app/client/src/pages/Editor/gitSync/components/LocalBranchList.tsx index a28d8d3719..410cc13482 100644 --- a/app/client/src/pages/Editor/gitSync/components/LocalBranchList.tsx +++ b/app/client/src/pages/Editor/gitSync/components/LocalBranchList.tsx @@ -2,7 +2,7 @@ import { BranchListItem } from "./BranchListItem"; import { getIsActiveItem } from "../utils"; import React from "react"; import { createMessage, LOCAL_BRANCHES } from "ee/constants/messages"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; /** * LocalBranchList: returns a list of local branches diff --git a/app/client/src/pages/Editor/gitSync/components/MergeStatus.tsx b/app/client/src/pages/Editor/gitSync/components/MergeStatus.tsx index 366b3a1efb..8f1fb70536 100644 --- a/app/client/src/pages/Editor/gitSync/components/MergeStatus.tsx +++ b/app/client/src/pages/Editor/gitSync/components/MergeStatus.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import StatusLoader from "./StatusLoader"; -import { Icon, Text } from "design-system"; +import { Icon, Text } from "@appsmith/ads"; const Flex = styled.div` display: flex; diff --git a/app/client/src/pages/Editor/gitSync/components/PushFailedWarning.tsx b/app/client/src/pages/Editor/gitSync/components/PushFailedWarning.tsx index d25eda7162..4be7ecd2c2 100644 --- a/app/client/src/pages/Editor/gitSync/components/PushFailedWarning.tsx +++ b/app/client/src/pages/Editor/gitSync/components/PushFailedWarning.tsx @@ -1,4 +1,4 @@ -import { Callout } from "design-system"; +import { Callout } from "@appsmith/ads"; import { Text, TextType } from "@appsmith/ads-old"; import React from "react"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/gitSync/components/ReconnectSSHError.tsx b/app/client/src/pages/Editor/gitSync/components/ReconnectSSHError.tsx index a0342af5e8..694c327cfb 100644 --- a/app/client/src/pages/Editor/gitSync/components/ReconnectSSHError.tsx +++ b/app/client/src/pages/Editor/gitSync/components/ReconnectSSHError.tsx @@ -1,4 +1,4 @@ -import { Callout, Text, toast } from "design-system"; +import { Callout, Text, toast } from "@appsmith/ads"; import React, { useEffect, useState } from "react"; import { useDispatch } from "react-redux"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/gitSync/components/RemoteBranchList.tsx b/app/client/src/pages/Editor/gitSync/components/RemoteBranchList.tsx index 257586bff3..52a3bd5873 100644 --- a/app/client/src/pages/Editor/gitSync/components/RemoteBranchList.tsx +++ b/app/client/src/pages/Editor/gitSync/components/RemoteBranchList.tsx @@ -1,7 +1,7 @@ import { RemoteBranchListItem } from "./RemoteBranchListItem"; import React from "react"; import { createMessage, REMOTE_BRANCHES } from "ee/constants/messages"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; /** * RemoteBranchList: returns a list of remote branches diff --git a/app/client/src/pages/Editor/gitSync/components/RemoteBranchListItem.tsx b/app/client/src/pages/Editor/gitSync/components/RemoteBranchListItem.tsx index 3fe2218fd1..e1f6bcbdab 100644 --- a/app/client/src/pages/Editor/gitSync/components/RemoteBranchListItem.tsx +++ b/app/client/src/pages/Editor/gitSync/components/RemoteBranchListItem.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Spinner, Tooltip } from "design-system"; +import { Spinner, Tooltip } from "@appsmith/ads"; import { isEllipsisActive } from "utils/helpers"; import { Text, TextType } from "@appsmith/ads-old"; import { BranchListItemContainer } from "./BranchListItemContainer"; diff --git a/app/client/src/pages/Editor/gitSync/components/StatusLoader.tsx b/app/client/src/pages/Editor/gitSync/components/StatusLoader.tsx index 075b0b2a11..281e39c866 100644 --- a/app/client/src/pages/Editor/gitSync/components/StatusLoader.tsx +++ b/app/client/src/pages/Editor/gitSync/components/StatusLoader.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import SpinnerLoader from "pages/common/SpinnerLoader"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; const LoaderWrapper = styled.div` display: flex; diff --git a/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings.tsx b/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings.tsx index 1ee72662b3..e4baad98ea 100644 --- a/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings.tsx +++ b/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings.tsx @@ -16,7 +16,7 @@ import { getIsFetchingGlobalGitConfig, getIsFetchingLocalGitConfig, } from "selectors/gitSyncSelectors"; -import { Checkbox, Input, Text } from "design-system"; +import { Checkbox, Input, Text } from "@appsmith/ads"; const InputContainer = styled.div` display: flex; diff --git a/app/client/src/pages/Editor/gitSync/components/ssh-key/CopySSHKey.tsx b/app/client/src/pages/Editor/gitSync/components/ssh-key/CopySSHKey.tsx index aa14d731d9..e327b2c5f5 100644 --- a/app/client/src/pages/Editor/gitSync/components/ssh-key/CopySSHKey.tsx +++ b/app/client/src/pages/Editor/gitSync/components/ssh-key/CopySSHKey.tsx @@ -1,7 +1,7 @@ import { TooltipWrapper, IconContainer } from "./StyledComponents"; import { COPY_SSH_KEY, createMessage } from "ee/constants/messages"; import React from "react"; -import { Button, Icon, Tooltip } from "design-system"; +import { Button, Icon, Tooltip } from "@appsmith/ads"; function getCopiedSuccessIcon() { return ( diff --git a/app/client/src/pages/Editor/gitSync/components/ssh-key/getConfirmMenuItem.tsx b/app/client/src/pages/Editor/gitSync/components/ssh-key/getConfirmMenuItem.tsx index 53a8532940..c956746698 100644 --- a/app/client/src/pages/Editor/gitSync/components/ssh-key/getConfirmMenuItem.tsx +++ b/app/client/src/pages/Editor/gitSync/components/ssh-key/getConfirmMenuItem.tsx @@ -9,7 +9,7 @@ import { REGENERATE_KEY_CONFIRM_MESSAGE, YES, } from "ee/constants/messages"; -import { Button, MenuItem, Text } from "design-system"; +import { Button, MenuItem, Text } from "@appsmith/ads"; /** * getConfirmMenuItem diff --git a/app/client/src/pages/Editor/gitSync/components/ssh-key/getNotificationBanner.tsx b/app/client/src/pages/Editor/gitSync/components/ssh-key/getNotificationBanner.tsx index 3df7891248..7d2a63efda 100644 --- a/app/client/src/pages/Editor/gitSync/components/ssh-key/getNotificationBanner.tsx +++ b/app/client/src/pages/Editor/gitSync/components/ssh-key/getNotificationBanner.tsx @@ -4,7 +4,7 @@ import { createMessage, DEPLOY_KEY_USAGE_GUIDE_MESSAGE, } from "ee/constants/messages"; -import { Callout } from "design-system"; +import { Callout } from "@appsmith/ads"; /** * getNotificationBanner returns a notification banner about copying the key to repo settings. diff --git a/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx b/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx index ba033212df..d028c88780 100644 --- a/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx +++ b/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx @@ -29,7 +29,7 @@ import { Text, Icon, MenuGroupName, -} from "design-system"; +} from "@appsmith/ads"; interface KeysProps { copyToClipboard: () => void; diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx index 8db51af558..fae93566e3 100644 --- a/app/client/src/pages/Editor/index.tsx +++ b/app/client/src/pages/Editor/index.tsx @@ -37,7 +37,7 @@ import { APP_MODE } from "entities/App"; import { GIT_BRANCH_QUERY_KEY } from "constants/routes"; import TemplatesModal from "pages/Templates/TemplatesModal"; import ReconnectDatasourceModal from "./gitSync/ReconnectDatasourceModal"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; import SignpostingOverlay from "pages/Editor/FirstTimeUserOnboarding/Overlay"; import { editorInitializer } from "../../utils/editor/EditorUtils"; import { widgetInitialisationSuccess } from "../../actions/widgetActions"; diff --git a/app/client/src/pages/Editor/utils.tsx b/app/client/src/pages/Editor/utils.tsx index 53edf4fcbd..35d0df62e5 100644 --- a/app/client/src/pages/Editor/utils.tsx +++ b/app/client/src/pages/Editor/utils.tsx @@ -32,7 +32,7 @@ import { PluginType } from "entities/Action"; import { getAssetUrl } from "ee/utils/airgapHelpers"; import type { Plugin } from "api/PluginApi"; import ImageAlt from "assets/images/placeholder-image.svg"; -import { Icon } from "design-system"; +import { Icon } from "@appsmith/ads"; import { EditorEntityTab, EditorEntityTabState, diff --git a/app/client/src/pages/Editor/widgetSidebar/SeeMoreButton.tsx b/app/client/src/pages/Editor/widgetSidebar/SeeMoreButton.tsx index f9b5d4381a..0f394d6a56 100644 --- a/app/client/src/pages/Editor/widgetSidebar/SeeMoreButton.tsx +++ b/app/client/src/pages/Editor/widgetSidebar/SeeMoreButton.tsx @@ -1,4 +1,4 @@ -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import React from "react"; interface Props { diff --git a/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx b/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx index 45a3fb07cb..e6781d01b4 100644 --- a/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx +++ b/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx @@ -10,7 +10,7 @@ import type { WidgetTags, } from "constants/WidgetConstants"; import { WIDGET_TAGS } from "constants/WidgetConstants"; -import { Flex, SearchInput, Text } from "design-system"; +import { Flex, SearchInput, Text } from "@appsmith/ads"; import Fuse from "fuse.js"; import { debounce } from "lodash"; import React, { useEffect, useMemo, useRef, useState } from "react"; diff --git a/app/client/src/pages/Editor/widgetSidebar/UIEntityTagGroup.tsx b/app/client/src/pages/Editor/widgetSidebar/UIEntityTagGroup.tsx index b73cfa58b6..15bbe4d9f9 100644 --- a/app/client/src/pages/Editor/widgetSidebar/UIEntityTagGroup.tsx +++ b/app/client/src/pages/Editor/widgetSidebar/UIEntityTagGroup.tsx @@ -10,7 +10,7 @@ import { CollapsibleHeader, Spinner, Text, -} from "design-system"; +} from "@appsmith/ads"; import { sortBy } from "lodash"; import React from "react"; import type { WidgetCardProps } from "widgets/BaseWidget"; diff --git a/app/client/src/pages/Editor/widgetSidebar/WidgetCard.tsx b/app/client/src/pages/Editor/widgetSidebar/WidgetCard.tsx index d35f34b4af..f120fd8afa 100644 --- a/app/client/src/pages/Editor/widgetSidebar/WidgetCard.tsx +++ b/app/client/src/pages/Editor/widgetSidebar/WidgetCard.tsx @@ -4,7 +4,7 @@ import styled from "styled-components"; import { useWidgetDragResize } from "utils/hooks/dragResizeHooks"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { generateReactKey } from "utils/generators"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { BUILDING_BLOCK_EXPLORER_TYPE } from "constants/WidgetConstants"; import { useSelector } from "react-redux"; import { getCurrentApplicationId } from "selectors/editorSelectors"; diff --git a/app/client/src/pages/Templates/BuildingBlock/index.tsx b/app/client/src/pages/Templates/BuildingBlock/index.tsx index 64ea6382f6..c9332fec06 100644 --- a/app/client/src/pages/Templates/BuildingBlock/index.tsx +++ b/app/client/src/pages/Templates/BuildingBlock/index.tsx @@ -7,7 +7,7 @@ import { BuildingBlockContent, BuildingBlockContentFooter, } from "./StyledComponents"; -import { Button, Text, Tooltip } from "design-system"; +import { Button, Text, Tooltip } from "@appsmith/ads"; import history from "utils/history"; import { FORK_THIS_TEMPLATE_BUILDING_BLOCK, diff --git a/app/client/src/pages/Templates/DatasourceChip.tsx b/app/client/src/pages/Templates/DatasourceChip.tsx index 62841cd045..b89d4b45f8 100644 --- a/app/client/src/pages/Templates/DatasourceChip.tsx +++ b/app/client/src/pages/Templates/DatasourceChip.tsx @@ -3,7 +3,7 @@ import { useSelector } from "react-redux"; import type { AppState } from "ee/reducers"; import { getDefaultPlugin } from "ee/selectors/entitiesSelector"; import styled from "styled-components"; -import { Tag } from "design-system"; +import { Tag } from "@appsmith/ads"; const StyledDatasourceChip = styled(Tag)` .image { diff --git a/app/client/src/pages/Templates/ForkTemplate.tsx b/app/client/src/pages/Templates/ForkTemplate.tsx index 5d95626c6f..59922a6336 100644 --- a/app/client/src/pages/Templates/ForkTemplate.tsx +++ b/app/client/src/pages/Templates/ForkTemplate.tsx @@ -8,7 +8,7 @@ import { ModalFooter, ModalHeader, Select, -} from "design-system"; +} from "@appsmith/ads"; import { useDispatch, useSelector } from "react-redux"; import { getForkableWorkspaces, diff --git a/app/client/src/pages/Templates/Template/RequestTemplate.tsx b/app/client/src/pages/Templates/Template/RequestTemplate.tsx index 42dcfc5097..68fce42e6d 100644 --- a/app/client/src/pages/Templates/Template/RequestTemplate.tsx +++ b/app/client/src/pages/Templates/Template/RequestTemplate.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import { Text, TextType } from "@appsmith/ads-old"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import RequestTemplateSvg from "assets/images/request-template.svg"; import { COULDNT_FIND_TEMPLATE, diff --git a/app/client/src/pages/Templates/Template/SimilarTemplates.tsx b/app/client/src/pages/Templates/Template/SimilarTemplates.tsx index 1ab72f48b5..ab08a0ee13 100644 --- a/app/client/src/pages/Templates/Template/SimilarTemplates.tsx +++ b/app/client/src/pages/Templates/Template/SimilarTemplates.tsx @@ -4,7 +4,7 @@ import { VIEW_ALL_TEMPLATES, } from "ee/constants/messages"; import type { Template as TemplateInterface } from "api/TemplatesApi"; -import { Text, Link } from "design-system"; +import { Text, Link } from "@appsmith/ads"; import React, { useCallback } from "react"; import styled from "styled-components"; import { Section } from "./TemplateDescription"; diff --git a/app/client/src/pages/Templates/Template/TemplateDescription.tsx b/app/client/src/pages/Templates/Template/TemplateDescription.tsx index 8d5be16ef6..f492355625 100644 --- a/app/client/src/pages/Templates/Template/TemplateDescription.tsx +++ b/app/client/src/pages/Templates/Template/TemplateDescription.tsx @@ -2,7 +2,7 @@ import type { Template } from "api/TemplatesApi"; import React from "react"; import styled from "styled-components"; import DatasourceChip from "../DatasourceChip"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { createMessage, DATASOURCES, diff --git a/app/client/src/pages/Templates/Template/index.tsx b/app/client/src/pages/Templates/Template/index.tsx index 57a4be23ea..87127360bd 100644 --- a/app/client/src/pages/Templates/Template/index.tsx +++ b/app/client/src/pages/Templates/Template/index.tsx @@ -2,7 +2,7 @@ import React, { useState } from "react"; import styled from "styled-components"; import history from "utils/history"; import type { Template as TemplateInterface } from "api/TemplatesApi"; -import { Button, Tooltip, Text } from "design-system"; +import { Button, Tooltip, Text } from "@appsmith/ads"; import ForkTemplateDialog from "../ForkTemplate"; import DatasourceChip from "../DatasourceChip"; import { createMessage, FORK_THIS_TEMPLATE } from "ee/constants/messages"; diff --git a/app/client/src/pages/Templates/TemplateContent/StyledComponents.tsx b/app/client/src/pages/Templates/TemplateContent/StyledComponents.tsx index 16c42211c0..46d4d73c2a 100644 --- a/app/client/src/pages/Templates/TemplateContent/StyledComponents.tsx +++ b/app/client/src/pages/Templates/TemplateContent/StyledComponents.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; export const Wrapper = styled.div<{ isModalLayout?: boolean }>` ${(props) => diff --git a/app/client/src/pages/Templates/TemplateFilters/StyledComponents.tsx b/app/client/src/pages/Templates/TemplateFilters/StyledComponents.tsx index 38644644a9..67dc8b3d4e 100644 --- a/app/client/src/pages/Templates/TemplateFilters/StyledComponents.tsx +++ b/app/client/src/pages/Templates/TemplateFilters/StyledComponents.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; export const FilterWrapper = styled.div` overflow: auto; @@ -65,6 +65,6 @@ export const SearchWrapper = styled.div<{ sticky?: boolean }>` z-index: 1; background-color: var(--ads-v2-color-bg); padding: var(--ads-v2-spaces-7); - margin-left: 0; + margin-left: 0; `} `; diff --git a/app/client/src/pages/Templates/TemplateFilters/index.tsx b/app/client/src/pages/Templates/TemplateFilters/index.tsx index 51072770d1..4345f40a3c 100644 --- a/app/client/src/pages/Templates/TemplateFilters/index.tsx +++ b/app/client/src/pages/Templates/TemplateFilters/index.tsx @@ -3,7 +3,7 @@ import { filterTemplates, setTemplateSearchQuery, } from "actions/templateActions"; -import { Icon, SearchInput } from "design-system"; +import { Icon, SearchInput } from "@appsmith/ads"; import { debounce } from "lodash"; import React, { useMemo, useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/pages/Templates/TemplateViewHeader.tsx b/app/client/src/pages/Templates/TemplateViewHeader.tsx index 793a7a4962..2dd5335e3f 100644 --- a/app/client/src/pages/Templates/TemplateViewHeader.tsx +++ b/app/client/src/pages/Templates/TemplateViewHeader.tsx @@ -5,7 +5,7 @@ import { GO_BACK, createMessage, } from "ee/constants/messages"; -import { Button, Link, Text } from "design-system"; +import { Button, Link, Text } from "@appsmith/ads"; import { useQuery } from "pages/Editor/utils"; import React from "react"; import { useSelector } from "react-redux"; diff --git a/app/client/src/pages/Templates/TemplatesModal/Components/TemplateDetailedViewHeader.tsx b/app/client/src/pages/Templates/TemplatesModal/Components/TemplateDetailedViewHeader.tsx index eefd8c1908..b935f0c68a 100644 --- a/app/client/src/pages/Templates/TemplatesModal/Components/TemplateDetailedViewHeader.tsx +++ b/app/client/src/pages/Templates/TemplatesModal/Components/TemplateDetailedViewHeader.tsx @@ -1,5 +1,5 @@ import { TEMPLATES_BACK_BUTTON, createMessage } from "ee/constants/messages"; -import { Link, Text } from "design-system"; +import { Link, Text } from "@appsmith/ads"; import React from "react"; interface Props { diff --git a/app/client/src/pages/Templates/TemplatesModal/LoadingScreen.tsx b/app/client/src/pages/Templates/TemplatesModal/LoadingScreen.tsx index 8ba9ed824a..875d5a7ee1 100644 --- a/app/client/src/pages/Templates/TemplatesModal/LoadingScreen.tsx +++ b/app/client/src/pages/Templates/TemplatesModal/LoadingScreen.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Spinner, Text } from "design-system"; +import { Spinner, Text } from "@appsmith/ads"; const Wrapper = styled.div` height: 85vh; diff --git a/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx b/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx index 26e97fa9de..354a3750e9 100644 --- a/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx +++ b/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx @@ -10,7 +10,7 @@ import { import { getCurrentAppWorkspace } from "ee/selectors/selectedWorkspaceSelectors"; import { importTemplateIntoApplication } from "actions/templateActions"; import type { Template } from "api/TemplatesApi"; -import { Button, Checkbox, Divider, Icon, Text } from "design-system"; +import { Button, Checkbox, Divider, Icon, Text } from "@appsmith/ads"; import React, { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { getCurrentApplicationId } from "selectors/editorSelectors"; diff --git a/app/client/src/pages/Templates/TemplatesModal/TemplatesListLayoutSwitcher.tsx b/app/client/src/pages/Templates/TemplatesModal/TemplatesListLayoutSwitcher.tsx index 6c181e960f..3dd173c547 100644 --- a/app/client/src/pages/Templates/TemplatesModal/TemplatesListLayoutSwitcher.tsx +++ b/app/client/src/pages/Templates/TemplatesModal/TemplatesListLayoutSwitcher.tsx @@ -1,7 +1,7 @@ import type { EventName } from "ee/utils/analyticsUtilTypes"; import type { Template as TemplateInterface } from "api/TemplatesApi"; import { CANVAS_STARTER_TEMPLATES_SEE_MORE_BUILDING_BLOCKS_PRE_FILTER } from "constants/TemplatesConstants"; -import { Flex } from "design-system"; +import { Flex } from "@appsmith/ads"; import React, { useMemo } from "react"; import styled from "styled-components"; import TemplatesLayoutWithFilters from "../TemplatesLayoutWithFilters"; diff --git a/app/client/src/pages/Templates/TemplatesModal/index.tsx b/app/client/src/pages/Templates/TemplatesModal/index.tsx index 62637d430d..fb3325ed89 100644 --- a/app/client/src/pages/Templates/TemplatesModal/index.tsx +++ b/app/client/src/pages/Templates/TemplatesModal/index.tsx @@ -15,7 +15,7 @@ import { fetchDefaultPlugins } from "actions/pluginActions"; import TemplateDetailedView from "./TemplateDetailedView"; import { isEmpty } from "lodash"; import type { AppState } from "ee/reducers"; -import { Modal, ModalBody, ModalContent, ModalHeader } from "design-system"; +import { Modal, ModalBody, ModalContent, ModalHeader } from "@appsmith/ads"; import TemplateModalHeader from "./Header"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import TemplatesListLayoutSwitcher from "./TemplatesListLayoutSwitcher"; diff --git a/app/client/src/pages/Templates/WidgetInfo.tsx b/app/client/src/pages/Templates/WidgetInfo.tsx index 4f8294f4a0..01ca4d596e 100644 --- a/app/client/src/pages/Templates/WidgetInfo.tsx +++ b/app/client/src/pages/Templates/WidgetInfo.tsx @@ -1,7 +1,7 @@ import React, { useMemo } from "react"; import styled from "styled-components"; import { useSelector } from "react-redux"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { IconWrapper } from "constants/IconConstants"; import { getWidgetCards } from "selectors/editorSelectors"; import { getAssetUrl } from "ee/utils/airgapHelpers"; diff --git a/app/client/src/pages/Templates/index.tsx b/app/client/src/pages/Templates/index.tsx index 834bcaa334..ce56f23d30 100644 --- a/app/client/src/pages/Templates/index.tsx +++ b/app/client/src/pages/Templates/index.tsx @@ -3,7 +3,7 @@ import * as Sentry from "@sentry/react"; import { fetchDefaultPlugins } from "actions/pluginActions"; import { getAllTemplates, getTemplateFilters } from "actions/templateActions"; import { setHeaderMeta } from "actions/themeActions"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import { isEmpty } from "lodash"; import ReconnectDatasourceModal from "pages/Editor/gitSync/ReconnectDatasourceModal"; import React, { useEffect } from "react"; diff --git a/app/client/src/pages/UserAuth/FooterLinks.tsx b/app/client/src/pages/UserAuth/FooterLinks.tsx index 6abf468ed7..f6b8490663 100644 --- a/app/client/src/pages/UserAuth/FooterLinks.tsx +++ b/app/client/src/pages/UserAuth/FooterLinks.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Link } from "design-system"; +import { Link } from "@appsmith/ads"; import styled from "styled-components"; const FooterWrapper = styled.div` diff --git a/app/client/src/pages/UserAuth/ForgotPassword.tsx b/app/client/src/pages/UserAuth/ForgotPassword.tsx index 3cbaa4b36a..ea69a61714 100644 --- a/app/client/src/pages/UserAuth/ForgotPassword.tsx +++ b/app/client/src/pages/UserAuth/ForgotPassword.tsx @@ -21,7 +21,7 @@ import { AUTH_LOGIN_URL } from "constants/routes"; import { FORGOT_PASSWORD_FORM_NAME } from "ee/constants/forms"; import FormTextField from "components/utils/ReduxFormTextField"; import { FormGroup } from "@appsmith/ads-old"; -import { Button, Link, Callout, Icon } from "design-system"; +import { Button, Link, Callout, Icon } from "@appsmith/ads"; import { isEmail, isEmptyString } from "utils/formhelpers"; import type { ForgotPasswordFormValues } from "./helpers"; import { forgotPasswordSubmitHandler } from "./helpers"; diff --git a/app/client/src/pages/UserAuth/LeftSideContent.tsx b/app/client/src/pages/UserAuth/LeftSideContent.tsx index ac0af4aefb..5f48f57249 100644 --- a/app/client/src/pages/UserAuth/LeftSideContent.tsx +++ b/app/client/src/pages/UserAuth/LeftSideContent.tsx @@ -2,7 +2,7 @@ import { getAssetUrl } from "ee/utils/airgapHelpers"; import React from "react"; import styled from "styled-components"; import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants"; -import { Avatar } from "design-system"; +import { Avatar } from "@appsmith/ads"; const Wrapper = styled.div` width: 432px; diff --git a/app/client/src/pages/UserAuth/Login.tsx b/app/client/src/pages/UserAuth/Login.tsx index e84d4d97db..9f5b774cb9 100644 --- a/app/client/src/pages/UserAuth/Login.tsx +++ b/app/client/src/pages/UserAuth/Login.tsx @@ -26,7 +26,7 @@ import { createMessage, } from "ee/constants/messages"; import { FormGroup } from "@appsmith/ads-old"; -import { Button, Link, Callout } from "design-system"; +import { Button, Link, Callout } from "@appsmith/ads"; import FormTextField from "components/utils/ReduxFormTextField"; import ThirdPartyAuth from "pages/UserAuth/ThirdPartyAuth"; import { isEmail, isEmptyString } from "utils/formhelpers"; diff --git a/app/client/src/pages/UserAuth/ResetPassword.tsx b/app/client/src/pages/UserAuth/ResetPassword.tsx index 7951a7e37d..9faf4acfd3 100644 --- a/app/client/src/pages/UserAuth/ResetPassword.tsx +++ b/app/client/src/pages/UserAuth/ResetPassword.tsx @@ -9,7 +9,7 @@ import { RESET_PASSWORD_FORM_NAME } from "ee/constants/forms"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { getIsTokenValid, getIsValidatingToken } from "selectors/authSelectors"; import FormTextField from "components/utils/ReduxFormTextField"; -import { Button, Callout, Icon, Link } from "design-system"; +import { Button, Callout, Icon, Link } from "@appsmith/ads"; import Spinner from "components/editorComponents/Spinner"; import StyledForm from "components/editorComponents/Form"; import { isEmptyString, isStrongPassword } from "utils/formhelpers"; @@ -32,7 +32,7 @@ import { createMessage, } from "ee/constants/messages"; import Container from "./Container"; -import type { CalloutProps } from "design-system"; +import type { CalloutProps } from "@appsmith/ads"; const validate = (values: ResetPasswordFormValues) => { const errors: ResetPasswordFormValues = {}; diff --git a/app/client/src/pages/UserAuth/SignUp.tsx b/app/client/src/pages/UserAuth/SignUp.tsx index 8b7ff5bee4..1fc06c51de 100644 --- a/app/client/src/pages/UserAuth/SignUp.tsx +++ b/app/client/src/pages/UserAuth/SignUp.tsx @@ -30,7 +30,7 @@ import { import FormTextField from "components/utils/ReduxFormTextField"; import ThirdPartyAuth from "pages/UserAuth/ThirdPartyAuth"; import { FormGroup } from "@appsmith/ads-old"; -import { Button, Link, Callout } from "design-system"; +import { Button, Link, Callout } from "@appsmith/ads"; import { isEmail, isStrongPassword, isEmptyString } from "utils/formhelpers"; import type { SignupFormValues } from "pages/UserAuth/helpers"; diff --git a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx index f71615051c..41580ece9f 100644 --- a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx +++ b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx @@ -8,7 +8,7 @@ import { useLocation } from "react-router-dom"; import PerformanceTracker, { PerformanceTransactionName, } from "utils/PerformanceTracker"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { isTenantConfig } from "ee/utils/adminSettingsHelpers"; import { useSelector } from "react-redux"; import { getTenantConfig } from "ee/selectors/tenantSelectors"; diff --git a/app/client/src/pages/UserAuth/VerificationError.tsx b/app/client/src/pages/UserAuth/VerificationError.tsx index 7e9d135704..d6be898c89 100644 --- a/app/client/src/pages/UserAuth/VerificationError.tsx +++ b/app/client/src/pages/UserAuth/VerificationError.tsx @@ -1,6 +1,6 @@ import React, { useEffect } from "react"; import Container from "./Container"; -import { Button, Callout, Icon, Link, Text } from "design-system"; +import { Button, Callout, Icon, Link, Text } from "@appsmith/ads"; import { AUTH_LOGIN_URL } from "constants/routes"; import { createMessage, diff --git a/app/client/src/pages/UserAuth/VerificationPending.tsx b/app/client/src/pages/UserAuth/VerificationPending.tsx index 41ac4d5615..6c98291a5b 100644 --- a/app/client/src/pages/UserAuth/VerificationPending.tsx +++ b/app/client/src/pages/UserAuth/VerificationPending.tsx @@ -8,7 +8,7 @@ import { VERIFICATION_PENDING_TITLE, } from "ee/constants/messages"; import type { RouteComponentProps } from "react-router-dom"; -import { Button, Callout, Link, Text } from "design-system"; +import { Button, Callout, Link, Text } from "@appsmith/ads"; import styled from "styled-components"; import { AUTH_LOGIN_URL } from "constants/routes"; import { useResendEmailVerification } from "./helpers"; diff --git a/app/client/src/pages/UserAuth/VerifyUser.tsx b/app/client/src/pages/UserAuth/VerifyUser.tsx index 131d463a33..03b3768d48 100644 --- a/app/client/src/pages/UserAuth/VerifyUser.tsx +++ b/app/client/src/pages/UserAuth/VerifyUser.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from "react"; import Container from "./Container"; import type { RouteComponentProps } from "react-router-dom"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; import * as Sentry from "@sentry/react"; import { EMAIL_VERIFICATION_PATH } from "ee/constants/ApiConstants"; import { Redirect } from "react-router-dom"; diff --git a/app/client/src/pages/UserAuth/helpers.ts b/app/client/src/pages/UserAuth/helpers.ts index 411409bfb3..e74d970b76 100644 --- a/app/client/src/pages/UserAuth/helpers.ts +++ b/app/client/src/pages/UserAuth/helpers.ts @@ -3,7 +3,7 @@ import { SubmissionError } from "redux-form"; import { useCallback, useEffect, useState } from "react"; import * as Sentry from "@sentry/react"; import UserApi from "ee/api/UserApi"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import type { ApiResponse } from "../../api/ApiResponses"; export interface LoginFormValues { diff --git a/app/client/src/pages/UserProfile/General.tsx b/app/client/src/pages/UserProfile/General.tsx index 91562dc2a7..22a89c1b6e 100644 --- a/app/client/src/pages/UserProfile/General.tsx +++ b/app/client/src/pages/UserProfile/General.tsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { Button, Input, toast, Text } from "design-system"; +import { Button, Input, toast, Text } from "@appsmith/ads"; import { useDispatch, useSelector } from "react-redux"; import { getCurrentUser } from "selectors/usersSelectors"; import { forgotPasswordSubmitHandler } from "pages/UserAuth/helpers"; diff --git a/app/client/src/pages/UserProfile/GitConfig.tsx b/app/client/src/pages/UserProfile/GitConfig.tsx index 813ee86d2e..1d55bad7e2 100644 --- a/app/client/src/pages/UserProfile/GitConfig.tsx +++ b/app/client/src/pages/UserProfile/GitConfig.tsx @@ -7,7 +7,7 @@ import { SUBMIT, } from "ee/constants/messages"; import { Classes } from "@blueprintjs/core"; -import { Button, Input, toast } from "design-system"; +import { Button, Input, toast } from "@appsmith/ads"; import { useDispatch, useSelector } from "react-redux"; import { getGlobalGitConfig, diff --git a/app/client/src/pages/UserProfile/index.tsx b/app/client/src/pages/UserProfile/index.tsx index 04fb12dd27..2cfb2fee9f 100644 --- a/app/client/src/pages/UserProfile/index.tsx +++ b/app/client/src/pages/UserProfile/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; import PageWrapper from "pages/common/PageWrapper"; import styled from "styled-components"; -import { Tabs, Tab, TabsList, TabPanel } from "design-system"; +import { Tabs, Tab, TabsList, TabPanel } from "@appsmith/ads"; import General from "./General"; import GitConfig from "./GitConfig"; import { useLocation } from "react-router"; diff --git a/app/client/src/pages/common/AvatarComponent.tsx b/app/client/src/pages/common/AvatarComponent.tsx index 3681ee2ab4..0cf0a1e36a 100644 --- a/app/client/src/pages/common/AvatarComponent.tsx +++ b/app/client/src/pages/common/AvatarComponent.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Avatar } from "design-system"; +import { Avatar } from "@appsmith/ads"; export interface AvatarProps { className?: string; diff --git a/app/client/src/pages/common/ErrorPages/ClientError.tsx b/app/client/src/pages/common/ErrorPages/ClientError.tsx index d9632af227..40c705077e 100644 --- a/app/client/src/pages/common/ErrorPages/ClientError.tsx +++ b/app/client/src/pages/common/ErrorPages/ClientError.tsx @@ -1,6 +1,6 @@ import React from "react"; import { useDispatch } from "react-redux"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { flushErrors } from "actions/errorActions"; import Page from "./Page"; diff --git a/app/client/src/pages/common/ErrorPages/GenericError.tsx b/app/client/src/pages/common/ErrorPages/GenericError.tsx index d74d350124..d50996c707 100644 --- a/app/client/src/pages/common/ErrorPages/GenericError.tsx +++ b/app/client/src/pages/common/ErrorPages/GenericError.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import Page from "./Page"; import { diff --git a/app/client/src/pages/common/ErrorPages/PageNotFound.tsx b/app/client/src/pages/common/ErrorPages/PageNotFound.tsx index ca0283db0d..2abd19aead 100644 --- a/app/client/src/pages/common/ErrorPages/PageNotFound.tsx +++ b/app/client/src/pages/common/ErrorPages/PageNotFound.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from "react"; import { connect } from "react-redux"; import { APPLICATIONS_URL } from "constants/routes"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { flushErrorsAndRedirect } from "actions/errorActions"; import { BACK_TO_HOMEPAGE, diff --git a/app/client/src/pages/common/ErrorPages/ServerTimeout.tsx b/app/client/src/pages/common/ErrorPages/ServerTimeout.tsx index 83f0849e61..f827e9ccfc 100644 --- a/app/client/src/pages/common/ErrorPages/ServerTimeout.tsx +++ b/app/client/src/pages/common/ErrorPages/ServerTimeout.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import Page from "./Page"; import { diff --git a/app/client/src/pages/common/ErrorPages/ServerUnavailable.tsx b/app/client/src/pages/common/ErrorPages/ServerUnavailable.tsx index 64eecf84cf..cf7b61980b 100644 --- a/app/client/src/pages/common/ErrorPages/ServerUnavailable.tsx +++ b/app/client/src/pages/common/ErrorPages/ServerUnavailable.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import Page from "./Page"; import { createMessage } from "ee/constants/messages"; diff --git a/app/client/src/pages/common/ErrorPages/StackTrace.tsx b/app/client/src/pages/common/ErrorPages/StackTrace.tsx index eb26ad2559..452313ff37 100644 --- a/app/client/src/pages/common/ErrorPages/StackTrace.tsx +++ b/app/client/src/pages/common/ErrorPages/StackTrace.tsx @@ -1,6 +1,6 @@ import React from "react"; import { useSelector } from "react-redux"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import type { AppState } from "ee/reducers"; import styled from "styled-components"; diff --git a/app/client/src/pages/common/ImportModal.tsx b/app/client/src/pages/common/ImportModal.tsx index 76011bbcb8..e5381f98ac 100644 --- a/app/client/src/pages/common/ImportModal.tsx +++ b/app/client/src/pages/common/ImportModal.tsx @@ -26,7 +26,7 @@ import { ModalContent, ModalHeader, Text, -} from "design-system"; +} from "@appsmith/ads"; import useMessages from "ee/hooks/importModal/useMessages"; import useMethods from "ee/hooks/importModal/useMethods"; import { getIsAnvilLayoutEnabled } from "layoutSystems/anvil/integrations/selectors"; diff --git a/app/client/src/pages/common/MobileSidebar.tsx b/app/client/src/pages/common/MobileSidebar.tsx index fb79996564..22bdb4c8ab 100644 --- a/app/client/src/pages/common/MobileSidebar.tsx +++ b/app/client/src/pages/common/MobileSidebar.tsx @@ -2,7 +2,7 @@ import React from "react"; import styled from "styled-components"; import { Colors } from "constants/Colors"; import { MenuItem } from "@appsmith/ads-old"; -import { Text, Avatar } from "design-system"; +import { Text, Avatar } from "@appsmith/ads"; import { getInitials } from "utils/AppsmithUtils"; import { DropdownOnSelectActions, diff --git a/app/client/src/pages/common/PageHeader.tsx b/app/client/src/pages/common/PageHeader.tsx index 701e65d0f2..1c786b6f50 100644 --- a/app/client/src/pages/common/PageHeader.tsx +++ b/app/client/src/pages/common/PageHeader.tsx @@ -12,7 +12,7 @@ import { shouldShowLicenseBanner } from "ee/selectors/tenantSelectors"; import { Banner } from "ee/utils/licenseHelpers"; import bootIntercom from "utils/bootIntercom"; import EntitySearchBar from "pages/common/SearchBar/EntitySearchBar"; -import { Switch, Tooltip } from "design-system"; +import { Switch, Tooltip } from "@appsmith/ads"; import { getIsAnvilLayoutEnabled } from "layoutSystems/anvil/integrations/selectors"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; diff --git a/app/client/src/pages/common/ProfileDropdown.tsx b/app/client/src/pages/common/ProfileDropdown.tsx index 74390b6977..a253c826fe 100644 --- a/app/client/src/pages/common/ProfileDropdown.tsx +++ b/app/client/src/pages/common/ProfileDropdown.tsx @@ -9,7 +9,7 @@ import { MenuTrigger, Text, Avatar, -} from "design-system"; +} from "@appsmith/ads"; import styled from "styled-components"; import type { PopperModifiers } from "@blueprintjs/core"; import { Classes as BlueprintClasses } from "@blueprintjs/core"; diff --git a/app/client/src/pages/common/ProfileImage.tsx b/app/client/src/pages/common/ProfileImage.tsx index 55b7105777..7520a83582 100644 --- a/app/client/src/pages/common/ProfileImage.tsx +++ b/app/client/src/pages/common/ProfileImage.tsx @@ -2,7 +2,7 @@ import React, { useContext } from "react"; import { getInitialsAndColorCode } from "utils/AppsmithUtils"; import styled, { ThemeContext } from "styled-components"; import { Colors } from "constants/Colors"; -import { Avatar } from "design-system"; +import { Avatar } from "@appsmith/ads"; export const Profile = styled.div<{ backgroundColor?: string; size?: number }>` /* width: ${(props) => props.size || 34}px; diff --git a/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx b/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx index 57d3679363..e5bc9a4ab3 100644 --- a/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx +++ b/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx @@ -1,5 +1,5 @@ import type { ApplicationPayload } from "ee/constants/ReduxActionConstants"; -import { Text } from "design-system"; +import { Text } from "@appsmith/ads"; import React from "react"; import { SearchListItem } from "./WorkspaceSearchItems"; import styled from "styled-components"; diff --git a/app/client/src/pages/common/SearchBar/DesktopEntitySearchField.tsx b/app/client/src/pages/common/SearchBar/DesktopEntitySearchField.tsx index 6295a0efec..a486aecd4e 100644 --- a/app/client/src/pages/common/SearchBar/DesktopEntitySearchField.tsx +++ b/app/client/src/pages/common/SearchBar/DesktopEntitySearchField.tsx @@ -1,4 +1,4 @@ -import { Icon, SearchInput, Spinner, Text } from "design-system"; +import { Icon, SearchInput, Spinner, Text } from "@appsmith/ads"; import React from "react"; import styled from "styled-components"; import { useIsMobileDevice } from "utils/hooks/useDeviceDetect"; diff --git a/app/client/src/pages/common/SearchBar/EntitySearchBar.tsx b/app/client/src/pages/common/SearchBar/EntitySearchBar.tsx index fb9b110ea2..8d51cabd84 100644 --- a/app/client/src/pages/common/SearchBar/EntitySearchBar.tsx +++ b/app/client/src/pages/common/SearchBar/EntitySearchBar.tsx @@ -1,7 +1,7 @@ import { getAssetUrl } from "ee/utils/airgapHelpers"; import { APPLICATIONS_URL, AUTH_LOGIN_URL } from "constants/routes"; import { ANONYMOUS_USERNAME } from "constants/userConstants"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import React, { useCallback, useEffect, useRef, useState } from "react"; import { Link, useLocation } from "react-router-dom"; import styled from "styled-components"; diff --git a/app/client/src/pages/common/SearchBar/HomepageHeaderAction.tsx b/app/client/src/pages/common/SearchBar/HomepageHeaderAction.tsx index 156aabc040..5776435651 100644 --- a/app/client/src/pages/common/SearchBar/HomepageHeaderAction.tsx +++ b/app/client/src/pages/common/SearchBar/HomepageHeaderAction.tsx @@ -26,7 +26,7 @@ import { MenuSeparator, MenuTrigger, Tooltip, -} from "design-system"; +} from "@appsmith/ads"; import React, { useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { useRouteMatch } from "react-router"; diff --git a/app/client/src/pages/common/SearchBar/MobileEntitySearchField.tsx b/app/client/src/pages/common/SearchBar/MobileEntitySearchField.tsx index 3939b6c47f..8ebe475480 100644 --- a/app/client/src/pages/common/SearchBar/MobileEntitySearchField.tsx +++ b/app/client/src/pages/common/SearchBar/MobileEntitySearchField.tsx @@ -1,4 +1,4 @@ -import { Button, Icon, SearchInput, Spinner, Text } from "design-system"; +import { Button, Icon, SearchInput, Spinner, Text } from "@appsmith/ads"; import React from "react"; import styled from "styled-components"; import WorkspaceSearchItems from "pages/common/SearchBar/WorkspaceSearchItems"; diff --git a/app/client/src/pages/common/SearchBar/WorkspaceSearchItems.tsx b/app/client/src/pages/common/SearchBar/WorkspaceSearchItems.tsx index 75d57f8ea2..d3416d9dab 100644 --- a/app/client/src/pages/common/SearchBar/WorkspaceSearchItems.tsx +++ b/app/client/src/pages/common/SearchBar/WorkspaceSearchItems.tsx @@ -1,5 +1,5 @@ import type { Workspace } from "ee/constants/workspaceConstants"; -import { Icon, Text } from "design-system"; +import { Icon, Text } from "@appsmith/ads"; import React from "react"; import { useHistory } from "react-router"; import styled from "styled-components"; diff --git a/app/client/src/pages/common/SearchSnippets.tsx b/app/client/src/pages/common/SearchSnippets.tsx index a24cf394db..a72fbadeab 100644 --- a/app/client/src/pages/common/SearchSnippets.tsx +++ b/app/client/src/pages/common/SearchSnippets.tsx @@ -1,6 +1,6 @@ import React from "react"; import { createMessage, SNIPPET_TOOLTIP } from "ee/constants/messages"; -import { Button, Tooltip } from "design-system"; +import { Button, Tooltip } from "@appsmith/ads"; export enum ENTITY_TYPE { ACTION = "ACTION", diff --git a/app/client/src/pages/common/SharedUserList.tsx b/app/client/src/pages/common/SharedUserList.tsx index 8b2007cbfa..b7ff979c37 100644 --- a/app/client/src/pages/common/SharedUserList.tsx +++ b/app/client/src/pages/common/SharedUserList.tsx @@ -2,7 +2,7 @@ import React from "react"; import { getCurrentUser } from "selectors/usersSelectors"; import { useSelector } from "react-redux"; import styled from "styled-components"; -import { AvatarGroup } from "design-system"; +import { AvatarGroup } from "@appsmith/ads"; import { useIsMobileDevice } from "utils/hooks/useDeviceDetect"; import { USER_PHOTO_ASSET_URL } from "constants/userConstants"; import { getAllUsersOfWorkspace } from "ee/selectors/selectedWorkspaceSelectors"; diff --git a/app/client/src/pages/common/SpinnerLoader.tsx b/app/client/src/pages/common/SpinnerLoader.tsx index 3e4c1c28f9..596bd96343 100644 --- a/app/client/src/pages/common/SpinnerLoader.tsx +++ b/app/client/src/pages/common/SpinnerLoader.tsx @@ -1,6 +1,6 @@ import React from "react"; -import type { SpinnerProps } from "design-system"; -import { Spinner } from "design-system"; +import type { SpinnerProps } from "@appsmith/ads"; +import { Spinner } from "@appsmith/ads"; type Props = SpinnerProps; diff --git a/app/client/src/pages/common/datasourceAuth/AuthMessage.tsx b/app/client/src/pages/common/datasourceAuth/AuthMessage.tsx index 9c3eab05ee..996d9ae920 100644 --- a/app/client/src/pages/common/datasourceAuth/AuthMessage.tsx +++ b/app/client/src/pages/common/datasourceAuth/AuthMessage.tsx @@ -1,7 +1,7 @@ import type { AppState } from "ee/reducers"; import { redirectAuthorizationCode } from "actions/datasourceActions"; -import type { CalloutKind } from "design-system"; -import { Callout } from "design-system"; +import type { CalloutKind } from "@appsmith/ads"; +import { Callout } from "@appsmith/ads"; import type { Datasource } from "entities/Datasource"; import { ActionType } from "entities/Datasource"; import React from "react"; diff --git a/app/client/src/pages/common/datasourceAuth/index.tsx b/app/client/src/pages/common/datasourceAuth/index.tsx index dda2ac18b9..4dc37254dc 100644 --- a/app/client/src/pages/common/datasourceAuth/index.tsx +++ b/app/client/src/pages/common/datasourceAuth/index.tsx @@ -25,7 +25,7 @@ import { TEST_BUTTON_TEXT, createMessage, } from "ee/constants/messages"; -import { Button, toast } from "design-system"; +import { Button, toast } from "@appsmith/ads"; import type { ClientCredentials } from "entities/Datasource/RestAPIForm"; import { GrantType, diff --git a/app/client/src/pages/setup/DetailsForm.tsx b/app/client/src/pages/setup/DetailsForm.tsx index b75de80894..bf7f018e43 100644 --- a/app/client/src/pages/setup/DetailsForm.tsx +++ b/app/client/src/pages/setup/DetailsForm.tsx @@ -18,7 +18,7 @@ import { import FormTextField from "components/utils/ReduxFormTextField"; import type { FormErrors, InjectedFormProps } from "redux-form"; import { FormGroup } from "@appsmith/ads-old"; -import { Button, Checkbox } from "design-system"; +import { Button, Checkbox } from "@appsmith/ads"; import { proficiencyOptions, useCaseOptions } from "./constants"; import { isAirgapped } from "ee/utils/airgapHelpers"; import { setFirstTimeUserOnboardingTelemetryCalloutVisibility } from "utils/storage"; diff --git a/app/client/src/pages/setup/NonSuperUserProfilingQuestions.tsx b/app/client/src/pages/setup/NonSuperUserProfilingQuestions.tsx index f8722b98de..c4e8fcfafc 100644 --- a/app/client/src/pages/setup/NonSuperUserProfilingQuestions.tsx +++ b/app/client/src/pages/setup/NonSuperUserProfilingQuestions.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import { WELCOME_FORM_USECASE_FIELD_NAME, WELCOME_NON_SUPER_FORM_NAME, diff --git a/app/client/src/pages/setup/SignupSuccess.tsx b/app/client/src/pages/setup/SignupSuccess.tsx index 8173c5fa3d..fae14f5e6d 100644 --- a/app/client/src/pages/setup/SignupSuccess.tsx +++ b/app/client/src/pages/setup/SignupSuccess.tsx @@ -10,7 +10,7 @@ import PerformanceTracker, { } from "utils/PerformanceTracker"; import UserWelcomeScreen from "pages/setup/UserWelcomeScreen"; import { Center } from "pages/setup/common"; -import { Spinner } from "design-system"; +import { Spinner } from "@appsmith/ads"; import { isValidLicense } from "ee/selectors/tenantSelectors"; import { redirectUserAfterSignup } from "ee/utils/signupHelpers"; import { setUserSignedUpFlag } from "utils/storage"; diff --git a/app/client/src/pages/setup/common.tsx b/app/client/src/pages/setup/common.tsx index ed7946b13e..e164603d55 100644 --- a/app/client/src/pages/setup/common.tsx +++ b/app/client/src/pages/setup/common.tsx @@ -4,7 +4,7 @@ import type { FormTextFieldProps } from "components/utils/ReduxFormTextField"; import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form"; import styled from "styled-components"; import type { OptionType } from "./constants"; -import { Select, Option } from "design-system"; +import { Select, Option } from "@appsmith/ads"; export const FormHeaderLabel = styled.h5` width: 100%; diff --git a/app/client/src/pages/tests/slug.test.tsx b/app/client/src/pages/tests/slug.test.tsx index f7ef20b1b9..e18dfc4e4f 100644 --- a/app/client/src/pages/tests/slug.test.tsx +++ b/app/client/src/pages/tests/slug.test.tsx @@ -22,7 +22,7 @@ import { import ManualUpgrades from "components/BottomBar/ManualUpgrades"; import { updateCurrentPage } from "actions/pageActions"; import urlBuilder from "ee/entities/URLRedirect/URLAssembly"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; describe("URL slug names", () => { beforeEach(async () => { diff --git a/app/client/src/pages/workspace/AppInviteUsersForm.tsx b/app/client/src/pages/workspace/AppInviteUsersForm.tsx index 83a76167c9..7381df767a 100644 --- a/app/client/src/pages/workspace/AppInviteUsersForm.tsx +++ b/app/client/src/pages/workspace/AppInviteUsersForm.tsx @@ -18,7 +18,7 @@ import { MAKE_APPLICATION_PUBLIC_TOOLTIP, } from "ee/constants/messages"; import { hasInviteUserToApplicationPermission } from "ee/utils/permissionHelpers"; -import { Button, Icon, Switch, Tooltip } from "design-system"; +import { Button, Icon, Switch, Tooltip } from "@appsmith/ads"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; diff --git a/app/client/src/pages/workspace/DeleteConfirmationModal.tsx b/app/client/src/pages/workspace/DeleteConfirmationModal.tsx index 1f12855afa..7d6945286c 100644 --- a/app/client/src/pages/workspace/DeleteConfirmationModal.tsx +++ b/app/client/src/pages/workspace/DeleteConfirmationModal.tsx @@ -7,7 +7,7 @@ import { ModalHeader, ModalFooter, Text, -} from "design-system"; +} from "@appsmith/ads"; import { DELETE_CONFIRMATION_MODAL_TITLE, DELETE_CONFIRMATION_MODAL_SUBTITLE, diff --git a/app/client/src/pages/workspace/General.tsx b/app/client/src/pages/workspace/General.tsx index 2307d7fb92..a48b417937 100644 --- a/app/client/src/pages/workspace/General.tsx +++ b/app/client/src/pages/workspace/General.tsx @@ -7,7 +7,7 @@ import { } from "ee/actions/workspaceActions"; import type { SaveWorkspaceRequest } from "ee/api/WorkspaceApi"; import { debounce } from "lodash"; -import { Input } from "design-system"; +import { Input } from "@appsmith/ads"; import { useSelector, useDispatch } from "react-redux"; import { getCurrentError, diff --git a/app/client/src/pages/workspace/ManageUsers.tsx b/app/client/src/pages/workspace/ManageUsers.tsx index 5647353761..98064058ca 100644 --- a/app/client/src/pages/workspace/ManageUsers.tsx +++ b/app/client/src/pages/workspace/ManageUsers.tsx @@ -1,6 +1,6 @@ import React from "react"; import { useLocation } from "react-router-dom"; -import { Link } from "design-system"; +import { Link } from "@appsmith/ads"; function ManageUsers({ workspaceId }: { workspaceId: string }) { const currentPath = useLocation().pathname; diff --git a/app/client/src/pages/workspace/PartnerProgramCallout.tsx b/app/client/src/pages/workspace/PartnerProgramCallout.tsx index a700aec162..b4c2555ab0 100644 --- a/app/client/src/pages/workspace/PartnerProgramCallout.tsx +++ b/app/client/src/pages/workspace/PartnerProgramCallout.tsx @@ -1,5 +1,5 @@ -import type { CalloutLinkProps } from "design-system"; -import { Callout } from "design-system"; +import type { CalloutLinkProps } from "@appsmith/ads"; +import { Callout } from "@appsmith/ads"; import React from "react"; import { PARTNER_PROGRAM_CALLOUT, diff --git a/app/client/src/pages/workspace/SettingsPageHeader.tsx b/app/client/src/pages/workspace/SettingsPageHeader.tsx index 233b381179..78e967e8d0 100644 --- a/app/client/src/pages/workspace/SettingsPageHeader.tsx +++ b/app/client/src/pages/workspace/SettingsPageHeader.tsx @@ -9,7 +9,7 @@ import { MenuTrigger, SearchInput, Tooltip, -} from "design-system"; +} from "@appsmith/ads"; import { HeaderWrapper } from "pages/AdminSettings/components"; import { SettingsHeader } from "components/utils/helperComponents"; import { ARE_YOU_SURE, createMessage } from "ee/constants/messages"; diff --git a/app/client/src/pages/workspace/WorkspaceInviteUsersForm.tsx b/app/client/src/pages/workspace/WorkspaceInviteUsersForm.tsx index 46df06f044..c106ba00d6 100644 --- a/app/client/src/pages/workspace/WorkspaceInviteUsersForm.tsx +++ b/app/client/src/pages/workspace/WorkspaceInviteUsersForm.tsx @@ -4,7 +4,7 @@ import { useSelector } from "react-redux"; import { getCurrentAppWorkspace } from "ee/selectors/selectedWorkspaceSelectors"; import { createMessage, NO_USERS_INVITED } from "ee/constants/messages"; import { isPermitted, PERMISSION_TYPE } from "ee/utils/permissionHelpers"; -import { Avatar, Icon, Spinner, Text, Tooltip } from "design-system"; +import { Avatar, Icon, Spinner, Text, Tooltip } from "@appsmith/ads"; import { getInitialsFromName } from "utils/AppsmithUtils"; import ManageUsers from "pages/workspace/ManageUsers"; import { USER_PHOTO_ASSET_URL } from "constants/userConstants"; diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts index bbffa431d1..ce2181f293 100644 --- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts @@ -145,7 +145,7 @@ import { import type { Plugin } from "api/PluginApi"; import { setDefaultActionDisplayFormat } from "./PluginActionSagaUtils"; import { checkAndLogErrorsIfCyclicDependency } from "sagas/helper"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import type { TRunDescription } from "workers/Evaluation/fns/actionFns"; import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers"; import { FILE_SIZE_LIMIT_FOR_BLOBS } from "constants/WidgetConstants"; diff --git a/app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts b/app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts index 97f2f4340a..c422a67f06 100644 --- a/app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts @@ -1,7 +1,7 @@ import AppsmithConsole from "utils/AppsmithConsole"; import { ActionValidationError } from "sagas/ActionExecution/errorUtils"; import { getType, Types } from "utils/TypeHelpers"; -import type { ToastKind } from "design-system"; +import type { ToastKind } from "@appsmith/ads"; import type { TShowAlertDescription } from "workers/Evaluation/fns/showAlert"; import { call } from "redux-saga/effects"; import showToast from "sagas/ToastSagas"; diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts index 4e34fa313f..716453a19a 100644 --- a/app/client/src/sagas/ActionSagas.ts +++ b/app/client/src/sagas/ActionSagas.ts @@ -125,7 +125,7 @@ import { getFromServerWhenNoPrefetchedResult, } from "./helper"; import { setSnipingMode as setSnipingModeAction } from "actions/propertyPaneActions"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { getFormValues } from "redux-form"; import { API_EDITOR_FORM_NAME, diff --git a/app/client/src/sagas/ApiPaneSagas.ts b/app/client/src/sagas/ApiPaneSagas.ts index 4952d86b20..5ae9bb3fdb 100644 --- a/app/client/src/sagas/ApiPaneSagas.ts +++ b/app/client/src/sagas/ApiPaneSagas.ts @@ -73,7 +73,7 @@ import { validateResponse } from "./ErrorSagas"; import type { CreateDatasourceSuccessAction } from "actions/datasourceActions"; import { removeTempDatasource } from "actions/datasourceActions"; import { klona } from "klona/lite"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import type { AutoGeneratedHeader } from "pages/Editor/APIEditor/helpers"; import { deriveAutoGeneratedHeaderState } from "pages/Editor/APIEditor/helpers"; import { TEMP_DATASOURCE_ID } from "constants/Datasource"; diff --git a/app/client/src/sagas/AppThemingSaga.tsx b/app/client/src/sagas/AppThemingSaga.tsx index f853d9647a..5f11aa3c8d 100644 --- a/app/client/src/sagas/AppThemingSaga.tsx +++ b/app/client/src/sagas/AppThemingSaga.tsx @@ -13,7 +13,7 @@ import { } from "ee/constants/ReduxActionConstants"; import ThemingApi from "api/AppThemingApi"; import { all, takeLatest, put, select, call } from "redux-saga/effects"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { CHANGE_APP_THEME, createMessage, diff --git a/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts index bc24f78a0f..d93af9d4c7 100644 --- a/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts +++ b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts @@ -15,7 +15,7 @@ import { GridDefaults, MAIN_CONTAINER_WIDGET_ID, } from "constants/WidgetConstants"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { updateRelationships } from "layoutSystems/autolayout/utils/autoLayoutDraggingUtils"; import type { WidgetDraggingUpdateParams } from "layoutSystems/common/canvasArenas/ArenaTypes"; import { calculateDropTargetRows } from "layoutSystems/common/dropTarget/DropTargetUtils"; diff --git a/app/client/src/sagas/CommunityTemplatesSagas.tsx b/app/client/src/sagas/CommunityTemplatesSagas.tsx index 8a8ec95b41..b8650421bd 100644 --- a/app/client/src/sagas/CommunityTemplatesSagas.tsx +++ b/app/client/src/sagas/CommunityTemplatesSagas.tsx @@ -7,7 +7,7 @@ import { isAirgapped } from "ee/utils/airgapHelpers"; import { all, call, put, select, takeEvery } from "redux-saga/effects"; import { validateResponse, type ErrorActionPayload } from "./ErrorSagas"; import { COMMUNITY_TEMPLATES, createMessage } from "ee/constants/messages"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import type { PublishCommunityTemplateRequest, PublishCommunityTemplateResponse, diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts index 5d6713c84e..5e0a60e6b2 100644 --- a/app/client/src/sagas/DatasourcesSagas.ts +++ b/app/client/src/sagas/DatasourcesSagas.ts @@ -152,7 +152,7 @@ import { TEMP_DATASOURCE_ID, } from "constants/Datasource"; import { getUntitledDatasourceSequence } from "utils/DatasourceSagaUtils"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { fetchPluginFormConfig } from "actions/pluginActions"; import { addClassToDocumentRoot } from "pages/utils"; import { AuthorizationStatus } from "pages/common/datasourceAuth"; diff --git a/app/client/src/sagas/EvalErrorHandler.ts b/app/client/src/sagas/EvalErrorHandler.ts index 1e820b1a22..ee33f00ada 100644 --- a/app/client/src/sagas/EvalErrorHandler.ts +++ b/app/client/src/sagas/EvalErrorHandler.ts @@ -27,7 +27,7 @@ import { } from "ee/constants/messages"; import log from "loglevel"; import type { AppState } from "ee/reducers"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { isDynamicEntity } from "ee/entities/DataTree/isDynamicEntity"; import { getEntityPayloadInfo } from "ee/utils/getEntityPayloadInfo"; diff --git a/app/client/src/sagas/GitSyncSagas.ts b/app/client/src/sagas/GitSyncSagas.ts index 5faa8a79d5..75649e61bc 100644 --- a/app/client/src/sagas/GitSyncSagas.ts +++ b/app/client/src/sagas/GitSyncSagas.ts @@ -133,7 +133,7 @@ import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity"; import { getActions, getJSCollections } from "ee/selectors/entitiesSelector"; import type { Action } from "entities/Action"; import type { JSCollectionDataState } from "ee/reducers/entityReducers/jsActionsReducer"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { gitExtendedSagas } from "ee/sagas/GitExtendedSagas"; import { selectFeatureFlagCheck } from "ee/selectors/featureFlagsSelectors"; import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; diff --git a/app/client/src/sagas/JSLibrarySaga.ts b/app/client/src/sagas/JSLibrarySaga.ts index fb05d11e07..9e09b5e1b7 100644 --- a/app/client/src/sagas/JSLibrarySaga.ts +++ b/app/client/src/sagas/JSLibrarySaga.ts @@ -30,7 +30,7 @@ import type { JSLibrary } from "workers/common/JSLibrary"; import { getUsedActionNames } from "selectors/actionSelectors"; import AppsmithConsole from "utils/AppsmithConsole"; import { selectInstalledLibraries } from "ee/selectors/entitiesSelector"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { endSpan, startRootSpan } from "UITelemetry/generateTraces"; import { getFromServerWhenNoPrefetchedResult } from "./helper"; diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts index 6e2135d030..7193e99330 100644 --- a/app/client/src/sagas/JSPaneSagas.ts +++ b/app/client/src/sagas/JSPaneSagas.ts @@ -86,7 +86,7 @@ import { UserCancelledActionExecutionError } from "sagas/ActionExecution/errorUt import type { EventLocation } from "ee/utils/analyticsUtilTypes"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { checkAndLogErrorsIfCyclicDependency } from "./helper"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers"; import { getJSActionPathNameToDisplay, diff --git a/app/client/src/sagas/ModalSagas.ts b/app/client/src/sagas/ModalSagas.ts index e8b78a8141..8cd62f2237 100644 --- a/app/client/src/sagas/ModalSagas.ts +++ b/app/client/src/sagas/ModalSagas.ts @@ -42,7 +42,7 @@ import WidgetFactory from "WidgetProvider/factory"; import type { WidgetProps } from "widgets/BaseWidget"; import { selectWidgetInitAction } from "actions/widgetSelectionActions"; import { SelectionRequestType } from "./WidgetSelectUtils"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { getIsAutoLayout } from "selectors/editorSelectors"; import { recalculateAutoLayoutColumnsAndSave } from "./AutoLayoutUpdateSagas"; import { diff --git a/app/client/src/sagas/OneClickBindingSaga.ts b/app/client/src/sagas/OneClickBindingSaga.ts index 81a550166d..7f3a6ee236 100644 --- a/app/client/src/sagas/OneClickBindingSaga.ts +++ b/app/client/src/sagas/OneClickBindingSaga.ts @@ -48,7 +48,7 @@ import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import AppsmithConsole from "utils/AppsmithConsole"; import { ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils"; import { fetchActions, runAction } from "actions/pluginActionActions"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import WidgetFactory from "WidgetProvider/factory"; export function* createActionsForOneClickBindingSaga( diff --git a/app/client/src/sagas/PartialImportExportSagas/PartialExportSagas.ts b/app/client/src/sagas/PartialImportExportSagas/PartialExportSagas.ts index ab78983477..1488957a52 100644 --- a/app/client/src/sagas/PartialImportExportSagas/PartialExportSagas.ts +++ b/app/client/src/sagas/PartialImportExportSagas/PartialExportSagas.ts @@ -10,7 +10,7 @@ import { ReduxActionTypes, } from "ee/constants/ReduxActionConstants"; import { getCurrentApplication } from "ee/selectors/applicationSelectors"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { getFlexLayersForSelectedWidgets } from "layoutSystems/autolayout/utils/AutoLayoutUtils"; import type { FlexLayer } from "layoutSystems/autolayout/utils/types"; import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer"; diff --git a/app/client/src/sagas/PartialImportExportSagas/PartialImportSagas.ts b/app/client/src/sagas/PartialImportExportSagas/PartialImportSagas.ts index e26acfca87..03bf2ff81d 100644 --- a/app/client/src/sagas/PartialImportExportSagas/PartialImportSagas.ts +++ b/app/client/src/sagas/PartialImportExportSagas/PartialImportSagas.ts @@ -11,7 +11,7 @@ import { getCurrentWorkspaceId } from "ee/selectors/selectedWorkspaceSelectors"; import { pasteWidget } from "actions/widgetActions"; import { selectWidgetInitAction } from "actions/widgetSelectionActions"; import type { ApiResponse } from "api/ApiResponses"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { call, fork, put, select } from "redux-saga/effects"; import { SelectionRequestType } from "sagas/WidgetSelectUtils"; import { diff --git a/app/client/src/sagas/QueryPaneSagas.ts b/app/client/src/sagas/QueryPaneSagas.ts index 24ecd62018..e703ac1a0b 100644 --- a/app/client/src/sagas/QueryPaneSagas.ts +++ b/app/client/src/sagas/QueryPaneSagas.ts @@ -70,7 +70,7 @@ import { fetchDynamicValuesSaga } from "./FormEvaluationSaga"; import type { FormEvalOutput } from "reducers/evaluationReducers/formEvaluationReducer"; import { validateResponse } from "./ErrorSagas"; import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import type { CreateDatasourceSuccessAction } from "actions/datasourceActions"; import { createDefaultActionPayloadWithPluginDefaults } from "./ActionSagas"; import { DB_NOT_SUPPORTED } from "ee/utils/Environments"; diff --git a/app/client/src/sagas/SnipingModeSagas.ts b/app/client/src/sagas/SnipingModeSagas.ts index a29e5ec8e8..4967e44c23 100644 --- a/app/client/src/sagas/SnipingModeSagas.ts +++ b/app/client/src/sagas/SnipingModeSagas.ts @@ -20,7 +20,7 @@ import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidg import { setSnipingMode } from "actions/propertyPaneActions"; import { selectWidgetInitAction } from "actions/widgetSelectionActions"; import { SelectionRequestType } from "sagas/WidgetSelectUtils"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import type { PropertyUpdates } from "WidgetProvider/constants"; import type { ModuleInstance } from "ee/constants/ModuleInstanceConstants"; import { getModuleInstanceById } from "ee/selectors/moduleInstanceSelectors"; diff --git a/app/client/src/sagas/TemplatesSagas.ts b/app/client/src/sagas/TemplatesSagas.ts index fe8210cb8f..ff921256d2 100644 --- a/app/client/src/sagas/TemplatesSagas.ts +++ b/app/client/src/sagas/TemplatesSagas.ts @@ -36,7 +36,7 @@ import type { TemplateFiltersResponse, } from "api/TemplatesApi"; import TemplatesAPI from "api/TemplatesApi"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { APP_MODE } from "entities/App"; import { all, call, put, select, take, takeEvery } from "redux-saga/effects"; import { getCurrentApplicationId } from "selectors/editorSelectors"; diff --git a/app/client/src/sagas/ToastSagas.ts b/app/client/src/sagas/ToastSagas.ts index 7b4ffb67d4..3d9aee703c 100644 --- a/app/client/src/sagas/ToastSagas.ts +++ b/app/client/src/sagas/ToastSagas.ts @@ -1,5 +1,5 @@ -import type { ToastProps } from "design-system"; -import { toast } from "design-system"; +import type { ToastProps } from "@appsmith/ads"; +import { toast } from "@appsmith/ads"; import { APP_MODE } from "entities/App"; import { select } from "redux-saga/effects"; import { getAppMode } from "ee/selectors/entitiesSelector"; diff --git a/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts b/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts index 6a8702e2ac..9e076e1557 100644 --- a/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts +++ b/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts @@ -1,7 +1,7 @@ // Check if user is updating the app when toast is shown // Check how many times does the user see a toast before updating -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { createMessage, INFO_VERSION_MISMATCH_FOUND_RELOAD_REQUEST, diff --git a/app/client/src/sagas/WidgetAdditionSagas.ts b/app/client/src/sagas/WidgetAdditionSagas.ts index bcb6d8330a..61518df900 100644 --- a/app/client/src/sagas/WidgetAdditionSagas.ts +++ b/app/client/src/sagas/WidgetAdditionSagas.ts @@ -18,7 +18,7 @@ import { BUILDING_BLOCK_EXPLORER_TYPE, RenderModes, } from "constants/WidgetConstants"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import type { DataTree } from "entities/DataTree/dataTreeTypes"; import produce from "immer"; import { klona as clone } from "klona/full"; diff --git a/app/client/src/sagas/WidgetBlueprintSagas.ts b/app/client/src/sagas/WidgetBlueprintSagas.ts index 00ce1ec250..2daa3393ef 100644 --- a/app/client/src/sagas/WidgetBlueprintSagas.ts +++ b/app/client/src/sagas/WidgetBlueprintSagas.ts @@ -10,7 +10,7 @@ import type { WidgetType } from "constants/WidgetConstants"; import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants"; import { BlueprintOperationTypes } from "WidgetProvider/constants"; import * as log from "loglevel"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import type { LayoutSystemTypes } from "layoutSystems/types"; import { getLayoutSystemType } from "selectors/layoutSystemSelectors"; diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx index f1b28975b5..9c2f356da0 100644 --- a/app/client/src/sagas/WidgetOperationSagas.tsx +++ b/app/client/src/sagas/WidgetOperationSagas.tsx @@ -89,7 +89,7 @@ import { getAllPaths } from "ee/workers/Evaluation/evaluationUtils"; import { BlueprintOperationTypes } from "WidgetProvider/constants"; import { generateAutoHeightLayoutTreeAction } from "actions/autoHeightActions"; import { stopReflowAction } from "actions/reflowActions"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes"; import { getAllPathsFromPropertyConfig, diff --git a/app/client/src/sagas/WidgetSelectUtils.ts b/app/client/src/sagas/WidgetSelectUtils.ts index 8a82e77651..a0c6577caf 100644 --- a/app/client/src/sagas/WidgetSelectUtils.ts +++ b/app/client/src/sagas/WidgetSelectUtils.ts @@ -18,7 +18,7 @@ import { import { getWidgetChildrenIds } from "sagas/WidgetOperationUtils"; import { getLastSelectedWidget, getSelectedWidgets } from "selectors/ui"; import WidgetFactory from "WidgetProvider/factory"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { checkIsDropTarget } from "WidgetProvider/factory/helpers"; /** diff --git a/app/client/src/sagas/helper.ts b/app/client/src/sagas/helper.ts index 1e183d2abf..0bd53b77e5 100644 --- a/app/client/src/sagas/helper.ts +++ b/app/client/src/sagas/helper.ts @@ -9,7 +9,7 @@ import LOG_TYPE from "entities/AppsmithConsole/logtype"; import type { Log } from "entities/AppsmithConsole"; import { LOG_CATEGORY, Severity } from "entities/AppsmithConsole"; import { ENTITY_TYPE, PLATFORM_ERROR } from "ee/entities/AppsmithConsole/utils"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { ReduxActionTypes, type ReduxActionType, diff --git a/app/client/src/utils/BrandingUtils.ts b/app/client/src/utils/BrandingUtils.ts index ba964a1139..d8b19ba1dd 100644 --- a/app/client/src/utils/BrandingUtils.ts +++ b/app/client/src/utils/BrandingUtils.ts @@ -8,7 +8,7 @@ import { ADMIN_BRANDING_FAVICON_FORMAT_ERROR, ADMIN_BRANDING_FAVICON_DIMENSION_ERROR, } from "ee/constants/messages"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants"; import { getAssetUrl } from "ee/utils/airgapHelpers"; import { LightModeTheme } from "@design-system/theming"; diff --git a/app/client/src/utils/autocomplete/ternDocTooltip.tsx b/app/client/src/utils/autocomplete/ternDocTooltip.tsx index 60eb2d9b02..abdc96ff9e 100644 --- a/app/client/src/utils/autocomplete/ternDocTooltip.tsx +++ b/app/client/src/utils/autocomplete/ternDocTooltip.tsx @@ -3,7 +3,7 @@ import ReactDOM from "react-dom"; import { ternDocsInfo } from "ee/utils/autocomplete/EntityDefinitions"; import type { Completion, TernCompletionResult } from "./CodemirrorTernService"; import { CodeEditorColors } from "components/editorComponents/CodeEditor/constants"; -import { Link } from "design-system"; +import { Link } from "@appsmith/ads"; export function renderTernTooltipContent( element: HTMLElement, diff --git a/app/client/src/utils/localStorage.tsx b/app/client/src/utils/localStorage.tsx index 37d65ca345..5349365b62 100644 --- a/app/client/src/utils/localStorage.tsx +++ b/app/client/src/utils/localStorage.tsx @@ -5,7 +5,7 @@ import { LOCAL_STORAGE_NOT_SUPPORTED_APP_MIGHT_NOT_WORK_AS_EXPECTED, createMessage, } from "ee/constants/messages"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; export const LOCAL_STORAGE_KEYS = { CANVAS_CARDS_STATE: "CANVAS_CARDS_STATE", diff --git a/app/client/src/utils/replayHelpers.tsx b/app/client/src/utils/replayHelpers.tsx index 42870c513c..56d7c5f16e 100644 --- a/app/client/src/utils/replayHelpers.tsx +++ b/app/client/src/utils/replayHelpers.tsx @@ -15,7 +15,7 @@ import { BULK_WIDGET_REMOVED, ACTION_CONFIGURATION_CHANGED, } from "ee/constants/messages"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { setApiPaneConfigSelectedTabIndex } from "../actions/apiPaneActions"; import { API_EDITOR_TABS } from "../constants/ApiEditorConstants/CommonApiConstants"; import store from "../store"; diff --git a/app/client/src/widgets/ButtonWidget/component/index.tsx b/app/client/src/widgets/ButtonWidget/component/index.tsx index 93719a2f35..fe7b886b9b 100644 --- a/app/client/src/widgets/ButtonWidget/component/index.tsx +++ b/app/client/src/widgets/ButtonWidget/component/index.tsx @@ -34,7 +34,7 @@ import { import { DragContainer } from "./DragContainer"; import { buttonHoverActiveStyles } from "./utils"; import type { ThemeProp } from "WidgetProvider/constants"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; const RecaptchaWrapper = styled.div` position: relative; diff --git a/app/client/src/widgets/ConnectDataOverlay.tsx b/app/client/src/widgets/ConnectDataOverlay.tsx index 7138dcc672..4398dd68ac 100644 --- a/app/client/src/widgets/ConnectDataOverlay.tsx +++ b/app/client/src/widgets/ConnectDataOverlay.tsx @@ -1,6 +1,6 @@ import { Colors } from "constants/Colors"; -import { Button } from "design-system"; +import { Button } from "@appsmith/ads"; import React from "react"; import styled from "styled-components"; diff --git a/app/client/src/widgets/CustomWidget/widget/index.tsx b/app/client/src/widgets/CustomWidget/widget/index.tsx index 19b23a6f42..4098d50300 100644 --- a/app/client/src/widgets/CustomWidget/widget/index.tsx +++ b/app/client/src/widgets/CustomWidget/widget/index.tsx @@ -28,7 +28,7 @@ import { CUSTOM_WIDGET_DOC_URL, CUSTOM_WIDGET_HEIGHT_DOC_URL, } from "pages/Editor/CustomWidgetBuilder/constants"; -import { Link } from "design-system"; +import { Link } from "@appsmith/ads"; import styled from "styled-components"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { Colors } from "constants/Colors"; diff --git a/app/client/src/widgets/JSONFormWidget/widget/index.tsx b/app/client/src/widgets/JSONFormWidget/widget/index.tsx index efc7cafcbf..2eadbfe412 100644 --- a/app/client/src/widgets/JSONFormWidget/widget/index.tsx +++ b/app/client/src/widgets/JSONFormWidget/widget/index.tsx @@ -61,7 +61,7 @@ import type { WidgetQueryGenerationFormConfig, } from "WidgetQueryGenerators/types"; import type { DynamicPath } from "utils/DynamicBindingUtils"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import { ONSUBMIT_NOT_CONFIGURED_ACTION_TEXT, ONSUBMIT_NOT_CONFIGURED_ACTION_URL, diff --git a/app/client/src/widgets/wds/WDSButtonWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSButtonWidget/widget/index.tsx index df5f93189f..897be61ab0 100644 --- a/app/client/src/widgets/wds/WDSButtonWidget/widget/index.tsx +++ b/app/client/src/widgets/wds/WDSButtonWidget/widget/index.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { toast } from "design-system"; +import { toast } from "@appsmith/ads"; import * as config from "../config"; import BaseWidget from "widgets/BaseWidget"; diff --git a/app/client/yarn.lock b/app/client/yarn.lock index b9ae0fd180..65b8e2c616 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -189,6 +189,45 @@ __metadata: languageName: unknown linkType: soft +"@appsmith/ads@workspace:^, @appsmith/ads@workspace:packages/design-system/ads": + version: 0.0.0-use.local + resolution: "@appsmith/ads@workspace:packages/design-system/ads" + dependencies: + "@radix-ui/react-dialog": ^1.0.2 + "@radix-ui/react-dropdown-menu": ^2.0.4 + "@radix-ui/react-hover-card": ^1.0.7 + "@radix-ui/react-popover": ^1.0.6 + "@radix-ui/react-tabs": ^1.0.2 + "@react-aria/button": ^3.7.0 + "@react-aria/checkbox": ^3.7.1 + "@react-aria/focus": ^3.10.1 + "@react-aria/link": ^3.3.6 + "@react-aria/radio": ^3.4.2 + "@react-aria/switch": ^3.3.1 + "@react-aria/textfield": ^3.8.1 + "@react-stately/radio": ^3.6.2 + "@react-stately/toggle": ^3.4.4 + "@react-types/button": ^3.7.0 + "@types/loadable__component": ^5.13.4 + "@types/react-datepicker": ^4.10.0 + "@xstyled/styled-components": ^3.8.0 + axe-core: ^4.7.2 + concurrently: ^8.2.0 + csstype: ^3.1.2 + date-fns: ^2.29.3 + file-loader: 6.2.0 + normalize.css: ^8.0.1 + overlayscrollbars: ^2.7.2 + overlayscrollbars-react: ^0.5.6 + rc-select: ^14.4.3 + rc-table: ^7.35.2 + rc-tooltip: ^5.3.1 + react-datepicker: ^4.10.0 + react-toastify: 9.0.3 + remark-gfm: ^3.0.1 + languageName: unknown + linkType: soft + "@aws-crypto/crc32@npm:5.2.0": version: 5.2.0 resolution: "@aws-crypto/crc32@npm:5.2.0" @@ -13115,6 +13154,7 @@ __metadata: version: 0.0.0-use.local resolution: "appsmith@workspace:." dependencies: + "@appsmith/ads": "workspace:^" "@appsmith/ads-old": "workspace:^" "@aws-sdk/client-s3": ^3.622.0 "@aws-sdk/lib-storage": ^3.622.0 @@ -13268,7 +13308,6 @@ __metadata: d3-geo: ^3.1.0 dayjs: ^1.10.6 deep-diff: ^1.0.2 - design-system: "workspace:^" diff: ^5.0.0 dotenv: ^8.1.0 downloadjs: ^1.4.7 @@ -17435,45 +17474,6 @@ __metadata: languageName: node linkType: hard -"design-system@workspace:^, design-system@workspace:packages/design-system/ads": - version: 0.0.0-use.local - resolution: "design-system@workspace:packages/design-system/ads" - dependencies: - "@radix-ui/react-dialog": ^1.0.2 - "@radix-ui/react-dropdown-menu": ^2.0.4 - "@radix-ui/react-hover-card": ^1.0.7 - "@radix-ui/react-popover": ^1.0.6 - "@radix-ui/react-tabs": ^1.0.2 - "@react-aria/button": ^3.7.0 - "@react-aria/checkbox": ^3.7.1 - "@react-aria/focus": ^3.10.1 - "@react-aria/link": ^3.3.6 - "@react-aria/radio": ^3.4.2 - "@react-aria/switch": ^3.3.1 - "@react-aria/textfield": ^3.8.1 - "@react-stately/radio": ^3.6.2 - "@react-stately/toggle": ^3.4.4 - "@react-types/button": ^3.7.0 - "@types/loadable__component": ^5.13.4 - "@types/react-datepicker": ^4.10.0 - "@xstyled/styled-components": ^3.8.0 - axe-core: ^4.7.2 - concurrently: ^8.2.0 - csstype: ^3.1.2 - date-fns: ^2.29.3 - file-loader: 6.2.0 - normalize.css: ^8.0.1 - overlayscrollbars: ^2.7.2 - overlayscrollbars-react: ^0.5.6 - rc-select: ^14.4.3 - rc-table: ^7.35.2 - rc-tooltip: ^5.3.1 - react-datepicker: ^4.10.0 - react-toastify: 9.0.3 - remark-gfm: ^3.0.1 - languageName: unknown - linkType: soft - "destroy@npm:1.2.0": version: 1.2.0 resolution: "destroy@npm:1.2.0"