Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'release' of github.com:appsmithorg/appsmith into release

Browse Source
This commit is contained in:
Nikhil Nandagopal 2020-09-03 13:38:27 +05:30
commit c66aa1fa7d
14 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/client/src/components/ads/EditableText.tsx
View File

@ -223,7 +223,9 @@ export const EditableText = (props: EditableTextProps) => {
}; };
const iconName = const iconName =
!isEditing && savingState.name === SavingState.NOT_STARTED !isEditing &&
savingState.name === SavingState.NOT_STARTED &&
!props.hideEditIcon
? "edit" ? "edit"
: !isEditing && savingState.name === SavingState.SUCCESS : !isEditing && savingState.name === SavingState.SUCCESS
? "success" ? "success"

7
app/client/src/components/ads/common.tsx
View File

@ -1,4 +1,5 @@
import { Theme } from "constants/DefaultTheme"; import { Theme } from "constants/DefaultTheme";
import styled from "styled-components";
export interface CommonComponentProps { export interface CommonComponentProps {
isLoading?: boolean; //default false isLoading?: boolean; //default false
@ -40,3 +41,9 @@ export const hexToRgba = (color: string, alpha: number) => {
const value = hexToRgb(color); const value = hexToRgb(color);
return `rgba(${value.r}, ${value.g}, ${value.b}, ${alpha});`; return `rgba(${value.r}, ${value.g}, ${value.b}, ${alpha});`;
}; };
export const StoryWrapper = styled.div`
background: #1a191c;
height: 700px;
padding: 50px 100px;
`;

2
app/client/src/components/stories/Button.stories.tsx
View File

@ -2,7 +2,7 @@ import React from "react";
import Button, { Size, Category, Variant } from "components/ads/Button"; import Button, { Size, Category, Variant } from "components/ads/Button";
import { withKnobs, select, boolean, text } from "@storybook/addon-knobs"; import { withKnobs, select, boolean, text } from "@storybook/addon-knobs";
import { withDesign } from "storybook-addon-designs"; import { withDesign } from "storybook-addon-designs";
import { StoryWrapper } from "./Tabs.stories"; import { StoryWrapper } from "components/ads/common";
import { IconCollection } from "components/ads/Icon"; import { IconCollection } from "components/ads/Icon";
export default { export default {

2
app/client/src/components/stories/ColorSelector.stories.tsx
View File

@ -3,7 +3,7 @@ import { action } from "@storybook/addon-actions";
import ColorSelector, { appColorPalette } from "components/ads/ColorSelector"; import ColorSelector, { appColorPalette } from "components/ads/ColorSelector";
import { withKnobs, array, boolean } from "@storybook/addon-knobs"; import { withKnobs, array, boolean } from "@storybook/addon-knobs";
import { withDesign } from "storybook-addon-designs"; import { withDesign } from "storybook-addon-designs";
import { StoryWrapper } from "./Tabs.stories"; import { StoryWrapper } from "components/ads/common";
export default { export default {
title: "ColorSelector", title: "ColorSelector",

2
app/client/src/components/stories/Dropdown.stories.tsx
View File

@ -4,7 +4,7 @@ import { withDesign } from "storybook-addon-designs";
import Dropdown from "components/ads/Dropdown"; import Dropdown from "components/ads/Dropdown";
import { action } from "@storybook/addon-actions"; import { action } from "@storybook/addon-actions";
import { IconCollection } from "components/ads/Icon"; import { IconCollection } from "components/ads/Icon";
import { StoryWrapper } from "./Tabs.stories"; import { StoryWrapper } from "components/ads/common";
export default { export default {
title: "Dropdown", title: "Dropdown",

2
app/client/src/components/stories/EditableText.stories.tsx
View File

@ -7,7 +7,7 @@ import EditableText, {
SavingState, SavingState,
} from "components/ads/EditableText"; } from "components/ads/EditableText";
import { action } from "@storybook/addon-actions"; import { action } from "@storybook/addon-actions";
import { StoryWrapper } from "./Tabs.stories"; import { StoryWrapper } from "components/ads/common";
export default { export default {
title: "EditableText", title: "EditableText",

2
app/client/src/components/stories/Icon.stories.tsx
View File

@ -4,7 +4,7 @@ import Button, { Size, Category, Variant } from "components/ads/Button";
import { withKnobs, select, boolean } from "@storybook/addon-knobs"; import { withKnobs, select, boolean } from "@storybook/addon-knobs";
import { withDesign } from "storybook-addon-designs"; import { withDesign } from "storybook-addon-designs";
import AppIcon, { AppIconCollection } from "components/ads/AppIcon"; import AppIcon, { AppIconCollection } from "components/ads/AppIcon";
import { StoryWrapper } from "./Tabs.stories"; import { StoryWrapper } from "components/ads/common";
export default { export default {
title: "Icon", title: "Icon",

2
app/client/src/components/stories/IconSelector.stories.tsx
View File

@ -4,7 +4,7 @@ import { withDesign } from "storybook-addon-designs";
import IconSelector from "components/ads/IconSelector"; import IconSelector from "components/ads/IconSelector";
import { action } from "@storybook/addon-actions"; import { action } from "@storybook/addon-actions";
import { AppIconCollection } from "components/ads/AppIcon"; import { AppIconCollection } from "components/ads/AppIcon";
import { StoryWrapper } from "./Tabs.stories"; import { StoryWrapper } from "components/ads/common";
export default { export default {
title: "IconSelector", title: "IconSelector",

2
app/client/src/components/stories/SearchInput.stories.tsx
View File

@ -2,7 +2,7 @@ import React from "react";
import { withKnobs, boolean, text, select } from "@storybook/addon-knobs"; import { withKnobs, boolean, text, select } from "@storybook/addon-knobs";
import { action } from "@storybook/addon-actions"; import { action } from "@storybook/addon-actions";
import SearchInput, { SearchVariant } from "components/ads/SearchInput"; import SearchInput, { SearchVariant } from "components/ads/SearchInput";
import { StoryWrapper } from "./Tabs.stories"; import { StoryWrapper } from "components/ads/common";
export default { export default {
title: "Search Input", title: "Search Input",

2
app/client/src/components/stories/Table.stories.tsx
View File

@ -4,7 +4,7 @@ import Button, { Category, Variant, Size } from "components/ads/Button";
import Icon, { IconSize } from "components/ads/Icon"; import Icon, { IconSize } from "components/ads/Icon";
import TableDropdown from "components/ads/TableDropdown"; import TableDropdown from "components/ads/TableDropdown";
import { Position } from "@blueprintjs/core/lib/esm/common/position"; import { Position } from "@blueprintjs/core/lib/esm/common/position";
import { StoryWrapper } from "./Tabs.stories"; import { StoryWrapper } from "components/ads/common";
export default { export default {
title: "Table", title: "Table",

2
app/client/src/components/stories/TableDropdown.stories.tsx
View File

@ -3,7 +3,7 @@ import { withKnobs, select } from "@storybook/addon-knobs";
import { withDesign } from "storybook-addon-designs"; import { withDesign } from "storybook-addon-designs";
import TableDropdown from "components/ads/TableDropdown"; import TableDropdown from "components/ads/TableDropdown";
import { Position } from "@blueprintjs/core/lib/esm/common/position"; import { Position } from "@blueprintjs/core/lib/esm/common/position";
import { StoryWrapper } from "./Tabs.stories"; import { StoryWrapper } from "components/ads/common";
export default { export default {
title: "Dropdown", title: "Dropdown",

8
app/client/src/components/stories/Tabs.stories.tsx
View File

@ -3,7 +3,7 @@ import { TabComponent, TabProp } from "components/ads/Tabs";
import { select, text, withKnobs } from "@storybook/addon-knobs"; import { select, text, withKnobs } from "@storybook/addon-knobs";
import { withDesign } from "storybook-addon-designs"; import { withDesign } from "storybook-addon-designs";
import { IconCollection } from "components/ads/Icon"; import { IconCollection } from "components/ads/Icon";
import styled from "styled-components"; import { StoryWrapper } from "components/ads/common";
export default { export default {
title: "Tabs", title: "Tabs",
@ -97,9 +97,3 @@ export const Tabs = () => (
title4={text("Title 4", "")} title4={text("Title 4", "")}
/> />
); );
export const StoryWrapper = styled.div`
background: #1a191c;
height: 700px;
padding: 50px 100px;
`;

2
app/client/src/components/stories/Text.stories.tsx
View File

@ -2,7 +2,7 @@ import React from "react";
import { boolean, select, text, withKnobs } from "@storybook/addon-knobs"; import { boolean, select, text, withKnobs } from "@storybook/addon-knobs";
import Text, { TextType, Case, FontWeight } from "components/ads/Text"; import Text, { TextType, Case, FontWeight } from "components/ads/Text";
import styled from "styled-components"; import styled from "styled-components";
import { StoryWrapper } from "./Tabs.stories"; import { StoryWrapper } from "components/ads/common";
export default { export default {
title: "Text", title: "Text",

2
app/client/src/components/stories/TextInput.stories.tsx
View File

@ -2,7 +2,7 @@ import React from "react";
import { withKnobs, boolean, text } from "@storybook/addon-knobs"; import { withKnobs, boolean, text } from "@storybook/addon-knobs";
import TextInput from "components/ads/TextInput"; import TextInput from "components/ads/TextInput";
import { action } from "@storybook/addon-actions"; import { action } from "@storybook/addon-actions";
import { StoryWrapper } from "./Tabs.stories"; import { StoryWrapper } from "components/ads/common";
export default { export default {
title: "Text Input", title: "Text Input",