chore: import common variables from design system (#17600)

* Delete CommonComponentProps, Classes, import them from design-system

* Delete Icon.test.tsx

* Remove color utils, add import from design-system

* Remove Variant, add import from design-system

* Remove unused toast parameters from common

* use design-system version 28-alpha-7

* Move ThemeProp from ads/common to widgets/constants

* fix import

* Delete index.ts

* feat: migrated form group from ads folder to design system repository (#17400)

* feat: migrated form group from ads folder to design system repo

* fix: formGroup label color fix

* DS version updated

* Updated Label Config

* chore: Flapdoodle version upgrade to 3.5.0 (#17609)

* chore: code split tenant API CE (#17596)

## Description

We shouldn't expose tenant config on CE , so on CE,  we should only return the necessary user permissions hard coded on the saga.

## Type of change

- New feature (non-breaking change which adds functionality)

## How Has This Been Tested?

- Manual

## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes

* chore: BaseAppsmithRepo code split (#17614)

* chore: Updating the tenant API to return the complete object instead of just the configuration (#17615)

* Fix sandbox iframe default setting (#17618)

* feat: upgrade hooks | audit logs (#17525)

* feat: Text Widget Reskinning (#17298)

* feat: Use truncate button color from theme

* fix: Update Truncate Button Color validation regex

* feat: Maintain Focus and Context Phase 1 (#16317)

* fix: update regex and test case for organisation website (#17612)

* chore: Add properties to analytics event (#17621)

* feat: enabled setTimeout/clearTimeout APIs (#17445)

* Update top contributors

* fix: ms sql default port updated to 1433 (#17342)

* fix: removed global style from design system dropdown component (#17392)

* bug: removed global style from design system dropdown component

* changed design system package version

* fix: Dropdown background fix - design system

* design-system - dropdown background color fix

* DS version updated

* chore: Fixing broken client build (#17634)

## Description

EE client build is broken due to not following proper code splitting strategy; one file in particularly didn't get split earlier and changes to that file broke the client build on EE.

This PR fixes the issues.

* Fix/16994 refactor common datatype handling (#17429)

* fix:Add array datatype to execute request

* feat: Consume and store type of array elements in Param class (#16994)

* Append param instead of clientDataType in varargs (#16994)

* Refactor common data type handling w.r.t newer structure (#16994)

This commit takes care of the following items:
- It minimizes the number of usage to the older stringToKnownDataTypeConverter method
- Modifies the existing test cases to conform to the newer structure
- Marks stringToKnownDataTypeConverter method as deprecated to discourage further use

* Remove comma delimited numbers from valid test cases (#16994)

* Fix extracting clientDataType from varargs in MySQL (#16994)

* Pass param as a dedicated parameter in json smart replacement (#16994)

* Remove varargs from json smart replacement method (#16994)

* Move BsonType to mongoplugin module (#16994)

* Introduce NullArrayType and refactor BsonType test cases (#16994)

* Add new test cases on numeric string with leading zero (#16994)

* Refactor test case name (#16994)

* Add comment on the ordering of Json and Bson types (#16994)

* Add comment on the ordering of Json and Bson types (#16994)

* Add NullArrayType in Postgres and introduce postgres-specific types (#16994)

* Add data type test cases for Postgres and change as per review comments (#16994)

Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>

* feat: Update invite modal submit when we have tabs in modal (#17608)

## Description

> Update invite modal submit when we have tabs in modal.

Fixes [#16741](https://github.com/appsmithorg/appsmith/issues/16741)

## Type of change

- New feature (non-breaking change which adds functionality)

## How Has This Been Tested?

> Tested it locally.

## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes

* feat: AST based entity refactor (#17434)

* task: AST based entity refactor

* implemented refactor logic

* jest cases with string manipulation using AST logic

* comments and indentation

* added evalVersion to request

* chore: Added feature flag for datasource environments (#17657)

chore: Added Feature flag for datasource environments

* chore: Corrected analytics event for instance setting events (#17622)

* Update top contributors

* Fix typo in cloud-hosting check and NPE from Segment (#17692)

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

* fix: remove file references on click of cancel button (#17664)

* fix: table does not show data issue fixed (#17459)

* chore: Add recommended indexes (#17704)

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

* chore: Added workspace details to user invite analytic event (#17644)

## Description

This PR adds the workspace details to user invite analytics event

## Type of change

- New feature (non-breaking change which adds functionality)

## How Has This Been Tested?

- Manually on local

## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes

* chore: Correct the toast font on windows (#17671)

* fix: JS option missing for Label Font Style in Input widget (#17631)

* fix: replace time based action to event based (#17586)

* fix: replace time based action to event based

- The delete datasource button was getting reset to it's original state after a static time of 2200ms
- Replaced this to reset on completion of deletion instead

* fix: removed unused functions

* fix: updated the condition to show confirm delete icon

* Updated Label Config

* test: Add cypress tests for template phase 2 (#17036)

Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>

* Change Segment CDN to our proxy (#17714)

* chore: Fixing prettier formatting for AnalyticsUtil.tsx

* chore: Adding base repository function to add user permissions to generic domain object (#17733)

## Description

Adding base function to set the user permissions for a user in any domain object. 

As part of this, we also add default permission group to the `SeedMongoData`. Without this fix, the JUnit tests go into an infinite loop. Also fixing the `ExampleWorkspaceClonerTest` file.

## Type of change

- Bug fix (non-breaking change which fixes an issue)

## How Has This Been Tested?

- JUnit

## Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes

* Update top contributors

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
Co-authored-by: Nidhi <nidhi@appsmith.com>
Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: f0c1s <anubhav@appsmith.com>
Co-authored-by: Dhruvik Neharia <dhruvik@appsmith.com>
Co-authored-by: Hetu Nandu <hetu@appsmith.com>
Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: arunvjn <32433245+arunvjn@users.noreply.github.com>
Co-authored-by: Appsmith Bot <74705725+appsmith-bot@users.noreply.github.com>
Co-authored-by: Vaibhav Tanwar <40293928+vaibh1297@users.noreply.github.com>
Co-authored-by: subratadeypappu <subrata@appsmith.com>
Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
Co-authored-by: Ankita Kinger <ankita@appsmith.com>
Co-authored-by: ChandanBalajiBP <104058110+ChandanBalajiBP@users.noreply.github.com>
Co-authored-by: Vishnu Gp <vishnu@appsmith.com>
Co-authored-by: Keyur Paralkar <keyur@appsmith.com>
Co-authored-by: sneha122 <sneha@appsmith.com>
Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com>
Co-authored-by: sanjus-robotic-studio <58104863+sanjus-robotic-studio@users.noreply.github.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com>
Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com>
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
Co-authored-by: Nidhi <nidhi@appsmith.com>
Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: f0c1s <anubhav@appsmith.com>
Co-authored-by: Dhruvik Neharia <dhruvik@appsmith.com>
Co-authored-by: Hetu Nandu <hetu@appsmith.com>
Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: arunvjn <32433245+arunvjn@users.noreply.github.com>
Co-authored-by: Appsmith Bot <74705725+appsmith-bot@users.noreply.github.com>
Co-authored-by: Vaibhav Tanwar <40293928+vaibh1297@users.noreply.github.com>
Co-authored-by: subratadeypappu <subrata@appsmith.com>
Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
Co-authored-by: Ankita Kinger <ankita@appsmith.com>
Co-authored-by: ChandanBalajiBP <104058110+ChandanBalajiBP@users.noreply.github.com>
Co-authored-by: Vishnu Gp <vishnu@appsmith.com>
Co-authored-by: Keyur Paralkar <keyur@appsmith.com>
Co-authored-by: sneha122 <sneha@appsmith.com>
Co-authored-by: sanjus-robotic-studio <58104863+sanjus-robotic-studio@users.noreply.github.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com>
Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
This commit is contained in:
Tanvi Bhakta 2022-10-31 06:54:47 +05:30 committed by GitHub
parent cc2c3eae69
commit ae76dc0aef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
126 changed files with 220 additions and 399 deletions

View File

@ -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",

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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,

View File

@ -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";

View File

@ -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";

View File

@ -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: <MagicLineIcon />,
},
{
name: "key",
input: ["key"],
actualIcon: <KeyIcon />,
},
].forEach(({ actualIcon, input, name }: any) => {
input.forEach((iconString: string) => {
it(`${name}: ${iconString}`, () => {
// render the icons
render(
<div data-testid="container">
<Icon
data-testid={"basically-a-span"}
fillColor={Colors.BLUE_BAYOUX}
name={iconString as typeof IconCollection[number]}
size={IconSize.XXL}
/>
{actualIcon}
</div>,
);
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);
});
});
});
});

View File

@ -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
);
};

View File

@ -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)<FormGroupProps>`
& {
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;

View File

@ -1 +0,0 @@
export * from "./common";

View File

@ -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,

View File

@ -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 {

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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,

View File

@ -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,

View File

@ -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";

View File

@ -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,

View File

@ -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";

View File

@ -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";

View File

@ -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 {

View File

@ -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";

View File

@ -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`

View File

@ -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",

View File

@ -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)<ThemeProp & INumericInputProps>`
&&& {

View File

@ -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;

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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};

View File

@ -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, {

View File

@ -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";

View File

@ -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,

View File

@ -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";

View File

@ -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`

View File

@ -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";

View File

@ -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,

View File

@ -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";

View File

@ -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 {

View File

@ -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;

View File

@ -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,

View File

@ -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;

View File

@ -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";

View File

@ -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 & {

View File

@ -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";

View File

@ -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 ----------

View File

@ -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";

View File

@ -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 {

View File

@ -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";

View File

@ -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 {

View File

@ -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)`

View File

@ -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`;

View File

@ -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 {

View File

@ -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";

View File

@ -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`

View File

@ -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;

View File

@ -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 {

View File

@ -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`

View File

@ -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 {

View File

@ -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%;

View File

@ -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;

View File

@ -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;

View File

@ -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,

View File

@ -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,

View File

@ -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;

View File

@ -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";

View File

@ -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,

View File

@ -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";

View File

@ -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;

View File

@ -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%);

View File

@ -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 {

View File

@ -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,

View File

@ -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,

View File

@ -1,6 +1,7 @@
import React from "react";
import { Classes, CommonComponentProps } from "components/ads/common";
import {
Classes,
CommonComponentProps,
Menu,
MenuDivider,
MenuItem,

View File

@ -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,

View File

@ -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`

View File

@ -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,

View File

@ -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";

View File

@ -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,

View File

@ -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")`

View File

@ -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";

View File

@ -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,

View File

@ -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,

View File

@ -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";

View File

@ -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";

View File

@ -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,

View File

@ -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,

View File

@ -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 {

View File

@ -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";

View File

@ -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";

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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,

Some files were not shown because too many files have changed in this diff Show More