diff --git a/app/client/package.json b/app/client/package.json index 509a3ccbe8..ca416b2f8f 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -46,7 +46,7 @@ "cypress-log-to-output": "^1.1.2", "dayjs": "^1.10.6", "deep-diff": "^1.0.2", - "design-system": "npm:@appsmithorg/design-system@1.0.29", + "design-system": "npm:@appsmithorg/design-system@1.0.28-alpha.7", "downloadjs": "^1.4.7", "draft-js": "^0.11.7", "emoji-mart": "^3.0.1", diff --git a/app/client/src/ce/pages/UserAuth/Login.tsx b/app/client/src/ce/pages/UserAuth/Login.tsx index d4fd0f216e..d61555c2f8 100644 --- a/app/client/src/ce/pages/UserAuth/Login.tsx +++ b/app/client/src/ce/pages/UserAuth/Login.tsx @@ -30,8 +30,7 @@ import { NEW_TO_APPSMITH, createMessage, } from "@appsmith/constants/messages"; -import FormGroup from "components/ads/formFields/FormGroup"; -import { Button, FormMessage, Size } from "design-system"; +import { Button, FormGroup, FormMessage, Size } from "design-system"; import FormTextField from "components/utils/ReduxFormTextField"; import ThirdPartyAuth from "@appsmith/pages/UserAuth/ThirdPartyAuth"; import { ThirdPartyLoginRegistry } from "pages/UserAuth/ThirdPartyLoginRegistry"; diff --git a/app/client/src/ce/pages/UserAuth/SignUp.tsx b/app/client/src/ce/pages/UserAuth/SignUp.tsx index 4b4300523b..bfe4c16907 100644 --- a/app/client/src/ce/pages/UserAuth/SignUp.tsx +++ b/app/client/src/ce/pages/UserAuth/SignUp.tsx @@ -29,11 +29,10 @@ import { ALREADY_HAVE_AN_ACCOUNT, createMessage, } from "@appsmith/constants/messages"; -import FormGroup from "components/ads/formFields/FormGroup"; import FormTextField from "components/utils/ReduxFormTextField"; import ThirdPartyAuth from "@appsmith/pages/UserAuth/ThirdPartyAuth"; import { ThirdPartyLoginRegistry } from "pages/UserAuth/ThirdPartyLoginRegistry"; -import { Button, FormMessage, Size } from "design-system"; +import { Button, FormGroup, FormMessage, Size } from "design-system"; import { isEmail, isStrongPassword, isEmptyString } from "utils/formhelpers"; diff --git a/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx b/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx index b80c529847..d708dbec7b 100644 --- a/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx +++ b/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx @@ -46,14 +46,15 @@ import { ReactComponent as NoEmailConfigImage } from "assets/images/email-not-co import AnalyticsUtil from "utils/AnalyticsUtil"; import { Button, + Classes, Callout, + DropdownOption, Size, Text, TextType, TextProps, - DropdownOption, + Variant, } from "design-system"; -import { Classes, Variant } from "components/ads/common"; import { getInitialsAndColorCode } from "utils/AppsmithUtils"; import ProfileImage from "pages/common/ProfileImage"; import ManageUsers from "pages/workspace/ManageUsers"; diff --git a/app/client/src/ce/sagas/SuperUserSagas.tsx b/app/client/src/ce/sagas/SuperUserSagas.tsx index 065a5ec44e..c5a4fad991 100644 --- a/app/client/src/ce/sagas/SuperUserSagas.tsx +++ b/app/client/src/ce/sagas/SuperUserSagas.tsx @@ -1,7 +1,6 @@ import React from "react"; import UserApi, { SendTestEmailPayload } from "@appsmith/api/UserApi"; -import { Variant } from "components/ads/common"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { ReduxAction, ReduxActionErrorTypes, diff --git a/app/client/src/ce/sagas/WorkspaceSagas.ts b/app/client/src/ce/sagas/WorkspaceSagas.ts index 49508255ca..58f27dc314 100644 --- a/app/client/src/ce/sagas/WorkspaceSagas.ts +++ b/app/client/src/ce/sagas/WorkspaceSagas.ts @@ -25,8 +25,7 @@ import WorkspaceApi, { SaveWorkspaceLogo, } from "@appsmith/api/WorkspaceApi"; import { ApiResponse } from "api/ApiResponses"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { getCurrentWorkspace } from "@appsmith/selectors/workspaceSelectors"; import { getCurrentUser } from "selectors/usersSelectors"; import { Workspace } from "constants/workspaceConstants"; diff --git a/app/client/src/ce/sagas/userSagas.tsx b/app/client/src/ce/sagas/userSagas.tsx index 436bbaad25..1161594d04 100644 --- a/app/client/src/ce/sagas/userSagas.tsx +++ b/app/client/src/ce/sagas/userSagas.tsx @@ -42,8 +42,7 @@ import { ERROR_CODES } from "@appsmith/constants/ApiConstants"; import { ANONYMOUS_USERNAME, User } from "constants/userConstants"; import { flushErrorsAndRedirect } from "actions/errorActions"; import localStorage from "utils/localStorage"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import log from "loglevel"; import { getCurrentUser } from "selectors/usersSelectors"; diff --git a/app/client/src/components/ads/Icon.test.tsx b/app/client/src/components/ads/Icon.test.tsx deleted file mode 100644 index a6cd261459..0000000000 --- a/app/client/src/components/ads/Icon.test.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import React from "react"; -import { Icon, IconCollection, IconSize } from "design-system"; -import { render, screen } from "@testing-library/react"; -import { Colors } from "constants/Colors"; - -import MagicLineIcon from "remixicon-react/MagicLineIcon"; -import KeyIcon from "remixicon-react/Key2LineIcon"; - -describe("Enterprise icon", () => { - [ - { - name: "enterprise", - input: ["enterprise", "magic-line"], - actualIcon: , - }, - { - name: "key", - input: ["key"], - actualIcon: , - }, - ].forEach(({ actualIcon, input, name }: any) => { - input.forEach((iconString: string) => { - it(`${name}: ${iconString}`, () => { - // render the icons - render( -
- - {actualIcon} -
, - ); - const output = screen.queryByTestId("container"); - const outputChildren = output && output.children; - const actual = outputChildren && outputChildren[0]; - const expected = outputChildren && outputChildren[1]; - const actualSvg = actual && actual.children && actual.children[0]; - const actualPath = - actualSvg && actualSvg.children && actualSvg.children[0]; - const expectedSvg = expected; - const expectedPath = - expected && expected.children && expected.children[0]; - expect(actualSvg).toEqual(expectedSvg); - expect(actualPath).toEqual(expectedPath); - }); - }); - }); -}); diff --git a/app/client/src/components/ads/common.tsx b/app/client/src/components/ads/common.tsx deleted file mode 100644 index e236c1a86a..0000000000 --- a/app/client/src/components/ads/common.tsx +++ /dev/null @@ -1,99 +0,0 @@ -import { Theme } from "constants/DefaultTheme"; -import tinycolor from "tinycolor2"; -import styled from "styled-components"; -import { toast } from "react-toastify"; - -export interface CommonComponentProps { - isLoading?: boolean; //default false - cypressSelector?: string; - className?: string; - name?: string; - disabled?: boolean; //default false -} - -export type ThemeProp = { - theme: Theme; -}; - -export enum Classes { - ICON = "cs-icon", - APP_ICON = "cs-app-icon", - TEXT = "cs-text", - BP3_POPOVER_ARROW_BORDER = "bp3-popover-arrow-border", - BP3_POPOVER_ARROW_FILL = "bp3-popover-arrow-fill", - SPINNER = "cs-spinner", - MULTI_SELECT_BOX = "cs-multi-select-box", - DATE_PICKER_OVARLAY = "date-picker-overlay", -} - -export const hexToRgb = ( - hex: string, -): { - r: number; - g: number; - b: number; -} => { - const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex); - return result - ? { - r: parseInt(result[1], 16), - g: parseInt(result[2], 16), - b: parseInt(result[3], 16), - } - : { - r: -1, - g: -1, - b: -1, - }; -}; - -export const hexToRgba = (color: string, alpha: number) => { - const value = hexToRgb(color); - return `rgba(${value.r}, ${value.g}, ${value.b}, ${alpha});`; -}; - -export const lighten = (color: string, amount: number) => { - return tinycolor(color) - .lighten(amount) - .toString(); -}; - -export const darken = (color: string, amount: number) => { - return tinycolor(color) - .darken(amount) - .toString(); -}; -export const StoryWrapper = styled.div` - background: #ffffff; - height: 700px; - padding: 50px 100px; -`; - -export enum Variant { - success = "success", - info = "info", - warning = "warning", - danger = "danger", -} - -export enum ToastTypeOptions { - success = "success", - info = "info", - warning = "warning", - error = "error", -} - -const TOAST_VARIANT_LOOKUP = { - [toast.TYPE.ERROR]: Variant.danger, - [toast.TYPE.INFO]: Variant.info, - [toast.TYPE.SUCCESS]: Variant.success, - [toast.TYPE.WARNING]: Variant.warning, - undefined: Variant.info, -}; - -export const ToastVariant = (type: any): Variant => { - return ( - TOAST_VARIANT_LOOKUP[type as keyof typeof TOAST_VARIANT_LOOKUP] || - Variant.info - ); -}; diff --git a/app/client/src/components/ads/formFields/FormGroup.tsx b/app/client/src/components/ads/formFields/FormGroup.tsx deleted file mode 100644 index b5b63d542e..0000000000 --- a/app/client/src/components/ads/formFields/FormGroup.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import styled from "styled-components"; -import { FormGroup, Classes } from "@blueprintjs/core"; -import { getTypographyByKey } from "constants/DefaultTheme"; -type FormGroupProps = { - fill?: boolean; -}; -const StyledFormGroup = styled(FormGroup)` - & { - width: ${(props) => (props.fill ? "100%" : "auto")}; - &.${Classes.FORM_GROUP} { - margin: 0 0 ${(props) => props.theme.spaces[11]}px; - } - &.${Classes.FORM_GROUP} .${Classes.FORM_HELPER_TEXT} { - font-size: ${(props) => props.theme.fontSizes[3]}px; - } - &.${Classes.FORM_GROUP} .${Classes.LABEL} { - ${(props) => getTypographyByKey(props, "h5")} - color: ${(props) => props.theme.colors.textInput.normal.text}; - } - } -`; -export default StyledFormGroup; diff --git a/app/client/src/components/ads/index.ts b/app/client/src/components/ads/index.ts deleted file mode 100644 index 6b57160892..0000000000 --- a/app/client/src/components/ads/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./common"; diff --git a/app/client/src/components/designSystems/appsmith/BaseButton.tsx b/app/client/src/components/designSystems/appsmith/BaseButton.tsx index 0c6e632aad..ff881bb5e6 100644 --- a/app/client/src/components/designSystems/appsmith/BaseButton.tsx +++ b/app/client/src/components/designSystems/appsmith/BaseButton.tsx @@ -7,8 +7,6 @@ import { IconName } from "@blueprintjs/icons"; import { Theme } from "constants/DefaultTheme"; -import { ThemeProp } from "components/ads/common"; - import _ from "lodash"; import { ButtonStyleTypes, @@ -19,6 +17,7 @@ import { ButtonVariant, ButtonVariantTypes, } from "components/constants"; +import { ThemeProp } from "widgets/constants"; const getCustomTextColor = ( theme: Theme, diff --git a/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx b/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx index dce81c318d..9d9b7665fa 100644 --- a/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx +++ b/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx @@ -1,11 +1,9 @@ import React from "react"; import { Collapsible } from "."; -import { Icon, IconSize } from "design-system"; +import { Classes, Icon, IconSize, Text, TextType } from "design-system"; import styled from "styled-components"; import LongArrowSVG from "assets/images/long-arrow-bottom.svg"; import { useEntityLink } from "../Debugger/hooks/debuggerHooks"; -import { Text, TextType } from "design-system"; -import { Classes } from "components/ads/common"; import { getTypographyByKey } from "constants/DefaultTheme"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { diff --git a/app/client/src/components/editorComponents/ActionRightPane/index.tsx b/app/client/src/components/editorComponents/ActionRightPane/index.tsx index 5859a00991..6b5d8c6685 100644 --- a/app/client/src/components/editorComponents/ActionRightPane/index.tsx +++ b/app/client/src/components/editorComponents/ActionRightPane/index.tsx @@ -1,15 +1,16 @@ import React, { useCallback, useMemo } from "react"; import styled from "styled-components"; import { Collapse, Classes as BPClasses } from "@blueprintjs/core"; -import { Classes, Variant } from "components/ads/common"; import { Button, Category, + Classes, Icon, IconSize, Size, Text, TextType, + Variant, } from "design-system"; import { useState } from "react"; import history from "utils/history"; diff --git a/app/client/src/components/editorComponents/ApiResponseView.tsx b/app/client/src/components/editorComponents/ApiResponseView.tsx index 6080d11dde..f44ef9a25c 100644 --- a/app/client/src/components/editorComponents/ApiResponseView.tsx +++ b/app/client/src/components/editorComponents/ApiResponseView.tsx @@ -22,7 +22,6 @@ import { ACTION_EXECUTION_MESSAGE, } from "@appsmith/constants/messages"; import { Text as BlueprintText } from "@blueprintjs/core"; -import { Classes, Variant } from "components/ads/common"; import { EditorTheme } from "./CodeEditor/EditorConfig"; import DebuggerLogs from "./Debugger/DebuggerLogs"; import ErrorLogs from "./Debugger/Errors"; @@ -34,11 +33,13 @@ import { Button, Callout, Category, + Classes, Icon, Size, TAB_MIN_HEIGHT, Text, TextType, + Variant, } from "design-system"; import EntityBottomTabs from "./EntityBottomTabs"; import { DEBUGGER_TAB_KEYS } from "./Debugger/helpers"; diff --git a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx index a762447e7e..3ac084e6c9 100644 --- a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx +++ b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx @@ -14,6 +14,7 @@ import { ScrollIndicator, Toaster, TooltipComponent as Tooltip, + Variant, } from "design-system"; import { EvaluatedValueDebugButton } from "components/editorComponents/Debugger/DebugCTA"; import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory"; @@ -34,7 +35,6 @@ import * as Sentry from "@sentry/react"; import { Severity } from "@sentry/react"; import { CodeEditorExpected } from "components/editorComponents/CodeEditor/index"; import { Indices, Layers } from "constants/Layers"; -import { Variant } from "components/ads/common"; import { useDispatch, useSelector } from "react-redux"; import { getEvaluatedPopupState } from "selectors/editorContextSelectors"; import { AppState } from "@appsmith/reducers"; diff --git a/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx b/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx index f46c42bdcc..9f1c6c8a71 100644 --- a/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx +++ b/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx @@ -21,8 +21,7 @@ import { DEBUGGER_OPEN_DOCUMENTATION, DEBUGGER_SEARCH_SNIPPET, } from "@appsmith/constants/messages"; -import { Icon, IconName, IconSize } from "design-system"; -import { Classes } from "components/ads/common"; +import { Classes, Icon, IconName, IconSize } from "design-system"; import { executeCommandAction } from "actions/apiPaneActions"; import { SlashCommand } from "entities/Action"; import { FieldEntityInformation } from "../CodeEditor/EditorConfig"; diff --git a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx index 7eee1c1c75..63c5d40a48 100644 --- a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx +++ b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx @@ -5,11 +5,10 @@ import { showDebugger, } from "actions/debuggerActions"; import { useDispatch, useSelector } from "react-redux"; -import { Classes, Variant } from "components/ads/common"; import { getAppMode } from "selectors/applicationSelectors"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { getTypographyByKey } from "constants/DefaultTheme"; -import { Button, Icon, IconSize } from "design-system"; +import { Button, Classes, Icon, IconSize, Variant } from "design-system"; import { Message } from "entities/AppsmithConsole"; import ContextualMenu from "./ContextualMenu"; import { Position } from "@blueprintjs/core"; diff --git a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx index a72212c41b..175813f496 100644 --- a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx +++ b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx @@ -3,8 +3,14 @@ import React, { useMemo } from "react"; import { useSelector } from "react-redux"; import { AppState } from "@appsmith/reducers"; import styled from "styled-components"; -import { Icon, IconSize } from "design-system"; -import { Classes } from "components/ads/common"; +import { + Classes, + Icon, + IconSize, + Text, + TextType, + TooltipComponent as Tooltip, +} from "design-system"; import InspectElement from "assets/images/InspectElement.svg"; import { ReactComponent as LongArrowSVG } from "assets/images/long-arrow-right.svg"; import { @@ -19,8 +25,6 @@ import { getDependenciesFromInverseDependencies } from "./helpers"; import { useSelectedEntity, useEntityLink } from "./hooks/debuggerHooks"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { getTypographyByKey, thinScrollbar } from "constants/DefaultTheme"; -import { TooltipComponent as Tooltip } from "design-system"; -import { Text, TextType } from "design-system"; import { ENTITY_TYPE } from "entities/AppsmithConsole"; import { useGetEntityInfo } from "./hooks/useGetEntityInfo"; diff --git a/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx b/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx index a3c98f59aa..26bb1caafd 100644 --- a/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx +++ b/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx @@ -1,6 +1,7 @@ import React, { MutableRefObject, useRef } from "react"; import { get } from "lodash"; import { + Classes, Dropdown, DropdownOption, Icon, @@ -12,7 +13,6 @@ import styled, { useTheme } from "styled-components"; import { useDispatch } from "react-redux"; import { clearLogs } from "actions/debuggerActions"; -import { Classes } from "components/ads/common"; import { CLEAR_LOG_TOOLTIP, createMessage } from "@appsmith/constants/messages"; import { TOOLTIP_HOVER_ON_DELAY } from "constants/AppConstants"; diff --git a/app/client/src/components/editorComponents/Debugger/LogItem.tsx b/app/client/src/components/editorComponents/Debugger/LogItem.tsx index 65fc9d6b34..2c6683fd12 100644 --- a/app/client/src/components/editorComponents/Debugger/LogItem.tsx +++ b/app/client/src/components/editorComponents/Debugger/LogItem.tsx @@ -1,7 +1,6 @@ import { Collapse } from "@blueprintjs/core"; import { get } from "lodash"; import { isString } from "lodash"; -import { Classes } from "components/ads/common"; import { Log, LOG_CATEGORY, @@ -16,14 +15,15 @@ import EntityLink, { DebuggerLinkUI } from "./EntityLink"; import { getLogIcon } from "./helpers"; import { AppIcon, + Classes, Icon, IconName, IconSize, Text, TextType, + TooltipComponent, } from "design-system"; import { getTypographyByKey } from "constants/DefaultTheme"; -import { TooltipComponent } from "design-system"; import { createMessage, TROUBLESHOOT_ISSUE, diff --git a/app/client/src/components/editorComponents/EditableText.tsx b/app/client/src/components/editorComponents/EditableText.tsx index 144ec8e8c3..8df54c1526 100644 --- a/app/client/src/components/editorComponents/EditableText.tsx +++ b/app/client/src/components/editorComponents/EditableText.tsx @@ -6,8 +6,7 @@ import { import styled from "styled-components"; import _ from "lodash"; import ErrorTooltip from "./ErrorTooltip"; -import { Variant } from "components/ads/common"; -import { Icon, IconSize, Toaster } from "design-system"; +import { Icon, IconSize, Toaster, Variant } from "design-system"; export enum EditInteractionKind { SINGLE, diff --git a/app/client/src/components/editorComponents/GlobalSearch/SnippetsDescription.tsx b/app/client/src/components/editorComponents/GlobalSearch/SnippetsDescription.tsx index 729a346527..04d9a88553 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/SnippetsDescription.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/SnippetsDescription.tsx @@ -36,8 +36,7 @@ import { SNIPPET_INSERT, } from "@appsmith/constants/messages"; import { getExpectedValue } from "utils/validation/common"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { ReactComponent as CopyIcon } from "assets/icons/menu/copy-snippet.svg"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { getTypographyByKey } from "constants/DefaultTheme"; diff --git a/app/client/src/components/editorComponents/GlobalSearch/index.tsx b/app/client/src/components/editorComponents/GlobalSearch/index.tsx index 31db96d6d5..e92410ef3d 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/index.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/index.tsx @@ -66,8 +66,7 @@ import { lightTheme } from "selectors/themeSelectors"; import { SnippetAction } from "reducers/uiReducers/globalSearchReducer"; import copy from "copy-to-clipboard"; import { getSnippet } from "./SnippetsDescription"; -import { Variant } from "components/ads/common"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { useFilteredActions, useFilteredFileOperations, diff --git a/app/client/src/components/editorComponents/JSResponseView.tsx b/app/client/src/components/editorComponents/JSResponseView.tsx index e2decba896..25755257fb 100644 --- a/app/client/src/components/editorComponents/JSResponseView.tsx +++ b/app/client/src/components/editorComponents/JSResponseView.tsx @@ -29,11 +29,18 @@ import Resizer, { ResizerCSS } from "./Debugger/Resizer"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { JSCollection, JSAction } from "entities/JSCollection"; import ReadOnlyEditor from "components/editorComponents/ReadOnlyEditor"; -import { Button, Callout, Icon, Size, Text, TextType } from "design-system"; -import { Classes } from "components/ads/common"; +import { + Button, + Callout, + Classes, + Icon, + Size, + Text, + TextType, + Variant, +} from "design-system"; import LoadingOverlayScreen from "components/editorComponents/LoadingOverlayScreen"; import { JSCollectionData } from "reducers/entityReducers/jsActionsReducer"; -import { Variant } from "components/ads/common"; import { EvaluationError } from "utils/DynamicBindingUtils"; import { DebugButton } from "./Debugger/DebugCTA"; import { DEBUGGER_TAB_KEYS } from "./Debugger/helpers"; diff --git a/app/client/src/components/editorComponents/StoreAsDatasource.tsx b/app/client/src/components/editorComponents/StoreAsDatasource.tsx index a2ce321f99..3df64a601c 100644 --- a/app/client/src/components/editorComponents/StoreAsDatasource.tsx +++ b/app/client/src/components/editorComponents/StoreAsDatasource.tsx @@ -6,11 +6,10 @@ import { } from "actions/datasourceActions"; import { connect, useDispatch, useSelector } from "react-redux"; import history from "utils/history"; -import { FontWeight, Text, TextType } from "design-system"; +import { Classes, FontWeight, Text, TextType } from "design-system"; import { datasourcesEditorIdURL } from "RouteBuilder"; import CloudLine from "remixicon-react/CloudLineIcon"; import Edit2Line from "remixicon-react/Edit2LineIcon"; -import { Classes } from "components/ads/common"; import { getQueryParams } from "utils/URLUtils"; import { Colors } from "constants/Colors"; import { getCurrentPageId } from "selectors/editorSelectors"; diff --git a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx index b98e51a1ad..f5cf72c6ef 100644 --- a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx +++ b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx @@ -6,13 +6,11 @@ import FormRow from "components/editorComponents/FormRow"; import FormLabel from "components/editorComponents/FormLabel"; import FIELD_VALUES from "constants/FieldExpectedValue"; import HelperTooltip from "components/editorComponents/HelperTooltip"; -import { Icon, IconSize } from "design-system"; import { CodeEditorBorder, EditorTheme, } from "components/editorComponents/CodeEditor/EditorConfig"; -import { Text, Case, TextType } from "design-system"; -import { Classes } from "components/ads/common"; +import { Case, Classes, Icon, IconSize, Text, TextType } from "design-system"; import { AutocompleteDataType } from "utils/autocomplete/TernServer"; import DynamicDropdownField from "./DynamicDropdownField"; import { diff --git a/app/client/src/components/formControls/FieldArrayControl.tsx b/app/client/src/components/formControls/FieldArrayControl.tsx index 2ed20ff069..0986215622 100644 --- a/app/client/src/components/formControls/FieldArrayControl.tsx +++ b/app/client/src/components/formControls/FieldArrayControl.tsx @@ -1,7 +1,6 @@ import React, { useEffect } from "react"; import FormControl from "pages/Editor/FormControl"; -import { Icon, IconSize, Text, TextType } from "design-system"; -import { Classes } from "components/ads/common"; +import { Classes, Icon, IconSize, Text, TextType } from "design-system"; import styled from "styled-components"; import { FieldArray } from "redux-form"; import { ControlProps } from "./BaseControl"; diff --git a/app/client/src/components/formControls/InputNumberControl.tsx b/app/client/src/components/formControls/InputNumberControl.tsx index b737c296d3..0da1440609 100644 --- a/app/client/src/components/formControls/InputNumberControl.tsx +++ b/app/client/src/components/formControls/InputNumberControl.tsx @@ -2,8 +2,7 @@ import React from "react"; import BaseControl, { ControlProps } from "./BaseControl"; import { ControlType } from "constants/PropertyControlConstants"; import NumberField from "components/editorComponents/form/fields/NumberField"; -import { Text, TextType } from "design-system"; -import { Classes } from "components/ads/common"; +import { Classes, Text, TextType } from "design-system"; import styled from "styled-components"; const FormGroup = styled.div` diff --git a/app/client/src/components/propertyControls/ButtonBorderRadiusControl.tsx b/app/client/src/components/propertyControls/ButtonBorderRadiusControl.tsx index 0aa08a1e76..1b7f3136e7 100644 --- a/app/client/src/components/propertyControls/ButtonBorderRadiusControl.tsx +++ b/app/client/src/components/propertyControls/ButtonBorderRadiusControl.tsx @@ -4,7 +4,7 @@ import { Button, ButtonGroup, IButtonProps } from "@blueprintjs/core"; import BaseControl, { ControlProps } from "./BaseControl"; import { ControlIcons } from "icons/ControlIcons"; -import { ThemeProp } from "components/ads/common"; +import { ThemeProp } from "widgets/constants"; export enum ButtonBorderRadiusTypes { SHARP = "SHARP", diff --git a/app/client/src/components/propertyControls/NumericInputControl.tsx b/app/client/src/components/propertyControls/NumericInputControl.tsx index 0ca2ad1ddf..16eb4e8268 100644 --- a/app/client/src/components/propertyControls/NumericInputControl.tsx +++ b/app/client/src/components/propertyControls/NumericInputControl.tsx @@ -3,8 +3,8 @@ import styled from "styled-components"; import { Classes, INumericInputProps, NumericInput } from "@blueprintjs/core"; import BaseControl, { ControlData, ControlProps } from "./BaseControl"; -import { ThemeProp } from "components/ads/common"; import { emitInteractionAnalyticsEvent } from "utils/AppsmithUtils"; +import { ThemeProp } from "widgets/constants"; const StyledNumericInput = styled(NumericInput)` &&& { diff --git a/app/client/src/components/wds/Button/withRecaptcha.tsx b/app/client/src/components/wds/Button/withRecaptcha.tsx index 5c8a96a42f..22eb01d8bf 100644 --- a/app/client/src/components/wds/Button/withRecaptcha.tsx +++ b/app/client/src/components/wds/Button/withRecaptcha.tsx @@ -8,7 +8,7 @@ import { } from "@appsmith/constants/messages"; import { RecaptchaType, RecaptchaTypes } from "components/constants"; import ReCAPTCHA from "react-google-recaptcha"; -import { Variant } from "components/ads/common"; +import { Variant } from "design-system"; const RecaptchaWrapper = styled.div` position: relative; diff --git a/app/client/src/globalStyles/tooltip.ts b/app/client/src/globalStyles/tooltip.ts index 77c42b3e33..780eba2c03 100644 --- a/app/client/src/globalStyles/tooltip.ts +++ b/app/client/src/globalStyles/tooltip.ts @@ -1,7 +1,7 @@ import { createGlobalStyle } from "styled-components"; import { Theme } from "constants/DefaultTheme"; import { Classes } from "@blueprintjs/core"; -import { Classes as CsClasses } from "components/ads/common"; +import { Classes as CsClasses } from "design-system"; export const GLOBAL_STYLE_TOOLTIP_CLASSNAME = "ads-global-tooltip"; diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx index 6727ace612..b8287baa37 100644 --- a/app/client/src/pages/Applications/ApplicationCard.tsx +++ b/app/client/src/pages/Applications/ApplicationCard.tsx @@ -30,6 +30,7 @@ import { AppIconName, Button, Category, + Classes as CsClasses, ColorSelector, EditableText, EditInteractionKind, @@ -47,6 +48,7 @@ import { Text, TextType, TooltipComponent, + Variant, } from "design-system"; import { useSelector } from "react-redux"; import { @@ -58,10 +60,8 @@ import { getIsSavingAppName, getIsErroredSavingAppName, } from "selectors/applicationSelectors"; -import { Classes as CsClasses } from "components/ads/common"; import { truncateString, howMuchTimeBeforeText } from "utils/helpers"; import ForkApplicationModal from "./ForkApplicationModal"; -import { Variant } from "components/ads/common"; import { getExportAppAPIRoute } from "@appsmith/constants/ApiConstants"; import { Colors } from "constants/Colors"; import { CONNECTED_TO_GIT, createMessage } from "@appsmith/constants/messages"; diff --git a/app/client/src/pages/Applications/ImportApplicationModalOld.tsx b/app/client/src/pages/Applications/ImportApplicationModalOld.tsx index b02bddd941..1e51bae425 100644 --- a/app/client/src/pages/Applications/ImportApplicationModalOld.tsx +++ b/app/client/src/pages/Applications/ImportApplicationModalOld.tsx @@ -6,13 +6,13 @@ import { FileType, SetProgress, Size, + Toaster, + Variant, } from "design-system"; import { StyledDialog } from "./ForkModalStyles"; import { useSelector } from "store"; import { useDispatch } from "react-redux"; import { importApplication } from "actions/applicationActions"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; import { IMPORT_APPLICATION_MODAL_TITLE } from "@appsmith/constants/messages"; import { getIsImportingApplication } from "selectors/applicationSelectors"; diff --git a/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx b/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx index 2cc5a3b100..52ded72f70 100644 --- a/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx +++ b/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx @@ -2,10 +2,8 @@ import React, { useState, useRef, useEffect, useCallback } from "react"; import styled, { withTheme } from "styled-components"; import moment from "moment"; import "@github/g-emoji-element"; -import { Icon, IconSize } from "design-system"; import { Colors } from "constants/Colors"; -import { Text, Case, TextType } from "design-system"; -import { Classes } from "components/ads/common"; +import { Case, Classes, Icon, IconSize, Text, TextType } from "design-system"; const StyledContainer = styled.div` color: ${(props) => props.theme.colors.text.normal}; diff --git a/app/client/src/pages/Applications/index.tsx b/app/client/src/pages/Applications/index.tsx index 88498ba26f..ec9a26c126 100644 --- a/app/client/src/pages/Applications/index.tsx +++ b/app/client/src/pages/Applications/index.tsx @@ -48,6 +48,7 @@ import { AppIconCollection, Button, Category, + Classes, EditableText, EditInteractionKind, DialogComponent as Dialog, @@ -66,7 +67,6 @@ import { duplicateApplication, updateApplication, } from "actions/applicationActions"; -import { Classes } from "components/ads/common"; import { Position } from "@blueprintjs/core/lib/esm/common/position"; import { UpdateApplicationPayload } from "api/ApplicationApi"; import PerformanceTracker, { diff --git a/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx b/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx index b1023c92a9..efa6096e8a 100644 --- a/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx +++ b/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx @@ -1,16 +1,22 @@ import React, { useEffect, useState, useMemo } from "react"; import styled from "styled-components"; -import { Icon, IconSize, TabComponent } from "design-system"; +import { + Classes, + FontWeight, + Icon, + IconSize, + TabComponent, + Text, + TextType, +} from "design-system"; import { StyledSeparator } from "pages/Applications/ProductUpdatesModal/ReleaseComponent"; import history from "utils/history"; -import { Text, FontWeight, TextType } from "design-system"; import { TabbedViewContainer } from "./CommonEditorForm"; import get from "lodash/get"; import { getQueryParams } from "utils/URLUtils"; import ActionRightPane, { useEntityDependencies, } from "components/editorComponents/ActionRightPane"; -import { Classes } from "components/ads/common"; import { Colors } from "constants/Colors"; import { sortedDatasourcesHandler } from "./helpers"; import { datasourcesEditorIdURL } from "RouteBuilder"; diff --git a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx index cd2c1623a0..7e939e5d40 100644 --- a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx +++ b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx @@ -28,21 +28,22 @@ import ActionSettings from "pages/Editor/ActionSettings"; import RequestDropdownField from "components/editorComponents/form/fields/RequestDropdownField"; import { ExplorerURLParams } from "../Explorer/helpers"; import MoreActionsMenu from "../Explorer/Actions/MoreActionsMenu"; -import { TabComponent } from "design-system"; import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; import { Button, Callout, Case, + Classes, Icon, IconSize, SearchSnippet, Size, + TabComponent, Text, TextType, TooltipComponent, + Variant, } from "design-system"; -import { Classes, Variant } from "components/ads/common"; import { useLocalStorage } from "utils/hooks/localstorage"; import { API_EDITOR_TAB_TITLES, diff --git a/app/client/src/pages/Editor/APIEditor/Pagination.tsx b/app/client/src/pages/Editor/APIEditor/Pagination.tsx index 5e8c9cf8f2..b331d2e25a 100644 --- a/app/client/src/pages/Editor/APIEditor/Pagination.tsx +++ b/app/client/src/pages/Editor/APIEditor/Pagination.tsx @@ -5,13 +5,12 @@ import styled from "constants/DefaultTheme"; import FormRow from "components/editorComponents/FormRow"; import { PaginationType } from "entities/Action"; import RadioFieldGroup from "components/editorComponents/form/fields/RadioGroupField"; -import { Button, Category, Size, Text, TextType } from "design-system"; +import { Button, Category, Classes, Size, Text, TextType } from "design-system"; import { CodeEditorBorder, EditorTheme, } from "components/editorComponents/CodeEditor/EditorConfig"; import { GifPlayer } from "design-system"; -import { Classes } from "components/ads/common"; import lightmodeGif from "assets/icons/gifs/config_pagination_lightmode.gif"; import darkmodeGif from "assets/icons/gifs/config_pagination_darkmode.gif"; import lightmodeThumbnail from "assets/icons/gifs/lightmode_thumbnail.png"; diff --git a/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx b/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx index 8378c7ee96..22b5b8d336 100644 --- a/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx +++ b/app/client/src/pages/Editor/APIEditor/PostBodyData.tsx @@ -18,11 +18,10 @@ import { EditorTheme, TabBehaviour, } from "components/editorComponents/CodeEditor/EditorConfig"; -import { MultiSwitch } from "design-system"; +import { Classes, MultiSwitch } from "design-system"; import { updateBodyContentType } from "actions/apiPaneActions"; import { CodeEditorExpected } from "components/editorComponents/CodeEditor"; import { AutocompleteDataType } from "utils/autocomplete/TernServer"; -import { Classes } from "components/ads/common"; import { createMessage, API_PANE_NO_BODY } from "@appsmith/constants/messages"; const PostBodyContainer = styled.div` diff --git a/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx b/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx index 3476366a78..1ea013c29b 100644 --- a/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx +++ b/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx @@ -14,8 +14,7 @@ import { EMPTY_RESPONSE } from "components/editorComponents/ApiResponseView"; import { AppState } from "@appsmith/reducers"; import { getApiName } from "selectors/formSelectors"; import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; -import { Text, TextType } from "design-system"; -import { Classes } from "components/ads/common"; +import { Classes, Text, TextType } from "design-system"; import { createMessage, API_PANE_NO_BODY } from "@appsmith/constants/messages"; import get from "lodash/get"; import { Datasource } from "entities/Datasource"; diff --git a/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx index 9ba3cd16b5..01940873c2 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx @@ -5,7 +5,7 @@ import _ from "lodash"; import { DATASOURCE_DB_FORM } from "@appsmith/constants/forms"; import { Icon } from "@blueprintjs/core"; import FormTitle from "./FormTitle"; -import { Button, Callout, Category } from "design-system"; +import { Button, Callout, Category, Variant } from "design-system"; import { Colors } from "constants/Colors"; import CollapsibleHelp from "components/designSystems/appsmith/help/CollapsibleHelp"; import Connected from "./Connected"; @@ -16,7 +16,6 @@ import { getAppsmithConfigs } from "@appsmith/configs"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { convertArrayToSentence } from "utils/helpers"; import { PluginType } from "entities/Action"; -import { Variant } from "components/ads/common"; import { AppState } from "@appsmith/reducers"; import { FormTitleContainer, diff --git a/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx b/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx index bef55c81b7..d8d023596a 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx @@ -1,10 +1,14 @@ import React, { useCallback, useState } from "react"; import { PluginType } from "entities/Action"; import styled from "styled-components"; -import { Button, IconPositions } from "design-system"; -import { Toaster } from "design-system"; +import { + Button, + Classes, + IconPositions, + Toaster, + Variant, +} from "design-system"; import { ERROR_ADD_API_INVALID_URL } from "@appsmith/constants/messages"; -import { Classes, Variant } from "components/ads/common"; import { createNewQueryAction } from "actions/apiPaneActions"; import { useDispatch, useSelector } from "react-redux"; import { AppState } from "@appsmith/reducers"; diff --git a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx index 74bb1e4831..be202fa019 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx @@ -19,8 +19,7 @@ import { connect } from "react-redux"; import { AppState } from "@appsmith/reducers"; import { ApiActionConfig, PluginType } from "entities/Action"; import { ActionDataState } from "reducers/entityReducers/actionsReducer"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { DEFAULT_API_ACTION_CONFIG } from "constants/ApiEditorConstants/ApiEditorConstants"; import { createActionRequest } from "actions/pluginActionActions"; import { diff --git a/app/client/src/pages/Editor/DataSourceEditor/index.tsx b/app/client/src/pages/Editor/DataSourceEditor/index.tsx index cdb286c483..c9fcfb6a42 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/index.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/index.tsx @@ -34,8 +34,7 @@ import { REST_API_AUTHORIZATION_FAILED, REST_API_AUTHORIZATION_SUCCESSFUL, } from "@appsmith/constants/messages"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; interface ReduxStateProps { datasourceId: string; diff --git a/app/client/src/pages/Editor/EditorAppName/EditableAppName.tsx b/app/client/src/pages/Editor/EditorAppName/EditableAppName.tsx index 90f92907c2..275bef0130 100644 --- a/app/client/src/pages/Editor/EditorAppName/EditableAppName.tsx +++ b/app/client/src/pages/Editor/EditorAppName/EditableAppName.tsx @@ -3,8 +3,8 @@ import React from "react"; import styled from "styled-components"; import { noop } from "lodash"; -import { CommonComponentProps } from "components/ads/common"; import { + CommonComponentProps, EditableTextSubComponent, EditInteractionKind, SavingState, diff --git a/app/client/src/pages/Editor/EditorAppName/NavigationMenuData.ts b/app/client/src/pages/Editor/EditorAppName/NavigationMenuData.ts index 9045e45fd8..41ff88f253 100644 --- a/app/client/src/pages/Editor/EditorAppName/NavigationMenuData.ts +++ b/app/client/src/pages/Editor/EditorAppName/NavigationMenuData.ts @@ -2,8 +2,7 @@ import { useDispatch, useSelector } from "react-redux"; import { useHistory, useParams } from "react-router-dom"; import { noop } from "lodash"; -import { Toaster } from "design-system"; -import { ThemeProp, Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { APPLICATIONS_URL } from "constants/routes"; @@ -33,6 +32,7 @@ import { redoShortCut, undoShortCut } from "utils/helpers"; import { pageListEditorURL } from "RouteBuilder"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { selectFeatureFlags } from "selectors/usersSelectors"; +import { ThemeProp } from "widgets/constants"; type NavigationMenuDataProps = ThemeProp & { editMode: typeof noop; diff --git a/app/client/src/pages/Editor/EditorAppName/NavigationMenuItem.tsx b/app/client/src/pages/Editor/EditorAppName/NavigationMenuItem.tsx index 8ca9b4dc23..9f817e0f6f 100644 --- a/app/client/src/pages/Editor/EditorAppName/NavigationMenuItem.tsx +++ b/app/client/src/pages/Editor/EditorAppName/NavigationMenuItem.tsx @@ -4,7 +4,7 @@ import styled from "styled-components"; import { Classes, MenuItem } from "@blueprintjs/core"; import _, { noop } from "lodash"; -import { CommonComponentProps } from "components/ads/common"; +import { CommonComponentProps } from "design-system"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { getTypographyByKey } from "constants/DefaultTheme"; import { HeaderIcons } from "icons/HeaderIcons"; diff --git a/app/client/src/pages/Editor/EditorAppName/index.tsx b/app/client/src/pages/Editor/EditorAppName/index.tsx index 12adb43fbe..8f8894f453 100644 --- a/app/client/src/pages/Editor/EditorAppName/index.tsx +++ b/app/client/src/pages/Editor/EditorAppName/index.tsx @@ -4,21 +4,21 @@ import styled, { withTheme } from "styled-components"; import { Classes, Menu, Position } from "@blueprintjs/core"; import { Classes as Popover2Classes, Popover2 } from "@blueprintjs/popover2"; import { noop } from "lodash"; - -import { Variant } from "components/ads/common"; import { + CommonComponentProps, EditInteractionKind, Icon, IconSize, SavingState, Toaster, + Variant, } from "design-system"; -import { CommonComponentProps, ThemeProp } from "components/ads/common"; import { getTypographyByKey } from "constants/DefaultTheme"; import EditableAppName from "./EditableAppName"; import { GetNavigationMenuData } from "./NavigationMenuData"; import { NavigationMenu } from "./NavigationMenu"; +import { ThemeProp } from "widgets/constants"; type EditorAppNameProps = CommonComponentProps & ThemeProp & { diff --git a/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx b/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx index fef94c7135..bbe0375f45 100644 --- a/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx @@ -14,8 +14,7 @@ import { noop } from "lodash"; import TreeDropdown from "pages/Editor/Explorer/TreeDropdown"; import { useNewActionName } from "./helpers"; import styled from "styled-components"; -import { Icon, IconSize } from "design-system"; -import { Classes } from "components/ads/common"; +import { Classes, Icon, IconSize } from "design-system"; import { Position } from "@blueprintjs/core"; import { inGuidedTour } from "selectors/onboardingSelectors"; import { toggleShowDeviationDialog } from "actions/onboardingActions"; diff --git a/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx b/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx index b4ce53de14..bab77471c9 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx @@ -3,16 +3,16 @@ import styled from "styled-components"; import { Colors } from "constants/Colors"; import { useSelector } from "react-redux"; import { getPluginImages } from "selectors/entitiesSelector"; -import { Classes } from "components/ads/common"; import { + Classes, DropdownOption, RenderDropdownOptionType, Text, TextType, + TooltipComponent, } from "design-system"; import { FormIcons } from "icons/FormIcons"; import _ from "lodash"; -import { TooltipComponent } from "design-system"; // ---------- Helpers and constants ---------- diff --git a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx index c2425f9c6e..25a276ee58 100644 --- a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx +++ b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx @@ -33,8 +33,7 @@ import { SEARCH_CATEGORY_ID, } from "components/editorComponents/GlobalSearch/utils"; import { redoAction, undoAction } from "actions/pageActions"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { getAppMode } from "selectors/applicationSelectors"; import { APP_MODE } from "entities/App"; diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx index 649a9227f4..fdeb39651f 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx @@ -5,6 +5,7 @@ import { useDispatch, useSelector } from "react-redux"; import { getDataTree } from "selectors/dataTreeSelectors"; import { isAction, isWidget } from "workers/evaluationUtils"; import { + Classes, Dropdown, DefaultDropDownValueNodeProps, DropdownOption, @@ -15,7 +16,6 @@ import { TooltipComponent as Tooltip, RenderDropdownOptionType, } from "design-system"; -import { Classes } from "components/ads/common"; import { useEntityLink } from "components/editorComponents/Debugger/hooks/debuggerHooks"; import { useGetEntityInfo } from "components/editorComponents/Debugger/hooks/useGetEntityInfo"; import { diff --git a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx index ac771eec83..1aa93e255c 100644 --- a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx +++ b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx @@ -20,11 +20,11 @@ import DropdownField from "components/editorComponents/form/fields/DropdownField import { ControlProps } from "components/formControls/BaseControl"; import ActionSettings from "pages/Editor/ActionSettings"; import log from "loglevel"; -import { Variant } from "components/ads/common"; import { Button, Callout, Category, + Classes, Icon as AdsIcon, IconSize, SearchSnippet, @@ -34,9 +34,9 @@ import { Text, TextType, TooltipComponent, + Variant, } from "design-system"; import styled from "constants/DefaultTheme"; -import { Classes } from "components/ads/common"; import FormRow from "components/editorComponents/FormRow"; import EditorButton from "components/editorComponents/Button"; import DebuggerLogs from "components/editorComponents/Debugger/DebuggerLogs"; diff --git a/app/client/src/pages/Editor/ThemePropertyPane/DeleteThemeModal.tsx b/app/client/src/pages/Editor/ThemePropertyPane/DeleteThemeModal.tsx index 7c333392ae..11bd0df3f0 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/DeleteThemeModal.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/DeleteThemeModal.tsx @@ -1,6 +1,5 @@ import React from "react"; -import { Variant } from "components/ads/common"; import { createMessage, DELETE_APP_THEME_WARNING, @@ -12,6 +11,7 @@ import { Category, DialogComponent as Dialog, Size, + Variant, } from "design-system"; interface DeleteThemeModalProps { diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeBetaCard.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeBetaCard.tsx index 2c580d6253..c7b1b9b3e7 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeBetaCard.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeBetaCard.tsx @@ -8,8 +8,7 @@ import { APP_THEME_BETA_CARD_HEADING, APP_THEME_BETA_CARD_CONTENT, } from "@appsmith/constants/messages"; -import { Variant } from "components/ads"; -import { Button, Size, Category } from "design-system"; +import { Button, Size, Category, Variant } from "design-system"; import { Colors } from "constants/Colors"; const StyledButton = styled(Button)` diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx index 44bce05f24..825ebd0241 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx @@ -29,12 +29,11 @@ import { AppTheme } from "entities/AppTheming"; import AnalyticsUtil from "utils/AnalyticsUtil"; import ThemeFontControl from "./controls/ThemeFontControl"; import ThemeColorControl from "./controls/ThemeColorControl"; -import { Button, Category, Size } from "design-system"; +import { Button, Category, Classes as CsClasses, Size } from "design-system"; import ThemeBoxShadowControl from "./controls/ThemeShadowControl"; import { getCurrentApplicationId } from "selectors/editorSelectors"; import ThemeBorderRadiusControl from "./controls/ThemeBorderRadiusControl"; import BetaCard from "components/editorComponents/BetaCard"; -import { Classes as CsClasses } from "components/ads/common"; import { Colors } from "constants/Colors"; const THEMING_BETA_CARD_POPOVER_CLASSNAME = `theming-beta-card-popover`; diff --git a/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx b/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx index 8c5e5aca9d..ad92c55262 100644 --- a/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx +++ b/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx @@ -17,6 +17,7 @@ import { Text, TextInput, TextType, + Variant, } from "design-system"; import styled, { useTheme } from "styled-components"; @@ -36,7 +37,6 @@ import { import Link from "./components/Link"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { Subtitle, Title } from "./components/StyledComponents"; -import { Variant } from "components/ads"; const StyledDialog = styled(Dialog)` && .bp3-dialog-body { diff --git a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx index a63526b282..36c8ec81ad 100644 --- a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx +++ b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx @@ -22,6 +22,7 @@ import { Text, TextType, TooltipComponent, + Variant, } from "design-system"; import { Colors } from "constants/Colors"; @@ -62,7 +63,6 @@ import { useQuery } from "../utils"; import ListItemWrapper from "./components/DatasourceListItem"; import { getDefaultPageId } from "sagas/ApplicationSagas"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; -import { Variant } from "components/ads"; import { getOAuthAccessToken } from "actions/datasourceActions"; import { builderURL } from "RouteBuilder"; import localStorage from "utils/localStorage"; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx index 7b07c6a39b..2a79dfb0de 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx @@ -56,9 +56,11 @@ import GitChangesList from "../components/GitChangesList"; import { Icon, IconSize, + ScrollIndicator, Text, TextType, TooltipComponent as Tooltip, + Variant, } from "design-system"; import InfoWrapper from "../components/InfoWrapper"; import Link from "../components/Link"; @@ -73,10 +75,8 @@ import { import GIT_ERROR_CODES from "constants/GitErrorCodes"; import useAutoGrow from "utils/hooks/useAutoGrow"; import { Space, Title } from "../components/StyledComponents"; -import { Variant } from "components/ads"; import DiscardChangesWarning from "../components/DiscardChangesWarning"; import { changeInfoSinceLastCommit } from "../utils"; -import { ScrollIndicator } from "design-system"; import { GitStatusData } from "reducers/uiReducers/gitSyncReducer"; const Section = styled.div` diff --git a/app/client/src/pages/Editor/gitSync/components/BranchListItemContainer.tsx b/app/client/src/pages/Editor/gitSync/components/BranchListItemContainer.tsx index 0bd24e24cf..9b76675635 100644 --- a/app/client/src/pages/Editor/gitSync/components/BranchListItemContainer.tsx +++ b/app/client/src/pages/Editor/gitSync/components/BranchListItemContainer.tsx @@ -1,7 +1,7 @@ import styled from "styled-components"; import { getTypographyByKey } from "constants/DefaultTheme"; import { Colors } from "constants/Colors"; -import { Classes } from "components/ads"; +import { Classes } from "design-system"; export const BranchListItemContainer = styled.div<{ selected?: boolean; diff --git a/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx b/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx index 55b13e9b6c..cfd8e0e26e 100644 --- a/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx +++ b/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx @@ -1,8 +1,7 @@ import React, { useState } from "react"; import { Colors } from "constants/Colors"; import AnalyticsUtil from "utils/AnalyticsUtil"; -import { Variant } from "components/ads"; -import { Icon, IconSize, Menu, Toaster } from "design-system"; +import { Icon, IconSize, Menu, Toaster, Variant } from "design-system"; import { deleteBranchInit } from "actions/gitSyncActions"; import { useDispatch, useSelector } from "react-redux"; import { diff --git a/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx b/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx index 14d662fe3a..526b0734a4 100644 --- a/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx +++ b/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx @@ -1,17 +1,17 @@ import { + Classes as AdsClasses, Icon, IconSize, Text, Case, FontWeight, TextType, + TooltipComponent, } from "design-system"; -import { TooltipComponent } from "design-system"; import { Colors } from "constants/Colors"; import React, { useState, useEffect, useCallback } from "react"; import styled from "styled-components"; import { CREDENTIAL_MODE } from "../constants"; -import { Classes as AdsClasses } from "components/ads/common"; import { DOCS_BASE_URL } from "constants/ThirdPartyConstants"; const Container = styled.div` diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx index 59378775b4..0887462e2d 100644 --- a/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx +++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx @@ -1,7 +1,6 @@ import React from "react"; import styled from "constants/DefaultTheme"; -import { Classes } from "components/ads/common"; -import { Icon, IconSize, Text, TextType } from "design-system"; +import { Classes, Icon, IconSize, Text, TextType } from "design-system"; import { Colors } from "constants/Colors"; import { useSelector } from "react-redux"; import { diff --git a/app/client/src/pages/Editor/gitSync/components/InfoWrapper.tsx b/app/client/src/pages/Editor/gitSync/components/InfoWrapper.tsx index fdf2d5a01d..3e77fd941b 100644 --- a/app/client/src/pages/Editor/gitSync/components/InfoWrapper.tsx +++ b/app/client/src/pages/Editor/gitSync/components/InfoWrapper.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; import { Colors } from "constants/Colors"; -import { Classes } from "components/ads/common"; +import { Classes } from "design-system"; const InfoWrapper = styled.div<{ isError?: boolean }>` width: 100%; diff --git a/app/client/src/pages/Editor/gitSync/components/Link.tsx b/app/client/src/pages/Editor/gitSync/components/Link.tsx index ddc36db7d4..fe2d1ac00d 100644 --- a/app/client/src/pages/Editor/gitSync/components/Link.tsx +++ b/app/client/src/pages/Editor/gitSync/components/Link.tsx @@ -2,6 +2,7 @@ import React from "react"; import { Colors } from "constants/Colors"; import styled from "styled-components"; import { + Classes, Icon, IconSize, Text, @@ -9,7 +10,6 @@ import { FontWeight, TextType, } from "design-system"; -import { Classes } from "components/ads/common"; const LinkText = styled.div<{ color?: string }>` cursor: pointer; diff --git a/app/client/src/pages/Editor/gitSync/components/MergeStatus.tsx b/app/client/src/pages/Editor/gitSync/components/MergeStatus.tsx index e452555883..c0cfb024cb 100644 --- a/app/client/src/pages/Editor/gitSync/components/MergeStatus.tsx +++ b/app/client/src/pages/Editor/gitSync/components/MergeStatus.tsx @@ -1,9 +1,8 @@ import React from "react"; import styled from "constants/DefaultTheme"; import StatusLoader from "./StatusLoader"; -import { Text, TextType } from "design-system"; +import { Classes, Text, TextType } from "design-system"; import { Colors } from "constants/Colors"; -import { Classes } from "components/ads"; const Flex = styled.div` display: flex; diff --git a/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx b/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx index c975ef9afb..82d54f8b24 100644 --- a/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx +++ b/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx @@ -5,12 +5,19 @@ import { SSH_KEY_GENERATED, } from "@appsmith/constants/messages"; import React, { useCallback, useState } from "react"; -import { Icon, IconSize, Menu, Toaster, Text, TextType } from "design-system"; +import { + Icon, + IconSize, + Menu, + Toaster, + Text, + TextType, + Variant, +} from "design-system"; import Key2LineIcon from "remixicon-react/Key2LineIcon"; import { Space } from "pages/Editor/gitSync/components/StyledComponents"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { Position } from "@blueprintjs/core"; -import { Variant } from "components/ads/common"; import { useSSHKeyPair } from "../../hooks"; import { DeployedKeyContainer, diff --git a/app/client/src/pages/Settings/DisconnectService.tsx b/app/client/src/pages/Settings/DisconnectService.tsx index 51bf08fb8e..23365018be 100644 --- a/app/client/src/pages/Settings/DisconnectService.tsx +++ b/app/client/src/pages/Settings/DisconnectService.tsx @@ -1,7 +1,6 @@ import React, { useState } from "react"; import styled from "styled-components"; -import { Variant } from "components/ads/common"; -import { Button, CalloutV2 } from "design-system"; +import { Button, CalloutV2, Variant } from "design-system"; import { createMessage, DANGER_ZONE, diff --git a/app/client/src/pages/Settings/FormGroup/CopyUrlForm.tsx b/app/client/src/pages/Settings/FormGroup/CopyUrlForm.tsx index c6422ffc0b..f80f9e1803 100644 --- a/app/client/src/pages/Settings/FormGroup/CopyUrlForm.tsx +++ b/app/client/src/pages/Settings/FormGroup/CopyUrlForm.tsx @@ -1,12 +1,15 @@ import React, { useEffect } from "react"; import { Field, InjectedFormProps, reduxForm } from "redux-form"; import { HelpIcons } from "icons/HelpIcons"; -import { UneditableField } from "design-system"; import styled from "styled-components"; import copy from "copy-to-clipboard"; -import { Variant } from "components/ads/common"; import AnalyticsUtil from "utils/AnalyticsUtil"; -import { Toaster, TooltipComponent } from "design-system"; +import { + Toaster, + TooltipComponent, + UneditableField, + Variant, +} from "design-system"; import { Colors } from "constants/Colors"; const HelpIcon = HelpIcons.HELP_ICON; diff --git a/app/client/src/pages/Settings/RestartBanner.tsx b/app/client/src/pages/Settings/RestartBanner.tsx index 2450b13321..8c268417b1 100644 --- a/app/client/src/pages/Settings/RestartBanner.tsx +++ b/app/client/src/pages/Settings/RestartBanner.tsx @@ -1,5 +1,12 @@ import React from "react"; -import { Button, Category, Icon, IconSize, Size } from "design-system"; +import { + Button, + Category, + hexToRgba, + Icon, + IconSize, + Size, +} from "design-system"; import { getIsRestartFailed, getRestartingState, @@ -15,7 +22,6 @@ import { RESTART_ERROR_HEADER, } from "@appsmith/constants/messages"; import { Colors } from "constants/Colors"; -import { hexToRgba } from "components/ads/common"; import { AppIcon } from "design-system"; import { retryServerRestart } from "@appsmith/actions/settingsAction"; import { useDispatch } from "react-redux"; diff --git a/app/client/src/pages/Settings/SettingsForm.tsx b/app/client/src/pages/Settings/SettingsForm.tsx index 07c02b7dab..7484d2ee39 100644 --- a/app/client/src/pages/Settings/SettingsForm.tsx +++ b/app/client/src/pages/Settings/SettingsForm.tsx @@ -29,8 +29,7 @@ import { DISCONNECT_SERVICE_WARNING, MANDATORY_FIELDS_ERROR, } from "@appsmith/constants/messages"; -import { Variant } from "components/ads"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { connectedMethods, saveAllowed, diff --git a/app/client/src/pages/Templates/LeftPaneTemplateList.tsx b/app/client/src/pages/Templates/LeftPaneTemplateList.tsx index 3d403ac3be..e39b1f1391 100644 --- a/app/client/src/pages/Templates/LeftPaneTemplateList.tsx +++ b/app/client/src/pages/Templates/LeftPaneTemplateList.tsx @@ -3,9 +3,8 @@ import { useSelector } from "react-redux"; import { useParams } from "react-router"; import { getTemplatesSelector } from "selectors/templatesSelectors"; import styled from "styled-components"; -import { Text, TextType } from "design-system"; +import { Classes, Text, TextType } from "design-system"; import history from "utils/history"; -import { Classes } from "components/ads/common"; import LeftPaneBottomSection from "pages/Home/LeftPaneBottomSection"; import { thinScrollbar } from "constants/DefaultTheme"; import { Colors } from "constants/Colors"; diff --git a/app/client/src/pages/Templates/TemplatesModal/LoadingScreen.tsx b/app/client/src/pages/Templates/TemplatesModal/LoadingScreen.tsx index b0fa5e0039..196709b75d 100644 --- a/app/client/src/pages/Templates/TemplatesModal/LoadingScreen.tsx +++ b/app/client/src/pages/Templates/TemplatesModal/LoadingScreen.tsx @@ -1,7 +1,6 @@ import React from "react"; import styled from "styled-components"; -import { Text, TextType, Spinner } from "design-system"; -import { Classes } from "components/ads"; +import { Classes, Text, TextType, Spinner } from "design-system"; const Wrapper = styled.div` height: 85vh; diff --git a/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx b/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx index 3d62ebded0..38b023b4f5 100644 --- a/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx +++ b/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx @@ -1,8 +1,16 @@ import React, { useEffect, useState } from "react"; import styled from "styled-components"; import PagesLineIcon from "remixicon-react/PagesLineIcon"; -import { CheckboxType, Text, TextType, IconWrapper } from "design-system"; -import { Checkmark, Size, Button } from "design-system"; +import { + Button, + CheckboxType, + Checkmark, + Classes, + Size, + Text, + TextType, + IconWrapper, +} from "design-system"; import { useDispatch } from "react-redux"; import { importTemplateIntoApplication } from "actions/templateActions"; import { Template } from "api/TemplatesApi"; @@ -15,7 +23,6 @@ import { PAGES, } from "ce/constants/messages"; import { Colors } from "constants/Colors"; -import { Classes } from "components/ads"; const Wrapper = styled.div` width: max(300px, 25%); diff --git a/app/client/src/pages/UserAuth/ForgotPassword.tsx b/app/client/src/pages/UserAuth/ForgotPassword.tsx index ade0da0d37..0f1660592d 100644 --- a/app/client/src/pages/UserAuth/ForgotPassword.tsx +++ b/app/client/src/pages/UserAuth/ForgotPassword.tsx @@ -29,9 +29,8 @@ import { } from "@appsmith/constants/messages"; import { AUTH_LOGIN_URL } from "constants/routes"; import { FORGOT_PASSWORD_FORM_NAME } from "@appsmith/constants/forms"; -import FormGroup from "components/ads/formFields/FormGroup"; import FormTextField from "components/utils/ReduxFormTextField"; -import { Button, FormMessage, Size } from "design-system"; +import { Button, FormGroup, FormMessage, Size } from "design-system"; import { Icon } from "@blueprintjs/core"; import { isEmail, isEmptyString } from "utils/formhelpers"; import { diff --git a/app/client/src/pages/UserAuth/ResetPassword.tsx b/app/client/src/pages/UserAuth/ResetPassword.tsx index 9f45aa7545..0fc79d3a54 100644 --- a/app/client/src/pages/UserAuth/ResetPassword.tsx +++ b/app/client/src/pages/UserAuth/ResetPassword.tsx @@ -7,10 +7,10 @@ import { RESET_PASSWORD_FORM_NAME } from "@appsmith/constants/forms"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { getIsTokenValid, getIsValidatingToken } from "selectors/authSelectors"; import { Icon } from "@blueprintjs/core"; -import FormGroup from "components/ads/formFields/FormGroup"; import FormTextField from "components/utils/ReduxFormTextField"; import { Button, + FormGroup, FormMessage, FormMessageProps, MessageAction, diff --git a/app/client/src/pages/UserProfile/General.tsx b/app/client/src/pages/UserProfile/General.tsx index 0e70840ab9..9138cb8992 100644 --- a/app/client/src/pages/UserProfile/General.tsx +++ b/app/client/src/pages/UserProfile/General.tsx @@ -1,13 +1,18 @@ import React, { useEffect } from "react"; import styled from "styled-components"; -import { Toaster, Text, TextType } from "design-system"; import { debounce } from "lodash"; -import { TextInput, notEmptyValidator } from "design-system"; +import { + notEmptyValidator, + Text, + TextInput, + TextType, + Toaster, + Variant, +} from "design-system"; import { useDispatch, useSelector } from "react-redux"; import { Classes } from "@blueprintjs/core"; import { getCurrentUser } from "selectors/usersSelectors"; import { forgotPasswordSubmitHandler } from "pages/UserAuth/helpers"; -import { Variant } from "components/ads/common"; import { FORGOT_PASSWORD_SUCCESS_TEXT, createMessage, diff --git a/app/client/src/pages/common/ProfileDropdown.tsx b/app/client/src/pages/common/ProfileDropdown.tsx index e76b987318..66853e48b0 100644 --- a/app/client/src/pages/common/ProfileDropdown.tsx +++ b/app/client/src/pages/common/ProfileDropdown.tsx @@ -1,6 +1,7 @@ import React from "react"; -import { Classes, CommonComponentProps } from "components/ads/common"; import { + Classes, + CommonComponentProps, Menu, MenuDivider, MenuItem, diff --git a/app/client/src/pages/common/datasourceAuth/index.tsx b/app/client/src/pages/common/datasourceAuth/index.tsx index 41f904e8fb..1de7286119 100644 --- a/app/client/src/pages/common/datasourceAuth/index.tsx +++ b/app/client/src/pages/common/datasourceAuth/index.tsx @@ -36,8 +36,7 @@ import { OAUTH_AUTHORIZATION_APPSMITH_ERROR, OAUTH_AUTHORIZATION_FAILED, } from "@appsmith/constants/messages"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { CONTEXT_DELETE, CONFIRM_CONTEXT_DELETE, diff --git a/app/client/src/pages/setup/DetailsForm.tsx b/app/client/src/pages/setup/DetailsForm.tsx index 0e77064fcd..9e32d2be4c 100644 --- a/app/client/src/pages/setup/DetailsForm.tsx +++ b/app/client/src/pages/setup/DetailsForm.tsx @@ -9,7 +9,6 @@ import { FormHeaderWrapper, withDropdown, } from "./common"; -import StyledFormGroup from "components/ads/formFields/FormGroup"; import { createMessage, WELCOME_FORM_EMAIL_ID, @@ -27,7 +26,12 @@ import { import FormTextField from "components/utils/ReduxFormTextField"; import { SetupFormProps } from "./SetupForm"; import { ButtonWrapper } from "pages/Applications/ForkModalStyles"; -import { Button, Category, Size } from "design-system"; +import { + Button, + Category, + FormGroup as StyledFormGroup, + Size, +} from "design-system"; import { roleOptions, useCaseOptions } from "./constants"; const DetailsFormWrapper = styled.div` diff --git a/app/client/src/pages/setup/GetStarted.tsx b/app/client/src/pages/setup/GetStarted.tsx index e4857c9b46..646fb195c4 100644 --- a/app/client/src/pages/setup/GetStarted.tsx +++ b/app/client/src/pages/setup/GetStarted.tsx @@ -1,6 +1,5 @@ import React from "react"; -import { Button } from "design-system"; -import StyledFormGroup from "components/ads/formFields/FormGroup"; +import { Button, FormGroup as StyledFormGroup } from "design-system"; import FormTextField from "components/utils/ReduxFormTextField"; import { WELCOME_FORM_ROLE_FIELD_NAME, diff --git a/app/client/src/pages/setup/common.tsx b/app/client/src/pages/setup/common.tsx index 84df5cd3a7..c1764eab5c 100644 --- a/app/client/src/pages/setup/common.tsx +++ b/app/client/src/pages/setup/common.tsx @@ -1,6 +1,5 @@ import React from "react"; -import { Dropdown } from "design-system"; -import StyledFormGroup from "components/ads/formFields/FormGroup"; +import { Dropdown, FormGroup as StyledFormGroup } from "design-system"; import { FormTextFieldProps } from "components/utils/ReduxFormTextField"; import { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form"; import styled from "styled-components"; diff --git a/app/client/src/pages/workspace/DeleteConfirmationModal.tsx b/app/client/src/pages/workspace/DeleteConfirmationModal.tsx index 257148c367..92283cf826 100644 --- a/app/client/src/pages/workspace/DeleteConfirmationModal.tsx +++ b/app/client/src/pages/workspace/DeleteConfirmationModal.tsx @@ -7,8 +7,8 @@ import { Size, Text, TextType, + Variant, } from "design-system"; -import { Variant } from "components/ads/common"; import { DELETE_CONFIRMATION_MODAL_TITLE, DELETE_CONFIRMATION_MODAL_SUBTITLE, diff --git a/app/client/src/pages/workspace/ManageUsers.tsx b/app/client/src/pages/workspace/ManageUsers.tsx index d42c77a9c8..2d276ddbfe 100644 --- a/app/client/src/pages/workspace/ManageUsers.tsx +++ b/app/client/src/pages/workspace/ManageUsers.tsx @@ -1,8 +1,7 @@ import React from "react"; import styled from "styled-components"; import history from "utils/history"; -import { Icon, IconSize, Text, TextType } from "design-system"; -import { Classes } from "components/ads/common"; +import { Classes, Icon, IconSize, Text, TextType } from "design-system"; import { useLocation } from "react-router-dom"; const StyledManageUsers = styled("a")` diff --git a/app/client/src/pages/workspace/Members.tsx b/app/client/src/pages/workspace/Members.tsx index 87cb8601de..10a58e3cfb 100644 --- a/app/client/src/pages/workspace/Members.tsx +++ b/app/client/src/pages/workspace/Members.tsx @@ -17,6 +17,7 @@ import { deleteWorkspaceUser, } from "actions/workspaceActions"; import { + Classes as AppClass, Dropdown, HighlightText, Icon, @@ -27,7 +28,6 @@ import { TextType, } from "design-system"; import styled from "styled-components"; -import { Classes as AppClass } from "components/ads/common"; import DeleteConfirmationModal from "./DeleteConfirmationModal"; import { useMediaQuery } from "react-responsive"; import { Card } from "@blueprintjs/core"; diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts index 7538efcbcf..a42c7dacb1 100644 --- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts @@ -38,7 +38,7 @@ import { validateResponse } from "sagas/ErrorSagas"; import AnalyticsUtil, { EventName } from "utils/AnalyticsUtil"; import { Action, PluginType } from "entities/Action"; import LOG_TYPE from "entities/AppsmithConsole/logtype"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { createMessage, ERROR_ACTION_EXECUTE_FAIL, @@ -47,7 +47,6 @@ import { ACTION_EXECUTION_CANCELLED, ACTION_EXECUTION_FAILED, } from "@appsmith/constants/messages"; -import { Variant } from "components/ads/common"; import { EventType, LayoutOnLoadActionErrors, diff --git a/app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts b/app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts index 82a1d25ad8..a07b5d8caa 100644 --- a/app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/ShowAlertActionSaga.ts @@ -1,5 +1,4 @@ -import { ToastTypeOptions, Variant } from "components/ads/common"; -import { Toaster } from "design-system"; +import { Toaster, ToastTypeOptions, Variant } from "design-system"; import AppsmithConsole from "utils/AppsmithConsole"; import { ActionTriggerType, diff --git a/app/client/src/sagas/ActionExecution/errorUtils.ts b/app/client/src/sagas/ActionExecution/errorUtils.ts index d31f5fc8d0..484825582f 100644 --- a/app/client/src/sagas/ActionExecution/errorUtils.ts +++ b/app/client/src/sagas/ActionExecution/errorUtils.ts @@ -8,8 +8,7 @@ import { TRIGGER_ACTION_VALIDATION_ERROR, } from "@appsmith/constants/messages"; import { ENTITY_TYPE } from "entities/AppsmithConsole"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { ApiResponse } from "api/ApiResponses"; import { isString } from "lodash"; import { Types } from "utils/TypeHelpers"; diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts index 76f98bc1d5..e391d3a9c4 100644 --- a/app/client/src/sagas/ActionSagas.ts +++ b/app/client/src/sagas/ActionSagas.ts @@ -60,8 +60,7 @@ import { } from "selectors/entitiesSelector"; import history from "utils/history"; import { INTEGRATION_TABS } from "constants/routes"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import PerformanceTracker, { PerformanceTransactionName, } from "utils/PerformanceTracker"; diff --git a/app/client/src/sagas/ApiPaneSagas.ts b/app/client/src/sagas/ApiPaneSagas.ts index aa044acc01..9f23d2f8cf 100644 --- a/app/client/src/sagas/ApiPaneSagas.ts +++ b/app/client/src/sagas/ApiPaneSagas.ts @@ -57,8 +57,7 @@ import PerformanceTracker, { PerformanceTransactionName, } from "utils/PerformanceTracker"; import { EventLocation } from "utils/AnalyticsUtil"; -import { Variant } from "components/ads/common"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { createMessage, ERROR_ACTION_RENAME_FAIL, diff --git a/app/client/src/sagas/AppThemingSaga.tsx b/app/client/src/sagas/AppThemingSaga.tsx index 925b6745e5..b670d6d9c9 100644 --- a/app/client/src/sagas/AppThemingSaga.tsx +++ b/app/client/src/sagas/AppThemingSaga.tsx @@ -15,8 +15,7 @@ import { } from "@appsmith/constants/ReduxActionConstants"; import ThemingApi from "api/AppThemingApi"; import { all, takeLatest, put, select } from "redux-saga/effects"; -import { Variant } from "components/ads/common"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { CHANGE_APP_THEME, createMessage, diff --git a/app/client/src/sagas/ApplicationSagas.tsx b/app/client/src/sagas/ApplicationSagas.tsx index 4d29030118..e6b3cf3332 100644 --- a/app/client/src/sagas/ApplicationSagas.tsx +++ b/app/client/src/sagas/ApplicationSagas.tsx @@ -52,10 +52,9 @@ import { DISCARD_SUCCESS, DUPLICATING_APPLICATION, } from "@appsmith/constants/messages"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { APP_MODE } from "entities/App"; import { Workspace, Workspaces } from "constants/workspaceConstants"; -import { Variant } from "components/ads/common"; import { AppIconName } from "design-system"; import { AppColorCode } from "constants/DefaultTheme"; import { diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts index 988455190d..fc530433d1 100644 --- a/app/client/src/sagas/DatasourcesSagas.ts +++ b/app/client/src/sagas/DatasourcesSagas.ts @@ -53,8 +53,7 @@ import { validateResponse } from "./ErrorSagas"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { getFormData } from "selectors/formSelectors"; import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors"; -import { Variant } from "components/ads/common"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { getConfigInitialValues } from "components/formControls/utils"; import { setActionProperty } from "actions/pluginActionActions"; import { authorizeDatasourceWithAppsmithToken } from "api/CloudServicesApi"; diff --git a/app/client/src/sagas/ErrorSagas.tsx b/app/client/src/sagas/ErrorSagas.tsx index 2e48dcde85..d0e389fe45 100644 --- a/app/client/src/sagas/ErrorSagas.tsx +++ b/app/client/src/sagas/ErrorSagas.tsx @@ -7,8 +7,7 @@ import { import log from "loglevel"; import history from "utils/history"; import { ApiResponse } from "api/ApiResponses"; -import { Variant } from "components/ads/common"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { flushErrors } from "actions/errorActions"; import { AUTH_LOGIN_URL } from "constants/routes"; import { User } from "constants/userConstants"; diff --git a/app/client/src/sagas/EvaluationsSaga.ts b/app/client/src/sagas/EvaluationsSaga.ts index 17885697e1..69519ac013 100644 --- a/app/client/src/sagas/EvaluationsSaga.ts +++ b/app/client/src/sagas/EvaluationsSaga.ts @@ -66,8 +66,7 @@ import { TriggerMeta, } from "./ActionExecution/ActionExecutionSagas"; import { EventType } from "constants/AppsmithActionConstants/ActionConstants"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { createMessage, SNIPPET_EXECUTION_FAILED, diff --git a/app/client/src/sagas/GitSyncSagas.ts b/app/client/src/sagas/GitSyncSagas.ts index 541c0e716b..fb0788cf0c 100644 --- a/app/client/src/sagas/GitSyncSagas.ts +++ b/app/client/src/sagas/GitSyncSagas.ts @@ -64,8 +64,7 @@ import { showReconnectDatasourceModal } from "actions/applicationActions"; import { ApiResponse } from "api/ApiResponses"; import { GitConfig, GitSyncModalTab } from "entities/GitSync"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { getCurrentAppGitMetaData, getCurrentApplication, diff --git a/app/client/src/sagas/JSActionSagas.ts b/app/client/src/sagas/JSActionSagas.ts index a2101d0159..69f8bbc44a 100644 --- a/app/client/src/sagas/JSActionSagas.ts +++ b/app/client/src/sagas/JSActionSagas.ts @@ -32,8 +32,7 @@ import { import history from "utils/history"; import { getCurrentPageId } from "selectors/editorSelectors"; import JSActionAPI, { JSCollectionCreateUpdateResponse } from "api/JSActionAPI"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { createMessage, JS_ACTION_COPY_SUCCESS, diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts index 6dcf6f4634..deafc5f3f4 100644 --- a/app/client/src/sagas/JSPaneSagas.ts +++ b/app/client/src/sagas/JSPaneSagas.ts @@ -51,9 +51,8 @@ import { } from "actions/jsPaneActions"; import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors"; import { getPluginIdOfPackageName } from "sagas/selectors"; +import { Toaster, Variant } from "design-system"; import { PluginPackageName, PluginType } from "entities/Action"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; import { createMessage, ERROR_JS_COLLECTION_RENAME_FAIL, diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts index 9004d4f6cc..2cf814e7c2 100644 --- a/app/client/src/sagas/OnboardingSagas.ts +++ b/app/client/src/sagas/OnboardingSagas.ts @@ -29,8 +29,7 @@ import { getQueryAction, getTableWidget, } from "selectors/onboardingSelectors"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { Workspaces } from "constants/workspaceConstants"; import { enableGuidedTour, diff --git a/app/client/src/sagas/PageSagas.tsx b/app/client/src/sagas/PageSagas.tsx index ca77457e8b..ed63899040 100644 --- a/app/client/src/sagas/PageSagas.tsx +++ b/app/client/src/sagas/PageSagas.tsx @@ -96,8 +96,7 @@ import PerformanceTracker, { PerformanceTransactionName, } from "utils/PerformanceTracker"; import log from "loglevel"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { migrateIncorrectDynamicBindingPathLists } from "utils/migrations/IncorrectDynamicBindingPathLists"; import * as Sentry from "@sentry/react"; import { ERROR_CODES } from "@appsmith/constants/ApiConstants"; diff --git a/app/client/src/sagas/PostEvaluationSagas.ts b/app/client/src/sagas/PostEvaluationSagas.ts index 6fbe769b03..b306cc89ac 100644 --- a/app/client/src/sagas/PostEvaluationSagas.ts +++ b/app/client/src/sagas/PostEvaluationSagas.ts @@ -26,8 +26,7 @@ import { find, get, some } from "lodash"; import LOG_TYPE from "entities/AppsmithConsole/logtype"; import { put, select } from "redux-saga/effects"; import { AnyReduxAction } from "@appsmith/constants/ReduxActionConstants"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import AppsmithConsole from "utils/AppsmithConsole"; import * as Sentry from "@sentry/react"; import AnalyticsUtil from "utils/AnalyticsUtil"; diff --git a/app/client/src/sagas/ProvidersSaga.ts b/app/client/src/sagas/ProvidersSaga.ts index 255a66ea5b..304f48498e 100644 --- a/app/client/src/sagas/ProvidersSaga.ts +++ b/app/client/src/sagas/ProvidersSaga.ts @@ -37,8 +37,7 @@ import { } from "@appsmith/constants/messages"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; export function* fetchProviderTemplatesSaga( action: ReduxActionWithPromise, diff --git a/app/client/src/sagas/QueryPaneSagas.ts b/app/client/src/sagas/QueryPaneSagas.ts index 6a366b590d..ddfe4507bb 100644 --- a/app/client/src/sagas/QueryPaneSagas.ts +++ b/app/client/src/sagas/QueryPaneSagas.ts @@ -44,8 +44,7 @@ import { createNewApiName, createNewQueryName } from "utils/AppsmithUtils"; import { getQueryParams } from "utils/URLUtils"; import { isEmpty, merge } from "lodash"; import { getConfigInitialValues } from "components/formControls/utils"; -import { Variant } from "components/ads/common"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { Datasource } from "entities/Datasource"; import omit from "lodash/omit"; import { diff --git a/app/client/src/sagas/SnipingModeSagas.ts b/app/client/src/sagas/SnipingModeSagas.ts index d56a26581a..f8f25050cb 100644 --- a/app/client/src/sagas/SnipingModeSagas.ts +++ b/app/client/src/sagas/SnipingModeSagas.ts @@ -10,8 +10,7 @@ import { setWidgetDynamicProperty, updateWidgetPropertyRequest, } from "actions/controlActions"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { diff --git a/app/client/src/sagas/TemplatesSagas.ts b/app/client/src/sagas/TemplatesSagas.ts index ccdf84d3dc..06f398db7f 100644 --- a/app/client/src/sagas/TemplatesSagas.ts +++ b/app/client/src/sagas/TemplatesSagas.ts @@ -33,8 +33,7 @@ import { } from "actions/pluginActionActions"; import { fetchJSCollections } from "actions/jsActionActions"; import { failFastApiCalls } from "./InitSagas"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { fetchDatasources } from "actions/datasourceActions"; import { fetchPluginFormConfigs } from "actions/pluginActions"; import { fetchAllPageEntityCompletion, saveLayout } from "actions/pageActions"; diff --git a/app/client/src/sagas/WebsocketSagas/handleAppLevelSocketEvents.tsx b/app/client/src/sagas/WebsocketSagas/handleAppLevelSocketEvents.tsx index 794c63b312..ab7559e76f 100644 --- a/app/client/src/sagas/WebsocketSagas/handleAppLevelSocketEvents.tsx +++ b/app/client/src/sagas/WebsocketSagas/handleAppLevelSocketEvents.tsx @@ -2,12 +2,11 @@ import { put } from "redux-saga/effects"; import { APP_LEVEL_SOCKET_EVENTS } from "./socketEvents"; import { collabSetAppEditors } from "actions/appCollabActions"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { createMessage, INFO_VERSION_MISMATCH_FOUND_RELOAD_REQUEST, } from "@appsmith/constants/messages"; -import { Variant } from "components/ads/common"; import React from "react"; import { getAppsmithConfigs } from "@appsmith/configs"; diff --git a/app/client/src/sagas/WidgetBlueprintSagas.ts b/app/client/src/sagas/WidgetBlueprintSagas.ts index de61d4bd73..2b344c0f97 100644 --- a/app/client/src/sagas/WidgetBlueprintSagas.ts +++ b/app/client/src/sagas/WidgetBlueprintSagas.ts @@ -10,8 +10,7 @@ import { MAIN_CONTAINER_WIDGET_ID, WidgetType, } from "constants/WidgetConstants"; -import { Variant } from "components/ads/common"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { BlueprintOperationTypes } from "widgets/constants"; import * as log from "loglevel"; diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx index 1409d02623..0b61a6b4f9 100644 --- a/app/client/src/sagas/WidgetOperationSagas.tsx +++ b/app/client/src/sagas/WidgetOperationSagas.tsx @@ -62,8 +62,7 @@ import { selectMultipleWidgetsInitAction } from "actions/widgetSelectionActions" import { getDataTree } from "selectors/dataTreeSelectors"; import { validateProperty } from "./EvaluationsSaga"; -import { Toaster } from "design-system"; -import { Variant } from "components/ads/common"; +import { Toaster, Variant } from "design-system"; import { ColumnProperties } from "widgets/TableWidget/component/Constants"; import { getAllPathsFromPropertyConfig, diff --git a/app/client/src/sagas/WidgetSelectionSagas.ts b/app/client/src/sagas/WidgetSelectionSagas.ts index 9f7b6278e8..89e09c473e 100644 --- a/app/client/src/sagas/WidgetSelectionSagas.ts +++ b/app/client/src/sagas/WidgetSelectionSagas.ts @@ -18,12 +18,11 @@ import { selectWidgetInitAction, silentAddSelectionsAction, } from "actions/widgetSelectionActions"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { createMessage, SELECT_ALL_WIDGETS_MSG, } from "@appsmith/constants/messages"; -import { Variant } from "components/ads/common"; import { getLastSelectedWidget, getSelectedWidgets } from "selectors/ui"; import { CanvasWidgetsReduxState, diff --git a/app/client/src/sagas/helper.ts b/app/client/src/sagas/helper.ts index f6ef759575..e45163f0b1 100644 --- a/app/client/src/sagas/helper.ts +++ b/app/client/src/sagas/helper.ts @@ -1,6 +1,5 @@ -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import { createMessage } from "ce/constants/messages"; -import { Variant } from "components/ads"; import { LayoutOnLoadActionErrors } from "constants/AppsmithActionConstants/ActionConstants"; import { FormEvalOutput, diff --git a/app/client/src/utils/localStorage.tsx b/app/client/src/utils/localStorage.tsx index 3c10b219ff..8b2bd76090 100644 --- a/app/client/src/utils/localStorage.tsx +++ b/app/client/src/utils/localStorage.tsx @@ -1,5 +1,4 @@ -import { Variant } from "components/ads/common"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import * as log from "loglevel"; import { LOCAL_STORAGE_QUOTA_EXCEEDED_MESSAGE, diff --git a/app/client/src/widgets/AudioRecorderWidget/component/index.tsx b/app/client/src/widgets/AudioRecorderWidget/component/index.tsx index 69e796b76c..f7e271ebaa 100644 --- a/app/client/src/widgets/AudioRecorderWidget/component/index.tsx +++ b/app/client/src/widgets/AudioRecorderWidget/component/index.tsx @@ -10,9 +10,9 @@ import { ReactComponent as RecorderPauseIcon } from "assets/icons/widget/recorde import { ReactComponent as RecorderCompleteIcon } from "assets/icons/widget/recorder/recorder_complete.svg"; import { ReactComponent as RecorderNoPermissionIcon } from "assets/icons/widget/recorder/recorder_no_permission.svg"; import { WIDGET_PADDING } from "constants/WidgetConstants"; -import { ThemeProp } from "components/ads/common"; import { darkenHover } from "constants/DefaultTheme"; import { Colors } from "constants/Colors"; +import { ThemeProp } from "widgets/constants"; export enum RecorderStatusTypes { PERMISSION_PROMPT = "PERMISSION_PROMPT", diff --git a/app/client/src/widgets/ButtonGroupWidget/component/index.tsx b/app/client/src/widgets/ButtonGroupWidget/component/index.tsx index 8db97c680d..654764d2a1 100644 --- a/app/client/src/widgets/ButtonGroupWidget/component/index.tsx +++ b/app/client/src/widgets/ButtonGroupWidget/component/index.tsx @@ -18,7 +18,6 @@ import { ButtonVariantTypes, ButtonPlacement, } from "components/constants"; -import { ThemeProp } from "components/ads/common"; import styled, { createGlobalStyle } from "styled-components"; import { getCustomBackgroundColor, @@ -30,6 +29,7 @@ import { RenderMode, RenderModes } from "constants/WidgetConstants"; import { DragContainer } from "widgets/ButtonWidget/component/DragContainer"; import { buttonHoverActiveStyles } from "../../ButtonWidget/component/utils"; import { THEMEING_TEXT_SIZES } from "constants/ThemeConstants"; +import { ThemeProp } from "widgets/constants"; // Utility functions interface ButtonData { @@ -230,7 +230,7 @@ const StyledButton = styled.button` "1px solid var(--wds-color-border-disabled)"} !important; background: ${buttonVariant !== ButtonVariantTypes.TERTIARY && "var(--wds-color-bg-disabled)"} !important; - + span { color: var(--wds-color-text-disabled) !important; } diff --git a/app/client/src/widgets/ButtonWidget/component/index.tsx b/app/client/src/widgets/ButtonWidget/component/index.tsx index 3471b9c803..d186cc302a 100644 --- a/app/client/src/widgets/ButtonWidget/component/index.tsx +++ b/app/client/src/widgets/ButtonWidget/component/index.tsx @@ -20,8 +20,7 @@ import { GOOGLE_RECAPTCHA_DOMAIN_ERROR, createMessage, } from "@appsmith/constants/messages"; -import { ThemeProp, Variant } from "components/ads/common"; -import { Toaster } from "design-system"; +import { Toaster, Variant } from "design-system"; import ReCAPTCHA from "react-google-recaptcha"; import { Colors } from "constants/Colors"; @@ -42,6 +41,7 @@ import { } from "widgets/WidgetUtils"; import { DragContainer } from "./DragContainer"; import { buttonHoverActiveStyles } from "./utils"; +import { ThemeProp } from "widgets/constants"; const RecaptchaWrapper = styled.div` position: relative; diff --git a/app/client/src/widgets/CameraWidget/component/index.tsx b/app/client/src/widgets/CameraWidget/component/index.tsx index e75dc586dc..00b4484f6c 100644 --- a/app/client/src/widgets/CameraWidget/component/index.tsx +++ b/app/client/src/widgets/CameraWidget/component/index.tsx @@ -18,7 +18,6 @@ import { import log from "loglevel"; import { useIsMobileDevice } from "utils/hooks/useDeviceDetect"; -import { ThemeProp } from "components/ads/common"; import { ButtonBorderRadius, ButtonBorderRadiusTypes, @@ -53,6 +52,7 @@ import { ReactComponent as MicrophoneIcon } from "assets/icons/widget/camera/mic import { ReactComponent as MicrophoneMutedIcon } from "assets/icons/widget/camera/microphone-muted.svg"; import { ReactComponent as FullScreenIcon } from "assets/icons/widget/camera/fullscreen.svg"; import { ReactComponent as ExitFullScreenIcon } from "assets/icons/widget/camera/exit-fullscreen.svg"; +import { ThemeProp } from "widgets/constants"; const overlayerMixin = css` position: absolute; diff --git a/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx b/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx index 261f047e55..e0c35f78ff 100644 --- a/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx +++ b/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx @@ -4,7 +4,6 @@ import { Alignment } from "@blueprintjs/core"; import { Classes } from "@blueprintjs/core"; import { ComponentProps } from "widgets/BaseComponent"; -import { ThemeProp } from "components/ads/common"; import { generateReactKey } from "utils/generators"; import { Colors } from "constants/Colors"; import { LabelPosition } from "components/constants"; @@ -22,7 +21,7 @@ import { labelLayoutStyles, LABEL_CONTAINER_CLASS, } from "design-system"; -import { AlignWidgetTypes } from "widgets/constants"; +import { ThemeProp, AlignWidgetTypes } from "widgets/constants"; export interface InputContainerProps { inline?: boolean; diff --git a/app/client/src/widgets/IconButtonWidget/component/index.tsx b/app/client/src/widgets/IconButtonWidget/component/index.tsx index 76fee55867..e992019f0a 100644 --- a/app/client/src/widgets/IconButtonWidget/component/index.tsx +++ b/app/client/src/widgets/IconButtonWidget/component/index.tsx @@ -4,7 +4,6 @@ import { Button, Position } from "@blueprintjs/core"; import { IconName } from "@blueprintjs/icons"; import { ComponentProps } from "widgets/BaseComponent"; -import { ThemeProp } from "components/ads/common"; import { RenderMode, RenderModes, @@ -25,6 +24,7 @@ import { import { createGlobalStyle } from "constants/DefaultTheme"; import Interweave from "interweave"; import { Popover2 } from "@blueprintjs/popover2"; +import { ThemeProp } from "widgets/constants"; const ToolTipWrapper = styled.div` height: 100%; diff --git a/app/client/src/widgets/MenuButtonWidget/component/index.tsx b/app/client/src/widgets/MenuButtonWidget/component/index.tsx index b199e5264f..c7fb21a8aa 100644 --- a/app/client/src/widgets/MenuButtonWidget/component/index.tsx +++ b/app/client/src/widgets/MenuButtonWidget/component/index.tsx @@ -19,7 +19,6 @@ import { ButtonVariant, ButtonVariantTypes, } from "components/constants"; -import { ThemeProp } from "components/ads/common"; import { getCustomBackgroundColor, getCustomBorderColor, @@ -34,6 +33,7 @@ import orderBy from "lodash/orderBy"; import { RenderMode } from "constants/WidgetConstants"; import { DragContainer } from "widgets/ButtonWidget/component/DragContainer"; import { THEMEING_TEXT_SIZES } from "constants/ThemeConstants"; +import { ThemeProp } from "widgets/constants"; const PopoverStyles = createGlobalStyle<{ parentWidth: number; @@ -133,7 +133,7 @@ const BaseButton = styled(Button)` : "transparent" } !important; color: var(--wds-color-text-disabled) !important; - + span { color: var(--wds-color-text-disabled) !important; } diff --git a/app/client/src/widgets/SwitchGroupWidget/component/index.tsx b/app/client/src/widgets/SwitchGroupWidget/component/index.tsx index e79f804059..4091e4b905 100644 --- a/app/client/src/widgets/SwitchGroupWidget/component/index.tsx +++ b/app/client/src/widgets/SwitchGroupWidget/component/index.tsx @@ -2,7 +2,6 @@ import React from "react"; import styled from "styled-components"; import { Alignment } from "@blueprintjs/core"; -import { ThemeProp } from "components/ads/common"; import { BlueprintRadioSwitchGroupTransform } from "constants/DefaultTheme"; import { LabelPosition } from "components/constants"; import { TextSize } from "constants/WidgetConstants"; @@ -12,6 +11,7 @@ import { LABEL_CONTAINER_CLASS, } from "design-system"; import { StyledSwitch } from "widgets/SwitchWidget/component"; +import { ThemeProp } from "widgets/constants"; export interface SwitchGroupContainerProps { compactMode: boolean; diff --git a/app/client/src/widgets/TableWidget/component/components/menuButtonTableComponent.tsx b/app/client/src/widgets/TableWidget/component/components/menuButtonTableComponent.tsx index 02815715af..a9e2edeb99 100644 --- a/app/client/src/widgets/TableWidget/component/components/menuButtonTableComponent.tsx +++ b/app/client/src/widgets/TableWidget/component/components/menuButtonTableComponent.tsx @@ -19,12 +19,12 @@ import { getComplementaryGrayscaleColor, } from "widgets/WidgetUtils"; import { darkenActive, darkenHover } from "constants/DefaultTheme"; -import { ThemeProp } from "components/ads/common"; import { ButtonVariant, ButtonVariantTypes } from "components/constants"; import { MenuItems } from "../Constants"; import tinycolor from "tinycolor2"; import { Colors } from "constants/Colors"; import orderBy from "lodash/orderBy"; +import { ThemeProp } from "widgets/constants"; const MenuButtonContainer = styled.div` width: 100%; diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/menuButtonTableComponent.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/menuButtonTableComponent.tsx index 375d4f2b64..9cfe818778 100644 --- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/menuButtonTableComponent.tsx +++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/menuButtonTableComponent.tsx @@ -19,7 +19,6 @@ import { getComplementaryGrayscaleColor, } from "widgets/WidgetUtils"; import { darkenActive, darkenHover } from "constants/DefaultTheme"; -import { ThemeProp } from "components/ads/common"; import { ButtonVariant, ButtonVariantTypes } from "components/constants"; import { MenuItems } from "../Constants"; import tinycolor from "tinycolor2"; @@ -29,6 +28,7 @@ import { getBooleanPropertyValue, getPropertyValue, } from "widgets/TableWidgetV2/widget/utilities"; +import { ThemeProp } from "widgets/constants"; const MenuButtonContainer = styled.div` width: 100%; diff --git a/app/client/src/widgets/constants.ts b/app/client/src/widgets/constants.ts index afeac564da..d277d9e4e9 100644 --- a/app/client/src/widgets/constants.ts +++ b/app/client/src/widgets/constants.ts @@ -1,6 +1,7 @@ import { IconNames } from "@blueprintjs/icons"; import { PropertyPaneConfig } from "constants/PropertyControlConstants"; import { WIDGET_STATIC_PROPS } from "constants/WidgetConstants"; +import { Theme } from "constants/DefaultTheme"; import { omit } from "lodash"; import { WidgetConfigProps } from "reducers/entityReducers/widgetConfigReducer"; import { DerivedPropertiesMap } from "utils/WidgetFactory"; @@ -264,3 +265,7 @@ export const dateFormatOptions = [ value: "MM/DD/YY", }, ]; + +export type ThemeProp = { + theme: Theme; +}; diff --git a/app/client/yarn.lock b/app/client/yarn.lock index 55573303a8..787de2b355 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -6211,10 +6211,10 @@ depd@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" -"design-system@npm:@appsmithorg/design-system@1.0.29": - version "1.0.29" - resolved "https://registry.yarnpkg.com/@appsmithorg/design-system/-/design-system-1.0.29.tgz#a6a661d43facb934fba4974c01466d64e41e5b92" - integrity sha512-cWVP9/HRO3BmewK4TGNxmIc4kEqemxW/FLiCTIf9vi42cSx9VIne0BCYbV6iLLYVeAFJlXcdTUdHhbp8PNma1Q== +"design-system@npm:@appsmithorg/design-system@1.0.28-alpha.7": + version "1.0.28-alpha.7" + resolved "https://registry.yarnpkg.com/@appsmithorg/design-system/-/design-system-1.0.28-alpha.7.tgz#ca893d48dd0aea5bb15ea2011bd4644858c87dc9" + integrity sha512-FnwOYzxFyS4Pnyy6w5ahEZ3aadrT2zbZ82DKsLpD1P9+HtjvcXGyg95R7NleiJcEifqeZtEGGw5DnYyphBYhZA== dependencies: "@blueprintjs/datetime" "3.23.6" copy-to-clipboard "^3.3.1" diff --git a/contributions/AppsmithWidgetDevelopmentGuide.md b/contributions/AppsmithWidgetDevelopmentGuide.md index 3e7e970b60..0b00ba38c2 100644 --- a/contributions/AppsmithWidgetDevelopmentGuide.md +++ b/contributions/AppsmithWidgetDevelopmentGuide.md @@ -74,7 +74,7 @@ Widget code resides in the `src/widgets` folder of the Appsmith codebase. Each w - This file contains the configuration for a widget. -`constants.ts` +`constants.tsx` - This file contains the constants which will be used in the widget and its components.