diff --git a/app/client/.babelrc b/app/client/.babelrc index 0617a488c7..bad109521a 100644 --- a/app/client/.babelrc +++ b/app/client/.babelrc @@ -13,8 +13,7 @@ "actions":"./src/actions/", "api": "./src/api/", "assets": "./src/assets/", - "sagas": "./src/sagas/", - "@appsmith": "./src/ee" + "sagas": "./src/sagas/" } }, "babel-plugin-styled-components"] ] diff --git a/app/client/.eslintrc.base.json b/app/client/.eslintrc.base.json index 6180f6054f..485c107c64 100644 --- a/app/client/.eslintrc.base.json +++ b/app/client/.eslintrc.base.json @@ -76,11 +76,11 @@ { "group": ["*.svg"], "importNames": ["ReactComponent"], - "message": "Reason: Please don’t import SVG icons statically. (They won’t always be needed, but they *will* always be present in the bundle and will increase the bundle size.) Instead, please either import them as SVG paths (e.g. import starIconUrl from './star.svg'), or use the importSvg wrapper from design-system-old (e.g. const StarIcon = importSvg(() => import('./star.svg')))." + "message": "Reason: Please don’t import SVG icons statically. (They won’t always be needed, but they *will* always be present in the bundle and will increase the bundle size.) Instead, please either import them as SVG paths (e.g. import starIconUrl from './star.svg'), or use the importSvg wrapper from @appsmith/ads-old (e.g. const StarIcon = importSvg(() => import('./star.svg')))." }, { "group": ["remixicon-react/*"], - "message": "Reason: Please don’t import Remix icons statically. (They won’t always be needed, but they *will* always be present in the bundle and will increase the bundle size.) Instead, please use the importRemixIcon wrapper from design-system-old (e.g. const StarIcon = importRemixIcon(() => import('remixicon-react/Star')))." + "message": "Reason: Please don’t import Remix icons statically. (They won’t always be needed, but they *will* always be present in the bundle and will increase the bundle size.) Instead, please use the importRemixIcon wrapper from @appsmith/ads-old (e.g. const StarIcon = importRemixIcon(() => import('remixicon-react/Star')))." } ] } diff --git a/app/client/jest.config.js b/app/client/jest.config.js index e8158a237a..95aaa2fa70 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|design-system-old|react-dnd|dnd-core|@babel|(@blueprintjs)|@github|lodash-es|@draft-js-plugins|react-documents|linkedom|assert-never|axios)", + "/node_modules/(?!codemirror|konva|design-system|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", @@ -27,14 +27,12 @@ module.exports = { "^worker-loader!": "/test/__mocks__/workerMock.js", "^!!raw-loader!": "/test/__mocks__/derivedMock.js", "test/(.*)": "/test/$1", - "@appsmith/(.*)": "/src/ee/$1", - "design-system-old": "/node_modules/design-system-old", + "@appsmith/ads-old": "/node_modules/@appsmith/ads-old", "@design-system/widgets-old": "/node_modules/@design-system/widgets-old", "@design-system/widgets": "/node_modules/@design-system/widgets", "@design-system/headless": "/node_modules/@design-system/headless", "@design-system/theming": "/node_modules/@design-system/theming", - "design-system": "/node_modules/design-system", "^proxy-memoize$": "/node_modules/proxy-memoize/dist/wrapper.cjs", // @blueprintjs packages need to be resolved to the `esnext` directory. The default `esm` directory // contains sources that are transpiled to ES5. As Jest does not transpile our sources to ES5, diff --git a/app/client/package.json b/app/client/package.json index 0733b00dcd..228706265f 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-old": "workspace:^", "@aws-sdk/client-s3": "^3.622.0", "@aws-sdk/lib-storage": "^3.622.0", "@babel/standalone": "^7.23.6", @@ -123,7 +124,6 @@ "dayjs": "^1.10.6", "deep-diff": "^1.0.2", "design-system": "workspace:^", - "design-system-old": "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 cd5d6b77fa..9d365b290e 100644 --- a/app/client/packages/design-system/ads-old/package.json +++ b/app/client/packages/design-system/ads-old/package.json @@ -1,5 +1,5 @@ { - "name": "design-system-old", + "name": "@appsmith/ads-old", "version": "1.1.17", "description": "This is the package for the Appsmith design system components", "main": "src/index.ts", diff --git a/app/client/src/ce/hooks/importModal/useMethods.ts b/app/client/src/ce/hooks/importModal/useMethods.ts index 44e93e8eb9..7aa075c8b7 100644 --- a/app/client/src/ce/hooks/importModal/useMethods.ts +++ b/app/client/src/ce/hooks/importModal/useMethods.ts @@ -1,7 +1,7 @@ import { importApplication } from "ee/actions/applicationActions"; import { UPLOADING_APPLICATION, createMessage } from "ee/constants/messages"; import { getIsImportingApplication } from "ee/selectors/applicationSelectors"; -import type { SetProgress } from "design-system-old"; +import type { SetProgress } from "@appsmith/ads-old"; import { useCallback, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/ce/pages/AdminSettings/config/general.tsx b/app/client/src/ce/pages/AdminSettings/config/general.tsx index bb102bb1f8..d6fbc2e746 100644 --- a/app/client/src/ce/pages/AdminSettings/config/general.tsx +++ b/app/client/src/ce/pages/AdminSettings/config/general.tsx @@ -11,7 +11,7 @@ import { SettingTypes, } from "ee/pages/AdminSettings/config/types"; import BrandingBadge from "pages/AppViewer/BrandingBadge"; -import { TagInput } from "design-system-old"; +import { TagInput } from "@appsmith/ads-old"; import localStorage from "utils/localStorage"; import isUndefined from "lodash/isUndefined"; import { AppsmithFrameAncestorsSetting } from "pages/Applications/EmbedSnippet/Constants/constants"; diff --git a/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx b/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx index ac11aecd4a..ac31b73d91 100644 --- a/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx +++ b/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx @@ -6,7 +6,7 @@ import { EditableText, SavingState, notEmptyValidator, -} from "design-system-old"; +} from "@appsmith/ads-old"; import type { Workspace } from "ee/constants/workspaceConstants"; import { DropdownOnSelectActions, diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx index 0c11ede91a..c68dde14f4 100644 --- a/app/client/src/ce/pages/Applications/index.tsx +++ b/app/client/src/ce/pages/Applications/index.tsx @@ -58,7 +58,7 @@ import { MenuItem as ListItem, Text, TextType, -} from "design-system-old"; +} from "@appsmith/ads-old"; import { loadingUserWorkspaces } from "pages/Applications/ApplicationLoaders"; import PageWrapper from "pages/common/PageWrapper"; import WorkspaceInviteUsersForm from "pages/workspace/WorkspaceInviteUsersForm"; diff --git a/app/client/src/ce/pages/workspace/Members.tsx b/app/client/src/ce/pages/workspace/Members.tsx index e83e2a0606..6b9763b6e5 100644 --- a/app/client/src/ce/pages/workspace/Members.tsx +++ b/app/client/src/ce/pages/workspace/Members.tsx @@ -8,7 +8,7 @@ import { import type { RouteComponentProps } from "react-router"; import { useHistory } from "react-router"; import { getCurrentUser } from "selectors/usersSelectors"; -import { HighlightText, Table } from "design-system-old"; +import { HighlightText, Table } from "@appsmith/ads-old"; import { fetchUsersForWorkspace, fetchRolesForWorkspace, diff --git a/app/client/src/ce/sagas/userSagas.tsx b/app/client/src/ce/sagas/userSagas.tsx index 79551016c5..dcae341ddf 100644 --- a/app/client/src/ce/sagas/userSagas.tsx +++ b/app/client/src/ce/sagas/userSagas.tsx @@ -84,7 +84,7 @@ import { USER_PROFILE_PICTURE_UPLOAD_FAILED, UPDATE_USER_DETAILS_FAILED, } from "ee/constants/messages"; -import { createMessage } from "design-system-old"; +import { createMessage } from "@appsmith/ads-old"; import type { ProductAlert, ProductAlertConfig, diff --git a/app/client/src/components/BottomBar/ManualUpgrades.tsx b/app/client/src/components/BottomBar/ManualUpgrades.tsx index 1b461343b1..dbe10e17cc 100644 --- a/app/client/src/components/BottomBar/ManualUpgrades.tsx +++ b/app/client/src/components/BottomBar/ManualUpgrades.tsx @@ -12,7 +12,7 @@ import { ModalFooter, Callout, } from "design-system"; -import { Text, TextType } from "design-system-old"; +import { Text, TextType } from "@appsmith/ads-old"; import type { ReactNode } from "react"; import React, { useState } from "react"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/components/TabItemBackgroundFill.tsx b/app/client/src/components/TabItemBackgroundFill.tsx index deb4e08220..b3f68e1c4a 100644 --- a/app/client/src/components/TabItemBackgroundFill.tsx +++ b/app/client/src/components/TabItemBackgroundFill.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; -import type { TabProp } from "design-system-old"; -import { getTypographyByKey } from "design-system-old"; +import type { TabProp } from "@appsmith/ads-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import type { Theme } from "constants/DefaultTheme"; interface WrapperProps { diff --git a/app/client/src/components/common/Card.tsx b/app/client/src/components/common/Card.tsx index 903c5028a6..b4ab016516 100644 --- a/app/client/src/components/common/Card.tsx +++ b/app/client/src/components/common/Card.tsx @@ -2,7 +2,7 @@ import React from "react"; import styled from "styled-components"; import { Card as BlueprintCard, Classes } from "@blueprintjs/core"; import { omit } from "lodash"; -import { AppIcon, Size, TextType, Text } from "design-system-old"; +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"; diff --git a/app/client/src/components/common/Collapsible.tsx b/app/client/src/components/common/Collapsible.tsx index 0f522208b9..824bf0ef37 100644 --- a/app/client/src/components/common/Collapsible.tsx +++ b/app/client/src/components/common/Collapsible.tsx @@ -3,7 +3,7 @@ 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 { Classes, getTypographyByKey } from "design-system-old"; +import { Classes, getTypographyByKey } from "@appsmith/ads-old"; import type { Datasource } from "entities/Datasource"; const Label = styled.span` diff --git a/app/client/src/components/designSystems/blueprintjs/icon/Icon.tsx b/app/client/src/components/designSystems/blueprintjs/icon/Icon.tsx index 93e78cd470..58d701c33f 100644 --- a/app/client/src/components/designSystems/blueprintjs/icon/Icon.tsx +++ b/app/client/src/components/designSystems/blueprintjs/icon/Icon.tsx @@ -11,7 +11,7 @@ import { iconClass, intentClass, } from "@blueprintjs/core/lib/esm/common/classes"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; // This export must be named "IconSize" to match the exports of @blueprintjs/core/lib/esm/components/icon export enum IconSize { diff --git a/app/client/src/components/editorComponents/ActionCreator/Field/FieldConfig.ts b/app/client/src/components/editorComponents/ActionCreator/Field/FieldConfig.ts index e1ba8b1f23..9f164c9155 100644 --- a/app/client/src/components/editorComponents/ActionCreator/Field/FieldConfig.ts +++ b/app/client/src/components/editorComponents/ActionCreator/Field/FieldConfig.ts @@ -33,7 +33,7 @@ import { } from "../utils"; import store from "store"; import { getPageList } from "ee/selectors/entitiesSelector"; -import type { TreeDropdownOption } from "design-system-old"; +import type { TreeDropdownOption } from "@appsmith/ads-old"; import { FIELD_GROUP_CONFIG } from "../FieldGroup/FieldGroupConfig"; import { getFunctionName, checkIfArgumentExistAtPosition } from "@shared/ast"; diff --git a/app/client/src/components/editorComponents/ActionCreator/Field/index.tsx b/app/client/src/components/editorComponents/ActionCreator/Field/index.tsx index c6af8d6c70..bb4d93d3a4 100644 --- a/app/client/src/components/editorComponents/ActionCreator/Field/index.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/Field/index.tsx @@ -4,7 +4,7 @@ import { ViewTypes, DEFAULT_SELECTOR_VIEW_TEXT, } from "../constants"; -import type { TreeDropdownOption } from "design-system-old"; +import type { TreeDropdownOption } from "@appsmith/ads-old"; import { getFunctionName } from "@shared/ast"; import type { FieldProps, diff --git a/app/client/src/components/editorComponents/ActionCreator/helpers.tsx b/app/client/src/components/editorComponents/ActionCreator/helpers.tsx index 853bf6a997..84232f0345 100644 --- a/app/client/src/components/editorComponents/ActionCreator/helpers.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/helpers.tsx @@ -12,7 +12,7 @@ import { getEntityNameAndPropertyPath, isEntityAction, } from "ee/workers/Evaluation/evaluationUtils"; -import type { TreeDropdownOption } from "design-system-old"; +import type { TreeDropdownOption } from "@appsmith/ads-old"; import { Icon } from "design-system"; import { PluginType } from "entities/Action"; import type { JSAction, Variable } from "entities/JSCollection"; diff --git a/app/client/src/components/editorComponents/ActionCreator/types.ts b/app/client/src/components/editorComponents/ActionCreator/types.ts index 13c3a83e44..6ff13ef069 100644 --- a/app/client/src/components/editorComponents/ActionCreator/types.ts +++ b/app/client/src/components/editorComponents/ActionCreator/types.ts @@ -2,7 +2,7 @@ import type { SwitcherProps, TreeDropdownOption, IconName, -} from "design-system-old"; +} from "@appsmith/ads-old"; import type { EntityTypeValue, MetaArgs } from "ee/entities/DataTree/types"; import type React from "react"; import type { AdditionalDynamicDataTree } from "utils/autocomplete/customTreeTypeDefCreator"; diff --git a/app/client/src/components/editorComponents/ActionCreator/utils.test.ts b/app/client/src/components/editorComponents/ActionCreator/utils.test.ts index e22362f4fe..0c3ff349c4 100644 --- a/app/client/src/components/editorComponents/ActionCreator/utils.test.ts +++ b/app/client/src/components/editorComponents/ActionCreator/utils.test.ts @@ -20,7 +20,7 @@ import { objectSetter, sortSubMenuOptions, } from "./utils"; -import type { TreeDropdownOption } from "design-system-old"; +import type { TreeDropdownOption } from "@appsmith/ads-old"; describe("Test argStringToArray", () => { const cases = [ diff --git a/app/client/src/components/editorComponents/ActionCreator/utils.ts b/app/client/src/components/editorComponents/ActionCreator/utils.ts index 70f242750b..acca3564ff 100644 --- a/app/client/src/components/editorComponents/ActionCreator/utils.ts +++ b/app/client/src/components/editorComponents/ActionCreator/utils.ts @@ -20,7 +20,7 @@ import { checkIfCatchBlockExists, checkIfThenBlockExists, } from "@shared/ast"; -import type { TreeDropdownOption } from "design-system-old"; +import type { TreeDropdownOption } from "@appsmith/ads-old"; import type { TActionBlock } from "./types"; import { AppsmithFunction, DEFAULT_LABELS, FieldType } from "./constants"; import { FIELD_GROUP_CONFIG } from "./FieldGroup/FieldGroupConfig"; 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 113a6f92dd..4cc681afde 100644 --- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx @@ -1,6 +1,6 @@ import { Popover2 } from "@blueprintjs/popover2"; import { isModalOpenSelector } from "components/editorComponents/GlobalSearch"; -import type { TreeDropdownOption } from "design-system-old"; +import type { TreeDropdownOption } from "@appsmith/ads-old"; import { Text, Button } from "design-system"; import React, { useCallback, useRef } from "react"; import { useSelector } from "react-redux"; 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 bbfb769d05..99abb77bf2 100644 --- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionSelectorView/index.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/ActionSelectorView/index.tsx @@ -1,6 +1,6 @@ import React, { useState, useMemo, useEffect } from "react"; -import type { TreeDropdownOption } from "design-system-old"; -import { TreeDropdown } from "design-system-old"; +import type { TreeDropdownOption } from "@appsmith/ads-old"; +import { TreeDropdown } from "@appsmith/ads-old"; import { Input } from "design-system"; import { debounce } from "lodash"; import { FIELD_CONFIG } from "../../Field/FieldConfig"; diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/SelectorView/index.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/SelectorView/index.tsx index 18f6e6993a..3f19ea8f0e 100644 --- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/SelectorView/index.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/SelectorView/index.tsx @@ -3,8 +3,8 @@ import { ControlWrapper, FieldWrapper, } from "components/propertyControls/StyledControls"; -import type { Setter } from "design-system-old"; -import { TreeDropdown } from "design-system-old"; +import type { Setter } from "@appsmith/ads-old"; +import { TreeDropdown } from "@appsmith/ads-old"; import { PopoverPosition } from "@blueprintjs/core"; import React from "react"; diff --git a/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx b/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx index e94161152c..b28f7d1283 100644 --- a/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx +++ b/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Text, TextType } from "design-system-old"; +import { Text, TextType } from "@appsmith/ads-old"; import styled from "styled-components"; import LongArrowSVG from "assets/images/long-arrow-bottom.svg"; import { useEntityLink } from "../Debugger/hooks/debuggerHooks"; diff --git a/app/client/src/components/editorComponents/ActionRightPane/index.tsx b/app/client/src/components/editorComponents/ActionRightPane/index.tsx index 7786ca8c2e..4df897a9fa 100644 --- a/app/client/src/components/editorComponents/ActionRightPane/index.tsx +++ b/app/client/src/components/editorComponents/ActionRightPane/index.tsx @@ -1,6 +1,6 @@ import React, { useMemo } from "react"; import styled from "styled-components"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import { useSelector } from "react-redux"; import type { AppState } from "ee/reducers"; import { getDependenciesFromInverseDependencies } from "../Debugger/helpers"; diff --git a/app/client/src/components/editorComponents/ApiResponseMeta.tsx b/app/client/src/components/editorComponents/ApiResponseMeta.tsx index b474d2f4ee..410fe96e49 100644 --- a/app/client/src/components/editorComponents/ApiResponseMeta.tsx +++ b/app/client/src/components/editorComponents/ApiResponseMeta.tsx @@ -1,7 +1,7 @@ import type { PropsWithChildren } from "react"; import React from "react"; import { Flex } from "design-system"; -import { Text, TextType } from "design-system-old"; +import { Text, TextType } from "@appsmith/ads-old"; import { formatBytes } from "../../utils/helpers"; import { isEmpty } from "lodash"; import BindDataButton from "pages/Editor/QueryEditor/BindDataButton"; diff --git a/app/client/src/components/editorComponents/ApiResponseView.tsx b/app/client/src/components/editorComponents/ApiResponseView.tsx index 3408f70427..439fafeec4 100644 --- a/app/client/src/components/editorComponents/ApiResponseView.tsx +++ b/app/client/src/components/editorComponents/ApiResponseView.tsx @@ -22,7 +22,7 @@ import NoResponseSVG from "assets/images/no-response.svg"; import DebuggerLogs from "./Debugger/DebuggerLogs"; import ErrorLogs from "./Debugger/Errors"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { Classes, Text, TextType } from "design-system-old"; +import { Classes, Text, TextType } from "@appsmith/ads-old"; import { Button, Callout, Flex, SegmentedControl } from "design-system"; import type { BottomTab } from "./EntityBottomTabs"; import EntityBottomTabs from "./EntityBottomTabs"; diff --git a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx index f9773b5c28..bb165bd30a 100644 --- a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx +++ b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx @@ -4,7 +4,7 @@ import { setDebuggerSelectedTab, showDebugger } from "actions/debuggerActions"; import { useDispatch, useSelector } from "react-redux"; import { getAppMode } from "ee/selectors/applicationSelectors"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import type { Message } from "entities/AppsmithConsole"; import ContextualMenu from "./ContextualMenu"; import { DEBUGGER_TAB_KEYS } from "./helpers"; diff --git a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx index 959d07df3d..55b0bfa070 100644 --- a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx +++ b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx @@ -3,7 +3,7 @@ import React, { useMemo } from "react"; import { useSelector } from "react-redux"; import type { AppState } from "ee/reducers"; import styled from "styled-components"; -import { Classes, getTypographyByKey, Text, TextType } from "design-system-old"; +import { Classes, getTypographyByKey, Text, TextType } from "@appsmith/ads-old"; import InspectElement from "assets/images/InspectElement.svg"; import { createMessage, @@ -20,7 +20,7 @@ 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 { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const LongArrowSVG = importSvg( async () => import("assets/images/long-arrow-right.svg"), diff --git a/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx b/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx index 6f470cd525..12ba9e9178 100644 --- a/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx +++ b/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx @@ -3,7 +3,7 @@ import { useDispatch } from "react-redux"; import type { Log, Message, SourceEntity } from "entities/AppsmithConsole"; import { LOG_CATEGORY, Severity } from "entities/AppsmithConsole"; import styled from "styled-components"; -import { Classes, getTypographyByKey } from "design-system-old"; +import { Classes, getTypographyByKey } from "@appsmith/ads-old"; import LOG_TYPE from "entities/AppsmithConsole/logtype"; import type { PluginErrorDetails } from "api/ActionAPI"; import LogCollapseData from "./components/LogCollapseData"; diff --git a/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogAdditionalInfo.tsx b/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogAdditionalInfo.tsx index ba0459e106..7d334e5f14 100644 --- a/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogAdditionalInfo.tsx +++ b/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogAdditionalInfo.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; export const Wrapper = styled.div` ${getTypographyByKey("h6")} diff --git a/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogCollapseData.tsx b/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogCollapseData.tsx index e9ed171238..f8a064051d 100644 --- a/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogCollapseData.tsx +++ b/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogCollapseData.tsx @@ -3,7 +3,7 @@ import React from "react"; import { Collapse } from "@blueprintjs/core"; import styled from "styled-components"; import { LOG_CATEGORY } from "entities/AppsmithConsole"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import ReactJson from "react-json-view"; import { Colors } from "constants/Colors"; import LogAdditionalInfo from "./LogAdditionalInfo"; diff --git a/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx b/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx index 70d470b6fc..925c264603 100644 --- a/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx +++ b/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx @@ -1,6 +1,6 @@ import type { MutableRefObject } from "react"; import React, { useRef } from "react"; -import type { DropdownOption } from "design-system-old"; +import type { DropdownOption } from "@appsmith/ads-old"; import styled from "styled-components"; import { useDispatch } from "react-redux"; diff --git a/app/client/src/components/editorComponents/Debugger/LogItem.tsx b/app/client/src/components/editorComponents/Debugger/LogItem.tsx index ea46fd57bb..723db1c785 100644 --- a/app/client/src/components/editorComponents/Debugger/LogItem.tsx +++ b/app/client/src/components/editorComponents/Debugger/LogItem.tsx @@ -8,7 +8,7 @@ import ReactJson from "react-json-view"; import styled from "styled-components"; import EntityLink from "./EntityLink"; import { getLogIcon } from "./helpers"; -import { Classes, getTypographyByKey } from "design-system-old"; +import { Classes, getTypographyByKey } from "@appsmith/ads-old"; import ContextualMenu from "./ContextualMenu"; import { Button, Icon } from "design-system"; import moment from "moment"; diff --git a/app/client/src/components/editorComponents/Debugger/helpers.tsx b/app/client/src/components/editorComponents/Debugger/helpers.tsx index 36877c53b6..b22571c992 100644 --- a/app/client/src/components/editorComponents/Debugger/helpers.tsx +++ b/app/client/src/components/editorComponents/Debugger/helpers.tsx @@ -2,7 +2,7 @@ import type { Log } from "entities/AppsmithConsole"; import { LOG_CATEGORY, Severity } from "entities/AppsmithConsole"; import React from "react"; import styled from "styled-components"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import { createMessage, OPEN_THE_DEBUGGER, PRESS } from "ee/constants/messages"; import type { DependencyMap } from "utils/DynamicBindingUtils"; import { isChildPropertyPath } from "utils/DynamicBindingUtils"; diff --git a/app/client/src/components/editorComponents/EntityBottomTabs.tsx b/app/client/src/components/editorComponents/EntityBottomTabs.tsx index 81555581cd..11a1c7d610 100644 --- a/app/client/src/components/editorComponents/EntityBottomTabs.tsx +++ b/app/client/src/components/editorComponents/EntityBottomTabs.tsx @@ -1,5 +1,5 @@ import React from "react"; -import type { CollapsibleTabProps } from "design-system-old"; +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"; diff --git a/app/client/src/components/editorComponents/GlobalSearch/Description.tsx b/app/client/src/components/editorComponents/GlobalSearch/Description.tsx index 1945b3976b..6b53d9f7e1 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/Description.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/Description.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import ActionLink from "./ActionLink"; import Highlight from "./Highlight"; import { getItemTitle, SEARCH_ITEM_TYPES } from "./utils"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import type { SearchItem } from "./utils"; interface Props { diff --git a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx index ae853e699e..57373c6ee7 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import { connect, useSelector } from "react-redux"; -import { getTypographyByKey, Text, TextType } from "design-system-old"; +import { getTypographyByKey, Text, TextType } from "@appsmith/ads-old"; import { Icon } from "design-system"; import { setGlobalSearchCategory } from "actions/globalSearchActions"; import { HELPBAR_PLACEHOLDER } from "ee/constants/messages"; diff --git a/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx b/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx index 59deb62e86..d5cc9033b6 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx @@ -2,10 +2,10 @@ import React from "react"; import styled from "styled-components"; import NoSearchDataImage from "assets/images/no_search_data.png"; import { NO_SEARCH_DATA_TEXT } from "ee/constants/messages"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { isAirgapped } from "ee/utils/airgapHelpers"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import { DISCORD_URL } from "constants/ThirdPartyConstants"; const DiscordIcon = importSvg( diff --git a/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx b/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx index ab58b8b275..bfc7f37987 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useRef, useContext, useMemo } from "react"; import { useSelector } from "react-redux"; import type { Hit as IHit } from "react-instantsearch-core"; import styled, { css } from "styled-components"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import Highlight from "./Highlight"; import ActionLink, { StyledActionLink } from "./ActionLink"; import scrollIntoView from "scroll-into-view-if-needed"; diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialImportModal/index.tsx b/app/client/src/components/editorComponents/PartialImportExport/PartialImportModal/index.tsx index 0e601e3c6d..9b4f57527a 100644 --- a/app/client/src/components/editorComponents/PartialImportExport/PartialImportModal/index.tsx +++ b/app/client/src/components/editorComponents/PartialImportExport/PartialImportModal/index.tsx @@ -15,8 +15,8 @@ import { getPartialImportExportLoadingState, } from "ee/selectors/applicationSelectors"; import { Icon, Modal, ModalContent, ModalHeader, Text } from "design-system"; -import type { SetProgress } from "design-system-old"; -import { FilePickerV2, FileType } from "design-system-old"; +import type { SetProgress } from "@appsmith/ads-old"; +import { FilePickerV2, FileType } from "@appsmith/ads-old"; import Statusbar from "pages/Editor/gitSync/components/Statusbar"; import React, { useCallback, useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/components/editorComponents/form/fields/CheckboxField.tsx b/app/client/src/components/editorComponents/form/fields/CheckboxField.tsx index 0ee330abb0..7613efc994 100644 --- a/app/client/src/components/editorComponents/form/fields/CheckboxField.tsx +++ b/app/client/src/components/editorComponents/form/fields/CheckboxField.tsx @@ -1,5 +1,5 @@ -import type { CheckboxProps } from "design-system-old"; -import { Checkbox } from "design-system-old"; +import type { CheckboxProps } from "@appsmith/ads-old"; +import { Checkbox } from "@appsmith/ads-old"; import React from "react"; import type { BaseFieldProps } from "redux-form"; import { Field } from "redux-form"; diff --git a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx index ef500fc414..5bea414ec4 100644 --- a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx +++ b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx @@ -12,7 +12,7 @@ import { CodeEditorBorder, EditorSize, } from "components/editorComponents/CodeEditor/EditorConfig"; -import { Classes } from "design-system-old"; +import { Classes } from "@appsmith/ads-old"; import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType"; import { DEFAULT_MULTI_PART_DROPDOWN_PLACEHOLDER, diff --git a/app/client/src/components/editorComponents/form/fields/NumberField.tsx b/app/client/src/components/editorComponents/form/fields/NumberField.tsx index a1a3a0707a..9e7c155037 100644 --- a/app/client/src/components/editorComponents/form/fields/NumberField.tsx +++ b/app/client/src/components/editorComponents/form/fields/NumberField.tsx @@ -1,8 +1,8 @@ import React from "react"; import type { BaseFieldProps } from "redux-form"; import { Field } from "redux-form"; -import type { TextInputProps } from "design-system-old"; -import { TextInput } from "design-system-old"; +import type { TextInputProps } from "@appsmith/ads-old"; +import { TextInput } from "@appsmith/ads-old"; type RenderComponentProps = TextInputProps & { input?: { diff --git a/app/client/src/components/editorComponents/form/fields/TagListField.tsx b/app/client/src/components/editorComponents/form/fields/TagListField.tsx index 1146863fbb..9738c8712d 100644 --- a/app/client/src/components/editorComponents/form/fields/TagListField.tsx +++ b/app/client/src/components/editorComponents/form/fields/TagListField.tsx @@ -2,7 +2,7 @@ import type { ReactElement } from "react"; import React from "react"; import type { WrappedFieldMetaProps, WrappedFieldInputProps } from "redux-form"; import { Field } from "redux-form"; -import { TagInput } from "design-system-old"; +import { TagInput } from "@appsmith/ads-old"; import type { Intent } from "constants/DefaultTheme"; const renderComponent = ( diff --git a/app/client/src/components/formControls/BaseControl.tsx b/app/client/src/components/formControls/BaseControl.tsx index a10b7ef406..400dff4a64 100644 --- a/app/client/src/components/formControls/BaseControl.tsx +++ b/app/client/src/components/formControls/BaseControl.tsx @@ -2,7 +2,7 @@ import { Component } from "react"; import type { ControlType } from "constants/PropertyControlConstants"; import type { InputType } from "components/constants"; import type { ConditonalObject } from "reducers/evaluationReducers/formEvaluationReducer"; -import type { DropdownOption } from "design-system-old"; +import type { DropdownOption } from "@appsmith/ads-old"; import type { ViewTypes } from "./utils"; import type { FeatureFlag } from "ee/entities/FeatureFlag"; // eslint-disable-next-line @typescript-eslint/ban-types diff --git a/app/client/src/components/formControls/FilePickerControl.tsx b/app/client/src/components/formControls/FilePickerControl.tsx index b1aa2ce25f..85c9f3db7c 100644 --- a/app/client/src/components/formControls/FilePickerControl.tsx +++ b/app/client/src/components/formControls/FilePickerControl.tsx @@ -4,8 +4,8 @@ import styled from "styled-components"; import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; import type { ControlType } from "constants/PropertyControlConstants"; -import type { SetProgress } from "design-system-old"; -import { FilePickerV2, FileType } from "design-system-old"; +import type { SetProgress } from "@appsmith/ads-old"; +import { FilePickerV2, FileType } from "@appsmith/ads-old"; import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form"; import { Field } from "redux-form"; import { useEffect, useCallback } from "react"; diff --git a/app/client/src/components/formControls/InputNumberControl.tsx b/app/client/src/components/formControls/InputNumberControl.tsx index ef8e403fef..e77b2c9167 100644 --- a/app/client/src/components/formControls/InputNumberControl.tsx +++ b/app/client/src/components/formControls/InputNumberControl.tsx @@ -3,7 +3,7 @@ import type { ControlProps } from "./BaseControl"; import BaseControl from "./BaseControl"; import type { ControlType } from "constants/PropertyControlConstants"; import NumberField from "components/editorComponents/form/fields/NumberField"; -import { Classes, Text, TextType } from "design-system-old"; +import { Classes, Text, TextType } from "@appsmith/ads-old"; import styled from "styled-components"; const FormGroup = styled.div` diff --git a/app/client/src/components/formControls/SortingControl.tsx b/app/client/src/components/formControls/SortingControl.tsx index 32e13cb464..0a63e17f1b 100644 --- a/app/client/src/components/formControls/SortingControl.tsx +++ b/app/client/src/components/formControls/SortingControl.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useRef } from "react"; import { useSelector } from "react-redux"; import FormControl from "pages/Editor/FormControl"; -import { Classes } from "design-system-old"; +import { Classes } from "@appsmith/ads-old"; import styled from "styled-components"; import { FieldArray, getFormValues } from "redux-form"; import type { ControlProps } from "./BaseControl"; diff --git a/app/client/src/components/propertyControls/DraggableListComponent.tsx b/app/client/src/components/propertyControls/DraggableListComponent.tsx index 4dfc0f401a..fcbb828569 100644 --- a/app/client/src/components/propertyControls/DraggableListComponent.tsx +++ b/app/client/src/components/propertyControls/DraggableListComponent.tsx @@ -1,6 +1,6 @@ import equal from "fast-deep-equal/es6"; import React from "react"; -import { DraggableList } from "design-system-old"; +import { DraggableList } from "@appsmith/ads-old"; export interface BaseItemProps { id: string; diff --git a/app/client/src/components/propertyControls/StyledControls.tsx b/app/client/src/components/propertyControls/StyledControls.tsx index 7a13720d11..0838bc9da7 100644 --- a/app/client/src/components/propertyControls/StyledControls.tsx +++ b/app/client/src/components/propertyControls/StyledControls.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import styled from "styled-components"; -import type { TextInputProps } from "design-system-old"; +import type { TextInputProps } from "@appsmith/ads-old"; import type { ContainerOrientation } from "constants/WidgetConstants"; import { Input, Icon } from "design-system"; import useInteractionAnalyticsEvent from "utils/hooks/useInteractionAnalyticsEvent"; diff --git a/app/client/src/components/utils/ReduxFormTextField.tsx b/app/client/src/components/utils/ReduxFormTextField.tsx index 162bf0ffc2..0bc5f20ebf 100644 --- a/app/client/src/components/utils/ReduxFormTextField.tsx +++ b/app/client/src/components/utils/ReduxFormTextField.tsx @@ -1,7 +1,7 @@ import React from "react"; import type { WrappedFieldMetaProps, WrappedFieldInputProps } from "redux-form"; import { Field } from "redux-form"; -import type { InputType } from "design-system-old"; +import type { InputType } from "@appsmith/ads-old"; import { Input, NumberInput } from "design-system"; import type { Intent } from "constants/DefaultTheme"; diff --git a/app/client/src/ee/sagas/ApplicationSagas.tsx b/app/client/src/ee/sagas/ApplicationSagas.tsx index 92a47483d2..adc40a74c6 100644 --- a/app/client/src/ee/sagas/ApplicationSagas.tsx +++ b/app/client/src/ee/sagas/ApplicationSagas.tsx @@ -18,7 +18,7 @@ import { deleteNavigationLogoSaga, fetchAllApplicationsOfWorkspaceSaga, } from "ce/sagas/ApplicationSagas"; -import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; +import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { all, takeLatest } from "redux-saga/effects"; export default function* applicationSagas() { diff --git a/app/client/src/ee/sagas/JSActionSagas.ts b/app/client/src/ee/sagas/JSActionSagas.ts index 25a8e38acd..e024e9c297 100644 --- a/app/client/src/ee/sagas/JSActionSagas.ts +++ b/app/client/src/ee/sagas/JSActionSagas.ts @@ -2,7 +2,7 @@ export * from "ce/sagas/JSActionSagas"; import { ReduxActionTypes, ReduxActionErrorTypes, -} from "@appsmith/constants/ReduxActionConstants"; +} from "ee/constants/ReduxActionConstants"; import { fetchJSCollectionsSaga, createJSCollectionSaga, diff --git a/app/client/src/ee/sagas/PageSagas.tsx b/app/client/src/ee/sagas/PageSagas.tsx index 6a4ba27df1..2f52077ca5 100644 --- a/app/client/src/ee/sagas/PageSagas.tsx +++ b/app/client/src/ee/sagas/PageSagas.tsx @@ -1,5 +1,5 @@ export * from "ce/sagas/PageSagas"; -import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; +import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { fetchPageSaga, fetchPublishedPageSaga, diff --git a/app/client/src/ee/sagas/SuperUserSagas.tsx b/app/client/src/ee/sagas/SuperUserSagas.tsx index 3f9184157c..3598a0754c 100644 --- a/app/client/src/ee/sagas/SuperUserSagas.tsx +++ b/app/client/src/ee/sagas/SuperUserSagas.tsx @@ -7,14 +7,14 @@ import { RestryRestartServerPoll, SendTestEmail, } from "ce/sagas/SuperUserSagas"; -import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; +import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import type { User } from "constants/userConstants"; import { takeLatest, all, select } from "redux-saga/effects"; import { getCurrentUser } from "selectors/usersSelectors"; -import type { FeatureFlags } from "@appsmith/entities/FeatureFlag"; -import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors"; -import { isGACEnabled } from "@appsmith/utils/planHelpers"; -import { getShowAdminSettings } from "@appsmith/utils/BusinessFeatures/adminSettingsHelpers"; +import type { FeatureFlags } from "ee/entities/FeatureFlag"; +import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors"; +import { isGACEnabled } from "ee/utils/planHelpers"; +import { getShowAdminSettings } from "ee/utils/BusinessFeatures/adminSettingsHelpers"; export function* InitSuperUserSaga() { const user: User = yield select(getCurrentUser); diff --git a/app/client/src/ee/sagas/WorkspaceSagas.ts b/app/client/src/ee/sagas/WorkspaceSagas.ts index fd321e5d34..b8fa0dc5aa 100644 --- a/app/client/src/ee/sagas/WorkspaceSagas.ts +++ b/app/client/src/ee/sagas/WorkspaceSagas.ts @@ -14,7 +14,7 @@ import { searchWorkspaceEntitiesSaga, fetchEntitiesOfWorkspaceSaga, } from "ce/sagas/WorkspaceSagas"; -import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; +import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { all, takeLatest } from "redux-saga/effects"; export default function* workspaceSagas() { diff --git a/app/client/src/ee/sagas/index.tsx b/app/client/src/ee/sagas/index.tsx index 8ae5d346e9..c67390ee0b 100644 --- a/app/client/src/ee/sagas/index.tsx +++ b/app/client/src/ee/sagas/index.tsx @@ -1,6 +1,6 @@ export * from "ce/sagas"; import { sagas as CE_Sagas } from "ce/sagas"; -import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; +import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { call, all, spawn, race, take } from "redux-saga/effects"; import log from "loglevel"; import * as sentry from "@sentry/react"; diff --git a/app/client/src/ee/sagas/tenantSagas.tsx b/app/client/src/ee/sagas/tenantSagas.tsx index 2fd732ab8b..53ca8398e7 100644 --- a/app/client/src/ee/sagas/tenantSagas.tsx +++ b/app/client/src/ee/sagas/tenantSagas.tsx @@ -1,5 +1,5 @@ export * from "ce/sagas/tenantSagas"; -import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; +import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { fetchCurrentTenantConfigSaga, updateTenantConfigSaga, diff --git a/app/client/src/ee/sagas/userSagas.tsx b/app/client/src/ee/sagas/userSagas.tsx index 6c0b074aae..8682e06247 100644 --- a/app/client/src/ee/sagas/userSagas.tsx +++ b/app/client/src/ee/sagas/userSagas.tsx @@ -18,7 +18,7 @@ import { updateFirstTimeUserOnboardingSage, fetchProductAlertSaga, } from "ce/sagas/userSagas"; -import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; +import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { takeLatest, all } from "redux-saga/effects"; export default function* userSagas() { diff --git a/app/client/src/icons/AlertIcons.tsx b/app/client/src/icons/AlertIcons.tsx index ded896b802..a68d72a44e 100644 --- a/app/client/src/icons/AlertIcons.tsx +++ b/app/client/src/icons/AlertIcons.tsx @@ -2,7 +2,7 @@ import type { JSXElementConstructor } from "react"; import React from "react"; import type { IconProps } from "constants/IconConstants"; import { IconWrapper } from "constants/IconConstants"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const InfoIcon = importSvg(async () => import("assets/icons/alert/info.svg")); const SuccessIcon = importSvg( diff --git a/app/client/src/icons/ControlIcons.tsx b/app/client/src/icons/ControlIcons.tsx index 9c33bb6e73..8e1fdf3323 100644 --- a/app/client/src/icons/ControlIcons.tsx +++ b/app/client/src/icons/ControlIcons.tsx @@ -2,7 +2,7 @@ import type { JSXElementConstructor } from "react"; import React from "react"; -import { importRemixIcon, importSvg } from "design-system-old"; +import { importRemixIcon, importSvg } from "@appsmith/ads-old"; import type { IconProps } from "constants/IconConstants"; import { IconWrapper } from "constants/IconConstants"; import PlayIcon from "assets/icons/control/play-icon.png"; diff --git a/app/client/src/icons/FormIcons.tsx b/app/client/src/icons/FormIcons.tsx index ff1c8d7732..40488b996b 100644 --- a/app/client/src/icons/FormIcons.tsx +++ b/app/client/src/icons/FormIcons.tsx @@ -4,7 +4,7 @@ import { Icon } from "@blueprintjs/core"; import { IconNames } from "@blueprintjs/icons"; import type { IconProps } from "constants/IconConstants"; import { IconWrapper } from "constants/IconConstants"; -import { importRemixIcon, importSvg } from "design-system-old"; +import { importRemixIcon, importSvg } from "@appsmith/ads-old"; const InfoIcon = importSvg( async () => import("assets/icons/form/info-outline.svg"), diff --git a/app/client/src/icons/HeaderIcons.tsx b/app/client/src/icons/HeaderIcons.tsx index 6eaba26153..5b724edc8d 100644 --- a/app/client/src/icons/HeaderIcons.tsx +++ b/app/client/src/icons/HeaderIcons.tsx @@ -2,7 +2,7 @@ import type { JSXElementConstructor } from "react"; import React from "react"; import type { IconProps } from "constants/IconConstants"; import { IconWrapper } from "constants/IconConstants"; -import { importRemixIcon } from "design-system-old"; +import { importRemixIcon } from "@appsmith/ads-old"; const ShareIcon = importRemixIcon( async () => import("remixicon-react/ShareBoxFillIcon"), diff --git a/app/client/src/icons/HelpIcons.tsx b/app/client/src/icons/HelpIcons.tsx index 4ecbdcfea3..6d9163b089 100644 --- a/app/client/src/icons/HelpIcons.tsx +++ b/app/client/src/icons/HelpIcons.tsx @@ -3,7 +3,7 @@ import React from "react"; import type { IconProps } from "constants/IconConstants"; import { IconWrapper } from "constants/IconConstants"; import { Icon } from "@blueprintjs/core"; -import { importRemixIcon, importSvg } from "design-system-old"; +import { importRemixIcon, importSvg } from "@appsmith/ads-old"; const UpdatesIcon = importSvg( async () => import("assets/icons/help/updates.svg"), diff --git a/app/client/src/icons/MenuIcons.tsx b/app/client/src/icons/MenuIcons.tsx index 5571840c6d..33eb122531 100644 --- a/app/client/src/icons/MenuIcons.tsx +++ b/app/client/src/icons/MenuIcons.tsx @@ -5,7 +5,7 @@ import { Icon } from "@blueprintjs/core"; import styled from "styled-components"; import { Colors } from "constants/Colors"; import { Icon as DSIcon } from "design-system"; -import { importRemixIcon, importSvg } from "design-system-old"; +import { importRemixIcon, importSvg } from "@appsmith/ads-old"; const ApisIcon = importSvg(async () => import("assets/icons/menu/api.svg")); const WorkspaceIcon = importSvg( diff --git a/app/client/src/index.tsx b/app/client/src/index.tsx index 1d6d2b324e..61b26f646f 100755 --- a/app/client/src/index.tsx +++ b/app/client/src/index.tsx @@ -6,7 +6,7 @@ import "./wdyr"; import ReactDOM from "react-dom"; import { Provider } from "react-redux"; import "./index.css"; -import "design-system-old/src/themes/default/index.css"; +import "@appsmith/ads-old/src/themes/default/index.css"; import "design-system/src/__theme__/default/index.css"; import { ThemeProvider } from "styled-components"; import { appInitializer } from "utils/AppUtils"; diff --git a/app/client/src/layoutSystems/common/mainContainerResizer/MainContainerResizer.tsx b/app/client/src/layoutSystems/common/mainContainerResizer/MainContainerResizer.tsx index 1ca14f2ec8..78bde17238 100644 --- a/app/client/src/layoutSystems/common/mainContainerResizer/MainContainerResizer.tsx +++ b/app/client/src/layoutSystems/common/mainContainerResizer/MainContainerResizer.tsx @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from "react-redux"; import { getCurrentApplicationLayout } from "selectors/editorSelectors"; import { setAutoCanvasResizing } from "actions/autoLayoutActions"; import styled from "styled-components"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import { CANVAS_VIEWPORT } from "constants/componentClassNameConstants"; import { AUTOLAYOUT_RESIZER_WIDTH_BUFFER } from "./constants"; diff --git a/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx b/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx index 4b2a83af5d..e6c33144eb 100644 --- a/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx +++ b/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx @@ -11,7 +11,7 @@ import { } from "actions/widgetActions"; import { modText } from "utils/helpers"; import { Layers } from "constants/Layers"; -import { TooltipComponent as Tooltip } from "design-system-old"; +import { TooltipComponent as Tooltip } from "@appsmith/ads-old"; import { getSelectedWidgets } from "selectors/ui"; import { stopEventPropagation } from "utils/AppsmithUtils"; diff --git a/app/client/src/pages/AdminSettings/Branding/previews/DashboardThumbnail.tsx b/app/client/src/pages/AdminSettings/Branding/previews/DashboardThumbnail.tsx index de4ca2ed41..8b99cf7666 100644 --- a/app/client/src/pages/AdminSettings/Branding/previews/DashboardThumbnail.tsx +++ b/app/client/src/pages/AdminSettings/Branding/previews/DashboardThumbnail.tsx @@ -3,7 +3,7 @@ import { Text } from "design-system"; import PreviewBox from "./PreviewBox"; import type { PreviewsProps } from "."; import { ContentBox } from "pages/AdminSettings/components"; -import { importRemixIcon } from "design-system-old"; +import { importRemixIcon } from "@appsmith/ads-old"; const DashboardThumbnail = (props: PreviewsProps) => { const { shades } = props; diff --git a/app/client/src/pages/AdminSettings/FormGroup/Radio.tsx b/app/client/src/pages/AdminSettings/FormGroup/Radio.tsx index 3a01ac45bb..f66d5d725c 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/Radio.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/Radio.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import type { ReactElement } from "react"; -import { FieldError } from "design-system-old"; +import { FieldError } from "@appsmith/ads-old"; import { Popover2 } from "@blueprintjs/popover2"; import { FormGroup, type SettingComponentProps } from "./Common"; import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form"; diff --git a/app/client/src/pages/AdminSettings/FormGroup/TagInputField.tsx b/app/client/src/pages/AdminSettings/FormGroup/TagInputField.tsx index 7ce24c9659..7b9762217f 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/TagInputField.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/TagInputField.tsx @@ -1,7 +1,7 @@ import React from "react"; import type { WrappedFieldMetaProps, WrappedFieldInputProps } from "redux-form"; import { Field } from "redux-form"; -import { TagInput } from "design-system-old"; +import { TagInput } from "@appsmith/ads-old"; import { FormGroup } from "./Common"; import type { Intent } from "constants/DefaultTheme"; import type { Setting } from "ee/pages/AdminSettings/config/types"; diff --git a/app/client/src/pages/AdminSettings/FormGroup/TextAreaField.tsx b/app/client/src/pages/AdminSettings/FormGroup/TextAreaField.tsx index 611c0be1e4..0aaf2061c7 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/TextAreaField.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/TextAreaField.tsx @@ -2,7 +2,7 @@ import React from "react"; import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form"; import { Field } from "redux-form"; import type { Intent } from "constants/DefaultTheme"; -import { FieldError } from "design-system-old"; +import { FieldError } from "@appsmith/ads-old"; import { Input } from "design-system"; import type { Setting } from "ee/pages/AdminSettings/config/types"; diff --git a/app/client/src/pages/AdminSettings/RestartBanner.tsx b/app/client/src/pages/AdminSettings/RestartBanner.tsx index 9ec8527334..98d33c8255 100644 --- a/app/client/src/pages/AdminSettings/RestartBanner.tsx +++ b/app/client/src/pages/AdminSettings/RestartBanner.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { hexToRgba } from "design-system-old"; +import { hexToRgba } from "@appsmith/ads-old"; import { Button, Icon, Spinner, Text } from "design-system"; import { getIsRestartFailed, diff --git a/app/client/src/pages/AdminSettings/SettingsBreadcrumbs.tsx b/app/client/src/pages/AdminSettings/SettingsBreadcrumbs.tsx index aeb4379630..ebc84a8658 100644 --- a/app/client/src/pages/AdminSettings/SettingsBreadcrumbs.tsx +++ b/app/client/src/pages/AdminSettings/SettingsBreadcrumbs.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Breadcrumbs } from "design-system-old"; +import { Breadcrumbs } from "@appsmith/ads-old"; import { BreadcrumbCategories } from "ee/pages/AdminSettings/BreadcrumbCategories"; export const getBreadcrumbList = (category: string, subCategory?: string) => { diff --git a/app/client/src/pages/AppViewer/AppViewerButton.tsx b/app/client/src/pages/AppViewer/AppViewerButton.tsx index 7a6fb7cf82..42c2af78ea 100644 --- a/app/client/src/pages/AppViewer/AppViewerButton.tsx +++ b/app/client/src/pages/AppViewer/AppViewerButton.tsx @@ -9,7 +9,7 @@ import { getMenuItemTextColor, getSignInButtonStyles, } from "./utils"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; const StyledButton = styled(Button)<{ primaryColor: string; @@ -78,7 +78,7 @@ const StyledButton = styled(Button)<{ gap: 10px; width: 100%; justify-content: ${isMinimal ? "center" : "flex-start"}; - + .bp3-button-text { ${getTypographyByKey("h5")} font-weight: 400; @@ -102,7 +102,7 @@ const StyledButton = styled(Button)<{ } &:hover, - &:active, + &:active, &:focus { background-color: ${styles.backgroundOnHover} !important; diff --git a/app/client/src/pages/AppViewer/BrandingBadge.tsx b/app/client/src/pages/AppViewer/BrandingBadge.tsx index 3710c15a6a..a2b8697732 100644 --- a/app/client/src/pages/AppViewer/BrandingBadge.tsx +++ b/app/client/src/pages/AppViewer/BrandingBadge.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import styled from "styled-components"; import { Text } from "design-system"; const AppsmithLogo = importSvg( diff --git a/app/client/src/pages/AppViewer/BrandingBadgeMobile.tsx b/app/client/src/pages/AppViewer/BrandingBadgeMobile.tsx index a790e64a63..9de2e94818 100644 --- a/app/client/src/pages/AppViewer/BrandingBadgeMobile.tsx +++ b/app/client/src/pages/AppViewer/BrandingBadgeMobile.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const AppsmithLogo = importSvg( async () => import("assets/svg/appsmith-logo-no-pad.svg"), diff --git a/app/client/src/pages/AppViewer/Navigation/components/CollapseButton.tsx b/app/client/src/pages/AppViewer/Navigation/components/CollapseButton.tsx index e040644961..56c7e91c6f 100644 --- a/app/client/src/pages/AppViewer/Navigation/components/CollapseButton.tsx +++ b/app/client/src/pages/AppViewer/Navigation/components/CollapseButton.tsx @@ -4,7 +4,7 @@ import { LOCK_SIDEBAR_MESSAGE, } from "ee/constants/messages"; import classNames from "classnames"; -import { TooltipComponent } from "design-system-old"; +import { TooltipComponent } from "@appsmith/ads-old"; import React from "react"; import type { NavigationSetting } from "constants/AppConstants"; import { @@ -12,7 +12,7 @@ import { StyledIconContainer, TooltipStyles, } from "./CollapseButton.styled"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const UnpinIcon = importSvg( async () => import("assets/icons/ads/double-arrow-right.svg"), diff --git a/app/client/src/pages/AppViewer/Navigation/components/MenuItem.tsx b/app/client/src/pages/AppViewer/Navigation/components/MenuItem.tsx index 2461fcb62b..69a55ee65e 100644 --- a/app/client/src/pages/AppViewer/Navigation/components/MenuItem.tsx +++ b/app/client/src/pages/AppViewer/Navigation/components/MenuItem.tsx @@ -10,7 +10,7 @@ import { builderURL, viewerURL } from "ee/RouteBuilder"; import { getAppMode } from "ee/selectors/applicationSelectors"; import { getSelectedAppTheme } from "selectors/appThemingSelectors"; import { trimQueryString } from "utils/helpers"; -import { Icon } from "design-system-old"; +import { Icon } from "@appsmith/ads-old"; import MenuText from "./MenuText"; import classNames from "classnames"; import { StyledMenuItem } from "./MenuItem.styled"; diff --git a/app/client/src/pages/AppViewer/Navigation/components/MenuText.styled.tsx b/app/client/src/pages/AppViewer/Navigation/components/MenuText.styled.tsx index a4dfc2739b..0a5b7d8b77 100644 --- a/app/client/src/pages/AppViewer/Navigation/components/MenuText.styled.tsx +++ b/app/client/src/pages/AppViewer/Navigation/components/MenuText.styled.tsx @@ -1,5 +1,5 @@ import type { NavigationSetting } from "constants/AppConstants"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import styled from "styled-components"; export const StyledMenuItemText = styled.div<{ diff --git a/app/client/src/pages/AppViewer/Navigation/components/MenuText.tsx b/app/client/src/pages/AppViewer/Navigation/components/MenuText.tsx index 3016d52f10..7ae886523a 100644 --- a/app/client/src/pages/AppViewer/Navigation/components/MenuText.tsx +++ b/app/client/src/pages/AppViewer/Navigation/components/MenuText.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useRef, useState } from "react"; import type { NavigationSetting } from "constants/AppConstants"; -import { TooltipComponent } from "design-system-old"; +import { TooltipComponent } from "@appsmith/ads-old"; import { isEllipsisActive } from "utils/helpers"; import { StyledMenuItemText } from "./MenuText.styled"; diff --git a/app/client/src/pages/AppViewer/Navigation/components/MoreDropdownButton.styled.tsx b/app/client/src/pages/AppViewer/Navigation/components/MoreDropdownButton.styled.tsx index 6e34334c2d..6a1c49e1b4 100644 --- a/app/client/src/pages/AppViewer/Navigation/components/MoreDropdownButton.styled.tsx +++ b/app/client/src/pages/AppViewer/Navigation/components/MoreDropdownButton.styled.tsx @@ -8,7 +8,7 @@ import { import styled from "styled-components"; import Button from "pages/AppViewer/AppViewerButton"; import { NavLink } from "react-router-dom"; -import { Menu } from "design-system-old"; +import { Menu } from "@appsmith/ads-old"; export const StyleMoreDropdownButton = styled(Button)<{ borderRadius: string; diff --git a/app/client/src/pages/AppViewer/PageTabs.tsx b/app/client/src/pages/AppViewer/PageTabs.tsx index a966d56594..5357192196 100644 --- a/app/client/src/pages/AppViewer/PageTabs.tsx +++ b/app/client/src/pages/AppViewer/PageTabs.tsx @@ -7,7 +7,7 @@ import type { Page, } from "ee/constants/ReduxActionConstants"; import { isEllipsisActive, trimQueryString } from "utils/helpers"; -import { getTypographyByKey, TooltipComponent } from "design-system-old"; +import { getTypographyByKey, TooltipComponent } from "@appsmith/ads-old"; import { getAppMode } from "ee/selectors/applicationSelectors"; import { useSelector } from "react-redux"; import { getSelectedAppTheme } from "selectors/appThemingSelectors"; diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx index 184f6c59eb..894d6bb4e6 100644 --- a/app/client/src/pages/Applications/ApplicationCard.tsx +++ b/app/client/src/pages/Applications/ApplicationCard.tsx @@ -17,14 +17,14 @@ import { getApplicationIcon, getRandomPaletteColor, } from "utils/AppsmithUtils"; -import type { AppIconName } from "design-system-old"; +import type { AppIconName } from "@appsmith/ads-old"; import { ColorSelector, EditableText, EditInteractionKind, IconSelector, SavingState, -} from "design-system-old"; +} from "@appsmith/ads-old"; import type { MenuItemProps } from "design-system"; import { Button, diff --git a/app/client/src/pages/Applications/helpers.ts b/app/client/src/pages/Applications/helpers.ts index 93be4e5a06..cd6c14b9b7 100644 --- a/app/client/src/pages/Applications/helpers.ts +++ b/app/client/src/pages/Applications/helpers.ts @@ -1,4 +1,4 @@ -import type { AppIconName } from "design-system-old"; +import type { AppIconName } from "@appsmith/ads-old"; import type { AppColorCode } from "constants/DefaultTheme"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { SubmissionError } from "redux-form"; diff --git a/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx b/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx index d6de6931b1..689e1c1c4e 100644 --- a/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx +++ b/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx @@ -1,6 +1,6 @@ import React, { useMemo, useCallback, useEffect } from "react"; import styled from "styled-components"; -import { Classes, FontWeight, Text, TextType } from "design-system-old"; +import { Classes, FontWeight, Text, TextType } from "@appsmith/ads-old"; import history from "utils/history"; import { TabbedViewContainer } from "./CommonEditorForm"; import get from "lodash/get"; diff --git a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx index 5d2e7be2c7..b4755ad941 100644 --- a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx +++ b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx @@ -23,7 +23,7 @@ import ActionNameEditor from "components/editorComponents/ActionNameEditor"; import ActionSettings from "pages/Editor/ActionSettings"; import RequestDropdownField from "components/editorComponents/form/fields/RequestDropdownField"; import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; -import { Classes } from "design-system-old"; +import { Classes } from "@appsmith/ads-old"; import { Button, Callout, diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx index fbfe4d4bd7..bc5861f4a0 100644 --- a/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx +++ b/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx @@ -4,7 +4,7 @@ import { change, formValueSelector } from "redux-form"; import FormRow from "components/editorComponents/FormRow"; import { PaginationType } from "entities/Action"; import RadioFieldGroup from "components/editorComponents/form/fields/RadioGroupField"; -import type { DropdownOption } from "design-system-old"; +import type { DropdownOption } from "@appsmith/ads-old"; import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; import type { AnyAction, Dispatch } from "redux"; import { bindActionCreators } from "redux"; diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx index 37c9505565..442d1669b0 100644 --- a/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx +++ b/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx @@ -15,7 +15,7 @@ import { TabBehaviour, } from "components/editorComponents/CodeEditor/EditorConfig"; import styled from "styled-components"; -import { Text, TextType } from "design-system-old"; +import { Text, TextType } from "@appsmith/ads-old"; import LazyCodeEditor from "components/editorComponents/LazyCodeEditor"; const QueryHeader = styled.div` diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx index e5ea15ef1f..157978191e 100644 --- a/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx +++ b/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx @@ -7,7 +7,7 @@ import { TabBehaviour, } from "components/editorComponents/CodeEditor/EditorConfig"; import styled from "styled-components"; -import { Text, TextType } from "design-system-old"; +import { Text, TextType } from "@appsmith/ads-old"; import DynamicTextField from "components/editorComponents/form/fields/DynamicTextField"; import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType"; diff --git a/app/client/src/pages/Editor/APIEditor/Pagination.tsx b/app/client/src/pages/Editor/APIEditor/Pagination.tsx index b5c48e95ba..be79bf3a08 100644 --- a/app/client/src/pages/Editor/APIEditor/Pagination.tsx +++ b/app/client/src/pages/Editor/APIEditor/Pagination.tsx @@ -5,11 +5,11 @@ import DynamicTextField from "components/editorComponents/form/fields/DynamicTex import FormRow from "components/editorComponents/FormRow"; import { PaginationType } from "entities/Action"; import RadioFieldGroup from "components/editorComponents/form/fields/RadioGroupField"; -import { Classes, Text, TextType } from "design-system-old"; +import { Classes, Text, TextType } from "@appsmith/ads-old"; import { Button } from "design-system"; import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; import { CodeEditorBorder } from "components/editorComponents/CodeEditor/EditorConfig"; -import { GifPlayer } from "design-system-old"; +import { GifPlayer } from "@appsmith/ads-old"; import thumbnail from "assets/icons/gifs/thumbnail.png"; import configPagination from "assets/icons/gifs/config_pagination.gif"; diff --git a/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx b/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx index 68a5ddccc2..800b8071fc 100644 --- a/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx +++ b/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx @@ -18,7 +18,7 @@ import { EditorSize, TabBehaviour, } from "components/editorComponents/CodeEditor/EditorConfig"; -import { Classes } from "design-system-old"; +import { Classes } from "@appsmith/ads-old"; import { updateBodyContentType } from "actions/apiPaneActions"; import type { CodeEditorExpected } from "components/editorComponents/CodeEditor"; import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType"; diff --git a/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx b/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx index 12ce72a1a0..588efc48b7 100644 --- a/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx +++ b/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx @@ -9,7 +9,7 @@ import PostBodyData from "./PostBodyData"; import type { AppState } from "ee/reducers"; import { getApiName } from "selectors/formSelectors"; import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; -import { Classes, Text, TextType } from "design-system-old"; +import { Classes, Text, TextType } from "@appsmith/ads-old"; import { createMessage, API_PANE_NO_BODY } from "ee/constants/messages"; import get from "lodash/get"; import type { Datasource } from "entities/Datasource"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/DraggablePageList.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/DraggablePageList.tsx index aea0aff9d7..74c0433987 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/DraggablePageList.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/DraggablePageList.tsx @@ -2,7 +2,7 @@ import { setPageOrder } from "actions/pageActions"; import styled from "styled-components"; import type { Page } from "ee/constants/ReduxActionConstants"; // import classNames from "classnames"; -import { DraggableList } from "design-system-old"; +import { DraggableList } from "@appsmith/ads-old"; import { MenuIcons } from "icons/MenuIcons"; import React, { useRef } from "react"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/GeneralSettings.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/GeneralSettings.tsx index 9ecd9b48c4..d0381b77e4 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/GeneralSettings.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/GeneralSettings.tsx @@ -6,9 +6,9 @@ import { GENERAL_SETTINGS_NAME_EMPTY_MESSAGE, } from "ee/constants/messages"; import classNames from "classnames"; -import type { AppIconName } from "design-system-old"; +import type { AppIconName } from "@appsmith/ads-old"; import { Input, Text } from "design-system"; -import { IconSelector } from "design-system-old"; +import { IconSelector } from "@appsmith/ads-old"; import { debounce } from "lodash"; import React, { useCallback, useState } from "react"; import { useEffect } from "react"; 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 dcdd550ebf..c57abcc206 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ButtonGroupSetting.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ButtonGroupSetting.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { TextType, Text } from "design-system-old"; +import { TextType, Text } from "@appsmith/ads-old"; import type { SegmentedControlOption } from "design-system"; import { SegmentedControl } from "design-system"; import type { 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 2e4acab5d6..862b915df5 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 @@ -4,7 +4,7 @@ import { createMessage, } from "ee/constants/messages"; import { Input, Text } from "design-system"; -import { emailValidator } from "design-system-old"; +import { emailValidator } from "@appsmith/ads-old"; import React, { useMemo } from "react"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/DataSourceEditor/DatasourceBlankState.tsx b/app/client/src/pages/Editor/DataSourceEditor/DatasourceBlankState.tsx index 6ee7d51c35..9a59c8322d 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/DatasourceBlankState.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/DatasourceBlankState.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import { Text } from "design-system"; import { createMessage, diff --git a/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx b/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx index d83ff9c61e..63597acf51 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx @@ -20,7 +20,7 @@ import { getCurrentEnvironmentId } from "ee/selectors/environmentSelectors"; import { isMultipleEnvEnabled } from "ee/utils/planHelpers"; import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors"; import { Text } from "design-system"; -import { Table } from "design-system-old"; +import { Table } from "@appsmith/ads-old"; const Key = styled.div` color: var(--ads-v2-color-fg-muted); diff --git a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx index 0d29c5c02e..116db429fd 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect, useRef } from "react"; import { useDispatch, useSelector } from "react-redux"; -import type { DropdownOption } from "design-system-old"; +import type { DropdownOption } from "@appsmith/ads-old"; import { Button, SearchInput } from "design-system"; import { useSheetData, diff --git a/app/client/src/pages/Editor/EditorHeader.tsx b/app/client/src/pages/Editor/EditorHeader.tsx index 63ed418cd8..0febd30ead 100644 --- a/app/client/src/pages/Editor/EditorHeader.tsx +++ b/app/client/src/pages/Editor/EditorHeader.tsx @@ -26,7 +26,7 @@ import { getCurrentApplication, } from "ee/selectors/applicationSelectors"; import EditorName from "./EditorName"; -import { EditInteractionKind, SavingState } from "design-system-old"; +import { EditInteractionKind, SavingState } from "@appsmith/ads-old"; import { Button, Tooltip, diff --git a/app/client/src/pages/Editor/EditorName/EditableName.tsx b/app/client/src/pages/Editor/EditorName/EditableName.tsx index ff555578a4..7c039b45fb 100644 --- a/app/client/src/pages/Editor/EditorName/EditableName.tsx +++ b/app/client/src/pages/Editor/EditorName/EditableName.tsx @@ -6,12 +6,12 @@ import type { noop } from "lodash"; import type { CommonComponentProps, EditInteractionKind, -} from "design-system-old"; +} from "@appsmith/ads-old"; import { EditableTextSubComponent, SavingState, UNFILLED_WIDTH, -} from "design-system-old"; +} from "@appsmith/ads-old"; export type EditableAppNameProps = CommonComponentProps & { defaultValue: string; diff --git a/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx b/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx index c83966aa27..cbf5a28574 100644 --- a/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx +++ b/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx @@ -10,7 +10,7 @@ import { } from "design-system"; import type { noop } from "lodash"; -import type { CommonComponentProps } from "design-system-old"; +import type { CommonComponentProps } from "@appsmith/ads-old"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { MenuTypes } from "./types"; diff --git a/app/client/src/pages/Editor/EditorName/components.ts b/app/client/src/pages/Editor/EditorName/components.ts index 13505aa1af..4d6e26bf71 100644 --- a/app/client/src/pages/Editor/EditorName/components.ts +++ b/app/client/src/pages/Editor/EditorName/components.ts @@ -1,6 +1,6 @@ import styled from "styled-components"; import { Classes } from "@blueprintjs/core"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import { Icon } from "design-system"; export const Container = styled.div` diff --git a/app/client/src/pages/Editor/EditorName/index.tsx b/app/client/src/pages/Editor/EditorName/index.tsx index 9fb68ae5f2..e69aae47ed 100644 --- a/app/client/src/pages/Editor/EditorName/index.tsx +++ b/app/client/src/pages/Editor/EditorName/index.tsx @@ -4,8 +4,8 @@ import type { noop } from "lodash"; import type { CommonComponentProps, EditInteractionKind, -} from "design-system-old"; -import { SavingState } from "design-system-old"; +} from "@appsmith/ads-old"; +import { SavingState } from "@appsmith/ads-old"; import EditableName from "./EditableName"; import { NavigationMenu } from "./NavigationMenu"; import { Menu, toast, MenuTrigger } from "design-system"; diff --git a/app/client/src/pages/Editor/EditorSaveIndicator.tsx b/app/client/src/pages/Editor/EditorSaveIndicator.tsx index 12c05961ab..965fbd5b8c 100644 --- a/app/client/src/pages/Editor/EditorSaveIndicator.tsx +++ b/app/client/src/pages/Editor/EditorSaveIndicator.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { TextType, Text } from "design-system-old"; +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"; diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx index bfda1a4738..ce187fcdc4 100644 --- a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx +++ b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx @@ -23,7 +23,7 @@ import { } from "selectors/editorSelectors"; import { fetchWorkspace } from "ee/actions/workspaceActions"; import { getCurrentWorkspaceId } from "ee/selectors/selectedWorkspaceSelectors"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { EntityExplorerWrapper } from "./Common/EntityExplorerWrapper"; import { getCurrentApplicationId } from "selectors/editorSelectors"; diff --git a/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx b/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx index da02bb7e7e..575b4e06e9 100644 --- a/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx +++ b/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx @@ -9,7 +9,7 @@ import { HTTP_METHODS_COLOR } from "constants/ApiEditorConstants/CommonApiConsta import { PRIMARY_KEY, FOREIGN_KEY } from "constants/DatasourceEditorConstants"; import { Icon } from "design-system"; import { getAssetUrl } from "ee/utils/airgapHelpers"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const ApiIcon = importSvg( async () => import("assets/icons/menu/api-colored.svg"), diff --git a/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx b/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx index dab2c247c3..76bc05a12e 100644 --- a/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx +++ b/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx @@ -2,7 +2,7 @@ import React, { useState } from "react"; import styled from "styled-components"; import { find, noop } from "lodash"; import type { DropdownOption } from "components/constants"; -import { StyledMenu } from "design-system-old"; +import { StyledMenu } from "@appsmith/ads-old"; import type { IPopoverSharedProps, Position } from "@blueprintjs/core"; import { Button as BlueprintButton, diff --git a/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx b/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx index 8dc5938d8c..23ce7426ff 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx @@ -24,7 +24,7 @@ import { getInfoImage, getInfoThumbnail } from "constants/ImagesURL"; import { ProgressiveImage, Container as ProgressiveImageContainer, -} from "design-system-old"; +} from "@appsmith/ads-old"; import SuccessTick from "pages/common/SuccessTick"; import { getAssetUrl } from "ee/utils/airgapHelpers"; diff --git a/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx b/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx index 44c4b28c0a..5091fcabdf 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx @@ -5,8 +5,8 @@ import { getPluginImages } from "ee/selectors/entitiesSelector"; import type { DropdownOption, RenderDropdownOptionType, -} from "design-system-old"; -import { Classes, Text, TextType } from "design-system-old"; +} from "@appsmith/ads-old"; +import { Classes, Text, TextType } from "@appsmith/ads-old"; import _ from "lodash"; import { Tooltip, Icon } from "design-system"; import { getAssetUrl } from "ee/utils/airgapHelpers"; 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 6c0dbf37b8..1bae8ee878 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx @@ -23,7 +23,7 @@ import DataSourceOption, { DatasourceImage, } from "../DataSourceOption"; import { getQueryStringfromObject } from "ee/entities/URLRedirect/URLAssembly"; -import type { DropdownOption } from "design-system-old"; +import type { DropdownOption } from "@appsmith/ads-old"; import { Button, Icon, Text, Select, Option, Tooltip } from "design-system"; import GoogleSheetForm from "./GoogleSheetForm"; import { 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 199a5cba56..d0d4e9c1c7 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx @@ -13,8 +13,8 @@ import type { UseSpreadSheetsReturn, UseSheetColumnHeadersReturn, } from "./hooks"; -import type { DropdownOption } from "design-system-old"; -import { getTypographyByKey, Text, TextType } from "design-system-old"; +import type { DropdownOption } from "@appsmith/ads-old"; +import { getTypographyByKey, Text, TextType } from "@appsmith/ads-old"; import { debounce } from "lodash"; import { createMessage, diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts index 92fa4180b6..b42ec2bf20 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts +++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts @@ -5,7 +5,7 @@ import type { GenerateCRUDEnabledPluginMap } from "api/PluginApi"; import { CONNECT_NEW_DATASOURCE_OPTION_ID } from "../DataSourceOption"; import type { executeDatasourceQuerySuccessPayload } from "actions/datasourceActions"; import { executeDatasourceQuery } from "actions/datasourceActions"; -import type { DropdownOption } from "design-system-old"; +import type { DropdownOption } from "@appsmith/ads-old"; import { useDispatch, useSelector } from "react-redux"; import { PluginPackageName } from "entities/Action"; import { getCurrentEnvironmentId } from "ee/selectors/environmentSelectors"; diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/styles.ts b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/styles.ts index 7a9d38d635..2115a5ab44 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/styles.ts +++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/styles.ts @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; export const SelectWrapper = styled.div<{ width: string }>` display: inline-block; diff --git a/app/client/src/pages/Editor/GeneratePage/components/constants.ts b/app/client/src/pages/Editor/GeneratePage/components/constants.ts index da49abd1a4..94092f4d71 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/constants.ts +++ b/app/client/src/pages/Editor/GeneratePage/components/constants.ts @@ -1,4 +1,4 @@ -import type { DropdownOption } from "design-system-old"; +import type { DropdownOption } from "@appsmith/ads-old"; import type { DatasourceTable } from "entities/Datasource"; import { PluginPackageName } from "entities/Action"; diff --git a/app/client/src/pages/Editor/IDE/Header/index.tsx b/app/client/src/pages/Editor/IDE/Header/index.tsx index 93d5351af7..2ec47bc699 100644 --- a/app/client/src/pages/Editor/IDE/Header/index.tsx +++ b/app/client/src/pages/Editor/IDE/Header/index.tsx @@ -15,7 +15,7 @@ import { Link, } from "design-system"; import { useDispatch, useSelector } from "react-redux"; -import { EditInteractionKind, SavingState } from "design-system-old"; +import { EditInteractionKind, SavingState } from "@appsmith/ads-old"; import styled from "styled-components"; import { diff --git a/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx b/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx index a513a13cc1..2cb18d267e 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx @@ -4,7 +4,7 @@ import { useSelector } from "react-redux"; import type { AppState } from "ee/reducers"; import type { Datasource } from "entities/Datasource"; import DatasourceCard from "./DatasourceCard"; -import { Text, TextType } from "design-system-old"; +import { Text, TextType } from "@appsmith/ads-old"; import { Button } from "design-system"; import { thinScrollbar } from "constants/DefaultTheme"; import { keyBy } from "lodash"; diff --git a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx index 906f6273ca..c709bb5ae9 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx @@ -11,8 +11,8 @@ import { getMockDatasources, } from "ee/selectors/entitiesSelector"; import type { Datasource, MockDatasource } from "entities/Datasource"; -import type { TabProp } from "design-system-old"; -import { IconSize } from "design-system-old"; +import type { TabProp } from "@appsmith/ads-old"; +import { IconSize } from "@appsmith/ads-old"; import { INTEGRATION_TABS, INTEGRATION_EDITOR_MODES } from "constants/routes"; import BackButton from "../DataSourceEditor/BackButton"; import UnsupportedPluginDialog from "./UnsupportedPluginDialog"; diff --git a/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx b/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx index 11a7156d0c..a2e587b468 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Text, TextType } from "design-system-old"; +import { Text, TextType } from "@appsmith/ads-old"; import { Button, Modal, diff --git a/app/client/src/pages/Editor/JSEditor/Form.tsx b/app/client/src/pages/Editor/JSEditor/Form.tsx index fa486af560..04ef5d7fd9 100644 --- a/app/client/src/pages/Editor/JSEditor/Form.tsx +++ b/app/client/src/pages/Editor/JSEditor/Form.tsx @@ -1,7 +1,7 @@ import type { ChangeEvent } from "react"; import React, { useCallback, useEffect, useMemo, useState } from "react"; import type { JSAction } from "entities/JSCollection"; -import type { DropdownOnSelect } from "design-system-old"; +import type { DropdownOnSelect } from "@appsmith/ads-old"; import { CodeEditorBorder, EditorModes, diff --git a/app/client/src/pages/Editor/JSEditor/JSBlankState.tsx b/app/client/src/pages/Editor/JSEditor/JSBlankState.tsx index fd6453bec1..036164138a 100644 --- a/app/client/src/pages/Editor/JSEditor/JSBlankState.tsx +++ b/app/client/src/pages/Editor/JSEditor/JSBlankState.tsx @@ -1,6 +1,6 @@ import React from "react"; import { Flex, Text } from "design-system"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import { createMessage, EDITOR_PANE_TEXTS } from "ee/constants/messages"; diff --git a/app/client/src/pages/Editor/JSEditor/utils.ts b/app/client/src/pages/Editor/JSEditor/utils.ts index f1b26983eb..9ea34f347b 100644 --- a/app/client/src/pages/Editor/JSEditor/utils.ts +++ b/app/client/src/pages/Editor/JSEditor/utils.ts @@ -8,7 +8,7 @@ import { RUN_GUTTER_ID, NO_FUNCTION_DROPDOWN_OPTION, } from "./constants"; -import type { DropdownOption } from "design-system-old"; +import type { DropdownOption } from "@appsmith/ads-old"; import { find, memoize } from "lodash"; import type { PropertyNode } from "@shared/ast"; import { diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx index 6cb05bfebb..3dd8a09348 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx @@ -56,7 +56,7 @@ import WidgetFactory from "WidgetProvider/factory"; import type { AdditionalDynamicDataTree } from "utils/autocomplete/customTreeTypeDefCreator"; import clsx from "clsx"; import styled from "styled-components"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import classNames from "classnames"; import type { PropertyUpdates } from "WidgetProvider/constants"; import { getIsOneClickBindingOptionsVisibility } from "selectors/oneClickBindingSelectors"; diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneHelperText.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneHelperText.tsx index ff9bbe3c09..e5c53d3644 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneHelperText.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneHelperText.tsx @@ -1,4 +1,4 @@ -import { Text, TextType } from "design-system-old"; +import { Text, TextType } from "@appsmith/ads-old"; import React from "react"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx index c6470ee8fa..58fc7587be 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx @@ -7,7 +7,7 @@ import { EditableText, EditInteractionKind, SavingState, -} from "design-system-old"; +} from "@appsmith/ads-old"; import type { TooltipPlacement } from "design-system"; import { Tooltip, Button } from "design-system"; import { updateWidgetName } from "actions/propertyPaneActions"; diff --git a/app/client/src/pages/Editor/QueryEditor/QueriesBlankState.tsx b/app/client/src/pages/Editor/QueryEditor/QueriesBlankState.tsx index 43a8090773..3ab95b5fc3 100644 --- a/app/client/src/pages/Editor/QueryEditor/QueriesBlankState.tsx +++ b/app/client/src/pages/Editor/QueryEditor/QueriesBlankState.tsx @@ -1,6 +1,6 @@ import React from "react"; import { Flex, Text } from "design-system"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import { createMessage, EDITOR_PANE_TEXTS } from "ee/constants/messages"; diff --git a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx index 574368a0dd..160ce631ac 100644 --- a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx +++ b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx @@ -4,7 +4,7 @@ import React, { useCallback, useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import styled from "styled-components"; import { getErrorCount } from "selectors/debuggerSelectors"; -import { Text, TextType } from "design-system-old"; +import { Text, TextType } from "@appsmith/ads-old"; import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers"; import { DEBUGGER_ERRORS, diff --git a/app/client/src/pages/Editor/RealtimeAppEditors.tsx b/app/client/src/pages/Editor/RealtimeAppEditors.tsx index 55835f870d..353ca63aa7 100644 --- a/app/client/src/pages/Editor/RealtimeAppEditors.tsx +++ b/app/client/src/pages/Editor/RealtimeAppEditors.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; import { getRealtimeAppEditors } from "selectors/appCollabSelectors"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import ProfileImage from "pages/common/ProfileImage"; import UserApi from "ee/api/UserApi"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/ShareApplicationForm.tsx b/app/client/src/pages/Editor/ShareApplicationForm.tsx index f11c968780..4a157746f8 100644 --- a/app/client/src/pages/Editor/ShareApplicationForm.tsx +++ b/app/client/src/pages/Editor/ShareApplicationForm.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import { withRouter } from "react-router"; import { connect } from "react-redux"; import type { AppState } from "ee/reducers"; -import { Switch } from "design-system-old"; +import { Switch } from "@appsmith/ads-old"; import Spinner from "components/editorComponents/Spinner"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { getCurrentApplicationId } from "selectors/editorSelectors"; diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx index 6b70649ac8..223ca19466 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx @@ -19,7 +19,7 @@ import DeleteThemeModal from "./DeleteThemeModal"; import { getComplementaryGrayscaleColor } from "widgets/WidgetUtils"; import { getCurrentApplicationId } from "selectors/editorSelectors"; import { Colors } from "constants/Colors"; -import { importRemixIcon } from "design-system-old"; +import { importRemixIcon } from "@appsmith/ads-old"; const DeleteIcon = importRemixIcon( async () => import("remixicon-react/DeleteBinLineIcon"), diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx index 5fab894db3..82fdd8c626 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx @@ -19,7 +19,7 @@ import type { AppTheme } from "entities/AppTheming"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import ThemeFontControl from "./controls/ThemeFontControl"; import ThemeColorControl from "./controls/ThemeColorControl"; -import { Classes as CsClasses } from "design-system-old"; +import { Classes as CsClasses } from "@appsmith/ads-old"; import { Button, Menu, diff --git a/app/client/src/pages/Editor/commons/EditorHeaderComponents.tsx b/app/client/src/pages/Editor/commons/EditorHeaderComponents.tsx index d37d9089fc..ba8f67913c 100644 --- a/app/client/src/pages/Editor/commons/EditorHeaderComponents.tsx +++ b/app/client/src/pages/Editor/commons/EditorHeaderComponents.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; import { Profile } from "pages/common/ProfileImage"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; export const HeaderWrapper = styled.div` width: 100%; diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/AutocommitStatusbar.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/AutocommitStatusbar.tsx index 8cc659b4cf..be8245bdc6 100644 --- a/app/client/src/pages/Editor/gitSync/QuickGitActions/AutocommitStatusbar.tsx +++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/AutocommitStatusbar.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { Statusbar } from "design-system-old"; +import { Statusbar } from "@appsmith/ads-old"; import styled from "styled-components"; import { AUTOCOMMIT_IN_PROGRESS_MESSAGE, diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx index 94600dfed9..c76a29f688 100644 --- a/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx +++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx @@ -17,7 +17,7 @@ import { import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { Button, Icon, Tooltip } from "design-system"; import { isEllipsisActive } from "utils/helpers"; -import { importRemixIcon } from "design-system-old"; +import { importRemixIcon } from "@appsmith/ads-old"; import { setShowBranchPopupAction } from "actions/gitSyncActions"; const ProtectedIcon = importRemixIcon( diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx index 476d6bc074..a58fb4861b 100644 --- a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx +++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx @@ -40,7 +40,7 @@ import { protectedModeSelector, } from "selectors/gitSyncSelectors"; import SpinnerLoader from "pages/common/SpinnerLoader"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import { Button, Icon, Tooltip } from "design-system"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx index 8e7d1d76e5..b47b308c01 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx @@ -23,7 +23,7 @@ import { UPDATE_CONFIG, } from "ee/constants/messages"; import styled from "styled-components"; -import { emailValidator } from "design-system-old"; +import { emailValidator } from "@appsmith/ads-old"; import UserGitProfileSettings from "../components/UserGitProfileSettings"; import { AUTH_TYPE_OPTIONS, Classes } from "../constants"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/gitSync/components/BranchList.tsx b/app/client/src/pages/Editor/gitSync/components/BranchList.tsx index a783f9b7d0..eb4936f9d1 100644 --- a/app/client/src/pages/Editor/gitSync/components/BranchList.tsx +++ b/app/client/src/pages/Editor/gitSync/components/BranchList.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useMemo, useState } from "react"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import styled, { useTheme } from "styled-components"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/pages/Editor/gitSync/components/BranchListItem.tsx b/app/client/src/pages/Editor/gitSync/components/BranchListItem.tsx index 05cc478b19..e73801f324 100644 --- a/app/client/src/pages/Editor/gitSync/components/BranchListItem.tsx +++ b/app/client/src/pages/Editor/gitSync/components/BranchListItem.tsx @@ -9,7 +9,7 @@ import { isEllipsisActive } from "utils/helpers"; import { useSelector } from "react-redux"; import { getBranchSwitchingDetails } from "selectors/gitSyncSelectors"; import styled from "styled-components"; -import { importRemixIcon } from "design-system-old"; +import { importRemixIcon } from "@appsmith/ads-old"; const ProtectedIcon = importRemixIcon( async () => import("remixicon-react/ShieldKeyholeLineIcon"), diff --git a/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx b/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx index 9af79be6d3..8c986a0e3e 100644 --- a/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx +++ b/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx @@ -5,7 +5,7 @@ import { FontWeight, TextType, TooltipComponent, -} from "design-system-old"; +} from "@appsmith/ads-old"; import { Colors } from "constants/Colors"; import React, { useState, useEffect, useCallback } from "react"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/gitSync/components/DangerMenuItem.tsx b/app/client/src/pages/Editor/gitSync/components/DangerMenuItem.tsx index e298ec0d3e..6f0b24d3a5 100644 --- a/app/client/src/pages/Editor/gitSync/components/DangerMenuItem.tsx +++ b/app/client/src/pages/Editor/gitSync/components/DangerMenuItem.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { MenuItem } from "design-system-old"; +import { MenuItem } from "@appsmith/ads-old"; import { Colors } from "constants/Colors"; const DangerMenuItem = styled(MenuItem)` diff --git a/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx b/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx index 95d26cc7ce..78600a5ec4 100644 --- a/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx +++ b/app/client/src/pages/Editor/gitSync/components/DatasourceListItem.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Text, TextType } from "design-system-old"; +import { Text, TextType } from "@appsmith/ads-old"; import { Icon, Tooltip } from "design-system"; import type { Datasource } from "entities/Datasource"; import styled from "styled-components"; diff --git a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx index 9450a75381..59a9642ef1 100644 --- a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx +++ b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx @@ -16,7 +16,7 @@ import { howMuchTimeBeforeText } from "utils/helpers"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; import { viewerURL } from "ee/RouteBuilder"; import { Link, Text } from "design-system"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const CloudyIcon = importSvg( async () => import("assets/icons/ads/cloudy-line.svg"), diff --git a/app/client/src/pages/Editor/gitSync/components/Link.tsx b/app/client/src/pages/Editor/gitSync/components/Link.tsx index 7a04db395b..27c5ff86f1 100644 --- a/app/client/src/pages/Editor/gitSync/components/Link.tsx +++ b/app/client/src/pages/Editor/gitSync/components/Link.tsx @@ -1,7 +1,7 @@ import React from "react"; import { Colors } from "constants/Colors"; import styled from "styled-components"; -import { Classes, Text, Case, FontWeight, TextType } from "design-system-old"; +import { Classes, Text, Case, FontWeight, TextType } from "@appsmith/ads-old"; import { Icon } from "design-system"; const LinkText = styled.div<{ color?: string }>` diff --git a/app/client/src/pages/Editor/gitSync/components/OptionSelector.tsx b/app/client/src/pages/Editor/gitSync/components/OptionSelector.tsx index 2e53426959..c4e7262467 100644 --- a/app/client/src/pages/Editor/gitSync/components/OptionSelector.tsx +++ b/app/client/src/pages/Editor/gitSync/components/OptionSelector.tsx @@ -2,16 +2,16 @@ import React from "react"; import type { DefaultDropDownValueNodeProps, DropdownOption, -} from "design-system-old"; +} from "@appsmith/ads-old"; import { Dropdown, DropdownWrapper, DropdownContainer as DropdownComponentContainer, -} from "design-system-old"; +} from "@appsmith/ads-old"; import { Colors } from "constants/Colors"; import styled from "styled-components"; import { Classes as GitSyncClasses } from "pages/Editor/gitSync/constants"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const ChevronDown = importSvg( async () => import("assets/icons/ads/chevron-down.svg"), diff --git a/app/client/src/pages/Editor/gitSync/components/PushFailedWarning.tsx b/app/client/src/pages/Editor/gitSync/components/PushFailedWarning.tsx index c45e8f623a..d25eda7162 100644 --- a/app/client/src/pages/Editor/gitSync/components/PushFailedWarning.tsx +++ b/app/client/src/pages/Editor/gitSync/components/PushFailedWarning.tsx @@ -1,5 +1,5 @@ import { Callout } from "design-system"; -import { Text, TextType } from "design-system-old"; +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/RemoteBranchListItem.tsx b/app/client/src/pages/Editor/gitSync/components/RemoteBranchListItem.tsx index 851cee8f5d..3fe2218fd1 100644 --- a/app/client/src/pages/Editor/gitSync/components/RemoteBranchListItem.tsx +++ b/app/client/src/pages/Editor/gitSync/components/RemoteBranchListItem.tsx @@ -1,7 +1,7 @@ import React from "react"; import { Spinner, Tooltip } from "design-system"; import { isEllipsisActive } from "utils/helpers"; -import { Text, TextType } from "design-system-old"; +import { Text, TextType } from "@appsmith/ads-old"; import { BranchListItemContainer } from "./BranchListItemContainer"; import { useSelector } from "react-redux"; import { getBranchSwitchingDetails } from "selectors/gitSyncSelectors"; diff --git a/app/client/src/pages/Editor/gitSync/components/Statusbar.tsx b/app/client/src/pages/Editor/gitSync/components/Statusbar.tsx index a22b46c9e9..868e80406e 100644 --- a/app/client/src/pages/Editor/gitSync/components/Statusbar.tsx +++ b/app/client/src/pages/Editor/gitSync/components/Statusbar.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { Statusbar } from "design-system-old"; +import { Statusbar } from "@appsmith/ads-old"; import styled from "styled-components"; interface StatusbarProps { diff --git a/app/client/src/pages/Editor/gitSync/components/StyledComponents.tsx b/app/client/src/pages/Editor/gitSync/components/StyledComponents.tsx index f4074deadf..543a150f05 100644 --- a/app/client/src/pages/Editor/gitSync/components/StyledComponents.tsx +++ b/app/client/src/pages/Editor/gitSync/components/StyledComponents.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { getTypographyByKey } from "design-system-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; export const Title = styled.p` ${getTypographyByKey("h2")}; diff --git a/app/client/src/pages/Editor/gitSync/components/TabItem.tsx b/app/client/src/pages/Editor/gitSync/components/TabItem.tsx index 6bfe0aaf8f..598e7d1fa5 100644 --- a/app/client/src/pages/Editor/gitSync/components/TabItem.tsx +++ b/app/client/src/pages/Editor/gitSync/components/TabItem.tsx @@ -1,8 +1,8 @@ import React from "react"; import styled from "styled-components"; import type { Theme } from "constants/DefaultTheme"; -import type { TabProp } from "design-system-old"; -import { getTypographyByKey } from "design-system-old"; +import type { TabProp } from "@appsmith/ads-old"; +import { getTypographyByKey } from "@appsmith/ads-old"; import { Colors } from "constants/Colors"; interface WrapperProps { diff --git a/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings.tsx b/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings.tsx index 3f1e8538e5..1ee72662b3 100644 --- a/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings.tsx +++ b/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings.tsx @@ -10,7 +10,7 @@ import { createMessage, } from "ee/constants/messages"; import styled from "styled-components"; -import { emailValidator } from "design-system-old"; +import { emailValidator } from "@appsmith/ads-old"; import { useSelector } from "react-redux"; import { getIsFetchingGlobalGitConfig, diff --git a/app/client/src/pages/Templates/LeftPaneTemplateList.tsx b/app/client/src/pages/Templates/LeftPaneTemplateList.tsx index 7a4522c679..11daca2d51 100644 --- a/app/client/src/pages/Templates/LeftPaneTemplateList.tsx +++ b/app/client/src/pages/Templates/LeftPaneTemplateList.tsx @@ -3,7 +3,7 @@ import { useSelector } from "react-redux"; import { useParams } from "react-router"; import { getTemplatesSelector } from "selectors/templatesSelectors"; import styled from "styled-components"; -import { Classes, Text, TextType } from "design-system-old"; +import { Classes, Text, TextType } from "@appsmith/ads-old"; import history from "utils/history"; import { thinScrollbar } from "constants/DefaultTheme"; import { Colors } from "constants/Colors"; diff --git a/app/client/src/pages/Templates/Template/RequestTemplate.tsx b/app/client/src/pages/Templates/Template/RequestTemplate.tsx index 4862981eef..42dcfc5097 100644 --- a/app/client/src/pages/Templates/Template/RequestTemplate.tsx +++ b/app/client/src/pages/Templates/Template/RequestTemplate.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Text, TextType } from "design-system-old"; +import { Text, TextType } from "@appsmith/ads-old"; import { Button } from "design-system"; import RequestTemplateSvg from "assets/images/request-template.svg"; import { diff --git a/app/client/src/pages/UserAuth/ForgotPassword.tsx b/app/client/src/pages/UserAuth/ForgotPassword.tsx index 98be2b1143..3cbaa4b36a 100644 --- a/app/client/src/pages/UserAuth/ForgotPassword.tsx +++ b/app/client/src/pages/UserAuth/ForgotPassword.tsx @@ -20,7 +20,7 @@ import { 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 "design-system-old"; +import { FormGroup } from "@appsmith/ads-old"; import { Button, Link, Callout, Icon } from "design-system"; import { isEmail, isEmptyString } from "utils/formhelpers"; import type { ForgotPasswordFormValues } from "./helpers"; diff --git a/app/client/src/pages/UserAuth/Login.tsx b/app/client/src/pages/UserAuth/Login.tsx index a5996485fa..e84d4d97db 100644 --- a/app/client/src/pages/UserAuth/Login.tsx +++ b/app/client/src/pages/UserAuth/Login.tsx @@ -25,7 +25,7 @@ import { NEW_TO_APPSMITH, createMessage, } from "ee/constants/messages"; -import { FormGroup } from "design-system-old"; +import { FormGroup } from "@appsmith/ads-old"; import { Button, Link, Callout } from "design-system"; import FormTextField from "components/utils/ReduxFormTextField"; import ThirdPartyAuth from "pages/UserAuth/ThirdPartyAuth"; diff --git a/app/client/src/pages/UserAuth/SignUp.tsx b/app/client/src/pages/UserAuth/SignUp.tsx index a550b42d16..8b7ff5bee4 100644 --- a/app/client/src/pages/UserAuth/SignUp.tsx +++ b/app/client/src/pages/UserAuth/SignUp.tsx @@ -29,7 +29,7 @@ import { } from "ee/constants/messages"; import FormTextField from "components/utils/ReduxFormTextField"; import ThirdPartyAuth from "pages/UserAuth/ThirdPartyAuth"; -import { FormGroup } from "design-system-old"; +import { FormGroup } from "@appsmith/ads-old"; import { Button, Link, Callout } from "design-system"; import { isEmail, isStrongPassword, isEmptyString } from "utils/formhelpers"; diff --git a/app/client/src/pages/UserAuth/StyledComponents.tsx b/app/client/src/pages/UserAuth/StyledComponents.tsx index 2df33f86ee..597e05c32a 100644 --- a/app/client/src/pages/UserAuth/StyledComponents.tsx +++ b/app/client/src/pages/UserAuth/StyledComponents.tsx @@ -2,7 +2,7 @@ import styled from "styled-components"; import { Link } from "react-router-dom"; import Form from "components/editorComponents/Form"; import { Card } from "@blueprintjs/core"; -import { FormGroup, getTypographyByKey } from "design-system-old"; +import { FormGroup, getTypographyByKey } from "@appsmith/ads-old"; export const AuthContainer = styled.section` position: absolute; diff --git a/app/client/src/pages/UserProfile/General.tsx b/app/client/src/pages/UserProfile/General.tsx index 4d6a0a78c8..91562dc2a7 100644 --- a/app/client/src/pages/UserProfile/General.tsx +++ b/app/client/src/pages/UserProfile/General.tsx @@ -16,8 +16,8 @@ import UserProfileImagePicker from "./UserProfileImagePicker"; import { Wrapper, FieldWrapper, LabelWrapper } from "./StyledComponents"; import { ANONYMOUS_USERNAME } from "constants/userConstants"; import { ALL_LANGUAGE_CHARACTERS_REGEX } from "constants/Regex"; -import { createMessage } from "design-system-old"; -import { notEmptyValidator } from "design-system-old"; +import { createMessage } from "@appsmith/ads-old"; +import { notEmptyValidator } from "@appsmith/ads-old"; import { getIsFormLoginEnabled } from "ee/selectors/tenantSelectors"; const nameValidator = ( diff --git a/app/client/src/pages/UserProfile/GitConfig.tsx b/app/client/src/pages/UserProfile/GitConfig.tsx index 919af9c84b..813ee86d2e 100644 --- a/app/client/src/pages/UserProfile/GitConfig.tsx +++ b/app/client/src/pages/UserProfile/GitConfig.tsx @@ -14,7 +14,7 @@ import { getIsFetchingGlobalGitConfig, } from "selectors/gitSyncSelectors"; import { updateGlobalGitConfigInit } from "actions/gitSyncActions"; -import { emailValidator } from "design-system-old"; +import { emailValidator } from "@appsmith/ads-old"; export default function GitConfig() { const dispatch = useDispatch(); diff --git a/app/client/src/pages/UserProfile/UserProfileImagePicker.tsx b/app/client/src/pages/UserProfile/UserProfileImagePicker.tsx index b4f784c140..4d63ade2df 100644 --- a/app/client/src/pages/UserProfile/UserProfileImagePicker.tsx +++ b/app/client/src/pages/UserProfile/UserProfileImagePicker.tsx @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from "react-redux"; import { updatePhoto, removePhoto, updatePhotoId } from "actions/userActions"; import { getCurrentUser } from "selectors/usersSelectors"; import { USER_PHOTO_ASSET_URL } from "constants/userConstants"; -import { DisplayImageUpload } from "design-system-old"; +import { DisplayImageUpload } from "@appsmith/ads-old"; import type Uppy from "@uppy/core"; import { ReduxActionErrorTypes } from "ee/constants/ReduxActionConstants"; diff --git a/app/client/src/pages/UserProfile/index.test.tsx b/app/client/src/pages/UserProfile/index.test.tsx index 2f0fe2caa1..f9e6ffe365 100644 --- a/app/client/src/pages/UserProfile/index.test.tsx +++ b/app/client/src/pages/UserProfile/index.test.tsx @@ -83,11 +83,6 @@ const defaultStoreState = { }, }; -jest.mock("design-system-old/build/constants/messages", () => ({ - ...jest.requireActual("design-system-old/build/constants/messages"), - createMessage: () => "", -})); - jest.mock("actions/gitSyncActions", () => ({ fetchGlobalGitConfigInit: jest.fn(), })); diff --git a/app/client/src/pages/common/ImportModal.tsx b/app/client/src/pages/common/ImportModal.tsx index 4510474b7d..76011bbcb8 100644 --- a/app/client/src/pages/common/ImportModal.tsx +++ b/app/client/src/pages/common/ImportModal.tsx @@ -12,7 +12,7 @@ import { IMPORT_FROM_GIT_DISABLED_IN_ANVIL, UPLOADING_JSON, } from "ee/constants/messages"; -import { FilePickerV2, FileType } from "design-system-old"; +import { FilePickerV2, FileType } from "@appsmith/ads-old"; import { setIsGitSyncModalOpen } from "actions/gitSyncActions"; import { GitSyncModalTab } from "entities/GitSync"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; diff --git a/app/client/src/pages/common/LoginHeader.tsx b/app/client/src/pages/common/LoginHeader.tsx index 104939ea7a..08e4dc2e50 100644 --- a/app/client/src/pages/common/LoginHeader.tsx +++ b/app/client/src/pages/common/LoginHeader.tsx @@ -7,7 +7,7 @@ import StyledHeader from "components/designSystems/appsmith/StyledHeader"; import type { AppState } from "ee/reducers"; import { BASE_URL } from "constants/routes"; import { Colors } from "constants/Colors"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const AppsmithLogo = importSvg( async () => import("assets/svg/appsmith_logo_primary.svg"), diff --git a/app/client/src/pages/common/MobileSidebar.tsx b/app/client/src/pages/common/MobileSidebar.tsx index 1ac21d6ddf..fb79996564 100644 --- a/app/client/src/pages/common/MobileSidebar.tsx +++ b/app/client/src/pages/common/MobileSidebar.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import { Colors } from "constants/Colors"; -import { MenuItem } from "design-system-old"; +import { MenuItem } from "@appsmith/ads-old"; import { Text, Avatar } from "design-system"; import { getInitials } from "utils/AppsmithUtils"; import { diff --git a/app/client/src/pages/common/ProfileDropdown.tsx b/app/client/src/pages/common/ProfileDropdown.tsx index d5b5f87ced..74390b6977 100644 --- a/app/client/src/pages/common/ProfileDropdown.tsx +++ b/app/client/src/pages/common/ProfileDropdown.tsx @@ -1,5 +1,5 @@ import React from "react"; -import type { CommonComponentProps } from "design-system-old"; +import type { CommonComponentProps } from "@appsmith/ads-old"; import { getInitials } from "utils/AppsmithUtils"; import { Menu, diff --git a/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx b/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx index 2842823e4a..57d3679363 100644 --- a/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx +++ b/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx @@ -3,8 +3,8 @@ import { Text } from "design-system"; import React from "react"; import { SearchListItem } from "./WorkspaceSearchItems"; import styled from "styled-components"; -import type { AppIconName } from "design-system-old"; -import { AppIcon, Size } from "design-system-old"; +import type { AppIconName } from "@appsmith/ads-old"; +import { AppIcon, Size } from "@appsmith/ads-old"; import { getApplicationIcon } from "utils/AppsmithUtils"; const CircleAppIcon = styled(AppIcon)` diff --git a/app/client/src/pages/common/SuccessTick.tsx b/app/client/src/pages/common/SuccessTick.tsx index d423dd50a0..b77d82a377 100644 --- a/app/client/src/pages/common/SuccessTick.tsx +++ b/app/client/src/pages/common/SuccessTick.tsx @@ -1,7 +1,7 @@ import type { CSSProperties } from "styled-components"; import styled from "styled-components"; import React from "react"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const CheckmarkSvg = importSvg(async () => import("assets/svg/checkmark.svg")); diff --git a/app/client/src/pages/common/ThemeSwitcher.tsx b/app/client/src/pages/common/ThemeSwitcher.tsx index b2aea09f07..b069de8776 100644 --- a/app/client/src/pages/common/ThemeSwitcher.tsx +++ b/app/client/src/pages/common/ThemeSwitcher.tsx @@ -1,7 +1,7 @@ import React, { useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { setThemeMode } from "actions/themeActions"; -import { MenuItem, RectangularSwitcher } from "design-system-old"; +import { MenuItem, RectangularSwitcher } from "@appsmith/ads-old"; import { getCurrentThemeMode, ThemeMode } from "selectors/themeSelectors"; export default function ThemeSwitcher(props: { className?: string }) { diff --git a/app/client/src/pages/setup/DetailsForm.tsx b/app/client/src/pages/setup/DetailsForm.tsx index 8cf180e8f1..b75de80894 100644 --- a/app/client/src/pages/setup/DetailsForm.tsx +++ b/app/client/src/pages/setup/DetailsForm.tsx @@ -17,7 +17,7 @@ import { } from "ee/constants/messages"; import FormTextField from "components/utils/ReduxFormTextField"; import type { FormErrors, InjectedFormProps } from "redux-form"; -import { FormGroup } from "design-system-old"; +import { FormGroup } from "@appsmith/ads-old"; import { Button, Checkbox } from "design-system"; import { proficiencyOptions, useCaseOptions } from "./constants"; import { isAirgapped } from "ee/utils/airgapHelpers"; diff --git a/app/client/src/pages/setup/common.tsx b/app/client/src/pages/setup/common.tsx index 85c02ce119..ed7946b13e 100644 --- a/app/client/src/pages/setup/common.tsx +++ b/app/client/src/pages/setup/common.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { FormGroup as StyledFormGroup } from "design-system-old"; +import { FormGroup as StyledFormGroup } from "@appsmith/ads-old"; import type { FormTextFieldProps } from "components/utils/ReduxFormTextField"; import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form"; import styled from "styled-components"; diff --git a/app/client/src/pages/workspace/General.tsx b/app/client/src/pages/workspace/General.tsx index ce3f413a50..2307d7fb92 100644 --- a/app/client/src/pages/workspace/General.tsx +++ b/app/client/src/pages/workspace/General.tsx @@ -15,8 +15,8 @@ import { } from "ee/selectors/workspaceSelectors"; import { useParams } from "react-router-dom"; import styled from "styled-components"; -import type { SetProgress, UploadCallback } from "design-system-old"; -import { FilePickerV2, FileType, Text, TextType } from "design-system-old"; +import type { SetProgress, UploadCallback } from "@appsmith/ads-old"; +import { FilePickerV2, FileType, Text, TextType } from "@appsmith/ads-old"; import { Classes } from "@blueprintjs/core"; import { useMediaQuery } from "react-responsive"; import { diff --git a/app/client/src/pages/workspace/WorkspaceInviteUsersForm.tsx b/app/client/src/pages/workspace/WorkspaceInviteUsersForm.tsx index 382ff4f836..46df06f044 100644 --- a/app/client/src/pages/workspace/WorkspaceInviteUsersForm.tsx +++ b/app/client/src/pages/workspace/WorkspaceInviteUsersForm.tsx @@ -8,7 +8,7 @@ import { Avatar, Icon, Spinner, Text, Tooltip } from "design-system"; import { getInitialsFromName } from "utils/AppsmithUtils"; import ManageUsers from "pages/workspace/ManageUsers"; import { USER_PHOTO_ASSET_URL } from "constants/userConstants"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import type { WorkspaceUserRoles } from "ee/constants/workspaceConstants"; import InviteUsersForm from "ee/pages/workspace/InviteUsersForm"; import { ENTITY_TYPE } from "ee/constants/workspaceConstants"; diff --git a/app/client/src/reducers/entityReducers/datasourceReducer.ts b/app/client/src/reducers/entityReducers/datasourceReducer.ts index 480622bb0f..58aff62daa 100644 --- a/app/client/src/reducers/entityReducers/datasourceReducer.ts +++ b/app/client/src/reducers/entityReducers/datasourceReducer.ts @@ -12,7 +12,7 @@ import type { } from "entities/Datasource"; import { ToastMessageType } from "entities/Datasource"; import { TEMP_DATASOURCE_ID } from "constants/Datasource"; -import type { DropdownOption } from "design-system-old"; +import type { DropdownOption } from "@appsmith/ads-old"; import produce from "immer"; import { assign } from "lodash"; diff --git a/app/client/src/utils/AppsmithUtils.tsx b/app/client/src/utils/AppsmithUtils.tsx index 0035da3ee8..55d5f42a98 100644 --- a/app/client/src/utils/AppsmithUtils.tsx +++ b/app/client/src/utils/AppsmithUtils.tsx @@ -3,8 +3,8 @@ import { ERROR_CODES } from "ee/constants/ApiConstants"; import { createMessage, ERROR_500 } from "ee/constants/messages"; import * as Sentry from "@sentry/react"; import type { Property } from "api/ActionAPI"; -import type { AppIconName } from "design-system-old"; -import { AppIconCollection } from "design-system-old"; +import type { AppIconName } from "@appsmith/ads-old"; +import { AppIconCollection } from "@appsmith/ads-old"; import _, { isPlainObject } from "lodash"; import * as log from "loglevel"; import { osName } from "react-device-detect"; diff --git a/app/client/src/widgets/AudioRecorderWidget/component/index.tsx b/app/client/src/widgets/AudioRecorderWidget/component/index.tsx index e2d818f9d0..6ae84df91c 100644 --- a/app/client/src/widgets/AudioRecorderWidget/component/index.tsx +++ b/app/client/src/widgets/AudioRecorderWidget/component/index.tsx @@ -8,7 +8,7 @@ import { WIDGET_PADDING } from "constants/WidgetConstants"; import { darkenHover } from "constants/DefaultTheme"; import { Colors } from "constants/Colors"; import type { ThemeProp } from "WidgetProvider/constants"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const RecorderDefaultIcon = importSvg( async () => import("assets/icons/widget/recorder/recorder_default.svg"), diff --git a/app/client/src/widgets/CameraWidget/component/index.tsx b/app/client/src/widgets/CameraWidget/component/index.tsx index 8e879ee57e..2105dffcff 100644 --- a/app/client/src/widgets/CameraWidget/component/index.tsx +++ b/app/client/src/widgets/CameraWidget/component/index.tsx @@ -45,7 +45,7 @@ import { } from "../constants"; import type { ThemeProp } from "WidgetProvider/constants"; import { isAirgapped } from "ee/utils/airgapHelpers"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import { getVideoConstraints } from "../../utils"; import { CANVAS_ART_BOARD } from "constants/componentClassNameConstants"; diff --git a/app/client/src/widgets/CodeScannerWidget/component/index.tsx b/app/client/src/widgets/CodeScannerWidget/component/index.tsx index d0ea4cbf7c..11653d5420 100644 --- a/app/client/src/widgets/CodeScannerWidget/component/index.tsx +++ b/app/client/src/widgets/CodeScannerWidget/component/index.tsx @@ -27,7 +27,7 @@ import { import { ScannerLayout } from "../constants"; import type { ThemeProp } from "WidgetProvider/constants"; import { usePageVisibility } from "react-page-visibility"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import { getVideoConstraints } from "widgets/utils"; import { isMobile } from "react-device-detect"; diff --git a/app/client/src/widgets/ImageWidget/component/index.tsx b/app/client/src/widgets/ImageWidget/component/index.tsx index 338b598b9c..1aa25ac5d7 100644 --- a/app/client/src/widgets/ImageWidget/component/index.tsx +++ b/app/client/src/widgets/ImageWidget/component/index.tsx @@ -3,7 +3,7 @@ import type { ComponentProps } from "widgets/BaseComponent"; import styled from "styled-components"; import { TransformWrapper, TransformComponent } from "react-zoom-pan-pinch"; import { createMessage, IMAGE_LOAD_ERROR } from "ee/constants/messages"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const RotateLeftIcon = importSvg( async () => import("assets/icons/widget/image/rotate-left.svg"), diff --git a/app/client/src/widgets/JSONFormWidget/component/FieldLabel.tsx b/app/client/src/widgets/JSONFormWidget/component/FieldLabel.tsx index c0cd258c4c..4ec7bd02ff 100644 --- a/app/client/src/widgets/JSONFormWidget/component/FieldLabel.tsx +++ b/app/client/src/widgets/JSONFormWidget/component/FieldLabel.tsx @@ -8,7 +8,7 @@ import { IconWrapper } from "constants/IconConstants"; import { FontStyleTypes } from "constants/WidgetConstants"; import { THEMEING_TEXT_SIZES } from "constants/ThemeConstants"; import type { AlignWidget } from "WidgetProvider/constants"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const HelpIcon = importSvg(async () => import("assets/icons/control/help.svg")); diff --git a/app/client/src/widgets/TableWidget/component/AutoToolTipComponent.tsx b/app/client/src/widgets/TableWidget/component/AutoToolTipComponent.tsx index 5997a6c53e..71a02293b2 100644 --- a/app/client/src/widgets/TableWidget/component/AutoToolTipComponent.tsx +++ b/app/client/src/widgets/TableWidget/component/AutoToolTipComponent.tsx @@ -6,7 +6,7 @@ import type { CellLayoutProperties } from "./Constants"; import { ColumnTypes } from "./Constants"; import styled from "styled-components"; import equal from "fast-deep-equal/es6"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const OpenNewTabIcon = importSvg( async () => import("assets/icons/control/open-new-tab.svg"), diff --git a/app/client/src/widgets/TableWidget/component/TableColumnsVisibility.tsx b/app/client/src/widgets/TableWidget/component/TableColumnsVisibility.tsx index 557bb03e8f..acfe60f202 100644 --- a/app/client/src/widgets/TableWidget/component/TableColumnsVisibility.tsx +++ b/app/client/src/widgets/TableWidget/component/TableColumnsVisibility.tsx @@ -13,7 +13,7 @@ import Button from "components/editorComponents/Button"; import type { ReactTableColumnProps } from "./Constants"; import { TableIconWrapper } from "./TableStyledWrappers"; import TableActionIcon from "./TableActionIcon"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const VisibleIcon = importSvg( async () => import("assets/icons/control/columns-visibility.svg"), diff --git a/app/client/src/widgets/TableWidget/component/TableDataDownload.tsx b/app/client/src/widgets/TableWidget/component/TableDataDownload.tsx index b3f1b93aa7..f4a5db22cb 100644 --- a/app/client/src/widgets/TableWidget/component/TableDataDownload.tsx +++ b/app/client/src/widgets/TableWidget/component/TableDataDownload.tsx @@ -13,7 +13,7 @@ import TableAction from "./TableAction"; import styled from "styled-components"; import { transformTableDataIntoCsv } from "./CommonUtilities"; import zipcelx from "zipcelx"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const DownloadIcon = importSvg( async () => import("assets/icons/control/download-data-icon.svg"), diff --git a/app/client/src/widgets/TableWidget/component/TableFilterPane.tsx b/app/client/src/widgets/TableWidget/component/TableFilterPane.tsx index 809fdfefe5..5bd524b006 100644 --- a/app/client/src/widgets/TableWidget/component/TableFilterPane.tsx +++ b/app/client/src/widgets/TableWidget/component/TableFilterPane.tsx @@ -18,7 +18,7 @@ import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import type { WidgetProps } from "widgets/BaseWidget"; import { selectWidgetInitAction } from "actions/widgetSelectionActions"; import { SelectionRequestType } from "sagas/WidgetSelectUtils"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const DragHandleIcon = importSvg( async () => import("assets/icons/ads/app-icons/draghandler.svg"), diff --git a/app/client/src/widgets/TableWidget/component/TableFilters.tsx b/app/client/src/widgets/TableWidget/component/TableFilters.tsx index c67fe6f200..3d138d592e 100644 --- a/app/client/src/widgets/TableWidget/component/TableFilters.tsx +++ b/app/client/src/widgets/TableWidget/component/TableFilters.tsx @@ -14,7 +14,7 @@ import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { generateClassName } from "utils/generators"; import { getTableFilterState } from "selectors/tableFilterSelectors"; import TableAction from "./TableAction"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const FilterIcon = importSvg( async () => import("assets/icons/control/filter-icon.svg"), diff --git a/app/client/src/widgets/TableWidget/component/TableUtilities.tsx b/app/client/src/widgets/TableWidget/component/TableUtilities.tsx index 9652ac488e..1c923058d8 100644 --- a/app/client/src/widgets/TableWidget/component/TableUtilities.tsx +++ b/app/client/src/widgets/TableWidget/component/TableUtilities.tsx @@ -45,7 +45,7 @@ import MenuButtonTableComponent from "./components/menuButtonTableComponent"; import { stopClickEventPropagation } from "utils/helpers"; import tinycolor from "tinycolor2"; import { generateTableColumnId } from "./TableHelpers"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const CheckBoxLineIcon = importSvg( async () => import("assets/icons/widget/table/checkbox-line.svg"), diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/AutoToolTipComponent.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/AutoToolTipComponent.tsx index 60f171a7df..7d264fdb9a 100644 --- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/AutoToolTipComponent.tsx +++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/AutoToolTipComponent.tsx @@ -1,5 +1,5 @@ import { Tooltip } from "@blueprintjs/core"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import React, { createRef, useEffect, useState } from "react"; import styled from "styled-components"; import { ColumnTypes } from "widgets/TableWidgetV2/constants"; diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/BasicCell.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/BasicCell.tsx index 7951beea65..08d9efe890 100644 --- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/BasicCell.tsx +++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/BasicCell.tsx @@ -6,7 +6,7 @@ import type { BaseCellComponentProps } from "../Constants"; import { TABLE_SIZES } from "../Constants"; import { TooltipContentWrapper } from "../TableStyledWrappers"; import AutoToolTipComponent from "./AutoToolTipComponent"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const EditIcon = importSvg( async () => import("assets/icons/control/edit-variant1.svg"), diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectionCheckboxCell.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectionCheckboxCell.tsx index cff08bd3a5..33a9ef19ac 100644 --- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectionCheckboxCell.tsx +++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectionCheckboxCell.tsx @@ -2,7 +2,7 @@ import React from "react"; import { CellCheckboxWrapper, CellCheckbox } from "../TableStyledWrappers"; import { CheckboxState } from "../Constants"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const CheckBoxCheckIcon = importSvg( async () => import("assets/icons/widget/table/checkbox-check.svg"), diff --git a/app/client/src/widgets/TableWidgetV2/component/header/actions/ActionItem.tsx b/app/client/src/widgets/TableWidgetV2/component/header/actions/ActionItem.tsx index 1a6cd2e7f9..032edc5cc3 100644 --- a/app/client/src/widgets/TableWidgetV2/component/header/actions/ActionItem.tsx +++ b/app/client/src/widgets/TableWidgetV2/component/header/actions/ActionItem.tsx @@ -4,7 +4,7 @@ import { Colors } from "constants/Colors"; import styled from "styled-components"; import Tooltip from "components/editorComponents/Tooltip"; import { TooltipContentWrapper } from "../../TableStyledWrappers"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const FilterIcon = importSvg( async () => import("assets/icons/control/filter-icon.svg"), diff --git a/app/client/src/widgets/TableWidgetV2/component/header/actions/Download.tsx b/app/client/src/widgets/TableWidgetV2/component/header/actions/Download.tsx index c6037fa778..e563682a0b 100644 --- a/app/client/src/widgets/TableWidgetV2/component/header/actions/Download.tsx +++ b/app/client/src/widgets/TableWidgetV2/component/header/actions/Download.tsx @@ -13,7 +13,7 @@ import styled, { createGlobalStyle } from "styled-components"; import ActionItem from "./ActionItem"; import { transformTableDataIntoCsv } from "./Utilities"; import zipcelx from "zipcelx"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const DownloadIcon = importSvg( async () => import("assets/icons/control/download-data-icon.svg"), diff --git a/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/CascadeFields.tsx b/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/CascadeFields.tsx index ec5d666bd9..d20ba645bc 100644 --- a/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/CascadeFields.tsx +++ b/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/CascadeFields.tsx @@ -17,7 +17,7 @@ import { RenderOptionWrapper } from "../../../TableStyledWrappers"; import DatePickerComponent from "widgets/DatePickerWidget2/component"; import { TimePrecision } from "widgets/DatePickerWidget2/constants"; import { ColumnTypes, ReadOnlyColumnTypes } from "../../../../constants"; -import { importRemixIcon } from "design-system-old"; +import { importRemixIcon } from "@appsmith/ads-old"; const CloseIcon = importRemixIcon( async () => import("remixicon-react/CloseCircleFillIcon"), diff --git a/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/FilterPane.tsx b/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/FilterPane.tsx index 98f9662a22..e62d7ffd96 100644 --- a/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/FilterPane.tsx +++ b/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/FilterPane.tsx @@ -19,7 +19,7 @@ import { getTableFilterState } from "selectors/tableFilterSelectors"; import { getWidgetMetaProps } from "sagas/selectors"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import type { WidgetProps } from "widgets/BaseWidget"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; import { CANVAS_ART_BOARD } from "constants/componentClassNameConstants"; const DragHandleIcon = importSvg( diff --git a/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/FilterPaneContent.tsx b/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/FilterPaneContent.tsx index a27ce103a2..90be010b8d 100644 --- a/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/FilterPaneContent.tsx +++ b/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/FilterPaneContent.tsx @@ -24,7 +24,7 @@ import { FilterableColumnTypes, } from "widgets/TableWidgetV2/constants"; import { generateReactKey } from "utils/generators"; -import { importRemixIcon } from "design-system-old"; +import { importRemixIcon } from "@appsmith/ads-old"; const AddIcon = importRemixIcon( async () => import("remixicon-react/AddLineIcon"), diff --git a/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/index.tsx b/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/index.tsx index 746e2914a7..ec0e3eaabb 100644 --- a/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/index.tsx +++ b/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/index.tsx @@ -15,7 +15,7 @@ import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { generateClassName } from "utils/generators"; import { getTableFilterState } from "selectors/tableFilterSelectors"; import ActionItem from "../ActionItem"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const FilterIcon = importSvg( async () => import("assets/icons/control/filter-icon.svg"), diff --git a/app/client/src/widgets/components/LabelWithTooltip.tsx b/app/client/src/widgets/components/LabelWithTooltip.tsx index 48d8a2feab..545b4aa03f 100644 --- a/app/client/src/widgets/components/LabelWithTooltip.tsx +++ b/app/client/src/widgets/components/LabelWithTooltip.tsx @@ -8,7 +8,7 @@ import { TooltipComponent as Tooltip } from "@design-system/widgets-old"; import { isEllipsisActive } from "utils/helpers"; import { Colors } from "constants/Colors"; import { IconWrapper } from "constants/IconConstants"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const HelpIcon = importSvg(async () => import("assets/icons/control/help.svg")); diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/AutoToolTipComponent.tsx b/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/AutoToolTipComponent.tsx index 522ba2a58b..a624d61dfe 100644 --- a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/AutoToolTipComponent.tsx +++ b/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/AutoToolTipComponent.tsx @@ -4,7 +4,7 @@ import { CellWrapper, TooltipContentWrapper } from "../TableStyledWrappers"; import type { CellAlignment, VerticalAlignment } from "../Constants"; import styled from "styled-components"; import { ColumnTypes } from "widgets/wds/WDSTableWidget/constants"; -import { importSvg } from "design-system-old"; +import { importSvg } from "@appsmith/ads-old"; const OpenNewTabIcon = importSvg( async () => import("assets/icons/control/open-new-tab.svg"), diff --git a/app/client/test/factories/AppIDEFactoryUtils.ts b/app/client/test/factories/AppIDEFactoryUtils.ts index 2528843adf..21e2b06da7 100644 --- a/app/client/test/factories/AppIDEFactoryUtils.ts +++ b/app/client/test/factories/AppIDEFactoryUtils.ts @@ -1,8 +1,8 @@ import store from "store"; -import { EditorViewMode } from "@appsmith/entities/IDE/constants"; -import type { AppState } from "@appsmith/reducers"; +import { EditorViewMode } from "ee/entities/IDE/constants"; +import type { AppState } from "ee/reducers"; import MockPluginsState from "test/factories/MockPluginsState"; -import type { Page } from "@appsmith/constants/ReduxActionConstants"; +import type { Page } from "ee/constants/ReduxActionConstants"; import type { Action } from "entities/Action"; import type { IDETabs, @@ -12,7 +12,7 @@ import { IDETabsDefaultValue } from "reducers/uiReducers/ideReducer"; import type { JSCollection } from "entities/JSCollection"; import type { FocusHistory } from "reducers/uiReducers/focusHistoryReducer"; import type { Datasource } from "entities/Datasource"; -import type { FeatureFlags } from "@appsmith/entities/FeatureFlag"; +import type { FeatureFlags } from "ee/entities/FeatureFlag"; interface IDEStateArgs { ideView?: EditorViewMode; diff --git a/app/client/test/factories/PageFactory.ts b/app/client/test/factories/PageFactory.ts index 47df69d15f..50ab3730bb 100644 --- a/app/client/test/factories/PageFactory.ts +++ b/app/client/test/factories/PageFactory.ts @@ -1,5 +1,5 @@ import * as Factory from "factory.ts"; -import type { Page } from "@appsmith/constants/ReduxActionConstants"; +import type { Page } from "ee/constants/ReduxActionConstants"; function generateRandomHexId() { const hexChars = "0123456789abcdef"; diff --git a/app/client/test/sagas.ts b/app/client/test/sagas.ts index 14bdfc4ce7..f3c730b655 100644 --- a/app/client/test/sagas.ts +++ b/app/client/test/sagas.ts @@ -1,12 +1,12 @@ -import { watchActionExecutionSagas } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; -import userSagas from "@appsmith/sagas/userSagas"; -import workspaceSagas from "@appsmith/sagas/WorkspaceSagas"; +import { watchActionExecutionSagas } from "ee/sagas/ActionExecution/ActionExecutionSagas"; +import userSagas from "ee/sagas/userSagas"; +import workspaceSagas from "ee/sagas/WorkspaceSagas"; import { watchActionSagas } from "sagas/ActionSagas"; import layoutUpdateSagas from "sagas/AutoLayoutUpdateSagas"; import { watchDatasourcesSagas } from "sagas/DatasourcesSagas"; -import { watchJSActionSagas } from "@appsmith/sagas/JSActionSagas"; +import { watchJSActionSagas } from "ee/sagas/JSActionSagas"; import apiPaneSagas from "../src/sagas/ApiPaneSagas"; -import applicationSagas from "@appsmith/sagas/ApplicationSagas"; +import applicationSagas from "ee/sagas/ApplicationSagas"; import batchSagas from "../src/sagas/BatchSagas"; import draggingCanvasSagas from "../src/sagas/CanvasSagas/DraggingCanvasSagas"; import selectionCanvasSagas from "../src/sagas/CanvasSagas/SelectionCanvasSagas"; diff --git a/app/client/test/testCommon.ts b/app/client/test/testCommon.ts index 305f3079a3..0baeccc4da 100644 --- a/app/client/test/testCommon.ts +++ b/app/client/test/testCommon.ts @@ -1,16 +1,16 @@ -import type { Page } from "@appsmith/constants/ReduxActionConstants"; -import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; +import type { Page } from "ee/constants/ReduxActionConstants"; +import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { initEditorAction } from "actions/initActions"; import { setAppMode, updateCurrentPage } from "actions/pageActions"; import { APP_MODE } from "entities/App"; import { useDispatch } from "react-redux"; import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer"; -import { getCanvasWidgetsPayload } from "@appsmith/sagas/PageSagas"; +import { getCanvasWidgetsPayload } from "ee/sagas/PageSagas"; import { editorInitializer } from "utils/editor/EditorUtils"; import { extractCurrentDSL } from "utils/WidgetPropsUtils"; -import type { AppState } from "@appsmith/reducers"; -import type { WidgetEntity } from "@appsmith/entities/DataTree/types"; -import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly"; +import type { AppState } from "ee/reducers"; +import type { WidgetEntity } from "ee/entities/DataTree/types"; +import urlBuilder from "ee/entities/URLRedirect/URLAssembly"; import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsStructureReducer"; const pageId = "0123456789abcdef00000000"; diff --git a/app/client/test/testMockedWidgets.tsx b/app/client/test/testMockedWidgets.tsx index 219f02a1ef..d4cd005133 100644 --- a/app/client/test/testMockedWidgets.tsx +++ b/app/client/test/testMockedWidgets.tsx @@ -4,7 +4,7 @@ import Canvas from "pages/Editor/Canvas"; import IDE from "pages/Editor/IDE"; import React from "react"; import { useSelector } from "react-redux"; -import { getCanvasWidgetsStructure } from "@appsmith/selectors/entitiesSelector"; +import { getCanvasWidgetsStructure } from "ee/selectors/entitiesSelector"; import { useMockDsl } from "./testCommon"; export function MockCanvas() { diff --git a/app/client/test/testUtils.tsx b/app/client/test/testUtils.tsx index cbe26265e8..9b99d698bb 100644 --- a/app/client/test/testUtils.tsx +++ b/app/client/test/testUtils.tsx @@ -7,17 +7,17 @@ import { ThemeProvider } from "styled-components"; import { getCurrentThemeDetails } from "selectors/themeSelectors"; import * as customQueries from "./customQueries"; import { BrowserRouter } from "react-router-dom"; -import type { AppState } from "@appsmith/reducers"; -import appReducer from "@appsmith/reducers"; +import type { AppState } from "ee/reducers"; +import appReducer from "ee/reducers"; import { applyMiddleware, compose, createStore } from "redux"; import { reduxBatch } from "@manaflair/redux-batch"; import createSagaMiddleware from "redux-saga"; import store, { testStore } from "store"; import { sagasToRunForTests } from "./sagas"; import { all, call, spawn } from "redux-saga/effects"; -import type { FeatureFlags } from "@appsmith/entities/FeatureFlag"; +import type { FeatureFlags } from "ee/entities/FeatureFlag"; import { fetchFeatureFlagsSuccess } from "../src/actions/userActions"; -import { DEFAULT_FEATURE_FLAG_VALUE } from "@appsmith/entities/FeatureFlag"; +import { DEFAULT_FEATURE_FLAG_VALUE } from "ee/entities/FeatureFlag"; const testSagaMiddleware = createSagaMiddleware(); diff --git a/app/client/tsconfig.path.json b/app/client/tsconfig.path.json index 37c086c0c1..8b0f2c60fe 100644 --- a/app/client/tsconfig.path.json +++ b/app/client/tsconfig.path.json @@ -1,7 +1,7 @@ { "compilerOptions": { "paths": { - "@appsmith/*": ["ee/*"], + "ee/*": ["ee/*"], "test/*": ["../test/*"] } } diff --git a/app/client/yarn.lock b/app/client/yarn.lock index e88d704f3a..93fabf3484 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -174,6 +174,21 @@ __metadata: languageName: node linkType: hard +"@appsmith/ads-old@workspace:^, @appsmith/ads-old@workspace:packages/design-system/ads-old": + version: 0.0.0-use.local + resolution: "@appsmith/ads-old@workspace:packages/design-system/ads-old" + dependencies: + "@types/loadable__component": ^5.13.4 + "@types/react-form": ^4.0.2 + "@types/wait-on": ^5.2.0 + concurrently: ^7.3.0 + emoji-mart: 3.0.1 + identity-obj-proxy: 3.0.0 + react-toastify: ^5.5.0 + wait-on: ^5.3.0 + languageName: unknown + linkType: soft + "@aws-crypto/crc32@npm:5.2.0": version: 5.2.0 resolution: "@aws-crypto/crc32@npm:5.2.0" @@ -13100,6 +13115,7 @@ __metadata: version: 0.0.0-use.local resolution: "appsmith@workspace:." dependencies: + "@appsmith/ads-old": "workspace:^" "@aws-sdk/client-s3": ^3.622.0 "@aws-sdk/lib-storage": ^3.622.0 "@babel/helper-create-regexp-features-plugin": ^7.18.6 @@ -13253,7 +13269,6 @@ __metadata: dayjs: ^1.10.6 deep-diff: ^1.0.2 design-system: "workspace:^" - design-system-old: "workspace:^" diff: ^5.0.0 dotenv: ^8.1.0 downloadjs: ^1.4.7 @@ -17420,21 +17435,6 @@ __metadata: languageName: node linkType: hard -"design-system-old@workspace:^, design-system-old@workspace:packages/design-system/ads-old": - version: 0.0.0-use.local - resolution: "design-system-old@workspace:packages/design-system/ads-old" - dependencies: - "@types/loadable__component": ^5.13.4 - "@types/react-form": ^4.0.2 - "@types/wait-on": ^5.2.0 - concurrently: ^7.3.0 - emoji-mart: 3.0.1 - identity-obj-proxy: 3.0.0 - react-toastify: ^5.5.0 - wait-on: ^5.3.0 - languageName: unknown - linkType: soft - "design-system@workspace:^, design-system@workspace:packages/design-system/ads": version: 0.0.0-use.local resolution: "design-system@workspace:packages/design-system/ads"