PromucFlow_constructor/app/client/src/components/ads/Text.tsx
haojin111 9cfca0518f
feat: 9754 import work flow (#10453)
* updated import application modal design as v2

* updated import flow

* added title, description, uploadIcon on filepicker ads component for custom file picker

* adding modal of add credential for git import

* added "Git Import" modal

* added generating ssh key for importing flow

* fixed issue of merging

* chore: fix import

* chore: show old import modal based on feature flag

* seperated import api from connect

* added datasource list on reconnect credential modal

* chore: minor changes

* chore: move ssh keys to git sync reducer from applications reducer

* chore: minor fixes

* chore: fetch datasource config for import

* for pulling

* for review of displaying of datasource

* added reconnect datasources after git import

* fix: initialize datasource with default values

* fix: initialise redux for after updating datasource with default values

* fixed issue of git connection init when importing

* if there is a datasource config missing in import, reconnect modal should be opened

* updated logic for unconfigured datasources

* commented unnecessary code

* fixed issue of successful import

* updated import app error logic

* Add un-configured datasources to Import via file response

* Add test

* fix

* chore: refactors

* change per review

* fix: reset ssh keys / url

* Fix issue with newly created datasources not sent

* fix

* chore: minor updates

* chore: minor fix

* WIP

* added saas and rest api datasource form

* feat: fixes and updates for file import flow

* chore: close on upload

* Refactor logic ofr finding unconfigured datasources

* fix: minor fixes

* Fix issue with IsPartialImport

* fix

* Add PartialImport flag for ImportExport service

* refactoring of datasource editor form for both of importing app and editing app

* fixed collapse config

* Fix tests

* Handle redirection back to the /applications for oAuth type

* Show reconnect button on the datasources pages if the datasource configuration is skipped

* added analytic events for reconnecting datasource modal

* Fix the repo limit check for git import

* updated test of importing app from json as new work flow

* updated exported app json while testing automatically

* Add isImport flag for handling OAuth redirection in import flow

* WIP

* updated card UI for import from git title and message in import app modal

* chore: cleanup

* chore: lint

* fix: add is import query param to get token for oauth

* fix

* When the user imports the application there should not be any uncommitted changes displayed on the commit icon

* Add flag to identify OAuth redirection for git import

* Update the variable name

* refactoring reconnect datasource modal

* close git import modal when repo limit error responded

* fixed issue of restoring draft data of datasource form without save on reconnect datasource modal

* chore: update query

* updated query name of oauth redirection url

* Fix duplicate name issue in git import

* fixed rest api reconnect issue on reconnect modal

* init datasources and plugins after imported app, updated reconnect modal as new design

* added unconfigured datasource list logic when importing and updated rest api form delete button visible

* removed put default config of datasource and fixed issue on it

* Add logic to check isCOnfugred in datasource API

* Expose API to get un configured datasources for git import

* added fetch unconfigured datasource list api when redirecting form OAuth

* Remove sensitive fields from application json during export

* update put call response to check for datasourceConfig

* chore: use @appsmith for constants/messages

* chore: use download icon and Import for Importing application label

* chore: move import application text up a bit

* Fix bad merge

* chore: update skip to application tooltip text

* fixed tooltip content of skip to application CTA

* init values of datasource when importing

* updated ui of git import modal as figma design

* fixing padding issue of reconnect datasource modal

* fixed cursor issue on import app modal

* Fix issue with datasource config

* chore: make code compile

* chore: sort lines

* fixed save button issue of dbform on reconnecting modal

* fixed style of import application modal

* Fix iisue with wrong value updated to flag

* reverted from reconnection form style

* fix: update design as per slack discussions on 2022.02.23

* fix: move modal close button to the left

* Remove check for the flag and use the one from db

* Set siCOnfigured as true for mockdata sets

* updated creating datasource with isConfigured as false

* Fix NPE while importing

* fixed scrollbar issue and text alignment on reconnect datasource modal

* fixed style of form container in reconnect datasource and redirecting to app if all are configured

* remove unwanted fields from application json

* FIx NPE for file import

* fix: move close button up in import modal

* remove delete button on reconnect datasource modal

* Add isConfigured false while creating datasources

* fix: add a gap and update color

gap between git import dialog title and subtitle
update color of subtext to GREY_800

* fix: use git import feature flag

* fix: do not use older modal

* updated selecting logic of unconfigured datasource in reconnect modal

* cleanup: auto format

* cleanup: refactor react component

* cleanup: refactor some more

* cleanup: autoformat

* Fix reconnect flag for mockdatasource

* During git import set the isConfigured to false for datasources

* Remove decrypted field from the applicationJson file

* Remove decrypted field from the applicationJson file

* Add app slug to remote repo

* fixed cypress test related with git

* updated json while testing

* Changes per review

* Update the method name

* fixed cypress test related with git

* fixed migration cypress test

* set is configured field as true on tour app

* Fix issue with datasource creation for welcome tour

* fixed issue of replay_editor cypress test

Co-authored-by: Rishabh Saxena <rishabh@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: Anubhav <anubhav@appsmith.com>
Co-authored-by: f0c1s <iamanubhavsaini+git@gmail.com>
2022-03-17 15:58:54 +05:30

120 lines
2.8 KiB
TypeScript

import styled from "styled-components";
import { ThemeProp, Classes, CommonComponentProps } from "./common";
import { Theme } from "constants/DefaultTheme";
import { TypographyKeys } from "constants/typography";
export enum TextType {
P0 = "p0",
P1 = "p1",
P2 = "p2",
P3 = "p3",
P4 = "p4",
H1 = "h1",
H2 = "h2",
H3 = "h3",
H4 = "h4",
H5 = "h5",
H6 = "h6",
BUTTON_MEDIUM = "btnMedium",
BUTTON_SMALL = "btnSmall",
SIDE_HEAD = "sideHeading",
DANGER_HEADING = "dangerHeading",
}
export enum Case {
UPPERCASE = "uppercase",
LOWERCASE = "lowercase",
CAPITALIZE = "capitalize",
}
export enum FontWeight {
BOLD = "bold",
NORMAL = "normal",
}
export type TextProps = CommonComponentProps & {
type: TextType;
underline?: boolean;
italic?: boolean;
case?: Case;
weight?: FontWeight | string;
highlight?: boolean;
textAlign?: string;
color?: string;
};
const typeSelector = (props: TextProps & ThemeProp): string => {
let color = "";
switch (props.type) {
case TextType.P0:
color = props.theme.colors.text.normal;
break;
case TextType.P1:
color = props.theme.colors.text.normal;
break;
case TextType.P2:
color = props.theme.colors.text.normal;
break;
case TextType.P3:
color = props.theme.colors.text.normal;
break;
default:
color = props.theme.colors.text.heading;
break;
}
return color;
};
const getFontWeight = ({
theme,
type,
weight,
}: {
theme: Theme;
weight: string | undefined;
type: TypographyKeys;
}) => {
if (weight) {
switch (weight) {
case FontWeight.BOLD:
return theme.fontWeights[2];
case FontWeight.NORMAL:
return "normal";
default:
return weight;
}
} else {
return theme.typography[type].fontWeight;
}
};
const Text = styled.span.attrs((props: TextProps) => ({
className: props.className
? `${props.className} ${Classes.TEXT}`
: Classes.TEXT,
"data-cy": props.cypressSelector,
}))<TextProps>`
text-decoration: ${(props) => (props.underline ? "underline" : "unset")};
font-style: ${(props) => (props.italic ? "italic" : "normal")};
font-weight: ${(props) =>
getFontWeight({
theme: props.theme,
type: props.type,
weight: props.weight,
})};
font-size: ${(props) => props.theme.typography[props.type].fontSize}px;
line-height: ${(props) => props.theme.typography[props.type].lineHeight}px;
letter-spacing: ${(props) =>
props.theme.typography[props.type].letterSpacing}px;
color: ${(props) =>
props.highlight
? props.theme.colors.text.highlight
: props.color
? props.color
: typeSelector(props)};
text-transform: ${(props) => (props.case ? props.case : "none")};
text-align: ${(props) => (props.textAlign ? props.textAlign : "normal")};
`;
export default Text;