diff --git a/datahub-web-react/src/alchemy-components/theme/foundations/colors.ts b/datahub-web-react/src/alchemy-components/theme/foundations/colors.ts index 5eed2095ad..fba1cdbdb5 100644 --- a/datahub-web-react/src/alchemy-components/theme/foundations/colors.ts +++ b/datahub-web-react/src/alchemy-components/theme/foundations/colors.ts @@ -124,4 +124,9 @@ const colors = { }, }; +export const SUCCESS_COLOR_HEX = '#52C41A'; +export const FAILURE_COLOR_HEX = '#F5222D'; +export const WARNING_COLOR_HEX = '#FA8C16'; +export const ERROR_COLOR_HEX = '#FAAD14'; + export default colors; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary.tsx index 8eb6013d45..301cee4362 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary.tsx @@ -4,6 +4,8 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; +import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@components/theme/foundations/colors'; + import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const SummaryHeader = styled.div` @@ -40,9 +42,6 @@ type Props = { summary: TestsSummary; }; -const SUCCESS_COLOR_HEX = '#52C41A'; -const FAILURE_COLOR_HEX = '#F5222D'; - const getSummaryIcon = (summary: TestsSummary) => { if (summary.total === 0) { return ; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/testUtils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/testUtils.tsx index 0da8da7327..04f60877ab 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/testUtils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/testUtils.tsx @@ -1,6 +1,8 @@ import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons'; import React from 'react'; +import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@components/theme/foundations/colors'; + import { TestResultType } from '@types'; /** @@ -20,8 +22,6 @@ export const getResultText = (result: TestResultType) => { /** * Returns the display color assoociated with an TestResultType */ -const SUCCESS_COLOR_HEX = '#4db31b'; -const FAILURE_COLOR_HEX = '#F5222D'; export const getResultColor = (result: TestResultType) => { switch (result) { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline.tsx index 7c79625535..f2d6de3169 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline.tsx @@ -6,6 +6,8 @@ import { Bar } from '@visx/shape'; import { Maybe } from 'graphql/jsutils/Maybe'; import React, { useMemo } from 'react'; +import { ERROR_COLOR_HEX, FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@components/theme/foundations/colors'; + import { ANTD_GRAY } from '@app/entityV2/shared/constants'; import { LinkWrapper } from '@app/shared/LinkWrapper'; @@ -34,9 +36,6 @@ type Props = { width: number; }; -const SUCCESS_COLOR_HEX = '#52C41A'; -const FAILURE_COLOR_HEX = '#F5222D'; -const ERROR_COLOR_HEX = '#FAAD14'; const INIT_COLOR_HEX = '#8C8C8C'; const getFillColor = (type: AssertionResultType) => { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline.tsx index c90b207862..4718bd5dad 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline.tsx @@ -5,6 +5,8 @@ import { scaleUtc } from '@visx/scale'; import { Bar } from '@visx/shape'; import React, { useMemo } from 'react'; +import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@components/theme/foundations/colors'; + import { ANTD_GRAY } from '@app/entityV2/shared/constants'; export type BooleanResult = { @@ -30,9 +32,6 @@ type Props = { width: number; }; -const SUCCESS_COLOR_HEX = '#52C41A'; -const FAILURE_COLOR_HEX = '#F5222D'; - /** * True / false results displayed on a horizontal timeline. */ diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx index 9da493a974..3ef24da77b 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx @@ -4,6 +4,8 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; +import { ERROR_COLOR_HEX, FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@components/theme/foundations/colors'; + import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const SummaryHeader = styled.div` @@ -42,10 +44,6 @@ type Props = { summary: AssertionsSummary; }; -const SUCCESS_COLOR_HEX = '#52C41A'; -const FAILURE_COLOR_HEX = '#F5222D'; -const ERROR_COLOR_HEX = '#FAAD14'; - const getSummaryIcon = (summary: AssertionsSummary) => { if (summary.totalRuns === 0) { return ; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylUtils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylUtils.tsx index 0e54568be4..2e5e2c72e5 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylUtils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylUtils.tsx @@ -5,6 +5,8 @@ import * as moment from 'moment-timezone'; import React from 'react'; import styled from 'styled-components'; +import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX, WARNING_COLOR_HEX } from '@components/theme/foundations/colors'; + import { GenericEntityProperties } from '@app/entity/shared/types'; import { AssertionGroup, AssertionStatusSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylTypes'; import { sortAssertions } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; @@ -15,10 +17,6 @@ import { GetDatasetAssertionsWithRunEventsQuery } from '@src/graphql/dataset.gen import { Assertion, AssertionResultType, AssertionType, CronSchedule, EntityType } from '@types'; -export const SUCCESS_COLOR_HEX = '#52C41A'; -export const FAILURE_COLOR_HEX = '#F5222D'; -export const WARNING_COLOR_HEX = '#FA8C16'; - const StyledApiOutlined = styled(ApiOutlined)` && { margin: 0px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertionUtils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertionUtils.tsx index b29cbba9d3..735032d1c2 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertionUtils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertionUtils.tsx @@ -2,6 +2,8 @@ import { CheckCircleOutlined, CloseCircleOutlined, ExclamationCircleOutlined, St import QueryString from 'query-string'; import React from 'react'; +import { ERROR_COLOR_HEX, FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@components/theme/foundations/colors'; + // TODO import { ANTD_GRAY } from '@app/entityV2/shared/constants'; @@ -57,9 +59,6 @@ export const getResultText = (result: AssertionResultType) => { /** * Returns the display color associated with an AssertionResultType */ -const SUCCESS_COLOR_HEX = '#4db31b'; -const FAILURE_COLOR_HEX = '#F5222D'; -const ERROR_COLOR_HEX = '#FAAD14'; const INIT_COLOR_HEX = '#2F54EB'; const NO_RESULTS_COLOR_HEX = ANTD_GRAY[8]; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/utils.tsx index 46457a0bfc..9c227179e6 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/utils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/utils.tsx @@ -7,13 +7,10 @@ import { } from '@ant-design/icons'; import React from 'react'; +import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX, WARNING_COLOR_HEX } from '@components/theme/foundations/colors'; + import { ANTD_GRAY } from '@app/entityV2/shared/constants'; import { AssertionStatusSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylTypes'; -import { - FAILURE_COLOR_HEX, - SUCCESS_COLOR_HEX, - WARNING_COLOR_HEX, -} from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; import { DataContractCategoryType } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/builder/types'; import { Assertion, AssertionType, DataContract, DataContractState } from '@types'; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/styledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/styledComponents.tsx index 44f29ec1aa..9fb190f62f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/styledComponents.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/styledComponents.tsx @@ -1,12 +1,9 @@ import { CheckOutlined, ClockCircleOutlined, CloseOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; import styled from 'styled-components'; +import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX, WARNING_COLOR_HEX } from '@components/theme/foundations/colors'; + import { ANTD_GRAY } from '@app/entityV2/shared/constants'; -import { - FAILURE_COLOR_HEX, - SUCCESS_COLOR_HEX, - WARNING_COLOR_HEX, -} from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; export const StyledCheckOutlined = styled(CheckOutlined)` color: ${SUCCESS_COLOR_HEX};