diff --git a/datahub-web-react/.eslintignore b/datahub-web-react/.eslintignore index 4f78ca46e0..1551556d0e 100644 --- a/datahub-web-react/.eslintignore +++ b/datahub-web-react/.eslintignore @@ -2,3 +2,4 @@ dist/ build/ node_modules/ +**/*.generated.ts diff --git a/datahub-web-react/.eslintrc.js b/datahub-web-react/.eslintrc.js index d71d3915ab..d1697e09e8 100644 --- a/datahub-web-react/.eslintrc.js +++ b/datahub-web-react/.eslintrc.js @@ -8,7 +8,7 @@ module.exports = { 'plugin:vitest/recommended', 'prettier', ], - plugins: ['@typescript-eslint', '@stylistic/js', 'react-refresh'], + plugins: ['@typescript-eslint', '@stylistic/js', 'react-refresh', 'import-alias'], parserOptions: { ecmaVersion: 2020, // Allows for the parsing of modern ECMAScript features sourceType: 'module', // Allows for the use of imports @@ -23,6 +23,7 @@ module.exports = { 'arrow-body-style': 'off', 'class-methods-use-this': 'off', 'import/no-extraneous-dependencies': 'off', + 'import/no-relative-packages': 'error', 'import/prefer-default-export': 'off', // TODO: remove this lint rule 'no-console': 'off', 'no-plusplus': 'off', @@ -50,18 +51,36 @@ module.exports = { 'vitest/prefer-to-be': 'off', '@typescript-eslint/no-use-before-define': ['error', { functions: false, classes: false }], 'react-refresh/only-export-components': ['warn', { allowConstantExport: true }], + 'import-alias/import-alias': [ + 'error', + { + aliases: [ + // Must be kept consistent with tsconfig.json, vite.config.ts, and .prettierrc.js + { alias: '@components/', matcher: '^src/alchemy-components/' }, + { alias: '@app/', matcher: '^src/app/' }, + { alias: '@conf/', matcher: '^src/conf/' }, + { alias: '@graphql/', matcher: '^src/graphql/' }, + { alias: '@graphql-mock/', matcher: '^src/graphql-mock/' }, + { alias: '@images/', matcher: '^src/images/' }, + { alias: '@providers/', matcher: '^src/providers/' }, + { alias: '@utils/', matcher: '^src/utils/' }, + { alias: '@types', matcher: '^src/types.generated' }, + { alias: '@src/', matcher: '^src/' }, + ], + }, + ], }, settings: { react: { version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use }, }, - overrides: [ - { - files: ['src/app/searchV2/**/*.tsx', 'src/app/entityV2/**/*.tsx'], - rules: { - 'import/no-cycle': 'off', - }, - }, - ], + overrides: [ + { + files: ['src/app/searchV2/**/*.tsx', 'src/app/entityV2/**/*.tsx'], + rules: { + 'import/no-cycle': 'off', + }, + }, + ], }; diff --git a/datahub-web-react/.prettierrc.js b/datahub-web-react/.prettierrc.js index c8c6a54961..ebeebb58cb 100644 --- a/datahub-web-react/.prettierrc.js +++ b/datahub-web-react/.prettierrc.js @@ -4,4 +4,16 @@ module.exports = { singleQuote: true, printWidth: 120, tabWidth: 4, + plugins: ['@trivago/prettier-plugin-sort-imports'], + importOrder: [ + // Third party imports are first automatically, in their own group + '^@components/(.*)$', + // Have to specify all aliases otherwise they're considered third party + '^(@app|@conf|@providers|@utils|@src)/(.*)$', + '^(@graphql/|@graphql-mock/|@types)(.*)$', + '^@images/(.*)$', + '^[./]', + ], + importOrderSeparation: true, + importOrderSortSpecifiers: true, }; diff --git a/datahub-web-react/package.json b/datahub-web-react/package.json index afc7590859..2b6fc3fd05 100644 --- a/datahub-web-react/package.json +++ b/datahub-web-react/package.json @@ -110,7 +110,7 @@ "test-coverage": "yarn test run --coverage", "generate": "NODE_OPTIONS='--max-old-space-size=5120 --openssl-legacy-provider' graphql-codegen --config codegen.yml", "lint": "eslint . --ext .ts,.tsx --quiet && yarn format-check && yarn type-check", - "lint-fix": "eslint '*/**/*.{ts,tsx}' --quiet --fix && yarn format", + "lint-fix": "eslint . --ext .ts,.tsx --quiet --fix && yarn format", "format-check": "prettier --check src", "format": "prettier --write src", "type-check": "tsc --noEmit", @@ -146,6 +146,7 @@ "@storybook/test": "^8.1.11", "@storybook/theming": "^8.1.11", "@stylistic/eslint-plugin-js": "^3.1.0", + "@trivago/prettier-plugin-sort-imports": "^5.2.2", "@types/graphql": "^14.5.0", "@types/query-string": "^6.3.0", "@types/styled-components": "^5.1.7", @@ -158,6 +159,7 @@ "eslint-config-airbnb-typescript": "^17.0.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-import": "^2.25.3", + "eslint-plugin-import-alias": "^1.2.0", "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-react": "^7.28.0", "eslint-plugin-react-hooks": "^4.3.0", @@ -165,7 +167,7 @@ "eslint-plugin-vitest": "^0.3.17", "jsdom": "^22.1.0", "less": "^4.2.0", - "prettier": "^2.8.8", + "prettier": "^3.5.3", "source-map-explorer": "^2.5.2", "storybook": "^8.1.11", "vite": "^4.5.6", diff --git a/datahub-web-react/src/App.less b/datahub-web-react/src/App.less index 5837d77a5a..29bccb97f4 100644 --- a/datahub-web-react/src/App.less +++ b/datahub-web-react/src/App.less @@ -7,5 +7,7 @@ @font-face { font-family: 'Manrope'; font-style: normal; - src: local('Manrope'), url('./fonts/manrope.woff2') format('woff2'); + src: + local('Manrope'), + url('./fonts/manrope.woff2') format('woff2'); } diff --git a/datahub-web-react/src/App.test.tsx b/datahub-web-react/src/App.test.tsx index 8a391a3769..98c09b87e4 100644 --- a/datahub-web-react/src/App.test.tsx +++ b/datahub-web-react/src/App.test.tsx @@ -1,8 +1,9 @@ -import React from 'react'; -import { render } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; -import { InnerApp } from './App'; -import { mocks } from './Mocks'; +import { render } from '@testing-library/react'; +import React from 'react'; + +import { InnerApp } from '@src/App'; +import { mocks } from '@src/Mocks'; // eslint-disable-next-line vitest/expect-expect test('renders the app', async () => { diff --git a/datahub-web-react/src/App.tsx b/datahub-web-react/src/App.tsx index 9fef14b895..c9f4720284 100644 --- a/datahub-web-react/src/App.tsx +++ b/datahub-web-react/src/App.tsx @@ -1,19 +1,20 @@ -import React from 'react'; -import Cookies from 'js-cookie'; -import { BrowserRouter as Router } from 'react-router-dom'; -import { ApolloClient, ApolloProvider, createHttpLink, InMemoryCache, ServerError } from '@apollo/client'; +import { ApolloClient, ApolloProvider, InMemoryCache, ServerError, createHttpLink } from '@apollo/client'; import { onError } from '@apollo/client/link/error'; +import Cookies from 'js-cookie'; +import React from 'react'; import { Helmet, HelmetProvider } from 'react-helmet-async'; -import './App.less'; -import './AppV2.less'; -import { Routes } from './app/Routes'; -import { PageRoutes } from './conf/Global'; -import { isLoggedInVar } from './app/auth/checkAuthStatus'; -import { GlobalCfg } from './conf'; -import possibleTypesResult from './possibleTypes.generated'; -import { ErrorCodes } from './app/shared/constants'; -import CustomThemeProvider from './CustomThemeProvider'; -import { useCustomTheme } from './customThemeContext'; +import { BrowserRouter as Router } from 'react-router-dom'; + +import { Routes } from '@app/Routes'; +import { isLoggedInVar } from '@app/auth/checkAuthStatus'; +import { ErrorCodes } from '@app/shared/constants'; +import { PageRoutes } from '@conf/Global'; +import '@src/App.less'; +import '@src/AppV2.less'; +import CustomThemeProvider from '@src/CustomThemeProvider'; +import { GlobalCfg } from '@src/conf'; +import { useCustomTheme } from '@src/customThemeContext'; +import possibleTypesResult from '@src/possibleTypes.generated'; /* Construct Apollo Client diff --git a/datahub-web-react/src/AppConfigProvider.tsx b/datahub-web-react/src/AppConfigProvider.tsx index 928b8da562..fb98a76a90 100644 --- a/datahub-web-react/src/AppConfigProvider.tsx +++ b/datahub-web-react/src/AppConfigProvider.tsx @@ -1,9 +1,11 @@ import React, { useEffect } from 'react'; -import './App.less'; -import { THIRD_PARTY_LOGGING_KEY } from './app/analytics/analytics'; -import { checkAuthStatus } from './app/auth/checkAuthStatus'; -import { AppConfigContext, DEFAULT_APP_CONFIG } from './appConfigContext'; -import { useAppConfigQuery } from './graphql/app.generated'; + +import { THIRD_PARTY_LOGGING_KEY } from '@app/analytics/analytics'; +import { checkAuthStatus } from '@app/auth/checkAuthStatus'; +import '@src/App.less'; +import { AppConfigContext, DEFAULT_APP_CONFIG } from '@src/appConfigContext'; + +import { useAppConfigQuery } from '@graphql/app.generated'; function changeFavicon(src) { const links = document.querySelectorAll("link[rel~='icon']") as any; diff --git a/datahub-web-react/src/AppV2.less b/datahub-web-react/src/AppV2.less index 3980245cb4..f554d7132e 100644 --- a/datahub-web-react/src/AppV2.less +++ b/datahub-web-react/src/AppV2.less @@ -7,7 +7,9 @@ @font-face { font-family: 'Manrope'; font-style: normal; - src: local('Manrope'), url('./fonts/manrope.woff2') format('woff2'); + src: + local('Manrope'), + url('./fonts/manrope.woff2') format('woff2'); } @font-face { diff --git a/datahub-web-react/src/CustomThemeProvider.tsx b/datahub-web-react/src/CustomThemeProvider.tsx index 505c37d4c8..e0023923e5 100644 --- a/datahub-web-react/src/CustomThemeProvider.tsx +++ b/datahub-web-react/src/CustomThemeProvider.tsx @@ -1,8 +1,9 @@ import React, { useEffect, useState } from 'react'; import { ThemeProvider } from 'styled-components'; -import { Theme } from './conf/theme/types'; -import defaultThemeConfig from './conf/theme/theme_light.config.json'; -import { CustomThemeContext } from './customThemeContext'; + +import defaultThemeConfig from '@conf/theme/theme_light.config.json'; +import { Theme } from '@conf/theme/types'; +import { CustomThemeContext } from '@src/customThemeContext'; interface Props { children: React.ReactNode; diff --git a/datahub-web-react/src/Mocks.tsx b/datahub-web-react/src/Mocks.tsx index 554bbaaf7b..c57998c37e 100644 --- a/datahub-web-react/src/Mocks.tsx +++ b/datahub-web-react/src/Mocks.tsx @@ -1,64 +1,66 @@ import React from 'react'; -import { GetDatasetDocument, UpdateDatasetDocument, GetDatasetSchemaDocument } from './graphql/dataset.generated'; -import { GetDataFlowDocument } from './graphql/dataFlow.generated'; -import { GetDataJobDocument } from './graphql/dataJob.generated'; -import { GetBrowsePathsDocument, GetBrowseResultsDocument } from './graphql/browse.generated'; + +import { Entity } from '@app/entity/Entity'; +import { VIEW_ENTITY_PAGE } from '@app/entity/shared/constants'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { ViewBuilderState } from '@app/entity/view/types'; +import { EntityCapabilityType } from '@app/entityV2/Entity'; +import { FetchedEntity } from '@app/lineage/types'; +import { DEFAULT_APP_CONFIG } from '@src/appConfigContext'; + +import { AppConfigDocument, GetEntityCountsDocument } from '@graphql/app.generated'; +import { GetBrowsePathsDocument, GetBrowseResultsDocument } from '@graphql/browse.generated'; +import { GetDataFlowDocument } from '@graphql/dataFlow.generated'; +import { GetDataJobDocument } from '@graphql/dataJob.generated'; +import { GetDatasetDocument, GetDatasetSchemaDocument, UpdateDatasetDocument } from '@graphql/dataset.generated'; +import { GetGlossaryTermDocument, GetGlossaryTermQuery } from '@graphql/glossaryTerm.generated'; +import { GetMeDocument } from '@graphql/me.generated'; +import { GetMlModelDocument } from '@graphql/mlModel.generated'; +import { GetMlModelGroupDocument } from '@graphql/mlModelGroup.generated'; +import { GetGrantedPrivilegesDocument } from '@graphql/policy.generated'; +import { GetQuickFiltersDocument } from '@graphql/quickFilters.generated'; +import { ListRecommendationsDocument } from '@graphql/recommendations.generated'; import { - GetAutoCompleteResultsDocument, GetAutoCompleteMultipleResultsDocument, + GetAutoCompleteResultsDocument, GetSearchResultsDocument, - GetSearchResultsQuery, GetSearchResultsForMultipleDocument, GetSearchResultsForMultipleQuery, -} from './graphql/search.generated'; -import { GetUserDocument } from './graphql/user.generated'; + GetSearchResultsQuery, +} from '@graphql/search.generated'; +import { GetTagDocument } from '@graphql/tag.generated'; +import { GetUserDocument } from '@graphql/user.generated'; import { - Dataset, - DataFlow, - DataJob, - GlossaryTerm, - GlossaryNode, - EntityType, - PlatformType, - MlModel, - MlModelGroup, - SchemaFieldDataType, - ScenarioType, - RecommendationRenderType, - RelationshipDirection, - Container, - PlatformPrivileges, - FilterOperator, AppConfig, - EntityPrivileges, BusinessAttribute, - EntityRelationshipsResult, - Maybe, - SearchResult, - DataHubViewType, - LogicalOperator, + Container, + DataFlow, DataHubView, DataHubViewFilter, + DataHubViewType, + DataJob, + Dataset, + EntityPrivileges, + EntityRelationshipsResult, + EntityType, + FilterOperator, GlobalTags, - OwnershipType, + GlossaryNode, + GlossaryTerm, + LogicalOperator, + Maybe, + MlModel, + MlModelGroup, Owner, -} from './types.generated'; -import { GetTagDocument } from './graphql/tag.generated'; -import { GetMlModelDocument } from './graphql/mlModel.generated'; -import { GetMlModelGroupDocument } from './graphql/mlModelGroup.generated'; -import { GetGlossaryTermDocument, GetGlossaryTermQuery } from './graphql/glossaryTerm.generated'; -import { GetEntityCountsDocument, AppConfigDocument } from './graphql/app.generated'; -import { GetMeDocument } from './graphql/me.generated'; -import { ListRecommendationsDocument } from './graphql/recommendations.generated'; -import { FetchedEntity } from './app/lineage/types'; -import { DEFAULT_APP_CONFIG } from './appConfigContext'; -import { GetQuickFiltersDocument } from './graphql/quickFilters.generated'; -import { GetGrantedPrivilegesDocument } from './graphql/policy.generated'; -import { VIEW_ENTITY_PAGE } from './app/entity/shared/constants'; -import { Entity } from './app/entity/Entity'; -import { GenericEntityProperties } from './app/entity/shared/types'; -import { ViewBuilderState } from './app/entity/view/types'; -import { EntityCapabilityType } from './app/entityV2/Entity'; + OwnershipType, + PlatformPrivileges, + PlatformType, + RecommendationRenderType, + RelationshipDirection, + ScenarioType, + SchemaFieldDataType, + SearchResult, +} from '@types'; export const entityPrivileges: EntityPrivileges = { canEditLineage: true, diff --git a/datahub-web-react/src/alchemy-components/.docs/Icons.mdx b/datahub-web-react/src/alchemy-components/.docs/Icons.mdx index e3f6ab6846..917172952a 100644 --- a/datahub-web-react/src/alchemy-components/.docs/Icons.mdx +++ b/datahub-web-react/src/alchemy-components/.docs/Icons.mdx @@ -1,6 +1,7 @@ import { Meta, Source } from '@storybook/blocks'; import { AVAILABLE_ICONS } from '@components'; + import { IconGalleryWithSearch } from './mdx-components'; diff --git a/datahub-web-react/src/alchemy-components/.docs/Intro.mdx b/datahub-web-react/src/alchemy-components/.docs/Intro.mdx index f81d08059c..89a0b5c252 100644 --- a/datahub-web-react/src/alchemy-components/.docs/Intro.mdx +++ b/datahub-web-react/src/alchemy-components/.docs/Intro.mdx @@ -1,4 +1,5 @@ -import { Meta, Description } from '@storybook/blocks'; +import { Description, Meta } from '@storybook/blocks'; + import ReadMe from '../README.mdx'; diff --git a/datahub-web-react/src/alchemy-components/.docs/StyleGuide.mdx b/datahub-web-react/src/alchemy-components/.docs/StyleGuide.mdx index 7460c7e114..769c7e6040 100644 --- a/datahub-web-react/src/alchemy-components/.docs/StyleGuide.mdx +++ b/datahub-web-react/src/alchemy-components/.docs/StyleGuide.mdx @@ -1,18 +1,19 @@ import { Meta, Source } from '@storybook/blocks'; import { Heading } from '@components'; + import { colors } from '@components/theme'; -import { Grid, FlexGrid, ColorCard, CopyButton, Seperator } from './mdx-components'; +import { ColorCard, CopyButton, FlexGrid, Grid, Seperator } from './mdx-components'; import borderSource from '@components/theme/foundations/borders?raw'; import colorsSource from '@components/theme/foundations/colors?raw'; -import typographySource from '@components/theme/foundations/typography?raw'; import radiusSource from '@components/theme/foundations/radius?raw'; import shadowsSource from '@components/theme/foundations/shadows?raw'; import sizesSource from '@components/theme/foundations/sizes?raw'; import spacingSource from '@components/theme/foundations/spacing?raw'; import transitionSource from '@components/theme/foundations/transition?raw'; +import typographySource from '@components/theme/foundations/typography?raw'; import zIndexSource from '@components/theme/foundations/zIndex?raw'; diff --git a/datahub-web-react/src/alchemy-components/.docs/mdx-components/CodeBlock.tsx b/datahub-web-react/src/alchemy-components/.docs/mdx-components/CodeBlock.tsx index 43b9ebfae6..361acdb23d 100644 --- a/datahub-web-react/src/alchemy-components/.docs/mdx-components/CodeBlock.tsx +++ b/datahub-web-react/src/alchemy-components/.docs/mdx-components/CodeBlock.tsx @@ -1,7 +1,6 @@ +import { DocsContext, Source } from '@storybook/blocks'; import React from 'react'; -import { Source, DocsContext } from '@storybook/blocks'; - export const CodeBlock = () => { const context = React.useContext(DocsContext); diff --git a/datahub-web-react/src/alchemy-components/.docs/mdx-components/CopyButton.tsx b/datahub-web-react/src/alchemy-components/.docs/mdx-components/CopyButton.tsx index c81aa6ed44..bb8c3c8964 100644 --- a/datahub-web-react/src/alchemy-components/.docs/mdx-components/CopyButton.tsx +++ b/datahub-web-react/src/alchemy-components/.docs/mdx-components/CopyButton.tsx @@ -1,6 +1,6 @@ +import { Button, Icon } from '@components'; import React from 'react'; -import { Button, Icon } from '@components'; import { copyToClipboard } from './utils'; interface Props { diff --git a/datahub-web-react/src/alchemy-components/.docs/mdx-components/GridList.tsx b/datahub-web-react/src/alchemy-components/.docs/mdx-components/GridList.tsx index 5cb4bd27e5..97616a2977 100644 --- a/datahub-web-react/src/alchemy-components/.docs/mdx-components/GridList.tsx +++ b/datahub-web-react/src/alchemy-components/.docs/mdx-components/GridList.tsx @@ -1,7 +1,6 @@ /* Docs Only Component that helps to display a list of components in a grid layout. */ - import React, { ReactNode } from 'react'; const styles = { diff --git a/datahub-web-react/src/alchemy-components/.docs/mdx-components/IconGalleryWithSearch.tsx b/datahub-web-react/src/alchemy-components/.docs/mdx-components/IconGalleryWithSearch.tsx index d8751509bd..5cfec1db95 100644 --- a/datahub-web-react/src/alchemy-components/.docs/mdx-components/IconGalleryWithSearch.tsx +++ b/datahub-web-react/src/alchemy-components/.docs/mdx-components/IconGalleryWithSearch.tsx @@ -1,7 +1,7 @@ +import { Button, ButtonProps, Icon } from '@components'; import React, { useState } from 'react'; -import { Icon, Button, ButtonProps } from '@components'; -import { IconGrid, IconGridItem, IconDisplayBlock } from './components'; +import { IconDisplayBlock, IconGrid, IconGridItem } from './components'; interface Props { icons: string[]; diff --git a/datahub-web-react/src/alchemy-components/.docs/mdx-components/components.ts b/datahub-web-react/src/alchemy-components/.docs/mdx-components/components.ts index 28d428493b..8db9acf698 100644 --- a/datahub-web-react/src/alchemy-components/.docs/mdx-components/components.ts +++ b/datahub-web-react/src/alchemy-components/.docs/mdx-components/components.ts @@ -1,7 +1,6 @@ /* Docs Only Components that helps to display information in info guides. */ - import styled from 'styled-components'; import theme from '@components/theme'; diff --git a/datahub-web-react/src/alchemy-components/README.mdx b/datahub-web-react/src/alchemy-components/README.mdx index a2e62b5ff2..99d8c44754 100644 --- a/datahub-web-react/src/alchemy-components/README.mdx +++ b/datahub-web-react/src/alchemy-components/README.mdx @@ -42,9 +42,9 @@ You can access the theme types at `@components/theme/types` and the theme config Our docs are generated using [Storybook](https://storybook.js.org/) and deployed to [Cloudfare](https://www.cloudflare.com/). -- Storybook config is located at `.storybook` -- Static doc files are located at `alchemy-components/.docs` -- Component stories are located in each component directory:
`alchemy-components/components/Component/Component.stories.tsx` +- Storybook config is located at `.storybook` +- Static doc files are located at `alchemy-components/.docs` +- Component stories are located in each component directory:
`alchemy-components/components/Component/Component.stories.tsx` Storybook serves as our playground for developing components. You can start it locally: @@ -58,16 +58,16 @@ This launches the docs app at `localhost:6006` and enables everything you need t Building a component library is a collaboriate effort! We're aiming to provide a first-class experience, so here's a list of the standards we'll be looking for: -- Consitent prop and variant naming conventions:
- -- `variant` is used to define style types, such as `outline` or `filled`.
- -- `color` is used to define the components color, such as `violet` or `blue`.
- -- `size` is used to define the components size, such as `xs` or `4xl`.
- -- Booleans are prefixed with `is`: `isLoading` or `isDisabled`. -- All style props have a correseponding theme type, ie. `FontSizeOptions`. -- All components have an export of default props. -- Styles are defined using `style objects` instead of `tagged template literals`. -- Stories are organized into the correct directory . +- Consitent prop and variant naming conventions:
+ -- `variant` is used to define style types, such as `outline` or `filled`.
+ -- `color` is used to define the components color, such as `violet` or `blue`.
+ -- `size` is used to define the components size, such as `xs` or `4xl`.
+ -- Booleans are prefixed with `is`: `isLoading` or `isDisabled`. +- All style props have a correseponding theme type, ie. `FontSizeOptions`. +- All components have an export of default props. +- Styles are defined using `style objects` instead of `tagged template literals`. +- Stories are organized into the correct directory . ### FAQs -- **How are components being styled?**
Our components are built using [Styled Components](https://styled-components.com/) that dynamically generate styles based on variant selection. +- **How are components being styled?**
Our components are built using [Styled Components](https://styled-components.com/) that dynamically generate styles based on variant selection. diff --git a/datahub-web-react/src/alchemy-components/components/AutoComplete/AutoComplete.stories.tsx b/datahub-web-react/src/alchemy-components/components/AutoComplete/AutoComplete.stories.tsx index 9661e40a61..e0c233c81f 100644 --- a/datahub-web-react/src/alchemy-components/components/AutoComplete/AutoComplete.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/AutoComplete/AutoComplete.stories.tsx @@ -1,7 +1,8 @@ import { BADGE } from '@geometricpanda/storybook-addon-badges'; import { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import AutoComplete from './AutoComplete'; + +import AutoComplete from '@components/components/AutoComplete/AutoComplete'; // Auto Docs const meta = { diff --git a/datahub-web-react/src/alchemy-components/components/AutoComplete/AutoComplete.tsx b/datahub-web-react/src/alchemy-components/components/AutoComplete/AutoComplete.tsx index f1f29ae260..ead920dfeb 100644 --- a/datahub-web-react/src/alchemy-components/components/AutoComplete/AutoComplete.tsx +++ b/datahub-web-react/src/alchemy-components/components/AutoComplete/AutoComplete.tsx @@ -1,10 +1,15 @@ import { AutoComplete as AntdAutoComplete } from 'antd'; import React, { useCallback, useEffect, useState } from 'react'; -import ClickOutside from '../Utils/ClickOutside/ClickOutside'; -import { DropdownWrapper } from './components'; -import { AUTOCOMPLETE_WRAPPER_CLASS_CSS_SELECTOR, AUTOCOMPLETE_WRAPPER_CLASS_NAME, ESCAPE_KEY } from './constants'; -import { AutoCompleteProps, OptionType } from './types'; -import { OverlayClassProvider } from '../Utils'; + +import { DropdownWrapper } from '@components/components/AutoComplete/components'; +import { + AUTOCOMPLETE_WRAPPER_CLASS_CSS_SELECTOR, + AUTOCOMPLETE_WRAPPER_CLASS_NAME, + ESCAPE_KEY, +} from '@components/components/AutoComplete/constants'; +import { AutoCompleteProps, OptionType } from '@components/components/AutoComplete/types'; +import { OverlayClassProvider } from '@components/components/Utils'; +import ClickOutside from '@components/components/Utils/ClickOutside/ClickOutside'; export default function AutoComplete({ children, diff --git a/datahub-web-react/src/alchemy-components/components/AutoComplete/index.ts b/datahub-web-react/src/alchemy-components/components/AutoComplete/index.ts index 3d3540752e..88a215b040 100644 --- a/datahub-web-react/src/alchemy-components/components/AutoComplete/index.ts +++ b/datahub-web-react/src/alchemy-components/components/AutoComplete/index.ts @@ -1,3 +1,3 @@ -import AutoComplete from './AutoComplete'; +import AutoComplete from '@components/components/AutoComplete/AutoComplete'; export { AutoComplete }; diff --git a/datahub-web-react/src/alchemy-components/components/Avatar/Avatar.stories.tsx b/datahub-web-react/src/alchemy-components/components/Avatar/Avatar.stories.tsx index 09d0d37f15..fdfd573513 100644 --- a/datahub-web-react/src/alchemy-components/components/Avatar/Avatar.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Avatar/Avatar.stories.tsx @@ -1,8 +1,10 @@ import { BADGE } from '@geometricpanda/storybook-addon-badges'; -import { GridList } from '@src/alchemy-components/.docs/mdx-components'; import { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import { Avatar, avatarDefaults } from './Avatar'; + +import { Avatar, avatarDefaults } from '@components/components/Avatar/Avatar'; + +import { GridList } from '@src/alchemy-components/.docs/mdx-components'; const IMAGE_URL = 'https://is1-ssl.mzstatic.com/image/thumb/Purple211/v4/78/cb/e1/78cbe16d-28d9-057e-9f73-524c32eb5fe5/AppIcon-0-0-1x_U007emarketing-0-7-0-85-220.png/512x512bb.jpg'; diff --git a/datahub-web-react/src/alchemy-components/components/Avatar/Avatar.tsx b/datahub-web-react/src/alchemy-components/components/Avatar/Avatar.tsx index 9e5ec025e0..70759f139c 100644 --- a/datahub-web-react/src/alchemy-components/components/Avatar/Avatar.tsx +++ b/datahub-web-react/src/alchemy-components/components/Avatar/Avatar.tsx @@ -1,7 +1,8 @@ import React, { useState } from 'react'; -import { AvatarImage, AvatarImageWrapper, AvatarText, Container } from './components'; -import { AvatarProps } from './types'; -import getAvatarColor, { getNameInitials } from './utils'; + +import { AvatarImage, AvatarImageWrapper, AvatarText, Container } from '@components/components/Avatar/components'; +import { AvatarProps } from '@components/components/Avatar/types'; +import getAvatarColor, { getNameInitials } from '@components/components/Avatar/utils'; export const avatarDefaults: AvatarProps = { name: 'User name', diff --git a/datahub-web-react/src/alchemy-components/components/Avatar/_tests_/getNameInitials.test.ts b/datahub-web-react/src/alchemy-components/components/Avatar/_tests_/getNameInitials.test.ts index 54bb258acb..f4c8ec4c6d 100644 --- a/datahub-web-react/src/alchemy-components/components/Avatar/_tests_/getNameInitials.test.ts +++ b/datahub-web-react/src/alchemy-components/components/Avatar/_tests_/getNameInitials.test.ts @@ -1,4 +1,4 @@ -import { getNameInitials } from '../utils'; +import { getNameInitials } from '@components/components/Avatar/utils'; describe('get initials of the name', () => { it('get initials of name with first name and last name', () => { diff --git a/datahub-web-react/src/alchemy-components/components/Avatar/components.ts b/datahub-web-react/src/alchemy-components/components/Avatar/components.ts index bcd23a8ab0..918e6a5e43 100644 --- a/datahub-web-react/src/alchemy-components/components/Avatar/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Avatar/components.ts @@ -1,7 +1,9 @@ +import styled from 'styled-components'; + +import { getAvatarColorStyles, getAvatarNameSizes, getAvatarSizes } from '@components/components/Avatar/utils'; + import { colors } from '@src/alchemy-components/theme'; import { AvatarSizeOptions } from '@src/alchemy-components/theme/config'; -import styled from 'styled-components'; -import { getAvatarColorStyles, getAvatarNameSizes, getAvatarSizes } from './utils'; export const Container = styled.div<{ $hasOnClick: boolean; $showInPill?: boolean }>` display: inline-flex; diff --git a/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.stories.tsx b/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.stories.tsx index d9d46f7ce8..81fb34676d 100644 --- a/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.stories.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Meta, StoryObj } from '@storybook/react'; -import { AvatarStack, avatarListDefaults } from './AvatarStack'; +import React from 'react'; + +import { AvatarStack, avatarListDefaults } from '@components/components/AvatarStack/AvatarStack'; // Meta Configuration const meta = { diff --git a/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.tsx b/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.tsx index e9d8323676..c2456a8e51 100644 --- a/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.tsx +++ b/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { AvatarContainer, AvatarStackContainer } from './components'; -import { Avatar } from '../Avatar'; -import { AvatarItemProps, AvatarStackProps } from './types'; + +import { Avatar } from '@components/components/Avatar'; +import { AvatarContainer, AvatarStackContainer } from '@components/components/AvatarStack/components'; +import { AvatarItemProps, AvatarStackProps } from '@components/components/AvatarStack/types'; export const avatarListDefaults: AvatarStackProps = { avatars: [ diff --git a/datahub-web-react/src/alchemy-components/components/Badge/Badge.stories.tsx b/datahub-web-react/src/alchemy-components/components/Badge/Badge.stories.tsx index 931720d8e1..50bd2ed134 100644 --- a/datahub-web-react/src/alchemy-components/components/Badge/Badge.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Badge/Badge.stories.tsx @@ -1,12 +1,11 @@ -import React from 'react'; - import { BADGE } from '@geometricpanda/storybook-addon-badges'; import type { Meta, StoryObj } from '@storybook/react'; +import React from 'react'; import { GridList } from '@components/.docs/mdx-components'; -import { Badge, badgeDefault } from './Badge'; -import pillMeta from '../Pills/Pill.stories'; -import { omitKeys } from './utils'; +import { Badge, badgeDefault } from '@components/components/Badge/Badge'; +import { omitKeys } from '@components/components/Badge/utils'; +import pillMeta from '@components/components/Pills/Pill.stories'; const pillMetaArgTypes = omitKeys(pillMeta.argTypes, ['label']); const pillMetaArgs = omitKeys(pillMeta.args, ['label']); diff --git a/datahub-web-react/src/alchemy-components/components/Badge/Badge.tsx b/datahub-web-react/src/alchemy-components/components/Badge/Badge.tsx index 1c934ef120..14229a68ca 100644 --- a/datahub-web-react/src/alchemy-components/components/Badge/Badge.tsx +++ b/datahub-web-react/src/alchemy-components/components/Badge/Badge.tsx @@ -1,9 +1,9 @@ import { Pill } from '@components'; import React, { useMemo } from 'react'; -import { BadgeProps } from './types'; -import { formatBadgeValue } from './utils'; -import { BadgeContainer } from './components'; +import { BadgeContainer } from '@components/components/Badge/components'; +import { BadgeProps } from '@components/components/Badge/types'; +import { formatBadgeValue } from '@components/components/Badge/utils'; export const badgeDefault: BadgeProps = { count: 0, diff --git a/datahub-web-react/src/alchemy-components/components/Badge/types.ts b/datahub-web-react/src/alchemy-components/components/Badge/types.ts index b838442524..7b1968651f 100644 --- a/datahub-web-react/src/alchemy-components/components/Badge/types.ts +++ b/datahub-web-react/src/alchemy-components/components/Badge/types.ts @@ -1,5 +1,6 @@ import { HTMLAttributes } from 'react'; -import { PillProps } from '../Pills/types'; + +import { PillProps } from '@components/components/Pills/types'; export interface BadgeProps extends Omit, Omit, 'color'> { count: number; diff --git a/datahub-web-react/src/alchemy-components/components/Bar/Bar.stories.tsx b/datahub-web-react/src/alchemy-components/components/Bar/Bar.stories.tsx index e2a1d378c2..38630f152d 100644 --- a/datahub-web-react/src/alchemy-components/components/Bar/Bar.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Bar/Bar.stories.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { Meta, StoryObj } from '@storybook/react'; -import colors from '@src/alchemy-components/theme/foundations/colors'; +import React from 'react'; -import { Bar } from './Bar'; +import { Bar } from '@components/components/Bar/Bar'; + +import colors from '@src/alchemy-components/theme/foundations/colors'; const meta: Meta = { title: 'Components / Bar', diff --git a/datahub-web-react/src/alchemy-components/components/Bar/Bar.tsx b/datahub-web-react/src/alchemy-components/components/Bar/Bar.tsx index 2c3a4aea89..dfac96932b 100644 --- a/datahub-web-react/src/alchemy-components/components/Bar/Bar.tsx +++ b/datahub-web-react/src/alchemy-components/components/Bar/Bar.tsx @@ -1,9 +1,10 @@ import React from 'react'; -import { colors } from '@src/alchemy-components/theme'; -import { BarComponentProps } from './types'; -import { BarContainer, IndividualBar } from './components'; -import { BAR_HEIGHT_MULTIPLIER } from './constant'; +import { BarContainer, IndividualBar } from '@components/components/Bar/components'; +import { BAR_HEIGHT_MULTIPLIER } from '@components/components/Bar/constant'; +import { BarComponentProps } from '@components/components/Bar/types'; + +import { colors } from '@src/alchemy-components/theme'; const defaultProps: BarComponentProps = { color: colors.violet[500], diff --git a/datahub-web-react/src/alchemy-components/components/Bar/components.ts b/datahub-web-react/src/alchemy-components/components/Bar/components.ts index be0e5774d1..806d2a93ed 100644 --- a/datahub-web-react/src/alchemy-components/components/Bar/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Bar/components.ts @@ -11,5 +11,7 @@ export const IndividualBar = styled.div<{ height: number; isColored: boolean; co height: ${(props) => props.height}px; background-color: ${(props) => (props.isColored ? props.color : '#C6C0E0')}; border-radius: 20px; - transition: background-color 0.3s ease, height 0.3s ease; + transition: + background-color 0.3s ease, + height 0.3s ease; `; diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.stories.tsx b/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.stories.tsx index 887e08a498..edb3198163 100644 --- a/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.stories.tsx @@ -1,12 +1,13 @@ -import React from 'react'; import { BADGE } from '@geometricpanda/storybook-addon-badges'; import type { Meta, StoryObj } from '@storybook/react'; -import { BarChart } from './BarChart'; -import { generateMockDataHorizontal, getMockedProps } from './utils'; -import { DEFAULT_MIN_VALUE } from './hooks/usePrepareAccessors'; -import { DEFAULT_MAX_DOMAIN_VALUE } from './hooks/usePrepareScales'; -import { abbreviateNumber } from '../dataviz/utils'; -import { DEFAULT_LENGTH_OF_LEFT_AXIS_LABEL } from './constants'; +import React from 'react'; + +import { BarChart } from '@components/components/BarChart/BarChart'; +import { DEFAULT_LENGTH_OF_LEFT_AXIS_LABEL } from '@components/components/BarChart/constants'; +import { DEFAULT_MIN_VALUE } from '@components/components/BarChart/hooks/usePrepareAccessors'; +import { DEFAULT_MAX_DOMAIN_VALUE } from '@components/components/BarChart/hooks/usePrepareScales'; +import { generateMockDataHorizontal, getMockedProps } from '@components/components/BarChart/utils'; +import { abbreviateNumber } from '@components/components/dataviz/utils'; const meta = { title: 'Charts / BarChart', diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.tsx b/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.tsx index 5143e06999..3c98d9f781 100644 --- a/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.tsx +++ b/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.tsx @@ -1,20 +1,30 @@ -import React, { useCallback, useMemo, useState } from 'react'; -import { colors } from '@src/alchemy-components/theme'; import { LinearGradient } from '@visx/gradient'; import { ParentSize } from '@visx/responsive'; import { Axis, AxisScale, BarSeries, Grid, Tooltip, XYChart } from '@visx/xychart'; -import { Popover } from '../Popover'; -import { ChartWrapper, StyledBarSeries } from './components'; -import { AxisProps, BarChartProps, ColorAccessor, Datum, GridProps, XAccessor, YAccessor } from './types'; -import { getMockedProps } from './utils'; -import useMergedProps from './hooks/useMergedProps'; -import usePrepareScales from './hooks/usePrepareScales'; -import usePrepareAccessors from './hooks/usePrepareAccessors'; -import { COLOR_SCHEME_TO_PARAMS, DEFAULT_COLOR_SCHEME } from './constants'; -import TruncatableTick from './components/TruncatableTick'; -import { barChartDefault } from './defaults'; -import LeftAxisMarginSetter from './components/LeftAxisMarginSetter'; -import { abbreviateNumber } from '../dataviz/utils'; +import React, { useCallback, useMemo, useState } from 'react'; + +import { ChartWrapper, StyledBarSeries } from '@components/components/BarChart/components'; +import LeftAxisMarginSetter from '@components/components/BarChart/components/LeftAxisMarginSetter'; +import TruncatableTick from '@components/components/BarChart/components/TruncatableTick'; +import { COLOR_SCHEME_TO_PARAMS, DEFAULT_COLOR_SCHEME } from '@components/components/BarChart/constants'; +import { barChartDefault } from '@components/components/BarChart/defaults'; +import useMergedProps from '@components/components/BarChart/hooks/useMergedProps'; +import usePrepareAccessors from '@components/components/BarChart/hooks/usePrepareAccessors'; +import usePrepareScales from '@components/components/BarChart/hooks/usePrepareScales'; +import { + AxisProps, + BarChartProps, + ColorAccessor, + Datum, + GridProps, + XAccessor, + YAccessor, +} from '@components/components/BarChart/types'; +import { getMockedProps } from '@components/components/BarChart/utils'; +import { Popover } from '@components/components/Popover'; +import { abbreviateNumber } from '@components/components/dataviz/utils'; + +import { colors } from '@src/alchemy-components/theme'; export function BarChart({ data, diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/components/LeftAxisMarginSetter.tsx b/datahub-web-react/src/alchemy-components/components/BarChart/components/LeftAxisMarginSetter.tsx index 8da6c30db3..718fdb880c 100644 --- a/datahub-web-react/src/alchemy-components/components/BarChart/components/LeftAxisMarginSetter.tsx +++ b/datahub-web-react/src/alchemy-components/components/BarChart/components/LeftAxisMarginSetter.tsx @@ -1,7 +1,7 @@ +import { TickFormatter } from '@visx/axis'; +import { getTicks } from '@visx/scale'; import { DataContext } from '@visx/xychart'; import { useCallback, useContext, useEffect } from 'react'; -import { getTicks } from '@visx/scale'; -import { TickFormatter } from '@visx/axis'; interface LeftAxisMarginSetterProps { setLeftMargin?: (margin: number) => void; diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/components/TruncatableTick.tsx b/datahub-web-react/src/alchemy-components/components/BarChart/components/TruncatableTick.tsx index 526387eadd..40801b0f11 100644 --- a/datahub-web-react/src/alchemy-components/components/BarChart/components/TruncatableTick.tsx +++ b/datahub-web-react/src/alchemy-components/components/BarChart/components/TruncatableTick.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Text } from '@visx/text'; -import { Popover } from '../../Popover'; -import { TruncatableTickProps } from '../types'; +import React from 'react'; + +import { TruncatableTickProps } from '@components/components/BarChart/types'; +import { Popover } from '@components/components/Popover'; export default function TruncatableTick({ formattedValue, limit, ...textProps }: TruncatableTickProps) { if (formattedValue === undefined) return null; diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/constants.ts b/datahub-web-react/src/alchemy-components/components/BarChart/constants.ts index 2c3e0b11ef..70243efbd9 100644 --- a/datahub-web-react/src/alchemy-components/components/BarChart/constants.ts +++ b/datahub-web-react/src/alchemy-components/components/BarChart/constants.ts @@ -1,5 +1,6 @@ +import { ColorScheme, ColorSchemeParams } from '@components/components/BarChart/types'; + import { colors } from '@src/alchemy-components/theme'; -import { ColorScheme, ColorSchemeParams } from './types'; export const VIOLET_COLOR_SCHEME_PRARAMS: ColorSchemeParams = { mainColor: colors.violet[500], diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/defaults.ts b/datahub-web-react/src/alchemy-components/components/BarChart/defaults.ts index 9f8c44f10d..ad58842b3c 100644 --- a/datahub-web-react/src/alchemy-components/components/BarChart/defaults.ts +++ b/datahub-web-react/src/alchemy-components/components/BarChart/defaults.ts @@ -1,9 +1,11 @@ -import { colors } from '@src/alchemy-components/theme'; import { TickLabelProps } from '@visx/axis'; import dayjs from 'dayjs'; -import { DEFAULT_LENGTH_OF_LEFT_AXIS_LABEL } from './constants'; -import { BarChartProps, Datum } from './types'; -import { abbreviateNumber } from '../dataviz/utils'; + +import { DEFAULT_LENGTH_OF_LEFT_AXIS_LABEL } from '@components/components/BarChart/constants'; +import { BarChartProps, Datum } from '@components/components/BarChart/types'; +import { abbreviateNumber } from '@components/components/dataviz/utils'; + +import { colors } from '@src/alchemy-components/theme'; const commonTickLabelProps: TickLabelProps = { fontSize: 10, diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMaxDataValue.ts b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMaxDataValue.ts index a8448fa8f5..6cc17045ae 100644 --- a/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMaxDataValue.ts +++ b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMaxDataValue.ts @@ -1,5 +1,6 @@ import { useMemo } from 'react'; -import { BaseDatum, YAccessor } from '../types'; + +import { BaseDatum, YAccessor } from '@components/components/BarChart/types'; export default function useMaxDataValue(data: BaseDatum[], yAccessor: YAccessor): number { return useMemo(() => Math.max(...data.map(yAccessor)) ?? 0, [data, yAccessor]); diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMinDataValue.ts b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMinDataValue.ts index 287baf45aa..558d17e7f0 100644 --- a/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMinDataValue.ts +++ b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMinDataValue.ts @@ -1,5 +1,6 @@ import { useMemo } from 'react'; -import { BaseDatum, YAccessor } from '../types'; + +import { BaseDatum, YAccessor } from '@components/components/BarChart/types'; export default function useMinDataValue(data: BaseDatum[], yAccessor: YAccessor): number { return useMemo(() => Math.min(...data.map(yAccessor)) ?? 0, [data, yAccessor]); diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/hooks/usePrepareAccessors.ts b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/usePrepareAccessors.ts index 9166cd2f59..7ddc37a4fd 100644 --- a/datahub-web-react/src/alchemy-components/components/BarChart/hooks/usePrepareAccessors.ts +++ b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/usePrepareAccessors.ts @@ -1,5 +1,6 @@ import { useCallback, useMemo } from 'react'; -import { BaseDatum, XAccessor, YAccessor } from '../types'; + +import { BaseDatum, XAccessor, YAccessor } from '@components/components/BarChart/types'; export const DEFAULT_MIN_VALUE = 0.1; diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/hooks/usePrepareScales.ts b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/usePrepareScales.ts index 2579d30ab9..86c337815e 100644 --- a/datahub-web-react/src/alchemy-components/components/BarChart/hooks/usePrepareScales.ts +++ b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/usePrepareScales.ts @@ -1,5 +1,6 @@ import { useCallback, useMemo } from 'react'; -import { BaseDatum, Scale, XAccessor, YAccessor } from '../types'; + +import { BaseDatum, Scale, XAccessor, YAccessor } from '@components/components/BarChart/types'; export const DEFAULT_MAX_DOMAIN_VALUE = 10; diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/utils.ts b/datahub-web-react/src/alchemy-components/components/BarChart/utils.ts index 107bcbeea8..f816056ab2 100644 --- a/datahub-web-react/src/alchemy-components/components/BarChart/utils.ts +++ b/datahub-web-react/src/alchemy-components/components/BarChart/utils.ts @@ -1,5 +1,6 @@ import dayjs from 'dayjs'; -import { COLOR_SCHEMES } from './constants'; + +import { COLOR_SCHEMES } from '@components/components/BarChart/constants'; export function generateMockData(length = 30, maxValue = 50_000, minValue = 0) { return Array(length) diff --git a/datahub-web-react/src/alchemy-components/components/Button/Button.stories.tsx b/datahub-web-react/src/alchemy-components/components/Button/Button.stories.tsx index 124508de36..b047d337c7 100644 --- a/datahub-web-react/src/alchemy-components/components/Button/Button.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Button/Button.stories.tsx @@ -1,13 +1,12 @@ +import { AVAILABLE_ICONS } from '@components'; +import { BADGE } from '@geometricpanda/storybook-addon-badges'; +import type { Meta, StoryObj } from '@storybook/react'; +import React from 'react'; + +import { GridList } from '@components/.docs/mdx-components'; import { ButtonVariantValues } from '@components/components/Button/types'; import { MATERIAL_UI_ICONS, PHOSPHOR_ICONS } from '@components/components/Icon/constants'; import { SizeValues } from '@components/theme/config'; -import React from 'react'; - -import type { Meta, StoryObj } from '@storybook/react'; -import { BADGE } from '@geometricpanda/storybook-addon-badges'; - -import { GridList } from '@components/.docs/mdx-components'; -import { AVAILABLE_ICONS } from '@components'; import { Button, buttonDefaults } from '.'; diff --git a/datahub-web-react/src/alchemy-components/components/Button/Button.tsx b/datahub-web-react/src/alchemy-components/components/Button/Button.tsx index be171e92ab..af9726e611 100644 --- a/datahub-web-react/src/alchemy-components/components/Button/Button.tsx +++ b/datahub-web-react/src/alchemy-components/components/Button/Button.tsx @@ -1,11 +1,9 @@ +import { LoadingOutlined } from '@ant-design/icons'; +import { Icon } from '@components'; import React from 'react'; -import { LoadingOutlined } from '@ant-design/icons'; - -import { Icon } from '@components'; - -import { ButtonBase } from './components'; -import { ButtonProps, ButtonPropsDefaults } from './types'; +import { ButtonBase } from '@components/components/Button/components'; +import { ButtonProps, ButtonPropsDefaults } from '@components/components/Button/types'; export const buttonDefaults: ButtonPropsDefaults = { variant: 'filled', diff --git a/datahub-web-react/src/alchemy-components/components/Button/components.ts b/datahub-web-react/src/alchemy-components/components/Button/components.ts index c1a943af5e..bbad968278 100644 --- a/datahub-web-react/src/alchemy-components/components/Button/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Button/components.ts @@ -1,8 +1,8 @@ import styled from 'styled-components'; +import { ButtonStyleProps } from '@components/components/Button/types'; +import { getButtonStyle } from '@components/components/Button/utils'; import { spacing } from '@components/theme'; -import { ButtonStyleProps } from './types'; -import { getButtonStyle } from './utils'; export const ButtonBase = styled.button( // Dynamic styles diff --git a/datahub-web-react/src/alchemy-components/components/Button/types.ts b/datahub-web-react/src/alchemy-components/components/Button/types.ts index 4245bc1cec..7e3c83f749 100644 --- a/datahub-web-react/src/alchemy-components/components/Button/types.ts +++ b/datahub-web-react/src/alchemy-components/components/Button/types.ts @@ -1,7 +1,7 @@ -import { IconProps } from '@components/components/Icon/types'; import { ButtonHTMLAttributes } from 'react'; -import type { SizeOptions, ColorOptions } from '@components/theme/config'; +import { IconProps } from '@components/components/Icon/types'; +import type { ColorOptions, SizeOptions } from '@components/theme/config'; export enum ButtonVariantValues { filled = 'filled', diff --git a/datahub-web-react/src/alchemy-components/components/Button/utils.ts b/datahub-web-react/src/alchemy-components/components/Button/utils.ts index 101b501166..8f6b9c83d3 100644 --- a/datahub-web-react/src/alchemy-components/components/Button/utils.ts +++ b/datahub-web-react/src/alchemy-components/components/Button/utils.ts @@ -1,12 +1,12 @@ /* * Button Style Utilities */ +import { CSSObject } from 'styled-components'; -import { typography, colors, shadows, radius, spacing } from '@components/theme'; +import { ButtonStyleProps, ButtonVariant } from '@components/components/Button/types'; +import { colors, radius, shadows, spacing, typography } from '@components/theme'; import { ColorOptions, SizeOptions } from '@components/theme/config'; import { getColor, getFontSize } from '@components/theme/utils'; -import { CSSObject } from 'styled-components'; -import { ButtonStyleProps, ButtonVariant } from './types'; interface ColorStyles { bgColor: string; diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.stories.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.stories.tsx index 1f05b9eb3e..c924e0590e 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.stories.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { BADGE } from '@geometricpanda/storybook-addon-badges'; import type { Meta, StoryObj } from '@storybook/react'; -import { CalendarChart } from './CalendarChart'; -import { getMockedProps } from './utils'; +import React from 'react'; + +import { CalendarChart } from '@components/components/CalendarChart/CalendarChart'; +import { getMockedProps } from '@components/components/CalendarChart/utils'; const meta = { title: 'Charts / CalendarChart', diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.tsx index 59f853903a..a2330fe390 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.tsx +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.tsx @@ -1,14 +1,16 @@ -import { colors } from '@src/alchemy-components/theme'; import { ParentSize } from '@visx/responsive'; import React, { useMemo } from 'react'; -import { ChartWrapper } from './components'; -import { AxisBottomMonths } from './private/components/AxisBottomMonths'; -import { AxisLeftWeekdays } from './private/components/AxisLeftWeekdays'; -import { Calendar } from './private/components/Calendar'; -import { CalendarProvider } from './private/context'; -import { CalendarChartProps } from './types'; -import { prepareCalendarData } from './utils'; -import { CalendarContainer } from './private/components/CalendarContainer'; + +import { ChartWrapper } from '@components/components/CalendarChart/components'; +import { AxisBottomMonths } from '@components/components/CalendarChart/private/components/AxisBottomMonths'; +import { AxisLeftWeekdays } from '@components/components/CalendarChart/private/components/AxisLeftWeekdays'; +import { Calendar } from '@components/components/CalendarChart/private/components/Calendar'; +import { CalendarContainer } from '@components/components/CalendarChart/private/components/CalendarContainer'; +import { CalendarProvider } from '@components/components/CalendarChart/private/context'; +import { CalendarChartProps } from '@components/components/CalendarChart/types'; +import { prepareCalendarData } from '@components/components/CalendarChart/utils'; + +import { colors } from '@src/alchemy-components/theme'; const commonLabelProps = { fill: colors.gray[1700], diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/getColorAccessors.test.ts b/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/getColorAccessors.test.ts index 788b611f1e..d026fda3bd 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/getColorAccessors.test.ts +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/getColorAccessors.test.ts @@ -1,5 +1,5 @@ -import { CalendarData } from '../types'; -import { getColorAccessor } from '../utils'; +import { CalendarData } from '@components/components/CalendarChart/types'; +import { getColorAccessor } from '@components/components/CalendarChart/utils'; type Datum = { value1: number; diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/prepareCalendarDate.test.ts b/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/prepareCalendarDate.test.ts index 97a0fe382e..b299430d87 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/prepareCalendarDate.test.ts +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/prepareCalendarDate.test.ts @@ -1,5 +1,5 @@ -import { CalendarData } from '../types'; -import { prepareCalendarData } from '../utils'; +import { CalendarData } from '@components/components/CalendarChart/types'; +import { prepareCalendarData } from '@components/components/CalendarChart/utils'; const sampleData: CalendarData[] = [ { day: '2024-12-02', value: 1 }, diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisBottomMonths.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisBottomMonths.tsx index 3b39b2d971..989bb24d5b 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisBottomMonths.tsx +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisBottomMonths.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import { DAYS_IN_WEEK } from '../constants'; -import { useCalendarState } from '../context'; -import { TickLabel } from './TickLabel'; -import { AxisBottomMonthsProps } from '../../types'; + +import { TickLabel } from '@components/components/CalendarChart/private/components/TickLabel'; +import { DAYS_IN_WEEK } from '@components/components/CalendarChart/private/constants'; +import { useCalendarState } from '@components/components/CalendarChart/private/context'; +import { AxisBottomMonthsProps } from '@components/components/CalendarChart/types'; export function AxisBottomMonths({ labelProps }: AxisBottomMonthsProps) { const { squareSize, squareGap, margin, data } = useCalendarState(); diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisLeftWeekdays.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisLeftWeekdays.tsx index 41e460b164..7168de9991 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisLeftWeekdays.tsx +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisLeftWeekdays.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import { DAYS_IN_WEEK } from '../constants'; -import { AxisLeftWeekdaysProps } from '../../types'; -import { useCalendarState } from '../context'; -import { TickLabel } from './TickLabel'; + +import { TickLabel } from '@components/components/CalendarChart/private/components/TickLabel'; +import { DAYS_IN_WEEK } from '@components/components/CalendarChart/private/constants'; +import { useCalendarState } from '@components/components/CalendarChart/private/context'; +import { AxisLeftWeekdaysProps } from '@components/components/CalendarChart/types'; const WEEKDAYS = ['Mon', 'Tue', 'Wed', 'Thur', 'Fri', 'Sat', 'Sun']; diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Calendar.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Calendar.tsx index 61323ee48b..a8f390e562 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Calendar.tsx +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Calendar.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { CalendarProps } from '../../types'; -import { Month } from './Month'; + +import { Month } from '@components/components/CalendarChart/private/components/Month'; +import { CalendarProps } from '@components/components/CalendarChart/types'; export function Calendar({ data }: CalendarProps) { return ( diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/CalendarContainer.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/CalendarContainer.tsx index 169a14f0a5..a1f04edb65 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/CalendarContainer.tsx +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/CalendarContainer.tsx @@ -1,8 +1,9 @@ import React, { useMemo } from 'react'; -import { useCalendarState } from '../context'; -import { DAYS_IN_WEEK } from '../constants'; -import { CalendarContainerProps } from '../../types'; -import { CalendarInnerWrapper, CalendarWrapper } from '../../components'; + +import { CalendarInnerWrapper, CalendarWrapper } from '@components/components/CalendarChart/components'; +import { DAYS_IN_WEEK } from '@components/components/CalendarChart/private/constants'; +import { useCalendarState } from '@components/components/CalendarChart/private/context'; +import { CalendarContainerProps } from '@components/components/CalendarChart/types'; export function CalendarContainer({ children }: CalendarContainerProps) { const { squareSize, squareGap, margin, parentHeight, countOfWeeks, countOfMonths } = useCalendarState(); diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Day.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Day.tsx index 229be8d2aa..7fc52b38f6 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Day.tsx +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Day.tsx @@ -1,8 +1,10 @@ -import { Popover } from '@src/alchemy-components/components/Popover'; import React, { useMemo } from 'react'; -import { DayProps } from '../../types'; -import { useCalendarState } from '../context'; -import { StyledBar } from '../../components'; + +import { StyledBar } from '@components/components/CalendarChart/components'; +import { useCalendarState } from '@components/components/CalendarChart/private/context'; +import { DayProps } from '@components/components/CalendarChart/types'; + +import { Popover } from '@src/alchemy-components/components/Popover'; export function Day({ day, weekOffset, dayIndex }: DayProps) { const { squareSize, squareGap, margin, colorAccessor, showPopover, popoverRenderer, selectedDay, onDayClick } = diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Month.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Month.tsx index 312935716d..c1a72e8590 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Month.tsx +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Month.tsx @@ -1,7 +1,8 @@ import React, { useMemo } from 'react'; -import { MonthProps } from '../../types'; -import { useCalendarState } from '../context'; -import { Week } from './Week'; + +import { Week } from '@components/components/CalendarChart/private/components/Week'; +import { useCalendarState } from '@components/components/CalendarChart/private/context'; +import { MonthProps } from '@components/components/CalendarChart/types'; export function Month({ month, monthIndex }: MonthProps) { const { squareGap, data } = useCalendarState(); diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Week.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Week.tsx index 973ad8c516..ef7649e919 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Week.tsx +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Week.tsx @@ -1,7 +1,8 @@ import React, { useMemo } from 'react'; -import { WeekProps } from '../../types'; -import { useCalendarState } from '../context'; -import { Day } from './Day'; + +import { Day } from '@components/components/CalendarChart/private/components/Day'; +import { useCalendarState } from '@components/components/CalendarChart/private/context'; +import { WeekProps } from '@components/components/CalendarChart/types'; export function Week({ week, weekNumber, monthOffset }: WeekProps) { const { squareSize, squareGap, margin } = useCalendarState(); diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/context.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/context.tsx index a83fd6c7f5..a34e9aa50a 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/context.tsx +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/context.tsx @@ -1,7 +1,8 @@ import { Margin } from '@visx/xychart'; -import React, { createContext, PropsWithChildren, useContext, useMemo } from 'react'; -import { DayData, MonthData } from '../types'; -import { DAYS_IN_WEEK, MIN_GAP_SIZE, MIN_SQUARE_SIZE } from './constants'; +import React, { PropsWithChildren, createContext, useContext, useMemo } from 'react'; + +import { DAYS_IN_WEEK, MIN_GAP_SIZE, MIN_SQUARE_SIZE } from '@components/components/CalendarChart/private/constants'; +import { DayData, MonthData } from '@components/components/CalendarChart/types'; export type CalendarContextState = { data: MonthData[]; diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/utils.ts b/datahub-web-react/src/alchemy-components/components/CalendarChart/utils.ts index a4acb1dbbf..cf2a48bba5 100644 --- a/datahub-web-react/src/alchemy-components/components/CalendarChart/utils.ts +++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/utils.ts @@ -1,12 +1,20 @@ import { scaleLinear } from '@visx/scale'; import * as d3interpolate from '@visx/vendor/d3-interpolate'; import dayjs from 'dayjs'; +import advancedFormat from 'dayjs/plugin/advancedFormat'; import isoWeek from 'dayjs/plugin/isoWeek'; import utc from 'dayjs/plugin/utc'; -import advancedFormat from 'dayjs/plugin/advancedFormat'; -import { CalendarChartProps, CalendarData, ColorAccessor, DayData, MonthData, WeekData } from './types'; -import { DAYS_IN_WEEK, MIN_DAYS_IN_WEEK } from './private/constants'; -import { CALENDAR_DATE_FORMAT } from './constants'; + +import { CALENDAR_DATE_FORMAT } from '@components/components/CalendarChart/constants'; +import { DAYS_IN_WEEK, MIN_DAYS_IN_WEEK } from '@components/components/CalendarChart/private/constants'; +import { + CalendarChartProps, + CalendarData, + ColorAccessor, + DayData, + MonthData, + WeekData, +} from '@components/components/CalendarChart/types'; dayjs.extend(isoWeek); dayjs.extend(utc); diff --git a/datahub-web-react/src/alchemy-components/components/Card/Card.stories.tsx b/datahub-web-react/src/alchemy-components/components/Card/Card.stories.tsx index 67966dbaa1..cf9f9158d6 100644 --- a/datahub-web-react/src/alchemy-components/components/Card/Card.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Card/Card.stories.tsx @@ -1,10 +1,13 @@ import { BADGE } from '@geometricpanda/storybook-addon-badges'; -import { GridList } from '@src/alchemy-components/.docs/mdx-components'; -import { colors } from '@src/alchemy-components/theme'; import type { Meta, StoryObj } from '@storybook/react'; import React from 'react'; + +import { Icon } from '@components/components/Icon'; + +import { GridList } from '@src/alchemy-components/.docs/mdx-components'; +import { colors } from '@src/alchemy-components/theme'; + import { Card, cardDefaults } from '.'; -import { Icon } from '../Icon'; // Auto Docs const meta = { diff --git a/datahub-web-react/src/alchemy-components/components/Card/Card.tsx b/datahub-web-react/src/alchemy-components/components/Card/Card.tsx index 384741ed98..049e3c86b9 100644 --- a/datahub-web-react/src/alchemy-components/components/Card/Card.tsx +++ b/datahub-web-react/src/alchemy-components/components/Card/Card.tsx @@ -1,7 +1,15 @@ import React from 'react'; -import { CardProps } from './types'; -import { CardContainer, Header, SubTitle, SubTitleContainer, Title, TitleContainer } from './components'; -import { Pill } from '../Pills'; + +import { + CardContainer, + Header, + SubTitle, + SubTitleContainer, + Title, + TitleContainer, +} from '@components/components/Card/components'; +import { CardProps } from '@components/components/Card/types'; +import { Pill } from '@components/components/Pills'; export const cardDefaults: CardProps = { title: 'Title', diff --git a/datahub-web-react/src/alchemy-components/components/Card/components.ts b/datahub-web-react/src/alchemy-components/components/Card/components.ts index f9510a85cb..f8575d21bb 100644 --- a/datahub-web-react/src/alchemy-components/components/Card/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Card/components.ts @@ -1,6 +1,7 @@ +import styled from 'styled-components'; + import { colors, radius, spacing, typography } from '@src/alchemy-components/theme'; import { IconAlignmentOptions } from '@src/alchemy-components/theme/config'; -import styled from 'styled-components'; export const CardContainer = styled.div<{ hasButton?: boolean; width?: string; maxWidth?: string; height?: string }>( ({ hasButton, width, maxWidth, height }) => ({ diff --git a/datahub-web-react/src/alchemy-components/components/Checkbox/Checkbox.stories.tsx b/datahub-web-react/src/alchemy-components/components/Checkbox/Checkbox.stories.tsx index e546c2ea52..7ab62e5c08 100644 --- a/datahub-web-react/src/alchemy-components/components/Checkbox/Checkbox.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Checkbox/Checkbox.stories.tsx @@ -1,9 +1,10 @@ -import React from 'react'; import type { Meta, StoryObj } from '@storybook/react'; +import React from 'react'; + import { GridList } from '@components/.docs/mdx-components'; -import { Checkbox, checkboxDefaults, CheckboxGroup } from './Checkbox'; -import { CheckboxProps } from './types'; -import { Heading } from '../Heading'; +import { Checkbox, CheckboxGroup, checkboxDefaults } from '@components/components/Checkbox/Checkbox'; +import { CheckboxProps } from '@components/components/Checkbox/types'; +import { Heading } from '@components/components/Heading'; const MOCK_CHECKBOXES: CheckboxProps[] = [ { diff --git a/datahub-web-react/src/alchemy-components/components/Checkbox/Checkbox.tsx b/datahub-web-react/src/alchemy-components/components/Checkbox/Checkbox.tsx index 7064937cbe..5af1a83a3b 100644 --- a/datahub-web-react/src/alchemy-components/components/Checkbox/Checkbox.tsx +++ b/datahub-web-react/src/alchemy-components/components/Checkbox/Checkbox.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import { CheckboxProps, CheckboxGroupProps } from './types'; + import { CheckboxBase, CheckboxContainer, @@ -9,7 +9,8 @@ import { Label, Required, StyledCheckbox, -} from './components'; +} from '@components/components/Checkbox/components'; +import { CheckboxGroupProps, CheckboxProps } from '@components/components/Checkbox/types'; export const checkboxDefaults: CheckboxProps = { error: '', diff --git a/datahub-web-react/src/alchemy-components/components/Checkbox/components.ts b/datahub-web-react/src/alchemy-components/components/Checkbox/components.ts index 2a85be2f51..32ca80efe5 100644 --- a/datahub-web-react/src/alchemy-components/components/Checkbox/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Checkbox/components.ts @@ -1,8 +1,14 @@ import styled from 'styled-components'; -import { borders, colors, spacing, transform, zIndices, radius } from '@components/theme'; + +import { + getCheckboxColor, + getCheckboxHoverBackgroundColor, + getCheckboxSize, +} from '@components/components/Checkbox/utils'; +import { formLabelTextStyles } from '@components/components/commonStyles'; +import { borders, colors, radius, spacing, transform, zIndices } from '@components/theme'; + import { SizeOptions } from '@src/alchemy-components/theme/config'; -import { getCheckboxColor, getCheckboxHoverBackgroundColor, getCheckboxSize } from './utils'; -import { formLabelTextStyles } from '../commonStyles'; export const CheckboxContainer = styled.div({ display: 'flex', diff --git a/datahub-web-react/src/alchemy-components/components/Checkbox/types.ts b/datahub-web-react/src/alchemy-components/components/Checkbox/types.ts index e153154050..7ffb2ccddd 100644 --- a/datahub-web-react/src/alchemy-components/components/Checkbox/types.ts +++ b/datahub-web-react/src/alchemy-components/components/Checkbox/types.ts @@ -1,4 +1,5 @@ import { InputHTMLAttributes } from 'react'; + import { SizeOptions } from '@src/alchemy-components/theme/config'; export interface CheckboxProps extends Omit, 'size'> { diff --git a/datahub-web-react/src/alchemy-components/components/Checkbox/utils.ts b/datahub-web-react/src/alchemy-components/components/Checkbox/utils.ts index 959b37a8d9..a909a377fd 100644 --- a/datahub-web-react/src/alchemy-components/components/Checkbox/utils.ts +++ b/datahub-web-react/src/alchemy-components/components/Checkbox/utils.ts @@ -1,4 +1,5 @@ import theme, { colors } from '@components/theme'; + import { SizeOptions } from '@src/alchemy-components/theme/config'; const checkboxBackgroundDefault = { diff --git a/datahub-web-react/src/alchemy-components/components/ColorPicker/ColorPicker.tsx b/datahub-web-react/src/alchemy-components/components/ColorPicker/ColorPicker.tsx index 17c101e58f..a2ef66b9b4 100644 --- a/datahub-web-react/src/alchemy-components/components/ColorPicker/ColorPicker.tsx +++ b/datahub-web-react/src/alchemy-components/components/ColorPicker/ColorPicker.tsx @@ -1,7 +1,7 @@ -import React, { useState, useEffect, useCallback } from 'react'; -import styled from 'styled-components'; -import { CirclePicker, ColorResult } from 'react-color'; import { Input, colors } from '@components'; +import React, { useCallback, useEffect, useState } from 'react'; +import { CirclePicker, ColorResult } from 'react-color'; +import styled from 'styled-components'; // Constants const DEFAULT_COLORS = [ diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.stories.tsx b/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.stories.tsx index c116003505..4c478d9fbf 100644 --- a/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.stories.tsx @@ -1,8 +1,9 @@ import type { Meta, StoryObj } from '@storybook/react'; import moment from 'moment'; import React, { useState } from 'react'; -import { DatePicker, datePickerDefault } from './DatePicker'; -import { DatePickerValue } from './types'; + +import { DatePicker, datePickerDefault } from '@components/components/DatePicker/DatePicker'; +import { DatePickerValue } from '@components/components/DatePicker/types'; const meta = { title: 'Forms / DatePicker', diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.tsx b/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.tsx index 765cfdce14..51e679f686 100644 --- a/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.tsx +++ b/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.tsx @@ -1,8 +1,9 @@ import React, { useEffect, useMemo, useState } from 'react'; -import { StyledAntdDatePicker } from './components'; -import useVariantProps from './hooks/useVariantProps'; -import { DatePickerVariant } from './constants'; -import { DatePickerProps, DatePickerValue } from './types'; + +import { StyledAntdDatePicker } from '@components/components/DatePicker/components'; +import { DatePickerVariant } from '@components/components/DatePicker/constants'; +import useVariantProps from '@components/components/DatePicker/hooks/useVariantProps'; +import { DatePickerProps, DatePickerValue } from '@components/components/DatePicker/types'; export const datePickerDefault: DatePickerProps = { variant: DatePickerVariant.Default, diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/components.tsx b/datahub-web-react/src/alchemy-components/components/DatePicker/components.tsx index 8d44635c62..7e84637749 100644 --- a/datahub-web-react/src/alchemy-components/components/DatePicker/components.tsx +++ b/datahub-web-react/src/alchemy-components/components/DatePicker/components.tsx @@ -1,7 +1,8 @@ -import { colors } from '@src/alchemy-components/theme'; import { DatePicker as AntdDatePicker } from 'antd'; import styled from 'styled-components'; +import { colors } from '@src/alchemy-components/theme'; + export const StyledAntdDatePicker = styled(AntdDatePicker)<{ $noDefaultPaddings?: boolean }>` &.ant-picker { ${(props) => props.$noDefaultPaddings && 'padding: 0;'} diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/hooks/useVariantProps.ts b/datahub-web-react/src/alchemy-components/components/DatePicker/hooks/useVariantProps.ts index 65932ba58a..80e77220ee 100644 --- a/datahub-web-react/src/alchemy-components/components/DatePicker/hooks/useVariantProps.ts +++ b/datahub-web-react/src/alchemy-components/components/DatePicker/hooks/useVariantProps.ts @@ -1,7 +1,8 @@ import { useMemo } from 'react'; -import { DatePickerVariant } from '../constants'; -import { VariantProps } from '../types'; -import { CommonVariantProps, DateSwitcherVariantProps } from '../variants'; + +import { DatePickerVariant } from '@components/components/DatePicker/constants'; +import { VariantProps } from '@components/components/DatePicker/types'; +import { CommonVariantProps, DateSwitcherVariantProps } from '@components/components/DatePicker/variants'; export default function useVariantProps(variant: DatePickerVariant | undefined): VariantProps { return useMemo(() => { diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/types.ts b/datahub-web-react/src/alchemy-components/components/DatePicker/types.ts index 4e16346edd..390a9392d7 100644 --- a/datahub-web-react/src/alchemy-components/components/DatePicker/types.ts +++ b/datahub-web-react/src/alchemy-components/components/DatePicker/types.ts @@ -1,6 +1,7 @@ import { DatePicker as AntdDatePicker } from 'antd'; import { Moment } from 'moment'; -import { DatePickerVariant } from './constants'; + +import { DatePickerVariant } from '@components/components/DatePicker/constants'; export type DatePickerProps = { value?: DatePickerValue; diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/common/props.tsx b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/common/props.tsx index 9323530d33..c92d7958d0 100644 --- a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/common/props.tsx +++ b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/common/props.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { StyledCalendarWrapper } from '../../components'; -import { VariantProps } from '../../types'; + +import { StyledCalendarWrapper } from '@components/components/DatePicker/components'; +import { VariantProps } from '@components/components/DatePicker/types'; export const CommonVariantProps: VariantProps = { panelRender: (panel) => {panel}, diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/components.tsx b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/components.tsx index 4e3f0067f9..729d0dbf47 100644 --- a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/components.tsx +++ b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/components.tsx @@ -2,9 +2,10 @@ import { colors } from '@components'; import { CaretLeft, CaretRight } from 'phosphor-react'; import React, { useCallback, useMemo } from 'react'; import styled from 'styled-components'; -import { Text } from '../../../Text/Text'; -import { SwitcherDirection } from './types'; -import { ExtendedInputRenderProps } from '../../types'; + +import { ExtendedInputRenderProps } from '@components/components/DatePicker/types'; +import { SwitcherDirection } from '@components/components/DatePicker/variants/dateSwitcher/types'; +import { Text } from '@components/components/Text/Text'; const StyledContainer = styled.div<{ $opened?: boolean; $disabled?: boolean }>` border: 1px solid ${(props) => (props.$opened || props.$disabled ? colors.gray[1800] : colors.gray[100])}; diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/props.tsx b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/props.tsx index 8deb9ad890..8dc8d3ff63 100644 --- a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/props.tsx +++ b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/props.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { VariantProps } from '../../types'; -import { CommonVariantProps } from '../common/props'; -import { DateSwitcherInput } from './components'; + +import { VariantProps } from '@components/components/DatePicker/types'; +import { CommonVariantProps } from '@components/components/DatePicker/variants/common/props'; +import { DateSwitcherInput } from '@components/components/DatePicker/variants/dateSwitcher/components'; export const DateSwitcherVariantProps: VariantProps = { ...CommonVariantProps, diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/index.ts b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/index.ts index e9ce5e764f..96a4fb7579 100644 --- a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/index.ts +++ b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/index.ts @@ -1,4 +1,4 @@ -import { CommonVariantProps } from './common/props'; -import { DateSwitcherVariantProps } from './dateSwitcher/props'; +import { CommonVariantProps } from '@components/components/DatePicker/variants/common/props'; +import { DateSwitcherVariantProps } from '@components/components/DatePicker/variants/dateSwitcher/props'; export { CommonVariantProps, DateSwitcherVariantProps }; diff --git a/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.stories.tsx b/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.stories.tsx index a295068cae..31a915b94f 100644 --- a/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.stories.tsx @@ -1,10 +1,11 @@ import { BADGE } from '@geometricpanda/storybook-addon-badges'; import type { Meta, StoryObj } from '@storybook/react'; import React, { useState } from 'react'; -import { Button } from '../Button'; -import { Drawer } from './Drawer'; -import { DrawerProps } from './types'; -import { drawerDefault } from './defaults'; + +import { Button } from '@components/components/Button'; +import { Drawer } from '@components/components/Drawer/Drawer'; +import { drawerDefault } from '@components/components/Drawer/defaults'; +import { DrawerProps } from '@components/components/Drawer/types'; // Auto Docs const meta = { diff --git a/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.tsx b/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.tsx index d1c55f6e9c..e73f66d6a1 100644 --- a/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.tsx +++ b/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.tsx @@ -1,10 +1,11 @@ import React from 'react'; -import { Button } from '../Button'; -import { Text } from '../Text'; -import { StyledDrawer, TitleContainer, TitleLeftContainer } from './components'; -import { maskTransparentStyle } from './constants'; -import { DrawerProps } from './types'; -import { drawerDefault } from './defaults'; + +import { Button } from '@components/components/Button'; +import { StyledDrawer, TitleContainer, TitleLeftContainer } from '@components/components/Drawer/components'; +import { maskTransparentStyle } from '@components/components/Drawer/constants'; +import { drawerDefault } from '@components/components/Drawer/defaults'; +import { DrawerProps } from '@components/components/Drawer/types'; +import { Text } from '@components/components/Text'; export const Drawer = ({ title, diff --git a/datahub-web-react/src/alchemy-components/components/Drawer/defaults.ts b/datahub-web-react/src/alchemy-components/components/Drawer/defaults.ts index 41bbe180bb..c5f0677d76 100644 --- a/datahub-web-react/src/alchemy-components/components/Drawer/defaults.ts +++ b/datahub-web-react/src/alchemy-components/components/Drawer/defaults.ts @@ -1,4 +1,4 @@ -import { DrawerProps } from './types'; +import { DrawerProps } from '@components/components/Drawer/types'; export const drawerDefault: Omit = { width: 600, diff --git a/datahub-web-react/src/alchemy-components/components/Dropdown/Dropdown.stories.tsx b/datahub-web-react/src/alchemy-components/components/Dropdown/Dropdown.stories.tsx index 06aab52535..c59efec7fa 100644 --- a/datahub-web-react/src/alchemy-components/components/Dropdown/Dropdown.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Dropdown/Dropdown.stories.tsx @@ -1,7 +1,8 @@ import { BADGE } from '@geometricpanda/storybook-addon-badges'; import { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import Dropdown from './Dropdown'; + +import Dropdown from '@components/components/Dropdown/Dropdown'; // Auto Docs const meta = { diff --git a/datahub-web-react/src/alchemy-components/components/Dropdown/Dropdown.tsx b/datahub-web-react/src/alchemy-components/components/Dropdown/Dropdown.tsx index 21070e5c48..86f0d020ea 100644 --- a/datahub-web-react/src/alchemy-components/components/Dropdown/Dropdown.tsx +++ b/datahub-web-react/src/alchemy-components/components/Dropdown/Dropdown.tsx @@ -1,7 +1,8 @@ import { Dropdown as AntdDropdown } from 'antd'; import React, { useMemo } from 'react'; -import { useOverlayClassStackContext } from '../Utils/OverlayClassContext/OverlayClassContext'; -import { DropdownProps } from './types'; + +import { DropdownProps } from '@components/components/Dropdown/types'; +import { useOverlayClassStackContext } from '@components/components/Utils/OverlayClassContext/OverlayClassContext'; export default function Dropdown({ children, overlayClassName, ...props }: React.PropsWithChildren) { // Get all overlay classes from parents diff --git a/datahub-web-react/src/alchemy-components/components/Editor/Editor.stories.tsx b/datahub-web-react/src/alchemy-components/components/Editor/Editor.stories.tsx index 40da409d5d..659ab74127 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/Editor.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/Editor.stories.tsx @@ -1,11 +1,13 @@ -import type { Meta, StoryObj } from '@storybook/react'; -import { BoldExtension, ItalicExtension } from 'remirror/extensions'; -import { Remirror, ThemeProvider, useRemirror } from '@remirror/react'; -import React from 'react'; -import UserContextProvider from '@src/app/context/UserContextProvider'; import { MockedProvider } from '@apollo/client/testing'; -import { Editor } from './Editor'; -import { EditorTheme } from './EditorTheme'; +import { Remirror, ThemeProvider, useRemirror } from '@remirror/react'; +import type { Meta, StoryObj } from '@storybook/react'; +import React from 'react'; +import { BoldExtension, ItalicExtension } from 'remirror/extensions'; + +import { Editor } from '@components/components/Editor/Editor'; +import { EditorTheme } from '@components/components/Editor/EditorTheme'; + +import UserContextProvider from '@src/app/context/UserContextProvider'; const meta = { title: 'Components / Editor', diff --git a/datahub-web-react/src/alchemy-components/components/Editor/Editor.tsx b/datahub-web-react/src/alchemy-components/components/Editor/Editor.tsx index e9848d7515..93ade66c2e 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/Editor.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/Editor.tsx @@ -1,5 +1,7 @@ -import React, { forwardRef, useEffect, useImperativeHandle } from 'react'; +import { EditorComponent, Remirror, TableComponents, ThemeProvider, useRemirror } from '@remirror/react'; import DOMPurify from 'dompurify'; +import React, { forwardRef, useEffect, useImperativeHandle } from 'react'; +import { useMount } from 'react-use'; import { BlockquoteExtension, BoldExtension, @@ -21,18 +23,17 @@ import { TableExtension, UnderlineExtension, } from 'remirror/extensions'; -import { EditorComponent, Remirror, useRemirror, ThemeProvider, TableComponents } from '@remirror/react'; -import { useMount } from 'react-use'; -import { EditorContainer, EditorTheme } from './EditorTheme'; -import { htmlToMarkdown } from './extensions/htmlToMarkdown'; -import { markdownToHtml } from './extensions/markdownToHtml'; -import { CodeBlockToolbar } from './toolbar/CodeBlockToolbar'; -import { FloatingToolbar } from './toolbar/FloatingToolbar'; -import { Toolbar } from './toolbar/Toolbar'; -import { OnChangeMarkdown } from './OnChangeMarkdown'; -import { TableCellMenu } from './toolbar/TableCellMenu'; -import { DataHubMentionsExtension } from './extensions/mentions/DataHubMentionsExtension'; -import { MentionsComponent } from './extensions/mentions/MentionsComponent'; + +import { EditorContainer, EditorTheme } from '@components/components/Editor/EditorTheme'; +import { OnChangeMarkdown } from '@components/components/Editor/OnChangeMarkdown'; +import { htmlToMarkdown } from '@components/components/Editor/extensions/htmlToMarkdown'; +import { markdownToHtml } from '@components/components/Editor/extensions/markdownToHtml'; +import { DataHubMentionsExtension } from '@components/components/Editor/extensions/mentions/DataHubMentionsExtension'; +import { MentionsComponent } from '@components/components/Editor/extensions/mentions/MentionsComponent'; +import { CodeBlockToolbar } from '@components/components/Editor/toolbar/CodeBlockToolbar'; +import { FloatingToolbar } from '@components/components/Editor/toolbar/FloatingToolbar'; +import { TableCellMenu } from '@components/components/Editor/toolbar/TableCellMenu'; +import { Toolbar } from '@components/components/Editor/toolbar/Toolbar'; type EditorProps = { readOnly?: boolean; diff --git a/datahub-web-react/src/alchemy-components/components/Editor/EditorTheme.tsx b/datahub-web-react/src/alchemy-components/components/Editor/EditorTheme.tsx index 19ca06a381..8a2dcebffc 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/EditorTheme.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/EditorTheme.tsx @@ -1,7 +1,3 @@ -import { defaultRemirrorTheme } from '@remirror/theme'; -import type { RemirrorThemeType } from '@remirror/theme'; -import styled from 'styled-components'; - import { extensionBlockquoteStyledCss, extensionCalloutStyledCss, @@ -15,6 +11,10 @@ import { extensionPositionerStyledCss, extensionTablesStyledCss, } from '@remirror/styles/styled-components'; +import { defaultRemirrorTheme } from '@remirror/theme'; +import type { RemirrorThemeType } from '@remirror/theme'; +import styled from 'styled-components'; + import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; export const EditorTheme: RemirrorThemeType = { diff --git a/datahub-web-react/src/alchemy-components/components/Editor/OnChangeMarkdown.tsx b/datahub-web-react/src/alchemy-components/components/Editor/OnChangeMarkdown.tsx index b6a090f892..f1e1759f49 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/OnChangeMarkdown.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/OnChangeMarkdown.tsx @@ -1,6 +1,6 @@ -import { useCallback } from 'react'; -import { useExtensionEvent, useHelpers } from '@remirror/react'; import { DocChangedExtension } from '@remirror/core'; +import { useExtensionEvent, useHelpers } from '@remirror/react'; +import { useCallback } from 'react'; export interface OnChangeMarkdownProps { onChange: (md: string) => void; diff --git a/datahub-web-react/src/alchemy-components/components/Editor/extensions/htmlToMarkdown.tsx b/datahub-web-react/src/alchemy-components/components/Editor/extensions/htmlToMarkdown.tsx index 45a9e85882..86022a43da 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/extensions/htmlToMarkdown.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/extensions/htmlToMarkdown.tsx @@ -1,7 +1,8 @@ +import { ErrorConstant, defaultImport, invariant, isElementDomNode } from '@remirror/core'; import _TurndownService from 'turndown'; import { gfm } from 'turndown-plugin-gfm'; -import { defaultImport, ErrorConstant, invariant, isElementDomNode } from '@remirror/core'; -import { DATAHUB_MENTION_ATTRS } from './mentions/DataHubMentionsExtension'; + +import { DATAHUB_MENTION_ATTRS } from '@components/components/Editor/extensions/mentions/DataHubMentionsExtension'; const TurndownService = defaultImport(_TurndownService); diff --git a/datahub-web-react/src/alchemy-components/components/Editor/extensions/markdownToHtml.tsx b/datahub-web-react/src/alchemy-components/components/Editor/extensions/markdownToHtml.tsx index 07efa16a98..a3f321817e 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/extensions/markdownToHtml.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/extensions/markdownToHtml.tsx @@ -1,5 +1,6 @@ import { marked } from 'marked'; -import { DATAHUB_MENTION_ATTRS } from './mentions/DataHubMentionsExtension'; + +import { DATAHUB_MENTION_ATTRS } from '@components/components/Editor/extensions/mentions/DataHubMentionsExtension'; marked.use({ renderer: { diff --git a/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/DataHubMentionsExtension.tsx b/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/DataHubMentionsExtension.tsx index ed7881b340..d4abc66ba6 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/DataHubMentionsExtension.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/DataHubMentionsExtension.tsx @@ -1,19 +1,17 @@ /* eslint-disable class-methods-use-this */ -import React, { ComponentType } from 'react'; -import type { Plugin } from 'prosemirror-state'; import { ApplySchemaAttributes, CommandFunction, - extension, ExtensionTag, FromToProps, Handler, - isElementDomNode, NodeExtension, NodeExtensionSpec, NodeSpecOverride, - omitExtraAttributes, ProsemirrorAttributes, + extension, + isElementDomNode, + omitExtraAttributes, } from '@remirror/core'; import { NodeViewComponentProps } from '@remirror/react'; import autocomplete, { @@ -21,7 +19,10 @@ import autocomplete, { AutocompleteAction, pluginKey as acPluginKey, } from 'prosemirror-autocomplete'; -import { MentionsNodeView } from './MentionsNodeView'; +import type { Plugin } from 'prosemirror-state'; +import React, { ComponentType } from 'react'; + +import { MentionsNodeView } from '@components/components/Editor/extensions/mentions/MentionsNodeView'; export const DATAHUB_MENTION_ATTRS = { urn: 'data-datahub-mention-urn', diff --git a/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/MentionsComponent.tsx b/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/MentionsComponent.tsx index 8af0f15554..5fa218b60f 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/MentionsComponent.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/MentionsComponent.tsx @@ -1,14 +1,16 @@ -import React, { useEffect, useState } from 'react'; -import { useDebounce } from 'react-use'; +import { LoadingOutlined } from '@ant-design/icons'; import { FloatingWrapper } from '@remirror/react'; import { Empty, Spin } from 'antd'; -import styled from 'styled-components'; -import { LoadingOutlined } from '@ant-design/icons'; +import React, { useEffect, useState } from 'react'; +import { useDebounce } from 'react-use'; import { Positioner, selectionPositioner } from 'remirror/extensions'; +import styled from 'styled-components'; + +import { MentionsDropdown } from '@components/components/Editor/extensions/mentions/MentionsDropdown'; +import { useDataHubMentions } from '@components/components/Editor/extensions/mentions/useDataHubMentions'; + import { useUserContext } from '@src/app/context/useUserContext'; import { useGetAutoCompleteMultipleResultsLazyQuery } from '@src/graphql/search.generated'; -import { MentionsDropdown } from './MentionsDropdown'; -import { useDataHubMentions } from './useDataHubMentions'; const Container = styled.div` position: relative; diff --git a/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/MentionsDropdown.tsx b/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/MentionsDropdown.tsx index 6cd2f22e79..63b5fb0f12 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/MentionsDropdown.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/MentionsDropdown.tsx @@ -1,13 +1,15 @@ -import React, { useCallback, useMemo, useState } from 'react'; -import { Typography } from 'antd'; -import styled from 'styled-components'; -import { useDebounce } from 'react-use'; import { useCommands } from '@remirror/react'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { Typography } from 'antd'; +import React, { useCallback, useMemo, useState } from 'react'; +import { useDebounce } from 'react-use'; +import styled from 'styled-components'; + +import { useDataHubMentions } from '@components/components/Editor/extensions/mentions/useDataHubMentions'; + import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; -import { AutoCompleteResultForEntity, Entity, EntityType } from '@src/types.generated'; import AutoCompleteItem from '@src/app/searchV2/autoComplete/AutoCompleteItem'; -import { useDataHubMentions } from './useDataHubMentions'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { AutoCompleteResultForEntity, Entity, EntityType } from '@src/types.generated'; const HeaderItem = styled(Typography.Text)` display: block; diff --git a/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/MentionsNodeView.tsx b/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/MentionsNodeView.tsx index e82e53be93..6b0ff698b9 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/MentionsNodeView.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/MentionsNodeView.tsx @@ -1,14 +1,14 @@ -import React from 'react'; -import { Typography } from 'antd'; import { Tooltip } from '@components'; +import { NodeViewComponentProps } from '@remirror/react'; +import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { NodeViewComponentProps } from '@remirror/react'; +import { IconStyleType } from '@src/app/entityV2/Entity'; import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; +import { HoverEntityTooltip } from '@src/app/recommendations/renderer/component/HoverEntityTooltip'; import { useEntityRegistry } from '@src/app/useEntityRegistry'; import { useGetEntityMentionNodeQuery } from '@src/graphql/search.generated'; -import { IconStyleType } from '@src/app/entityV2/Entity'; -import { HoverEntityTooltip } from '@src/app/recommendations/renderer/component/HoverEntityTooltip'; const { Text } = Typography; diff --git a/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/useDataHubMentions.ts b/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/useDataHubMentions.ts index 8a4fd37b5e..bf8dd477e5 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/useDataHubMentions.ts +++ b/datahub-web-react/src/alchemy-components/components/Editor/extensions/mentions/useDataHubMentions.ts @@ -1,7 +1,8 @@ -import { useCallback, useEffect, useState } from 'react'; import { useRemirrorContext } from '@remirror/react'; import { ActionKind, AutocompleteAction, FromTo } from 'prosemirror-autocomplete'; -import { DataHubMentionsExtension } from './DataHubMentionsExtension'; +import { useCallback, useEffect, useState } from 'react'; + +import { DataHubMentionsExtension } from '@components/components/Editor/extensions/mentions/DataHubMentionsExtension'; type State = { active: boolean; diff --git a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/AddImageButton.tsx b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/AddImageButton.tsx index d290812b16..011ab9b6d9 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/AddImageButton.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/AddImageButton.tsx @@ -1,9 +1,11 @@ -import React, { useState } from 'react'; -import { Form, Input, Modal, Typography } from 'antd'; -import { useCommands } from '@remirror/react'; import { Image } from '@phosphor-icons/react'; +import { useCommands } from '@remirror/react'; +import { Form, Input, Modal, Typography } from 'antd'; +import React, { useState } from 'react'; + +import { CommandButton } from '@components/components/Editor/toolbar/CommandButton'; + import { colors } from '@src/alchemy-components/theme'; -import { CommandButton } from './CommandButton'; export const AddImageButton = () => { const [isModalVisible, setModalVisible] = useState(false); diff --git a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/AddLinkButton.tsx b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/AddLinkButton.tsx index f480d8ce51..f486cddaf3 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/AddLinkButton.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/AddLinkButton.tsx @@ -1,10 +1,11 @@ -import React, { useState } from 'react'; -import { useActive } from '@remirror/react'; import { LinkSimpleHorizontal } from '@phosphor-icons/react'; -import { colors } from '@src/alchemy-components/theme'; +import { useActive } from '@remirror/react'; +import React, { useState } from 'react'; -import { CommandButton } from './CommandButton'; -import { LinkModal } from './LinkModal'; +import { CommandButton } from '@components/components/Editor/toolbar/CommandButton'; +import { LinkModal } from '@components/components/Editor/toolbar/LinkModal'; + +import { colors } from '@src/alchemy-components/theme'; export const AddLinkButton = () => { const [isModalVisible, setModalVisible] = useState(false); diff --git a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/CodeBlockToolbar.tsx b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/CodeBlockToolbar.tsx index 1aa7b0e514..f578ef7eea 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/CodeBlockToolbar.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/CodeBlockToolbar.tsx @@ -1,11 +1,12 @@ -import React from 'react'; -import styled from 'styled-components'; -import { Select } from 'antd'; import { findParentNodeOfType, isElementDomNode } from '@remirror/core'; -import { defaultAbsolutePosition, hasStateChanged, isPositionVisible, Positioner } from 'remirror/extensions'; import { FloatingWrapper, useAttrs, useCommands } from '@remirror/react'; +import { Select } from 'antd'; +import React from 'react'; import { listLanguages } from 'refractor'; -import { ToolbarContainer } from './FloatingToolbar'; +import { Positioner, defaultAbsolutePosition, hasStateChanged, isPositionVisible } from 'remirror/extensions'; +import styled from 'styled-components'; + +import { ToolbarContainer } from '@components/components/Editor/toolbar/FloatingToolbar'; const StyledSelect = styled(Select)` min-width: 120px; diff --git a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/CommandButton.tsx b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/CommandButton.tsx index caa382327a..3a1f78ca4e 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/CommandButton.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/CommandButton.tsx @@ -1,8 +1,8 @@ -import React, { MouseEventHandler, useCallback } from 'react'; -import { Button, ButtonProps } from 'antd'; import { Tooltip } from '@components'; import { capitalCase } from '@remirror/core'; import { useHelpers } from '@remirror/react'; +import { Button, ButtonProps } from 'antd'; +import React, { MouseEventHandler, useCallback } from 'react'; export interface CommandButtonProps extends Omit { active?: boolean; diff --git a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/FloatingToolbar.tsx b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/FloatingToolbar.tsx index 61bc3dafe9..8cbe6337cc 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/FloatingToolbar.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/FloatingToolbar.tsx @@ -1,6 +1,3 @@ -import React, { useMemo, useState } from 'react'; -import styled from 'styled-components'; -import { Typography } from 'antd'; import { BoldOutlined, DisconnectOutlined, @@ -10,12 +7,16 @@ import { UnderlineOutlined, } from '@ant-design/icons'; import { FloatingWrapper, useActive, useAttrs, useCommands } from '@remirror/react'; +import { Typography } from 'antd'; +import React, { useMemo, useState } from 'react'; import { createMarkPositioner } from 'remirror/extensions'; -import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; +import styled from 'styled-components'; -import { CommandButton } from './CommandButton'; -import { LinkModal } from './LinkModal'; -import { CodeIcon } from './Icons'; +import { CommandButton } from '@components/components/Editor/toolbar/CommandButton'; +import { CodeIcon } from '@components/components/Editor/toolbar/Icons'; +import { LinkModal } from '@components/components/Editor/toolbar/LinkModal'; + +import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; const { Text } = Typography; @@ -25,7 +26,10 @@ export const ToolbarContainer = styled.span` padding: 2px; background-color: ${ANTD_GRAY[1]}; border-radius: 4px; - box-shadow: 0 3px 6px -4px #0000001f, 0 6px 16px #00000014, 0 9px 28px 8px #0000000d; + box-shadow: + 0 3px 6px -4px #0000001f, + 0 6px 16px #00000014, + 0 9px 28px 8px #0000000d; overflow: hidden; z-index: 300; `; diff --git a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/HeadingMenu.tsx b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/HeadingMenu.tsx index 4437a9ed85..735fafd591 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/HeadingMenu.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/HeadingMenu.tsx @@ -1,7 +1,8 @@ -import React, { MouseEventHandler, useCallback } from 'react'; -import { Select } from 'antd'; -import styled from 'styled-components'; import { useActive, useCommands } from '@remirror/react'; +import { Select } from 'antd'; +import React, { MouseEventHandler, useCallback } from 'react'; +import styled from 'styled-components'; + import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; const { Option } = Select; diff --git a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/Icons.tsx b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/Icons.tsx index b7954fd7b6..2f967abaf9 100644 --- a/datahub-web-react/src/alchemy-components/components/Editor/toolbar/Icons.tsx +++ b/datahub-web-react/src/alchemy-components/components/Editor/toolbar/Icons.tsx @@ -1,6 +1,6 @@ -import React from 'react'; import Icon from '@ant-design/icons'; import { CustomIconComponentProps } from '@ant-design/icons/lib/components/Icon'; +import React from 'react'; export const CodeIcon = (props: Partial) => ( = { icon: 'AccountCircle', diff --git a/datahub-web-react/src/alchemy-components/components/Icon/Icon.tsx b/datahub-web-react/src/alchemy-components/components/Icon/Icon.tsx index 5bf9615487..2010a0f001 100644 --- a/datahub-web-react/src/alchemy-components/components/Icon/Icon.tsx +++ b/datahub-web-react/src/alchemy-components/components/Icon/Icon.tsx @@ -1,10 +1,9 @@ import React from 'react'; -import { getFontSize, getColor, getRotationTransform } from '@components/theme/utils'; - -import { IconProps, IconPropsDefaults } from './types'; -import { IconWrapper } from './components'; -import { getIconNames, getIconComponent } from './utils'; +import { IconWrapper } from '@components/components/Icon/components'; +import { IconProps, IconPropsDefaults } from '@components/components/Icon/types'; +import { getIconComponent, getIconNames } from '@components/components/Icon/utils'; +import { getColor, getFontSize, getRotationTransform } from '@components/theme/utils'; export const iconDefaults: IconPropsDefaults = { source: 'material', diff --git a/datahub-web-react/src/alchemy-components/components/Icon/types.ts b/datahub-web-react/src/alchemy-components/components/Icon/types.ts index 76f350519f..baeb87242a 100644 --- a/datahub-web-react/src/alchemy-components/components/Icon/types.ts +++ b/datahub-web-react/src/alchemy-components/components/Icon/types.ts @@ -1,7 +1,7 @@ import { HTMLAttributes } from 'react'; -import type { FontSizeOptions, FontColorOptions, RotationOptions } from '@components/theme/config'; -import { AVAILABLE_ICONS } from './constants'; +import { AVAILABLE_ICONS } from '@components/components/Icon/constants'; +import type { FontColorOptions, FontSizeOptions, RotationOptions } from '@components/theme/config'; // Utility function to create an enum from an array of strings function createEnum(values: T[]): { [K in T]: K } { diff --git a/datahub-web-react/src/alchemy-components/components/Icon/utils.ts b/datahub-web-react/src/alchemy-components/components/Icon/utils.ts index 2cbbbb0812..21a67a2ebe 100644 --- a/datahub-web-react/src/alchemy-components/components/Icon/utils.ts +++ b/datahub-web-react/src/alchemy-components/components/Icon/utils.ts @@ -1,7 +1,8 @@ -import { IconSource } from '@components/components/Icon/types'; import * as materialIcons from '@mui/icons-material'; import * as phosphorIcons from 'phosphor-react'; +import { IconSource } from '@components/components/Icon/types'; + export const getIconNames = () => { // We only want "Filled" (mui default) and "Outlined" icons const filtered = Object.keys(materialIcons).filter( diff --git a/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.stories.tsx b/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.stories.tsx index 3f831d1b4c..8e9f65934d 100644 --- a/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.stories.tsx @@ -1,9 +1,9 @@ -import React from 'react'; -import { Meta, StoryObj } from '@storybook/react'; import { Airplane } from '@phosphor-icons/react'; +import { Meta, StoryObj } from '@storybook/react'; +import React from 'react'; -import { IconLabel } from './IconLabel'; -import { IconType } from './types'; +import { IconLabel } from '@components/components/IconLabel/IconLabel'; +import { IconType } from '@components/components/IconLabel/types'; const meta: Meta = { title: 'Components / IconLabel', diff --git a/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.tsx b/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.tsx index 3593f409e5..c17b55ccfe 100644 --- a/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.tsx +++ b/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.tsx @@ -1,7 +1,8 @@ import React, { useEffect, useState } from 'react'; -import { IconLabelProps, IconType } from './types'; -import { IconLabelContainer, ImageContainer, Label } from './components'; -import { isValidImageUrl } from './utils'; + +import { IconLabelContainer, ImageContainer, Label } from '@components/components/IconLabel/components'; +import { IconLabelProps, IconType } from '@components/components/IconLabel/types'; +import { isValidImageUrl } from '@components/components/IconLabel/utils'; export const IconLabel = ({ icon, name, type, style, imageUrl, testId }: IconLabelProps) => { const [isValidImage, setIsValidImage] = useState(false); diff --git a/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.stories.tsx b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.stories.tsx index 7e21c5c9fc..0b159357f7 100644 --- a/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.stories.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Meta, StoryObj } from '@storybook/react'; -import { IncidentPriorityLabel } from './IncidentPriorityLabel'; +import React from 'react'; + +import { IncidentPriorityLabel } from '@components/components/IncidentPriorityLabel/IncidentPriorityLabel'; const meta: Meta = { title: 'Components / IncidentPriorityLabel', diff --git a/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.tsx b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.tsx index 34f435d059..83e7dfa860 100644 --- a/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.tsx +++ b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.tsx @@ -1,15 +1,15 @@ import React from 'react'; -import CriticalIcon from '@src/images/incident-critical.svg'; +import { IconLabel } from '@components/components/IconLabel'; +import { IconType } from '@components/components/IconLabel/types'; +import { Label, StyledImage } from '@components/components/IncidentPriorityLabel/components'; +import { PRIORITIES } from '@components/components/IncidentPriorityLabel/constant'; +import { IncidentPriorityLabelProps } from '@components/components/IncidentPriorityLabel/types'; + +import LowIcon from '@src/images/incident-chart-bar-one.svg'; import HighIcon from '@src/images/incident-chart-bar-three.svg'; import MediumIcon from '@src/images/incident-chart-bar-two.svg'; -import LowIcon from '@src/images/incident-chart-bar-one.svg'; -import { Label, StyledImage } from './components'; - -import { IconLabel } from '../IconLabel'; -import { IncidentPriorityLabelProps } from './types'; -import { PRIORITIES } from './constant'; -import { IconType } from '../IconLabel/types'; +import CriticalIcon from '@src/images/incident-critical.svg'; // 🔄 Map priorities to icons for cleaner code const priorityIcons = { diff --git a/datahub-web-react/src/alchemy-components/components/IncidentStagePill/IncidentStagePill.stories.tsx b/datahub-web-react/src/alchemy-components/components/IncidentStagePill/IncidentStagePill.stories.tsx index 7d8ac6642a..4803df39cd 100644 --- a/datahub-web-react/src/alchemy-components/components/IncidentStagePill/IncidentStagePill.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/IncidentStagePill/IncidentStagePill.stories.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Meta, StoryObj } from '@storybook/react'; -import { IncidentStagePill } from './IncidentStagePill'; +import React from 'react'; + +import { IncidentStagePill } from '@components/components/IncidentStagePill/IncidentStagePill'; const meta: Meta = { title: 'Components / IncidentStagePill', diff --git a/datahub-web-react/src/alchemy-components/components/IncidentStagePill/IncidentStagePill.tsx b/datahub-web-react/src/alchemy-components/components/IncidentStagePill/IncidentStagePill.tsx index ff82bd580f..741d4657cd 100644 --- a/datahub-web-react/src/alchemy-components/components/IncidentStagePill/IncidentStagePill.tsx +++ b/datahub-web-react/src/alchemy-components/components/IncidentStagePill/IncidentStagePill.tsx @@ -1,10 +1,11 @@ +import { CheckCircle, Circle, CircleDashed, CircleHalf, Hexagon } from '@phosphor-icons/react'; import React from 'react'; -import { Hexagon, Circle, CircleHalf, CheckCircle, CircleDashed } from '@phosphor-icons/react'; -import { IncidentStage } from '@src/types.generated'; -import colors from '@src/alchemy-components/theme/foundations/colors'; -import { Pill } from '../Pills'; -import { IncidentStageLabel } from './constant'; +import { IncidentStageLabel } from '@components/components/IncidentStagePill/constant'; +import { Pill } from '@components/components/Pills'; + +import colors from '@src/alchemy-components/theme/foundations/colors'; +import { IncidentStage } from '@src/types.generated'; const INCIDENT_STAGE = { [IncidentStage.Triage]: { diff --git a/datahub-web-react/src/alchemy-components/components/Input/Input.stories.tsx b/datahub-web-react/src/alchemy-components/components/Input/Input.stories.tsx index 10597cf64c..458f07a060 100644 --- a/datahub-web-react/src/alchemy-components/components/Input/Input.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Input/Input.stories.tsx @@ -1,13 +1,11 @@ -import { MATERIAL_UI_ICONS, PHOSPHOR_ICONS } from '@components/components/Icon/constants'; +import { BADGE } from '@geometricpanda/storybook-addon-badges'; +import type { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import type { Meta, StoryObj } from '@storybook/react'; -import { BADGE } from '@geometricpanda/storybook-addon-badges'; - import { GridList } from '@components/.docs/mdx-components'; -import { AVAILABLE_ICONS } from '../Icon'; - -import { Input, inputDefaults } from './Input'; +import { AVAILABLE_ICONS } from '@components/components/Icon'; +import { MATERIAL_UI_ICONS, PHOSPHOR_ICONS } from '@components/components/Icon/constants'; +import { Input, inputDefaults } from '@components/components/Input/Input'; const meta = { title: 'Forms / Input', diff --git a/datahub-web-react/src/alchemy-components/components/Input/Input.tsx b/datahub-web-react/src/alchemy-components/components/Input/Input.tsx index c98187e414..1fd3b440c7 100644 --- a/datahub-web-react/src/alchemy-components/components/Input/Input.tsx +++ b/datahub-web-react/src/alchemy-components/components/Input/Input.tsx @@ -2,12 +2,18 @@ import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { InputProps } from './types'; - -import { ErrorMessage, InputContainer, InputField, InputWrapper, Label, Required, WarningMessage } from './components'; - -import { Icon } from '../Icon'; -import { getInputType } from './utils'; +import { Icon } from '@components/components/Icon'; +import { + ErrorMessage, + InputContainer, + InputField, + InputWrapper, + Label, + Required, + WarningMessage, +} from '@components/components/Input/components'; +import { InputProps } from '@components/components/Input/types'; +import { getInputType } from '@components/components/Input/utils'; export const inputDefaults: InputProps = { value: '', diff --git a/datahub-web-react/src/alchemy-components/components/Input/components.ts b/datahub-web-react/src/alchemy-components/components/Input/components.ts index d1c337642d..752bcf62ca 100644 --- a/datahub-web-react/src/alchemy-components/components/Input/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Input/components.ts @@ -1,16 +1,14 @@ import styled from 'styled-components'; -import theme, { borders, colors, radius, spacing, typography } from '@components/theme'; -import { getStatusColors } from '@components/theme/utils'; - +import type { InputProps } from '@components/components/Input/types'; import { INPUT_MAX_HEIGHT, formLabelTextStyles, - inputValueTextStyles, inputPlaceholderTextStyles, -} from '../commonStyles'; - -import type { InputProps } from './types'; + inputValueTextStyles, +} from '@components/components/commonStyles'; +import theme, { borders, colors, radius, spacing, typography } from '@components/theme'; +import { getStatusColors } from '@components/theme/utils'; const defaultFlexStyles = { display: 'flex', diff --git a/datahub-web-react/src/alchemy-components/components/Input/types.ts b/datahub-web-react/src/alchemy-components/components/Input/types.ts index 8a8e8a02c1..872bc672f5 100644 --- a/datahub-web-react/src/alchemy-components/components/Input/types.ts +++ b/datahub-web-react/src/alchemy-components/components/Input/types.ts @@ -1,6 +1,7 @@ -import { IconProps } from '@components/components/Icon/types'; import React, { InputHTMLAttributes } from 'react'; +import { IconProps } from '@components/components/Icon/types'; + export interface InputProps extends InputHTMLAttributes { value?: string | number | readonly string[] | undefined; setValue?: React.Dispatch>; diff --git a/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.stories.tsx b/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.stories.tsx index 260786cf76..bf140adb99 100644 --- a/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.stories.tsx @@ -1,9 +1,10 @@ -import React from 'react'; import { BADGE } from '@geometricpanda/storybook-addon-badges'; import type { Meta, StoryObj } from '@storybook/react'; -import { LineChart } from './LineChart'; -import { getMockedProps } from '../BarChart/utils'; -import { DEFAULT_MAX_DOMAIN_VALUE } from '../BarChart/hooks/usePrepareScales'; +import React from 'react'; + +import { DEFAULT_MAX_DOMAIN_VALUE } from '@components/components/BarChart/hooks/usePrepareScales'; +import { getMockedProps } from '@components/components/BarChart/utils'; +import { LineChart } from '@components/components/LineChart/LineChart'; const meta = { title: 'Charts / LineChart', diff --git a/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.tsx b/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.tsx index f4571fedc6..94c90fbe65 100644 --- a/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.tsx +++ b/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.tsx @@ -1,25 +1,27 @@ -import { abbreviateNumber } from '@src/app/dataviz/utils'; import { curveMonotoneX } from '@visx/curve'; import { ParentSize } from '@visx/responsive'; import { AreaSeries, Axis, AxisScale, GlyphSeries, Grid, Tooltip, XYChart } from '@visx/xychart'; import React, { useMemo, useState } from 'react'; -import usePrepareScales from '../BarChart/hooks/usePrepareScales'; -import useMergedProps from '../BarChart/hooks/useMergedProps'; -import { AxisProps, GridProps } from '../BarChart/types'; -import { getMockedProps } from '../BarChart/utils'; -import { Popover } from '../Popover'; -import { ChartWrapper } from './components'; -import { Datum, LineChartProps } from './types'; + // FIY: tooltip has a bug when glyph and vertical/horizontal crosshair can be shown behind the graph // issue: https://github.com/airbnb/visx/issues/1333 // We have this problem when LineChart shown on Drawer // That can be fixed by adding z-idex // But there are no ways to do it with StyledComponents as glyph and crosshairs rendered in portals // https://github.com/styled-components/styled-components/issues/2620 -import LeftAxisMarginSetter from '../BarChart/components/LeftAxisMarginSetter'; -import './customTooltip.css'; -import { lineChartDefault } from './defaults'; -import useMinDataValue from '../BarChart/hooks/useMinDataValue'; +import LeftAxisMarginSetter from '@components/components/BarChart/components/LeftAxisMarginSetter'; +import useMergedProps from '@components/components/BarChart/hooks/useMergedProps'; +import useMinDataValue from '@components/components/BarChart/hooks/useMinDataValue'; +import usePrepareScales from '@components/components/BarChart/hooks/usePrepareScales'; +import { AxisProps, GridProps } from '@components/components/BarChart/types'; +import { getMockedProps } from '@components/components/BarChart/utils'; +import { ChartWrapper } from '@components/components/LineChart/components'; +import '@components/components/LineChart/customTooltip.css'; +import { lineChartDefault } from '@components/components/LineChart/defaults'; +import { Datum, LineChartProps } from '@components/components/LineChart/types'; +import { Popover } from '@components/components/Popover'; + +import { abbreviateNumber } from '@src/app/dataviz/utils'; export function LineChart({ data, diff --git a/datahub-web-react/src/alchemy-components/components/LineChart/components.tsx b/datahub-web-react/src/alchemy-components/components/LineChart/components.tsx index e74e5d9a9e..073d510dc5 100644 --- a/datahub-web-react/src/alchemy-components/components/LineChart/components.tsx +++ b/datahub-web-react/src/alchemy-components/components/LineChart/components.tsx @@ -1,8 +1,10 @@ -import { colors } from '@src/alchemy-components/theme'; import React, { forwardRef, useEffect, useRef } from 'react'; import styled from 'styled-components'; -import { GLYPH_DROP_SHADOW_FILTER } from './constants'; -import { GlyphProps } from './types'; + +import { GLYPH_DROP_SHADOW_FILTER } from '@components/components/LineChart/constants'; +import { GlyphProps } from '@components/components/LineChart/types'; + +import { colors } from '@src/alchemy-components/theme'; export const ChartWrapper = styled.div` width: 100%; diff --git a/datahub-web-react/src/alchemy-components/components/LineChart/defaults.tsx b/datahub-web-react/src/alchemy-components/components/LineChart/defaults.tsx index cb6eb52967..1978d5086e 100644 --- a/datahub-web-react/src/alchemy-components/components/LineChart/defaults.tsx +++ b/datahub-web-react/src/alchemy-components/components/LineChart/defaults.tsx @@ -1,13 +1,15 @@ -import React from 'react'; import { TickLabelProps } from '@visx/axis'; -import { colors } from '@src/alchemy-components/theme'; -import dayjs from 'dayjs'; import { LinearGradient } from '@visx/gradient'; -import { Datum, LineChartProps } from './types'; -import { abbreviateNumber } from '../dataviz/utils'; -import { roundToEven } from './utils'; -import { GLYPH_DROP_SHADOW_FILTER } from './constants'; -import { Glyph, TooltipGlyph } from './components'; +import dayjs from 'dayjs'; +import React from 'react'; + +import { Glyph, TooltipGlyph } from '@components/components/LineChart/components'; +import { GLYPH_DROP_SHADOW_FILTER } from '@components/components/LineChart/constants'; +import { Datum, LineChartProps } from '@components/components/LineChart/types'; +import { roundToEven } from '@components/components/LineChart/utils'; +import { abbreviateNumber } from '@components/components/dataviz/utils'; + +import { colors } from '@src/alchemy-components/theme'; const commonTickLabelProps: TickLabelProps = { fontSize: 10, diff --git a/datahub-web-react/src/alchemy-components/components/LineChart/types.ts b/datahub-web-react/src/alchemy-components/components/LineChart/types.ts index 2e224715e2..0f2f965c7c 100644 --- a/datahub-web-react/src/alchemy-components/components/LineChart/types.ts +++ b/datahub-web-react/src/alchemy-components/components/LineChart/types.ts @@ -1,8 +1,9 @@ import { AxisScaleOutput } from '@visx/axis'; import { ScaleConfig } from '@visx/scale'; -import { GlyphProps as VisxGlyphProps, Margin } from '@visx/xychart'; +import { Margin, GlyphProps as VisxGlyphProps } from '@visx/xychart'; import React from 'react'; -import { AxisProps, BaseDatum, GridProps } from '../BarChart/types'; + +import { AxisProps, BaseDatum, GridProps } from '@components/components/BarChart/types'; export type Datum = BaseDatum; diff --git a/datahub-web-react/src/alchemy-components/components/Loader/Loader.tsx b/datahub-web-react/src/alchemy-components/components/Loader/Loader.tsx index 53ec36d34e..ff2258e269 100644 --- a/datahub-web-react/src/alchemy-components/components/Loader/Loader.tsx +++ b/datahub-web-react/src/alchemy-components/components/Loader/Loader.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { LoaderBackRing, LoaderWrapper, StyledLoadingOutlined } from './components'; -import { LoaderSizes, RingWidths } from './constants'; -import { LoaderProps } from './types'; + +import { LoaderBackRing, LoaderWrapper, StyledLoadingOutlined } from '@components/components/Loader/components'; +import { LoaderSizes, RingWidths } from '@components/components/Loader/constants'; +import { LoaderProps } from '@components/components/Loader/types'; export const loaderDefault: LoaderProps = { size: 'md', diff --git a/datahub-web-react/src/alchemy-components/components/Loader/Loading.stories.tsx b/datahub-web-react/src/alchemy-components/components/Loader/Loading.stories.tsx index 8d06d54c32..f234bead0c 100644 --- a/datahub-web-react/src/alchemy-components/components/Loader/Loading.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Loader/Loading.stories.tsx @@ -1,8 +1,10 @@ import { BADGE } from '@geometricpanda/storybook-addon-badges'; -import { GridList } from '@src/alchemy-components/.docs/mdx-components'; import type { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import { Loader, loaderDefault } from './Loader'; + +import { Loader, loaderDefault } from '@components/components/Loader/Loader'; + +import { GridList } from '@src/alchemy-components/.docs/mdx-components'; const meta = { title: 'Components / Loader', diff --git a/datahub-web-react/src/alchemy-components/components/Loader/components.tsx b/datahub-web-react/src/alchemy-components/components/Loader/components.tsx index 161d342204..89001bcdbb 100644 --- a/datahub-web-react/src/alchemy-components/components/Loader/components.tsx +++ b/datahub-web-react/src/alchemy-components/components/Loader/components.tsx @@ -1,7 +1,9 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { colors } from '@src/alchemy-components/theme'; import styled from 'styled-components'; -import { AlignItemsOptions, JustifyContentOptions } from './types'; + +import { AlignItemsOptions, JustifyContentOptions } from '@components/components/Loader/types'; + +import { colors } from '@src/alchemy-components/theme'; export const LoaderWrapper = styled.div<{ $marginTop?: number; diff --git a/datahub-web-react/src/alchemy-components/components/MatchText/MatchText.stories.tsx b/datahub-web-react/src/alchemy-components/components/MatchText/MatchText.stories.tsx index 5a3e384dc9..8ba7db885e 100644 --- a/datahub-web-react/src/alchemy-components/components/MatchText/MatchText.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/MatchText/MatchText.stories.tsx @@ -1,10 +1,9 @@ +import { BADGE } from '@geometricpanda/storybook-addon-badges'; +import type { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import type { Meta, StoryObj } from '@storybook/react'; -import { BADGE } from '@geometricpanda/storybook-addon-badges'; - -import MatchText from './MatchText'; -import { matchTextDefaults } from './defaults'; +import MatchText from '@components/components/MatchText/MatchText'; +import { matchTextDefaults } from '@components/components/MatchText/defaults'; // Auto Docs const meta = { diff --git a/datahub-web-react/src/alchemy-components/components/MatchText/MatchText.tsx b/datahub-web-react/src/alchemy-components/components/MatchText/MatchText.tsx index 760ba569a7..c4e17395a6 100644 --- a/datahub-web-react/src/alchemy-components/components/MatchText/MatchText.tsx +++ b/datahub-web-react/src/alchemy-components/components/MatchText/MatchText.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import { Text } from '../Text'; -import { matchTextDefaults } from './defaults'; -import { MatchTextProps } from './types'; -import { annotateHighlightedText } from './utils'; + +import { matchTextDefaults } from '@components/components/MatchText/defaults'; +import { MatchTextProps } from '@components/components/MatchText/types'; +import { annotateHighlightedText } from '@components/components/MatchText/utils'; +import { Text } from '@components/components/Text'; export default function MatchText({ text, diff --git a/datahub-web-react/src/alchemy-components/components/MatchText/__tests__/annotateHighlightedText.test.ts b/datahub-web-react/src/alchemy-components/components/MatchText/__tests__/annotateHighlightedText.test.ts index 7d41f89536..f38431491b 100644 --- a/datahub-web-react/src/alchemy-components/components/MatchText/__tests__/annotateHighlightedText.test.ts +++ b/datahub-web-react/src/alchemy-components/components/MatchText/__tests__/annotateHighlightedText.test.ts @@ -1,4 +1,4 @@ -import { annotateHighlightedText } from '../utils'; +import { annotateHighlightedText } from '@components/components/MatchText/utils'; const SAMPLE_INPUT = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit'; diff --git a/datahub-web-react/src/alchemy-components/components/MatchText/defaults.ts b/datahub-web-react/src/alchemy-components/components/MatchText/defaults.ts index 7d8299e17f..f7a411ce17 100644 --- a/datahub-web-react/src/alchemy-components/components/MatchText/defaults.ts +++ b/datahub-web-react/src/alchemy-components/components/MatchText/defaults.ts @@ -1,5 +1,5 @@ -import { textDefaults } from '../Text'; -import { MatchTextProps } from './types'; +import { MatchTextProps } from '@components/components/MatchText/types'; +import { textDefaults } from '@components/components/Text'; export const matchTextDefaults: Partial = { ...textDefaults, diff --git a/datahub-web-react/src/alchemy-components/components/MatchText/index.ts b/datahub-web-react/src/alchemy-components/components/MatchText/index.ts index e7621ab172..da0887fe02 100644 --- a/datahub-web-react/src/alchemy-components/components/MatchText/index.ts +++ b/datahub-web-react/src/alchemy-components/components/MatchText/index.ts @@ -1,3 +1,3 @@ -import MatchText from './MatchText'; +import MatchText from '@components/components/MatchText/MatchText'; export { MatchText }; diff --git a/datahub-web-react/src/alchemy-components/components/MatchText/types.ts b/datahub-web-react/src/alchemy-components/components/MatchText/types.ts index 733acac918..5662393d1d 100644 --- a/datahub-web-react/src/alchemy-components/components/MatchText/types.ts +++ b/datahub-web-react/src/alchemy-components/components/MatchText/types.ts @@ -1,4 +1,4 @@ -import { TextProps } from '../Text'; +import { TextProps } from '@components/components/Text'; export type TextPropsWithoutChildren = Omit; diff --git a/datahub-web-react/src/alchemy-components/components/Modal/Modal.stories.tsx b/datahub-web-react/src/alchemy-components/components/Modal/Modal.stories.tsx index d93c47b3a9..d4352c74e9 100644 --- a/datahub-web-react/src/alchemy-components/components/Modal/Modal.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Modal/Modal.stories.tsx @@ -2,8 +2,10 @@ import { Button, Text } from '@components'; import { BADGE } from '@geometricpanda/storybook-addon-badges'; import type { Meta, StoryObj } from '@storybook/react'; import React from 'react'; + +import { ModalButton } from '@components/components/Modal/Modal'; + import { Modal } from '.'; -import { ModalButton } from './Modal'; type ModalWithExampleButtons = React.ComponentProps & { buttonExamples?: string[]; content?: string }; diff --git a/datahub-web-react/src/alchemy-components/components/Modal/Modal.tsx b/datahub-web-react/src/alchemy-components/components/Modal/Modal.tsx index d15aada766..006dbac611 100644 --- a/datahub-web-react/src/alchemy-components/components/Modal/Modal.tsx +++ b/datahub-web-react/src/alchemy-components/components/Modal/Modal.tsx @@ -1,4 +1,4 @@ -import { Button, ButtonProps, Heading, typography, Text, Icon } from '@components'; +import { Button, ButtonProps, Heading, Icon, Text, typography } from '@components'; import { Modal as AntModal, ModalProps as AntModalProps } from 'antd'; import React from 'react'; import styled from 'styled-components'; diff --git a/datahub-web-react/src/alchemy-components/components/PageTitle/PageTitle.stories.tsx b/datahub-web-react/src/alchemy-components/components/PageTitle/PageTitle.stories.tsx index 7016ecbc7c..eadbf45ca3 100644 --- a/datahub-web-react/src/alchemy-components/components/PageTitle/PageTitle.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/PageTitle/PageTitle.stories.tsx @@ -1,7 +1,7 @@ +import { BADGE } from '@geometricpanda/storybook-addon-badges'; +import type { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import type { Meta, StoryObj } from '@storybook/react'; -import { BADGE } from '@geometricpanda/storybook-addon-badges'; import { PageTitle } from '.'; // Auto Docs diff --git a/datahub-web-react/src/alchemy-components/components/PageTitle/PageTitle.tsx b/datahub-web-react/src/alchemy-components/components/PageTitle/PageTitle.tsx index f2a54ad1d0..4550fc1497 100644 --- a/datahub-web-react/src/alchemy-components/components/PageTitle/PageTitle.tsx +++ b/datahub-web-react/src/alchemy-components/components/PageTitle/PageTitle.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { PageTitleProps } from './types'; -import { Container, SubTitle, Title } from './components'; -import { Pill } from '../Pills'; + +import { Container, SubTitle, Title } from '@components/components/PageTitle/components'; +import { PageTitleProps } from '@components/components/PageTitle/types'; +import { Pill } from '@components/components/Pills'; export const PageTitle = ({ title, subTitle, pillLabel, variant = 'pageHeader' }: PageTitleProps) => { return ( diff --git a/datahub-web-react/src/alchemy-components/components/PageTitle/components.ts b/datahub-web-react/src/alchemy-components/components/PageTitle/components.ts index 328323434e..84fd8680d4 100644 --- a/datahub-web-react/src/alchemy-components/components/PageTitle/components.ts +++ b/datahub-web-react/src/alchemy-components/components/PageTitle/components.ts @@ -1,6 +1,7 @@ import styled from 'styled-components'; -import { typography, colors } from '@components/theme'; -import { getHeaderSubtitleStyles, getHeaderTitleStyles } from './utils'; + +import { getHeaderSubtitleStyles, getHeaderTitleStyles } from '@components/components/PageTitle/utils'; +import { colors, typography } from '@components/theme'; // Text Styles const titleStyles = { diff --git a/datahub-web-react/src/alchemy-components/components/Pagination/Pagination.stories.tsx b/datahub-web-react/src/alchemy-components/components/Pagination/Pagination.stories.tsx index f82b17f46b..77268b4369 100644 --- a/datahub-web-react/src/alchemy-components/components/Pagination/Pagination.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Pagination/Pagination.stories.tsx @@ -1,8 +1,9 @@ import { BADGE } from '@geometricpanda/storybook-addon-badges'; import type { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import { Pagination } from './Pagination'; -import { paginationDefaults } from './types'; + +import { Pagination } from '@components/components/Pagination/Pagination'; +import { paginationDefaults } from '@components/components/Pagination/types'; // Auto Docs const meta = { diff --git a/datahub-web-react/src/alchemy-components/components/Pagination/Pagination.tsx b/datahub-web-react/src/alchemy-components/components/Pagination/Pagination.tsx index 9c3e65da07..8dab7819cb 100644 --- a/datahub-web-react/src/alchemy-components/components/Pagination/Pagination.tsx +++ b/datahub-web-react/src/alchemy-components/components/Pagination/Pagination.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Pagination as PaginationComponent } from 'antd'; -import { paginationDefaults, PaginationProps } from './types'; -import { PaginationContainer } from './components'; +import React from 'react'; + +import { PaginationContainer } from '@components/components/Pagination/components'; +import { PaginationProps, paginationDefaults } from '@components/components/Pagination/types'; export const Pagination = ({ currentPage = paginationDefaults.currentPage, diff --git a/datahub-web-react/src/alchemy-components/components/Pagination/components.ts b/datahub-web-react/src/alchemy-components/components/Pagination/components.ts index 79a14ae9ad..41686f9746 100644 --- a/datahub-web-react/src/alchemy-components/components/Pagination/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Pagination/components.ts @@ -1,6 +1,7 @@ -import { colors, spacing } from '@src/alchemy-components/theme'; import styled from 'styled-components'; +import { colors, spacing } from '@src/alchemy-components/theme'; + export const PaginationContainer = styled.div` display: flex; justify-content: center; diff --git a/datahub-web-react/src/alchemy-components/components/Pills/Pill.stories.tsx b/datahub-web-react/src/alchemy-components/components/Pills/Pill.stories.tsx index 78962021a1..b115f3c70b 100644 --- a/datahub-web-react/src/alchemy-components/components/Pills/Pill.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Pills/Pill.stories.tsx @@ -1,13 +1,12 @@ -import { PillProps } from '@components/components/Pills/types'; -import { ColorValues, getSizeName, PillVariantValues, SizeValues } from '@components/theme/config'; -import React from 'react'; - import { BADGE } from '@geometricpanda/storybook-addon-badges'; import type { Meta, StoryObj } from '@storybook/react'; +import React from 'react'; import { GridList } from '@components/.docs/mdx-components'; -import { AVAILABLE_ICONS } from '../Icon'; -import { Pill, SUPPORTED_CONFIGURATIONS } from './Pill'; +import { AVAILABLE_ICONS } from '@components/components/Icon'; +import { Pill, SUPPORTED_CONFIGURATIONS } from '@components/components/Pills/Pill'; +import { PillProps } from '@components/components/Pills/types'; +import { ColorValues, PillVariantValues, SizeValues, getSizeName } from '@components/theme/config'; const defaults: PillProps = { label: 'Label', diff --git a/datahub-web-react/src/alchemy-components/components/Pills/Pill.tsx b/datahub-web-react/src/alchemy-components/components/Pills/Pill.tsx index 28be100af4..aef261bab8 100644 --- a/datahub-web-react/src/alchemy-components/components/Pills/Pill.tsx +++ b/datahub-web-react/src/alchemy-components/components/Pills/Pill.tsx @@ -1,8 +1,9 @@ import { Button, Icon } from '@components'; -import { ColorOptions, ColorValues, PillVariantOptions, PillVariantValues, SizeValues } from '@components/theme/config'; import React from 'react'; -import { PillContainer, PillText } from './components'; -import { PillProps, PillPropsDefaults } from './types'; + +import { PillContainer, PillText } from '@components/components/Pills/components'; +import { PillProps, PillPropsDefaults } from '@components/components/Pills/types'; +import { ColorOptions, ColorValues, PillVariantOptions, PillVariantValues, SizeValues } from '@components/theme/config'; export const SUPPORTED_CONFIGURATIONS: Record = { [PillVariantValues.filled]: [ diff --git a/datahub-web-react/src/alchemy-components/components/Pills/components.ts b/datahub-web-react/src/alchemy-components/components/Pills/components.ts index b7cb9283f8..6f17044ae9 100644 --- a/datahub-web-react/src/alchemy-components/components/Pills/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Pills/components.ts @@ -1,8 +1,8 @@ -import { spacing } from '@components/theme'; import styled from 'styled-components'; -import { PillStyleProps } from './types'; -import { getPillStyle } from './utils'; +import { PillStyleProps } from '@components/components/Pills/types'; +import { getPillStyle } from '@components/components/Pills/utils'; +import { spacing } from '@components/theme'; export const PillContainer = styled.div( { diff --git a/datahub-web-react/src/alchemy-components/components/Pills/types.ts b/datahub-web-react/src/alchemy-components/components/Pills/types.ts index f8e5fa3304..6991efadcb 100644 --- a/datahub-web-react/src/alchemy-components/components/Pills/types.ts +++ b/datahub-web-react/src/alchemy-components/components/Pills/types.ts @@ -1,6 +1,7 @@ -import { ColorOptions, SizeOptions, PillVariantOptions } from '@src/alchemy-components/theme/config'; import { HTMLAttributes } from 'react'; +import { ColorOptions, PillVariantOptions, SizeOptions } from '@src/alchemy-components/theme/config'; + export interface PillPropsDefaults { variant: PillVariantOptions; size: SizeOptions; diff --git a/datahub-web-react/src/alchemy-components/components/Pills/utils.ts b/datahub-web-react/src/alchemy-components/components/Pills/utils.ts index f7618aad65..4b4a148c83 100644 --- a/datahub-web-react/src/alchemy-components/components/Pills/utils.ts +++ b/datahub-web-react/src/alchemy-components/components/Pills/utils.ts @@ -1,8 +1,10 @@ +import { CSSObject } from 'styled-components'; + import { PillStyleProps } from '@components/components/Pills/types'; import { ColorOptions, PillVariantOptions, SizeOptions } from '@components/theme/config'; + import { typography } from '@src/alchemy-components/theme'; import { getColor, getFontSize } from '@src/alchemy-components/theme/utils'; -import { CSSObject } from 'styled-components'; interface ColorStyles { primaryColor: string; @@ -64,7 +66,7 @@ const getPillVariantStyles = (variant: PillVariantOptions, colorStyles: ColorSty }, borderRadius: '4px', }, - }[variant]); + })[variant]; const getPillFontStyles = (variant: PillVariantOptions, size: SizeOptions): CSSObject => { const baseFontStyles = { diff --git a/datahub-web-react/src/alchemy-components/components/Radio/Radio.stories.tsx b/datahub-web-react/src/alchemy-components/components/Radio/Radio.stories.tsx index cb3116d7b8..cb3be2a969 100644 --- a/datahub-web-react/src/alchemy-components/components/Radio/Radio.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Radio/Radio.stories.tsx @@ -1,9 +1,10 @@ -import React from 'react'; import type { Meta, StoryObj } from '@storybook/react'; +import React from 'react'; + import { GridList } from '@components/.docs/mdx-components'; -import { Radio, radioDefaults, RadioGroup } from './Radio'; -import { Heading } from '../Heading'; -import { RadioProps } from './types'; +import { Heading } from '@components/components/Heading'; +import { Radio, RadioGroup, radioDefaults } from '@components/components/Radio/Radio'; +import { RadioProps } from '@components/components/Radio/types'; const MOCK_RADIOS: RadioProps[] = [ { diff --git a/datahub-web-react/src/alchemy-components/components/Radio/Radio.tsx b/datahub-web-react/src/alchemy-components/components/Radio/Radio.tsx index 592c10ec88..9e0e441a1d 100644 --- a/datahub-web-react/src/alchemy-components/components/Radio/Radio.tsx +++ b/datahub-web-react/src/alchemy-components/components/Radio/Radio.tsx @@ -1,15 +1,16 @@ import React, { useEffect, useState } from 'react'; -import { RadioGroupProps, RadioProps } from './types'; + import { - RadioWrapper, Checkmark, HiddenInput, Label, - Required, - RadioLabel, RadioBase, RadioGroupContainer, -} from './components'; + RadioLabel, + RadioWrapper, + Required, +} from '@components/components/Radio/components'; +import { RadioGroupProps, RadioProps } from '@components/components/Radio/types'; export const radioDefaults = { label: 'Label', diff --git a/datahub-web-react/src/alchemy-components/components/Radio/components.ts b/datahub-web-react/src/alchemy-components/components/Radio/components.ts index 027971be17..3d278ab7f2 100644 --- a/datahub-web-react/src/alchemy-components/components/Radio/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Radio/components.ts @@ -1,7 +1,8 @@ -import { borders, colors, radius, spacing } from '@components/theme'; import styled from 'styled-components'; -import { formLabelTextStyles } from '../commonStyles'; -import { getRadioBorderColor, getRadioCheckmarkColor } from './utils'; + +import { getRadioBorderColor, getRadioCheckmarkColor } from '@components/components/Radio/utils'; +import { formLabelTextStyles } from '@components/components/commonStyles'; +import { borders, colors, radius, spacing } from '@components/theme'; export const RadioWrapper = styled.div<{ disabled: boolean; error: string }>(({ disabled, error }) => ({ position: 'relative', diff --git a/datahub-web-react/src/alchemy-components/components/SearchBar/SearchBar.stories.tsx b/datahub-web-react/src/alchemy-components/components/SearchBar/SearchBar.stories.tsx index 9ae34356a7..648cea49d3 100644 --- a/datahub-web-react/src/alchemy-components/components/SearchBar/SearchBar.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/SearchBar/SearchBar.stories.tsx @@ -1,9 +1,10 @@ -import React, { useState } from 'react'; import { BADGE } from '@geometricpanda/storybook-addon-badges'; import type { Meta, StoryObj } from '@storybook/react'; +import React, { useState } from 'react'; + import { GridList } from '@components/.docs/mdx-components'; -import { SearchBar, searchBarDefaults } from './SearchBar'; -import { SearchBarProps } from './types'; +import { SearchBar, searchBarDefaults } from '@components/components/SearchBar/SearchBar'; +import { SearchBarProps } from '@components/components/SearchBar/types'; const meta = { title: 'Components / Search Bar', diff --git a/datahub-web-react/src/alchemy-components/components/SearchBar/SearchBar.tsx b/datahub-web-react/src/alchemy-components/components/SearchBar/SearchBar.tsx index 9e21c5c0b8..e8435dc43a 100644 --- a/datahub-web-react/src/alchemy-components/components/SearchBar/SearchBar.tsx +++ b/datahub-web-react/src/alchemy-components/components/SearchBar/SearchBar.tsx @@ -1,8 +1,10 @@ -import { Icon } from '@src/alchemy-components'; import { InputProps } from 'antd'; import React from 'react'; -import { StyledSearchBar } from './components'; -import { SearchBarProps } from './types'; + +import { StyledSearchBar } from '@components/components/SearchBar/components'; +import { SearchBarProps } from '@components/components/SearchBar/types'; + +import { Icon } from '@src/alchemy-components'; export const searchBarDefaults: SearchBarProps = { placeholder: 'Search...', diff --git a/datahub-web-react/src/alchemy-components/components/SearchBar/components.ts b/datahub-web-react/src/alchemy-components/components/SearchBar/components.ts index 7045801ddf..cb31a1d36a 100644 --- a/datahub-web-react/src/alchemy-components/components/SearchBar/components.ts +++ b/datahub-web-react/src/alchemy-components/components/SearchBar/components.ts @@ -1,7 +1,8 @@ -import { colors, typography } from '@src/alchemy-components/theme'; import { Input } from 'antd'; import styled from 'styled-components'; +import { colors, typography } from '@src/alchemy-components/theme'; + export const StyledSearchBar = styled(Input)<{ $width?: string }>` height: 40px; width: ${(props) => props.$width}; diff --git a/datahub-web-react/src/alchemy-components/components/Select/AutoCompleteSelect.tsx b/datahub-web-react/src/alchemy-components/components/Select/AutoCompleteSelect.tsx index e100c0cc9e..0f64d37976 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/AutoCompleteSelect.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/AutoCompleteSelect.tsx @@ -1,6 +1,7 @@ import { Dropdown, Text } from '@components'; import React, { useCallback, useEffect, useRef, useState } from 'react'; import styled from 'styled-components'; + import { ActionButtonsContainer, Container, @@ -15,9 +16,9 @@ import { SelectLabelContainer, StyledClearButton, StyledIcon, -} from './components'; -import { ActionButtonsProps, SelectProps } from './types'; -import DropdownSearchBar from './private/DropdownSearchBar'; +} from '@components/components/Select/components'; +import DropdownSearchBar from '@components/components/Select/private/DropdownSearchBar'; +import { ActionButtonsProps, SelectProps } from '@components/components/Select/types'; const NoSuggestions = styled.div` padding: 8px; diff --git a/datahub-web-react/src/alchemy-components/components/Select/BasicSelect.tsx b/datahub-web-react/src/alchemy-components/components/Select/BasicSelect.tsx index 7465c7410d..098df6771a 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/BasicSelect.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/BasicSelect.tsx @@ -1,6 +1,7 @@ import { Dropdown, Text } from '@components'; import { isEqual } from 'lodash'; import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; + import { ActionButtonsContainer, Container, @@ -15,13 +16,13 @@ import { StyledCheckbox, StyledClearButton, StyledIcon, -} from './components'; -import SelectLabelRenderer from './private/SelectLabelRenderer/SelectLabelRenderer'; -import { ActionButtonsProps, SelectOption, SelectProps } from './types'; -import { getFooterButtonSize } from './utils'; -import DropdownSearchBar from './private/DropdownSearchBar'; -import DropdownFooterActions from './private/DropdownFooterActions'; -import DropdownSelectAllOption from './private/DropdownSelectAllOption'; +} from '@components/components/Select/components'; +import DropdownFooterActions from '@components/components/Select/private/DropdownFooterActions'; +import DropdownSearchBar from '@components/components/Select/private/DropdownSearchBar'; +import DropdownSelectAllOption from '@components/components/Select/private/DropdownSelectAllOption'; +import SelectLabelRenderer from '@components/components/Select/private/SelectLabelRenderer/SelectLabelRenderer'; +import { ActionButtonsProps, SelectOption, SelectProps } from '@components/components/Select/types'; +import { getFooterButtonSize } from '@components/components/Select/utils'; const SelectActionButtons = ({ selectedValues, diff --git a/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedOption.tsx b/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedOption.tsx index c6452ff1eb..9dda415603 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedOption.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedOption.tsx @@ -1,15 +1,14 @@ -import React, { useState, useEffect } from 'react'; - -import { colors, Icon } from '@components'; -import theme from '@components/theme'; -import styled from 'styled-components'; +import { Icon, colors } from '@components'; import { Checkbox } from 'antd'; +import React, { useEffect, useState } from 'react'; +import styled from 'styled-components'; -import { OptionLabel } from '../components'; -import { NestedSelectOption } from './types'; -import useNestedOption from './useSelectOption'; -import useNestedSelectOptionChildren from './useNestedSelectOptionChildren'; -import { CustomOptionRenderer } from '../types'; +import { NestedSelectOption } from '@components/components/Select/Nested/types'; +import useNestedSelectOptionChildren from '@components/components/Select/Nested/useNestedSelectOptionChildren'; +import useNestedOption from '@components/components/Select/Nested/useSelectOption'; +import { OptionLabel } from '@components/components/Select/components'; +import { CustomOptionRenderer } from '@components/components/Select/types'; +import theme from '@components/theme'; const ParentOption = styled.div` display: flex; diff --git a/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedSelect.tsx b/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedSelect.tsx index a50157f483..cb779797c7 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedSelect.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedSelect.tsx @@ -1,6 +1,9 @@ -import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Dropdown, Icon } from '@components'; +import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; +import { NestedOption } from '@components/components/Select/Nested/NestedOption'; +import { NestedSelectOption } from '@components/components/Select/Nested/types'; +import { filterNestedSelectOptions } from '@components/components/Select/Nested/utils'; import { ActionButtonsContainer, Container, @@ -9,15 +12,11 @@ import { SelectBase, SelectLabel, StyledClearButton, -} from '../components'; - -import { CustomOptionRenderer, SelectLabelProps, SelectSizeOptions } from '../types'; -import { NestedOption } from './NestedOption'; -import { NestedSelectOption } from './types'; -import DropdownSearchBar from '../private/DropdownSearchBar'; -import DropdownFooterActions from '../private/DropdownFooterActions'; -import SelectLabelRenderer from '../private/SelectLabelRenderer/SelectLabelRenderer'; -import { filterNestedSelectOptions } from './utils'; +} from '@components/components/Select/components'; +import DropdownFooterActions from '@components/components/Select/private/DropdownFooterActions'; +import DropdownSearchBar from '@components/components/Select/private/DropdownSearchBar'; +import SelectLabelRenderer from '@components/components/Select/private/SelectLabelRenderer/SelectLabelRenderer'; +import { CustomOptionRenderer, SelectLabelProps, SelectSizeOptions } from '@components/components/Select/types'; const NO_PARENT_VALUE = 'no_parent_value'; diff --git a/datahub-web-react/src/alchemy-components/components/Select/Nested/__tests__/filterNestedSelectOptions.test.ts b/datahub-web-react/src/alchemy-components/components/Select/Nested/__tests__/filterNestedSelectOptions.test.ts index 3d231f1696..d49d909091 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/Nested/__tests__/filterNestedSelectOptions.test.ts +++ b/datahub-web-react/src/alchemy-components/components/Select/Nested/__tests__/filterNestedSelectOptions.test.ts @@ -1,5 +1,5 @@ -import { NestedSelectOption } from '../types'; -import { filterNestedSelectOptions } from '../utils'; +import { NestedSelectOption } from '@components/components/Select/Nested/types'; +import { filterNestedSelectOptions } from '@components/components/Select/Nested/utils'; describe('filterNestedSelectOptions', () => { const options: NestedSelectOption[] = [ diff --git a/datahub-web-react/src/alchemy-components/components/Select/Nested/__tests__/getChainOfParents.test.ts b/datahub-web-react/src/alchemy-components/components/Select/Nested/__tests__/getChainOfParents.test.ts index d2a4bca51b..8e59919af1 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/Nested/__tests__/getChainOfParents.test.ts +++ b/datahub-web-react/src/alchemy-components/components/Select/Nested/__tests__/getChainOfParents.test.ts @@ -1,5 +1,5 @@ -import { NestedSelectOption } from '../types'; -import { getChainOfParents } from '../utils'; +import { NestedSelectOption } from '@components/components/Select/Nested/types'; +import { getChainOfParents } from '@components/components/Select/Nested/utils'; describe('getChainOfParents', () => { const options: NestedSelectOption[] = [ diff --git a/datahub-web-react/src/alchemy-components/components/Select/Nested/types.ts b/datahub-web-react/src/alchemy-components/components/Select/Nested/types.ts index cfced70c5b..a1786fd903 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/Nested/types.ts +++ b/datahub-web-react/src/alchemy-components/components/Select/Nested/types.ts @@ -1,5 +1,6 @@ +import { SelectOption } from '@components/components/Select/types'; + import { Entity } from '@src/types.generated'; -import { SelectOption } from '../types'; export interface NestedSelectOption extends SelectOption { parentValue?: string; diff --git a/datahub-web-react/src/alchemy-components/components/Select/Nested/useNestedSelectOptionChildren.ts b/datahub-web-react/src/alchemy-components/components/Select/Nested/useNestedSelectOptionChildren.ts index c37efe85d6..a2bc5b597d 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/Nested/useNestedSelectOptionChildren.ts +++ b/datahub-web-react/src/alchemy-components/components/Select/Nested/useNestedSelectOptionChildren.ts @@ -1,5 +1,6 @@ import { useEffect, useMemo, useState } from 'react'; -import { NestedSelectOption } from './types'; + +import { NestedSelectOption } from '@components/components/Select/Nested/types'; function getChildrenRecursively( directChildren: OptionType[], diff --git a/datahub-web-react/src/alchemy-components/components/Select/Nested/useSelectOption.ts b/datahub-web-react/src/alchemy-components/components/Select/Nested/useSelectOption.ts index 68f39724cd..3e69166010 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/Nested/useSelectOption.ts +++ b/datahub-web-react/src/alchemy-components/components/Select/Nested/useSelectOption.ts @@ -1,5 +1,6 @@ import { useMemo } from 'react'; -import { NestedSelectOption } from './types'; + +import { NestedSelectOption } from '@components/components/Select/Nested/types'; interface Props { selectedOptions: OptionType[]; diff --git a/datahub-web-react/src/alchemy-components/components/Select/Nested/utils.ts b/datahub-web-react/src/alchemy-components/components/Select/Nested/utils.ts index 15e647b4f7..3163b8d164 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/Nested/utils.ts +++ b/datahub-web-react/src/alchemy-components/components/Select/Nested/utils.ts @@ -1,4 +1,4 @@ -import { NestedSelectOption } from './types'; +import { NestedSelectOption } from '@components/components/Select/Nested/types'; export function getChainOfParents(option: NestedSelectOption | undefined, options: NestedSelectOption[]) { if (option === undefined) return []; diff --git a/datahub-web-react/src/alchemy-components/components/Select/Select.stories.tsx b/datahub-web-react/src/alchemy-components/components/Select/Select.stories.tsx index cfc9759b51..146a5e6218 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/Select.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/Select.stories.tsx @@ -1,11 +1,12 @@ -import { GridList } from '@components/.docs/mdx-components'; import { BADGE } from '@geometricpanda/storybook-addon-badges'; import type { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import { Select, selectDefaults } from './Select'; -import { SimpleSelect } from './SimpleSelect'; -import { SelectSizeOptions } from './types'; -import { AVAILABLE_ICONS } from '../Icon'; + +import { GridList } from '@components/.docs/mdx-components'; +import { AVAILABLE_ICONS } from '@components/components/Icon'; +import { Select, selectDefaults } from '@components/components/Select/Select'; +import { SimpleSelect } from '@components/components/Select/SimpleSelect'; +import { SelectSizeOptions } from '@components/components/Select/types'; // Auto Docs const meta: Meta = { diff --git a/datahub-web-react/src/alchemy-components/components/Select/Select.tsx b/datahub-web-react/src/alchemy-components/components/Select/Select.tsx index 1bd4a26389..dd3f65595b 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/Select.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/Select.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { BasicSelect } from './BasicSelect'; -import { SelectOption, SelectProps } from './types'; + +import { BasicSelect } from '@components/components/Select/BasicSelect'; +import { SelectOption, SelectProps } from '@components/components/Select/types'; export const selectDefaults: SelectProps = { options: [], diff --git a/datahub-web-react/src/alchemy-components/components/Select/SimpleSelect.tsx b/datahub-web-react/src/alchemy-components/components/Select/SimpleSelect.tsx index 18d96da24d..a6bcf1786f 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/SimpleSelect.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/SimpleSelect.tsx @@ -1,6 +1,7 @@ -import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Dropdown, Text } from '@components'; import { isEqual } from 'lodash'; +import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; + import { ActionButtonsContainer, Container, @@ -15,11 +16,11 @@ import { StyledCheckbox, StyledClearButton, StyledIcon, -} from './components'; -import { ActionButtonsProps, SelectOption, SelectProps } from './types'; -import SelectLabelRenderer from './private/SelectLabelRenderer/SelectLabelRenderer'; -import DropdownSearchBar from './private/DropdownSearchBar'; -import DropdownSelectAllOption from './private/DropdownSelectAllOption'; +} from '@components/components/Select/components'; +import DropdownSearchBar from '@components/components/Select/private/DropdownSearchBar'; +import DropdownSelectAllOption from '@components/components/Select/private/DropdownSelectAllOption'; +import SelectLabelRenderer from '@components/components/Select/private/SelectLabelRenderer/SelectLabelRenderer'; +import { ActionButtonsProps, SelectOption, SelectProps } from '@components/components/Select/types'; const SelectActionButtons = ({ selectedValues, diff --git a/datahub-web-react/src/alchemy-components/components/Select/components.ts b/datahub-web-react/src/alchemy-components/components/Select/components.ts index b64f4fee34..bcdca9ecc0 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Select/components.ts @@ -1,10 +1,15 @@ import { Button, Icon } from '@components'; -import { colors, radius, shadows, spacing, transition, typography, zIndices } from '@components/theme'; import { Checkbox } from 'antd'; import styled from 'styled-components'; -import { formLabelTextStyles, inputPlaceholderTextStyles, inputValueTextStyles } from '../commonStyles'; -import { SelectLabelVariants, SelectSizeOptions, SelectStyleProps } from './types'; -import { getOptionLabelStyle, getSelectFontStyles, getSelectStyle } from './utils'; + +import { SelectLabelVariants, SelectSizeOptions, SelectStyleProps } from '@components/components/Select/types'; +import { getOptionLabelStyle, getSelectFontStyles, getSelectStyle } from '@components/components/Select/utils'; +import { + formLabelTextStyles, + inputPlaceholderTextStyles, + inputValueTextStyles, +} from '@components/components/commonStyles'; +import { colors, radius, shadows, spacing, transition, typography, zIndices } from '@components/theme'; const sharedTransition = `${transition.property.colors} ${transition.easing['ease-in-out']} ${transition.duration.normal}`; diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/DropdownFooterActions.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/DropdownFooterActions.tsx index f4e82581dd..79b8e4ddd6 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/private/DropdownFooterActions.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/private/DropdownFooterActions.tsx @@ -1,8 +1,10 @@ -import React from 'react'; import { Button } from '@components'; -import { colors, spacing } from '@src/alchemy-components/theme'; +import React from 'react'; import styled from 'styled-components'; -import { SelectSizeOptions } from '../types'; + +import { SelectSizeOptions } from '@components/components/Select/types'; + +import { colors, spacing } from '@src/alchemy-components/theme'; const FooterBase = styled.div({ display: 'flex', diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/DropdownSearchBar.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/DropdownSearchBar.tsx index 9949ced850..7c62ad6171 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/private/DropdownSearchBar.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/private/DropdownSearchBar.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Input } from '@components'; +import React from 'react'; import styled from 'styled-components'; -import { SelectSizeOptions } from '../types'; + +import { SelectSizeOptions } from '@components/components/Select/types'; const SearchInputContainer = styled.div({ position: 'relative', diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/DropdownSelectAllOption.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/DropdownSelectAllOption.tsx index 6d966a62f2..39449e37f7 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/private/DropdownSelectAllOption.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/private/DropdownSelectAllOption.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; + +import { LabelContainer, StyledCheckbox } from '@components/components/Select/components'; import { colors, spacing, typography } from '@components/theme'; -import { LabelContainer, StyledCheckbox } from '../components'; const SelectAllOption = styled.div<{ isSelected: boolean; isDisabled?: boolean }>(({ isSelected, isDisabled }) => ({ cursor: isDisabled ? 'not-allowed' : 'pointer', diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/SelectLabelRenderer.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/SelectLabelRenderer.tsx index 2b338dfe61..f664779477 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/SelectLabelRenderer.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/SelectLabelRenderer.tsx @@ -1,11 +1,12 @@ import { useMemo } from 'react'; -import { SelectOption, SelectLabelDisplayProps } from '../../types'; -import MultiSelectDefault from './variants/MultiSelectDefault'; -import MultiSelectLabeled from './variants/MultiSelectLabeled'; -import SingleSelectDefault from './variants/SingleSelectDefault'; -import SingleSelectLabeled from './variants/SingleSelectLabeled'; -import SingleSelectCustom from './variants/SingleSelectCustom'; -import MultiSelectCustom from './variants/MultiSelectCustom'; + +import MultiSelectCustom from '@components/components/Select/private/SelectLabelRenderer/variants/MultiSelectCustom'; +import MultiSelectDefault from '@components/components/Select/private/SelectLabelRenderer/variants/MultiSelectDefault'; +import MultiSelectLabeled from '@components/components/Select/private/SelectLabelRenderer/variants/MultiSelectLabeled'; +import SingleSelectCustom from '@components/components/Select/private/SelectLabelRenderer/variants/SingleSelectCustom'; +import SingleSelectDefault from '@components/components/Select/private/SelectLabelRenderer/variants/SingleSelectDefault'; +import SingleSelectLabeled from '@components/components/Select/private/SelectLabelRenderer/variants/SingleSelectLabeled'; +import { SelectLabelDisplayProps, SelectOption } from '@components/components/Select/types'; export default function SelectLabelRenderer({ variant, diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectCustom.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectCustom.tsx index aea8d6c049..e570ed4653 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectCustom.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectCustom.tsx @@ -1,7 +1,9 @@ import React from 'react'; + +import { LabelsWrapper, Placeholder } from '@components/components/Select/components'; +import { SelectLabelVariantProps, SelectOption } from '@components/components/Select/types'; + import { Pill } from '@src/alchemy-components/components/Pills'; -import { LabelsWrapper, Placeholder } from '../../../components'; -import { SelectLabelVariantProps, SelectOption } from '../../../types'; export default function MultiSelectCustom({ selectedOptions, diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectDefault.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectDefault.tsx index fb04306559..6556b1eaab 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectDefault.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectDefault.tsx @@ -1,7 +1,9 @@ import React from 'react'; + +import { LabelsWrapper, Placeholder } from '@components/components/Select/components'; +import { SelectLabelVariantProps, SelectOption } from '@components/components/Select/types'; + import { Pill } from '@src/alchemy-components/components/Pills'; -import { LabelsWrapper, Placeholder } from '../../../components'; -import { SelectLabelVariantProps, SelectOption } from '../../../types'; export default function MultiSelectDefault({ selectedOptions, diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectLabeled.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectLabeled.tsx index 3f84ed422f..3ef6b100cf 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectLabeled.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectLabeled.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Pill } from '@components'; -import { ActionButtonsContainer, LabelsWrapper, SelectValue } from '../../../components'; -import { SelectLabelVariantProps, SelectOption } from '../../../types'; +import React from 'react'; + +import { ActionButtonsContainer, LabelsWrapper, SelectValue } from '@components/components/Select/components'; +import { SelectLabelVariantProps, SelectOption } from '@components/components/Select/types'; export default function MultiSelectLabeled({ selectedOptions, diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectCustom.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectCustom.tsx index 04930ac068..3e5eab6b6c 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectCustom.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectCustom.tsx @@ -1,12 +1,13 @@ import React from 'react'; + import { ActionButtonsContainer, DescriptionContainer, LabelsWrapper, Placeholder, SelectValue, -} from '../../../components'; -import { SelectLabelVariantProps, SelectOption } from '../../../types'; +} from '@components/components/Select/components'; +import { SelectLabelVariantProps, SelectOption } from '@components/components/Select/types'; export default function SingleSelectCustom({ selectedOptions, diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectDefault.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectDefault.tsx index 01fb51eadd..fe66449a59 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectDefault.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectDefault.tsx @@ -1,12 +1,13 @@ import React from 'react'; + import { ActionButtonsContainer, DescriptionContainer, LabelsWrapper, Placeholder, SelectValue, -} from '../../../components'; -import { SelectLabelVariantProps, SelectOption } from '../../../types'; +} from '@components/components/Select/components'; +import { SelectLabelVariantProps, SelectOption } from '@components/components/Select/types'; export default function SingleSelectDefault({ selectedOptions, diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectLabeled.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectLabeled.tsx index 82e255f11f..59c77f0d84 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectLabeled.tsx +++ b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectLabeled.tsx @@ -1,13 +1,14 @@ -import React from 'react'; import { Pill } from '@components'; +import React from 'react'; + import { ActionButtonsContainer, DescriptionContainer, LabelsWrapper, Placeholder, SelectValue, -} from '../../../components'; -import { SelectLabelVariantProps, SelectOption } from '../../../types'; +} from '@components/components/Select/components'; +import { SelectLabelVariantProps, SelectOption } from '@components/components/Select/types'; export default function SingleSelectLabeled({ selectedOptions, diff --git a/datahub-web-react/src/alchemy-components/components/Select/types.ts b/datahub-web-react/src/alchemy-components/components/Select/types.ts index b94c812f14..0641304dfe 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/types.ts +++ b/datahub-web-react/src/alchemy-components/components/Select/types.ts @@ -1,5 +1,6 @@ import React from 'react'; -import { IconNames } from '../Icon'; + +import { IconNames } from '@components/components/Icon'; export type SelectSizeOptions = 'sm' | 'md' | 'lg'; export interface SelectOption { diff --git a/datahub-web-react/src/alchemy-components/components/Select/utils.ts b/datahub-web-react/src/alchemy-components/components/Select/utils.ts index 9c3e18443e..083b0fc081 100644 --- a/datahub-web-react/src/alchemy-components/components/Select/utils.ts +++ b/datahub-web-react/src/alchemy-components/components/Select/utils.ts @@ -1,8 +1,7 @@ +import { SelectStyleProps } from '@components/components/Select/types'; import { colors, radius, spacing, typography } from '@components/theme'; import { getFontSize } from '@components/theme/utils'; -import { SelectStyleProps } from './types'; - export const getOptionLabelStyle = ( isSelected: boolean, isMultiSelect?: boolean, diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemCheckboxGroup.tsx b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemCheckboxGroup.tsx index d0ab0db6d9..16f7ab8d06 100644 --- a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemCheckboxGroup.tsx +++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemCheckboxGroup.tsx @@ -1,7 +1,8 @@ // CheckboxGroup.tsx import React, { ReactNode } from 'react'; import styled from 'styled-components'; -import { Checkbox } from '../Checkbox'; + +import { Checkbox } from '@components/components/Checkbox'; const StyledCheckboxLabel = styled.div` display: flex; diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemPopover.tsx b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemPopover.tsx index c8219b47d2..ebefbf6687 100644 --- a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemPopover.tsx +++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemPopover.tsx @@ -1,9 +1,11 @@ import { Popover } from 'antd'; -import React, { ReactNode } from 'react'; -import { Entity, EntityType } from '@src/types.generated'; import { CheckboxValueType } from 'antd/lib/checkbox/Group'; -import { SelectItems } from './SelectItems'; -import './select-items-popover.less'; +import React, { ReactNode } from 'react'; + +import { SelectItems } from '@components/components/SelectItemsPopover/SelectItems'; +import '@components/components/SelectItemsPopover/select-items-popover.less'; + +import { Entity, EntityType } from '@src/types.generated'; export type SelectItemPopoverProps = { entities: Entity[]; diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.stories.tsx b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.stories.tsx index 66c01d1990..d3bc545fc7 100644 --- a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.stories.tsx @@ -1,10 +1,9 @@ -import React from 'react'; -import { Meta, StoryObj } from '@storybook/react'; -import { Entity, EntityType, Tag as TagType } from '@src/types.generated'; import { MockedProvider } from '@apollo/client/testing'; -import Tag from '@src/app/sharedV2/tags/tag/Tag'; -import { EntityRegistryContext } from '@src/entityRegistryContext'; +import { Meta, StoryObj } from '@storybook/react'; import { Button } from 'antd'; +import React from 'react'; + +import { SelectItemPopover, SelectItemPopoverProps } from '@components/components/SelectItemsPopover/SelectItemPopover'; import { defaultGlossaryTermEntities, defaultTagEntities, @@ -13,8 +12,11 @@ import { mockTagEntityRegistry, mockTagSelectedEntities, tagMocks, -} from './__mock.data'; -import { SelectItemPopoverProps, SelectItemPopover } from './SelectItemPopover'; +} from '@components/components/SelectItemsPopover/__mock.data'; + +import Tag from '@src/app/sharedV2/tags/tag/Tag'; +import { EntityRegistryContext } from '@src/entityRegistryContext'; +import { Entity, EntityType, Tag as TagType } from '@src/types.generated'; // Storybook meta configuration const meta: Meta = { diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.tsx b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.tsx index c153fef8f8..f7bf954bcf 100644 --- a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.tsx +++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.tsx @@ -1,15 +1,18 @@ -import React, { ReactNode } from 'react'; -import { Checkbox, Empty, Typography } from 'antd'; -import styled from 'styled-components'; import { LoadingOutlined } from '@ant-design/icons'; -import { Entity, EntityType } from '@src/types.generated'; +import { Checkbox, Empty, Typography } from 'antd'; import { CheckboxValueType } from 'antd/lib/checkbox/Group'; -import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants'; +import React, { ReactNode } from 'react'; +import styled from 'styled-components'; + +import { Button } from '@components/components/Button'; +// Import your custom hook +import { SelectItemCheckboxGroup } from '@components/components/SelectItemsPopover/SelectItemCheckboxGroup'; +import { useEntityOperations } from '@components/components/SelectItemsPopover/hooks'; + import { InlineListSearch } from '@src/app/entityV2/shared/components/search/InlineListSearch'; +import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants'; import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import { useEntityOperations } from './hooks'; // Import your custom hook -import { SelectItemCheckboxGroup } from './SelectItemCheckboxGroup'; -import { Button } from '../Button'; +import { Entity, EntityType } from '@src/types.generated'; export interface SelectItemsProps { entities: Entity[]; diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/hooks.tsx b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/hooks.tsx index 9631ba653a..4787ff7ad4 100644 --- a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/hooks.tsx +++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/hooks.tsx @@ -1,8 +1,9 @@ -import { useState, useEffect } from 'react'; -import { EntityType } from '@src/types.generated'; -import { useGetAutoCompleteResultsLazyQuery } from '@src/graphql/search.generated'; import { debounce } from 'lodash'; +import { useEffect, useState } from 'react'; + import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { useGetAutoCompleteResultsLazyQuery } from '@src/graphql/search.generated'; +import { EntityType } from '@src/types.generated'; interface UseUpdateEntityParams { selectedItems: any[]; diff --git a/datahub-web-react/src/alchemy-components/components/Switch/Switch.stories.tsx b/datahub-web-react/src/alchemy-components/components/Switch/Switch.stories.tsx index 7bb4ee2397..47fa72cae4 100644 --- a/datahub-web-react/src/alchemy-components/components/Switch/Switch.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Switch/Switch.stories.tsx @@ -1,12 +1,10 @@ +import { BADGE } from '@geometricpanda/storybook-addon-badges'; +import type { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import type { Meta, StoryObj } from '@storybook/react'; -import { BADGE } from '@geometricpanda/storybook-addon-badges'; - import { GridList } from '@components/.docs/mdx-components'; - -import { Switch, switchDefaults } from './Switch'; -import { AVAILABLE_ICONS } from '../Icon'; +import { AVAILABLE_ICONS } from '@components/components/Icon'; +import { Switch, switchDefaults } from '@components/components/Switch/Switch'; const meta = { title: 'Forms / Switch', diff --git a/datahub-web-react/src/alchemy-components/components/Switch/Switch.tsx b/datahub-web-react/src/alchemy-components/components/Switch/Switch.tsx index 18a0138656..817a9f5baf 100644 --- a/datahub-web-react/src/alchemy-components/components/Switch/Switch.tsx +++ b/datahub-web-react/src/alchemy-components/components/Switch/Switch.tsx @@ -1,7 +1,16 @@ import { Tooltip } from '@components'; import React, { useEffect, useState } from 'react'; -import { IconContainer, Label, Required, Slider, StyledIcon, StyledInput, SwitchContainer } from './components'; -import { SwitchProps } from './types'; + +import { + IconContainer, + Label, + Required, + Slider, + StyledIcon, + StyledInput, + SwitchContainer, +} from '@components/components/Switch/components'; +import { SwitchProps } from '@components/components/Switch/types'; export const switchDefaults: SwitchProps = { label: 'Label', diff --git a/datahub-web-react/src/alchemy-components/components/Switch/components.ts b/datahub-web-react/src/alchemy-components/components/Switch/components.ts index 1586c1cf9f..af3dcbd9ce 100644 --- a/datahub-web-react/src/alchemy-components/components/Switch/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Switch/components.ts @@ -1,21 +1,17 @@ import styled from 'styled-components'; -import { borders, colors, shadows, spacing, transition } from '@components/theme'; -import { ColorOptions, SizeOptions } from '@components/theme/config'; - -import { Icon } from '../Icon'; - -import { formLabelTextStyles } from '../commonStyles'; - +import { Icon } from '@components/components/Icon'; +import type { SwitchLabelPosition } from '@components/components/Switch/types'; import { getIconTransformPositionLeft, getIconTransformPositionTop, getInputHeight, getSliderTransformPosition, getToggleSize, -} from './utils'; - -import type { SwitchLabelPosition } from './types'; +} from '@components/components/Switch/utils'; +import { formLabelTextStyles } from '@components/components/commonStyles'; +import { borders, colors, shadows, spacing, transition } from '@components/theme'; +import { ColorOptions, SizeOptions } from '@components/theme/config'; export const Label = styled.div({ ...formLabelTextStyles, diff --git a/datahub-web-react/src/alchemy-components/components/Switch/types.ts b/datahub-web-react/src/alchemy-components/components/Switch/types.ts index e15c0f81b4..3d87336a6c 100644 --- a/datahub-web-react/src/alchemy-components/components/Switch/types.ts +++ b/datahub-web-react/src/alchemy-components/components/Switch/types.ts @@ -1,7 +1,8 @@ -import { ColorOptions, SizeOptions } from '@components/theme/config'; import { InputHTMLAttributes } from 'react'; import { CSSProperties } from 'styled-components'; -import { IconNames } from '../Icon'; + +import { IconNames } from '@components/components/Icon'; +import { ColorOptions, SizeOptions } from '@components/theme/config'; export type SwitchLabelPosition = 'left' | 'top'; diff --git a/datahub-web-react/src/alchemy-components/components/Table/Table.stories.tsx b/datahub-web-react/src/alchemy-components/components/Table/Table.stories.tsx index 2dd0d678b0..890ec79af9 100644 --- a/datahub-web-react/src/alchemy-components/components/Table/Table.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Table/Table.stories.tsx @@ -1,9 +1,12 @@ import { BADGE } from '@geometricpanda/storybook-addon-badges'; -import { AlignmentOptions } from '@src/alchemy-components/theme/config'; import { Meta, StoryObj } from '@storybook/react'; import React, { useState } from 'react'; + +import { SortingState } from '@components/components/Table/types'; + +import { AlignmentOptions } from '@src/alchemy-components/theme/config'; + import { Table, tableDefaults } from '.'; -import { SortingState } from './types'; // Auto Docs const meta = { diff --git a/datahub-web-react/src/alchemy-components/components/Table/Table.tsx b/datahub-web-react/src/alchemy-components/components/Table/Table.tsx index e3a8df6c8c..4c021e20c5 100644 --- a/datahub-web-react/src/alchemy-components/components/Table/Table.tsx +++ b/datahub-web-react/src/alchemy-components/components/Table/Table.tsx @@ -1,7 +1,8 @@ -import { CaretUp, CaretDown } from 'phosphor-react'; import { LoadingOutlined } from '@ant-design/icons'; import { Text } from '@components'; +import { CaretDown, CaretUp } from 'phosphor-react'; import React, { useEffect, useState } from 'react'; + import { BaseTable, HeaderContainer, @@ -13,11 +14,11 @@ import { TableHeader, TableHeaderCell, TableRow, -} from './components'; -import { SortingState, TableProps } from './types'; -import { getSortedData, handleActiveSort, renderCell } from './utils'; -import { Tooltip2 } from '../Tooltip2'; -import { useGetSelectionColumn } from './useGetSelectionColumn'; +} from '@components/components/Table/components'; +import { SortingState, TableProps } from '@components/components/Table/types'; +import { useGetSelectionColumn } from '@components/components/Table/useGetSelectionColumn'; +import { getSortedData, handleActiveSort, renderCell } from '@components/components/Table/utils'; +import { Tooltip2 } from '@components/components/Tooltip2'; export const tableDefaults: TableProps = { columns: [], diff --git a/datahub-web-react/src/alchemy-components/components/Table/components.ts b/datahub-web-react/src/alchemy-components/components/Table/components.ts index 3ecb173606..d48ba708aa 100644 --- a/datahub-web-react/src/alchemy-components/components/Table/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Table/components.ts @@ -1,8 +1,9 @@ import { Icon } from '@components'; -import { colors, radius, spacing, typography, borders } from '@src/alchemy-components/theme'; -import { AlignmentOptions } from '@src/alchemy-components/theme/config'; import styled from 'styled-components'; +import { borders, colors, radius, spacing, typography } from '@src/alchemy-components/theme'; +import { AlignmentOptions } from '@src/alchemy-components/theme/config'; + export const TableContainer = styled.div<{ isScrollable?: boolean; maxHeight?: string; isBorderless?: boolean }>( ({ isScrollable, maxHeight, isBorderless }) => ({ borderRadius: isBorderless ? radius.none : radius.lg, diff --git a/datahub-web-react/src/alchemy-components/components/Table/types.ts b/datahub-web-react/src/alchemy-components/components/Table/types.ts index 4ddc25c5be..843e161c52 100644 --- a/datahub-web-react/src/alchemy-components/components/Table/types.ts +++ b/datahub-web-react/src/alchemy-components/components/Table/types.ts @@ -1,6 +1,7 @@ -import { AlignmentOptions } from '@src/alchemy-components/theme/config'; import React, { TableHTMLAttributes } from 'react'; +import { AlignmentOptions } from '@src/alchemy-components/theme/config'; + export interface Column { title: string | React.ReactNode; key: string; diff --git a/datahub-web-react/src/alchemy-components/components/Table/useGetSelectionColumn.tsx b/datahub-web-react/src/alchemy-components/components/Table/useGetSelectionColumn.tsx index fa3dbe6fc9..067e268bd7 100644 --- a/datahub-web-react/src/alchemy-components/components/Table/useGetSelectionColumn.tsx +++ b/datahub-web-react/src/alchemy-components/components/Table/useGetSelectionColumn.tsx @@ -1,9 +1,10 @@ -import React from 'react'; import { Checkbox } from '@components'; -import { Column, RowSelectionProps } from './types'; -import { CheckboxWrapper } from './components'; -import { getRowKey } from './utils'; -import { useRowSelection } from './useRowSelection'; +import React from 'react'; + +import { CheckboxWrapper } from '@components/components/Table/components'; +import { Column, RowSelectionProps } from '@components/components/Table/types'; +import { useRowSelection } from '@components/components/Table/useRowSelection'; +import { getRowKey } from '@components/components/Table/utils'; export const useGetSelectionColumn = ( data: T[], diff --git a/datahub-web-react/src/alchemy-components/components/Table/useRowSelection.ts b/datahub-web-react/src/alchemy-components/components/Table/useRowSelection.ts index 69e2fce6b1..1c0bb8af4c 100644 --- a/datahub-web-react/src/alchemy-components/components/Table/useRowSelection.ts +++ b/datahub-web-react/src/alchemy-components/components/Table/useRowSelection.ts @@ -1,6 +1,7 @@ import { useCallback, useMemo } from 'react'; -import { RowSelectionProps } from './types'; -import { getRowKey } from './utils'; + +import { RowSelectionProps } from '@components/components/Table/types'; +import { getRowKey } from '@components/components/Table/utils'; export const useRowSelection = ( data: T[], diff --git a/datahub-web-react/src/alchemy-components/components/Table/utils.ts b/datahub-web-react/src/alchemy-components/components/Table/utils.ts index 47371ca4eb..ce0446de3e 100644 --- a/datahub-web-react/src/alchemy-components/components/Table/utils.ts +++ b/datahub-web-react/src/alchemy-components/components/Table/utils.ts @@ -1,4 +1,4 @@ -import { Column, SortingState } from './types'; +import { Column, SortingState } from '@components/components/Table/types'; export const handleActiveSort = ( key: string, diff --git a/datahub-web-react/src/alchemy-components/components/Text/Text.stories.tsx b/datahub-web-react/src/alchemy-components/components/Text/Text.stories.tsx index c82d468aaa..dcb29fa19c 100644 --- a/datahub-web-react/src/alchemy-components/components/Text/Text.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Text/Text.stories.tsx @@ -1,9 +1,9 @@ +import { BADGE } from '@geometricpanda/storybook-addon-badges'; +import type { Meta, StoryFn, StoryObj } from '@storybook/react'; import React from 'react'; -import type { Meta, StoryObj, StoryFn } from '@storybook/react'; -import { BADGE } from '@geometricpanda/storybook-addon-badges'; - import { VerticalFlexGrid } from '@components/.docs/mdx-components'; + import { Text, textDefaults } from '.'; // Auto Docs diff --git a/datahub-web-react/src/alchemy-components/components/Text/Text.tsx b/datahub-web-react/src/alchemy-components/components/Text/Text.tsx index 6f0bcba349..b06becd584 100644 --- a/datahub-web-react/src/alchemy-components/components/Text/Text.tsx +++ b/datahub-web-react/src/alchemy-components/components/Text/Text.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { TextProps } from './types'; -import { P, Div, Span, Pre } from './components'; +import { Div, P, Pre, Span } from '@components/components/Text/components'; +import { TextProps } from '@components/components/Text/types'; export const textDefaults: TextProps = { type: 'p', diff --git a/datahub-web-react/src/alchemy-components/components/Text/components.ts b/datahub-web-react/src/alchemy-components/components/Text/components.ts index 0641ec3438..368545f480 100644 --- a/datahub-web-react/src/alchemy-components/components/Text/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Text/components.ts @@ -1,8 +1,8 @@ import styled from 'styled-components'; -import { typography, colors } from '@components/theme'; +import { TextProps } from '@components/components/Text/types'; +import { colors, typography } from '@components/theme'; import { getColor, getFontSize } from '@components/theme/utils'; -import { TextProps } from './types'; // Text Styles const textStyles = { diff --git a/datahub-web-react/src/alchemy-components/components/Text/types.ts b/datahub-web-react/src/alchemy-components/components/Text/types.ts index c56eb58a93..f57ddbfd45 100644 --- a/datahub-web-react/src/alchemy-components/components/Text/types.ts +++ b/datahub-web-react/src/alchemy-components/components/Text/types.ts @@ -1,5 +1,6 @@ import { HTMLAttributes } from 'react'; -import { Color, FontSizeOptions, FontColorOptions, FontWeightOptions, SpacingOptions } from '@components/theme/config'; + +import { Color, FontColorOptions, FontSizeOptions, FontWeightOptions, SpacingOptions } from '@components/theme/config'; export interface TextProps extends HTMLAttributes { type?: 'span' | 'p' | 'div' | 'pre'; diff --git a/datahub-web-react/src/alchemy-components/components/TextArea/TextArea.stories.tsx b/datahub-web-react/src/alchemy-components/components/TextArea/TextArea.stories.tsx index b244eefa6f..ef599953c0 100644 --- a/datahub-web-react/src/alchemy-components/components/TextArea/TextArea.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/TextArea/TextArea.stories.tsx @@ -1,12 +1,10 @@ +import { BADGE } from '@geometricpanda/storybook-addon-badges'; +import type { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import type { Meta, StoryObj } from '@storybook/react'; -import { BADGE } from '@geometricpanda/storybook-addon-badges'; - import { GridList } from '@components/.docs/mdx-components'; - -import { TextArea, textAreaDefaults } from './TextArea'; -import { AVAILABLE_ICONS } from '../Icon'; +import { AVAILABLE_ICONS } from '@components/components/Icon'; +import { TextArea, textAreaDefaults } from '@components/components/TextArea/TextArea'; // Auto Docs const meta = { diff --git a/datahub-web-react/src/alchemy-components/components/TextArea/TextArea.tsx b/datahub-web-react/src/alchemy-components/components/TextArea/TextArea.tsx index bf7de3520f..6432be3031 100644 --- a/datahub-web-react/src/alchemy-components/components/TextArea/TextArea.tsx +++ b/datahub-web-react/src/alchemy-components/components/TextArea/TextArea.tsx @@ -1,7 +1,5 @@ import React from 'react'; -import { TextAreaProps } from './types'; - import { ErrorMessage, Label, @@ -12,7 +10,8 @@ import { TextAreaField, TextAreaWrapper, WarningMessage, -} from './components'; +} from '@components/components/TextArea/components'; +import { TextAreaProps } from '@components/components/TextArea/types'; export const textAreaDefaults: TextAreaProps = { label: 'Label', diff --git a/datahub-web-react/src/alchemy-components/components/TextArea/components.ts b/datahub-web-react/src/alchemy-components/components/TextArea/components.ts index dd208d3b23..d173183660 100644 --- a/datahub-web-react/src/alchemy-components/components/TextArea/components.ts +++ b/datahub-web-react/src/alchemy-components/components/TextArea/components.ts @@ -1,14 +1,15 @@ import styled from 'styled-components'; -import theme, { colors, radius, borders, spacing, typography, sizes } from '@components/theme'; +import { Icon, IconNames } from '@components/components/Icon'; +import { TextAreaProps } from '@components/components/TextArea/types'; +import { + formLabelTextStyles, + inputPlaceholderTextStyles, + inputValueTextStyles, +} from '@components/components/commonStyles'; +import theme, { borders, colors, radius, sizes, spacing, typography } from '@components/theme'; import { getStatusColors } from '@components/theme/utils'; -import { Icon, IconNames } from '../Icon'; - -import { formLabelTextStyles, inputValueTextStyles, inputPlaceholderTextStyles } from '../commonStyles'; - -import { TextAreaProps } from './types'; - const minHeight = '100px'; const defaultFlexStyles = { diff --git a/datahub-web-react/src/alchemy-components/components/TextArea/types.ts b/datahub-web-react/src/alchemy-components/components/TextArea/types.ts index a6edd05e8b..83a80c111a 100644 --- a/datahub-web-react/src/alchemy-components/components/TextArea/types.ts +++ b/datahub-web-react/src/alchemy-components/components/TextArea/types.ts @@ -1,5 +1,6 @@ import { TextareaHTMLAttributes } from 'react'; -import { IconNames } from '../Icon'; + +import { IconNames } from '@components/components/Icon'; export interface TextAreaProps extends TextareaHTMLAttributes { label: string; diff --git a/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.stories.tsx b/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.stories.tsx index 191c0e522c..efa844d805 100644 --- a/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.stories.tsx @@ -1,7 +1,8 @@ import { BADGE } from '@geometricpanda/storybook-addon-badges'; import type { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import { Timeline } from './Timeline'; + +import { Timeline } from '@components/components/Timeline/Timeline'; // Auto Docs const meta = { diff --git a/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.tsx b/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.tsx index d6d994430f..ded75881f2 100644 --- a/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.tsx +++ b/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.tsx @@ -1,7 +1,8 @@ import { Timeline as AntdTimeline } from 'antd'; import React from 'react'; -import { StyledAntdTimeline } from './components'; -import { BaseItemType, TimelineProps } from './types'; + +import { StyledAntdTimeline } from '@components/components/Timeline/components'; +import { BaseItemType, TimelineProps } from '@components/components/Timeline/types'; export const Timeline = ({ items, diff --git a/datahub-web-react/src/alchemy-components/components/Timeline/components.tsx b/datahub-web-react/src/alchemy-components/components/Timeline/components.tsx index cbcf654014..ddbed572dc 100644 --- a/datahub-web-react/src/alchemy-components/components/Timeline/components.tsx +++ b/datahub-web-react/src/alchemy-components/components/Timeline/components.tsx @@ -1,7 +1,8 @@ -import { colors } from '@src/alchemy-components/theme'; import { Timeline as AntdTimeline } from 'antd'; import styled from 'styled-components'; +import { colors } from '@src/alchemy-components/theme'; + export const StyledAntdTimeline = styled(AntdTimeline)` .ant-timeline-item-head { padding: 0; diff --git a/datahub-web-react/src/alchemy-components/components/Timeline/types.ts b/datahub-web-react/src/alchemy-components/components/Timeline/types.ts index 5e3debf018..868ce2aab2 100644 --- a/datahub-web-react/src/alchemy-components/components/Timeline/types.ts +++ b/datahub-web-react/src/alchemy-components/components/Timeline/types.ts @@ -1,6 +1,7 @@ -import { TimelineContentDetails } from '@src/app/entityV2/shared/tabs/Incident/types'; import React from 'react'; +import { TimelineContentDetails } from '@src/app/entityV2/shared/tabs/Incident/types'; + export type TimelineItem = { key: string; content: React.ReactNode; diff --git a/datahub-web-react/src/alchemy-components/components/Tooltip2/Tooltip2.tsx b/datahub-web-react/src/alchemy-components/components/Tooltip2/Tooltip2.tsx index 543ffe2af0..64bde77cce 100644 --- a/datahub-web-react/src/alchemy-components/components/Tooltip2/Tooltip2.tsx +++ b/datahub-web-react/src/alchemy-components/components/Tooltip2/Tooltip2.tsx @@ -1,17 +1,18 @@ import { Popover } from '@components'; import { TooltipProps } from 'antd'; import * as React from 'react'; + import { Container, Content, Section, SectionHeader, - SectionsContainer, SectionTitle, + SectionsContainer, Title, TitleSuffix, -} from './components'; -import { Tooltip2Props } from './types'; +} from '@components/components/Tooltip2/components'; +import { Tooltip2Props } from '@components/components/Tooltip2/types'; /** * Note: Depends on styling set in global-overrides-v2.less to override ant padding diff --git a/datahub-web-react/src/alchemy-components/components/Tooltip2/TooltipHeader.tsx b/datahub-web-react/src/alchemy-components/components/Tooltip2/TooltipHeader.tsx index 7b3ac460b4..200916b4a3 100644 --- a/datahub-web-react/src/alchemy-components/components/Tooltip2/TooltipHeader.tsx +++ b/datahub-web-react/src/alchemy-components/components/Tooltip2/TooltipHeader.tsx @@ -1,7 +1,9 @@ -import colors from '@src/alchemy-components/theme/foundations/colors'; import React from 'react'; import styled from 'styled-components'; -import { TooltipHeaderProps } from './types'; + +import { TooltipHeaderProps } from '@components/components/Tooltip2/types'; + +import colors from '@src/alchemy-components/theme/foundations/colors'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/alchemy-components/components/Tooltip2/components.ts b/datahub-web-react/src/alchemy-components/components/Tooltip2/components.ts index 19db36b50e..50c419d0bd 100644 --- a/datahub-web-react/src/alchemy-components/components/Tooltip2/components.ts +++ b/datahub-web-react/src/alchemy-components/components/Tooltip2/components.ts @@ -1,6 +1,7 @@ -import colors from '@src/alchemy-components/theme/foundations/colors'; import styled from 'styled-components'; +import colors from '@src/alchemy-components/theme/foundations/colors'; + export const Title = styled.div` color: ${colors.gray[1700]}; font-size: 14px; diff --git a/datahub-web-react/src/alchemy-components/components/Utils/ClickOutside/ClickOutside.stories.tsx b/datahub-web-react/src/alchemy-components/components/Utils/ClickOutside/ClickOutside.stories.tsx index 71ed7f02af..9844d5457f 100644 --- a/datahub-web-react/src/alchemy-components/components/Utils/ClickOutside/ClickOutside.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/Utils/ClickOutside/ClickOutside.stories.tsx @@ -1,7 +1,8 @@ import { BADGE } from '@geometricpanda/storybook-addon-badges'; import { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import ClickOutside from './ClickOutside'; + +import ClickOutside from '@components/components/Utils/ClickOutside/ClickOutside'; // Auto Docs const meta = { diff --git a/datahub-web-react/src/alchemy-components/components/Utils/ClickOutside/ClickOutside.tsx b/datahub-web-react/src/alchemy-components/components/Utils/ClickOutside/ClickOutside.tsx index 4e17e43440..ac150f5e50 100644 --- a/datahub-web-react/src/alchemy-components/components/Utils/ClickOutside/ClickOutside.tsx +++ b/datahub-web-react/src/alchemy-components/components/Utils/ClickOutside/ClickOutside.tsx @@ -1,5 +1,6 @@ import React, { useEffect, useRef } from 'react'; -import { ClickOutsideProps } from './types'; + +import { ClickOutsideProps } from '@components/components/Utils/ClickOutside/types'; export default function ClickOutside({ children, diff --git a/datahub-web-react/src/alchemy-components/components/Utils/OverlayClassContext/OverlayClassContext.tsx b/datahub-web-react/src/alchemy-components/components/Utils/OverlayClassContext/OverlayClassContext.tsx index 2f8afd1583..61376c6185 100644 --- a/datahub-web-react/src/alchemy-components/components/Utils/OverlayClassContext/OverlayClassContext.tsx +++ b/datahub-web-react/src/alchemy-components/components/Utils/OverlayClassContext/OverlayClassContext.tsx @@ -1,5 +1,9 @@ import React, { useContext, useMemo } from 'react'; -import { DEFAULT_OVERLAY_CLASS_NAME, NESTED_OVERLAY_CLASS_NAME_SUFFIX } from './constants'; + +import { + DEFAULT_OVERLAY_CLASS_NAME, + NESTED_OVERLAY_CLASS_NAME_SUFFIX, +} from '@components/components/Utils/OverlayClassContext/constants'; export const OverlayClassStackContext = React.createContext([]); diff --git a/datahub-web-react/src/alchemy-components/components/WhiskerChart/WhiskerChart.stories.tsx b/datahub-web-react/src/alchemy-components/components/WhiskerChart/WhiskerChart.stories.tsx index ed2ec4fd6c..1ad886c6f0 100644 --- a/datahub-web-react/src/alchemy-components/components/WhiskerChart/WhiskerChart.stories.tsx +++ b/datahub-web-react/src/alchemy-components/components/WhiskerChart/WhiskerChart.stories.tsx @@ -1,10 +1,9 @@ +import { BADGE } from '@geometricpanda/storybook-addon-badges'; +import type { Meta, StoryObj } from '@storybook/react'; import React from 'react'; -import type { Meta, StoryObj } from '@storybook/react'; -import { BADGE } from '@geometricpanda/storybook-addon-badges'; - -import WhiskerChart from './WhiskerChart'; -import { DEFAULT_BOX_SIZE, DEFAULT_GAP_BETWEEN_WHISKERS } from './constants'; +import WhiskerChart from '@components/components/WhiskerChart/WhiskerChart'; +import { DEFAULT_BOX_SIZE, DEFAULT_GAP_BETWEEN_WHISKERS } from '@components/components/WhiskerChart/constants'; // Auto Docs const meta = { diff --git a/datahub-web-react/src/alchemy-components/components/WhiskerChart/WhiskerChart.tsx b/datahub-web-react/src/alchemy-components/components/WhiskerChart/WhiskerChart.tsx index 51982c39e4..603d4b56c4 100644 --- a/datahub-web-react/src/alchemy-components/components/WhiskerChart/WhiskerChart.tsx +++ b/datahub-web-react/src/alchemy-components/components/WhiskerChart/WhiskerChart.tsx @@ -1,4 +1,3 @@ -import { colors } from '@src/alchemy-components/theme'; import { Axis } from '@visx/axis'; import { GridColumns } from '@visx/grid'; import { ParentSize } from '@visx/responsive'; @@ -7,15 +6,22 @@ import { BoxPlot } from '@visx/stats'; import { useTooltip } from '@visx/tooltip'; import React, { useMemo } from 'react'; import styled from 'styled-components'; + import { AXIS_LABEL_MARGIN_OFFSET, AXIS_LABEL_PROPS, DEFAULT_BOX_SIZE, DEFAULT_GAP_BETWEEN_WHISKERS, -} from './constants'; -import { whiskerChartDefaults } from './defaults'; -import { InternalWhiskerChartProps, WhiskerChartProps, WhiskerTooltipDatum } from './types'; -import { computeWhiskerOffset } from './utils'; +} from '@components/components/WhiskerChart/constants'; +import { whiskerChartDefaults } from '@components/components/WhiskerChart/defaults'; +import { + InternalWhiskerChartProps, + WhiskerChartProps, + WhiskerTooltipDatum, +} from '@components/components/WhiskerChart/types'; +import { computeWhiskerOffset } from '@components/components/WhiskerChart/utils'; + +import { colors } from '@src/alchemy-components/theme'; const ChartWrapper = styled.div` width: 100%; diff --git a/datahub-web-react/src/alchemy-components/components/WhiskerChart/components/GlyphWithLineAndPopover.tsx b/datahub-web-react/src/alchemy-components/components/WhiskerChart/components/GlyphWithLineAndPopover.tsx index d2bbfe11be..c13991b733 100644 --- a/datahub-web-react/src/alchemy-components/components/WhiskerChart/components/GlyphWithLineAndPopover.tsx +++ b/datahub-web-react/src/alchemy-components/components/WhiskerChart/components/GlyphWithLineAndPopover.tsx @@ -1,12 +1,13 @@ import React, { useCallback } from 'react'; -import { Popover } from '../../Popover'; -import { Text } from '../../Text'; + +import { Popover } from '@components/components/Popover'; +import { Text } from '@components/components/Text'; import { DEFAULT_COLOR_SHEME, WHISKER_METRIC_ATTRIBUTE_NAMES, WHISKER_METRIC_NAMES as WHISKER_METRIC_LABELS, -} from '../constants'; -import { TooltipRendererProps } from '../types'; +} from '@components/components/WhiskerChart/constants'; +import { TooltipRendererProps } from '@components/components/WhiskerChart/types'; const RADIUS = 6; diff --git a/datahub-web-react/src/alchemy-components/components/WhiskerChart/components/MetricPoint.tsx b/datahub-web-react/src/alchemy-components/components/WhiskerChart/components/MetricPoint.tsx index 9272db931b..7519f4c8fe 100644 --- a/datahub-web-react/src/alchemy-components/components/WhiskerChart/components/MetricPoint.tsx +++ b/datahub-web-react/src/alchemy-components/components/WhiskerChart/components/MetricPoint.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { MetricPointProps } from '../types'; + +import { MetricPointProps } from '@components/components/WhiskerChart/types'; const StyledRect = styled.rect` cursor: pointer; diff --git a/datahub-web-react/src/alchemy-components/components/WhiskerChart/components/WhiskerRenderer.tsx b/datahub-web-react/src/alchemy-components/components/WhiskerChart/components/WhiskerRenderer.tsx index 56440ef726..8d2f975dec 100644 --- a/datahub-web-react/src/alchemy-components/components/WhiskerChart/components/WhiskerRenderer.tsx +++ b/datahub-web-react/src/alchemy-components/components/WhiskerChart/components/WhiskerRenderer.tsx @@ -1,9 +1,10 @@ import { LinearGradient } from '@visx/gradient'; import { BarRounded } from '@visx/shape'; import React, { useState } from 'react'; -import { DEFAULT_COLOR_SHEME } from '../constants'; -import { WhiskerMetricType, WhiskerRenderProps } from '../types'; -import MetricPoint from './MetricPoint'; + +import MetricPoint from '@components/components/WhiskerChart/components/MetricPoint'; +import { DEFAULT_COLOR_SHEME } from '@components/components/WhiskerChart/constants'; +import { WhiskerMetricType, WhiskerRenderProps } from '@components/components/WhiskerChart/types'; export default function WhiskerRenderer({ datum, diff --git a/datahub-web-react/src/alchemy-components/components/WhiskerChart/constants.ts b/datahub-web-react/src/alchemy-components/components/WhiskerChart/constants.ts index 13d6ced89c..9aa1042ac4 100644 --- a/datahub-web-react/src/alchemy-components/components/WhiskerChart/constants.ts +++ b/datahub-web-react/src/alchemy-components/components/WhiskerChart/constants.ts @@ -1,5 +1,6 @@ import { TextProps } from '@visx/text/lib/Text'; -import { ColorSchemeSettings, WhiskerMetricType } from './types'; + +import { ColorSchemeSettings, WhiskerMetricType } from '@components/components/WhiskerChart/types'; export const DEFAULT_COLOR_SHEME: ColorSchemeSettings = { box: '#705EE4', diff --git a/datahub-web-react/src/alchemy-components/components/WhiskerChart/defaults.tsx b/datahub-web-react/src/alchemy-components/components/WhiskerChart/defaults.tsx index 678ced5fa9..71c17bb960 100644 --- a/datahub-web-react/src/alchemy-components/components/WhiskerChart/defaults.tsx +++ b/datahub-web-react/src/alchemy-components/components/WhiskerChart/defaults.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import GlyphWithLineAndPopover from './components/GlyphWithLineAndPopover'; -import WhiskerRenderer from './components/WhiskerRenderer'; -import { DEFAULT_BOX_SIZE, DEFAULT_GAP_BETWEEN_WHISKERS } from './constants'; -import { WhiskerChartProps } from './types'; + +import GlyphWithLineAndPopover from '@components/components/WhiskerChart/components/GlyphWithLineAndPopover'; +import WhiskerRenderer from '@components/components/WhiskerChart/components/WhiskerRenderer'; +import { DEFAULT_BOX_SIZE, DEFAULT_GAP_BETWEEN_WHISKERS } from '@components/components/WhiskerChart/constants'; +import { WhiskerChartProps } from '@components/components/WhiskerChart/types'; export const whiskerChartDefaults: Omit = { boxSize: DEFAULT_BOX_SIZE, diff --git a/datahub-web-react/src/alchemy-components/theme/foundations/index.ts b/datahub-web-react/src/alchemy-components/theme/foundations/index.ts index e4c81d77f0..70abfc172a 100644 --- a/datahub-web-react/src/alchemy-components/theme/foundations/index.ts +++ b/datahub-web-react/src/alchemy-components/theme/foundations/index.ts @@ -1,15 +1,15 @@ -import blur from './blur'; -import borders from './borders'; -import breakpoints from './breakpoints'; -import colors from './colors'; -import radius from './radius'; -import shadows from './shadows'; -import sizes from './sizes'; -import spacing from './spacing'; -import transform from './transform'; -import transition from './transition'; -import typography from './typography'; -import zIndices from './zIndex'; +import blur from '@components/theme/foundations/blur'; +import borders from '@components/theme/foundations/borders'; +import breakpoints from '@components/theme/foundations/breakpoints'; +import colors from '@components/theme/foundations/colors'; +import radius from '@components/theme/foundations/radius'; +import shadows from '@components/theme/foundations/shadows'; +import sizes from '@components/theme/foundations/sizes'; +import spacing from '@components/theme/foundations/spacing'; +import transform from '@components/theme/foundations/transform'; +import transition from '@components/theme/foundations/transition'; +import typography from '@components/theme/foundations/typography'; +import zIndices from '@components/theme/foundations/zIndex'; export const foundations = { blur, diff --git a/datahub-web-react/src/alchemy-components/theme/foundations/shadows.ts b/datahub-web-react/src/alchemy-components/theme/foundations/shadows.ts index e4cc920dd8..2ac499308d 100644 --- a/datahub-web-react/src/alchemy-components/theme/foundations/shadows.ts +++ b/datahub-web-react/src/alchemy-components/theme/foundations/shadows.ts @@ -1,4 +1,4 @@ -import { BoxShadowOptions } from '../config'; +import { BoxShadowOptions } from '@components/theme/config'; const shadows: Record = { xs: '0px 1px 2px 0px rgba(0, 0, 0, 0.05)', diff --git a/datahub-web-react/src/alchemy-components/theme/index.ts b/datahub-web-react/src/alchemy-components/theme/index.ts index 65bad35f82..c186896d41 100644 --- a/datahub-web-react/src/alchemy-components/theme/index.ts +++ b/datahub-web-react/src/alchemy-components/theme/index.ts @@ -1,8 +1,7 @@ -import * as config from './config'; -import * as utils from './utils'; - -import { foundations } from './foundations'; -import { semanticTokens } from './semantic-tokens'; +import * as config from '@components/theme/config'; +import { foundations } from '@components/theme/foundations'; +import { semanticTokens } from '@components/theme/semantic-tokens'; +import * as utils from '@components/theme/utils'; const theme = { semanticTokens, diff --git a/datahub-web-react/src/alchemy-components/theme/semantic-tokens.ts b/datahub-web-react/src/alchemy-components/theme/semantic-tokens.ts index 29bd20d11f..46fc055c1d 100644 --- a/datahub-web-react/src/alchemy-components/theme/semantic-tokens.ts +++ b/datahub-web-react/src/alchemy-components/theme/semantic-tokens.ts @@ -1,4 +1,4 @@ -import { foundations } from './foundations'; +import { foundations } from '@components/theme/foundations'; const { colors } = foundations; diff --git a/datahub-web-react/src/alchemy-components/theme/utils.ts b/datahub-web-react/src/alchemy-components/theme/utils.ts index 206756e5bb..188d08ded0 100644 --- a/datahub-web-react/src/alchemy-components/theme/utils.ts +++ b/datahub-web-react/src/alchemy-components/theme/utils.ts @@ -1,10 +1,15 @@ /* Theme Utils that can be used anywhere in the app */ - -import { FontSizeOptions, ColorOptions, MiscColorOptions, RotationOptions, DEFAULT_VALUE } from './config'; -import { foundations } from './foundations'; -import { semanticTokens } from './semantic-tokens'; +import { + ColorOptions, + DEFAULT_VALUE, + FontSizeOptions, + MiscColorOptions, + RotationOptions, +} from '@components/theme/config'; +import { foundations } from '@components/theme/foundations'; +import { semanticTokens } from '@components/theme/semantic-tokens'; const { colors, typography, transform } = foundations; /* diff --git a/datahub-web-react/src/app/AdminConsole.tsx b/datahub-web-react/src/app/AdminConsole.tsx index a79575c3d8..fba4ea98ee 100644 --- a/datahub-web-react/src/app/AdminConsole.tsx +++ b/datahub-web-react/src/app/AdminConsole.tsx @@ -1,12 +1,13 @@ +import { BankOutlined, BarChartOutlined, MenuOutlined } from '@ant-design/icons'; +import { Menu } from 'antd'; +import Sider from 'antd/lib/layout/Sider'; import React, { useState } from 'react'; import { Link } from 'react-router-dom'; -import { Menu } from 'antd'; import styled from 'styled-components'; -import { BankOutlined, BarChartOutlined, MenuOutlined } from '@ant-design/icons'; -import Sider from 'antd/lib/layout/Sider'; -import { useAppConfig } from './useAppConfig'; -import { ANTD_GRAY } from './entity/shared/constants'; -import { useUserContext } from './context/useUserContext'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useAppConfig } from '@app/useAppConfig'; const ToggleContainer = styled.div` background-color: ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/AppProviders.tsx b/datahub-web-react/src/app/AppProviders.tsx index 767dd5e778..684c084da7 100644 --- a/datahub-web-react/src/app/AppProviders.tsx +++ b/datahub-web-react/src/app/AppProviders.tsx @@ -1,12 +1,13 @@ import React from 'react'; -import AppConfigProvider from '../AppConfigProvider'; -import { EducationStepsProvider } from '../providers/EducationStepsProvider'; -import UserContextProvider from './context/UserContextProvider'; -import QuickFiltersProvider from '../providers/QuickFiltersProvider'; -import SearchContextProvider from './search/context/SearchContextProvider'; -import EntityRegistryProvider from './EntityRegistryProvider'; -import { BrowserTitleProvider } from './shared/BrowserTabTitleContext'; -import { NavBarProvider } from './homeV2/layout/navBarRedesign/NavBarContext'; + +import EntityRegistryProvider from '@app/EntityRegistryProvider'; +import UserContextProvider from '@app/context/UserContextProvider'; +import { NavBarProvider } from '@app/homeV2/layout/navBarRedesign/NavBarContext'; +import SearchContextProvider from '@app/search/context/SearchContextProvider'; +import { BrowserTitleProvider } from '@app/shared/BrowserTabTitleContext'; +import { EducationStepsProvider } from '@providers/EducationStepsProvider'; +import QuickFiltersProvider from '@providers/QuickFiltersProvider'; +import AppConfigProvider from '@src/AppConfigProvider'; interface Props { children: React.ReactNode; diff --git a/datahub-web-react/src/app/DataHubTitle.tsx b/datahub-web-react/src/app/DataHubTitle.tsx index aace36bd38..f17af9d520 100644 --- a/datahub-web-react/src/app/DataHubTitle.tsx +++ b/datahub-web-react/src/app/DataHubTitle.tsx @@ -1,8 +1,9 @@ import React from 'react'; import { Helmet } from 'react-helmet-async'; import { useLocation } from 'react-router'; -import { useCustomTheme } from '../customThemeContext'; -import { useAppConfig } from './useAppConfig'; + +import { useAppConfig } from '@app/useAppConfig'; +import { useCustomTheme } from '@src/customThemeContext'; const PATH_FRAGMENT_TO_TITLE_OVERRIDES = { sso: 'SSO', diff --git a/datahub-web-react/src/app/EmbedRoutes.tsx b/datahub-web-react/src/app/EmbedRoutes.tsx index 4ab38ed6b8..3c187fd6f8 100644 --- a/datahub-web-react/src/app/EmbedRoutes.tsx +++ b/datahub-web-react/src/app/EmbedRoutes.tsx @@ -1,9 +1,10 @@ import React from 'react'; import { Route } from 'react-router-dom'; -import { PageRoutes } from '../conf/Global'; -import EmbeddedPage from './embed/EmbeddedPage'; -import { useEntityRegistry } from './useEntityRegistry'; -import EmbedLookup from './embed/lookup'; + +import EmbeddedPage from '@app/embed/EmbeddedPage'; +import EmbedLookup from '@app/embed/lookup'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; export default function EmbedRoutes() { const entityRegistry = useEntityRegistry(); diff --git a/datahub-web-react/src/app/EntityRegistryProvider.tsx b/datahub-web-react/src/app/EntityRegistryProvider.tsx index 000858bae6..11535f0415 100644 --- a/datahub-web-react/src/app/EntityRegistryProvider.tsx +++ b/datahub-web-react/src/app/EntityRegistryProvider.tsx @@ -1,8 +1,9 @@ -import buildEntityRegistryV2 from '@app/buildEntityRegistryV2'; import React from 'react'; -import { EntityRegistryContext } from '../entityRegistryContext'; -import EntityRegistry from './entity/EntityRegistry'; -import useBuildEntityRegistry from './useBuildEntityRegistry'; + +import buildEntityRegistryV2 from '@app/buildEntityRegistryV2'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import useBuildEntityRegistry from '@app/useBuildEntityRegistry'; +import { EntityRegistryContext } from '@src/entityRegistryContext'; export const globalEntityRegistryV2 = buildEntityRegistryV2(); diff --git a/datahub-web-react/src/app/ProtectedRoutes.tsx b/datahub-web-react/src/app/ProtectedRoutes.tsx index 2cf3c724ed..978dbafb8a 100644 --- a/datahub-web-react/src/app/ProtectedRoutes.tsx +++ b/datahub-web-react/src/app/ProtectedRoutes.tsx @@ -1,20 +1,21 @@ -import React, { useEffect } from 'react'; -import { Switch, Route, useLocation, useHistory } from 'react-router-dom'; import { Layout } from 'antd'; +import React, { useEffect } from 'react'; +import { Route, Switch, useHistory, useLocation } from 'react-router-dom'; import styled from 'styled-components'; -import DataHubTitle from './DataHubTitle'; -import { HomePage } from './home/HomePage'; -import { HomePage as HomePageV2 } from './homeV2/HomePage'; -import { SearchRoutes } from './SearchRoutes'; -import EmbedRoutes from './EmbedRoutes'; -import { NEW_ROUTE_MAP, PageRoutes } from '../conf/Global'; -import { useIsThemeV2, useSetThemeIsV2 } from './useIsThemeV2'; -import { getRedirectUrl } from '../conf/utils'; -import { IntroduceYourself } from './homeV2/introduce/IntroduceYourself'; -import { useSetUserTitle } from './identity/user/useUserTitle'; -import { useSetUserPersona } from './homeV2/persona/useUserPersona'; -import { useSetNavBarRedesignEnabled } from './useShowNavBarRedesign'; -import { OnboardingContextProvider } from './onboarding/OnboardingContextProvider'; + +import DataHubTitle from '@app/DataHubTitle'; +import EmbedRoutes from '@app/EmbedRoutes'; +import { SearchRoutes } from '@app/SearchRoutes'; +import { HomePage } from '@app/home/HomePage'; +import { HomePage as HomePageV2 } from '@app/homeV2/HomePage'; +import { IntroduceYourself } from '@app/homeV2/introduce/IntroduceYourself'; +import { useSetUserPersona } from '@app/homeV2/persona/useUserPersona'; +import { useSetUserTitle } from '@app/identity/user/useUserTitle'; +import { OnboardingContextProvider } from '@app/onboarding/OnboardingContextProvider'; +import { useIsThemeV2, useSetThemeIsV2 } from '@app/useIsThemeV2'; +import { useSetNavBarRedesignEnabled } from '@app/useShowNavBarRedesign'; +import { NEW_ROUTE_MAP, PageRoutes } from '@conf/Global'; +import { getRedirectUrl } from '@conf/utils'; const StyledLayout = styled(Layout)` background-color: transparent; diff --git a/datahub-web-react/src/app/Routes.tsx b/datahub-web-react/src/app/Routes.tsx index 2b53fa32da..02685c9a89 100644 --- a/datahub-web-react/src/app/Routes.tsx +++ b/datahub-web-react/src/app/Routes.tsx @@ -1,15 +1,16 @@ -import React from 'react'; -import { Switch, Route, RouteProps } from 'react-router-dom'; import { useReactiveVar } from '@apollo/client'; -import AppProviders from './AppProviders'; -import { LogIn } from './auth/LogIn'; -import { SignUp } from './auth/SignUp'; -import { ResetCredentials } from './auth/ResetCredentials'; -import { NoPageFound } from './shared/NoPageFound'; -import { PageRoutes } from '../conf/Global'; -import { isLoggedInVar } from './auth/checkAuthStatus'; -import { useTrackPageView } from './analytics'; -import { ProtectedRoutes } from './ProtectedRoutes'; +import React from 'react'; +import { Route, RouteProps, Switch } from 'react-router-dom'; + +import AppProviders from '@app/AppProviders'; +import { ProtectedRoutes } from '@app/ProtectedRoutes'; +import { useTrackPageView } from '@app/analytics'; +import { LogIn } from '@app/auth/LogIn'; +import { ResetCredentials } from '@app/auth/ResetCredentials'; +import { SignUp } from '@app/auth/SignUp'; +import { isLoggedInVar } from '@app/auth/checkAuthStatus'; +import { NoPageFound } from '@app/shared/NoPageFound'; +import { PageRoutes } from '@conf/Global'; const ProtectedRoute = ({ isLoggedIn, diff --git a/datahub-web-react/src/app/SearchRoutes.tsx b/datahub-web-react/src/app/SearchRoutes.tsx index b3e2612660..be4d76c43e 100644 --- a/datahub-web-react/src/app/SearchRoutes.tsx +++ b/datahub-web-react/src/app/SearchRoutes.tsx @@ -1,38 +1,37 @@ import React from 'react'; import { Redirect, Route, Switch } from 'react-router-dom'; -import { PageRoutes } from '../conf/Global'; -import { AnalyticsPage } from './analyticsDashboard/components/AnalyticsPage'; -import { BrowseResultsPage } from './browse/BrowseResultsPage'; -import { BusinessAttributes } from './businessAttribute/BusinessAttributes'; -import { useUserContext } from './context/useUserContext'; -import DomainRoutes from './domain/DomainRoutes'; -import { ManageDomainsPage } from './domain/ManageDomainsPage'; -import StructuredProperties from './govern/structuredProperties/StructuredProperties'; + +import { AnalyticsPage } from '@app/analyticsDashboard/components/AnalyticsPage'; +import { BrowseResultsPage } from '@app/browse/BrowseResultsPage'; +import { BusinessAttributes } from '@app/businessAttribute/BusinessAttributes'; +import { useUserContext } from '@app/context/useUserContext'; +import DomainRoutes from '@app/domain/DomainRoutes'; +import { ManageDomainsPage } from '@app/domain/ManageDomainsPage'; +import DomainRoutesV2 from '@app/domainV2/DomainRoutes'; +import { ManageDomainsPage as ManageDomainsPageV2 } from '@app/domainV2/ManageDomainsPage'; +import { EntityPage } from '@app/entity/EntityPage'; +import { EntityPage as EntityPageV2 } from '@app/entityV2/EntityPage'; +import GlossaryRoutes from '@app/glossary/GlossaryRoutes'; +import GlossaryRoutesV2 from '@app/glossaryV2/GlossaryRoutes'; +import StructuredProperties from '@app/govern/structuredProperties/StructuredProperties'; +import { ManageIngestionPage } from '@app/ingest/ManageIngestionPage'; +import { SearchPage } from '@app/search/SearchPage'; +import { SearchablePage } from '@app/search/SearchablePage'; +import { SearchPage as SearchPageV2 } from '@app/searchV2/SearchPage'; +import { SearchablePage as SearchablePageV2 } from '@app/searchV2/SearchablePage'; +import { SettingsPage } from '@app/settings/SettingsPage'; +import { SettingsPage as SettingsPageV2 } from '@app/settingsV2/SettingsPage'; +import { NoPageFound } from '@app/shared/NoPageFound'; +import { ManageTags } from '@app/tags/ManageTags'; import { useAppConfig, useBusinessAttributesFlag, useIsAppConfigContextLoaded, useIsNestedDomainsEnabled, -} from './useAppConfig'; - -import { EntityPage } from './entity/EntityPage'; -import { EntityPage as EntityPageV2 } from './entityV2/EntityPage'; -import GlossaryRoutes from './glossary/GlossaryRoutes'; -import GlossaryRoutesV2 from './glossaryV2/GlossaryRoutes'; -import { ManageIngestionPage } from './ingest/ManageIngestionPage'; -import { SearchPage } from './search/SearchPage'; -import { SearchablePage } from './search/SearchablePage'; -import { SearchPage as SearchPageV2 } from './searchV2/SearchPage'; -import { SearchablePage as SearchablePageV2 } from './searchV2/SearchablePage'; -import { SettingsPage } from './settings/SettingsPage'; -import { SettingsPage as SettingsPageV2 } from './settingsV2/SettingsPage'; -import { NoPageFound } from './shared/NoPageFound'; -import { useEntityRegistry } from './useEntityRegistry'; - -import DomainRoutesV2 from './domainV2/DomainRoutes'; -import { ManageDomainsPage as ManageDomainsPageV2 } from './domainV2/ManageDomainsPage'; -import { useIsThemeV2 } from './useIsThemeV2'; -import { ManageTags } from './tags/ManageTags'; +} from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { useIsThemeV2 } from '@app/useIsThemeV2'; +import { PageRoutes } from '@conf/Global'; /** * Container for all searchable page routes diff --git a/datahub-web-react/src/app/__tests__/Routes.test.tsx b/datahub-web-react/src/app/__tests__/Routes.test.tsx index b1f82ef46b..b55221b094 100644 --- a/datahub-web-react/src/app/__tests__/Routes.test.tsx +++ b/datahub-web-react/src/app/__tests__/Routes.test.tsx @@ -1,9 +1,10 @@ -import React from 'react'; -import { render, waitFor } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; -import { mocks } from '../../Mocks'; -import TestPageContainer from '../../utils/test-utils/TestPageContainer'; -import { Routes } from '../Routes'; +import { render, waitFor } from '@testing-library/react'; +import React from 'react'; + +import { Routes } from '@app/Routes'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; test('renders embed page properly', async () => { const { getByText } = render( diff --git a/datahub-web-react/src/app/analytics/README.md b/datahub-web-react/src/app/analytics/README.md index 881fffd59f..c58aaf845f 100644 --- a/datahub-web-react/src/app/analytics/README.md +++ b/datahub-web-react/src/app/analytics/README.md @@ -4,9 +4,9 @@ The DataHub React application can be configured to emit a set of standardized product analytics events to multiple backend providers including -- Mixpanel -- Amplitude -- Google Analytics +- Mixpanel +- Amplitude +- Google Analytics This provides operators of DataHub with visibility into how their users are engaging with the platform, allowing them to answer questions around weekly active users, the most used features, the least used features, and more. diff --git a/datahub-web-react/src/app/analytics/__tests__/analytics.test.ts b/datahub-web-react/src/app/analytics/__tests__/analytics.test.ts index 50f72ccdb1..1e4c2dde8e 100644 --- a/datahub-web-react/src/app/analytics/__tests__/analytics.test.ts +++ b/datahub-web-react/src/app/analytics/__tests__/analytics.test.ts @@ -1,4 +1,4 @@ -import { getMergedTrackingOptions, THIRD_PARTY_LOGGING_KEY } from '../analytics'; +import { THIRD_PARTY_LOGGING_KEY, getMergedTrackingOptions } from '@app/analytics/analytics'; describe('getMergedTrackingOptions', () => { it('should update or create an options object with mixpanel set to the value of what is in localStorage', () => { diff --git a/datahub-web-react/src/app/analytics/analytics.ts b/datahub-web-react/src/app/analytics/analytics.ts index c4c1b473be..bf10b12e6e 100644 --- a/datahub-web-react/src/app/analytics/analytics.ts +++ b/datahub-web-react/src/app/analytics/analytics.ts @@ -1,9 +1,10 @@ import Analytics, { PageData } from 'analytics'; import Cookies from 'js-cookie'; -import plugins from './plugin'; -import { Event, EventType } from './event'; -import { CLIENT_AUTH_COOKIE } from '../../conf/Global'; -import { getBrowserId } from '../browserId'; + +import { Event, EventType } from '@app/analytics/event'; +import plugins from '@app/analytics/plugin'; +import { getBrowserId } from '@app/browserId'; +import { CLIENT_AUTH_COOKIE } from '@conf/Global'; const appName = 'datahub-react'; diff --git a/datahub-web-react/src/app/analytics/event.ts b/datahub-web-react/src/app/analytics/event.ts index 91b7ff84a4..d2a4449f6c 100644 --- a/datahub-web-react/src/app/analytics/event.ts +++ b/datahub-web-react/src/app/analytics/event.ts @@ -1,3 +1,7 @@ +import { EmbedLookupNotFoundReason } from '@app/embed/lookup/constants'; +import { Direction } from '@app/lineage/types'; +import { FilterMode } from '@app/search/utils/constants'; + import { AllowedValue, DataHubViewType, @@ -7,10 +11,7 @@ import { PropertyValueInput, RecommendationRenderType, ScenarioType, -} from '../../types.generated'; -import { EmbedLookupNotFoundReason } from '../embed/lookup/constants'; -import { Direction } from '../lineage/types'; -import { FilterMode } from '../search/utils/constants'; +} from '@types'; /** * Valid event types. diff --git a/datahub-web-react/src/app/analytics/plugin/amplitude.ts b/datahub-web-react/src/app/analytics/plugin/amplitude.ts index e6346a02e9..4bd9ac5f3a 100644 --- a/datahub-web-react/src/app/analytics/plugin/amplitude.ts +++ b/datahub-web-react/src/app/analytics/plugin/amplitude.ts @@ -1,5 +1,6 @@ import amplitude from '@analytics/amplitude'; -import analyticsConfig from '../../../conf/analytics'; + +import analyticsConfig from '@conf/analytics'; const amplitudeConfigs = analyticsConfig.amplitude; const isEnabled: boolean = amplitudeConfigs || false; diff --git a/datahub-web-react/src/app/analytics/plugin/datahub.ts b/datahub-web-react/src/app/analytics/plugin/datahub.ts index 301329d5d4..451f017301 100644 --- a/datahub-web-react/src/app/analytics/plugin/datahub.ts +++ b/datahub-web-react/src/app/analytics/plugin/datahub.ts @@ -1,4 +1,4 @@ -import analyticsConfig from '../../../conf/analytics'; +import analyticsConfig from '@conf/analytics'; const { datahub } = analyticsConfig; const isEnabled: boolean = (datahub && datahub.enabled) || false; diff --git a/datahub-web-react/src/app/analytics/plugin/googleAnalytics.ts b/datahub-web-react/src/app/analytics/plugin/googleAnalytics.ts index 727258ee8d..0d3804a98f 100644 --- a/datahub-web-react/src/app/analytics/plugin/googleAnalytics.ts +++ b/datahub-web-react/src/app/analytics/plugin/googleAnalytics.ts @@ -1,6 +1,7 @@ import googleAnalytics from '@analytics/google-analytics'; -import { Event, EventType } from '../event'; -import analyticsConfig from '../../../conf/analytics'; + +import { Event, EventType } from '@app/analytics/event'; +import analyticsConfig from '@conf/analytics'; const ga4Configs = analyticsConfig.googleAnalytics; const isEnabled: boolean = ga4Configs || false; diff --git a/datahub-web-react/src/app/analytics/plugin/index.ts b/datahub-web-react/src/app/analytics/plugin/index.ts index dc704aa81e..52c0ca70e7 100644 --- a/datahub-web-react/src/app/analytics/plugin/index.ts +++ b/datahub-web-react/src/app/analytics/plugin/index.ts @@ -1,7 +1,7 @@ -import googleAnalytics from './googleAnalytics'; -import mixpanel from './mixpanel'; -import amplitude from './amplitude'; -import datahub from './datahub'; -import logger from './logger'; +import amplitude from '@app/analytics/plugin/amplitude'; +import datahub from '@app/analytics/plugin/datahub'; +import googleAnalytics from '@app/analytics/plugin/googleAnalytics'; +import logger from '@app/analytics/plugin/logger'; +import mixpanel from '@app/analytics/plugin/mixpanel'; export default [googleAnalytics, mixpanel, amplitude, datahub, logger]; diff --git a/datahub-web-react/src/app/analytics/plugin/logger.ts b/datahub-web-react/src/app/analytics/plugin/logger.ts index e8e2884c94..6cf2021735 100644 --- a/datahub-web-react/src/app/analytics/plugin/logger.ts +++ b/datahub-web-react/src/app/analytics/plugin/logger.ts @@ -1,4 +1,4 @@ -import analyticsConfig from '../../../conf/analytics'; +import analyticsConfig from '@conf/analytics'; /** * Analytics plugin that logs tracking events + page views to console.s diff --git a/datahub-web-react/src/app/analytics/plugin/mixpanel.ts b/datahub-web-react/src/app/analytics/plugin/mixpanel.ts index b8a7cb1794..755f8c825e 100644 --- a/datahub-web-react/src/app/analytics/plugin/mixpanel.ts +++ b/datahub-web-react/src/app/analytics/plugin/mixpanel.ts @@ -1,5 +1,6 @@ import mixpanel from '@analytics/mixpanel'; -import analyticsConfig from '../../../conf/analytics'; + +import analyticsConfig from '@conf/analytics'; const mixpanelConfigs = analyticsConfig.mixpanel; const isEnabled: boolean = mixpanelConfigs || false; diff --git a/datahub-web-react/src/app/analytics/useTrackPageView.ts b/datahub-web-react/src/app/analytics/useTrackPageView.ts index 14075e20ac..4169744d5d 100644 --- a/datahub-web-react/src/app/analytics/useTrackPageView.ts +++ b/datahub-web-react/src/app/analytics/useTrackPageView.ts @@ -1,6 +1,7 @@ import { useEffect } from 'react'; import { useLocation } from 'react-router-dom'; -import analytics from './analytics'; + +import analytics from '@app/analytics/analytics'; // Note: we explicitly keep this outside of React state management. let prevPathname: string = document.referrer; diff --git a/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsChart.tsx b/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsChart.tsx index f8bf1350b7..31e816393b 100644 --- a/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsChart.tsx +++ b/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsChart.tsx @@ -1,12 +1,13 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; -import { AnalyticsChart as AnalyticsChartType } from '../../../types.generated'; -import { TimeSeriesChart } from './TimeSeriesChart'; -import { BarChart } from './BarChart'; -import { TableChart } from './TableChart'; -import { ChartCard } from './ChartCard'; -import { ChartContainer } from './ChartContainer'; +import { BarChart } from '@app/analyticsDashboard/components/BarChart'; +import { ChartCard } from '@app/analyticsDashboard/components/ChartCard'; +import { ChartContainer } from '@app/analyticsDashboard/components/ChartContainer'; +import { TableChart } from '@app/analyticsDashboard/components/TableChart'; +import { TimeSeriesChart } from '@app/analyticsDashboard/components/TimeSeriesChart'; + +import { AnalyticsChart as AnalyticsChartType } from '@types'; type Props = { chartData: AnalyticsChartType; diff --git a/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx b/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx index fed1b0c15e..ccd17a6905 100644 --- a/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx +++ b/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx @@ -1,18 +1,20 @@ +import { SearchOutlined } from '@ant-design/icons'; +import { Alert, Divider, Input, Select } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Alert, Divider, Input, Select } from 'antd'; -import { SearchOutlined } from '@ant-design/icons'; + +import { ChartGroup } from '@app/analyticsDashboard/components/ChartGroup'; +import { Highlight } from '@app/analyticsDashboard/components/Highlight'; +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import filterSearchQuery from '@app/search/utils/filterSearchQuery'; +import { Message } from '@app/shared/Message'; +import { useIsThemeV2 } from '@app/useIsThemeV2'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { ChartGroup } from './ChartGroup'; -import { useGetAnalyticsChartsQuery, useGetMetadataAnalyticsChartsQuery } from '../../../graphql/analytics.generated'; -import { useGetHighlightsQuery } from '../../../graphql/highlights.generated'; -import { Highlight } from './Highlight'; -import { Message } from '../../shared/Message'; -import { useListDomainsQuery } from '../../../graphql/domain.generated'; -import filterSearchQuery from '../../search/utils/filterSearchQuery'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useUserContext } from '../../context/useUserContext'; -import { useIsThemeV2 } from '../../useIsThemeV2'; + +import { useGetAnalyticsChartsQuery, useGetMetadataAnalyticsChartsQuery } from '@graphql/analytics.generated'; +import { useListDomainsQuery } from '@graphql/domain.generated'; +import { useGetHighlightsQuery } from '@graphql/highlights.generated'; const PageContainer = styled.div<{ isV2: boolean; $isShowNavBarRedesign?: boolean }>` background-color: ${(props) => (props.isV2 ? '#fff' : 'inherit')}; @@ -132,9 +134,7 @@ export const AnalyticsPage = () => { )} {chartData?.getAnalyticsCharts ?.filter((chartGroup) => chartGroup.groupId === 'GlobalMetadataAnalytics') - .map((chartGroup) => ( - - ))} + .map((chartGroup) => )} <> {domainError && ( diff --git a/datahub-web-react/src/app/analyticsDashboard/components/BarChart.tsx b/datahub-web-react/src/app/analyticsDashboard/components/BarChart.tsx index 0c9909313e..c0840d4c78 100644 --- a/datahub-web-react/src/app/analyticsDashboard/components/BarChart.tsx +++ b/datahub-web-react/src/app/analyticsDashboard/components/BarChart.tsx @@ -1,12 +1,13 @@ -import React, { useMemo } from 'react'; -import { BarStack } from '@visx/shape'; -import { scaleOrdinal, scaleLinear, scaleBand } from '@visx/scale'; -import { Group } from '@visx/group'; import { AxisBottom, AxisRight } from '@visx/axis'; +import { Group } from '@visx/group'; +import { scaleBand, scaleLinear, scaleOrdinal } from '@visx/scale'; +import { BarStack } from '@visx/shape'; +import React, { useMemo } from 'react'; -import { BarChart as BarChartType } from '../../../types.generated'; -import { lineColors } from './lineColors'; -import Legend from './Legend'; +import Legend from '@app/analyticsDashboard/components/Legend'; +import { lineColors } from '@app/analyticsDashboard/components/lineColors'; + +import { BarChart as BarChartType } from '@types'; type Props = { chartData: BarChartType; diff --git a/datahub-web-react/src/app/analyticsDashboard/components/ChartGroup.tsx b/datahub-web-react/src/app/analyticsDashboard/components/ChartGroup.tsx index 7185d92b99..a1c6190294 100644 --- a/datahub-web-react/src/app/analyticsDashboard/components/ChartGroup.tsx +++ b/datahub-web-react/src/app/analyticsDashboard/components/ChartGroup.tsx @@ -1,8 +1,10 @@ +import { Col, Divider, Row, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Col, Divider, Row, Typography } from 'antd'; -import { AnalyticsChartGroup } from '../../../types.generated'; -import { AnalyticsChart } from './AnalyticsChart'; + +import { AnalyticsChart } from '@app/analyticsDashboard/components/AnalyticsChart'; + +import { AnalyticsChartGroup } from '@types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/analyticsDashboard/components/Highlight.tsx b/datahub-web-react/src/app/analyticsDashboard/components/Highlight.tsx index 907c3c7fdf..7a5797f101 100644 --- a/datahub-web-react/src/app/analyticsDashboard/components/Highlight.tsx +++ b/datahub-web-react/src/app/analyticsDashboard/components/Highlight.tsx @@ -1,10 +1,10 @@ -import React from 'react'; - import { Card, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { Highlight as HighlightType } from '../../../types.generated'; -import { formatNumber } from '../../shared/formatNumber'; +import { formatNumber } from '@app/shared/formatNumber'; + +import { Highlight as HighlightType } from '@types'; type Props = { highlight: HighlightType; diff --git a/datahub-web-react/src/app/analyticsDashboard/components/Legend.tsx b/datahub-web-react/src/app/analyticsDashboard/components/Legend.tsx index 7796713961..1e6de196de 100644 --- a/datahub-web-react/src/app/analyticsDashboard/components/Legend.tsx +++ b/datahub-web-react/src/app/analyticsDashboard/components/Legend.tsx @@ -1,7 +1,7 @@ -import React from 'react'; +import { LegendItem, LegendLabel, LegendOrdinal } from '@visx/legend'; import { Col, Row } from 'antd'; -import { LegendOrdinal, LegendItem, LegendLabel } from '@visx/legend'; import { ScaleOrdinal } from 'd3-scale/src/ordinal'; +import React from 'react'; import styled from 'styled-components'; const legendGlyphSize = 10; diff --git a/datahub-web-react/src/app/analyticsDashboard/components/TableChart.tsx b/datahub-web-react/src/app/analyticsDashboard/components/TableChart.tsx index ac3ce3733c..28f5d6b960 100644 --- a/datahub-web-react/src/app/analyticsDashboard/components/TableChart.tsx +++ b/datahub-web-react/src/app/analyticsDashboard/components/TableChart.tsx @@ -1,12 +1,12 @@ -import React from 'react'; - import { Button, Table } from 'antd'; -import styled from 'styled-components'; +import React from 'react'; import { useHistory } from 'react-router'; +import styled from 'styled-components'; -import { Cell, EntityType, FacetFilterInput, TableChart as TableChartType } from '../../../types.generated'; -import { navigateToSearchUrl } from '../../search/utils/navigateToSearchUrl'; -import { useEntityRegistry } from '../../useEntityRegistry'; +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Cell, EntityType, FacetFilterInput, TableChart as TableChartType } from '@types'; type Props = { chartData: TableChartType; diff --git a/datahub-web-react/src/app/analyticsDashboard/components/TimeSeriesChart.tsx b/datahub-web-react/src/app/analyticsDashboard/components/TimeSeriesChart.tsx index 85fa7843d1..d5f9b316d7 100644 --- a/datahub-web-react/src/app/analyticsDashboard/components/TimeSeriesChart.tsx +++ b/datahub-web-react/src/app/analyticsDashboard/components/TimeSeriesChart.tsx @@ -1,14 +1,16 @@ -import React, { useMemo } from 'react'; -import styled from 'styled-components'; import { AxisScaleOutput } from '@visx/axis'; -import { Axis, LineSeries, XYChart, Tooltip, GlyphSeries } from '@visx/xychart'; import { curveMonotoneX } from '@visx/curve'; import { ScaleConfig, scaleOrdinal } from '@visx/scale'; -import { TimeSeriesChart as TimeSeriesChartType, NumericDataPoint, NamedLine } from '../../../types.generated'; -import { lineColors } from './lineColors'; -import Legend from './Legend'; -import { addInterval } from '../../shared/time/timeUtils'; -import { formatNumber } from '../../shared/formatNumber'; +import { Axis, GlyphSeries, LineSeries, Tooltip, XYChart } from '@visx/xychart'; +import React, { useMemo } from 'react'; +import styled from 'styled-components'; + +import Legend from '@app/analyticsDashboard/components/Legend'; +import { lineColors } from '@app/analyticsDashboard/components/lineColors'; +import { formatNumber } from '@app/shared/formatNumber'; +import { addInterval } from '@app/shared/time/timeUtils'; + +import { NamedLine, NumericDataPoint, TimeSeriesChart as TimeSeriesChartType } from '@types'; type AxisConfig = { formatter: (tick: number) => string; diff --git a/datahub-web-react/src/app/analyticsDashboard/components/__tests__/timeSeriesChart.test.tsx b/datahub-web-react/src/app/analyticsDashboard/components/__tests__/timeSeriesChart.test.tsx index c528e4e627..a446536f6f 100644 --- a/datahub-web-react/src/app/analyticsDashboard/components/__tests__/timeSeriesChart.test.tsx +++ b/datahub-web-react/src/app/analyticsDashboard/components/__tests__/timeSeriesChart.test.tsx @@ -1,5 +1,6 @@ -import { DateInterval, TimeSeriesChart } from '../../../../types.generated'; -import { computeLines } from '../TimeSeriesChart'; +import { computeLines } from '@app/analyticsDashboard/components/TimeSeriesChart'; + +import { DateInterval, TimeSeriesChart } from '@types'; describe('timeSeriesChart', () => { describe('computeLines', () => { diff --git a/datahub-web-react/src/app/auth/LogIn.tsx b/datahub-web-react/src/app/auth/LogIn.tsx index ea016e7156..6af4278b87 100644 --- a/datahub-web-react/src/app/auth/LogIn.tsx +++ b/datahub-web-react/src/app/auth/LogIn.tsx @@ -1,15 +1,16 @@ -import React, { useCallback, useState } from 'react'; -import * as QueryString from 'query-string'; -import { Input, Button, Form, message, Image, Divider } from 'antd'; -import { UserOutlined, LockOutlined, LoginOutlined } from '@ant-design/icons'; +import { LockOutlined, LoginOutlined, UserOutlined } from '@ant-design/icons'; import { useReactiveVar } from '@apollo/client'; -import styled, { useTheme } from 'styled-components/macro'; +import { Button, Divider, Form, Image, Input, message } from 'antd'; +import * as QueryString from 'query-string'; +import React, { useCallback, useState } from 'react'; import { Redirect, useLocation } from 'react-router'; -import styles from './login.module.css'; -import { Message } from '../shared/Message'; -import { isLoggedInVar } from './checkAuthStatus'; -import analytics, { EventType } from '../analytics'; -import { useAppConfig } from '../useAppConfig'; +import styled, { useTheme } from 'styled-components/macro'; + +import analytics, { EventType } from '@app/analytics'; +import { isLoggedInVar } from '@app/auth/checkAuthStatus'; +import styles from '@app/auth/login.module.css'; +import { Message } from '@app/shared/Message'; +import { useAppConfig } from '@app/useAppConfig'; type FormValues = { username: string; diff --git a/datahub-web-react/src/app/auth/ResetCredentials.tsx b/datahub-web-react/src/app/auth/ResetCredentials.tsx index 77f41489fc..7c2605b3a7 100644 --- a/datahub-web-react/src/app/auth/ResetCredentials.tsx +++ b/datahub-web-react/src/app/auth/ResetCredentials.tsx @@ -1,16 +1,17 @@ -import React, { useCallback, useState } from 'react'; -import { Input, Button, Form, message, Image } from 'antd'; -import { UserOutlined, LockOutlined } from '@ant-design/icons'; +import { LockOutlined, UserOutlined } from '@ant-design/icons'; import { useReactiveVar } from '@apollo/client'; -import styled, { useTheme } from 'styled-components/macro'; +import { Button, Form, Image, Input, message } from 'antd'; +import React, { useCallback, useState } from 'react'; import { Redirect } from 'react-router'; -import styles from './login.module.css'; -import { Message } from '../shared/Message'; -import { isLoggedInVar } from './checkAuthStatus'; -import analytics, { EventType } from '../analytics'; -import { useAppConfig } from '../useAppConfig'; -import { PageRoutes } from '../../conf/Global'; -import useGetResetTokenFromUrlParams from './useGetResetTokenFromUrlParams'; +import styled, { useTheme } from 'styled-components/macro'; + +import analytics, { EventType } from '@app/analytics'; +import { isLoggedInVar } from '@app/auth/checkAuthStatus'; +import styles from '@app/auth/login.module.css'; +import useGetResetTokenFromUrlParams from '@app/auth/useGetResetTokenFromUrlParams'; +import { Message } from '@app/shared/Message'; +import { useAppConfig } from '@app/useAppConfig'; +import { PageRoutes } from '@conf/Global'; type FormValues = { email: string; diff --git a/datahub-web-react/src/app/auth/SignUp.tsx b/datahub-web-react/src/app/auth/SignUp.tsx index 2eaa749466..1553bda30d 100644 --- a/datahub-web-react/src/app/auth/SignUp.tsx +++ b/datahub-web-react/src/app/auth/SignUp.tsx @@ -1,17 +1,19 @@ -import React, { useCallback, useEffect, useState } from 'react'; -import { Input, Button, Form, message, Image, Select } from 'antd'; -import { UserOutlined, LockOutlined } from '@ant-design/icons'; +import { LockOutlined, UserOutlined } from '@ant-design/icons'; import { useReactiveVar } from '@apollo/client'; -import styled, { useTheme } from 'styled-components/macro'; +import { Button, Form, Image, Input, Select, message } from 'antd'; +import React, { useCallback, useEffect, useState } from 'react'; import { useHistory } from 'react-router-dom'; -import styles from './login.module.css'; -import { Message } from '../shared/Message'; -import { isLoggedInVar } from './checkAuthStatus'; -import analytics, { EventType } from '../analytics'; -import { useAppConfig } from '../useAppConfig'; -import { PageRoutes } from '../../conf/Global'; -import useGetInviteTokenFromUrlParams from './useGetInviteTokenFromUrlParams'; -import { useAcceptRoleMutation } from '../../graphql/mutations.generated'; +import styled, { useTheme } from 'styled-components/macro'; + +import analytics, { EventType } from '@app/analytics'; +import { isLoggedInVar } from '@app/auth/checkAuthStatus'; +import styles from '@app/auth/login.module.css'; +import useGetInviteTokenFromUrlParams from '@app/auth/useGetInviteTokenFromUrlParams'; +import { Message } from '@app/shared/Message'; +import { useAppConfig } from '@app/useAppConfig'; +import { PageRoutes } from '@conf/Global'; + +import { useAcceptRoleMutation } from '@graphql/mutations.generated'; type FormValues = { fullName: string; diff --git a/datahub-web-react/src/app/auth/checkAuthStatus.ts b/datahub-web-react/src/app/auth/checkAuthStatus.ts index d08f727bc9..ba2e6350b9 100644 --- a/datahub-web-react/src/app/auth/checkAuthStatus.ts +++ b/datahub-web-react/src/app/auth/checkAuthStatus.ts @@ -1,7 +1,8 @@ -import Cookies from 'js-cookie'; import { makeVar } from '@apollo/client'; -import { GlobalCfg } from '../../conf'; -import analytics from '../analytics'; +import Cookies from 'js-cookie'; + +import analytics from '@app/analytics'; +import { GlobalCfg } from '@src/conf'; export const checkAuthStatus = (): boolean => { const isAuthenticated = !!Cookies.get(GlobalCfg.CLIENT_AUTH_COOKIE); diff --git a/datahub-web-react/src/app/auth/useGetLogoutHandler.ts b/datahub-web-react/src/app/auth/useGetLogoutHandler.ts index a4b35b4de8..33e5cc7893 100644 --- a/datahub-web-react/src/app/auth/useGetLogoutHandler.ts +++ b/datahub-web-react/src/app/auth/useGetLogoutHandler.ts @@ -1,9 +1,10 @@ -import { useCallback } from 'react'; import Cookies from 'js-cookie'; +import { useCallback } from 'react'; + +import analytics, { EventType } from '@app/analytics'; +import { isLoggedInVar } from '@app/auth/checkAuthStatus'; +import { useUserContext } from '@app/context/useUserContext'; import { GlobalCfg } from '@src/conf'; -import analytics, { EventType } from '../analytics'; -import { useUserContext } from '../context/useUserContext'; -import { isLoggedInVar } from './checkAuthStatus'; export default function useGetLogoutHandler() { const me = useUserContext(); diff --git a/datahub-web-react/src/app/browse/BrowsableEntityPage.tsx b/datahub-web-react/src/app/browse/BrowsableEntityPage.tsx index c00c5e9fac..846398532e 100644 --- a/datahub-web-react/src/app/browse/BrowsableEntityPage.tsx +++ b/datahub-web-react/src/app/browse/BrowsableEntityPage.tsx @@ -1,8 +1,10 @@ -import * as React from 'react'; import { Affix } from 'antd'; -import { LegacyBrowsePath } from './LegacyBrowsePath'; -import { useGetBrowsePathsQuery } from '../../graphql/browse.generated'; -import { EntityType } from '../../types.generated'; +import * as React from 'react'; + +import { LegacyBrowsePath } from '@app/browse/LegacyBrowsePath'; + +import { useGetBrowsePathsQuery } from '@graphql/browse.generated'; +import { EntityType } from '@types'; interface Props { urn: string; diff --git a/datahub-web-react/src/app/browse/BrowseResultCard.tsx b/datahub-web-react/src/app/browse/BrowseResultCard.tsx index 6de6d6c6e4..fc248d1563 100644 --- a/datahub-web-react/src/app/browse/BrowseResultCard.tsx +++ b/datahub-web-react/src/app/browse/BrowseResultCard.tsx @@ -1,9 +1,10 @@ -import React from 'react'; -import { Card, Row, Space, Typography } from 'antd'; -import { Link } from 'react-router-dom'; import { ArrowRightOutlined, FolderOutlined } from '@ant-design/icons'; +import { Card, Row, Space, Typography } from 'antd'; +import React from 'react'; +import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { singularizeCollectionName } from '../entity/shared/utils'; + +import { singularizeCollectionName } from '@app/entity/shared/utils'; const styles = { row: { padding: 8 }, diff --git a/datahub-web-react/src/app/browse/BrowseResults.tsx b/datahub-web-react/src/app/browse/BrowseResults.tsx index 5447d6101b..60ff47e18b 100644 --- a/datahub-web-react/src/app/browse/BrowseResults.tsx +++ b/datahub-web-react/src/app/browse/BrowseResults.tsx @@ -1,11 +1,13 @@ +import { Col, Divider, Empty, List, Pagination, Row } from 'antd'; +import { Content } from 'antd/lib/layout/layout'; import React from 'react'; import styled from 'styled-components'; -import { Col, Divider, List, Pagination, Row, Empty } from 'antd'; -import { Content } from 'antd/lib/layout/layout'; -import { BrowseResultGroup, EntityType, Entity } from '../../types.generated'; -import BrowseResultCard from './BrowseResultCard'; -import { useEntityRegistry } from '../useEntityRegistry'; -import analytics, { EventType } from '../analytics'; + +import analytics, { EventType } from '@app/analytics'; +import BrowseResultCard from '@app/browse/BrowseResultCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { BrowseResultGroup, Entity, EntityType } from '@types'; const EntityList = styled(List)` && { diff --git a/datahub-web-react/src/app/browse/BrowseResultsPage.tsx b/datahub-web-react/src/app/browse/BrowseResultsPage.tsx index 0cde97ef70..e88051de21 100644 --- a/datahub-web-react/src/app/browse/BrowseResultsPage.tsx +++ b/datahub-web-react/src/app/browse/BrowseResultsPage.tsx @@ -1,16 +1,18 @@ +import { Affix } from 'antd'; +import * as QueryString from 'query-string'; import React from 'react'; import { Redirect, useHistory, useLocation, useParams } from 'react-router'; -import * as QueryString from 'query-string'; -import { Affix } from 'antd'; -import { BrowseCfg } from '../../conf'; -import { BrowseResults } from './BrowseResults'; -import { useGetBrowseResultsQuery } from '../../graphql/browse.generated'; -import { LegacyBrowsePath } from './LegacyBrowsePath'; -import { PageRoutes } from '../../conf/Global'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { Message } from '../shared/Message'; -import { scrollToTop } from '../shared/searchUtils'; -import { ErrorSection } from '../shared/error/ErrorSection'; + +import { BrowseResults } from '@app/browse/BrowseResults'; +import { LegacyBrowsePath } from '@app/browse/LegacyBrowsePath'; +import { Message } from '@app/shared/Message'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; +import { BrowseCfg } from '@src/conf'; + +import { useGetBrowseResultsQuery } from '@graphql/browse.generated'; type BrowseResultsPageParams = { type: string; diff --git a/datahub-web-react/src/app/browse/LegacyBrowsePath.tsx b/datahub-web-react/src/app/browse/LegacyBrowsePath.tsx index b74da696a6..565d69d3b6 100644 --- a/datahub-web-react/src/app/browse/LegacyBrowsePath.tsx +++ b/datahub-web-react/src/app/browse/LegacyBrowsePath.tsx @@ -1,16 +1,17 @@ -import React from 'react'; -import { Link, useHistory, useLocation } from 'react-router-dom'; -import { Breadcrumb, Row } from 'antd'; -import styled from 'styled-components'; -import { IconBaseProps } from 'react-icons/lib'; -import { VscRepoForked, VscPreview } from 'react-icons/vsc'; import { blue, grey } from '@ant-design/colors'; +import { Breadcrumb, Row } from 'antd'; +import React from 'react'; +import { IconBaseProps } from 'react-icons/lib'; +import { VscPreview, VscRepoForked } from 'react-icons/vsc'; +import { Link, useHistory, useLocation } from 'react-router-dom'; +import styled from 'styled-components'; -import { PageRoutes } from '../../conf/Global'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { EntityType } from '../../types.generated'; -import { navigateToLineageUrl } from '../lineage/utils/navigateToLineageUrl'; -import useIsLineageMode from '../lineage/utils/useIsLineageMode'; +import { navigateToLineageUrl } from '@app/lineage/utils/navigateToLineageUrl'; +import useIsLineageMode from '@app/lineage/utils/useIsLineageMode'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; + +import { EntityType } from '@types'; interface Props { type: EntityType; diff --git a/datahub-web-react/src/app/browserId.ts b/datahub-web-react/src/app/browserId.ts index 9b648fb806..030810074f 100644 --- a/datahub-web-react/src/app/browserId.ts +++ b/datahub-web-react/src/app/browserId.ts @@ -1,6 +1,7 @@ import Cookies from 'js-cookie'; import { v4 as uuidv4 } from 'uuid'; -import { BROWSER_ID_COOKIE } from '../conf/Global'; + +import { BROWSER_ID_COOKIE } from '@conf/Global'; function generateBrowserId(): string { return uuidv4(); diff --git a/datahub-web-react/src/app/buildEntityRegistry.ts b/datahub-web-react/src/app/buildEntityRegistry.ts index b7ff97b3a0..2ad2c07ff8 100644 --- a/datahub-web-react/src/app/buildEntityRegistry.ts +++ b/datahub-web-react/src/app/buildEntityRegistry.ts @@ -1,31 +1,31 @@ -import EntityRegistry from './entity/EntityRegistry'; -import { DashboardEntity } from './entity/dashboard/DashboardEntity'; -import { ChartEntity } from './entity/chart/ChartEntity'; -import { UserEntity } from './entity/user/User'; -import { GroupEntity } from './entity/group/Group'; -import { DatasetEntity } from './entity/dataset/DatasetEntity'; -import { DataFlowEntity } from './entity/dataFlow/DataFlowEntity'; -import { DataJobEntity } from './entity/dataJob/DataJobEntity'; -import { TagEntity } from './entity/tag/Tag'; -import { GlossaryTermEntity } from './entity/glossaryTerm/GlossaryTermEntity'; -import { MLFeatureEntity } from './entity/mlFeature/MLFeatureEntity'; -import { MLPrimaryKeyEntity } from './entity/mlPrimaryKey/MLPrimaryKeyEntity'; -import { MLFeatureTableEntity } from './entity/mlFeatureTable/MLFeatureTableEntity'; -import { MLModelEntity } from './entity/mlModel/MLModelEntity'; -import { MLModelGroupEntity } from './entity/mlModelGroup/MLModelGroupEntity'; -import { DomainEntity } from './entity/domain/DomainEntity'; -import { ContainerEntity } from './entity/container/ContainerEntity'; -import GlossaryNodeEntity from './entity/glossaryNode/GlossaryNodeEntity'; -import { DataPlatformEntity } from './entity/dataPlatform/DataPlatformEntity'; -import { DataProductEntity } from './entity/dataProduct/DataProductEntity'; -import { DataPlatformInstanceEntity } from './entity/dataPlatformInstance/DataPlatformInstanceEntity'; -import { ERModelRelationshipEntity } from './entity/ermodelrelationships/ERModelRelationshipEntity'; -import { RoleEntity } from './entity/Access/RoleEntity'; -import { RestrictedEntity } from './entity/restricted/RestrictedEntity'; -import { BusinessAttributeEntity } from './entity/businessAttribute/BusinessAttributeEntity'; -import { SchemaFieldPropertiesEntity } from './entity/schemaField/SchemaFieldPropertiesEntity'; -import { StructuredPropertyEntity } from './entity/structuredProperty/StructuredPropertyEntity'; -import { DataProcessInstanceEntity } from './entity/dataProcessInstance/DataProcessInstanceEntity'; +import { RoleEntity } from '@app/entity/Access/RoleEntity'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { BusinessAttributeEntity } from '@app/entity/businessAttribute/BusinessAttributeEntity'; +import { ChartEntity } from '@app/entity/chart/ChartEntity'; +import { ContainerEntity } from '@app/entity/container/ContainerEntity'; +import { DashboardEntity } from '@app/entity/dashboard/DashboardEntity'; +import { DataFlowEntity } from '@app/entity/dataFlow/DataFlowEntity'; +import { DataJobEntity } from '@app/entity/dataJob/DataJobEntity'; +import { DataPlatformEntity } from '@app/entity/dataPlatform/DataPlatformEntity'; +import { DataPlatformInstanceEntity } from '@app/entity/dataPlatformInstance/DataPlatformInstanceEntity'; +import { DataProcessInstanceEntity } from '@app/entity/dataProcessInstance/DataProcessInstanceEntity'; +import { DataProductEntity } from '@app/entity/dataProduct/DataProductEntity'; +import { DatasetEntity } from '@app/entity/dataset/DatasetEntity'; +import { DomainEntity } from '@app/entity/domain/DomainEntity'; +import { ERModelRelationshipEntity } from '@app/entity/ermodelrelationships/ERModelRelationshipEntity'; +import GlossaryNodeEntity from '@app/entity/glossaryNode/GlossaryNodeEntity'; +import { GlossaryTermEntity } from '@app/entity/glossaryTerm/GlossaryTermEntity'; +import { GroupEntity } from '@app/entity/group/Group'; +import { MLFeatureEntity } from '@app/entity/mlFeature/MLFeatureEntity'; +import { MLFeatureTableEntity } from '@app/entity/mlFeatureTable/MLFeatureTableEntity'; +import { MLModelEntity } from '@app/entity/mlModel/MLModelEntity'; +import { MLModelGroupEntity } from '@app/entity/mlModelGroup/MLModelGroupEntity'; +import { MLPrimaryKeyEntity } from '@app/entity/mlPrimaryKey/MLPrimaryKeyEntity'; +import { RestrictedEntity } from '@app/entity/restricted/RestrictedEntity'; +import { SchemaFieldPropertiesEntity } from '@app/entity/schemaField/SchemaFieldPropertiesEntity'; +import { StructuredPropertyEntity } from '@app/entity/structuredProperty/StructuredPropertyEntity'; +import { TagEntity } from '@app/entity/tag/Tag'; +import { UserEntity } from '@app/entity/user/User'; export default function buildEntityRegistry() { const registry = new EntityRegistry(); diff --git a/datahub-web-react/src/app/buildEntityRegistryV2.ts b/datahub-web-react/src/app/buildEntityRegistryV2.ts index 9ab7ef5ccf..0f1fb7089c 100644 --- a/datahub-web-react/src/app/buildEntityRegistryV2.ts +++ b/datahub-web-react/src/app/buildEntityRegistryV2.ts @@ -1,31 +1,31 @@ -import { RoleEntity } from './entityV2/Access/RoleEntity'; -import EntityRegistry from './entityV2/EntityRegistry'; -import { BusinessAttributeEntity } from './entityV2/businessAttribute/BusinessAttributeEntity'; -import { ChartEntity } from './entityV2/chart/ChartEntity'; -import { ContainerEntity } from './entityV2/container/ContainerEntity'; -import { DashboardEntity } from './entityV2/dashboard/DashboardEntity'; -import { DataContractEntity } from './entityV2/dataContract/DataContractEntity'; -import { DataFlowEntity } from './entityV2/dataFlow/DataFlowEntity'; -import { DataJobEntity } from './entityV2/dataJob/DataJobEntity'; -import { DataPlatformEntity } from './entityV2/dataPlatform/DataPlatformEntity'; -import { DataPlatformInstanceEntity } from './entityV2/dataPlatformInstance/DataPlatformInstanceEntity'; -import { DataProcessInstanceEntity } from './entityV2/dataProcessInstance/DataProcessInstanceEntity'; -import { DataProductEntity } from './entityV2/dataProduct/DataProductEntity'; -import { DatasetEntity } from './entityV2/dataset/DatasetEntity'; -import { DomainEntity } from './entityV2/domain/DomainEntity'; -import GlossaryNodeEntity from './entityV2/glossaryNode/GlossaryNodeEntity'; -import { GlossaryTermEntity } from './entityV2/glossaryTerm/GlossaryTermEntity'; -import { GroupEntity } from './entityV2/group/Group'; -import { MLFeatureEntity } from './entityV2/mlFeature/MLFeatureEntity'; -import { MLFeatureTableEntity } from './entityV2/mlFeatureTable/MLFeatureTableEntity'; -import { MLModelEntity } from './entityV2/mlModel/MLModelEntity'; -import { MLModelGroupEntity } from './entityV2/mlModelGroup/MLModelGroupEntity'; -import { MLPrimaryKeyEntity } from './entityV2/mlPrimaryKey/MLPrimaryKeyEntity'; -import { QueryEntity } from './entityV2/query/QueryEntity'; -import { SchemaFieldEntity } from './entityV2/schemaField/SchemaFieldEntity'; -import { StructuredPropertyEntity } from './entityV2/structuredProperty/StructuredPropertyEntity'; -import { TagEntity } from './entityV2/tag/Tag'; -import { UserEntity } from './entityV2/user/User'; +import { RoleEntity } from '@app/entityV2/Access/RoleEntity'; +import EntityRegistry from '@app/entityV2/EntityRegistry'; +import { BusinessAttributeEntity } from '@app/entityV2/businessAttribute/BusinessAttributeEntity'; +import { ChartEntity } from '@app/entityV2/chart/ChartEntity'; +import { ContainerEntity } from '@app/entityV2/container/ContainerEntity'; +import { DashboardEntity } from '@app/entityV2/dashboard/DashboardEntity'; +import { DataContractEntity } from '@app/entityV2/dataContract/DataContractEntity'; +import { DataFlowEntity } from '@app/entityV2/dataFlow/DataFlowEntity'; +import { DataJobEntity } from '@app/entityV2/dataJob/DataJobEntity'; +import { DataPlatformEntity } from '@app/entityV2/dataPlatform/DataPlatformEntity'; +import { DataPlatformInstanceEntity } from '@app/entityV2/dataPlatformInstance/DataPlatformInstanceEntity'; +import { DataProcessInstanceEntity } from '@app/entityV2/dataProcessInstance/DataProcessInstanceEntity'; +import { DataProductEntity } from '@app/entityV2/dataProduct/DataProductEntity'; +import { DatasetEntity } from '@app/entityV2/dataset/DatasetEntity'; +import { DomainEntity } from '@app/entityV2/domain/DomainEntity'; +import GlossaryNodeEntity from '@app/entityV2/glossaryNode/GlossaryNodeEntity'; +import { GlossaryTermEntity } from '@app/entityV2/glossaryTerm/GlossaryTermEntity'; +import { GroupEntity } from '@app/entityV2/group/Group'; +import { MLFeatureEntity } from '@app/entityV2/mlFeature/MLFeatureEntity'; +import { MLFeatureTableEntity } from '@app/entityV2/mlFeatureTable/MLFeatureTableEntity'; +import { MLModelEntity } from '@app/entityV2/mlModel/MLModelEntity'; +import { MLModelGroupEntity } from '@app/entityV2/mlModelGroup/MLModelGroupEntity'; +import { MLPrimaryKeyEntity } from '@app/entityV2/mlPrimaryKey/MLPrimaryKeyEntity'; +import { QueryEntity } from '@app/entityV2/query/QueryEntity'; +import { SchemaFieldEntity } from '@app/entityV2/schemaField/SchemaFieldEntity'; +import { StructuredPropertyEntity } from '@app/entityV2/structuredProperty/StructuredPropertyEntity'; +import { TagEntity } from '@app/entityV2/tag/Tag'; +import { UserEntity } from '@app/entityV2/user/User'; export default function buildEntityRegistryV2() { const registry = new EntityRegistry(); diff --git a/datahub-web-react/src/app/businessAttribute/AttributeBrowser.tsx b/datahub-web-react/src/app/businessAttribute/AttributeBrowser.tsx index 4d8f722aec..451ff4f205 100644 --- a/datahub-web-react/src/app/businessAttribute/AttributeBrowser.tsx +++ b/datahub-web-react/src/app/businessAttribute/AttributeBrowser.tsx @@ -1,9 +1,11 @@ import React, { useEffect } from 'react'; import styled from 'styled-components/macro'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { ListBusinessAttributesQuery, useListBusinessAttributesQuery } from '../../graphql/businessAttribute.generated'; -import { sortBusinessAttributes } from './businessAttributeUtils'; -import AttributeItem from './AttributeItem'; + +import AttributeItem from '@app/businessAttribute/AttributeItem'; +import { sortBusinessAttributes } from '@app/businessAttribute/businessAttributeUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { ListBusinessAttributesQuery, useListBusinessAttributesQuery } from '@graphql/businessAttribute.generated'; const BrowserWrapper = styled.div` color: #262626; diff --git a/datahub-web-react/src/app/businessAttribute/AttributeItem.tsx b/datahub-web-react/src/app/businessAttribute/AttributeItem.tsx index 051979d696..1b3e3e73a2 100644 --- a/datahub-web-react/src/app/businessAttribute/AttributeItem.tsx +++ b/datahub-web-react/src/app/businessAttribute/AttributeItem.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { useEntityRegistry } from '../useEntityRegistry'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const AttributeWrapper = styled.div` font-weight: normal; diff --git a/datahub-web-react/src/app/businessAttribute/BusinessAttributeItemMenu.tsx b/datahub-web-react/src/app/businessAttribute/BusinessAttributeItemMenu.tsx index 422de728f7..1731f8ce4f 100644 --- a/datahub-web-react/src/app/businessAttribute/BusinessAttributeItemMenu.tsx +++ b/datahub-web-react/src/app/businessAttribute/BusinessAttributeItemMenu.tsx @@ -1,9 +1,11 @@ -import React from 'react'; import { DeleteOutlined } from '@ant-design/icons'; -import { Dropdown, message, Modal } from 'antd'; -import { MenuIcon } from '../entity/shared/EntityDropdown/EntityDropdown'; -import { useDeleteBusinessAttributeMutation } from '../../graphql/businessAttribute.generated'; -import { MenuItemStyle } from '../entity/view/menu/item/styledComponent'; +import { Dropdown, Modal, message } from 'antd'; +import React from 'react'; + +import { MenuIcon } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; + +import { useDeleteBusinessAttributeMutation } from '@graphql/businessAttribute.generated'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/businessAttribute/BusinessAttributes.tsx b/datahub-web-react/src/app/businessAttribute/BusinessAttributes.tsx index e2794de5e5..c106738295 100644 --- a/datahub-web-react/src/app/businessAttribute/BusinessAttributes.tsx +++ b/datahub-web-react/src/app/businessAttribute/BusinessAttributes.tsx @@ -1,22 +1,24 @@ -import React, { useState, useMemo } from 'react'; -import styled from 'styled-components'; -import { Button, Empty, message, Pagination, Typography } from 'antd'; import { PlusOutlined } from '@ant-design/icons'; +import { Button, Empty, Pagination, Typography, message } from 'antd'; import { AlignType } from 'rc-table/lib/interface'; +import React, { useMemo, useState } from 'react'; import { Link } from 'react-router-dom'; -import { useListBusinessAttributesQuery } from '../../graphql/businessAttribute.generated'; -import { Message } from '../shared/Message'; -import TabToolbar from '../entity/shared/components/styled/TabToolbar'; -import { StyledTable } from '../entity/shared/components/styled/StyledTable'; -import CreateBusinessAttributeModal from './CreateBusinessAttributeModal'; -import { scrollToTop } from '../shared/searchUtils'; -import { useUserContext } from '../context/useUserContext'; -import { BusinessAttribute } from '../../types.generated'; -import { SearchBar } from '../search/SearchBar'; -import { useEntityRegistry } from '../useEntityRegistry'; -import useTagsAndTermsRenderer from './utils/useTagsAndTermsRenderer'; -import useDescriptionRenderer from './utils/useDescriptionRenderer'; -import BusinessAttributeItemMenu from './BusinessAttributeItemMenu'; +import styled from 'styled-components'; + +import BusinessAttributeItemMenu from '@app/businessAttribute/BusinessAttributeItemMenu'; +import CreateBusinessAttributeModal from '@app/businessAttribute/CreateBusinessAttributeModal'; +import useDescriptionRenderer from '@app/businessAttribute/utils/useDescriptionRenderer'; +import useTagsAndTermsRenderer from '@app/businessAttribute/utils/useTagsAndTermsRenderer'; +import { useUserContext } from '@app/context/useUserContext'; +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListBusinessAttributesQuery } from '@graphql/businessAttribute.generated'; +import { BusinessAttribute } from '@types'; function BusinessAttributeListMenuColumn(handleDelete: () => void) { return (record: BusinessAttribute) => ( diff --git a/datahub-web-react/src/app/businessAttribute/CreateBusinessAttributeModal.tsx b/datahub-web-react/src/app/businessAttribute/CreateBusinessAttributeModal.tsx index 979f8377c7..64f7508ce2 100644 --- a/datahub-web-react/src/app/businessAttribute/CreateBusinessAttributeModal.tsx +++ b/datahub-web-react/src/app/businessAttribute/CreateBusinessAttributeModal.tsx @@ -1,16 +1,18 @@ -import React, { useState } from 'react'; -import { message, Button, Input, Modal, Typography, Form, Select, Collapse } from 'antd'; -import styled from 'styled-components'; import { EditOutlined } from '@ant-design/icons'; +import { Button, Collapse, Form, Input, Modal, Select, Typography, message } from 'antd'; import DOMPurify from 'dompurify'; -import { useEnterKeyListener } from '../shared/useEnterKeyListener'; -import { useCreateBusinessAttributeMutation } from '../../graphql/businessAttribute.generated'; -import { CreateBusinessAttributeInput, EntityType } from '../../types.generated'; -import analytics, { EventType } from '../analytics'; -import { useEntityRegistry } from '../useEntityRegistry'; -import DescriptionModal from '../entity/shared/components/legacy/DescriptionModal'; -import { SchemaFieldDataType } from './businessAttributeUtils'; -import { validateCustomUrnId } from '../shared/textUtil'; +import React, { useState } from 'react'; +import styled from 'styled-components'; + +import analytics, { EventType } from '@app/analytics'; +import { SchemaFieldDataType } from '@app/businessAttribute/businessAttributeUtils'; +import DescriptionModal from '@app/entity/shared/components/legacy/DescriptionModal'; +import { validateCustomUrnId } from '@app/shared/textUtil'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useCreateBusinessAttributeMutation } from '@graphql/businessAttribute.generated'; +import { CreateBusinessAttributeInput, EntityType } from '@types'; type Props = { open: boolean; diff --git a/datahub-web-react/src/app/businessAttribute/businessAttributeUtils.ts b/datahub-web-react/src/app/businessAttribute/businessAttributeUtils.ts index ec8c44d799..20b56bd5ce 100644 --- a/datahub-web-react/src/app/businessAttribute/businessAttributeUtils.ts +++ b/datahub-web-react/src/app/businessAttribute/businessAttributeUtils.ts @@ -1,5 +1,6 @@ -import EntityRegistry from '../entity/EntityRegistry'; -import { Entity, EntityType } from '../../types.generated'; +import EntityRegistry from '@app/entity/EntityRegistry'; + +import { Entity, EntityType } from '@types'; export function sortBusinessAttributes(entityRegistry: EntityRegistry, nodeA?: Entity | null, nodeB?: Entity | null) { const nodeAName = entityRegistry.getDisplayName(EntityType.BusinessAttribute, nodeA) || ''; diff --git a/datahub-web-react/src/app/businessAttribute/utils/useDescriptionRenderer.tsx b/datahub-web-react/src/app/businessAttribute/utils/useDescriptionRenderer.tsx index ef665e45ae..53e1807590 100644 --- a/datahub-web-react/src/app/businessAttribute/utils/useDescriptionRenderer.tsx +++ b/datahub-web-react/src/app/businessAttribute/utils/useDescriptionRenderer.tsx @@ -1,8 +1,10 @@ -import React, { useState } from 'react'; import DOMPurify from 'dompurify'; -import { BusinessAttribute } from '../../../types.generated'; -import DescriptionField from '../../entity/dataset/profile/schema/components/SchemaDescriptionField'; -import { useUpdateDescriptionMutation } from '../../../graphql/mutations.generated'; +import React, { useState } from 'react'; + +import DescriptionField from '@app/entity/dataset/profile/schema/components/SchemaDescriptionField'; + +import { useUpdateDescriptionMutation } from '@graphql/mutations.generated'; +import { BusinessAttribute } from '@types'; export default function useDescriptionRenderer(businessAttributeRefetch: () => Promise) { const [updateDescription] = useUpdateDescriptionMutation(); diff --git a/datahub-web-react/src/app/businessAttribute/utils/useTagsAndTermsRenderer.tsx b/datahub-web-react/src/app/businessAttribute/utils/useTagsAndTermsRenderer.tsx index 7c138c99db..cb6472f292 100644 --- a/datahub-web-react/src/app/businessAttribute/utils/useTagsAndTermsRenderer.tsx +++ b/datahub-web-react/src/app/businessAttribute/utils/useTagsAndTermsRenderer.tsx @@ -1,6 +1,8 @@ import React from 'react'; -import { EntityType, GlobalTags, BusinessAttribute } from '../../../types.generated'; -import TagTermGroup from '../../shared/tags/TagTermGroup'; + +import TagTermGroup from '@app/shared/tags/TagTermGroup'; + +import { BusinessAttribute, EntityType, GlobalTags } from '@types'; export default function useTagsAndTermsRenderer( tagHoveredUrn: string | undefined, diff --git a/datahub-web-react/src/app/context/UserContextProvider.tsx b/datahub-web-react/src/app/context/UserContextProvider.tsx index 66593d346f..bf9af21e27 100644 --- a/datahub-web-react/src/app/context/UserContextProvider.tsx +++ b/datahub-web-react/src/app/context/UserContextProvider.tsx @@ -1,8 +1,10 @@ import React, { useCallback, useEffect, useState } from 'react'; -import { useGetMeLazyQuery } from '../../graphql/me.generated'; -import { useGetGlobalViewsSettingsLazyQuery } from '../../graphql/app.generated'; -import { CorpUser, PlatformPrivileges } from '../../types.generated'; -import { UserContext, LocalState, DEFAULT_STATE, State } from './userContext'; + +import { DEFAULT_STATE, LocalState, State, UserContext } from '@app/context/userContext'; + +import { useGetGlobalViewsSettingsLazyQuery } from '@graphql/app.generated'; +import { useGetMeLazyQuery } from '@graphql/me.generated'; +import { CorpUser, PlatformPrivileges } from '@types'; // TODO: Migrate all usage of useAuthenticatedUser to using this provider. diff --git a/datahub-web-react/src/app/context/useUserContext.tsx b/datahub-web-react/src/app/context/useUserContext.tsx index 28f2f399ec..ae18d12717 100644 --- a/datahub-web-react/src/app/context/useUserContext.tsx +++ b/datahub-web-react/src/app/context/useUserContext.tsx @@ -1,5 +1,6 @@ import { useContext } from 'react'; -import { UserContext } from './userContext'; + +import { UserContext } from '@app/context/userContext'; /** * Fetch an instance of User Context diff --git a/datahub-web-react/src/app/context/userContext.tsx b/datahub-web-react/src/app/context/userContext.tsx index a728e01ddc..a5c9fa6309 100644 --- a/datahub-web-react/src/app/context/userContext.tsx +++ b/datahub-web-react/src/app/context/userContext.tsx @@ -1,6 +1,8 @@ import React from 'react'; -import { CorpUser, PlatformPrivileges } from '../../types.generated'; -import { CustomUserContextState, DEFAULT_CUSTOM_STATE } from './CustomUserContext'; + +import { CustomUserContextState, DEFAULT_CUSTOM_STATE } from '@app/context/CustomUserContext'; + +import { CorpUser, PlatformPrivileges } from '@types'; /** * Local State is persisted to local storage. diff --git a/datahub-web-react/src/app/dataviz/ChartCard.tsx b/datahub-web-react/src/app/dataviz/ChartCard.tsx index 6d25daca9b..033797dbd0 100644 --- a/datahub-web-react/src/app/dataviz/ChartCard.tsx +++ b/datahub-web-react/src/app/dataviz/ChartCard.tsx @@ -1,8 +1,8 @@ -import React from 'react'; - import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Card = styled.div` display: flex; diff --git a/datahub-web-react/src/app/dataviz/Legend.tsx b/datahub-web-react/src/app/dataviz/Legend.tsx index a199894ae3..77ba808355 100644 --- a/datahub-web-react/src/app/dataviz/Legend.tsx +++ b/datahub-web-react/src/app/dataviz/Legend.tsx @@ -1,7 +1,6 @@ +import { LegendItem, LegendLabel, LegendOrdinal } from '@visx/legend'; import React from 'react'; -import { LegendOrdinal, LegendItem, LegendLabel } from '@visx/legend'; - interface Props { scale: any; } diff --git a/datahub-web-react/src/app/dataviz/bar/BarChart.tsx b/datahub-web-react/src/app/dataviz/bar/BarChart.tsx index 1176bc7ea7..1e97dcd107 100644 --- a/datahub-web-react/src/app/dataviz/bar/BarChart.tsx +++ b/datahub-web-react/src/app/dataviz/bar/BarChart.tsx @@ -1,14 +1,11 @@ +import { ParentSize } from '@visx/responsive'; +import { Axis, BarSeries, BarStack, Grid, XYChart } from '@visx/xychart'; +import dayjs from 'dayjs'; import React from 'react'; -import dayjs from 'dayjs'; - -import { Axis, BarSeries, BarStack, Grid, XYChart } from '@visx/xychart'; -import { ParentSize } from '@visx/responsive'; - -import { Legend } from '../Legend'; -import { ChartWrapper } from '../components'; - -import { abbreviateNumber } from '../utils'; +import { Legend } from '@app/dataviz/Legend'; +import { ChartWrapper } from '@app/dataviz/components'; +import { abbreviateNumber } from '@app/dataviz/utils'; export const BarChart = ({ data, diff --git a/datahub-web-react/src/app/dataviz/bar/HorizontalBarChart.tsx b/datahub-web-react/src/app/dataviz/bar/HorizontalBarChart.tsx index 9a963addc8..9119708e73 100644 --- a/datahub-web-react/src/app/dataviz/bar/HorizontalBarChart.tsx +++ b/datahub-web-react/src/app/dataviz/bar/HorizontalBarChart.tsx @@ -1,17 +1,14 @@ /* eslint-disable @typescript-eslint/dot-notation, no-param-reassign */ - +import { AxisLeft } from '@visx/axis'; +import { ParentSize } from '@visx/responsive'; +import { scaleBand, scaleLinear } from '@visx/scale'; +import { Bar, BarStackHorizontal } from '@visx/shape'; +import { Grid, XYChart } from '@visx/xychart'; import React from 'react'; -import { Grid, XYChart } from '@visx/xychart'; -import { BarStackHorizontal, Bar } from '@visx/shape'; -import { AxisLeft } from '@visx/axis'; -import { scaleLinear, scaleBand } from '@visx/scale'; -import { ParentSize } from '@visx/responsive'; - -import { Legend } from '../Legend'; -import { ChartWrapper } from '../components'; - -import { COMPLETED_COLOR, NOT_STARTED_COLOR, IN_PROGRESS_COLOR } from '../constants'; +import { Legend } from '@app/dataviz/Legend'; +import { ChartWrapper } from '@app/dataviz/components'; +import { COMPLETED_COLOR, IN_PROGRESS_COLOR, NOT_STARTED_COLOR } from '@app/dataviz/constants'; export const HorizontalBarChart = ({ data, diff --git a/datahub-web-react/src/app/dataviz/bar/HorizontalFullBarChart.tsx b/datahub-web-react/src/app/dataviz/bar/HorizontalFullBarChart.tsx index 4bb5848a38..81fca3e6cc 100644 --- a/datahub-web-react/src/app/dataviz/bar/HorizontalFullBarChart.tsx +++ b/datahub-web-react/src/app/dataviz/bar/HorizontalFullBarChart.tsx @@ -1,17 +1,14 @@ /* eslint-disable @typescript-eslint/dot-notation, no-param-reassign */ - +import { AxisLeft } from '@visx/axis'; +import { ParentSize } from '@visx/responsive'; +import { scaleBand, scaleLinear } from '@visx/scale'; +import { Bar, BarStackHorizontal } from '@visx/shape'; +import { Grid, XYChart } from '@visx/xychart'; import React from 'react'; -import { Grid, XYChart } from '@visx/xychart'; -import { BarStackHorizontal, Bar } from '@visx/shape'; -import { AxisLeft } from '@visx/axis'; -import { scaleLinear, scaleBand } from '@visx/scale'; -import { ParentSize } from '@visx/responsive'; - -import { Legend } from '../Legend'; -import { ChartWrapper } from '../components'; - -import { COMPLETED_COLOR, NOT_STARTED_COLOR, IN_PROGRESS_COLOR } from '../constants'; +import { Legend } from '@app/dataviz/Legend'; +import { ChartWrapper } from '@app/dataviz/components'; +import { COMPLETED_COLOR, IN_PROGRESS_COLOR, NOT_STARTED_COLOR } from '@app/dataviz/constants'; export const HorizontalFullBarChart = ({ data, diff --git a/datahub-web-react/src/app/dataviz/candle/CandleStick.tsx b/datahub-web-react/src/app/dataviz/candle/CandleStick.tsx index 437c677c7f..35d4dd3a8b 100644 --- a/datahub-web-react/src/app/dataviz/candle/CandleStick.tsx +++ b/datahub-web-react/src/app/dataviz/candle/CandleStick.tsx @@ -1,12 +1,11 @@ -import React from 'react'; - +import { GlyphCircle, GlyphDiamond } from '@visx/glyph'; +import { GlyphCircleProps } from '@visx/glyph/lib/glyphs/GlyphCircle'; +import { GlyphDiamondProps } from '@visx/glyph/lib/glyphs/GlyphDiamond'; import { Group } from '@visx/group'; import { Bar } from '@visx/shape'; import { BarProps } from '@visx/shape/lib/shapes/Bar'; -import { GlyphCircle, GlyphDiamond } from '@visx/glyph'; -import { GlyphDiamondProps } from '@visx/glyph/lib/glyphs/GlyphDiamond'; -import { GlyphCircleProps } from '@visx/glyph/lib/glyphs/GlyphCircle'; import { AddSVGProps } from '@visx/shape/lib/types'; +import React from 'react'; type DiamondProps = GlyphDiamondProps & Omit, keyof GlyphDiamondProps>; type CircleProps = GlyphCircleProps & Omit, keyof GlyphCircleProps>; diff --git a/datahub-web-react/src/app/dataviz/line/SimpleLineChart.tsx b/datahub-web-react/src/app/dataviz/line/SimpleLineChart.tsx index aa8831078c..e5329505aa 100644 --- a/datahub-web-react/src/app/dataviz/line/SimpleLineChart.tsx +++ b/datahub-web-react/src/app/dataviz/line/SimpleLineChart.tsx @@ -1,13 +1,12 @@ +import { curveCatmullRom } from '@visx/curve'; +import { MarkerCircle } from '@visx/marker'; +import { ParentSize } from '@visx/responsive'; +import { scaleLinear, scaleTime } from '@visx/scale'; +import { LinePath } from '@visx/shape'; +import { extent, max } from '@visx/vendor/d3-array'; import React from 'react'; -import { curveCatmullRom } from '@visx/curve'; -import { LinePath } from '@visx/shape'; -import { ParentSize } from '@visx/responsive'; -import { MarkerCircle } from '@visx/marker'; -import { extent, max } from '@visx/vendor/d3-array'; -import { scaleTime, scaleLinear } from '@visx/scale'; - -import { ChartWrapper } from '../components'; +import { ChartWrapper } from '@app/dataviz/components'; interface Props { data: any; diff --git a/datahub-web-react/src/app/dataviz/pie/PieChart.tsx b/datahub-web-react/src/app/dataviz/pie/PieChart.tsx index 6925e7b59a..e89fef1f67 100644 --- a/datahub-web-react/src/app/dataviz/pie/PieChart.tsx +++ b/datahub-web-react/src/app/dataviz/pie/PieChart.tsx @@ -1,10 +1,9 @@ -import React from 'react'; - +import { Annotation, Connector, Label } from '@visx/annotation'; import { Pie } from '@visx/shape'; import { PieArcDatum } from '@visx/shape/lib/shapes/Pie'; -import { Annotation, Label, Connector } from '@visx/annotation'; +import React from 'react'; -import { useDataAnnotationPosition } from './usePieDataAnnotation'; +import { useDataAnnotationPosition } from '@app/dataviz/pie/usePieDataAnnotation'; const PieDataAnnotation = ({ title, diff --git a/datahub-web-react/src/app/dataviz/utils.ts b/datahub-web-react/src/app/dataviz/utils.ts index c09e903ee4..7ea4544375 100644 --- a/datahub-web-react/src/app/dataviz/utils.ts +++ b/datahub-web-react/src/app/dataviz/utils.ts @@ -1,7 +1,7 @@ -import dayjs from 'dayjs'; import { scaleOrdinal } from '@visx/scale'; +import dayjs from 'dayjs'; -import { COMPLETED_COLOR, NOT_STARTED_COLOR, IN_PROGRESS_COLOR } from './constants'; +import { COMPLETED_COLOR, IN_PROGRESS_COLOR, NOT_STARTED_COLOR } from '@app/dataviz/constants'; // Mock Data Util export const generateDateSeries = (numOfDays) => diff --git a/datahub-web-react/src/app/domain/CreateDomainModal.tsx b/datahub-web-react/src/app/domain/CreateDomainModal.tsx index a50065e25f..da49f25058 100644 --- a/datahub-web-react/src/app/domain/CreateDomainModal.tsx +++ b/datahub-web-react/src/app/domain/CreateDomainModal.tsx @@ -1,13 +1,15 @@ +import { Button, Collapse, Form, Input, Modal, Tag, Typography, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { message, Button, Input, Modal, Typography, Form, Collapse, Tag } from 'antd'; -import { useCreateDomainMutation } from '../../graphql/domain.generated'; -import { useEnterKeyListener } from '../shared/useEnterKeyListener'; -import { validateCustomUrnId } from '../shared/textUtil'; -import analytics, { EventType } from '../analytics'; -import DomainParentSelect from '../entity/shared/EntityDropdown/DomainParentSelect'; -import { useIsNestedDomainsEnabled } from '../useAppConfig'; -import { useDomainsContext } from './DomainsContext'; + +import analytics, { EventType } from '@app/analytics'; +import { useDomainsContext } from '@app/domain/DomainsContext'; +import DomainParentSelect from '@app/entity/shared/EntityDropdown/DomainParentSelect'; +import { validateCustomUrnId } from '@app/shared/textUtil'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useIsNestedDomainsEnabled } from '@app/useAppConfig'; + +import { useCreateDomainMutation } from '@graphql/domain.generated'; const SuggestedNamesGroup = styled.div` margin-top: 8px; diff --git a/datahub-web-react/src/app/domain/DomainIcon.tsx b/datahub-web-react/src/app/domain/DomainIcon.tsx index c85a3c5efa..1792d2a364 100644 --- a/datahub-web-react/src/app/domain/DomainIcon.tsx +++ b/datahub-web-react/src/app/domain/DomainIcon.tsx @@ -1,6 +1,7 @@ import Icon from '@ant-design/icons/lib/components/Icon'; import React from 'react'; -import DomainsIcon from '../../images/domain.svg?react'; + +import DomainsIcon from '@images/domain.svg?react'; type Props = { style?: React.CSSProperties; diff --git a/datahub-web-react/src/app/domain/DomainItemMenu.tsx b/datahub-web-react/src/app/domain/DomainItemMenu.tsx index 3e04864b37..99ccd357b0 100644 --- a/datahub-web-react/src/app/domain/DomainItemMenu.tsx +++ b/datahub-web-react/src/app/domain/DomainItemMenu.tsx @@ -1,10 +1,12 @@ -import React from 'react'; import { DeleteOutlined } from '@ant-design/icons'; -import { Dropdown, Menu, message, Modal } from 'antd'; -import { EntityType } from '../../types.generated'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { useDeleteDomainMutation } from '../../graphql/domain.generated'; -import { MenuIcon } from '../entity/shared/EntityDropdown/EntityDropdown'; +import { Dropdown, Menu, Modal, message } from 'antd'; +import React from 'react'; + +import { MenuIcon } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useDeleteDomainMutation } from '@graphql/domain.generated'; +import { EntityType } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/domain/DomainListColumns.tsx b/datahub-web-react/src/app/domain/DomainListColumns.tsx index 952e456799..10368d6b3c 100644 --- a/datahub-web-react/src/app/domain/DomainListColumns.tsx +++ b/datahub-web-react/src/app/domain/DomainListColumns.tsx @@ -1,11 +1,13 @@ -import React from 'react'; import { Tag, Tooltip, Typography } from 'antd'; +import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { Maybe, Ownership } from '../../types.generated'; -import { useEntityRegistry } from '../useEntityRegistry'; -import AvatarsGroup from '../shared/avatar/AvatarsGroup'; -import DomainItemMenu from './DomainItemMenu'; + +import DomainItemMenu from '@app/domain/DomainItemMenu'; +import AvatarsGroup from '@app/shared/avatar/AvatarsGroup'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Maybe, Ownership } from '@types'; interface DomainEntry { name: string; diff --git a/datahub-web-react/src/app/domain/DomainRoutes.tsx b/datahub-web-react/src/app/domain/DomainRoutes.tsx index 56811ddc48..46c90c30bc 100644 --- a/datahub-web-react/src/app/domain/DomainRoutes.tsx +++ b/datahub-web-react/src/app/domain/DomainRoutes.tsx @@ -1,14 +1,16 @@ import React, { useState } from 'react'; +import { Route, Switch } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { Switch, Route } from 'react-router-dom'; -import { PageRoutes } from '../../conf/Global'; -import { EntityPage } from '../entity/EntityPage'; -import { useEntityRegistry } from '../useEntityRegistry'; -import ManageDomainsPageV2 from './nestedDomains/ManageDomainsPageV2'; -import { EntityType } from '../../types.generated'; -import ManageDomainsSidebar from './nestedDomains/ManageDomainsSidebar'; -import { DomainsContext } from './DomainsContext'; -import { GenericEntityProperties } from '../entity/shared/types'; + +import { DomainsContext } from '@app/domain/DomainsContext'; +import ManageDomainsPageV2 from '@app/domain/nestedDomains/ManageDomainsPageV2'; +import ManageDomainsSidebar from '@app/domain/nestedDomains/ManageDomainsSidebar'; +import { EntityPage } from '@app/entity/EntityPage'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; + +import { EntityType } from '@types'; const ContentWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/domain/DomainSearch.tsx b/datahub-web-react/src/app/domain/DomainSearch.tsx index 5036a795ea..975e7d3aac 100644 --- a/datahub-web-react/src/app/domain/DomainSearch.tsx +++ b/datahub-web-react/src/app/domain/DomainSearch.tsx @@ -1,12 +1,14 @@ -import React, { useRef, useState } from 'react'; import { LoadingOutlined } from '@ant-design/icons'; +import React, { useRef, useState } from 'react'; import styled from 'styled-components/macro'; -import { useGetSearchResultsForMultipleQuery } from '../../graphql/search.generated'; -import { EntityType } from '../../types.generated'; -import { SearchBar } from '../search/SearchBar'; -import ClickOutside from '../shared/ClickOutside'; -import { useEntityRegistry } from '../useEntityRegistry'; -import DomainSearchResultItem from './DomainSearchResultItem'; + +import DomainSearchResultItem from '@app/domain/DomainSearchResultItem'; +import { SearchBar } from '@app/search/SearchBar'; +import ClickOutside from '@app/shared/ClickOutside'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; const DomainSearchWrapper = styled.div` position: relative; @@ -15,7 +17,10 @@ const DomainSearchWrapper = styled.div` const ResultsWrapper = styled.div` background-color: white; border-radius: 5px; - box-shadow: 0 3px 6px -4px rgb(0 0 0 / 12%), 0 6px 16px 0 rgb(0 0 0 / 8%), 0 9px 28px 8px rgb(0 0 0 / 5%); + box-shadow: + 0 3px 6px -4px rgb(0 0 0 / 12%), + 0 6px 16px 0 rgb(0 0 0 / 8%), + 0 9px 28px 8px rgb(0 0 0 / 5%); max-height: 380px; overflow: auto; padding: 8px; diff --git a/datahub-web-react/src/app/domain/DomainSearchResultItem.tsx b/datahub-web-react/src/app/domain/DomainSearchResultItem.tsx index dc33ea173e..96e92ce525 100644 --- a/datahub-web-react/src/app/domain/DomainSearchResultItem.tsx +++ b/datahub-web-react/src/app/domain/DomainSearchResultItem.tsx @@ -1,15 +1,17 @@ // Create a new component called SearchResultItem.js import React from 'react'; -import { Link } from 'react-router-dom'; import Highlight from 'react-highlighter'; +import { Link } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { Entity, EntityType } from '../../types.generated'; -import { IconStyleType } from '../entity/Entity'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import DomainIcon from './DomainIcon'; -import ParentEntities from '../search/filters/ParentEntities'; -import { getParentDomains } from './utils'; -import EntityRegistry from '../entity/EntityRegistry'; + +import DomainIcon from '@app/domain/DomainIcon'; +import { getParentDomains } from '@app/domain/utils'; +import { IconStyleType } from '@app/entity/Entity'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import ParentEntities from '@app/search/filters/ParentEntities'; + +import { Entity, EntityType } from '@types'; type Props = { entity: Entity; diff --git a/datahub-web-react/src/app/domain/DomainsContext.tsx b/datahub-web-react/src/app/domain/DomainsContext.tsx index ecbdaebd03..da88ed1f3d 100644 --- a/datahub-web-react/src/app/domain/DomainsContext.tsx +++ b/datahub-web-react/src/app/domain/DomainsContext.tsx @@ -1,5 +1,6 @@ import React, { useContext } from 'react'; -import { GenericEntityProperties } from '../entity/shared/types'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; export interface DomainsContextType { entityData: GenericEntityProperties | null; diff --git a/datahub-web-react/src/app/domain/DomainsList.tsx b/datahub-web-react/src/app/domain/DomainsList.tsx index 37476bdc2c..c145eb4cd8 100644 --- a/datahub-web-react/src/app/domain/DomainsList.tsx +++ b/datahub-web-react/src/app/domain/DomainsList.tsx @@ -1,25 +1,27 @@ -import React, { useEffect, useState } from 'react'; +import { PlusOutlined } from '@ant-design/icons'; import { Button, Empty, Pagination, Typography } from 'antd'; +import * as QueryString from 'query-string'; +import { AlignType } from 'rc-table/lib/interface'; +import React, { useEffect, useState } from 'react'; import { useLocation } from 'react-router'; import styled from 'styled-components'; -import * as QueryString from 'query-string'; -import { PlusOutlined } from '@ant-design/icons'; -import { AlignType } from 'rc-table/lib/interface'; -import { EntityType } from '../../types.generated'; -import { useListDomainsQuery } from '../../graphql/domain.generated'; -import CreateDomainModal from './CreateDomainModal'; -import { Message } from '../shared/Message'; -import TabToolbar from '../entity/shared/components/styled/TabToolbar'; -import { SearchBar } from '../search/SearchBar'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { scrollToTop } from '../shared/searchUtils'; -import { addToListDomainsCache, removeFromListDomainsCache } from './utils'; -import { OnboardingTour } from '../onboarding/OnboardingTour'; -import { DOMAINS_INTRO_ID, DOMAINS_CREATE_DOMAIN_ID } from '../onboarding/config/DomainsOnboardingConfig'; -import { getElasticCappedTotalValueText } from '../entity/shared/constants'; -import { StyledTable } from '../entity/shared/components/styled/StyledTable'; -import { DomainOwnersColumn, DomainListMenuColumn, DomainNameColumn } from './DomainListColumns'; -import DomainIcon from './DomainIcon'; + +import CreateDomainModal from '@app/domain/CreateDomainModal'; +import DomainIcon from '@app/domain/DomainIcon'; +import { DomainListMenuColumn, DomainNameColumn, DomainOwnersColumn } from '@app/domain/DomainListColumns'; +import { addToListDomainsCache, removeFromListDomainsCache } from '@app/domain/utils'; +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { getElasticCappedTotalValueText } from '@app/entity/shared/constants'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; +import { DOMAINS_CREATE_DOMAIN_ID, DOMAINS_INTRO_ID } from '@app/onboarding/config/DomainsOnboardingConfig'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListDomainsQuery } from '@graphql/domain.generated'; +import { EntityType } from '@types'; const DomainsContainer = styled.div``; diff --git a/datahub-web-react/src/app/domain/EmptyDomainDescription.tsx b/datahub-web-react/src/app/domain/EmptyDomainDescription.tsx index 6a5f304e56..b232aa3780 100644 --- a/datahub-web-react/src/app/domain/EmptyDomainDescription.tsx +++ b/datahub-web-react/src/app/domain/EmptyDomainDescription.tsx @@ -1,7 +1,8 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const StyledParagraph = styled(Typography.Paragraph)` text-align: justify; diff --git a/datahub-web-react/src/app/domain/EmptyDomainsSection.tsx b/datahub-web-react/src/app/domain/EmptyDomainsSection.tsx index f232d259c2..cffde970b4 100644 --- a/datahub-web-react/src/app/domain/EmptyDomainsSection.tsx +++ b/datahub-web-react/src/app/domain/EmptyDomainsSection.tsx @@ -2,7 +2,8 @@ import { PlusOutlined } from '@ant-design/icons'; import { Button, Empty, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const EmptyDomainContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/domain/ManageDomainsPage.tsx b/datahub-web-react/src/app/domain/ManageDomainsPage.tsx index 3e19da1875..d662377b5b 100644 --- a/datahub-web-react/src/app/domain/ManageDomainsPage.tsx +++ b/datahub-web-react/src/app/domain/ManageDomainsPage.tsx @@ -1,9 +1,10 @@ import { Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { DomainsList } from './DomainsList'; -import { DomainsContext } from './DomainsContext'; -import { GenericEntityProperties } from '../entity/shared/types'; + +import { DomainsContext } from '@app/domain/DomainsContext'; +import { DomainsList } from '@app/domain/DomainsList'; +import { GenericEntityProperties } from '@app/entity/shared/types'; const PageContainer = styled.div` padding-top: 20px; diff --git a/datahub-web-react/src/app/domain/nestedDomains/DomainsSidebarHeader.tsx b/datahub-web-react/src/app/domain/nestedDomains/DomainsSidebarHeader.tsx index d9ff18514d..7e723e3183 100644 --- a/datahub-web-react/src/app/domain/nestedDomains/DomainsSidebarHeader.tsx +++ b/datahub-web-react/src/app/domain/nestedDomains/DomainsSidebarHeader.tsx @@ -1,15 +1,16 @@ -import { useApolloClient } from '@apollo/client'; import { PlusOutlined } from '@ant-design/icons'; +import { useApolloClient } from '@apollo/client'; import { Button } from 'antd'; import React, { useState } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { ANTD_GRAY, ANTD_GRAY_V2 } from '../../entity/shared/constants'; -import DomainsTitle from './DomainsTitle'; -import { PageRoutes } from '../../../conf/Global'; -import CreateDomainModal from '../CreateDomainModal'; -import { updateListDomainsCache } from '../utils'; -import { useDomainsContext } from '../DomainsContext'; + +import CreateDomainModal from '@app/domain/CreateDomainModal'; +import { useDomainsContext } from '@app/domain/DomainsContext'; +import DomainsTitle from '@app/domain/nestedDomains/DomainsTitle'; +import { updateListDomainsCache } from '@app/domain/utils'; +import { ANTD_GRAY, ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { PageRoutes } from '@conf/Global'; const HeaderWrapper = styled.div` border-bottom: 1px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/domain/nestedDomains/DomainsTitle.tsx b/datahub-web-react/src/app/domain/nestedDomains/DomainsTitle.tsx index 3aa7c8330d..ea6a93a445 100644 --- a/datahub-web-react/src/app/domain/nestedDomains/DomainsTitle.tsx +++ b/datahub-web-react/src/app/domain/nestedDomains/DomainsTitle.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import DomainIcon from '../DomainIcon'; + +import DomainIcon from '@app/domain/DomainIcon'; const IconWrapper = styled.span` margin-right: 10px; diff --git a/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsPageV2.tsx b/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsPageV2.tsx index f5fc0cba2d..3d7d3187f5 100644 --- a/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsPageV2.tsx +++ b/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsPageV2.tsx @@ -1,16 +1,17 @@ +import { PlusOutlined } from '@ant-design/icons'; import { useApolloClient } from '@apollo/client'; import { Button } from 'antd'; -import { PlusOutlined } from '@ant-design/icons'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components/macro'; -import DomainsTitle from './DomainsTitle'; -import RootDomains from './RootDomains'; -import { DOMAINS_CREATE_DOMAIN_ID, DOMAINS_INTRO_ID } from '../../onboarding/config/DomainsOnboardingConfig'; -import { OnboardingTour } from '../../onboarding/OnboardingTour'; -import { ANTD_GRAY_V2 } from '../../entity/shared/constants'; -import CreateDomainModal from '../CreateDomainModal'; -import { updateListDomainsCache } from '../utils'; -import { useDomainsContext } from '../DomainsContext'; + +import CreateDomainModal from '@app/domain/CreateDomainModal'; +import { useDomainsContext } from '@app/domain/DomainsContext'; +import DomainsTitle from '@app/domain/nestedDomains/DomainsTitle'; +import RootDomains from '@app/domain/nestedDomains/RootDomains'; +import { updateListDomainsCache } from '@app/domain/utils'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; +import { DOMAINS_CREATE_DOMAIN_ID, DOMAINS_INTRO_ID } from '@app/onboarding/config/DomainsOnboardingConfig'; const PageWrapper = styled.div` background-color: ${ANTD_GRAY_V2[1]}; diff --git a/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsSidebar.tsx b/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsSidebar.tsx index 827031138d..a9f2a55941 100644 --- a/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsSidebar.tsx +++ b/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsSidebar.tsx @@ -1,10 +1,11 @@ import React, { useState } from 'react'; -import { MAX_BROWSER_WIDTH, MIN_BROWSWER_WIDTH } from '../../glossary/BusinessGlossaryPage'; -import { ProfileSidebarResizer } from '../../entity/shared/containers/profile/sidebar/ProfileSidebarResizer'; -import DomainsSidebarHeader from './DomainsSidebarHeader'; -import { SidebarWrapper } from '../../shared/sidebar/components'; -import DomainNavigator from './domainNavigator/DomainNavigator'; -import DomainSearch from '../DomainSearch'; + +import DomainSearch from '@app/domain/DomainSearch'; +import DomainsSidebarHeader from '@app/domain/nestedDomains/DomainsSidebarHeader'; +import DomainNavigator from '@app/domain/nestedDomains/domainNavigator/DomainNavigator'; +import { ProfileSidebarResizer } from '@app/entity/shared/containers/profile/sidebar/ProfileSidebarResizer'; +import { MAX_BROWSER_WIDTH, MIN_BROWSWER_WIDTH } from '@app/glossary/BusinessGlossaryPage'; +import { SidebarWrapper } from '@app/shared/sidebar/components'; export default function ManageDomainsSidebar() { const [browserWidth, setBrowserWith] = useState(window.innerWidth * 0.2); diff --git a/datahub-web-react/src/app/domain/nestedDomains/RootDomains.tsx b/datahub-web-react/src/app/domain/nestedDomains/RootDomains.tsx index 75c38cd495..fda3912e70 100644 --- a/datahub-web-react/src/app/domain/nestedDomains/RootDomains.tsx +++ b/datahub-web-react/src/app/domain/nestedDomains/RootDomains.tsx @@ -1,13 +1,15 @@ +import { ReadOutlined } from '@ant-design/icons'; import React from 'react'; import styled from 'styled-components'; -import { ReadOutlined } from '@ant-design/icons'; -import { Message } from '../../shared/Message'; -import { ResultWrapper } from '../../search/SearchResultList'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { EntityType } from '../../../types.generated'; -import useListDomains from '../useListDomains'; -import EmptyDomainsSection from '../EmptyDomainsSection'; -import EmptyDomainDescription from '../EmptyDomainDescription'; + +import EmptyDomainDescription from '@app/domain/EmptyDomainDescription'; +import EmptyDomainsSection from '@app/domain/EmptyDomainsSection'; +import useListDomains from '@app/domain/useListDomains'; +import { ResultWrapper } from '@app/search/SearchResultList'; +import { Message } from '@app/shared/Message'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const DomainsWrapper = styled.div` overflow: auto; diff --git a/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNavigator.tsx b/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNavigator.tsx index 8decc2840a..3c5fdbfde1 100644 --- a/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNavigator.tsx +++ b/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNavigator.tsx @@ -1,10 +1,12 @@ import { Alert, Empty } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import useListDomains from '../../useListDomains'; -import DomainNode from './DomainNode'; -import { Domain } from '../../../../types.generated'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; + +import DomainNode from '@app/domain/nestedDomains/domainNavigator/DomainNode'; +import useListDomains from '@app/domain/useListDomains'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; + +import { Domain } from '@types'; const NavigatorWrapper = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNode.tsx b/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNode.tsx index 82977eff4f..19b3953906 100644 --- a/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNode.tsx +++ b/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNode.tsx @@ -2,17 +2,19 @@ import { Typography } from 'antd'; import React, { useEffect, useMemo } from 'react'; import { useHistory } from 'react-router'; import styled from 'styled-components'; -import { Domain } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { RotatingTriangle } from '../../../shared/sidebar/components'; -import DomainIcon from '../../DomainIcon'; -import useListDomains from '../../useListDomains'; -import useToggle from '../../../shared/useToggle'; -import { BodyContainer, BodyGridExpander } from '../../../shared/components'; -import { ANTD_GRAY_V2 } from '../../../entity/shared/constants'; -import { useDomainsContext } from '../../DomainsContext'; -import { applyOpacity } from '../../../shared/styleUtils'; -import useHasDomainChildren from './useHasDomainChildren'; + +import DomainIcon from '@app/domain/DomainIcon'; +import { useDomainsContext } from '@app/domain/DomainsContext'; +import useHasDomainChildren from '@app/domain/nestedDomains/domainNavigator/useHasDomainChildren'; +import useListDomains from '@app/domain/useListDomains'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { BodyContainer, BodyGridExpander } from '@app/shared/components'; +import { RotatingTriangle } from '@app/shared/sidebar/components'; +import { applyOpacity } from '@app/shared/styleUtils'; +import useToggle from '@app/shared/useToggle'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Domain } from '@types'; const RowWrapper = styled.div` align-items: center; diff --git a/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/useHasDomainChildren.ts b/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/useHasDomainChildren.ts index d16d5de23f..e9c30ee8f8 100644 --- a/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/useHasDomainChildren.ts +++ b/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/useHasDomainChildren.ts @@ -1,6 +1,8 @@ import { useEffect } from 'react'; -import { useGetDomainChildrenCountLazyQuery } from '../../../../graphql/domain.generated'; -import { useDomainsContext } from '../../DomainsContext'; + +import { useDomainsContext } from '@app/domain/DomainsContext'; + +import { useGetDomainChildrenCountLazyQuery } from '@graphql/domain.generated'; interface Props { domainUrn: string; diff --git a/datahub-web-react/src/app/domain/useListDomains.tsx b/datahub-web-react/src/app/domain/useListDomains.tsx index 74f6b454f1..e637b58764 100644 --- a/datahub-web-react/src/app/domain/useListDomains.tsx +++ b/datahub-web-react/src/app/domain/useListDomains.tsx @@ -1,5 +1,6 @@ -import { useListDomainsQuery } from '../../graphql/domain.generated'; -import { useSortedDomains } from './utils'; +import { useSortedDomains } from '@app/domain/utils'; + +import { useListDomainsQuery } from '@graphql/domain.generated'; interface Props { parentDomain?: string; diff --git a/datahub-web-react/src/app/domain/utils.ts b/datahub-web-react/src/app/domain/utils.ts index e39e97ac86..2075176740 100644 --- a/datahub-web-react/src/app/domain/utils.ts +++ b/datahub-web-react/src/app/domain/utils.ts @@ -1,13 +1,15 @@ import { ApolloClient } from '@apollo/client'; -import { useEffect } from 'react'; import { isEqual } from 'lodash'; -import { ListDomainsDocument, ListDomainsQuery } from '../../graphql/domain.generated'; -import { Entity, EntityType } from '../../types.generated'; -import { GenericEntityProperties } from '../entity/shared/types'; -import usePrevious from '../shared/usePrevious'; -import { useDomainsContext } from './DomainsContext'; -import { useEntityRegistry } from '../useEntityRegistry'; -import EntityRegistry from '../entity/EntityRegistry'; +import { useEffect } from 'react'; + +import { useDomainsContext } from '@app/domain/DomainsContext'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import usePrevious from '@app/shared/usePrevious'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { ListDomainsDocument, ListDomainsQuery } from '@graphql/domain.generated'; +import { Entity, EntityType } from '@types'; /** * Add an entry to the list domains cache. diff --git a/datahub-web-react/src/app/domainV2/CreateDomainModal.tsx b/datahub-web-react/src/app/domainV2/CreateDomainModal.tsx index b05a984201..004428e297 100644 --- a/datahub-web-react/src/app/domainV2/CreateDomainModal.tsx +++ b/datahub-web-react/src/app/domainV2/CreateDomainModal.tsx @@ -1,15 +1,17 @@ +import { Collapse, Form, Input, Modal, Tag, Typography, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { message, Input, Modal, Typography, Form, Collapse, Tag } from 'antd'; + +import analytics, { EventType } from '@app/analytics'; +import { useDomainsContext as useDomainsContextV2 } from '@app/domainV2/DomainsContext'; +import DomainParentSelect from '@app/entityV2/shared/EntityDropdown/DomainParentSelect'; +import { ModalButtonContainer } from '@app/shared/button/styledComponents'; +import { validateCustomUrnId } from '@app/shared/textUtil'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useIsNestedDomainsEnabled } from '@app/useAppConfig'; import { Button } from '@src/alchemy-components'; -import { useCreateDomainMutation } from '../../graphql/domain.generated'; -import { useEnterKeyListener } from '../shared/useEnterKeyListener'; -import { validateCustomUrnId } from '../shared/textUtil'; -import analytics, { EventType } from '../analytics'; -import DomainParentSelect from '../entityV2/shared/EntityDropdown/DomainParentSelect'; -import { useIsNestedDomainsEnabled } from '../useAppConfig'; -import { useDomainsContext as useDomainsContextV2 } from './DomainsContext'; -import { ModalButtonContainer } from '../shared/button/styledComponents'; + +import { useCreateDomainMutation } from '@graphql/domain.generated'; const SuggestedNamesGroup = styled.div` margin-top: 8px; diff --git a/datahub-web-react/src/app/domainV2/DomainAutocompleteOptions.tsx b/datahub-web-react/src/app/domainV2/DomainAutocompleteOptions.tsx index 7f392b6b8a..8b1c571669 100644 --- a/datahub-web-react/src/app/domainV2/DomainAutocompleteOptions.tsx +++ b/datahub-web-react/src/app/domainV2/DomainAutocompleteOptions.tsx @@ -1,11 +1,13 @@ import { LoadingOutlined } from '@ant-design/icons'; import React from 'react'; import styled from 'styled-components'; -import { Entity } from '../../types.generated'; -import { getParentDomains } from '../domain/utils'; -import EntityRegistry from '../entity/EntityRegistry'; -import { ANTD_GRAY } from '../entityV2/shared/constants'; -import ParentEntities from '../search/filters/ParentEntities'; + +import { getParentDomains } from '@app/domain/utils'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import ParentEntities from '@app/search/filters/ParentEntities'; + +import { Entity } from '@types'; const LoadingWrapper = styled.div` padding: 8px; diff --git a/datahub-web-react/src/app/domainV2/DomainIcon.tsx b/datahub-web-react/src/app/domainV2/DomainIcon.tsx index 76326f89bd..d13bea510f 100644 --- a/datahub-web-react/src/app/domainV2/DomainIcon.tsx +++ b/datahub-web-react/src/app/domainV2/DomainIcon.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Globe } from '@phosphor-icons/react'; -import { TYPE_ICON_CLASS_NAME } from '../entityV2/shared/components/subtypes'; +import React from 'react'; + +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; type Props = { style?: React.CSSProperties; diff --git a/datahub-web-react/src/app/domainV2/DomainItemMenu.tsx b/datahub-web-react/src/app/domainV2/DomainItemMenu.tsx index a0007b9043..dbfcce9a57 100644 --- a/datahub-web-react/src/app/domainV2/DomainItemMenu.tsx +++ b/datahub-web-react/src/app/domainV2/DomainItemMenu.tsx @@ -1,10 +1,12 @@ -import React from 'react'; import { DeleteOutlined } from '@ant-design/icons'; -import { Dropdown, Menu, message, Modal } from 'antd'; -import { EntityType } from '../../types.generated'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { useDeleteDomainMutation } from '../../graphql/domain.generated'; -import { MenuIcon } from '../entity/shared/EntityDropdown/EntityDropdown'; +import { Dropdown, Menu, Modal, message } from 'antd'; +import React from 'react'; + +import { MenuIcon } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useDeleteDomainMutation } from '@graphql/domain.generated'; +import { EntityType } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/domainV2/DomainListColumns.tsx b/datahub-web-react/src/app/domainV2/DomainListColumns.tsx index 646056adcf..c0d48fe67d 100644 --- a/datahub-web-react/src/app/domainV2/DomainListColumns.tsx +++ b/datahub-web-react/src/app/domainV2/DomainListColumns.tsx @@ -1,12 +1,14 @@ -import React from 'react'; -import { Tag, Typography } from 'antd'; import { Tooltip } from '@components'; +import { Tag, Typography } from 'antd'; +import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { Maybe, Ownership } from '../../types.generated'; -import { useEntityRegistry } from '../useEntityRegistry'; -import AvatarsGroup from '../shared/avatar/AvatarsGroup'; -import DomainItemMenu from './DomainItemMenu'; + +import DomainItemMenu from '@app/domainV2/DomainItemMenu'; +import AvatarsGroup from '@app/shared/avatar/AvatarsGroup'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Maybe, Ownership } from '@types'; interface DomainEntry { name: string; diff --git a/datahub-web-react/src/app/domainV2/DomainRoutes.tsx b/datahub-web-react/src/app/domainV2/DomainRoutes.tsx index 4910bb807a..f04a096f8b 100644 --- a/datahub-web-react/src/app/domainV2/DomainRoutes.tsx +++ b/datahub-web-react/src/app/domainV2/DomainRoutes.tsx @@ -1,17 +1,19 @@ import React, { useState } from 'react'; -import { matchPath, Route, Switch, useLocation } from 'react-router-dom'; +import { Route, Switch, matchPath, useLocation } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { PageRoutes } from '../../conf/Global'; -import { EntityType } from '../../types.generated'; -import { EntityPage } from '../entity/EntityPage'; -import { GenericEntityProperties } from '../entity/shared/types'; -import EntitySidebarContext from '../sharedV2/EntitySidebarContext'; -import useSidebarWidth from '../sharedV2/sidebar/useSidebarWidth'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { DomainsContext } from './DomainsContext'; -import ManageDomainsPageV2 from './nestedDomains/ManageDomainsPageV2'; -import ManageDomainsSidebar from './nestedDomains/ManageDomainsSidebar'; -import { useShowNavBarRedesign } from '../useShowNavBarRedesign'; + +import { DomainsContext } from '@app/domainV2/DomainsContext'; +import ManageDomainsPageV2 from '@app/domainV2/nestedDomains/ManageDomainsPageV2'; +import ManageDomainsSidebar from '@app/domainV2/nestedDomains/ManageDomainsSidebar'; +import { EntityPage } from '@app/entity/EntityPage'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; +import useSidebarWidth from '@app/sharedV2/sidebar/useSidebarWidth'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign'; +import { PageRoutes } from '@conf/Global'; + +import { EntityType } from '@types'; const ContentWrapper = styled.div<{ $isShowNavBarRedesign?: boolean; $isEntityProfile?: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/domainV2/DomainSearch.tsx b/datahub-web-react/src/app/domainV2/DomainSearch.tsx index 824043ee9c..a7faa5237a 100644 --- a/datahub-web-react/src/app/domainV2/DomainSearch.tsx +++ b/datahub-web-react/src/app/domainV2/DomainSearch.tsx @@ -1,14 +1,16 @@ +import { LoadingOutlined, SearchOutlined } from '@ant-design/icons'; import { SearchBar } from '@components'; import React, { useState } from 'react'; -import { LoadingOutlined, SearchOutlined } from '@ant-design/icons'; import { useDebounce } from 'react-use'; import styled from 'styled-components/macro'; -import { useGetAutoCompleteResultsQuery } from '../../graphql/search.generated'; -import { EntityType } from '../../types.generated'; -import ClickOutside from '../shared/ClickOutside'; -import { useEntityRegistry } from '../useEntityRegistry'; -import DomainSearchResultItem from './DomainSearchResultItem'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; + +import DomainSearchResultItem from '@app/domainV2/DomainSearchResultItem'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import ClickOutside from '@app/shared/ClickOutside'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetAutoCompleteResultsQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; const DomainSearchWrapper = styled.div` flex-shrink: 0; @@ -18,7 +20,10 @@ const DomainSearchWrapper = styled.div` const ResultsWrapper = styled.div` background-color: white; border-radius: 5px; - box-shadow: 0 3px 6px -4px rgb(0 0 0 / 12%), 0 6px 16px 0 rgb(0 0 0 / 8%), 0 9px 28px 8px rgb(0 0 0 / 5%); + box-shadow: + 0 3px 6px -4px rgb(0 0 0 / 12%), + 0 6px 16px 0 rgb(0 0 0 / 8%), + 0 9px 28px 8px rgb(0 0 0 / 5%); padding: 8px; position: absolute; max-height: 210px; diff --git a/datahub-web-react/src/app/domainV2/DomainSearchResultItem.tsx b/datahub-web-react/src/app/domainV2/DomainSearchResultItem.tsx index dc33ea173e..27e38070dd 100644 --- a/datahub-web-react/src/app/domainV2/DomainSearchResultItem.tsx +++ b/datahub-web-react/src/app/domainV2/DomainSearchResultItem.tsx @@ -1,15 +1,17 @@ // Create a new component called SearchResultItem.js import React from 'react'; -import { Link } from 'react-router-dom'; import Highlight from 'react-highlighter'; +import { Link } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { Entity, EntityType } from '../../types.generated'; -import { IconStyleType } from '../entity/Entity'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import DomainIcon from './DomainIcon'; -import ParentEntities from '../search/filters/ParentEntities'; -import { getParentDomains } from './utils'; -import EntityRegistry from '../entity/EntityRegistry'; + +import DomainIcon from '@app/domainV2/DomainIcon'; +import { getParentDomains } from '@app/domainV2/utils'; +import { IconStyleType } from '@app/entity/Entity'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import ParentEntities from '@app/search/filters/ParentEntities'; + +import { Entity, EntityType } from '@types'; type Props = { entity: Entity; diff --git a/datahub-web-react/src/app/domainV2/DomainsContext.tsx b/datahub-web-react/src/app/domainV2/DomainsContext.tsx index 3a6523e31a..42df0f3d46 100644 --- a/datahub-web-react/src/app/domainV2/DomainsContext.tsx +++ b/datahub-web-react/src/app/domainV2/DomainsContext.tsx @@ -1,5 +1,6 @@ import React, { useContext } from 'react'; -import { GenericEntityProperties } from '../entity/shared/types'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; export interface DomainsContextType { entityData: GenericEntityProperties | null; diff --git a/datahub-web-react/src/app/domainV2/DomainsList.tsx b/datahub-web-react/src/app/domainV2/DomainsList.tsx index 7966cdc671..bb65e263a8 100644 --- a/datahub-web-react/src/app/domainV2/DomainsList.tsx +++ b/datahub-web-react/src/app/domainV2/DomainsList.tsx @@ -1,25 +1,27 @@ -import React, { useEffect, useState } from 'react'; +import { PlusOutlined } from '@ant-design/icons'; import { Button, Empty, Pagination, Typography } from 'antd'; +import * as QueryString from 'query-string'; +import { AlignType } from 'rc-table/lib/interface'; +import React, { useEffect, useState } from 'react'; import { useLocation } from 'react-router'; import styled from 'styled-components'; -import * as QueryString from 'query-string'; -import { PlusOutlined } from '@ant-design/icons'; -import { AlignType } from 'rc-table/lib/interface'; -import { EntityType } from '../../types.generated'; -import { useListDomainsQuery } from '../../graphql/domain.generated'; -import CreateDomainModal from './CreateDomainModal'; -import { Message } from '../shared/Message'; -import TabToolbar from '../entity/shared/components/styled/TabToolbar'; -import { SearchBar } from '../search/SearchBar'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { scrollToTop } from '../shared/searchUtils'; -import { addToListDomainsCache, removeFromListDomainsCache } from './utils'; -import { OnboardingTour } from '../onboarding/OnboardingTour'; -import { DOMAINS_INTRO_ID, DOMAINS_CREATE_DOMAIN_ID } from '../onboarding/config/DomainsOnboardingConfig'; -import { getElasticCappedTotalValueText } from '../entity/shared/constants'; -import { StyledTable } from '../entity/shared/components/styled/StyledTable'; -import { DomainOwnersColumn, DomainListMenuColumn, DomainNameColumn } from './DomainListColumns'; -import DomainIcon from './DomainIcon'; + +import CreateDomainModal from '@app/domainV2/CreateDomainModal'; +import DomainIcon from '@app/domainV2/DomainIcon'; +import { DomainListMenuColumn, DomainNameColumn, DomainOwnersColumn } from '@app/domainV2/DomainListColumns'; +import { addToListDomainsCache, removeFromListDomainsCache } from '@app/domainV2/utils'; +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { getElasticCappedTotalValueText } from '@app/entity/shared/constants'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; +import { DOMAINS_CREATE_DOMAIN_ID, DOMAINS_INTRO_ID } from '@app/onboarding/config/DomainsOnboardingConfig'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListDomainsQuery } from '@graphql/domain.generated'; +import { EntityType } from '@types'; const DomainsContainer = styled.div``; diff --git a/datahub-web-react/src/app/domainV2/EmptyDomainDescription.tsx b/datahub-web-react/src/app/domainV2/EmptyDomainDescription.tsx index 6a5f304e56..b232aa3780 100644 --- a/datahub-web-react/src/app/domainV2/EmptyDomainDescription.tsx +++ b/datahub-web-react/src/app/domainV2/EmptyDomainDescription.tsx @@ -1,7 +1,8 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const StyledParagraph = styled(Typography.Paragraph)` text-align: justify; diff --git a/datahub-web-react/src/app/domainV2/EmptyDomainsSection.tsx b/datahub-web-react/src/app/domainV2/EmptyDomainsSection.tsx index 6ec4499997..1a3a2869ad 100644 --- a/datahub-web-react/src/app/domainV2/EmptyDomainsSection.tsx +++ b/datahub-web-react/src/app/domainV2/EmptyDomainsSection.tsx @@ -2,7 +2,8 @@ import { PlusOutlined } from '@ant-design/icons'; import { Button, Empty, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const EmptyDomainContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/domainV2/ManageDomainsPage.tsx b/datahub-web-react/src/app/domainV2/ManageDomainsPage.tsx index 98a312854d..14ac8f80ba 100644 --- a/datahub-web-react/src/app/domainV2/ManageDomainsPage.tsx +++ b/datahub-web-react/src/app/domainV2/ManageDomainsPage.tsx @@ -1,9 +1,10 @@ import { Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { DomainsList } from './DomainsList'; -import { DomainsContext } from './DomainsContext'; -import { GenericEntityProperties } from '../entity/shared/types'; + +import { DomainsContext } from '@app/domainV2/DomainsContext'; +import { DomainsList } from '@app/domainV2/DomainsList'; +import { GenericEntityProperties } from '@app/entity/shared/types'; const PageContainer = styled.div` padding-top: 20px; diff --git a/datahub-web-react/src/app/domainV2/__tests__/utils.test.ts b/datahub-web-react/src/app/domainV2/__tests__/utils.test.ts index 5a1b920f35..fa3a941bae 100644 --- a/datahub-web-react/src/app/domainV2/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/domainV2/__tests__/utils.test.ts @@ -1,15 +1,17 @@ -import { renderHook } from '@testing-library/react-hooks'; import { ApolloClient, InMemoryCache } from '@apollo/client'; -import { DomainMock1, DomainMock3, expectedResult } from '../../../Mocks'; -import { useEntityRegistry } from '../../useEntityRegistry'; +import { renderHook } from '@testing-library/react-hooks'; + import { addToListDomainsCache, + getParentDomains, removeFromListDomainsCache, updateListDomainsCache, useSortedDomains, - getParentDomains, -} from '../utils'; -import { Entity, EntityType } from '../../../types.generated'; +} from '@app/domainV2/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { DomainMock1, DomainMock3, expectedResult } from '@src/Mocks'; + +import { Entity, EntityType } from '@types'; const apolloClient = new ApolloClient({ cache: new InMemoryCache(), diff --git a/datahub-web-react/src/app/domainV2/nestedDomains/DomainsSidebarHeader.tsx b/datahub-web-react/src/app/domainV2/nestedDomains/DomainsSidebarHeader.tsx index 5c0ef7c78e..7f4f654b3a 100644 --- a/datahub-web-react/src/app/domainV2/nestedDomains/DomainsSidebarHeader.tsx +++ b/datahub-web-react/src/app/domainV2/nestedDomains/DomainsSidebarHeader.tsx @@ -1,9 +1,10 @@ import { useApolloClient } from '@apollo/client'; -import { Tooltip, Button } from '@components'; +import { Button, Tooltip } from '@components'; import React, { useState } from 'react'; import styled from 'styled-components'; -import CreateDomainModal from '../CreateDomainModal'; -import { updateListDomainsCache } from '../utils'; + +import CreateDomainModal from '@app/domainV2/CreateDomainModal'; +import { updateListDomainsCache } from '@app/domainV2/utils'; const Wrapper = styled.div` font-size: 20px; diff --git a/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsPageV2.tsx b/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsPageV2.tsx index 62a8f9b115..2efd0ab791 100644 --- a/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsPageV2.tsx +++ b/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsPageV2.tsx @@ -1,15 +1,16 @@ -import React, { useEffect, useState } from 'react'; -import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { Button } from '@src/alchemy-components'; -import styled from 'styled-components/macro'; -import { PageTitle } from '@src/alchemy-components/components/PageTitle'; import { useApolloClient } from '@apollo/client'; -import RootDomains from './RootDomains'; -import { DOMAINS_CREATE_DOMAIN_ID, DOMAINS_INTRO_ID } from '../../onboarding/config/DomainsOnboardingConfig'; -import { OnboardingTour } from '../../onboarding/OnboardingTour'; -import CreateDomainModal from '../CreateDomainModal'; -import { updateListDomainsCache } from '../utils'; -import { useDomainsContext as useDomainsContextV2 } from '../DomainsContext'; +import React, { useEffect, useState } from 'react'; +import styled from 'styled-components/macro'; + +import CreateDomainModal from '@app/domainV2/CreateDomainModal'; +import { useDomainsContext as useDomainsContextV2 } from '@app/domainV2/DomainsContext'; +import RootDomains from '@app/domainV2/nestedDomains/RootDomains'; +import { updateListDomainsCache } from '@app/domainV2/utils'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; +import { DOMAINS_CREATE_DOMAIN_ID, DOMAINS_INTRO_ID } from '@app/onboarding/config/DomainsOnboardingConfig'; +import { Button } from '@src/alchemy-components'; +import { PageTitle } from '@src/alchemy-components/components/PageTitle'; +import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; const PageWrapper = styled.div<{ $isShowNavBarRedesign?: boolean }>` background-color: #ffffff; diff --git a/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsSidebar.tsx b/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsSidebar.tsx index 6c2347c497..06c2b60dfc 100644 --- a/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsSidebar.tsx +++ b/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsSidebar.tsx @@ -1,12 +1,13 @@ +import { Button } from '@components'; +import { Divider } from 'antd'; import React, { useCallback, useState } from 'react'; import styled from 'styled-components'; -import { Divider } from 'antd'; -import { Button } from '@components'; + +import DomainSearch from '@app/domainV2/DomainSearch'; +import DomainsSidebarHeader from '@app/domainV2/nestedDomains/DomainsSidebarHeader'; +import DomainNavigator from '@app/domainV2/nestedDomains/domainNavigator/DomainNavigator'; +import useSidebarWidth from '@app/sharedV2/sidebar/useSidebarWidth'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import useSidebarWidth from '../../sharedV2/sidebar/useSidebarWidth'; -import DomainsSidebarHeader from './DomainsSidebarHeader'; -import DomainNavigator from './domainNavigator/DomainNavigator'; -import DomainSearch from '../DomainSearch'; const PLATFORM_BROWSE_TRANSITION_MS = 300; diff --git a/datahub-web-react/src/app/domainV2/nestedDomains/RootDomains.tsx b/datahub-web-react/src/app/domainV2/nestedDomains/RootDomains.tsx index da76310b43..a971cd0c75 100644 --- a/datahub-web-react/src/app/domainV2/nestedDomains/RootDomains.tsx +++ b/datahub-web-react/src/app/domainV2/nestedDomains/RootDomains.tsx @@ -1,12 +1,14 @@ +import { ReadOutlined } from '@ant-design/icons'; import React from 'react'; import styled from 'styled-components'; -import { ReadOutlined } from '@ant-design/icons'; -import { Message } from '../../shared/Message'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { EntityType } from '../../../types.generated'; -import useListDomains from '../useListDomains'; -import EmptyDomainsSection from '../EmptyDomainsSection'; -import EmptyDomainDescription from '../EmptyDomainDescription'; + +import EmptyDomainDescription from '@app/domainV2/EmptyDomainDescription'; +import EmptyDomainsSection from '@app/domainV2/EmptyDomainsSection'; +import useListDomains from '@app/domainV2/useListDomains'; +import { Message } from '@app/shared/Message'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const DomainsWrapper = styled.div` overflow: auto; diff --git a/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNavigator.tsx b/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNavigator.tsx index aac78e744c..36a2f05435 100644 --- a/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNavigator.tsx +++ b/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNavigator.tsx @@ -1,10 +1,12 @@ import { Alert, Empty } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import useListDomains from '../../useListDomains'; -import DomainNode from './DomainNode'; -import { Domain } from '../../../../types.generated'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; + +import DomainNode from '@app/domainV2/nestedDomains/domainNavigator/DomainNode'; +import useListDomains from '@app/domainV2/useListDomains'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; + +import { Domain } from '@types'; const NavigatorWrapper = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNode.tsx b/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNode.tsx index 482ec1f7f5..b457a3841f 100644 --- a/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNode.tsx +++ b/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNode.tsx @@ -1,17 +1,19 @@ +import { Tooltip, colors } from '@components'; import { Typography } from 'antd'; -import { colors, Tooltip } from '@components'; import React, { useEffect, useMemo } from 'react'; import { useHistory } from 'react-router'; import styled from 'styled-components'; -import { Domain } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { RotatingTriangle } from '../../../sharedV2/sidebar/components'; -import useListDomains from '../../useListDomains'; -import useToggle from '../../../shared/useToggle'; -import { BodyContainer, BodyGridExpander } from '../../../shared/components'; -import { useDomainsContext as useDomainsContextV2 } from '../../DomainsContext'; -import { DomainColoredIcon } from '../../../entityV2/shared/links/DomainColoredIcon'; -import { REDESIGN_COLORS, SEARCH_COLORS } from '../../../entityV2/shared/constants'; + +import { useDomainsContext as useDomainsContextV2 } from '@app/domainV2/DomainsContext'; +import useListDomains from '@app/domainV2/useListDomains'; +import { REDESIGN_COLORS, SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { DomainColoredIcon } from '@app/entityV2/shared/links/DomainColoredIcon'; +import { BodyContainer, BodyGridExpander } from '@app/shared/components'; +import useToggle from '@app/shared/useToggle'; +import { RotatingTriangle } from '@app/sharedV2/sidebar/components'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Domain } from '@types'; const Count = styled.div` color: ${colors.gray[1700]}; diff --git a/datahub-web-react/src/app/domainV2/useListDomains.tsx b/datahub-web-react/src/app/domainV2/useListDomains.tsx index 74f6b454f1..322a98effe 100644 --- a/datahub-web-react/src/app/domainV2/useListDomains.tsx +++ b/datahub-web-react/src/app/domainV2/useListDomains.tsx @@ -1,5 +1,6 @@ -import { useListDomainsQuery } from '../../graphql/domain.generated'; -import { useSortedDomains } from './utils'; +import { useSortedDomains } from '@app/domainV2/utils'; + +import { useListDomainsQuery } from '@graphql/domain.generated'; interface Props { parentDomain?: string; diff --git a/datahub-web-react/src/app/domainV2/utils.ts b/datahub-web-react/src/app/domainV2/utils.ts index 2e294189df..50c18349b1 100644 --- a/datahub-web-react/src/app/domainV2/utils.ts +++ b/datahub-web-react/src/app/domainV2/utils.ts @@ -1,13 +1,15 @@ import { ApolloClient } from '@apollo/client'; -import { useEffect } from 'react'; import { isEqual } from 'lodash'; -import { ListDomainsDocument, ListDomainsQuery } from '../../graphql/domain.generated'; -import { Entity, EntityType } from '../../types.generated'; -import { GenericEntityProperties } from '../entity/shared/types'; -import usePrevious from '../shared/usePrevious'; -import { useDomainsContext } from './DomainsContext'; -import { useEntityRegistry } from '../useEntityRegistry'; -import EntityRegistry from '../entity/EntityRegistry'; +import { useEffect } from 'react'; + +import { useDomainsContext } from '@app/domainV2/DomainsContext'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import usePrevious from '@app/shared/usePrevious'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { ListDomainsDocument, ListDomainsQuery } from '@graphql/domain.generated'; +import { Entity, EntityType } from '@types'; /** * Add an entry to the list domains cache. diff --git a/datahub-web-react/src/app/embed/EmbeddedPage.tsx b/datahub-web-react/src/app/embed/EmbeddedPage.tsx index 29d62bc201..fe22904eb2 100644 --- a/datahub-web-react/src/app/embed/EmbeddedPage.tsx +++ b/datahub-web-react/src/app/embed/EmbeddedPage.tsx @@ -1,16 +1,18 @@ import React, { useEffect } from 'react'; import { useParams } from 'react-router'; import styled from 'styled-components/macro'; -import { useGetGrantedPrivilegesQuery } from '../../graphql/policy.generated'; -import { EntityType } from '../../types.generated'; -import { UnauthorizedPage } from '../authorization/UnauthorizedPage'; -import { VIEW_ENTITY_PAGE } from '../entity/shared/constants'; -import { decodeUrn } from '../entity/shared/utils'; -import CompactContext from '../shared/CompactContext'; -import { useEntityRegistry } from '../useEntityRegistry'; -import analytics from '../analytics/analytics'; -import { EventType } from '../analytics'; -import { useUserContext } from '../context/useUserContext'; + +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import { UnauthorizedPage } from '@app/authorization/UnauthorizedPage'; +import { useUserContext } from '@app/context/useUserContext'; +import { VIEW_ENTITY_PAGE } from '@app/entity/shared/constants'; +import { decodeUrn } from '@app/entity/shared/utils'; +import CompactContext from '@app/shared/CompactContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetGrantedPrivilegesQuery } from '@graphql/policy.generated'; +import { EntityType } from '@types'; const EmbeddedPageWrapper = styled.div` max-height: 100%; diff --git a/datahub-web-react/src/app/embed/lookup/EmbedLookup.tsx b/datahub-web-react/src/app/embed/lookup/EmbedLookup.tsx index f3110a7049..d033ac0f5e 100644 --- a/datahub-web-react/src/app/embed/lookup/EmbedLookup.tsx +++ b/datahub-web-react/src/app/embed/lookup/EmbedLookup.tsx @@ -1,11 +1,12 @@ +import { LoadingOutlined } from '@ant-design/icons'; import React, { useEffect } from 'react'; import { useHistory, useParams } from 'react-router'; import styled from 'styled-components'; -import { LoadingOutlined } from '@ant-design/icons'; -import { ErrorSection } from '../../shared/error/ErrorSection'; -import useGetEntityByUrl from './useGetEntityByUrl'; -import LookupNotFound from './LookupNotFound'; -import LookupFoundMultiple from './LookupFoundMultiple'; + +import LookupFoundMultiple from '@app/embed/lookup/LookupFoundMultiple'; +import LookupNotFound from '@app/embed/lookup/LookupNotFound'; +import useGetEntityByUrl from '@app/embed/lookup/useGetEntityByUrl'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; const PageContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/embed/lookup/LookupFoundMultiple.tsx b/datahub-web-react/src/app/embed/lookup/LookupFoundMultiple.tsx index 5e0e5f65af..0a6f261335 100644 --- a/datahub-web-react/src/app/embed/lookup/LookupFoundMultiple.tsx +++ b/datahub-web-react/src/app/embed/lookup/LookupFoundMultiple.tsx @@ -1,6 +1,7 @@ import React, { useEffect } from 'react'; -import useEmbedLookupAnalytics from './useEmbedAnalytics'; -import NonExistentEntityPage from '../../entity/shared/entity/NonExistentEntityPage'; + +import useEmbedLookupAnalytics from '@app/embed/lookup/useEmbedAnalytics'; +import NonExistentEntityPage from '@app/entity/shared/entity/NonExistentEntityPage'; const LookupFoundMultiple = ({ url }: { url: string }) => { const { trackLookupMultipleFoundEvent } = useEmbedLookupAnalytics(); diff --git a/datahub-web-react/src/app/embed/lookup/LookupNotFound.tsx b/datahub-web-react/src/app/embed/lookup/LookupNotFound.tsx index a9ac735aa0..9e69a46c40 100644 --- a/datahub-web-react/src/app/embed/lookup/LookupNotFound.tsx +++ b/datahub-web-react/src/app/embed/lookup/LookupNotFound.tsx @@ -1,6 +1,7 @@ import React, { useEffect } from 'react'; -import useEmbedLookupAnalytics from './useEmbedAnalytics'; -import NonExistentEntityPage from '../../entity/shared/entity/NonExistentEntityPage'; + +import useEmbedLookupAnalytics from '@app/embed/lookup/useEmbedAnalytics'; +import NonExistentEntityPage from '@app/entity/shared/entity/NonExistentEntityPage'; const LookupNotFound = ({ url }: { url: string }) => { const { trackLookupNotFoundEvent } = useEmbedLookupAnalytics(); diff --git a/datahub-web-react/src/app/embed/lookup/index.tsx b/datahub-web-react/src/app/embed/lookup/index.tsx index ae1764a0b4..e6d8b7fdd5 100644 --- a/datahub-web-react/src/app/embed/lookup/index.tsx +++ b/datahub-web-react/src/app/embed/lookup/index.tsx @@ -1,3 +1,3 @@ -import EmbedLookup from './EmbedLookup'; +import EmbedLookup from '@app/embed/lookup/EmbedLookup'; export default EmbedLookup; diff --git a/datahub-web-react/src/app/embed/lookup/useEmbedAnalytics.ts b/datahub-web-react/src/app/embed/lookup/useEmbedAnalytics.ts index 41c6e36b30..02ccc71dd4 100644 --- a/datahub-web-react/src/app/embed/lookup/useEmbedAnalytics.ts +++ b/datahub-web-react/src/app/embed/lookup/useEmbedAnalytics.ts @@ -1,7 +1,8 @@ import { useCallback } from 'react'; -import analytics from '../../analytics/analytics'; -import { EventType } from '../../analytics'; -import { EMBED_LOOKUP_NOT_FOUND_REASON } from './constants'; + +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import { EMBED_LOOKUP_NOT_FOUND_REASON } from '@app/embed/lookup/constants'; const useEmbedLookupAnalytics = () => { const trackLookupNotFoundEvent = useCallback((url: string) => { diff --git a/datahub-web-react/src/app/embed/lookup/useGetEntityByUrl.ts b/datahub-web-react/src/app/embed/lookup/useGetEntityByUrl.ts index 49136c39fd..bec809a5e5 100644 --- a/datahub-web-react/src/app/embed/lookup/useGetEntityByUrl.ts +++ b/datahub-web-react/src/app/embed/lookup/useGetEntityByUrl.ts @@ -1,10 +1,11 @@ -import { useGetSearchResultsForMultipleQuery } from '../../../graphql/search.generated'; -import { FilterOperator } from '../../../types.generated'; -import { UnionType } from '../../search/utils/constants'; -import { generateOrFilters } from '../../search/utils/generateOrFilters'; -import { PageRoutes } from '../../../conf/Global'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { urlEncodeUrn } from '../../entity/shared/utils'; +import { urlEncodeUrn } from '@app/entity/shared/utils'; +import { UnionType } from '@app/search/utils/constants'; +import { generateOrFilters } from '@app/search/utils/generateOrFilters'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { FilterOperator } from '@types'; const URL_FIELDS = ['externalUrl', 'chartUrl', 'dashboardUrl'] as const; diff --git a/datahub-web-react/src/app/entity/Access/RoleEntity.tsx b/datahub-web-react/src/app/entity/Access/RoleEntity.tsx index 58a1ba8dd7..5f9c7d8f51 100644 --- a/datahub-web-react/src/app/entity/Access/RoleEntity.tsx +++ b/datahub-web-react/src/app/entity/Access/RoleEntity.tsx @@ -1,13 +1,15 @@ -import { TagOutlined, TagFilled } from '@ant-design/icons'; +import { TagFilled, TagOutlined } from '@ant-design/icons'; import * as React from 'react'; import styled from 'styled-components'; -import { Role, EntityType, SearchResult } from '../../../types.generated'; -import DefaultPreviewCard from '../../preview/DefaultPreviewCard'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { urlEncodeUrn } from '../shared/utils'; -import RoleEntityProfile from './RoleEntityProfile'; -import { useGetExternalRoleQuery } from '../../../graphql/accessrole.generated'; + +import RoleEntityProfile from '@app/entity/Access/RoleEntityProfile'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { urlEncodeUrn } from '@app/entity/shared/utils'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; + +import { useGetExternalRoleQuery } from '@graphql/accessrole.generated'; +import { EntityType, Role, SearchResult } from '@types'; const PreviewTagIcon = styled(TagOutlined)` font-size: 20px; diff --git a/datahub-web-react/src/app/entity/Access/RoleEntityProfile.tsx b/datahub-web-react/src/app/entity/Access/RoleEntityProfile.tsx index d8a31700fb..0d75fcc833 100644 --- a/datahub-web-react/src/app/entity/Access/RoleEntityProfile.tsx +++ b/datahub-web-react/src/app/entity/Access/RoleEntityProfile.tsx @@ -1,13 +1,13 @@ -import React from 'react'; - -import { useParams } from 'react-router'; -import { Divider, Typography } from 'antd'; import { grey } from '@ant-design/colors'; +import { Divider, Typography } from 'antd'; +import React from 'react'; +import { useParams } from 'react-router'; import styled from 'styled-components'; -import { Message } from '../../shared/Message'; -import { decodeUrn } from '../shared/utils'; -import { useGetExternalRoleQuery } from '../../../graphql/accessrole.generated'; +import { decodeUrn } from '@app/entity/shared/utils'; +import { Message } from '@app/shared/Message'; + +import { useGetExternalRoleQuery } from '@graphql/accessrole.generated'; const PageContainer = styled.div` padding: 32px 100px; diff --git a/datahub-web-react/src/app/entity/Entity.tsx b/datahub-web-react/src/app/entity/Entity.tsx index 37a63e9971..a142e67997 100644 --- a/datahub-web-react/src/app/entity/Entity.tsx +++ b/datahub-web-react/src/app/entity/Entity.tsx @@ -1,7 +1,9 @@ import { QueryHookOptions, QueryResult } from '@apollo/client'; -import { EntityType, Exact, SearchResult } from '../../types.generated'; -import { FetchedEntity } from '../lineage/types'; -import { EntitySidebarSection, GenericEntityProperties } from './shared/types'; + +import { EntitySidebarSection, GenericEntityProperties } from '@app/entity/shared/types'; +import { FetchedEntity } from '@app/lineage/types'; + +import { EntityType, Exact, SearchResult } from '@types'; export enum PreviewType { /** diff --git a/datahub-web-react/src/app/entity/EntityPage.tsx b/datahub-web-react/src/app/entity/EntityPage.tsx index d05f75694a..849592853d 100644 --- a/datahub-web-react/src/app/entity/EntityPage.tsx +++ b/datahub-web-react/src/app/entity/EntityPage.tsx @@ -1,17 +1,19 @@ import React, { useEffect } from 'react'; import { useParams } from 'react-router-dom'; -import { EntityType } from '../../types.generated'; -import { BrowsableEntityPage } from '../browse/BrowsableEntityPage'; -import LineageExplorer from '../lineage/LineageExplorer'; -import useIsLineageMode from '../lineage/utils/useIsLineageMode'; -import { useEntityRegistry } from '../useEntityRegistry'; -import analytics, { EventType } from '../analytics'; -import { decodeUrn } from './shared/utils'; -import { useGetGrantedPrivilegesQuery } from '../../graphql/policy.generated'; -import { UnauthorizedPage } from '../authorization/UnauthorizedPage'; -import { ErrorSection } from '../shared/error/ErrorSection'; -import { VIEW_ENTITY_PAGE } from './shared/constants'; -import { useUserContext } from '../context/useUserContext'; + +import analytics, { EventType } from '@app/analytics'; +import { UnauthorizedPage } from '@app/authorization/UnauthorizedPage'; +import { BrowsableEntityPage } from '@app/browse/BrowsableEntityPage'; +import { useUserContext } from '@app/context/useUserContext'; +import { VIEW_ENTITY_PAGE } from '@app/entity/shared/constants'; +import { decodeUrn } from '@app/entity/shared/utils'; +import LineageExplorer from '@app/lineage/LineageExplorer'; +import useIsLineageMode from '@app/lineage/utils/useIsLineageMode'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetGrantedPrivilegesQuery } from '@graphql/policy.generated'; +import { EntityType } from '@types'; interface RouteParams { urn: string; diff --git a/datahub-web-react/src/app/entity/EntityRegistry.tsx b/datahub-web-react/src/app/entity/EntityRegistry.tsx index 7aed83440f..3440549280 100644 --- a/datahub-web-react/src/app/entity/EntityRegistry.tsx +++ b/datahub-web-react/src/app/entity/EntityRegistry.tsx @@ -1,13 +1,15 @@ import { QueryHookOptions, QueryResult } from '@apollo/client'; import React from 'react'; -import { Entity as EntityInterface, EntityType, Exact, SearchResult } from '../../types.generated'; -import { FetchedEntity } from '../lineage/types'; -import { SearchResultProvider } from '../search/context/SearchResultContext'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from './Entity'; -import { GLOSSARY_ENTITY_TYPES } from './shared/constants'; -import { EntitySidebarSection, GenericEntityProperties } from './shared/types'; -import { dictToQueryStringParams, getFineGrainedLineageWithSiblings, urlEncodeUrn } from './shared/utils'; -import PreviewContext from './shared/PreviewContext'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import PreviewContext from '@app/entity/shared/PreviewContext'; +import { GLOSSARY_ENTITY_TYPES } from '@app/entity/shared/constants'; +import { EntitySidebarSection, GenericEntityProperties } from '@app/entity/shared/types'; +import { dictToQueryStringParams, getFineGrainedLineageWithSiblings, urlEncodeUrn } from '@app/entity/shared/utils'; +import { FetchedEntity } from '@app/lineage/types'; +import { SearchResultProvider } from '@app/search/context/SearchResultContext'; + +import { Entity as EntityInterface, EntityType, Exact, SearchResult } from '@types'; function validatedGet(key: K, map: Map): V { if (map.has(key)) { diff --git a/datahub-web-react/src/app/entity/businessAttribute/BusinessAttributeEntity.tsx b/datahub-web-react/src/app/entity/businessAttribute/BusinessAttributeEntity.tsx index 442aaf7355..d2cad8f094 100644 --- a/datahub-web-react/src/app/entity/businessAttribute/BusinessAttributeEntity.tsx +++ b/datahub-web-react/src/app/entity/businessAttribute/BusinessAttributeEntity.tsx @@ -1,20 +1,22 @@ -import * as React from 'react'; import { GlobalOutlined } from '@ant-design/icons'; -import { BusinessAttribute, EntityType, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { useGetBusinessAttributeQuery } from '../../../graphql/businessAttribute.generated'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { Preview } from './preview/Preview'; -import { PageRoutes } from '../../../conf/Global'; -import BusinessAttributeRelatedEntity from './profile/BusinessAttributeRelatedEntity'; -import { BusinessAttributeDataTypeSection } from './profile/BusinessAttributeDataTypeSection'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/businessAttribute/preview/Preview'; +import { BusinessAttributeDataTypeSection } from '@app/entity/businessAttribute/profile/BusinessAttributeDataTypeSection'; +import BusinessAttributeRelatedEntity from '@app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { PageRoutes } from '@conf/Global'; + +import { useGetBusinessAttributeQuery } from '@graphql/businessAttribute.generated'; +import { BusinessAttribute, EntityType, SearchResult } from '@types'; /** * Definition of datahub Business Attribute Entity diff --git a/datahub-web-react/src/app/entity/businessAttribute/preview/Preview.tsx b/datahub-web-react/src/app/entity/businessAttribute/preview/Preview.tsx index 323c287a0a..5fad4ea1bf 100644 --- a/datahub-web-react/src/app/entity/businessAttribute/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/businessAttribute/preview/Preview.tsx @@ -1,11 +1,13 @@ -import React from 'react'; import { GlobalOutlined } from '@ant-design/icons'; -import { EntityType, Owner } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; -import UrlButton from '../../shared/UrlButton'; -import { getRelatedEntitiesUrl } from '../../../businessAttribute/businessAttributeUtils'; +import React from 'react'; + +import { getRelatedEntitiesUrl } from '@app/businessAttribute/businessAttributeUtils'; +import { IconStyleType, PreviewType } from '@app/entity/Entity'; +import UrlButton from '@app/entity/shared/UrlButton'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, Owner } from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entity/businessAttribute/preview/_tests_/Preview.test.tsx b/datahub-web-react/src/app/entity/businessAttribute/preview/_tests_/Preview.test.tsx index bca32de985..a9875df325 100644 --- a/datahub-web-react/src/app/entity/businessAttribute/preview/_tests_/Preview.test.tsx +++ b/datahub-web-react/src/app/entity/businessAttribute/preview/_tests_/Preview.test.tsx @@ -1,10 +1,11 @@ import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import React from 'react'; -import { mocks } from '../../../../../Mocks'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { Preview } from '../Preview'; -import { PreviewType } from '../../../Entity'; + +import { PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/businessAttribute/preview/Preview'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('Preview', () => { it('renders', () => { diff --git a/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx b/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx index da2b108c2d..badfb71883 100644 --- a/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx +++ b/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx @@ -1,11 +1,13 @@ -import { Button, message, Select } from 'antd'; import { EditOutlined } from '@ant-design/icons'; +import { Button, Select, message } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { useEntityData, useRefetch } from '../../shared/EntityContext'; -import { SidebarHeader } from '../../shared/containers/profile/sidebar/SidebarHeader'; -import { useUpdateBusinessAttributeMutation } from '../../../../graphql/businessAttribute.generated'; -import { SchemaFieldDataType } from '../../../businessAttribute/businessAttributeUtils'; + +import { SchemaFieldDataType } from '@app/businessAttribute/businessAttributeUtils'; +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; + +import { useUpdateBusinessAttributeMutation } from '@graphql/businessAttribute.generated'; interface Props { readOnly?: boolean; diff --git a/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx b/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx index a73b36d692..7cce43befb 100644 --- a/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx +++ b/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; -import { UnionType } from '../../../search/utils/constants'; -import { EmbeddedListSearchSection } from '../../shared/components/styled/search/EmbeddedListSearchSection'; -import { useEntityData } from '../../shared/EntityContext'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection'; +import { UnionType } from '@app/search/utils/constants'; export default function BusinessAttributeRelatedEntity() { const { entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entity/chart/ChartEntity.tsx b/datahub-web-react/src/app/entity/chart/ChartEntity.tsx index b20116f615..1e6a3427ee 100644 --- a/datahub-web-react/src/app/entity/chart/ChartEntity.tsx +++ b/datahub-web-react/src/app/entity/chart/ChartEntity.tsx @@ -1,35 +1,36 @@ import { LineChartOutlined } from '@ant-design/icons'; import * as React from 'react'; -import { Chart, EntityType, LineageDirection, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { ChartPreview } from './preview/ChartPreview'; -import { GetChartQuery, useGetChartQuery, useUpdateChartMutation } from '../../../graphql/chart.generated'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { GenericEntityProperties } from '../shared/types'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { ChartDashboardsTab } from '../shared/tabs/Entity/ChartDashboardsTab'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import { ChartStatsSummarySubHeader } from './profile/stats/ChartStatsSummarySubHeader'; -import { InputFieldsTab } from '../shared/tabs/Entity/InputFieldsTab'; -import { EmbedTab } from '../shared/tabs/Embed/EmbedTab'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { getDataProduct } from '../shared/utils'; -import EmbeddedProfile from '../shared/embed/EmbeddedProfile'; -import { LOOKER_URN } from '../../ingest/source/builder/constants'; -import { MatchedFieldList } from '../../search/matches/MatchedFieldList'; -import { matchedInputFieldRenderer } from '../../search/matches/matchedInputFieldRenderer'; -import { IncidentTab } from '../shared/tabs/Incident/IncidentTab'; -import { ChartQueryTab } from './ChartQueryTab'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { ChartQueryTab } from '@app/entity/chart/ChartQueryTab'; +import { ChartPreview } from '@app/entity/chart/preview/ChartPreview'; +import { ChartStatsSummarySubHeader } from '@app/entity/chart/profile/stats/ChartStatsSummarySubHeader'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import EmbeddedProfile from '@app/entity/shared/embed/EmbeddedProfile'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { EmbedTab } from '@app/entity/shared/tabs/Embed/EmbedTab'; +import { ChartDashboardsTab } from '@app/entity/shared/tabs/Entity/ChartDashboardsTab'; +import { InputFieldsTab } from '@app/entity/shared/tabs/Entity/InputFieldsTab'; +import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab'; +import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getDataProduct } from '@app/entity/shared/utils'; +import { LOOKER_URN } from '@app/ingest/source/builder/constants'; +import { MatchedFieldList } from '@app/search/matches/MatchedFieldList'; +import { matchedInputFieldRenderer } from '@app/search/matches/matchedInputFieldRenderer'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { GetChartQuery, useGetChartQuery, useUpdateChartMutation } from '@graphql/chart.generated'; +import { Chart, EntityType, LineageDirection, SearchResult } from '@types'; /** * Definition of the DataHub Chart entity. diff --git a/datahub-web-react/src/app/entity/chart/ChartQueryTab.tsx b/datahub-web-react/src/app/entity/chart/ChartQueryTab.tsx index 7c28f4be88..02bd34aa1d 100644 --- a/datahub-web-react/src/app/entity/chart/ChartQueryTab.tsx +++ b/datahub-web-react/src/app/entity/chart/ChartQueryTab.tsx @@ -1,11 +1,13 @@ import { Typography } from 'antd'; import React from 'react'; -import styled from 'styled-components'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; -import { GetChartQuery } from '../../../graphql/chart.generated'; -import { ANTD_GRAY } from '../shared/constants'; -import { useBaseEntity } from '../shared/EntityContext'; -import { InfoItem } from '../shared/components/styled/InfoItem'; +import styled from 'styled-components'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { InfoItem } from '@app/entity/shared/components/styled/InfoItem'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; + +import { GetChartQuery } from '@graphql/chart.generated'; const InfoSection = styled.div` border-bottom: 1px solid ${ANTD_GRAY[4.5]}; diff --git a/datahub-web-react/src/app/entity/chart/preview/ChartPreview.tsx b/datahub-web-react/src/app/entity/chart/preview/ChartPreview.tsx index adb75aa704..bdc5e81b60 100644 --- a/datahub-web-react/src/app/entity/chart/preview/ChartPreview.tsx +++ b/datahub-web-react/src/app/entity/chart/preview/ChartPreview.tsx @@ -1,25 +1,27 @@ import React from 'react'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ChartStatsSummary as ChartStatsSummaryView } from '@app/entity/chart/shared/ChartStatsSummary'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { AccessLevel, - Domain, + ChartStatsSummary, Container, + DataProduct, + Deprecation, + Domain, + EntityPath, EntityType, GlobalTags, GlossaryTerms, - Owner, - SearchInsight, - ParentContainersResult, - Deprecation, - ChartStatsSummary, - DataProduct, - EntityPath, Health, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; -import { ChartStatsSummary as ChartStatsSummaryView } from '../shared/ChartStatsSummary'; + Owner, + ParentContainersResult, + SearchInsight, +} from '@types'; export const ChartPreview = ({ urn, diff --git a/datahub-web-react/src/app/entity/chart/profile/stats/ChartStatsSummarySubHeader.tsx b/datahub-web-react/src/app/entity/chart/profile/stats/ChartStatsSummarySubHeader.tsx index 8fbabe8429..336fb1f1d0 100644 --- a/datahub-web-react/src/app/entity/chart/profile/stats/ChartStatsSummarySubHeader.tsx +++ b/datahub-web-react/src/app/entity/chart/profile/stats/ChartStatsSummarySubHeader.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { ChartStatsSummary as ChartStatsSummaryObj } from '../../../../../types.generated'; -import { useBaseEntity } from '../../../shared/EntityContext'; -import { GetChartQuery } from '../../../../../graphql/chart.generated'; -import { ChartStatsSummary } from '../../shared/ChartStatsSummary'; + +import { ChartStatsSummary } from '@app/entity/chart/shared/ChartStatsSummary'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; + +import { GetChartQuery } from '@graphql/chart.generated'; +import { ChartStatsSummary as ChartStatsSummaryObj } from '@types'; export const ChartStatsSummarySubHeader = () => { const result = useBaseEntity(); diff --git a/datahub-web-react/src/app/entity/chart/shared/ChartStatsSummary.tsx b/datahub-web-react/src/app/entity/chart/shared/ChartStatsSummary.tsx index 566a9f9db5..d5cf88b4a8 100644 --- a/datahub-web-react/src/app/entity/chart/shared/ChartStatsSummary.tsx +++ b/datahub-web-react/src/app/entity/chart/shared/ChartStatsSummary.tsx @@ -1,13 +1,14 @@ +import { ClockCircleOutlined, EyeOutlined, QuestionCircleOutlined, TeamOutlined } from '@ant-design/icons'; +import { Popover, Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Popover, Tooltip } from 'antd'; -import { ClockCircleOutlined, EyeOutlined, TeamOutlined, QuestionCircleOutlined } from '@ant-design/icons'; -import { formatNumberWithoutAbbreviation } from '../../../shared/formatNumber'; -import { ANTD_GRAY } from '../../shared/constants'; -import { toLocalDateTimeString, toRelativeTimeString } from '../../../shared/time/timeUtils'; -import { StatsSummary } from '../../shared/components/styled/StatsSummary'; -import { countFormatter, needsFormatting } from '../../../../utils/formatter'; -import ExpandingStat from '../../dataset/shared/ExpandingStat'; + +import ExpandingStat from '@app/entity/dataset/shared/ExpandingStat'; +import { StatsSummary } from '@app/entity/shared/components/styled/StatsSummary'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils'; +import { countFormatter, needsFormatting } from '@utils/formatter'; const StatText = styled.span` color: ${ANTD_GRAY[8]}; diff --git a/datahub-web-react/src/app/entity/container/ContainerEntitiesTab.tsx b/datahub-web-react/src/app/entity/container/ContainerEntitiesTab.tsx index 96a64688bf..ac3864fc0c 100644 --- a/datahub-web-react/src/app/entity/container/ContainerEntitiesTab.tsx +++ b/datahub-web-react/src/app/entity/container/ContainerEntitiesTab.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { useEntityData } from '../shared/EntityContext'; -import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection'; -import { UnionType } from '../../search/utils/constants'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection'; +import { UnionType } from '@app/search/utils/constants'; export const ContainerEntitiesTab = () => { const { urn } = useEntityData(); diff --git a/datahub-web-react/src/app/entity/container/ContainerEntity.tsx b/datahub-web-react/src/app/entity/container/ContainerEntity.tsx index 557f52146e..d0ff8f4caf 100644 --- a/datahub-web-react/src/app/entity/container/ContainerEntity.tsx +++ b/datahub-web-react/src/app/entity/container/ContainerEntity.tsx @@ -1,25 +1,27 @@ -import * as React from 'react'; import { FolderOutlined } from '@ant-design/icons'; -import { Container, EntityType, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { Preview } from './preview/Preview'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { useGetContainerQuery, GetContainerQuery } from '../../../graphql/container.generated'; -import { ContainerEntitiesTab } from './ContainerEntitiesTab'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { getDataProduct } from '../shared/utils'; -import EmbeddedProfile from '../shared/embed/EmbeddedProfile'; -import AccessManagement from '../shared/tabs/Dataset/AccessManagement/AccessManagement'; -import { useAppConfig } from '../../useAppConfig'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { ContainerEntitiesTab } from '@app/entity/container/ContainerEntitiesTab'; +import { Preview } from '@app/entity/container/preview/Preview'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import EmbeddedProfile from '@app/entity/shared/embed/EmbeddedProfile'; +import AccessManagement from '@app/entity/shared/tabs/Dataset/AccessManagement/AccessManagement'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { getDataProduct } from '@app/entity/shared/utils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useAppConfig } from '@app/useAppConfig'; + +import { GetContainerQuery, useGetContainerQuery } from '@graphql/container.generated'; +import { Container, EntityType, SearchResult } from '@types'; /** * Definition of the DataHub Container entity. diff --git a/datahub-web-react/src/app/entity/container/preview/Preview.tsx b/datahub-web-react/src/app/entity/container/preview/Preview.tsx index fb1bd8f567..746171354f 100644 --- a/datahub-web-react/src/app/entity/container/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/container/preview/Preview.tsx @@ -1,25 +1,27 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { Container, + DataProduct, + Deprecation, + Domain, + EntityPath, EntityType, + GlobalTags, + GlossaryTerms, Owner, + ParentContainersResult, SearchInsight, SubTypes, - Domain, - ParentContainersResult, - GlobalTags, - Deprecation, - GlossaryTerms, - DataProduct, - EntityPath, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; -import { ANTD_GRAY } from '../../shared/constants'; +} from '@types'; const StatText = styled(Typography.Text)` color: ${ANTD_GRAY[8]}; diff --git a/datahub-web-react/src/app/entity/dashboard/DashboardEntity.tsx b/datahub-web-react/src/app/entity/dashboard/DashboardEntity.tsx index c35b1f90ee..64409b5bfb 100644 --- a/datahub-web-react/src/app/entity/dashboard/DashboardEntity.tsx +++ b/datahub-web-react/src/app/entity/dashboard/DashboardEntity.tsx @@ -1,38 +1,35 @@ import { DashboardFilled, DashboardOutlined } from '@ant-design/icons'; import * as React from 'react'; -import { - GetDashboardQuery, - useGetDashboardQuery, - useUpdateDashboardMutation, -} from '../../../graphql/dashboard.generated'; -import { Dashboard, EntityType, LineageDirection, OwnershipType, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { DashboardChartsTab } from '../shared/tabs/Entity/DashboardChartsTab'; -import { DashboardDatasetsTab } from '../shared/tabs/Entity/DashboardDatasetsTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { GenericEntityProperties } from '../shared/types'; -import { DashboardPreview } from './preview/DashboardPreview'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import { DashboardStatsSummarySubHeader } from './profile/DashboardStatsSummarySubHeader'; -import { EmbedTab } from '../shared/tabs/Embed/EmbedTab'; -import EmbeddedProfile from '../shared/embed/EmbeddedProfile'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { getDataProduct } from '../shared/utils'; -import { LOOKER_URN } from '../../ingest/source/builder/constants'; -import { MatchedFieldList } from '../../search/matches/MatchedFieldList'; -import { matchedInputFieldRenderer } from '../../search/matches/matchedInputFieldRenderer'; -import { IncidentTab } from '../shared/tabs/Incident/IncidentTab'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { DashboardPreview } from '@app/entity/dashboard/preview/DashboardPreview'; +import { DashboardStatsSummarySubHeader } from '@app/entity/dashboard/profile/DashboardStatsSummarySubHeader'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import EmbeddedProfile from '@app/entity/shared/embed/EmbeddedProfile'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { EmbedTab } from '@app/entity/shared/tabs/Embed/EmbedTab'; +import { DashboardChartsTab } from '@app/entity/shared/tabs/Entity/DashboardChartsTab'; +import { DashboardDatasetsTab } from '@app/entity/shared/tabs/Entity/DashboardDatasetsTab'; +import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab'; +import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getDataProduct } from '@app/entity/shared/utils'; +import { LOOKER_URN } from '@app/ingest/source/builder/constants'; +import { MatchedFieldList } from '@app/search/matches/MatchedFieldList'; +import { matchedInputFieldRenderer } from '@app/search/matches/matchedInputFieldRenderer'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { GetDashboardQuery, useGetDashboardQuery, useUpdateDashboardMutation } from '@graphql/dashboard.generated'; +import { Dashboard, EntityType, LineageDirection, OwnershipType, SearchResult } from '@types'; /** * Definition of the DataHub Dashboard entity. diff --git a/datahub-web-react/src/app/entity/dashboard/preview/DashboardPreview.tsx b/datahub-web-react/src/app/entity/dashboard/preview/DashboardPreview.tsx index 78e87b8f14..7c33434393 100644 --- a/datahub-web-react/src/app/entity/dashboard/preview/DashboardPreview.tsx +++ b/datahub-web-react/src/app/entity/dashboard/preview/DashboardPreview.tsx @@ -1,25 +1,27 @@ import React from 'react'; + +import { IconStyleType } from '@app/entity/Entity'; +import { DashboardStatsSummary as DashboardStatsSummaryView } from '@app/entity/dashboard/shared/DashboardStatsSummary'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { AccessLevel, - Domain, Container, + DashboardStatsSummary, + DataProduct, + Deprecation, + Domain, + EntityPath, EntityType, GlobalTags, GlossaryTerms, - Owner, - SearchInsight, - ParentContainersResult, - Deprecation, - DashboardStatsSummary, - DataProduct, - EntityPath, Health, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { IconStyleType } from '../../Entity'; -import { DashboardStatsSummary as DashboardStatsSummaryView } from '../shared/DashboardStatsSummary'; + Owner, + ParentContainersResult, + SearchInsight, +} from '@types'; export const DashboardPreview = ({ urn, diff --git a/datahub-web-react/src/app/entity/dashboard/profile/DashboardStatsSummarySubHeader.tsx b/datahub-web-react/src/app/entity/dashboard/profile/DashboardStatsSummarySubHeader.tsx index 9ce1fbe16e..9bd5771c0b 100644 --- a/datahub-web-react/src/app/entity/dashboard/profile/DashboardStatsSummarySubHeader.tsx +++ b/datahub-web-react/src/app/entity/dashboard/profile/DashboardStatsSummarySubHeader.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { DashboardStatsSummary as DashboardStatsSummaryObj } from '../../../../types.generated'; -import { useBaseEntity } from '../../shared/EntityContext'; -import { GetDashboardQuery } from '../../../../graphql/dashboard.generated'; -import { DashboardStatsSummary } from '../shared/DashboardStatsSummary'; + +import { DashboardStatsSummary } from '@app/entity/dashboard/shared/DashboardStatsSummary'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; + +import { GetDashboardQuery } from '@graphql/dashboard.generated'; +import { DashboardStatsSummary as DashboardStatsSummaryObj } from '@types'; export const DashboardStatsSummarySubHeader = () => { const result = useBaseEntity(); diff --git a/datahub-web-react/src/app/entity/dashboard/shared/DashboardStatsSummary.tsx b/datahub-web-react/src/app/entity/dashboard/shared/DashboardStatsSummary.tsx index a359d658d2..48f6488cb1 100644 --- a/datahub-web-react/src/app/entity/dashboard/shared/DashboardStatsSummary.tsx +++ b/datahub-web-react/src/app/entity/dashboard/shared/DashboardStatsSummary.tsx @@ -1,13 +1,14 @@ +import { ClockCircleOutlined, EyeOutlined, QuestionCircleOutlined, TeamOutlined } from '@ant-design/icons'; +import { Popover, Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Popover, Tooltip } from 'antd'; -import { ClockCircleOutlined, EyeOutlined, TeamOutlined, QuestionCircleOutlined } from '@ant-design/icons'; -import { formatNumberWithoutAbbreviation } from '../../../shared/formatNumber'; -import { ANTD_GRAY } from '../../shared/constants'; -import { toLocalDateTimeString, toRelativeTimeString } from '../../../shared/time/timeUtils'; -import { StatsSummary } from '../../shared/components/styled/StatsSummary'; -import { countFormatter, needsFormatting } from '../../../../utils/formatter'; -import ExpandingStat from '../../dataset/shared/ExpandingStat'; + +import ExpandingStat from '@app/entity/dataset/shared/ExpandingStat'; +import { StatsSummary } from '@app/entity/shared/components/styled/StatsSummary'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils'; +import { countFormatter, needsFormatting } from '@utils/formatter'; const StatText = styled.span` color: ${ANTD_GRAY[8]}; diff --git a/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx b/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx index 9e26bbadac..5ab90424f7 100644 --- a/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx +++ b/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx @@ -1,25 +1,27 @@ -import * as React from 'react'; import { ShareAltOutlined } from '@ant-design/icons'; -import { DataFlow, EntityType, OwnershipType, SearchResult } from '../../../types.generated'; -import { Preview } from './preview/Preview'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { useGetDataFlowQuery, useUpdateDataFlowMutation } from '../../../graphql/dataFlow.generated'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { GenericEntityProperties } from '../shared/types'; -import { DataFlowJobsTab } from '../shared/tabs/Entity/DataFlowJobsTab'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { getDataProduct } from '../shared/utils'; -import { IncidentTab } from '../shared/tabs/Incident/IncidentTab'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/dataFlow/preview/Preview'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { DataFlowJobsTab } from '@app/entity/shared/tabs/Entity/DataFlowJobsTab'; +import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getDataProduct } from '@app/entity/shared/utils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { useGetDataFlowQuery, useUpdateDataFlowMutation } from '@graphql/dataFlow.generated'; +import { DataFlow, EntityType, OwnershipType, SearchResult } from '@types'; /** * Definition of the DataHub DataFlow entity. diff --git a/datahub-web-react/src/app/entity/dataFlow/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataFlow/preview/Preview.tsx index 0c86e745eb..850b0d5cad 100644 --- a/datahub-web-react/src/app/entity/dataFlow/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/dataFlow/preview/Preview.tsx @@ -1,6 +1,12 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { DataProduct, Deprecation, @@ -12,11 +18,7 @@ import { Owner, ParentContainersResult, SearchInsight, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; -import { ANTD_GRAY } from '../../shared/constants'; +} from '@types'; const StatText = styled(Typography.Text)` color: ${ANTD_GRAY[8]}; diff --git a/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx b/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx index ff6490ebc9..c86ff0761f 100644 --- a/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx +++ b/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx @@ -1,28 +1,30 @@ -import * as React from 'react'; import { ConsoleSqlOutlined } from '@ant-design/icons'; -import { DataJob, EntityType, OwnershipType, SearchResult } from '../../../types.generated'; -import { Preview } from './preview/Preview'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { GetDataJobQuery, useGetDataJobQuery, useUpdateDataJobMutation } from '../../../graphql/dataJob.generated'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { GenericEntityProperties } from '../shared/types'; -import { DataJobFlowTab } from '../shared/tabs/Entity/DataJobFlowTab'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { RunsTab } from './tabs/RunsTab'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import { DataFlowEntity } from '../dataFlow/DataFlowEntity'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { getDataProduct } from '../shared/utils'; -import { IncidentTab } from '../shared/tabs/Incident/IncidentTab'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { DataFlowEntity } from '@app/entity/dataFlow/DataFlowEntity'; +import { Preview } from '@app/entity/dataJob/preview/Preview'; +import { RunsTab } from '@app/entity/dataJob/tabs/RunsTab'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { DataJobFlowTab } from '@app/entity/shared/tabs/Entity/DataJobFlowTab'; +import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab'; +import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getDataProduct } from '@app/entity/shared/utils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { GetDataJobQuery, useGetDataJobQuery, useUpdateDataJobMutation } from '@graphql/dataJob.generated'; +import { DataJob, EntityType, OwnershipType, SearchResult } from '@types'; const getDataJobPlatformName = (data?: DataJob): string => { return ( diff --git a/datahub-web-react/src/app/entity/dataJob/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataJob/preview/Preview.tsx index 07ff81effb..686b6040cc 100644 --- a/datahub-web-react/src/app/entity/dataJob/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/dataJob/preview/Preview.tsx @@ -1,7 +1,13 @@ +import { ClockCircleOutlined } from '@ant-design/icons'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { ClockCircleOutlined } from '@ant-design/icons'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { toRelativeTimeString } from '@app/shared/time/timeUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { DataProduct, @@ -14,12 +20,7 @@ import { Owner, ParentContainersResult, SearchInsight, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; -import { ANTD_GRAY } from '../../shared/constants'; -import { toRelativeTimeString } from '../../../shared/time/timeUtils'; +} from '@types'; const StatText = styled(Typography.Text)` color: ${ANTD_GRAY[8]}; diff --git a/datahub-web-react/src/app/entity/dataJob/tabs/RunsTab.tsx b/datahub-web-react/src/app/entity/dataJob/tabs/RunsTab.tsx index f00e3402c8..7ac08b1176 100644 --- a/datahub-web-react/src/app/entity/dataJob/tabs/RunsTab.tsx +++ b/datahub-web-react/src/app/entity/dataJob/tabs/RunsTab.tsx @@ -3,18 +3,20 @@ import { Pagination, Table, Tooltip, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { useGetDataJobRunsQuery } from '../../../../graphql/dataJob.generated'; -import { DataProcessInstanceRunResultType, DataProcessRunStatus } from '../../../../types.generated'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; import { getExecutionRequestStatusDisplayColor, getExecutionRequestStatusDisplayText, getExecutionRequestStatusIcon, -} from '../../../ingest/source/utils'; -import { CompactEntityNameList } from '../../../recommendations/renderer/component/CompactEntityNameList'; -import { ANTD_GRAY } from '../../shared/constants'; -import { useEntityData } from '../../shared/EntityContext'; -import LoadingSvg from '../../../../images/datahub-logo-color-loading_pendulum.svg?react'; -import { scrollToTop } from '../../../shared/searchUtils'; +} from '@app/ingest/source/utils'; +import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList'; +import { scrollToTop } from '@app/shared/searchUtils'; + +import { useGetDataJobRunsQuery } from '@graphql/dataJob.generated'; +import { DataProcessInstanceRunResultType, DataProcessRunStatus } from '@types'; + +import LoadingSvg from '@images/datahub-logo-color-loading_pendulum.svg?react'; const ExternalUrlLink = styled.a` font-size: 16px; diff --git a/datahub-web-react/src/app/entity/dataPlatform/DataPlatformEntity.tsx b/datahub-web-react/src/app/entity/dataPlatform/DataPlatformEntity.tsx index 89cbaf3cbe..8b3dbb864d 100644 --- a/datahub-web-react/src/app/entity/dataPlatform/DataPlatformEntity.tsx +++ b/datahub-web-react/src/app/entity/dataPlatform/DataPlatformEntity.tsx @@ -1,9 +1,11 @@ -import * as React from 'react'; import { DatabaseOutlined } from '@ant-design/icons'; -import { DataPlatform, EntityType, SearchResult } from '../../../types.generated'; -import { Entity, IconStyleType, PreviewType } from '../Entity'; -import { GenericEntityProperties } from '../shared/types'; -import { useGetDataPlatformQuery } from '../../../graphql/dataPlatform.generated'; +import * as React from 'react'; + +import { Entity, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + +import { useGetDataPlatformQuery } from '@graphql/dataPlatform.generated'; +import { DataPlatform, EntityType, SearchResult } from '@types'; const getDisplayName = (data?: DataPlatform): string => { return data?.properties?.displayName || data?.name || ''; diff --git a/datahub-web-react/src/app/entity/dataPlatformInstance/DataPlatformInstanceEntity.tsx b/datahub-web-react/src/app/entity/dataPlatformInstance/DataPlatformInstanceEntity.tsx index d0db687ffe..684fb2cea0 100644 --- a/datahub-web-react/src/app/entity/dataPlatformInstance/DataPlatformInstanceEntity.tsx +++ b/datahub-web-react/src/app/entity/dataPlatformInstance/DataPlatformInstanceEntity.tsx @@ -1,8 +1,10 @@ import * as React from 'react'; -import { DataPlatformInstance, EntityType } from '../../../types.generated'; -import { Entity } from '../Entity'; -import { GenericEntityProperties } from '../shared/types'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; + +import { Entity } from '@app/entity/Entity'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + +import { DataPlatformInstance, EntityType } from '@types'; /** * Definition of the DataHub DataPlatformInstance entity. diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx index ffbe9693e4..2b038801dc 100644 --- a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx +++ b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx @@ -1,26 +1,24 @@ -import React from 'react'; import { ApiOutlined } from '@ant-design/icons'; -import { Entity as GraphQLEntity } from '@types'; -import { DataProcessInstance, EntityType, OwnershipType, SearchResult } from '../../../types.generated'; -import { Preview } from './preview/Preview'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { - GetDataProcessInstanceQuery, - useGetDataProcessInstanceQuery, -} from '../../../graphql/dataProcessInstance.generated'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { GenericEntityProperties } from '../shared/types'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { getDataProduct } from '../shared/utils'; -import SummaryTab from './profile/DataProcessInstanceSummary'; +import React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/dataProcessInstance/preview/Preview'; +import SummaryTab from '@app/entity/dataProcessInstance/profile/DataProcessInstanceSummary'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getDataProduct } from '@app/entity/shared/utils'; + +import { GetDataProcessInstanceQuery, useGetDataProcessInstanceQuery } from '@graphql/dataProcessInstance.generated'; +import { DataProcessInstance, EntityType, Entity as GraphQLEntity, OwnershipType, SearchResult } from '@types'; const getParentEntities = (data: DataProcessInstance): GraphQLEntity[] => { const parentEntity = data?.relationships?.relationships?.find( diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx index d7d778fc2b..42e8e71f2f 100644 --- a/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx @@ -1,22 +1,24 @@ import React from 'react'; + +import { IconStyleType } from '@app/entity/Entity'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { + Container, + DataProcessRunEvent, DataProduct, Deprecation, Domain, - Entity as GeneratedEntity, EntityPath, EntityType, + Entity as GeneratedEntity, GlobalTags, Health, Owner, - SearchInsight, - Container, ParentContainersResult, - DataProcessRunEvent, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; + SearchInsight, +} from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary.tsx index 79247334b7..8621f3d2f8 100644 --- a/datahub-web-react/src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary.tsx +++ b/datahub-web-react/src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary.tsx @@ -1,14 +1,16 @@ +import { Pill } from '@components'; +import { Space, Table, Typography } from 'antd'; +import { capitalize } from 'lodash'; import React from 'react'; import styled from 'styled-components'; -import { Space, Table, Typography } from 'antd'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { InfoItem } from '@app/entity/shared/components/styled/InfoItem'; +import { TimestampPopover } from '@app/sharedV2/TimestampPopover'; import { formatDetailedDuration } from '@src/app/shared/time/timeUtils'; -import { capitalize } from 'lodash'; -import { Pill } from '@components'; -import { MlHyperParam, MlMetric, DataProcessInstanceRunResultType } from '../../../../types.generated'; -import { useBaseEntity } from '../../shared/EntityContext'; -import { InfoItem } from '../../shared/components/styled/InfoItem'; -import { GetDataProcessInstanceQuery } from '../../../../graphql/dataProcessInstance.generated'; -import { TimestampPopover } from '../../../sharedV2/TimestampPopover'; + +import { GetDataProcessInstanceQuery } from '@graphql/dataProcessInstance.generated'; +import { DataProcessInstanceRunResultType, MlHyperParam, MlMetric } from '@types'; const TabContent = styled.div` padding: 16px; diff --git a/datahub-web-react/src/app/entity/dataProduct/DataProductEntitiesTab.tsx b/datahub-web-react/src/app/entity/dataProduct/DataProductEntitiesTab.tsx index 8e1b020132..6f5cdc369e 100644 --- a/datahub-web-react/src/app/entity/dataProduct/DataProductEntitiesTab.tsx +++ b/datahub-web-react/src/app/entity/dataProduct/DataProductEntitiesTab.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { useEntityData } from '../shared/EntityContext'; -import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection'; -import generateUseListDataProductAssets from './generateUseListDataProductAssets'; + +import generateUseListDataProductAssets from '@app/entity/dataProduct/generateUseListDataProductAssets'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection'; export function DataProductEntitiesTab() { const { urn } = useEntityData(); diff --git a/datahub-web-react/src/app/entity/dataProduct/DataProductEntity.tsx b/datahub-web-react/src/app/entity/dataProduct/DataProductEntity.tsx index b7912268eb..14d7f33257 100644 --- a/datahub-web-react/src/app/entity/dataProduct/DataProductEntity.tsx +++ b/datahub-web-react/src/app/entity/dataProduct/DataProductEntity.tsx @@ -1,23 +1,25 @@ -import * as React from 'react'; import { FileDoneOutlined } from '@ant-design/icons'; -import { DataProduct, EntityType, OwnershipType, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { SidebarViewDefinitionSection } from '../shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection'; -import { GetDatasetQuery } from '../../../graphql/dataset.generated'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { Preview } from './preview/Preview'; -import { useGetDataProductQuery } from '../../../graphql/dataProduct.generated'; -import { DataProductEntitiesTab } from './DataProductEntitiesTab'; -import { EntityActionItem } from '../shared/entity/EntityActions'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { DataProductEntitiesTab } from '@app/entity/dataProduct/DataProductEntitiesTab'; +import { Preview } from '@app/entity/dataProduct/preview/Preview'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import { SidebarViewDefinitionSection } from '@app/entity/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { EntityActionItem } from '@app/entity/shared/entity/EntityActions'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; + +import { useGetDataProductQuery } from '@graphql/dataProduct.generated'; +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { DataProduct, EntityType, OwnershipType, SearchResult } from '@types'; /** * Definition of the DataHub Data Product entity. diff --git a/datahub-web-react/src/app/entity/dataProduct/generateUseListDataProductAssets.ts b/datahub-web-react/src/app/entity/dataProduct/generateUseListDataProductAssets.ts index 9063c3de19..931f2fcc87 100644 --- a/datahub-web-react/src/app/entity/dataProduct/generateUseListDataProductAssets.ts +++ b/datahub-web-react/src/app/entity/dataProduct/generateUseListDataProductAssets.ts @@ -1,5 +1,6 @@ -import { useListDataProductAssetsQuery } from '../../../graphql/search.generated'; -import { GetSearchResultsParams } from '../shared/components/styled/search/types'; +import { GetSearchResultsParams } from '@app/entity/shared/components/styled/search/types'; + +import { useListDataProductAssetsQuery } from '@graphql/search.generated'; export default function generateUseListDataProductAssets({ urn }: { urn: string }) { return (params: GetSearchResultsParams) => { diff --git a/datahub-web-react/src/app/entity/dataProduct/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataProduct/preview/Preview.tsx index 7f3b6d7042..29e07bd043 100644 --- a/datahub-web-react/src/app/entity/dataProduct/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/dataProduct/preview/Preview.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { EntityType, Owner, GlobalTags, GlossaryTerms, Domain, EntityPath } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; + +import { IconStyleType } from '@app/entity/Entity'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Domain, EntityPath, EntityType, GlobalTags, GlossaryTerms, Owner } from '@types'; interface Props { urn: string; diff --git a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx index cca6b0e60d..83b3cdb321 100644 --- a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx +++ b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx @@ -1,43 +1,45 @@ -import * as React from 'react'; import { DatabaseFilled, DatabaseOutlined } from '@ant-design/icons'; -import { Dataset, DatasetProperties, EntityType, OwnershipType, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { useAppConfig } from '../../useAppConfig'; -import { Preview } from './preview/Preview'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { GetDatasetQuery, useGetDatasetQuery, useUpdateDatasetMutation } from '../../../graphql/dataset.generated'; -import { GenericEntityProperties } from '../shared/types'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { SchemaTab } from '../shared/tabs/Dataset/Schema/SchemaTab'; -import QueriesTab from '../shared/tabs/Dataset/Queries/QueriesTab'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import StatsTab from '../shared/tabs/Dataset/Stats/StatsTab'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import ViewDefinitionTab from '../shared/tabs/Dataset/View/ViewDefinitionTab'; -import { SidebarViewDefinitionSection } from '../shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { ValidationsTab } from '../shared/tabs/Dataset/Validations/ValidationsTab'; -import { OperationsTab } from './profile/OperationsTab'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import { SidebarSiblingsSection } from '../shared/containers/profile/sidebar/SidebarSiblingsSection'; -import { DatasetStatsSummarySubHeader } from './profile/stats/stats/DatasetStatsSummarySubHeader'; -import { MatchedFieldList } from '../../search/matches/MatchedFieldList'; -import { EmbedTab } from '../shared/tabs/Embed/EmbedTab'; -import EmbeddedProfile from '../shared/embed/EmbeddedProfile'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { getDataProduct } from '../shared/utils'; -import { RelationshipsTab } from '../shared/tabs/Dataset/Relationship/RelationshipsTab'; -import AccessManagement from '../shared/tabs/Dataset/AccessManagement/AccessManagement'; -import { matchedFieldPathsRenderer } from '../../search/matches/matchedFieldPathsRenderer'; -import { getLastUpdatedMs } from './shared/utils'; -import { IncidentTab } from '../shared/tabs/Incident/IncidentTab'; -import { GovernanceTab } from '../shared/tabs/Dataset/Governance/GovernanceTab'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/dataset/preview/Preview'; +import { OperationsTab } from '@app/entity/dataset/profile/OperationsTab'; +import { DatasetStatsSummarySubHeader } from '@app/entity/dataset/profile/stats/stats/DatasetStatsSummarySubHeader'; +import { getLastUpdatedMs } from '@app/entity/dataset/shared/utils'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarViewDefinitionSection } from '@app/entity/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarSiblingsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import EmbeddedProfile from '@app/entity/shared/embed/EmbeddedProfile'; +import AccessManagement from '@app/entity/shared/tabs/Dataset/AccessManagement/AccessManagement'; +import { GovernanceTab } from '@app/entity/shared/tabs/Dataset/Governance/GovernanceTab'; +import QueriesTab from '@app/entity/shared/tabs/Dataset/Queries/QueriesTab'; +import { RelationshipsTab } from '@app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab'; +import { SchemaTab } from '@app/entity/shared/tabs/Dataset/Schema/SchemaTab'; +import StatsTab from '@app/entity/shared/tabs/Dataset/Stats/StatsTab'; +import { ValidationsTab } from '@app/entity/shared/tabs/Dataset/Validations/ValidationsTab'; +import ViewDefinitionTab from '@app/entity/shared/tabs/Dataset/View/ViewDefinitionTab'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { EmbedTab } from '@app/entity/shared/tabs/Embed/EmbedTab'; +import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab'; +import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getDataProduct } from '@app/entity/shared/utils'; +import { MatchedFieldList } from '@app/search/matches/MatchedFieldList'; +import { matchedFieldPathsRenderer } from '@app/search/matches/matchedFieldPathsRenderer'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useAppConfig } from '@app/useAppConfig'; + +import { GetDatasetQuery, useGetDatasetQuery, useUpdateDatasetMutation } from '@graphql/dataset.generated'; +import { Dataset, DatasetProperties, EntityType, OwnershipType, SearchResult } from '@types'; const SUBTYPES = { VIEW: 'view', diff --git a/datahub-web-react/src/app/entity/dataset/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataset/preview/Preview.tsx index 15c54f8603..cf489ada04 100644 --- a/datahub-web-react/src/app/entity/dataset/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/dataset/preview/Preview.tsx @@ -1,26 +1,28 @@ import React from 'react'; + +import { IconStyleType } from '@app/entity/Entity'; +import { DatasetStatsSummary as DatasetStatsSummaryView } from '@app/entity/dataset/shared/DatasetStatsSummary'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { + Container, + DataProduct, + DatasetStatsSummary, + Deprecation, + Domain, + EntityPath, EntityType, FabricType, - Owner, GlobalTags, GlossaryTerms, - SearchInsight, - Domain, - Container, - ParentContainersResult, - Maybe, - Deprecation, - DatasetStatsSummary, - DataProduct, Health, - EntityPath, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { IconStyleType } from '../../Entity'; -import { DatasetStatsSummary as DatasetStatsSummaryView } from '../shared/DatasetStatsSummary'; + Maybe, + Owner, + ParentContainersResult, + SearchInsight, +} from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entity/dataset/profile/Lineage.tsx b/datahub-web-react/src/app/entity/dataset/profile/Lineage.tsx index 419ce1c838..cc6f245dcb 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/Lineage.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/Lineage.tsx @@ -2,10 +2,12 @@ import { Button, List, Space, Typography } from 'antd'; import React from 'react'; import { useHistory, useLocation } from 'react-router-dom'; import styled from 'styled-components'; -import { DownstreamEntityRelationships, EntityType, UpstreamEntityRelationships } from '../../../../types.generated'; -import { navigateToLineageUrl } from '../../../lineage/utils/navigateToLineageUrl'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { PreviewType } from '../../Entity'; + +import { PreviewType } from '@app/entity/Entity'; +import { navigateToLineageUrl } from '@app/lineage/utils/navigateToLineageUrl'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DownstreamEntityRelationships, EntityType, UpstreamEntityRelationships } from '@types'; export type Props = { upstreamLineage?: UpstreamEntityRelationships | null; diff --git a/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx b/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx index 8896167469..c443efb704 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx @@ -3,25 +3,22 @@ import { Pagination, Table, Tooltip, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { GetDatasetRunsQuery, useGetDatasetRunsQuery } from '../../../../graphql/dataset.generated'; -import { - DataProcessInstanceRunResultType, - DataProcessRunStatus, - EntityType, - RelationshipDirection, -} from '../../../../types.generated'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { notEmpty } from '@app/entity/shared/utils'; import { getExecutionRequestStatusDisplayColor, getExecutionRequestStatusDisplayText, getExecutionRequestStatusIcon, -} from '../../../ingest/source/utils'; -import { CompactEntityNameList } from '../../../recommendations/renderer/component/CompactEntityNameList'; -import { ANTD_GRAY } from '../../shared/constants'; -import { useEntityData } from '../../shared/EntityContext'; -import LoadingSvg from '../../../../images/datahub-logo-color-loading_pendulum.svg?react'; -import { scrollToTop } from '../../../shared/searchUtils'; -import { formatDuration } from '../../../shared/formatDuration'; -import { notEmpty } from '../../shared/utils'; +} from '@app/ingest/source/utils'; +import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList'; +import { formatDuration } from '@app/shared/formatDuration'; +import { scrollToTop } from '@app/shared/searchUtils'; + +import { GetDatasetRunsQuery, useGetDatasetRunsQuery } from '@graphql/dataset.generated'; +import { DataProcessInstanceRunResultType, DataProcessRunStatus, EntityType, RelationshipDirection } from '@types'; + +import LoadingSvg from '@images/datahub-logo-color-loading_pendulum.svg?react'; const ExternalUrlLink = styled.a` font-size: 16px; diff --git a/datahub-web-react/src/app/entity/dataset/profile/UsageFacepile.tsx b/datahub-web-react/src/app/entity/dataset/profile/UsageFacepile.tsx index 0629e0128e..7cd58d287e 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/UsageFacepile.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/UsageFacepile.tsx @@ -1,10 +1,11 @@ -import React, { useMemo } from 'react'; import { Avatar, Tooltip } from 'antd'; +import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { UserUsageCounts } from '../../../../types.generated'; -import { SpacedAvatarGroup } from '../../../shared/avatar/SpaceAvatarGroup'; -import getAvatarColor from '../../../shared/avatar/getAvatarColor'; +import { SpacedAvatarGroup } from '@app/shared/avatar/SpaceAvatarGroup'; +import getAvatarColor from '@app/shared/avatar/getAvatarColor'; + +import { UserUsageCounts } from '@types'; export type Props = { users?: (UserUsageCounts | null)[] | null; diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Lineage.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Lineage.test.tsx index f7cca3addf..2ac0f90864 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Lineage.test.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Lineage.test.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import { render } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; +import { render } from '@testing-library/react'; +import React from 'react'; -import Lineage from '../Lineage'; -import { sampleDownstreamRelationship, sampleRelationship } from '../stories/lineageEntities'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { mocks } from '../../../../../Mocks'; +import Lineage from '@app/entity/dataset/profile/Lineage'; +import { sampleDownstreamRelationship, sampleRelationship } from '@app/entity/dataset/profile/stories/lineageEntities'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('Lineage', () => { it('renders', () => { diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Properties.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Properties.test.tsx index 4787efcc08..3936e97f1f 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Properties.test.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Properties.test.tsx @@ -1,10 +1,11 @@ -import React from 'react'; -import { render } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; -import { Properties } from '../../../shared/components/legacy/Properties'; -import { sampleProperties } from '../stories/properties'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { mocks } from '../../../../../Mocks'; +import { render } from '@testing-library/react'; +import React from 'react'; + +import { sampleProperties } from '@app/entity/dataset/profile/stories/properties'; +import { Properties } from '@app/entity/shared/components/legacy/Properties'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('Properties', () => { it('renders', () => { diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx index 19917d23b9..bdf04fead9 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx @@ -1,19 +1,21 @@ -import React from 'react'; -import { fireEvent, render } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; +import { fireEvent, render } from '@testing-library/react'; +import React from 'react'; + import { sampleSchema, sampleSchemaWithKeyValueFields, - sampleSchemaWithoutFields, sampleSchemaWithPkFk, sampleSchemaWithTags, -} from '../stories/sampleSchema'; -import { mocks } from '../../../../../Mocks'; -import { SchemaTab } from '../../../shared/tabs/Dataset/Schema/SchemaTab'; -import { EntityContext } from '../../../shared/EntityContext'; -import { EntityType, SchemaMetadata } from '../../../../../types.generated'; -import { SchemaRow } from '../../../shared/tabs/Dataset/Schema/components/SchemaRow'; + sampleSchemaWithoutFields, +} from '@app/entity/dataset/profile/stories/sampleSchema'; +import { EntityContext } from '@app/entity/shared/EntityContext'; +import { SchemaTab } from '@app/entity/shared/tabs/Dataset/Schema/SchemaTab'; +import { SchemaRow } from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaRow'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { EntityType, SchemaMetadata } from '@types'; vi.mock('virtualizedtableforantd4', async () => { return { diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/SchemaDescriptionField.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/SchemaDescriptionField.test.tsx index 3b3068e45e..f6e0e32a2e 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/SchemaDescriptionField.test.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/__tests__/SchemaDescriptionField.test.tsx @@ -1,9 +1,10 @@ -import React from 'react'; -import { fireEvent, render, waitFor } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; -import SchemaDescriptionField from '../schema/components/SchemaDescriptionField'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { mocks } from '../../../../../Mocks'; +import { fireEvent, render, waitFor } from '@testing-library/react'; +import React from 'react'; + +import SchemaDescriptionField from '@app/entity/dataset/profile/schema/components/SchemaDescriptionField'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('SchemaDescriptionField', () => { it('renders editable description', async () => { diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Stats.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Stats.test.tsx index d5682a629b..f299a362d3 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Stats.test.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Stats.test.tsx @@ -1,10 +1,15 @@ -import React from 'react'; -import { render } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; -import SnapshotStatsView from '../stats/snapshot/SnapshotStatsView'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { completeSampleProfile, missingFieldStatsProfile, missingTableStatsProfile } from '../stories/stats'; -import { mocks } from '../../../../../Mocks'; +import { render } from '@testing-library/react'; +import React from 'react'; + +import SnapshotStatsView from '@app/entity/dataset/profile/stats/snapshot/SnapshotStatsView'; +import { + completeSampleProfile, + missingFieldStatsProfile, + missingTableStatsProfile, +} from '@app/entity/dataset/profile/stories/stats'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('SnapshotStatsView', () => { it('renders complete profile', () => { diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPath.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPath.test.tsx index bb2c0121ef..3e03f28fb6 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPath.test.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPath.test.tsx @@ -1,4 +1,4 @@ -import translateFieldPath from '../../schema/utils/translateFieldPath'; +import translateFieldPath from '@app/entity/dataset/profile/schema/utils/translateFieldPath'; describe('translateFieldPath', () => { it('translates qualified unions', () => { diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx index 2ddfe7d19e..b6291ae1c0 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx @@ -1,4 +1,4 @@ -import translateFieldPathSegment from '../../schema/utils/translateFieldPathSegment'; +import translateFieldPathSegment from '@app/entity/dataset/profile/schema/utils/translateFieldPathSegment'; describe('translateFieldPathSegment', () => { it('translates unions', () => { diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/utils.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/utils.test.tsx index 8d41161380..c3a32a67cb 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/utils.test.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/utils.test.tsx @@ -1,5 +1,6 @@ -import { SchemaFieldDataType } from '../../../../../../types.generated'; -import { filterKeyFieldPath } from '../../schema/utils/utils'; +import { filterKeyFieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; + +import { SchemaFieldDataType } from '@types'; describe('utils', () => { describe('filterKeyFieldPath', () => { diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/CustomPagination.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/CustomPagination.tsx index d97582cace..68fcefbb79 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/CustomPagination.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/components/CustomPagination.tsx @@ -1,8 +1,9 @@ -import React, { useState } from 'react'; -import { Button, Dropdown, Typography } from 'antd'; import { LeftOutlined, RightOutlined } from '@ant-design/icons'; +import { Button, Dropdown, Typography } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; -import { MenuItemStyle } from '../../../../view/menu/item/styledComponent'; + +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; const CustomPaginationContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaDescriptionField.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaDescriptionField.tsx index e7d986028d..d32a61712e 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaDescriptionField.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaDescriptionField.tsx @@ -1,19 +1,20 @@ -import { Typography, message, Button } from 'antd'; import { EditOutlined } from '@ant-design/icons'; +import { FetchResult } from '@apollo/client'; +import { Button, Typography, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { FetchResult } from '@apollo/client'; -import { UpdateDatasetMutation } from '../../../../../../graphql/dataset.generated'; -import { StringMapEntry } from '../../../../../../types.generated'; -import PropagationDetails from '../../../../shared/propagation/PropagationDetails'; -import UpdateDescriptionModal from '../../../../shared/components/legacy/DescriptionModal'; -import StripMarkdownText, { removeMarkdown } from '../../../../shared/components/styled/StripMarkdownText'; -import SchemaEditableContext from '../../../../../shared/SchemaEditableContext'; -import { useEntityData } from '../../../../shared/EntityContext'; -import analytics, { EventType, EntityActionType } from '../../../../../analytics'; -import { Editor } from '../../../../shared/tabs/Documentation/components/editor/Editor'; -import { ANTD_GRAY } from '../../../../shared/constants'; +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import UpdateDescriptionModal from '@app/entity/shared/components/legacy/DescriptionModal'; +import StripMarkdownText, { removeMarkdown } from '@app/entity/shared/components/styled/StripMarkdownText'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import PropagationDetails from '@app/entity/shared/propagation/PropagationDetails'; +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; + +import { UpdateDatasetMutation } from '@graphql/dataset.generated'; +import { StringMapEntry } from '@types'; const EditIcon = styled(EditOutlined)` cursor: pointer; diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaHeader.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaHeader.tsx index e5a6791557..1dd95c9edd 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaHeader.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaHeader.tsx @@ -1,8 +1,3 @@ -import { Icon } from '@components'; -import React from 'react'; -import { useHistory, useLocation } from 'react-router-dom'; -import { Button, Input, Popover, Select, Tooltip, Typography } from 'antd'; -import { debounce } from 'lodash'; import { AuditOutlined, CaretDownOutlined, @@ -10,14 +5,21 @@ import { QuestionCircleOutlined, TableOutlined, } from '@ant-design/icons'; +import { Icon } from '@components'; +import { Button, Input, Popover, Select, Tooltip, Typography } from 'antd'; +import { debounce } from 'lodash'; +import React from 'react'; +import { useHistory, useLocation } from 'react-router-dom'; import styled from 'styled-components/macro'; -import CustomPagination from './CustomPagination'; -import TabToolbar from '../../../../shared/components/styled/TabToolbar'; -import { SemanticVersionStruct } from '../../../../../../types.generated'; -import { toRelativeTimeString } from '../../../../../shared/time/timeUtils'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../../shared/constants'; -import { navigateToVersionedDatasetUrl } from '../../../../shared/tabs/Dataset/Schema/utils/navigateToVersionedDatasetUrl'; -import getSchemaFilterFromQueryString from '../../../../shared/tabs/Dataset/Schema/utils/getSchemaFilterFromQueryString'; + +import CustomPagination from '@app/entity/dataset/profile/schema/components/CustomPagination'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entity/shared/constants'; +import getSchemaFilterFromQueryString from '@app/entity/shared/tabs/Dataset/Schema/utils/getSchemaFilterFromQueryString'; +import { navigateToVersionedDatasetUrl } from '@app/entity/shared/tabs/Dataset/Schema/utils/navigateToVersionedDatasetUrl'; +import { toRelativeTimeString } from '@app/shared/time/timeUtils'; + +import { SemanticVersionStruct } from '@types'; const SchemaHeaderContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaRawView.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaRawView.tsx index 07235a4e32..ac063d43fa 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaRawView.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaRawView.tsx @@ -1,8 +1,10 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { Schema, SchemaMetadata } from '../../../../../../types.generated'; -import { diffJson, formatRawSchema, getRawSchema } from '../utils/utils'; + +import { diffJson, formatRawSchema, getRawSchema } from '@app/entity/dataset/profile/schema/utils/utils'; + +import { Schema, SchemaMetadata } from '@types'; type Props = { schemaDiff: { diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaVersionSummary.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaVersionSummary.tsx index b0f07a59e2..2a27a41a8c 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaVersionSummary.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaVersionSummary.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const SummaryContainer = styled.div` diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/StructuredPropValues.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/StructuredPropValues.tsx index 81c737d42b..727159eb17 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/StructuredPropValues.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/components/StructuredPropValues.tsx @@ -1,10 +1,11 @@ +import { Tooltip } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; + import StructuredPropertyValue from '@src/app/entity/shared/tabs/Properties/StructuredPropertyValue'; import { mapStructuredPropertyToPropertyRow } from '@src/app/entity/shared/tabs/Properties/useStructuredProperties'; import { useEntityRegistry } from '@src/app/useEntityRegistry'; import { SchemaFieldEntity, SearchResult, StdDataType } from '@src/types.generated'; -import { Tooltip } from 'antd'; -import React from 'react'; -import styled from 'styled-components'; const ValuesContainer = styled.span` max-width: 120px; diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/TypeIcon.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/TypeIcon.tsx index e67912c900..df54db34b8 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/TypeIcon.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/components/TypeIcon.tsx @@ -1,18 +1,20 @@ import { + CalendarOutlined, FieldBinaryOutlined, + FieldTimeOutlined, NumberOutlined, - UnorderedListOutlined, QuestionCircleOutlined, UnderlineOutlined, - CalendarOutlined, - FieldTimeOutlined, + UnorderedListOutlined, } from '@ant-design/icons'; import { Tooltip, Typography } from 'antd'; import React, { FC } from 'react'; -import { VscSymbolString, VscFileBinary } from 'react-icons/vsc'; +import { VscFileBinary, VscSymbolString } from 'react-icons/vsc'; import styled from 'styled-components'; -import { capitalizeFirstLetter } from '../../../../../shared/textUtil'; -import { SchemaFieldDataType } from '../../../../../../types.generated'; + +import { capitalizeFirstLetter } from '@app/shared/textUtil'; + +import { SchemaFieldDataType } from '@types'; const TypeIconContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx index fdd03622fc..93234a88bf 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx @@ -1,15 +1,17 @@ -import React, { useState } from 'react'; import { Typography } from 'antd'; -import styled from 'styled-components'; +import React, { useState } from 'react'; import Highlight from 'react-highlighter'; -import translateFieldPath from './translateFieldPath'; -import { ExtendedSchemaFields } from './types'; -import TypeLabel from '../../../../shared/tabs/Dataset/Schema/components/TypeLabel'; -import { ForeignKeyConstraint, SchemaMetadata } from '../../../../../../types.generated'; -import PrimaryKeyLabel from '../../../../shared/tabs/Dataset/Schema/components/PrimaryKeyLabel'; -import PartitioningKeyLabel from '../../../../shared/tabs/Dataset/Schema/components/PartitioningKeyLabel'; -import NullableLabel from '../../../../shared/tabs/Dataset/Schema/components/NullableLabel'; -import ForeignKeyLabel from '../../../../shared/tabs/Dataset/Schema/components/ForeignKeyLabel'; +import styled from 'styled-components'; + +import translateFieldPath from '@app/entity/dataset/profile/schema/utils/translateFieldPath'; +import { ExtendedSchemaFields } from '@app/entity/dataset/profile/schema/utils/types'; +import ForeignKeyLabel from '@app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel'; +import NullableLabel from '@app/entity/shared/tabs/Dataset/Schema/components/NullableLabel'; +import PartitioningKeyLabel from '@app/entity/shared/tabs/Dataset/Schema/components/PartitioningKeyLabel'; +import PrimaryKeyLabel from '@app/entity/shared/tabs/Dataset/Schema/components/PrimaryKeyLabel'; +import TypeLabel from '@app/entity/shared/tabs/Dataset/Schema/components/TypeLabel'; + +import { ForeignKeyConstraint, SchemaMetadata } from '@types'; const MAX_FIELD_PATH_LENGTH = 200; diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/translateFieldPath.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/translateFieldPath.tsx index ccb532bc2d..07d990b5a4 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/translateFieldPath.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/translateFieldPath.tsx @@ -1,5 +1,5 @@ -import { KEY_SCHEMA_PREFIX, VERSION_PREFIX } from './constants'; -import translateFieldPathSegment from './translateFieldPathSegment'; +import { KEY_SCHEMA_PREFIX, VERSION_PREFIX } from '@app/entity/dataset/profile/schema/utils/constants'; +import translateFieldPathSegment from '@app/entity/dataset/profile/schema/utils/translateFieldPathSegment'; export default function translateFieldPath(fieldPath: string) { // fields that are part of a key schema are prefixed with [key=true] diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/translateFieldPathSegment.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/translateFieldPathSegment.tsx index 734580eb26..23398f2fd4 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/translateFieldPathSegment.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/translateFieldPathSegment.tsx @@ -1,4 +1,4 @@ -import { ARRAY_TOKEN, UNION_TOKEN } from './constants'; +import { ARRAY_TOKEN, UNION_TOKEN } from '@app/entity/dataset/profile/schema/utils/constants'; export default function translateFieldPathSegment(fieldPathSegment, i, fieldPathParts) { // for each segment, convert its fieldPath representation into a human readable version diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/types.ts b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/types.ts index b71b21112d..0b43ef2f11 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/types.ts +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/types.ts @@ -1,4 +1,4 @@ -import { SchemaField, GlobalTags } from '../../../../../../types.generated'; +import { GlobalTags, SchemaField } from '@types'; export interface ExtendedSchemaFields extends SchemaField { children?: Array; diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/utils.ts b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/utils.ts index 9d719ae25e..1d90ee7725 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/utils.ts +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/utils.ts @@ -1,16 +1,17 @@ import * as diff from 'diff'; +import { SchemaDiffSummary } from '@app/entity/dataset/profile/schema/components/SchemaVersionSummary'; +import { KEY_SCHEMA_PREFIX, UNION_TOKEN, VERSION_PREFIX } from '@app/entity/dataset/profile/schema/utils/constants'; +import { ExtendedSchemaFields } from '@app/entity/dataset/profile/schema/utils/types'; +import { convertTagsForUpdate } from '@app/shared/tags/utils/convertTagsForUpdate'; + import { - EditableSchemaMetadata, EditableSchemaFieldInfo, + EditableSchemaMetadata, EditableSchemaMetadataUpdate, - SchemaField, PlatformSchema, -} from '../../../../../../types.generated'; -import { convertTagsForUpdate } from '../../../../../shared/tags/utils/convertTagsForUpdate'; -import { SchemaDiffSummary } from '../components/SchemaVersionSummary'; -import { KEY_SCHEMA_PREFIX, UNION_TOKEN, VERSION_PREFIX } from './constants'; -import { ExtendedSchemaFields } from './types'; + SchemaField, +} from '@types'; export function convertEditableSchemaMeta( editableSchemaMeta?: Array, diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/Stats.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/Stats.tsx index f9f5dff5cc..73e507ce58 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/stats/Stats.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/stats/Stats.tsx @@ -1,8 +1,10 @@ -import React, { useState } from 'react'; import { Radio } from 'antd'; -import { DatasetProfile } from '../../../../../types.generated'; -import LatestStatsView from './snapshot/LatestStatsView'; -import HistoricalStatsView from './historical/HistoricalStatsView'; +import React, { useState } from 'react'; + +import HistoricalStatsView from '@app/entity/dataset/profile/stats/historical/HistoricalStatsView'; +import LatestStatsView from '@app/entity/dataset/profile/stats/snapshot/LatestStatsView'; + +import { DatasetProfile } from '@types'; export type Props = { urn: string; diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/StatsSection.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/StatsSection.tsx index c0a98e44f8..32244ee67c 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/stats/StatsSection.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/stats/StatsSection.tsx @@ -1,6 +1,6 @@ import { Divider, Row, Typography } from 'antd'; -import styled from 'styled-components'; import React from 'react'; +import styled from 'styled-components'; const Section = styled.div` padding-top: 24px; diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/HistoricalStatsView.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/HistoricalStatsView.tsx index 4b256ab5ee..c1ec9ff63b 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/HistoricalStatsView.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/HistoricalStatsView.tsx @@ -1,15 +1,15 @@ +import { Affix, Row, Select, Typography } from 'antd'; import React, { ReactNode, useEffect, useState } from 'react'; import styled from 'styled-components'; -import { Affix, Row, Select, Typography } from 'antd'; -import { useGetDataProfilesLazyQuery } from '../../../../../../graphql/dataset.generated'; -import { DatasetProfile, DateInterval } from '../../../../../../types.generated'; -import { Message } from '../../../../../shared/Message'; -import { getFixedLookbackWindow, TimeWindowSize } from '../../../../../shared/time/timeUtils'; +import StatsSection from '@app/entity/dataset/profile/stats/StatsSection'; +import ProfilingRunsChart from '@app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart'; +import StatChart from '@app/entity/dataset/profile/stats/historical/charts/StatChart'; +import { Message } from '@app/shared/Message'; +import { TimeWindowSize, getFixedLookbackWindow } from '@app/shared/time/timeUtils'; -import ProfilingRunsChart from './charts/ProfilingRunsChart'; -import StatsSection from '../StatsSection'; -import StatChart from './charts/StatChart'; +import { useGetDataProfilesLazyQuery } from '@graphql/dataset.generated'; +import { DatasetProfile, DateInterval } from '@types'; const HeaderRow = styled(Row)` padding-top: 24px; diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx index e14c5ad1f4..f88454c307 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx @@ -1,8 +1,10 @@ import { Button, Col, Modal, Table, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { DatasetProfile } from '../../../../../../../types.generated'; -import DataProfileView from '../../snapshot/SnapshotStatsView'; + +import DataProfileView from '@app/entity/dataset/profile/stats/snapshot/SnapshotStatsView'; + +import { DatasetProfile } from '@types'; export const ChartTable = styled(Table)` margin: 12px; diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/StatChart.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/StatChart.tsx index a6d2d2b4c8..3a8866ad62 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/StatChart.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/StatChart.tsx @@ -2,10 +2,11 @@ import { Col, Divider, Typography } from 'antd'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { DateInterval, DateRange } from '../../../../../../../types.generated'; -import { ChartCard } from '../../../../../../analyticsDashboard/components/ChartCard'; -import { ChartContainer } from '../../../../../../analyticsDashboard/components/ChartContainer'; -import { TimeSeriesChart } from '../../../../../../analyticsDashboard/components/TimeSeriesChart'; +import { ChartCard } from '@app/analyticsDashboard/components/ChartCard'; +import { ChartContainer } from '@app/analyticsDashboard/components/ChartContainer'; +import { TimeSeriesChart } from '@app/analyticsDashboard/components/TimeSeriesChart'; + +import { DateInterval, DateRange } from '@types'; const ChartTitle = styled(Typography.Title)` && { diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/LatestStatsView.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/LatestStatsView.tsx index a94e6c4f6d..3b422ca47c 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/LatestStatsView.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/LatestStatsView.tsx @@ -1,8 +1,10 @@ +import { Affix, Row, Typography } from 'antd'; import React, { ReactNode } from 'react'; import styled from 'styled-components'; -import { Affix, Row, Typography } from 'antd'; -import { DatasetProfile } from '../../../../../../types.generated'; -import DataProfileView from './SnapshotStatsView'; + +import DataProfileView from '@app/entity/dataset/profile/stats/snapshot/SnapshotStatsView'; + +import { DatasetProfile } from '@types'; const HeaderRow = styled(Row)` padding-top: 24px; diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/SnapshotStatsView.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/SnapshotStatsView.tsx index 73c37fc3ac..2b44f34011 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/SnapshotStatsView.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/SnapshotStatsView.tsx @@ -1,11 +1,12 @@ import { Row, Table, Tag, Typography } from 'antd'; +import { ColumnType, ColumnsType } from 'antd/lib/table'; +import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { ColumnsType, ColumnType } from 'antd/lib/table'; -import React, { useMemo } from 'react'; -import { DatasetProfile } from '../../../../../../types.generated'; -import { Highlight } from '../../../../../analyticsDashboard/components/Highlight'; -import StatsSection from '../StatsSection'; +import { Highlight } from '@app/analyticsDashboard/components/Highlight'; +import StatsSection from '@app/entity/dataset/profile/stats/StatsSection'; + +import { DatasetProfile } from '@types'; const ColumnStatsTable = styled(Table)` margin-top: 24px; diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/stats/DatasetStatsSummarySubHeader.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/stats/DatasetStatsSummarySubHeader.tsx index bbac8ecd2c..6396502ea2 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/stats/stats/DatasetStatsSummarySubHeader.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/stats/stats/DatasetStatsSummarySubHeader.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { DatasetStatsSummary as DatasetStatsSummaryObj } from '../../../../../../types.generated'; -import { useBaseEntity } from '../../../../shared/EntityContext'; -import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated'; -import { DatasetStatsSummary } from '../../../shared/DatasetStatsSummary'; -import { getLastUpdatedMs } from '../../../shared/utils'; + +import { DatasetStatsSummary } from '@app/entity/dataset/shared/DatasetStatsSummary'; +import { getLastUpdatedMs } from '@app/entity/dataset/shared/utils'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { DatasetStatsSummary as DatasetStatsSummaryObj } from '@types'; export const DatasetStatsSummarySubHeader = ({ properties }: { properties?: any }) => { const result = useBaseEntity(); diff --git a/datahub-web-react/src/app/entity/dataset/profile/stories/documentation.ts b/datahub-web-react/src/app/entity/dataset/profile/stories/documentation.ts index 3b62c3e6cf..345d33fadd 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/stories/documentation.ts +++ b/datahub-web-react/src/app/entity/dataset/profile/stories/documentation.ts @@ -1,4 +1,4 @@ -import { EntityType } from '../../../../../types.generated'; +import { EntityType } from '@types'; export const sampleDocs = [ { diff --git a/datahub-web-react/src/app/entity/dataset/profile/stories/lineageEntities.ts b/datahub-web-react/src/app/entity/dataset/profile/stories/lineageEntities.ts index 15c04d9ebe..3583ca1a8e 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/stories/lineageEntities.ts +++ b/datahub-web-react/src/app/entity/dataset/profile/stories/lineageEntities.ts @@ -1,4 +1,4 @@ -import { EntityType, FabricType, PlatformNativeType } from '../../../../../types.generated'; +import { EntityType, FabricType, PlatformNativeType } from '@types'; export const sampleUpstreamEntities = [ { diff --git a/datahub-web-react/src/app/entity/dataset/profile/stories/sampleSchema.ts b/datahub-web-react/src/app/entity/dataset/profile/stories/sampleSchema.ts index 2d7a226b94..9ce31ac046 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/stories/sampleSchema.ts +++ b/datahub-web-react/src/app/entity/dataset/profile/stories/sampleSchema.ts @@ -1,5 +1,6 @@ -import { dataset3 } from '../../../../../Mocks'; -import { EntityType, Schema, SchemaMetadata, SchemaField, SchemaFieldDataType } from '../../../../../types.generated'; +import { dataset3 } from '@src/Mocks'; + +import { EntityType, Schema, SchemaField, SchemaFieldDataType, SchemaMetadata } from '@types'; // Extending the schema type with an option for tags export type TaggedSchemaField = { diff --git a/datahub-web-react/src/app/entity/dataset/profile/stories/stats.ts b/datahub-web-react/src/app/entity/dataset/profile/stories/stats.ts index 035acd5668..a4afa38ec7 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/stories/stats.ts +++ b/datahub-web-react/src/app/entity/dataset/profile/stories/stats.ts @@ -1,4 +1,4 @@ -import { DatasetProfile } from '../../../../../types.generated'; +import { DatasetProfile } from '@types'; export const completeSampleProfile: DatasetProfile = { rowCount: 1000, diff --git a/datahub-web-react/src/app/entity/dataset/shared/DatasetStatsSummary.tsx b/datahub-web-react/src/app/entity/dataset/shared/DatasetStatsSummary.tsx index 8e9102145c..9eefd36b71 100644 --- a/datahub-web-react/src/app/entity/dataset/shared/DatasetStatsSummary.tsx +++ b/datahub-web-react/src/app/entity/dataset/shared/DatasetStatsSummary.tsx @@ -1,14 +1,15 @@ +import { ClockCircleOutlined, ConsoleSqlOutlined, HddOutlined, TableOutlined, TeamOutlined } from '@ant-design/icons'; +import { Popover } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Popover } from 'antd'; -import { ClockCircleOutlined, ConsoleSqlOutlined, TableOutlined, TeamOutlined, HddOutlined } from '@ant-design/icons'; -import { formatNumberWithoutAbbreviation } from '../../../shared/formatNumber'; -import { ANTD_GRAY } from '../../shared/constants'; -import { toLocalDateTimeString, toRelativeTimeString } from '../../../shared/time/timeUtils'; -import { StatsSummary } from '../../shared/components/styled/StatsSummary'; -import { FormattedBytesStat } from './FormattedBytesStat'; -import { countFormatter, needsFormatting } from '../../../../utils/formatter'; -import ExpandingStat from './ExpandingStat'; + +import ExpandingStat from '@app/entity/dataset/shared/ExpandingStat'; +import { FormattedBytesStat } from '@app/entity/dataset/shared/FormattedBytesStat'; +import { StatsSummary } from '@app/entity/shared/components/styled/StatsSummary'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils'; +import { countFormatter, needsFormatting } from '@utils/formatter'; const StatText = styled.span<{ color: string }>` color: ${(props) => props.color}; @@ -46,7 +47,7 @@ export const DatasetStatsSummary = ({ shouldWrap, }: Props) => { const isTooltipMode = mode === 'tooltip-content'; - const displayedColor = isTooltipMode ? '' : color ?? ANTD_GRAY[7]; + const displayedColor = isTooltipMode ? '' : (color ?? ANTD_GRAY[7]); const statsViews = [ !!rowCount && ( diff --git a/datahub-web-react/src/app/entity/dataset/shared/FormattedBytesStat.tsx b/datahub-web-react/src/app/entity/dataset/shared/FormattedBytesStat.tsx index 0b8e41df44..458a5d93f2 100644 --- a/datahub-web-react/src/app/entity/dataset/shared/FormattedBytesStat.tsx +++ b/datahub-web-react/src/app/entity/dataset/shared/FormattedBytesStat.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Tooltip } from 'antd'; -import { formatBytes, formatNumberWithoutAbbreviation } from '../../../shared/formatNumber'; +import React from 'react'; + +import { formatBytes, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; export const FormattedBytesStat = ({ bytes }: { bytes: number }) => { const formattedBytes = formatBytes(bytes); diff --git a/datahub-web-react/src/app/entity/dataset/shared/utils.ts b/datahub-web-react/src/app/entity/dataset/shared/utils.ts index fedd54385e..0b64bc7e70 100644 --- a/datahub-web-react/src/app/entity/dataset/shared/utils.ts +++ b/datahub-web-react/src/app/entity/dataset/shared/utils.ts @@ -1,4 +1,4 @@ -import { DatasetProperties, Operation } from '../../../../types.generated'; +import { DatasetProperties, Operation } from '@types'; export function getLastUpdatedMs( properties: Pick | null | undefined, diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/CreateDataProductModal.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/CreateDataProductModal.tsx index a234792813..97e922c65e 100644 --- a/datahub-web-react/src/app/entity/domain/DataProductsTab/CreateDataProductModal.tsx +++ b/datahub-web-react/src/app/entity/domain/DataProductsTab/CreateDataProductModal.tsx @@ -1,9 +1,11 @@ import { Button, Modal, message } from 'antd'; import React, { useState } from 'react'; -import DataProductBuilderForm from './DataProductBuilderForm'; -import { DataProductBuilderState } from './types'; -import { useCreateDataProductMutation } from '../../../../graphql/dataProduct.generated'; -import { DataProduct, Domain } from '../../../../types.generated'; + +import DataProductBuilderForm from '@app/entity/domain/DataProductsTab/DataProductBuilderForm'; +import { DataProductBuilderState } from '@app/entity/domain/DataProductsTab/types'; + +import { useCreateDataProductMutation } from '@graphql/dataProduct.generated'; +import { DataProduct, Domain } from '@types'; export const MODAL_WIDTH = '75vw'; diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductAdvancedOption.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductAdvancedOption.tsx index c3952fbaf5..70907084ee 100644 --- a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductAdvancedOption.tsx +++ b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductAdvancedOption.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { Collapse, Form, Input, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { validateCustomUrnId } from '../../../shared/textUtil'; -import { DataProductBuilderFormProps } from './types'; + +import { DataProductBuilderFormProps } from '@app/entity/domain/DataProductsTab/types'; +import { validateCustomUrnId } from '@app/shared/textUtil'; const FormItem = styled(Form.Item)` .ant-form-item-label { diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductBuilderForm.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductBuilderForm.tsx index 695267080c..758942bf93 100644 --- a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductBuilderForm.tsx +++ b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductBuilderForm.tsx @@ -1,10 +1,11 @@ import { Form, Input, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Editor as MarkdownEditor } from '../../shared/tabs/Documentation/components/editor/Editor'; -import { ANTD_GRAY } from '../../shared/constants'; -import { DataProductBuilderFormProps } from './types'; -import { DataProductAdvancedOption } from './DataProductAdvancedOption'; + +import { DataProductAdvancedOption } from '@app/entity/domain/DataProductsTab/DataProductAdvancedOption'; +import { DataProductBuilderFormProps } from '@app/entity/domain/DataProductsTab/types'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { Editor as MarkdownEditor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; const StyledEditor = styled(MarkdownEditor)` border: 1px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductResult.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductResult.tsx index 812e38ccd6..b0170d7b06 100644 --- a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductResult.tsx +++ b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductResult.tsx @@ -2,12 +2,14 @@ import { DeleteOutlined, EditOutlined } from '@ant-design/icons'; import { Button, Dropdown, Modal, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { DataProduct, EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { PreviewType } from '../../Entity'; -import EditDataProductModal from './EditDataProductModal'; -import { MenuIcon } from '../../shared/EntityDropdown/EntityDropdown'; -import { useDeleteDataProductMutation } from '../../../../graphql/dataProduct.generated'; + +import { PreviewType } from '@app/entity/Entity'; +import EditDataProductModal from '@app/entity/domain/DataProductsTab/EditDataProductModal'; +import { MenuIcon } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useDeleteDataProductMutation } from '@graphql/dataProduct.generated'; +import { DataProduct, EntityType } from '@types'; const ResultWrapper = styled.div` background-color: white; diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx index 39f89979dd..148b5642bb 100644 --- a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx +++ b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx @@ -1,21 +1,23 @@ -import { Button, Empty, Pagination } from 'antd'; import { LoadingOutlined, PlusOutlined } from '@ant-design/icons'; -import React, { useState } from 'react'; +import { Button, Empty, Pagination } from 'antd'; import * as QueryString from 'query-string'; +import React, { useState } from 'react'; import { useLocation } from 'react-router'; import styled from 'styled-components'; -import { useGetSearchResultsForMultipleQuery } from '../../../../graphql/search.generated'; -import { DataProduct, Domain, EntityType } from '../../../../types.generated'; -import TabToolbar from '../../shared/components/styled/TabToolbar'; -import { SearchBar } from '../../../search/SearchBar'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { scrollToTop } from '../../../shared/searchUtils'; -import { DomainsPaginationContainer } from '../../../domain/DomainsList'; -import { ANTD_GRAY } from '../../shared/constants'; -import { useEntityData } from '../../shared/EntityContext'; -import { DOMAINS_FILTER_NAME } from '../../../search/utils/constants'; -import DataProductResult from './DataProductResult'; -import CreateDataProductModal from './CreateDataProductModal'; + +import { DomainsPaginationContainer } from '@app/domain/DomainsList'; +import CreateDataProductModal from '@app/entity/domain/DataProductsTab/CreateDataProductModal'; +import DataProductResult from '@app/entity/domain/DataProductsTab/DataProductResult'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { SearchBar } from '@app/search/SearchBar'; +import { DOMAINS_FILTER_NAME } from '@app/search/utils/constants'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { DataProduct, Domain, EntityType } from '@types'; const DataProductsPaginationWrapper = styled(DomainsPaginationContainer)` justify-content: center; diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/EditDataProductModal.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/EditDataProductModal.tsx index 67b3b2904b..57f21a8bcd 100644 --- a/datahub-web-react/src/app/entity/domain/DataProductsTab/EditDataProductModal.tsx +++ b/datahub-web-react/src/app/entity/domain/DataProductsTab/EditDataProductModal.tsx @@ -1,10 +1,12 @@ import { Button, Modal, message } from 'antd'; import React, { useState } from 'react'; -import DataProductBuilderForm from './DataProductBuilderForm'; -import { DataProductBuilderState } from './types'; -import { useUpdateDataProductMutation } from '../../../../graphql/dataProduct.generated'; -import { DataProduct } from '../../../../types.generated'; -import { MODAL_BODY_STYLE, MODAL_WIDTH } from './CreateDataProductModal'; + +import { MODAL_BODY_STYLE, MODAL_WIDTH } from '@app/entity/domain/DataProductsTab/CreateDataProductModal'; +import DataProductBuilderForm from '@app/entity/domain/DataProductsTab/DataProductBuilderForm'; +import { DataProductBuilderState } from '@app/entity/domain/DataProductsTab/types'; + +import { useUpdateDataProductMutation } from '@graphql/dataProduct.generated'; +import { DataProduct } from '@types'; type Props = { dataProduct: DataProduct; diff --git a/datahub-web-react/src/app/entity/domain/DomainEntitiesTab.tsx b/datahub-web-react/src/app/entity/domain/DomainEntitiesTab.tsx index 9f58df9492..213f407d4e 100644 --- a/datahub-web-react/src/app/entity/domain/DomainEntitiesTab.tsx +++ b/datahub-web-react/src/app/entity/domain/DomainEntitiesTab.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { useEntityData } from '../shared/EntityContext'; -import { EntityType } from '../../../types.generated'; -import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection'; -import { UnionType } from '../../search/utils/constants'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection'; +import { UnionType } from '@app/search/utils/constants'; + +import { EntityType } from '@types'; export const DomainEntitiesTab = () => { const { urn, entityType } = useEntityData(); diff --git a/datahub-web-react/src/app/entity/domain/DomainEntity.tsx b/datahub-web-react/src/app/entity/domain/DomainEntity.tsx index 0f25f3ce56..b20b9f45e0 100644 --- a/datahub-web-react/src/app/entity/domain/DomainEntity.tsx +++ b/datahub-web-react/src/app/entity/domain/DomainEntity.tsx @@ -1,21 +1,23 @@ import * as React from 'react'; -import { Domain, EntityType, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { Preview } from './preview/Preview'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { useGetDomainQuery } from '../../../graphql/domain.generated'; -import { DomainEntitiesTab } from './DomainEntitiesTab'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import { EntityActionItem } from '../shared/entity/EntityActions'; -import DataProductsTab from './DataProductsTab/DataProductsTab'; -import { EntityProfileTab } from '../shared/constants'; -import DomainIcon from '../../domain/DomainIcon'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; + +import DomainIcon from '@app/domain/DomainIcon'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import DataProductsTab from '@app/entity/domain/DataProductsTab/DataProductsTab'; +import { DomainEntitiesTab } from '@app/entity/domain/DomainEntitiesTab'; +import { Preview } from '@app/entity/domain/preview/Preview'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfileTab } from '@app/entity/shared/constants'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { EntityActionItem } from '@app/entity/shared/entity/EntityActions'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; + +import { useGetDomainQuery } from '@graphql/domain.generated'; +import { Domain, EntityType, SearchResult } from '@types'; /** * Definition of the DataHub Domain entity. diff --git a/datahub-web-react/src/app/entity/domain/preview/DomainEntitiesSnippet.tsx b/datahub-web-react/src/app/entity/domain/preview/DomainEntitiesSnippet.tsx index a730d7ed0d..2d46e05db3 100644 --- a/datahub-web-react/src/app/entity/domain/preview/DomainEntitiesSnippet.tsx +++ b/datahub-web-react/src/app/entity/domain/preview/DomainEntitiesSnippet.tsx @@ -2,11 +2,13 @@ import { DatabaseOutlined, FileDoneOutlined } from '@ant-design/icons'; import { VerticalDivider } from '@remirror/react'; import React from 'react'; import styled from 'styled-components'; + +import DomainIcon from '@app/domain/DomainIcon'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { pluralize } from '@app/shared/textUtil'; import { useHoverEntityTooltipContext } from '@src/app/recommendations/HoverEntityTooltipContext'; -import { SearchResultFields_Domain_Fragment } from '../../../../graphql/search.generated'; -import { ANTD_GRAY_V2 } from '../../shared/constants'; -import DomainIcon from '../../../domain/DomainIcon'; -import { pluralize } from '../../../shared/textUtil'; + +import { SearchResultFields_Domain_Fragment } from '@graphql/search.generated'; const Wrapper = styled.div` color: ${ANTD_GRAY_V2[8]}; diff --git a/datahub-web-react/src/app/entity/domain/preview/Preview.tsx b/datahub-web-react/src/app/entity/domain/preview/Preview.tsx index 83198f6eba..01d6e7c90c 100644 --- a/datahub-web-react/src/app/entity/domain/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/domain/preview/Preview.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { Domain, EntityType, Owner, SearchInsight } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import DomainEntitiesSnippet from './DomainEntitiesSnippet'; -import DomainIcon from '../../../domain/DomainIcon'; + +import DomainIcon from '@app/domain/DomainIcon'; +import DomainEntitiesSnippet from '@app/entity/domain/preview/DomainEntitiesSnippet'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Domain, EntityType, Owner, SearchInsight } from '@types'; export const Preview = ({ domain, diff --git a/datahub-web-react/src/app/entity/ermodelrelationships/ERModelRelationshipEntity.tsx b/datahub-web-react/src/app/entity/ermodelrelationships/ERModelRelationshipEntity.tsx index 3eb950cb0e..5cb60287f3 100644 --- a/datahub-web-react/src/app/entity/ermodelrelationships/ERModelRelationshipEntity.tsx +++ b/datahub-web-react/src/app/entity/ermodelrelationships/ERModelRelationshipEntity.tsx @@ -1,23 +1,26 @@ +import { DatabaseFilled, DatabaseOutlined } from '@ant-design/icons'; import * as React from 'react'; -import { DatabaseOutlined, DatabaseFilled } from '@ant-design/icons'; -import { EntityType, ErModelRelationship, OwnershipType, SearchResult } from '../../../types.generated'; -import { Entity, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { GenericEntityProperties } from '../shared/types'; -import { ERModelRelationshipPreviewCard } from './preview/ERModelRelationshipPreviewCard'; -import ermodelrelationshipIcon from '../../../images/ermodelrelationshipIcon.svg'; -import { ERModelRelationshipTab } from '../shared/tabs/ERModelRelationship/ERModelRelationshipTab'; + +import { Entity, IconStyleType, PreviewType } from '@app/entity/Entity'; +import '@app/entity/ermodelrelationships/preview/ERModelRelationshipAction.less'; +import { ERModelRelationshipPreviewCard } from '@app/entity/ermodelrelationships/preview/ERModelRelationshipPreviewCard'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { ERModelRelationshipTab } from '@app/entity/shared/tabs/ERModelRelationship/ERModelRelationshipTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + import { useGetErModelRelationshipQuery, useUpdateErModelRelationshipMutation, -} from '../../../graphql/ermodelrelationship.generated'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import './preview/ERModelRelationshipAction.less'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +} from '@graphql/ermodelrelationship.generated'; +import { EntityType, ErModelRelationship, OwnershipType, SearchResult } from '@types'; + +import ermodelrelationshipIcon from '@images/ermodelrelationshipIcon.svg'; /** * Definition of the DataHub ErModelRelationship entity. diff --git a/datahub-web-react/src/app/entity/ermodelrelationships/preview/ERModelRelationshipPreviewCard.tsx b/datahub-web-react/src/app/entity/ermodelrelationships/preview/ERModelRelationshipPreviewCard.tsx index 715f935685..a4722345b2 100644 --- a/datahub-web-react/src/app/entity/ermodelrelationships/preview/ERModelRelationshipPreviewCard.tsx +++ b/datahub-web-react/src/app/entity/ermodelrelationships/preview/ERModelRelationshipPreviewCard.tsx @@ -1,10 +1,13 @@ -import React from 'react'; import { Card, Collapse } from 'antd'; -import ermodelrelationshipIcon from '../../../../images/ermodelrelationshipIcon.svg'; -import { EntityType, Owner, GlobalTags, GlossaryTerms } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { IconStyleType } from '../../Entity'; +import React from 'react'; + +import { IconStyleType } from '@app/entity/Entity'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, GlobalTags, GlossaryTerms, Owner } from '@types'; + +import ermodelrelationshipIcon from '@images/ermodelrelationshipIcon.svg'; const { Panel } = Collapse; diff --git a/datahub-web-react/src/app/entity/glossaryNode/ChildrenTab.tsx b/datahub-web-react/src/app/entity/glossaryNode/ChildrenTab.tsx index 27aca79d07..c434852000 100644 --- a/datahub-web-react/src/app/entity/glossaryNode/ChildrenTab.tsx +++ b/datahub-web-react/src/app/entity/glossaryNode/ChildrenTab.tsx @@ -1,11 +1,13 @@ import React from 'react'; -import { EntityType, GlossaryNode, GlossaryTerm } from '../../../types.generated'; -import EmptyGlossarySection from '../../glossary/EmptyGlossarySection'; -import GlossaryEntitiesList from '../../glossary/GlossaryEntitiesList'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { sortGlossaryTerms } from '../glossaryTerm/utils'; -import { useEntityData } from '../shared/EntityContext'; -import { sortGlossaryNodes } from './utils'; + +import { sortGlossaryNodes } from '@app/entity/glossaryNode/utils'; +import { sortGlossaryTerms } from '@app/entity/glossaryTerm/utils'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import EmptyGlossarySection from '@app/glossary/EmptyGlossarySection'; +import GlossaryEntitiesList from '@app/glossary/GlossaryEntitiesList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, GlossaryNode, GlossaryTerm } from '@types'; function ChildrenTab() { const { entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entity/glossaryNode/GlossaryNodeEntity.tsx b/datahub-web-react/src/app/entity/glossaryNode/GlossaryNodeEntity.tsx index 861e96811b..cce6f8d8e0 100644 --- a/datahub-web-react/src/app/entity/glossaryNode/GlossaryNodeEntity.tsx +++ b/datahub-web-react/src/app/entity/glossaryNode/GlossaryNodeEntity.tsx @@ -1,18 +1,20 @@ import { FolderFilled, FolderOutlined } from '@ant-design/icons'; import React from 'react'; -import { useGetGlossaryNodeQuery } from '../../../graphql/glossaryNode.generated'; -import { EntityType, GlossaryNode, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import ChildrenTab from './ChildrenTab'; -import { Preview } from './preview/Preview'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import ChildrenTab from '@app/entity/glossaryNode/ChildrenTab'; +import { Preview } from '@app/entity/glossaryNode/preview/Preview'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; + +import { useGetGlossaryNodeQuery } from '@graphql/glossaryNode.generated'; +import { EntityType, GlossaryNode, SearchResult } from '@types'; class GlossaryNodeEntity implements Entity { type: EntityType = EntityType.GlossaryNode; diff --git a/datahub-web-react/src/app/entity/glossaryNode/preview/Preview.tsx b/datahub-web-react/src/app/entity/glossaryNode/preview/Preview.tsx index 3938049059..90fd8bc6e8 100644 --- a/datahub-web-react/src/app/entity/glossaryNode/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/glossaryNode/preview/Preview.tsx @@ -1,8 +1,10 @@ -import React from 'react'; import { FolderOutlined } from '@ant-design/icons'; -import { EntityType, Owner, ParentNodesResult } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; +import React from 'react'; + +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, Owner, ParentNodesResult } from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entity/glossaryNode/utils.ts b/datahub-web-react/src/app/entity/glossaryNode/utils.ts index 4cf214e810..eca51858d6 100644 --- a/datahub-web-react/src/app/entity/glossaryNode/utils.ts +++ b/datahub-web-react/src/app/entity/glossaryNode/utils.ts @@ -1,5 +1,6 @@ -import { Entity, EntityType } from '../../../types.generated'; -import EntityRegistry from '../EntityRegistry'; +import EntityRegistry from '@app/entity/EntityRegistry'; + +import { Entity, EntityType } from '@types'; export function sortGlossaryNodes(entityRegistry: EntityRegistry, nodeA?: Entity | null, nodeB?: Entity | null) { const nodeAName = entityRegistry.getDisplayName(EntityType.GlossaryNode, nodeA); diff --git a/datahub-web-react/src/app/entity/glossaryTerm/GlossaryTermEntity.tsx b/datahub-web-react/src/app/entity/glossaryTerm/GlossaryTermEntity.tsx index 439cba2ea6..d33836b26d 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/GlossaryTermEntity.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/GlossaryTermEntity.tsx @@ -1,24 +1,26 @@ -import * as React from 'react'; import { BookFilled, BookOutlined } from '@ant-design/icons'; -import { EntityType, GlossaryTerm, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { Preview } from './preview/Preview'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { GetGlossaryTermQuery, useGetGlossaryTermQuery } from '../../../graphql/glossaryTerm.generated'; -import { GenericEntityProperties } from '../shared/types'; -import { SchemaTab } from '../shared/tabs/Dataset/Schema/SchemaTab'; -import GlossaryRelatedEntity from './profile/GlossaryRelatedEntity'; -import GlossayRelatedTerms from './profile/GlossaryRelatedTerms'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import { EntityActionItem } from '../shared/entity/EntityActions'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { PageRoutes } from '../../../conf/Global'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/glossaryTerm/preview/Preview'; +import GlossaryRelatedEntity from '@app/entity/glossaryTerm/profile/GlossaryRelatedEntity'; +import GlossayRelatedTerms from '@app/entity/glossaryTerm/profile/GlossaryRelatedTerms'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { EntityActionItem } from '@app/entity/shared/entity/EntityActions'; +import { SchemaTab } from '@app/entity/shared/tabs/Dataset/Schema/SchemaTab'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { PageRoutes } from '@conf/Global'; + +import { GetGlossaryTermQuery, useGetGlossaryTermQuery } from '@graphql/glossaryTerm.generated'; +import { EntityType, GlossaryTerm, SearchResult } from '@types'; /** * Definition of the DataHub Dataset entity. diff --git a/datahub-web-react/src/app/entity/glossaryTerm/preview/Preview.tsx b/datahub-web-react/src/app/entity/glossaryTerm/preview/Preview.tsx index ee87633cb6..7d8577153d 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/preview/Preview.tsx @@ -1,11 +1,13 @@ -import React from 'react'; import { BookOutlined } from '@ant-design/icons'; -import { Deprecation, Domain, EntityType, Owner, ParentNodesResult } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; -import UrlButton from '../../shared/UrlButton'; -import { getRelatedEntitiesUrl } from '../utils'; +import React from 'react'; + +import { IconStyleType, PreviewType } from '@app/entity/Entity'; +import { getRelatedEntitiesUrl } from '@app/entity/glossaryTerm/utils'; +import UrlButton from '@app/entity/shared/UrlButton'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Deprecation, Domain, EntityType, Owner, ParentNodesResult } from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entity/glossaryTerm/preview/__tests__/Preview.test.tsx b/datahub-web-react/src/app/entity/glossaryTerm/preview/__tests__/Preview.test.tsx index 90aa0238c1..02b9508c3b 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/preview/__tests__/Preview.test.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/preview/__tests__/Preview.test.tsx @@ -1,10 +1,11 @@ import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import React from 'react'; -import { mocks } from '../../../../../Mocks'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { Preview } from '../Preview'; -import { PreviewType } from '../../../Entity'; + +import { PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/glossaryTerm/preview/Preview'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('Preview', () => { it('renders', () => { diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx index 9131af265a..19a18060cf 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx @@ -1,17 +1,19 @@ -import { message, Button, Modal, Select, Tag } from 'antd'; +import { Button, Modal, Select, Tag, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { useAddRelatedTermsMutation } from '../../../../graphql/glossaryTerm.generated'; -import { useGetSearchResultsLazyQuery } from '../../../../graphql/search.generated'; -import { EntityType, SearchResult, TermRelationshipType } from '../../../../types.generated'; -import GlossaryBrowser from '../../../glossary/GlossaryBrowser/GlossaryBrowser'; -import ClickOutside from '../../../shared/ClickOutside'; -import { BrowserWrapper } from '../../../shared/tags/AddTagsTermsModal'; -import TermLabel from '../../../shared/TermLabel'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useEntityData, useRefetch } from '../../shared/EntityContext'; -import ParentEntities from '../../../search/filters/ParentEntities'; -import { getParentEntities } from '../../../search/filters/utils'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import GlossaryBrowser from '@app/glossary/GlossaryBrowser/GlossaryBrowser'; +import ParentEntities from '@app/search/filters/ParentEntities'; +import { getParentEntities } from '@app/search/filters/utils'; +import ClickOutside from '@app/shared/ClickOutside'; +import TermLabel from '@app/shared/TermLabel'; +import { BrowserWrapper } from '@app/shared/tags/AddTagsTermsModal'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useAddRelatedTermsMutation } from '@graphql/glossaryTerm.generated'; +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { EntityType, SearchResult, TermRelationshipType } from '@types'; const StyledSelect = styled(Select)` width: 480px; diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedEntity.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedEntity.tsx index 6959fc082f..2dd49439b9 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedEntity.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedEntity.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; -import { UnionType } from '../../../search/utils/constants'; -import { EmbeddedListSearchSection } from '../../shared/components/styled/search/EmbeddedListSearchSection'; -import { useEntityData } from '../../shared/EntityContext'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection'; +import { UnionType } from '@app/search/utils/constants'; export default function GlossaryRelatedEntity() { const { entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTerms.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTerms.tsx index 61ea2c3299..2ab9531ffc 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTerms.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTerms.tsx @@ -1,8 +1,11 @@ import { Menu } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components/macro'; -import { useEntityData } from '../../shared/EntityContext'; -import GlossaryRelatedTermsResult, { RelatedTermTypes } from './GlossaryRelatedTermsResult'; + +import GlossaryRelatedTermsResult, { + RelatedTermTypes, +} from '@app/entity/glossaryTerm/profile/GlossaryRelatedTermsResult'; +import { useEntityData } from '@app/entity/shared/EntityContext'; const DetailWrapper = styled.div` display: inline-flex; diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx index f9d565950f..52a08e44bb 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx @@ -2,13 +2,15 @@ import { PlusOutlined } from '@ant-design/icons'; import { Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; + +import AddRelatedTermsModal from '@app/entity/glossaryTerm/profile/AddRelatedTermsModal'; +import RelatedTerm from '@app/entity/glossaryTerm/profile/RelatedTerm'; +import { EmptyTab } from '@app/entity/shared/components/styled/EmptyTab'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { Message } from '@app/shared/Message'; import { Button } from '@src/alchemy-components'; -import { TermRelationshipType } from '../../../../types.generated'; -import { Message } from '../../../shared/Message'; -import { EmptyTab } from '../../shared/components/styled/EmptyTab'; -import { ANTD_GRAY } from '../../shared/constants'; -import AddRelatedTermsModal from './AddRelatedTermsModal'; -import RelatedTerm from './RelatedTerm'; + +import { TermRelationshipType } from '@types'; export enum RelatedTermTypes { hasRelatedTerms = 'Contains', diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossarySidebarAboutSection.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossarySidebarAboutSection.tsx index 79160cea36..0565cbf95b 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossarySidebarAboutSection.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossarySidebarAboutSection.tsx @@ -1,9 +1,10 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import StripMarkdownText from '../../shared/components/styled/StripMarkdownText'; -import { SidebarHeader } from '../../shared/containers/profile/sidebar/SidebarHeader'; -import { useEntityData, useRouteToTab } from '../../shared/EntityContext'; + +import { useEntityData, useRouteToTab } from '@app/entity/shared/EntityContext'; +import StripMarkdownText from '@app/entity/shared/components/styled/StripMarkdownText'; +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; const DescriptionTypography = styled(Typography.Paragraph)` max-width: 65ch; diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryTermHeader.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryTermHeader.tsx index fdf007d0c6..104ae35f35 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryTermHeader.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryTermHeader.tsx @@ -1,7 +1,8 @@ import { Divider, Space, Typography } from 'antd'; import React from 'react'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { AvatarsGroup } from '../../../shared/avatar'; + +import { AvatarsGroup } from '@app/shared/avatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; type Props = { definition: string; diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/RelatedTerm.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/RelatedTerm.tsx index 4db28768c6..51f82ffae5 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/profile/RelatedTerm.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/RelatedTerm.tsx @@ -2,11 +2,13 @@ import { DeleteOutlined, MoreOutlined } from '@ant-design/icons'; import { Divider, Dropdown } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { useGetGlossaryTermQuery } from '../../../../graphql/glossaryTerm.generated'; -import { EntityType, TermRelationshipType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { PreviewType } from '../../Entity'; -import useRemoveRelatedTerms from './useRemoveRelatedTerms'; + +import { PreviewType } from '@app/entity/Entity'; +import useRemoveRelatedTerms from '@app/entity/glossaryTerm/profile/useRemoveRelatedTerms'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetGlossaryTermQuery } from '@graphql/glossaryTerm.generated'; +import { EntityType, TermRelationshipType } from '@types'; const ListItem = styled.div` margin: 0 20px; diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/SchemaView.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/SchemaView.tsx index 46484459ba..e004c9d1c5 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/profile/SchemaView.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/SchemaView.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Empty, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; export type Props = { diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx index 1f791ddebe..86b6b19c75 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx @@ -1,9 +1,10 @@ +import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import React from 'react'; -import { MockedProvider } from '@apollo/client/testing'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import GlossaryRelatedTerms from '../GlossaryRelatedTerms'; -import { mocks } from '../../../../../Mocks'; + +import GlossaryRelatedTerms from '@app/entity/glossaryTerm/profile/GlossaryRelatedTerms'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('Glossary Related Terms', () => { it('renders and print hasRelatedTerms detail by default', async () => { diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx index 0dfc088143..79560ab5de 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx @@ -1,9 +1,10 @@ import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import React from 'react'; -import { mocks } from '../../../../../Mocks'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import GlossaryTermHeader from '../GlossaryTermHeader'; + +import GlossaryTermHeader from '@app/entity/glossaryTerm/profile/GlossaryTermHeader'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; const glossaryTermHeaderData = { definition: 'this is sample definition', diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/useRemoveRelatedTerms.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/useRemoveRelatedTerms.tsx index 0eb4692424..6d425ef32b 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/profile/useRemoveRelatedTerms.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/useRemoveRelatedTerms.tsx @@ -1,8 +1,10 @@ -import { message, Modal } from 'antd'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useEntityData, useRefetch } from '../../shared/EntityContext'; -import { useRemoveRelatedTermsMutation } from '../../../../graphql/glossaryTerm.generated'; -import { TermRelationshipType } from '../../../../types.generated'; +import { Modal, message } from 'antd'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useRemoveRelatedTermsMutation } from '@graphql/glossaryTerm.generated'; +import { TermRelationshipType } from '@types'; function useRemoveRelatedTerms(termUrn: string, relationshipType: TermRelationshipType, displayName: string) { const { urn, entityType } = useEntityData(); diff --git a/datahub-web-react/src/app/entity/glossaryTerm/utils.ts b/datahub-web-react/src/app/entity/glossaryTerm/utils.ts index cbfa76fa34..654126961f 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/utils.ts +++ b/datahub-web-react/src/app/entity/glossaryTerm/utils.ts @@ -1,5 +1,6 @@ -import { Entity, EntityType } from '../../../types.generated'; -import EntityRegistry from '../EntityRegistry'; +import EntityRegistry from '@app/entity/EntityRegistry'; + +import { Entity, EntityType } from '@types'; export function sortGlossaryTerms(entityRegistry: EntityRegistry, nodeA?: Entity | null, nodeB?: Entity | null) { const nodeAName = entityRegistry.getDisplayName(EntityType.GlossaryTerm, nodeA) || ''; diff --git a/datahub-web-react/src/app/entity/group/AddGroupMembersModal.tsx b/datahub-web-react/src/app/entity/group/AddGroupMembersModal.tsx index db1ec3355e..04235fc8d2 100644 --- a/datahub-web-react/src/app/entity/group/AddGroupMembersModal.tsx +++ b/datahub-web-react/src/app/entity/group/AddGroupMembersModal.tsx @@ -1,12 +1,14 @@ +import { Button, Form, Modal, Select, Tag, message } from 'antd'; import React, { useRef, useState } from 'react'; -import { message, Modal, Button, Form, Select, Tag } from 'antd'; import styled from 'styled-components'; -import { useAddGroupMembersMutation } from '../../../graphql/group.generated'; -import { CorpUser, Entity, EntityType } from '../../../types.generated'; -import { useGetSearchResultsLazyQuery } from '../../../graphql/search.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { useGetRecommendations } from '../../shared/recommendation'; -import { OwnerLabel } from '../../shared/OwnerLabel'; + +import { OwnerLabel } from '@app/shared/OwnerLabel'; +import { useGetRecommendations } from '@app/shared/recommendation'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useAddGroupMembersMutation } from '@graphql/group.generated'; +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { CorpUser, Entity, EntityType } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/entity/group/EditGroupDescriptionModal.tsx b/datahub-web-react/src/app/entity/group/EditGroupDescriptionModal.tsx index 5c67274505..e477588c37 100644 --- a/datahub-web-react/src/app/entity/group/EditGroupDescriptionModal.tsx +++ b/datahub-web-react/src/app/entity/group/EditGroupDescriptionModal.tsx @@ -1,9 +1,9 @@ +import { Button, Form, Modal } from 'antd'; import React, { useState } from 'react'; -import { Button, Modal, Form } from 'antd'; import styled from 'styled-components'; -import { Editor } from '../shared/tabs/Documentation/components/editor/Editor'; -import { ANTD_GRAY } from '../shared/constants'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; type Props = { onClose: () => void; diff --git a/datahub-web-react/src/app/entity/group/Group.tsx b/datahub-web-react/src/app/entity/group/Group.tsx index 763db856f3..26bc5fcc88 100644 --- a/datahub-web-react/src/app/entity/group/Group.tsx +++ b/datahub-web-react/src/app/entity/group/Group.tsx @@ -1,10 +1,12 @@ import { TeamOutlined } from '@ant-design/icons'; import * as React from 'react'; -import { CorpGroup, EntityType, SearchResult } from '../../../types.generated'; -import { Entity, IconStyleType, PreviewType } from '../Entity'; -import { Preview } from './preview/Preview'; -import GroupProfile from './GroupProfile'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; + +import { Entity, IconStyleType, PreviewType } from '@app/entity/Entity'; +import GroupProfile from '@app/entity/group/GroupProfile'; +import { Preview } from '@app/entity/group/preview/Preview'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; + +import { CorpGroup, EntityType, SearchResult } from '@types'; /** * Definition of the DataHub CorpGroup entity. diff --git a/datahub-web-react/src/app/entity/group/GroupAssets.tsx b/datahub-web-react/src/app/entity/group/GroupAssets.tsx index c319285d64..0951cd2a05 100644 --- a/datahub-web-react/src/app/entity/group/GroupAssets.tsx +++ b/datahub-web-react/src/app/entity/group/GroupAssets.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { UnionType } from '../../search/utils/constants'; -import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection'; + +import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection'; +import { UnionType } from '@app/search/utils/constants'; const GroupAssetsWrapper = styled.div` height: calc(100vh - 114px); diff --git a/datahub-web-react/src/app/entity/group/GroupEditModal.tsx b/datahub-web-react/src/app/entity/group/GroupEditModal.tsx index 6a3354eb35..b74c565e01 100644 --- a/datahub-web-react/src/app/entity/group/GroupEditModal.tsx +++ b/datahub-web-react/src/app/entity/group/GroupEditModal.tsx @@ -1,7 +1,9 @@ +import { Button, Form, Input, Modal, Typography, message } from 'antd'; import React, { useEffect, useState } from 'react'; -import { message, Button, Input, Modal, Typography, Form } from 'antd'; -import { useUpdateCorpGroupPropertiesMutation } from '../../../graphql/group.generated'; -import { useEnterKeyListener } from '../../shared/useEnterKeyListener'; + +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; + +import { useUpdateCorpGroupPropertiesMutation } from '@graphql/group.generated'; type PropsData = { email: string | undefined; diff --git a/datahub-web-react/src/app/entity/group/GroupInfoSideBar.tsx b/datahub-web-react/src/app/entity/group/GroupInfoSideBar.tsx index af3f89f7c2..b174ef4da2 100644 --- a/datahub-web-react/src/app/entity/group/GroupInfoSideBar.tsx +++ b/datahub-web-react/src/app/entity/group/GroupInfoSideBar.tsx @@ -1,31 +1,32 @@ -import { Divider, message, Space, Button, Typography, Row, Col, Tooltip } from 'antd'; -import React, { useEffect, useState } from 'react'; -import styled from 'styled-components'; import { EditOutlined, LockOutlined, MailOutlined, SlackOutlined } from '@ant-design/icons'; +import { Button, Col, Divider, Row, Space, Tooltip, Typography, message } from 'antd'; +import React, { useEffect, useState } from 'react'; import { useHistory, useRouteMatch } from 'react-router-dom'; -import { useUpdateCorpGroupPropertiesMutation } from '../../../graphql/group.generated'; -import { EntityRelationshipsResult, Ownership } from '../../../types.generated'; -import { useUpdateNameMutation } from '../../../graphql/mutations.generated'; +import styled from 'styled-components'; -import GroupEditModal from './GroupEditModal'; -import CustomAvatar from '../../shared/avatar/CustomAvatar'; -import GroupOwnerSideBarSection from './GroupOwnerSideBarSection'; +import { useUserContext } from '@app/context/useUserContext'; +import EditGroupDescriptionModal from '@app/entity/group/EditGroupDescriptionModal'; +import GroupEditModal from '@app/entity/group/GroupEditModal'; +import GroupMembersSideBarSection from '@app/entity/group/GroupMembersSideBarSection'; +import GroupOwnerSideBarSection from '@app/entity/group/GroupOwnerSideBarSection'; import { + AboutSection, + EditButton, + EmptyValue, + GroupsSection, SideBar, SideBarSubSection, - EmptyValue, SocialDetails, - EditButton, - GroupsSection, - AboutSection, -} from '../shared/SidebarStyledComponents'; -import GroupMembersSideBarSection from './GroupMembersSideBarSection'; -import { useUserContext } from '../../context/useUserContext'; -import { useBrowserTitle } from '../../shared/BrowserTabTitleContext'; -import StripMarkdownText, { removeMarkdown } from '../shared/components/styled/StripMarkdownText'; -import { Editor } from '../shared/tabs/Documentation/components/editor/Editor'; -import EditGroupDescriptionModal from './EditGroupDescriptionModal'; -import { REDESIGN_COLORS } from '../shared/constants'; +} from '@app/entity/shared/SidebarStyledComponents'; +import StripMarkdownText, { removeMarkdown } from '@app/entity/shared/components/styled/StripMarkdownText'; +import { REDESIGN_COLORS } from '@app/entity/shared/constants'; +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; +import { useBrowserTitle } from '@app/shared/BrowserTabTitleContext'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; + +import { useUpdateCorpGroupPropertiesMutation } from '@graphql/group.generated'; +import { useUpdateNameMutation } from '@graphql/mutations.generated'; +import { EntityRelationshipsResult, Ownership } from '@types'; type SideBarData = { photoUrl: string | undefined; diff --git a/datahub-web-react/src/app/entity/group/GroupMembers.tsx b/datahub-web-react/src/app/entity/group/GroupMembers.tsx index 28e81b438d..956c57b154 100644 --- a/datahub-web-react/src/app/entity/group/GroupMembers.tsx +++ b/datahub-web-react/src/app/entity/group/GroupMembers.tsx @@ -1,14 +1,16 @@ -import React, { useState } from 'react'; import { MoreOutlined, UserAddOutlined, UserDeleteOutlined } from '@ant-design/icons'; -import { Col, Dropdown, message, Modal, Pagination, Row, Empty, Button, Typography, MenuProps } from 'antd'; +import { Button, Col, Dropdown, Empty, MenuProps, Modal, Pagination, Row, Typography, message } from 'antd'; +import React, { useState } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { useGetAllGroupMembersQuery, useRemoveGroupMembersMutation } from '../../../graphql/group.generated'; -import { CorpUser, EntityType } from '../../../types.generated'; -import { CustomAvatar } from '../../shared/avatar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { AddGroupMembersModal } from './AddGroupMembersModal'; -import { scrollToTop } from '../../shared/searchUtils'; + +import { AddGroupMembersModal } from '@app/entity/group/AddGroupMembersModal'; +import { CustomAvatar } from '@app/shared/avatar'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetAllGroupMembersQuery, useRemoveGroupMembersMutation } from '@graphql/group.generated'; +import { CorpUser, EntityType } from '@types'; const ADD_MEMBER_STYLE = { backGround: '#ffffff', diff --git a/datahub-web-react/src/app/entity/group/GroupMembersSideBarSection.tsx b/datahub-web-react/src/app/entity/group/GroupMembersSideBarSection.tsx index 1788a050bf..1a7d4465da 100644 --- a/datahub-web-react/src/app/entity/group/GroupMembersSideBarSection.tsx +++ b/datahub-web-react/src/app/entity/group/GroupMembersSideBarSection.tsx @@ -2,9 +2,7 @@ import { Tag, Tooltip } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { CorpUser, EntityRelationship, EntityType } from '../../../types.generated'; -import { CustomAvatar } from '../../shared/avatar'; -import { useEntityRegistry } from '../../useEntityRegistry'; + import { DisplayCount, EmptyValue, @@ -12,7 +10,11 @@ import { GroupSectionTitle, GroupsSeeMoreText, TagsSection, -} from '../shared/SidebarStyledComponents'; +} from '@app/entity/shared/SidebarStyledComponents'; +import { CustomAvatar } from '@app/shared/avatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, EntityRelationship, EntityType } from '@types'; const TITLE = 'Members'; diff --git a/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx b/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx index 95ac2e6787..2ad254adb0 100644 --- a/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx +++ b/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx @@ -2,10 +2,12 @@ import { PlusOutlined } from '@ant-design/icons'; import { Button, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { EntityType, Ownership } from '../../../types.generated'; -import { ExpandedOwner } from '../shared/components/styled/ExpandedOwner/ExpandedOwner'; -import { EditOwnersModal } from '../shared/containers/profile/sidebar/Ownership/EditOwnersModal'; -import { DisplayCount, GroupSectionTitle, GroupSectionHeader } from '../shared/SidebarStyledComponents'; + +import { DisplayCount, GroupSectionHeader, GroupSectionTitle } from '@app/entity/shared/SidebarStyledComponents'; +import { ExpandedOwner } from '@app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner'; +import { EditOwnersModal } from '@app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal'; + +import { EntityType, Ownership } from '@types'; const TITLE = 'Owners'; diff --git a/datahub-web-react/src/app/entity/group/GroupProfile.tsx b/datahub-web-react/src/app/entity/group/GroupProfile.tsx index e8001ebccc..ec41a78f2a 100644 --- a/datahub-web-react/src/app/entity/group/GroupProfile.tsx +++ b/datahub-web-react/src/app/entity/group/GroupProfile.tsx @@ -1,17 +1,19 @@ -import React from 'react'; import { Col, Row } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { useGetGroupQuery } from '../../../graphql/group.generated'; -import useUserParams from '../../shared/entitySearch/routingUtils/useUserParams'; -import { OriginType, EntityRelationshipsResult, Ownership } from '../../../types.generated'; -import { Message } from '../../shared/Message'; -import GroupMembers from './GroupMembers'; -import { decodeUrn } from '../shared/utils'; -import { RoutedTabs } from '../../shared/RoutedTabs'; -import GroupInfoSidebar from './GroupInfoSideBar'; -import { GroupAssets } from './GroupAssets'; -import { ErrorSection } from '../../shared/error/ErrorSection'; -import NonExistentEntityPage from '../shared/entity/NonExistentEntityPage'; + +import { GroupAssets } from '@app/entity/group/GroupAssets'; +import GroupInfoSidebar from '@app/entity/group/GroupInfoSideBar'; +import GroupMembers from '@app/entity/group/GroupMembers'; +import NonExistentEntityPage from '@app/entity/shared/entity/NonExistentEntityPage'; +import { decodeUrn } from '@app/entity/shared/utils'; +import { Message } from '@app/shared/Message'; +import { RoutedTabs } from '@app/shared/RoutedTabs'; +import useUserParams from '@app/shared/entitySearch/routingUtils/useUserParams'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; + +import { useGetGroupQuery } from '@graphql/group.generated'; +import { EntityRelationshipsResult, OriginType, Ownership } from '@types'; const messageStyle = { marginTop: '10%' }; diff --git a/datahub-web-react/src/app/entity/group/preview/Preview.tsx b/datahub-web-react/src/app/entity/group/preview/Preview.tsx index 5b9a25e198..3899ceba91 100644 --- a/datahub-web-react/src/app/entity/group/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/group/preview/Preview.tsx @@ -1,14 +1,15 @@ -import React from 'react'; import { Tag, Typography } from 'antd'; +import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../shared/constants'; -import { IconStyleType } from '../../Entity'; -import NoMarkdownViewer from '../../shared/components/styled/StripMarkdownText'; -import SearchTextHighlighter from '../../../search/matches/SearchTextHighlighter'; +import { IconStyleType } from '@app/entity/Entity'; +import NoMarkdownViewer from '@app/entity/shared/components/styled/StripMarkdownText'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import SearchTextHighlighter from '@app/search/matches/SearchTextHighlighter'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const PreviewContainer = styled.div` margin-bottom: 4px; diff --git a/datahub-web-react/src/app/entity/mlFeature/MLFeatureEntity.tsx b/datahub-web-react/src/app/entity/mlFeature/MLFeatureEntity.tsx index faad2600dc..9e3f9bfe85 100644 --- a/datahub-web-react/src/app/entity/mlFeature/MLFeatureEntity.tsx +++ b/datahub-web-react/src/app/entity/mlFeature/MLFeatureEntity.tsx @@ -1,25 +1,27 @@ -import * as React from 'react'; import { DotChartOutlined } from '@ant-design/icons'; -import { MlFeature, EntityType, SearchResult, OwnershipType } from '../../../types.generated'; -import { Preview } from './preview/Preview'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { GenericEntityProperties } from '../shared/types'; -import { useGetMlFeatureQuery } from '../../../graphql/mlFeature.generated'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { FeatureTableTab } from '../shared/tabs/ML/MlFeatureFeatureTableTab'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { getDataProduct } from '../shared/utils'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; -import { IncidentTab } from '../shared/tabs/Incident/IncidentTab'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/mlFeature/preview/Preview'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab'; +import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab'; +import { FeatureTableTab } from '@app/entity/shared/tabs/ML/MlFeatureFeatureTableTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getDataProduct } from '@app/entity/shared/utils'; + +import { useGetMlFeatureQuery } from '@graphql/mlFeature.generated'; +import { EntityType, MlFeature, OwnershipType, SearchResult } from '@types'; /** * Definition of the DataHub MLFeature entity. diff --git a/datahub-web-react/src/app/entity/mlFeature/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlFeature/preview/Preview.tsx index 57a8b375bd..7793a5e709 100644 --- a/datahub-web-react/src/app/entity/mlFeature/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/mlFeature/preview/Preview.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { DataPlatform, DataProduct, EntityPath, EntityType, Owner } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; + +import { IconStyleType } from '@app/entity/Entity'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DataPlatform, DataProduct, EntityPath, EntityType, Owner } from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/MLFeatureTableEntity.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/MLFeatureTableEntity.tsx index 56d4622311..f3639e9859 100644 --- a/datahub-web-react/src/app/entity/mlFeatureTable/MLFeatureTableEntity.tsx +++ b/datahub-web-react/src/app/entity/mlFeatureTable/MLFeatureTableEntity.tsx @@ -1,25 +1,27 @@ -import * as React from 'react'; import { DotChartOutlined } from '@ant-design/icons'; -import { MlFeatureTable, EntityType, SearchResult, OwnershipType } from '../../../types.generated'; -import { Preview } from './preview/Preview'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { GenericEntityProperties } from '../shared/types'; -import { useGetMlFeatureTableQuery } from '../../../graphql/mlFeatureTable.generated'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import MlFeatureTableFeatures from './profile/features/MlFeatureTableFeatures'; -import Sources from './profile/Sources'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { getDataProduct } from '../shared/utils'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/mlFeatureTable/preview/Preview'; +import Sources from '@app/entity/mlFeatureTable/profile/Sources'; +import MlFeatureTableFeatures from '@app/entity/mlFeatureTable/profile/features/MlFeatureTableFeatures'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getDataProduct } from '@app/entity/shared/utils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { useGetMlFeatureTableQuery } from '@graphql/mlFeatureTable.generated'; +import { EntityType, MlFeatureTable, OwnershipType, SearchResult } from '@types'; /** * Definition of the DataHub MLFeatureTable entity. diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/preview/Preview.tsx index 97065d9f6d..dcdad78f5a 100644 --- a/datahub-web-react/src/app/entity/mlFeatureTable/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/mlFeatureTable/preview/Preview.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { DataProduct, EntityPath, EntityType, Owner } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; + +import { IconStyleType } from '@app/entity/Entity'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DataProduct, EntityPath, EntityType, Owner } from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/profile/MLFeatureTableHeader.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/profile/MLFeatureTableHeader.tsx index 82a1adb54d..4bfa562c39 100644 --- a/datahub-web-react/src/app/entity/mlFeatureTable/profile/MLFeatureTableHeader.tsx +++ b/datahub-web-react/src/app/entity/mlFeatureTable/profile/MLFeatureTableHeader.tsx @@ -1,12 +1,14 @@ import { Image, Row, Space, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { MlFeatureTable } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import CompactContext from '../../../shared/CompactContext'; -import { AvatarsGroup } from '../../../shared/avatar'; -import MarkdownViewer from '../../shared/components/legacy/MarkdownViewer'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; + +import MarkdownViewer from '@app/entity/shared/components/legacy/MarkdownViewer'; +import CompactContext from '@app/shared/CompactContext'; +import { AvatarsGroup } from '@app/shared/avatar'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { MlFeatureTable } from '@types'; const HeaderInfoItem = styled.div` display: inline-block; diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/profile/Sources.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/profile/Sources.tsx index 56c0fcbb60..3c21eced46 100644 --- a/datahub-web-react/src/app/entity/mlFeatureTable/profile/Sources.tsx +++ b/datahub-web-react/src/app/entity/mlFeatureTable/profile/Sources.tsx @@ -1,12 +1,14 @@ import { List, Typography } from 'antd'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { GetMlFeatureTableQuery } from '../../../../graphql/mlFeatureTable.generated'; -import { Dataset, EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { PreviewType } from '../../Entity'; -import { useBaseEntity } from '../../shared/EntityContext'; -import { notEmpty } from '../../shared/utils'; + +import { PreviewType } from '@app/entity/Entity'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { notEmpty } from '@app/entity/shared/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetMlFeatureTableQuery } from '@graphql/mlFeatureTable.generated'; +import { Dataset, EntityType } from '@types'; const ViewRawButtonContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx index 2d0b2f1cfc..7f72f20612 100644 --- a/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx +++ b/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx @@ -1,23 +1,25 @@ import { - UnorderedListOutlined, - FieldStringOutlined, + AudioOutlined, ClockCircleOutlined, + FieldBinaryOutlined, + FieldStringOutlined, + FileImageOutlined, + LineChartOutlined, + NumberOutlined, + OrderedListOutlined, QuestionOutlined, StopOutlined, - OrderedListOutlined, - NumberOutlined, - AudioOutlined, + UnorderedListOutlined, VideoCameraOutlined, - FileImageOutlined, - FieldBinaryOutlined, - LineChartOutlined, } from '@ant-design/icons'; import { Tooltip, Typography } from 'antd'; import React, { FC } from 'react'; import { VscFileBinary } from 'react-icons/vsc'; import styled from 'styled-components'; -import { capitalizeFirstLetter } from '../../../../shared/textUtil'; -import { MlFeatureDataType } from '../../../../../types.generated'; + +import { capitalizeFirstLetter } from '@app/shared/textUtil'; + +import { MlFeatureDataType } from '@types'; const TypeIconContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx index 7a3a933140..cb7a92a204 100644 --- a/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx +++ b/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx @@ -1,10 +1,11 @@ import React from 'react'; -import { MlPrimaryKey, MlFeature } from '../../../../../types.generated'; -import { GetMlFeatureTableQuery } from '../../../../../graphql/mlFeatureTable.generated'; -import { useBaseEntity } from '../../../shared/EntityContext'; -import { notEmpty } from '../../../shared/utils'; -import TableOfMlFeatures from './TableOfMlFeatures'; +import TableOfMlFeatures from '@app/entity/mlFeatureTable/profile/features/TableOfMlFeatures'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { notEmpty } from '@app/entity/shared/utils'; + +import { GetMlFeatureTableQuery } from '@graphql/mlFeatureTable.generated'; +import { MlFeature, MlPrimaryKey } from '@types'; export default function MlFeatureTableFeatures() { const baseEntity = useBaseEntity(); diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/TableOfMlFeatures.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/TableOfMlFeatures.tsx index 1c3cbf1def..5c8d6a2df2 100644 --- a/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/TableOfMlFeatures.tsx +++ b/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/TableOfMlFeatures.tsx @@ -1,17 +1,18 @@ -import React, { useState } from 'react'; -import { Table, Typography } from 'antd'; import { CheckSquareOutlined } from '@ant-design/icons'; +import { Table, Typography } from 'antd'; import { AlignType } from 'rc-table/lib/interface'; -import styled from 'styled-components'; +import React, { useState } from 'react'; import { Link } from 'react-router-dom'; +import styled from 'styled-components'; -import MlFeatureDataTypeIcon from './MlFeatureDataTypeIcon'; -import { MlFeatureDataType, MlPrimaryKey, MlFeature } from '../../../../../types.generated'; -import { useRefetch } from '../../../shared/EntityContext'; -import TagTermGroup from '../../../../shared/tags/TagTermGroup'; -import SchemaDescriptionField from '../../../dataset/profile/schema/components/SchemaDescriptionField'; -import { useUpdateDescriptionMutation } from '../../../../../graphql/mutations.generated'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; +import SchemaDescriptionField from '@app/entity/dataset/profile/schema/components/SchemaDescriptionField'; +import MlFeatureDataTypeIcon from '@app/entity/mlFeatureTable/profile/features/MlFeatureDataTypeIcon'; +import { useRefetch } from '@app/entity/shared/EntityContext'; +import TagTermGroup from '@app/shared/tags/TagTermGroup'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useUpdateDescriptionMutation } from '@graphql/mutations.generated'; +import { MlFeature, MlFeatureDataType, MlPrimaryKey } from '@types'; const FeaturesContainer = styled.div` margin-bottom: 100px; diff --git a/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx b/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx index 12e78ea761..e9e9d137be 100644 --- a/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx +++ b/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx @@ -1,25 +1,27 @@ -import * as React from 'react'; import { CodeSandboxOutlined } from '@ant-design/icons'; -import { MlModel, EntityType, SearchResult, OwnershipType } from '../../../types.generated'; -import { Preview } from './preview/Preview'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { useGetMlModelQuery } from '../../../graphql/mlModel.generated'; -import { GenericEntityProperties } from '../shared/types'; -import MLModelSummary from './profile/MLModelSummary'; -import MLModelGroupsTab from './profile/MLModelGroupsTab'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import MlModelFeaturesTab from './profile/MlModelFeaturesTab'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; -import { IncidentTab } from '../shared/tabs/Incident/IncidentTab'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/mlModel/preview/Preview'; +import MLModelGroupsTab from '@app/entity/mlModel/profile/MLModelGroupsTab'; +import MLModelSummary from '@app/entity/mlModel/profile/MLModelSummary'; +import MlModelFeaturesTab from '@app/entity/mlModel/profile/MlModelFeaturesTab'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + +import { useGetMlModelQuery } from '@graphql/mlModel.generated'; +import { EntityType, MlModel, OwnershipType, SearchResult } from '@types'; /** * Definition of the DataHub MlModel entity. diff --git a/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx index 7ea33ba4c1..0ee5698658 100644 --- a/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx @@ -1,10 +1,12 @@ import React from 'react'; -import { EntityPath, EntityType, MlModel } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; -import { getDataProduct } from '../../shared/utils'; + +import { IconStyleType } from '@app/entity/Entity'; +import { getDataProduct } from '@app/entity/shared/utils'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityPath, EntityType, MlModel } from '@types'; export const Preview = ({ model, diff --git a/datahub-web-react/src/app/entity/mlModel/profile/MLModelGroupsTab.tsx b/datahub-web-react/src/app/entity/mlModel/profile/MLModelGroupsTab.tsx index bea8e144e5..fda5a50ea4 100644 --- a/datahub-web-react/src/app/entity/mlModel/profile/MLModelGroupsTab.tsx +++ b/datahub-web-react/src/app/entity/mlModel/profile/MLModelGroupsTab.tsx @@ -1,13 +1,14 @@ -import React from 'react'; import { Space, Table, Typography } from 'antd'; -import Link from 'antd/lib/typography/Link'; import { ColumnsType } from 'antd/es/table'; +import Link from 'antd/lib/typography/Link'; +import React from 'react'; import styled from 'styled-components'; -import { EntityType, MlModelGroup } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useBaseEntity } from '../../shared/EntityContext'; -import { GetMlModelQuery } from '../../../../graphql/mlModel.generated'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetMlModelQuery } from '@graphql/mlModel.generated'; +import { EntityType, MlModelGroup } from '@types'; const TabContent = styled.div` padding: 16px; diff --git a/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx b/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx index 4041bc83ae..7e7652b30b 100644 --- a/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx +++ b/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx @@ -1,16 +1,19 @@ -import React from 'react'; -import styled from 'styled-components'; import { Space, Table, Typography } from 'antd'; +import React from 'react'; import { Link } from 'react-router-dom'; +import styled from 'styled-components'; + +import { Pill } from '@components/components/Pills'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { InfoItem } from '@app/entity/shared/components/styled/InfoItem'; +import { notEmpty } from '@app/entity/shared/utils'; +import { TimestampPopover } from '@app/sharedV2/TimestampPopover'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { colors } from '@src/alchemy-components/theme'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { MlHyperParam, MlMetric, EntityType } from '../../../../types.generated'; -import { useBaseEntity } from '../../shared/EntityContext'; -import { GetMlModelQuery } from '../../../../graphql/mlModel.generated'; -import { InfoItem } from '../../shared/components/styled/InfoItem'; -import { notEmpty } from '../../shared/utils'; -import { Pill } from '../../../../alchemy-components/components/Pills'; -import { TimestampPopover } from '../../../sharedV2/TimestampPopover'; + +import { GetMlModelQuery } from '@graphql/mlModel.generated'; +import { EntityType, MlHyperParam, MlMetric } from '@types'; const TabContent = styled.div` padding: 16px; diff --git a/datahub-web-react/src/app/entity/mlModel/profile/MlModelFeaturesTab.tsx b/datahub-web-react/src/app/entity/mlModel/profile/MlModelFeaturesTab.tsx index 7fd719177d..cac4135307 100644 --- a/datahub-web-react/src/app/entity/mlModel/profile/MlModelFeaturesTab.tsx +++ b/datahub-web-react/src/app/entity/mlModel/profile/MlModelFeaturesTab.tsx @@ -1,9 +1,10 @@ import React from 'react'; -import { MlPrimaryKey, MlFeature } from '../../../../types.generated'; -import { useBaseEntity } from '../../shared/EntityContext'; -import { GetMlModelQuery } from '../../../../graphql/mlModel.generated'; -import TableOfMlFeatures from '../../mlFeatureTable/profile/features/TableOfMlFeatures'; +import TableOfMlFeatures from '@app/entity/mlFeatureTable/profile/features/TableOfMlFeatures'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; + +import { GetMlModelQuery } from '@graphql/mlModel.generated'; +import { MlFeature, MlPrimaryKey } from '@types'; export default function MlModelFeaturesTab() { const entity = useBaseEntity() as GetMlModelQuery; diff --git a/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx b/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx index cba24c0e38..d3448c96e3 100644 --- a/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx +++ b/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx @@ -1,22 +1,24 @@ -import * as React from 'react'; import { CodeSandboxOutlined } from '@ant-design/icons'; -import { MlModelGroup, EntityType, SearchResult, OwnershipType } from '../../../types.generated'; -import { Preview } from './preview/Preview'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { GenericEntityProperties } from '../shared/types'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { useGetMlModelGroupQuery } from '../../../graphql/mlModelGroup.generated'; -import ModelGroupModels from './profile/ModelGroupModels'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/mlModelGroup/preview/Preview'; +import ModelGroupModels from '@app/entity/mlModelGroup/profile/ModelGroupModels'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + +import { useGetMlModelGroupQuery } from '@graphql/mlModelGroup.generated'; +import { EntityType, MlModelGroup, OwnershipType, SearchResult } from '@types'; /** * Definition of the DataHub MlModelGroup entity. diff --git a/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx index 76ad9c06da..fb7cb6587f 100644 --- a/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { EntityPath, EntityType, MlModelGroup } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { getDataProduct } from '../../shared/utils'; + +import { getDataProduct } from '@app/entity/shared/utils'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityPath, EntityType, MlModelGroup } from '@types'; export const Preview = ({ group, diff --git a/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx b/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx index f8d10931bd..22a2f93ed2 100644 --- a/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx +++ b/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx @@ -1,16 +1,18 @@ -import { Typography, Table } from 'antd'; +import { Table, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { colors } from '@src/alchemy-components/theme'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { EmptyTab } from '@app/entity/shared/components/styled/EmptyTab'; +import { InfoItem } from '@app/entity/shared/components/styled/InfoItem'; +import { notEmpty } from '@app/entity/shared/utils'; +import { TimestampPopover } from '@app/sharedV2/TimestampPopover'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { Pill } from '@src/alchemy-components/components/Pills'; -import { GetMlModelGroupQuery } from '../../../../graphql/mlModelGroup.generated'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useBaseEntity } from '../../shared/EntityContext'; -import { notEmpty } from '../../shared/utils'; -import { EmptyTab } from '../../shared/components/styled/EmptyTab'; -import { InfoItem } from '../../shared/components/styled/InfoItem'; -import { TimestampPopover } from '../../../sharedV2/TimestampPopover'; +import { colors } from '@src/alchemy-components/theme'; + +import { GetMlModelGroupQuery } from '@graphql/mlModelGroup.generated'; +import { EntityType } from '@types'; const InfoItemContainer = styled.div<{ justifyContent }>` display: flex; diff --git a/datahub-web-react/src/app/entity/mlPrimaryKey/MLPrimaryKeyEntity.tsx b/datahub-web-react/src/app/entity/mlPrimaryKey/MLPrimaryKeyEntity.tsx index d72fabc17e..2ca67e208e 100644 --- a/datahub-web-react/src/app/entity/mlPrimaryKey/MLPrimaryKeyEntity.tsx +++ b/datahub-web-react/src/app/entity/mlPrimaryKey/MLPrimaryKeyEntity.tsx @@ -1,23 +1,25 @@ -import * as React from 'react'; import { DotChartOutlined } from '@ant-design/icons'; -import { MlPrimaryKey, EntityType, SearchResult, OwnershipType } from '../../../types.generated'; -import { Preview } from './preview/Preview'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { GenericEntityProperties } from '../shared/types'; -import { useGetMlPrimaryKeyQuery } from '../../../graphql/mlPrimaryKey.generated'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { FeatureTableTab } from '../shared/tabs/ML/MlPrimaryKeyFeatureTableTab'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { getDataProduct } from '../shared/utils'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/mlPrimaryKey/preview/Preview'; +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab'; +import { FeatureTableTab } from '@app/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getDataProduct } from '@app/entity/shared/utils'; + +import { useGetMlPrimaryKeyQuery } from '@graphql/mlPrimaryKey.generated'; +import { EntityType, MlPrimaryKey, OwnershipType, SearchResult } from '@types'; /** * Definition of the DataHub MLPrimaryKey entity. diff --git a/datahub-web-react/src/app/entity/mlPrimaryKey/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlPrimaryKey/preview/Preview.tsx index e72062ea2a..70fb631b2f 100644 --- a/datahub-web-react/src/app/entity/mlPrimaryKey/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/mlPrimaryKey/preview/Preview.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { DataPlatform, DataProduct, EntityPath, EntityType, Owner } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; + +import { IconStyleType } from '@app/entity/Entity'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DataPlatform, DataProduct, EntityPath, EntityType, Owner } from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entity/ownership/ManageOwnership.tsx b/datahub-web-react/src/app/entity/ownership/ManageOwnership.tsx index a3304ab015..ccc27e948c 100644 --- a/datahub-web-react/src/app/entity/ownership/ManageOwnership.tsx +++ b/datahub-web-react/src/app/entity/ownership/ManageOwnership.tsx @@ -1,7 +1,8 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Typography } from 'antd'; -import { OwnershipList } from './OwnershipList'; + +import { OwnershipList } from '@app/entity/ownership/OwnershipList'; const PageContainer = styled.div` padding-top: 20px; diff --git a/datahub-web-react/src/app/entity/ownership/OwnershipBuilderModal.tsx b/datahub-web-react/src/app/entity/ownership/OwnershipBuilderModal.tsx index 2d3861f52c..42bf0da7b5 100644 --- a/datahub-web-react/src/app/entity/ownership/OwnershipBuilderModal.tsx +++ b/datahub-web-react/src/app/entity/ownership/OwnershipBuilderModal.tsx @@ -1,9 +1,11 @@ -import React, { useEffect, useState } from 'react'; import { Button, Form, Input, Modal, Typography, message, notification } from 'antd'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components/macro'; -import { useCreateOwnershipTypeMutation, useUpdateOwnershipTypeMutation } from '../../../graphql/ownership.generated'; -import { OwnershipTypeEntity } from '../../../types.generated'; -import { OwnershipTypeBuilderState } from './table/types'; + +import { OwnershipTypeBuilderState } from '@app/entity/ownership/table/types'; + +import { useCreateOwnershipTypeMutation, useUpdateOwnershipTypeMutation } from '@graphql/ownership.generated'; +import { OwnershipTypeEntity } from '@types'; const NAME_INPUT_TEST_ID = 'ownership-type-name-input'; const DESCRIPTION_INPUT_TEST_ID = 'ownership-type-description-input'; diff --git a/datahub-web-react/src/app/entity/ownership/OwnershipList.tsx b/datahub-web-react/src/app/entity/ownership/OwnershipList.tsx index 4191f281b4..617ed303d6 100644 --- a/datahub-web-react/src/app/entity/ownership/OwnershipList.tsx +++ b/datahub-web-react/src/app/entity/ownership/OwnershipList.tsx @@ -1,16 +1,18 @@ -import React, { useState } from 'react'; -import { Button, Pagination, message } from 'antd'; import { PlusOutlined } from '@ant-design/icons'; +import { Button, Pagination, message } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { useListOwnershipTypesQuery } from '../../../graphql/ownership.generated'; -import { Message } from '../../shared/Message'; -import { OwnershipBuilderModal } from './OwnershipBuilderModal'; -import TabToolbar from '../shared/components/styled/TabToolbar'; -import { OwnershipTable } from './table/OwnershipTable'; -import { OwnershipTypeEntity } from '../../../types.generated'; -import { SearchBar } from '../../search/SearchBar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { scrollToTop } from '../../shared/searchUtils'; + +import { OwnershipBuilderModal } from '@app/entity/ownership/OwnershipBuilderModal'; +import { OwnershipTable } from '@app/entity/ownership/table/OwnershipTable'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListOwnershipTypesQuery } from '@graphql/ownership.generated'; +import { OwnershipTypeEntity } from '@types'; const PaginationContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/ownership/table/ActionsColumn.tsx b/datahub-web-react/src/app/entity/ownership/table/ActionsColumn.tsx index c8f988b09b..3161381169 100644 --- a/datahub-web-react/src/app/entity/ownership/table/ActionsColumn.tsx +++ b/datahub-web-react/src/app/entity/ownership/table/ActionsColumn.tsx @@ -1,9 +1,10 @@ -import React from 'react'; -import { Dropdown, MenuProps, Popconfirm, Typography, message, notification } from 'antd'; import { CopyOutlined, DeleteOutlined, EditOutlined, MoreOutlined } from '@ant-design/icons'; +import { Dropdown, MenuProps, Popconfirm, Typography, message, notification } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import { OwnershipTypeEntity } from '../../../../types.generated'; -import { useDeleteOwnershipTypeMutation } from '../../../../graphql/ownership.generated'; + +import { useDeleteOwnershipTypeMutation } from '@graphql/ownership.generated'; +import { OwnershipTypeEntity } from '@types'; const DROPDOWN_TEST_ID = 'ownership-table-dropdown'; const EDIT_OWNERSHIP_TYPE_TEST_ID = 'edit-ownership-type'; diff --git a/datahub-web-react/src/app/entity/ownership/table/DescriptionColumn.tsx b/datahub-web-react/src/app/entity/ownership/table/DescriptionColumn.tsx index b197521d08..e53c37b778 100644 --- a/datahub-web-react/src/app/entity/ownership/table/DescriptionColumn.tsx +++ b/datahub-web-react/src/app/entity/ownership/table/DescriptionColumn.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import { OwnershipTypeEntity } from '../../../../types.generated'; + +import { OwnershipTypeEntity } from '@types'; const DescriptionText = styled(Typography.Text)` font-size: 14px; diff --git a/datahub-web-react/src/app/entity/ownership/table/NameColumn.tsx b/datahub-web-react/src/app/entity/ownership/table/NameColumn.tsx index a4e6681dc9..4358dac155 100644 --- a/datahub-web-react/src/app/entity/ownership/table/NameColumn.tsx +++ b/datahub-web-react/src/app/entity/ownership/table/NameColumn.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import { OwnershipTypeEntity } from '../../../../types.generated'; + +import { OwnershipTypeEntity } from '@types'; const NameText = styled(Typography.Text)` font-size: 14px; diff --git a/datahub-web-react/src/app/entity/ownership/table/OwnershipTable.tsx b/datahub-web-react/src/app/entity/ownership/table/OwnershipTable.tsx index cc05c5e390..9430899f9e 100644 --- a/datahub-web-react/src/app/entity/ownership/table/OwnershipTable.tsx +++ b/datahub-web-react/src/app/entity/ownership/table/OwnershipTable.tsx @@ -1,10 +1,12 @@ -import React from 'react'; import { Empty } from 'antd'; -import { OwnershipTypeEntity } from '../../../../types.generated'; -import { StyledTable } from '../../shared/components/styled/StyledTable'; -import { NameColumn } from './NameColumn'; -import { DescriptionColumn } from './DescriptionColumn'; -import { ActionsColumn } from './ActionsColumn'; +import React from 'react'; + +import { ActionsColumn } from '@app/entity/ownership/table/ActionsColumn'; +import { DescriptionColumn } from '@app/entity/ownership/table/DescriptionColumn'; +import { NameColumn } from '@app/entity/ownership/table/NameColumn'; +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; + +import { OwnershipTypeEntity } from '@types'; type Props = { ownershipTypes: OwnershipTypeEntity[]; diff --git a/datahub-web-react/src/app/entity/query/QueryEntity.tsx b/datahub-web-react/src/app/entity/query/QueryEntity.tsx index aa97fe26fd..33b1069d40 100644 --- a/datahub-web-react/src/app/entity/query/QueryEntity.tsx +++ b/datahub-web-react/src/app/entity/query/QueryEntity.tsx @@ -1,11 +1,13 @@ +import { ConsoleSqlOutlined } from '@ant-design/icons'; +import * as React from 'react'; + +import { Entity, IconStyleType } from '@app/entity/Entity'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; import { GenericEntityProperties } from '@app/entity/shared/types'; import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; -import { ConsoleSqlOutlined } from '@ant-design/icons'; + import { useGetQueryQuery } from '@graphql/query.generated'; import { DataPlatform, EntityType, QueryEntity as Query } from '@types'; -import * as React from 'react'; -import { Entity, IconStyleType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; /** * Definition of the DataHub DataPlatformInstance entity. diff --git a/datahub-web-react/src/app/entity/restricted/RestrictedEntity.tsx b/datahub-web-react/src/app/entity/restricted/RestrictedEntity.tsx index 482709c110..348fe0fddd 100644 --- a/datahub-web-react/src/app/entity/restricted/RestrictedEntity.tsx +++ b/datahub-web-react/src/app/entity/restricted/RestrictedEntity.tsx @@ -1,10 +1,13 @@ -import React from 'react'; import { QuestionOutlined } from '@ant-design/icons'; -import { EntityType, Restricted, SearchResult } from '../../../types.generated'; -import { Entity, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import RestrictedIcon from '../../../images/restricted.svg'; -import { RestrictedEntityProfile } from './RestrictedEntityProfile'; +import React from 'react'; + +import { Entity, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { RestrictedEntityProfile } from '@app/entity/restricted/RestrictedEntityProfile'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; + +import { EntityType, Restricted, SearchResult } from '@types'; + +import RestrictedIcon from '@images/restricted.svg'; /** * Definition of the DataHub Data Product entity. diff --git a/datahub-web-react/src/app/entity/restricted/RestrictedEntityProfile.tsx b/datahub-web-react/src/app/entity/restricted/RestrictedEntityProfile.tsx index cf8aa5935e..1c9d50afca 100644 --- a/datahub-web-react/src/app/entity/restricted/RestrictedEntityProfile.tsx +++ b/datahub-web-react/src/app/entity/restricted/RestrictedEntityProfile.tsx @@ -1,13 +1,15 @@ import React from 'react'; import styled from 'styled-components'; + +import { EntityTitle } from '@app/entity/shared/containers/profile/header/EntityName'; import { LogoIcon, PlatformContentWrapper, PlatformText, PreviewImage, -} from '../shared/containers/profile/header/PlatformContent/PlatformContentView'; -import RestrictedIcon from '../../../images/restricted.svg'; -import { EntityTitle } from '../shared/containers/profile/header/EntityName'; +} from '@app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView'; + +import RestrictedIcon from '@images/restricted.svg'; const SubHeader = styled.div` margin-top: 8px; diff --git a/datahub-web-react/src/app/entity/schemaField/SchemaFieldPropertiesEntity.tsx b/datahub-web-react/src/app/entity/schemaField/SchemaFieldPropertiesEntity.tsx index fdc0e33d77..0cc5c4969d 100644 --- a/datahub-web-react/src/app/entity/schemaField/SchemaFieldPropertiesEntity.tsx +++ b/datahub-web-react/src/app/entity/schemaField/SchemaFieldPropertiesEntity.tsx @@ -1,10 +1,12 @@ -import * as React from 'react'; import { PicCenterOutlined } from '@ant-design/icons'; -import { Dataset, EntityType, SchemaFieldEntity, SearchResult } from '../../../types.generated'; -import { Entity, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { Preview } from './preview/Preview'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; +import * as React from 'react'; + +import { Entity, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { Preview } from '@app/entity/schemaField/preview/Preview'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { Dataset, EntityType, SchemaFieldEntity, SearchResult } from '@types'; export class SchemaFieldPropertiesEntity implements Entity { type: EntityType = EntityType.SchemaField; diff --git a/datahub-web-react/src/app/entity/schemaField/preview/Preview.tsx b/datahub-web-react/src/app/entity/schemaField/preview/Preview.tsx index 086b1a3802..75e6ef3108 100644 --- a/datahub-web-react/src/app/entity/schemaField/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/schemaField/preview/Preview.tsx @@ -1,9 +1,11 @@ -import React from 'react'; import { PicCenterOutlined } from '@ant-design/icons'; -import { Dataset, EntityType, Owner, ParentContainersResult } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; +import React from 'react'; + +import { IconStyleType, PreviewType } from '@app/entity/Entity'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Dataset, EntityType, Owner, ParentContainersResult } from '@types'; export const Preview = ({ datasetUrn, diff --git a/datahub-web-react/src/app/entity/shared/EntityContext.ts b/datahub-web-react/src/app/entity/shared/EntityContext.ts index 74b92e17a2..b2bfe2aef3 100644 --- a/datahub-web-react/src/app/entity/shared/EntityContext.ts +++ b/datahub-web-react/src/app/entity/shared/EntityContext.ts @@ -1,7 +1,9 @@ import React, { useContext } from 'react'; -import { EntityType } from '../../../types.generated'; -import { shouldEntityBeTreatedAsPrimary, useIsSeparateSiblingsMode } from './siblingUtils'; -import { EntityContextType, UpdateEntityType } from './types'; + +import { shouldEntityBeTreatedAsPrimary, useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import { EntityContextType, UpdateEntityType } from '@app/entity/shared/types'; + +import { EntityType } from '@types'; export const EntityContext = React.createContext({ urn: '', diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/CreateGlossaryEntityModal.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/CreateGlossaryEntityModal.tsx index c92e6015c6..5e9de837e7 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/CreateGlossaryEntityModal.tsx +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/CreateGlossaryEntityModal.tsx @@ -1,23 +1,22 @@ -import React, { useEffect, useState } from 'react'; -import styled from 'styled-components/macro'; import { EditOutlined } from '@ant-design/icons'; -import { message, Button, Input, Modal, Typography, Form, Collapse } from 'antd'; +import { Button, Collapse, Form, Input, Modal, Typography, message } from 'antd'; import DOMPurify from 'dompurify'; +import React, { useEffect, useState } from 'react'; import { useHistory } from 'react-router'; -import { - useCreateGlossaryTermMutation, - useCreateGlossaryNodeMutation, -} from '../../../../graphql/glossaryTerm.generated'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import NodeParentSelect from './NodeParentSelect'; -import { useEntityData, useRefetch } from '../EntityContext'; -import analytics, { EventType } from '../../../analytics'; -import DescriptionModal from '../components/legacy/DescriptionModal'; -import { validateCustomUrnId } from '../../../shared/textUtil'; -import { useGlossaryEntityData } from '../GlossaryEntityContext'; -import { getGlossaryRootToUpdate, updateGlossarySidebar } from '../../../glossary/utils'; -import { getEntityPath } from '../containers/profile/utils'; +import styled from 'styled-components/macro'; + +import analytics, { EventType } from '@app/analytics'; +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import NodeParentSelect from '@app/entity/shared/EntityDropdown/NodeParentSelect'; +import { useGlossaryEntityData } from '@app/entity/shared/GlossaryEntityContext'; +import DescriptionModal from '@app/entity/shared/components/legacy/DescriptionModal'; +import { getEntityPath } from '@app/entity/shared/containers/profile/utils'; +import { getGlossaryRootToUpdate, updateGlossarySidebar } from '@app/glossary/utils'; +import { validateCustomUrnId } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useCreateGlossaryNodeMutation, useCreateGlossaryTermMutation } from '@graphql/glossaryTerm.generated'; +import { EntityType } from '@types'; const StyledItem = styled(Form.Item)` margin-bottom: 0; diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/DomainParentSelect.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/DomainParentSelect.tsx index 1e918757e4..35b6566600 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/DomainParentSelect.tsx +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/DomainParentSelect.tsx @@ -1,16 +1,18 @@ -import React, { MouseEvent } from 'react'; -import { Select } from 'antd'; import { CloseCircleFilled } from '@ant-design/icons'; +import { Select } from 'antd'; +import React, { MouseEvent } from 'react'; import styled from 'styled-components'; -import { Domain, EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import ClickOutside from '../../../shared/ClickOutside'; -import { BrowserWrapper } from '../../../shared/tags/AddTagsTermsModal'; -import useParentSelector from './useParentSelector'; -import DomainNavigator from '../../../domain/nestedDomains/domainNavigator/DomainNavigator'; -import { useDomainsContext } from '../../../domain/DomainsContext'; -import ParentEntities from '../../../search/filters/ParentEntities'; -import { getParentDomains } from '../../../domain/utils'; + +import { useDomainsContext } from '@app/domain/DomainsContext'; +import DomainNavigator from '@app/domain/nestedDomains/domainNavigator/DomainNavigator'; +import { getParentDomains } from '@app/domain/utils'; +import useParentSelector from '@app/entity/shared/EntityDropdown/useParentSelector'; +import ParentEntities from '@app/search/filters/ParentEntities'; +import ClickOutside from '@app/shared/ClickOutside'; +import { BrowserWrapper } from '@app/shared/tags/AddTagsTermsModal'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Domain, EntityType } from '@types'; const SearchResultContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx index b7dbd9a43c..4e8e08342c 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx @@ -1,7 +1,5 @@ -import React, { useState } from 'react'; -import styled from 'styled-components'; -import { Dropdown, Menu, message, Tooltip } from 'antd'; import { + CopyOutlined, DeleteOutlined, ExclamationCircleOutlined, FolderAddOutlined, @@ -9,26 +7,34 @@ import { LinkOutlined, MoreOutlined, PlusOutlined, - CopyOutlined, WarningOutlined, } from '@ant-design/icons'; +import { Dropdown, Menu, Tooltip, message } from 'antd'; +import React, { useState } from 'react'; import { Redirect, useHistory } from 'react-router'; -import { EntityType } from '../../../../types.generated'; -import CreateGlossaryEntityModal from './CreateGlossaryEntityModal'; -import { UpdateDeprecationModal } from './UpdateDeprecationModal'; -import { useUpdateDeprecationMutation } from '../../../../graphql/mutations.generated'; -import MoveGlossaryEntityModal from './MoveGlossaryEntityModal'; -import { ANTD_GRAY } from '../constants'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import useDeleteEntity from './useDeleteEntity'; -import { getEntityProfileDeleteRedirectPath } from '../../../shared/deleteUtils'; -import { shouldDisplayChildDeletionWarning, isDeleteDisabled, isMoveDisabled } from './utils'; -import { useUserContext } from '../../../context/useUserContext'; -import MoveDomainModal from './MoveDomainModal'; -import { useIsNestedDomainsEnabled } from '../../../useAppConfig'; -import { getEntityPath } from '../containers/profile/utils'; -import { useIsSeparateSiblingsMode } from '../siblingUtils'; -import { AddIncidentModal } from '../tabs/Incident/components/AddIncidentModal'; +import styled from 'styled-components'; + +import { useUserContext } from '@app/context/useUserContext'; +import CreateGlossaryEntityModal from '@app/entity/shared/EntityDropdown/CreateGlossaryEntityModal'; +import MoveDomainModal from '@app/entity/shared/EntityDropdown/MoveDomainModal'; +import MoveGlossaryEntityModal from '@app/entity/shared/EntityDropdown/MoveGlossaryEntityModal'; +import { UpdateDeprecationModal } from '@app/entity/shared/EntityDropdown/UpdateDeprecationModal'; +import useDeleteEntity from '@app/entity/shared/EntityDropdown/useDeleteEntity'; +import { + isDeleteDisabled, + isMoveDisabled, + shouldDisplayChildDeletionWarning, +} from '@app/entity/shared/EntityDropdown/utils'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { getEntityPath } from '@app/entity/shared/containers/profile/utils'; +import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import { AddIncidentModal } from '@app/entity/shared/tabs/Incident/components/AddIncidentModal'; +import { getEntityProfileDeleteRedirectPath } from '@app/shared/deleteUtils'; +import { useIsNestedDomainsEnabled } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useUpdateDeprecationMutation } from '@graphql/mutations.generated'; +import { EntityType } from '@types'; export enum EntityMenuItems { COPY_URL, diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx index dbf14b069f..3eb88146ee 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx @@ -1,13 +1,15 @@ +import { Button, Form, Modal, Typography, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { message, Button, Modal, Typography, Form } from 'antd'; -import { useRefetch } from '../EntityContext'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useMoveDomainMutation } from '../../../../graphql/domain.generated'; -import DomainParentSelect from './DomainParentSelect'; -import { useHandleMoveDomainComplete } from './useHandleMoveDomainComplete'; -import { useDomainsContext } from '../../../domain/DomainsContext'; -import { EntityType } from '../../../../types.generated'; + +import { useDomainsContext } from '@app/domain/DomainsContext'; +import { useRefetch } from '@app/entity/shared/EntityContext'; +import DomainParentSelect from '@app/entity/shared/EntityDropdown/DomainParentSelect'; +import { useHandleMoveDomainComplete } from '@app/entity/shared/EntityDropdown/useHandleMoveDomainComplete'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useMoveDomainMutation } from '@graphql/domain.generated'; +import { EntityType } from '@types'; const StyledItem = styled(Form.Item)` margin-bottom: 0; diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveGlossaryEntityModal.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveGlossaryEntityModal.tsx index de32f48f68..839b967677 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveGlossaryEntityModal.tsx +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveGlossaryEntityModal.tsx @@ -1,13 +1,15 @@ +import { Button, Form, Modal, Typography, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { message, Button, Modal, Typography, Form } from 'antd'; -import { useEntityData, useRefetch } from '../EntityContext'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useUpdateParentNodeMutation } from '../../../../graphql/glossary.generated'; -import NodeParentSelect from './NodeParentSelect'; -import { useGlossaryEntityData } from '../GlossaryEntityContext'; -import { getGlossaryRootToUpdate, getParentNodeToUpdate, updateGlossarySidebar } from '../../../glossary/utils'; -import { getModalDomContainer } from '../../../../utils/focus'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import NodeParentSelect from '@app/entity/shared/EntityDropdown/NodeParentSelect'; +import { useGlossaryEntityData } from '@app/entity/shared/GlossaryEntityContext'; +import { getGlossaryRootToUpdate, getParentNodeToUpdate, updateGlossarySidebar } from '@app/glossary/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { getModalDomContainer } from '@utils/focus'; + +import { useUpdateParentNodeMutation } from '@graphql/glossary.generated'; const StyledItem = styled(Form.Item)` margin-bottom: 0; diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx index 3746c5f6b9..d94e405468 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx @@ -1,15 +1,17 @@ -import React from 'react'; import { Select } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { EntityType, GlossaryNode, SearchResult } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useEntityData } from '../EntityContext'; -import ClickOutside from '../../../shared/ClickOutside'; -import GlossaryBrowser from '../../../glossary/GlossaryBrowser/GlossaryBrowser'; -import { BrowserWrapper } from '../../../shared/tags/AddTagsTermsModal'; -import useParentSelector from './useParentSelector'; -import ParentEntities from '../../../search/filters/ParentEntities'; -import { getParentGlossary } from '../../../glossary/utils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import useParentSelector from '@app/entity/shared/EntityDropdown/useParentSelector'; +import GlossaryBrowser from '@app/glossary/GlossaryBrowser/GlossaryBrowser'; +import { getParentGlossary } from '@app/glossary/utils'; +import ParentEntities from '@app/search/filters/ParentEntities'; +import ClickOutside from '@app/shared/ClickOutside'; +import { BrowserWrapper } from '@app/shared/tags/AddTagsTermsModal'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, GlossaryNode, SearchResult } from '@types'; const SearchResultContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/UpdateDeprecationModal.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/UpdateDeprecationModal.tsx index 0c36c3a953..b3547f3ef7 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/UpdateDeprecationModal.tsx +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/UpdateDeprecationModal.tsx @@ -1,10 +1,12 @@ +import { Button, DatePicker, Form, Modal, message } from 'antd'; import React from 'react'; -import { Button, DatePicker, Form, message, Modal } from 'antd'; import styled from 'styled-components'; -import { useBatchUpdateDeprecationMutation } from '../../../../graphql/mutations.generated'; -import { handleBatchError } from '../utils'; -import { Editor } from '../tabs/Documentation/components/editor/Editor'; -import { ANTD_GRAY } from '../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; +import { handleBatchError } from '@app/entity/shared/utils'; + +import { useBatchUpdateDeprecationMutation } from '@graphql/mutations.generated'; type Props = { urns: string[]; diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx index 53959d0d77..07f32fa6f5 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx @@ -1,5 +1,5 @@ -import { glossaryNode1, glossaryNode2, glossaryNode3, glossaryNode4 } from '../../../../../Mocks'; -import { filterResultsForMove } from '../NodeParentSelect'; +import { filterResultsForMove } from '@app/entity/shared/EntityDropdown/NodeParentSelect'; +import { glossaryNode1, glossaryNode2, glossaryNode3, glossaryNode4 } from '@src/Mocks'; describe('filterResultsForMove', () => { it('should return true if the given node is different than given urn and the node is not a child of the given urn', () => { diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/index.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/index.tsx index 3e21823dcd..a899a2f4df 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/index.tsx +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/index.tsx @@ -1,3 +1,3 @@ -import EntityDropdown from './EntityDropdown'; +import EntityDropdown from '@app/entity/shared/EntityDropdown/EntityDropdown'; export default EntityDropdown; diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/useDeleteEntity.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/useDeleteEntity.tsx index aa00e8ebc8..41b0aaee97 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/useDeleteEntity.tsx +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/useDeleteEntity.tsx @@ -1,13 +1,15 @@ +import { Modal, message } from 'antd'; import { useState } from 'react'; -import { message, Modal } from 'antd'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { getDeleteEntityMutation } from '../../../shared/deleteUtils'; -import analytics, { EventType } from '../../../analytics'; -import { useGlossaryEntityData } from '../GlossaryEntityContext'; -import { getParentNodeToUpdate, updateGlossarySidebar } from '../../../glossary/utils'; -import { useHandleDeleteDomain } from './useHandleDeleteDomain'; -import { removeTermFromGlossaryNode } from '../../../glossary/cacheUtils'; + +import analytics, { EventType } from '@app/analytics'; +import { useHandleDeleteDomain } from '@app/entity/shared/EntityDropdown/useHandleDeleteDomain'; +import { useGlossaryEntityData } from '@app/entity/shared/GlossaryEntityContext'; +import { removeTermFromGlossaryNode } from '@app/glossary/cacheUtils'; +import { getParentNodeToUpdate, updateGlossarySidebar } from '@app/glossary/utils'; +import { getDeleteEntityMutation } from '@app/shared/deleteUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; /** * Performs the flow for deleting an entity of a given type. diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/useDeleteGlossaryEntity.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/useDeleteGlossaryEntity.tsx index 07cd7c0418..e08fccc3c8 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/useDeleteGlossaryEntity.tsx +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/useDeleteGlossaryEntity.tsx @@ -1,8 +1,10 @@ -import { message, Modal } from 'antd'; +import { Modal, message } from 'antd'; import { useState } from 'react'; -import { useEntityData } from '../EntityContext'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useDeleteGlossaryEntityMutation } from '../../../../graphql/glossary.generated'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useDeleteGlossaryEntityMutation } from '@graphql/glossary.generated'; function useDeleteGlossaryEntity() { const [hasBeenDeleted, setHasBeenDeleted] = useState(false); diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleDeleteDomain.ts b/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleDeleteDomain.ts index ebbb8f9968..e2caf58223 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleDeleteDomain.ts +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleDeleteDomain.ts @@ -1,7 +1,8 @@ import { useApolloClient } from '@apollo/client'; -import { GenericEntityProperties } from '../types'; -import { removeFromListDomainsCache } from '../../../domain/utils'; -import { useDomainsContext } from '../../../domain/DomainsContext'; + +import { useDomainsContext } from '@app/domain/DomainsContext'; +import { removeFromListDomainsCache } from '@app/domain/utils'; +import { GenericEntityProperties } from '@app/entity/shared/types'; interface DeleteDomainProps { entityData: GenericEntityProperties; diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleMoveDomainComplete.ts b/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleMoveDomainComplete.ts index 2d9c346e18..00d93baeb4 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleMoveDomainComplete.ts +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleMoveDomainComplete.ts @@ -1,9 +1,11 @@ import { useApolloClient } from '@apollo/client'; -import { removeFromListDomainsCache, updateListDomainsCache } from '../../../domain/utils'; -import { useDomainsContext } from '../../../domain/DomainsContext'; -import { Domain } from '../../../../types.generated'; -import analytics from '../../../analytics/analytics'; -import { EventType } from '../../../analytics'; + +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import { useDomainsContext } from '@app/domain/DomainsContext'; +import { removeFromListDomainsCache, updateListDomainsCache } from '@app/domain/utils'; + +import { Domain } from '@types'; export function useHandleMoveDomainComplete() { const client = useApolloClient(); diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/useParentSelector.ts b/datahub-web-react/src/app/entity/shared/EntityDropdown/useParentSelector.ts index 32b5d8ca79..66e20718d3 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/useParentSelector.ts +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/useParentSelector.ts @@ -1,8 +1,10 @@ import { useEffect, useState } from 'react'; -import { useGetSearchResultsLazyQuery } from '../../../../graphql/search.generated'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { GenericEntityProperties } from '../types'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; interface Props { entityType: EntityType; diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/utils.ts b/datahub-web-react/src/app/entity/shared/EntityDropdown/utils.ts index 0a4c2c3444..5a7b435858 100644 --- a/datahub-web-react/src/app/entity/shared/EntityDropdown/utils.ts +++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/utils.ts @@ -1,5 +1,6 @@ -import { EntityType, PlatformPrivileges } from '../../../../types.generated'; -import { GenericEntityProperties } from '../types'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + +import { EntityType, PlatformPrivileges } from '@types'; export function isDeleteDisabled( entityType: EntityType, diff --git a/datahub-web-react/src/app/entity/shared/EntityGroups.tsx b/datahub-web-react/src/app/entity/shared/EntityGroups.tsx index 980a551a68..bc85704873 100644 --- a/datahub-web-react/src/app/entity/shared/EntityGroups.tsx +++ b/datahub-web-react/src/app/entity/shared/EntityGroups.tsx @@ -1,9 +1,11 @@ import { Tag } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; -import { EntityType, EntityRelationship } from '../../../types.generated'; -import { EmptyValue, TagsSection, Tags, GroupsSeeMoreText } from './SidebarStyledComponents'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { EmptyValue, GroupsSeeMoreText, Tags, TagsSection } from '@app/entity/shared/SidebarStyledComponents'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityRelationship, EntityType } from '@types'; type Props = { readMore: boolean; diff --git a/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInput.tsx b/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInput.tsx index 77b3fcf9a1..a1a06daec8 100644 --- a/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInput.tsx +++ b/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInput.tsx @@ -1,9 +1,11 @@ import { Select, Tag, Tooltip } from 'antd'; import React from 'react'; -import { useGetSearchResultsForMultipleLazyQuery } from '../../../../graphql/search.generated'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { EntitySearchInputResult } from './EntitySearchInputResult'; + +import { EntitySearchInputResult } from '@app/entity/shared/EntitySearchInput/EntitySearchInputResult'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsForMultipleLazyQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; type Props = { selectedUrns: string[]; diff --git a/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInputResult.tsx b/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInputResult.tsx index ca30a13061..29bccfa443 100644 --- a/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInputResult.tsx +++ b/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInputResult.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; + +import { IconStyleType } from '@app/entity/Entity'; +import { useEntityRegistry } from '@app/useEntityRegistry'; type Props = { entity: any; diff --git a/datahub-web-react/src/app/entity/shared/ExternalUrlButton.tsx b/datahub-web-react/src/app/entity/shared/ExternalUrlButton.tsx index 3bafc41893..f806ae9f8e 100644 --- a/datahub-web-react/src/app/entity/shared/ExternalUrlButton.tsx +++ b/datahub-web-react/src/app/entity/shared/ExternalUrlButton.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import { EntityType } from '../../../types.generated'; -import analytics, { EventType, EntityActionType } from '../../analytics'; -import UrlButton from './UrlButton'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import UrlButton from '@app/entity/shared/UrlButton'; + +import { EntityType } from '@types'; const GITHUB_LINK = 'github.com'; const GITHUB = 'GitHub'; diff --git a/datahub-web-react/src/app/entity/shared/GlossaryEntityContext.tsx b/datahub-web-react/src/app/entity/shared/GlossaryEntityContext.tsx index 79ec142fd8..b12a5e33b8 100644 --- a/datahub-web-react/src/app/entity/shared/GlossaryEntityContext.tsx +++ b/datahub-web-react/src/app/entity/shared/GlossaryEntityContext.tsx @@ -1,5 +1,6 @@ import React, { useContext } from 'react'; -import { GenericEntityProperties } from './types'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; export interface GlossaryEntityContextType { isInGlossaryContext: boolean; diff --git a/datahub-web-react/src/app/entity/shared/PreviewContext.tsx b/datahub-web-react/src/app/entity/shared/PreviewContext.tsx index 889a6726f3..f4b2bc34b1 100644 --- a/datahub-web-react/src/app/entity/shared/PreviewContext.tsx +++ b/datahub-web-react/src/app/entity/shared/PreviewContext.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { GenericEntityProperties } from './types'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; const PreviewContext = React.createContext(null); export default PreviewContext; diff --git a/datahub-web-react/src/app/entity/shared/UrlButton.tsx b/datahub-web-react/src/app/entity/shared/UrlButton.tsx index a6f6da4a60..17099c93e6 100644 --- a/datahub-web-react/src/app/entity/shared/UrlButton.tsx +++ b/datahub-web-react/src/app/entity/shared/UrlButton.tsx @@ -1,6 +1,6 @@ -import React, { ReactNode } from 'react'; import { ArrowRightOutlined } from '@ant-design/icons'; import { Button } from 'antd'; +import React, { ReactNode } from 'react'; import styled from 'styled-components/macro'; const UrlButtonContainer = styled.span` diff --git a/datahub-web-react/src/app/entity/shared/__tests__/siblingsUtils.test.ts b/datahub-web-react/src/app/entity/shared/__tests__/siblingsUtils.test.ts index 3fd9dd3245..8e056f5451 100644 --- a/datahub-web-react/src/app/entity/shared/__tests__/siblingsUtils.test.ts +++ b/datahub-web-react/src/app/entity/shared/__tests__/siblingsUtils.test.ts @@ -1,6 +1,7 @@ -import { dataset3WithLineage, dataset3WithSchema, dataset4WithLineage } from '../../../../Mocks'; -import { EntityType, SchemaFieldDataType } from '../../../../types.generated'; -import { combineEntityDataWithSiblings, shouldEntityBeTreatedAsPrimary } from '../siblingUtils'; +import { combineEntityDataWithSiblings, shouldEntityBeTreatedAsPrimary } from '@app/entity/shared/siblingUtils'; +import { dataset3WithLineage, dataset3WithSchema, dataset4WithLineage } from '@src/Mocks'; + +import { EntityType, SchemaFieldDataType } from '@types'; const usageStats = { buckets: [ diff --git a/datahub-web-react/src/app/entity/shared/components/legacy/DescriptionModal.tsx b/datahub-web-react/src/app/entity/shared/components/legacy/DescriptionModal.tsx index 0f88264e8d..b8025fd900 100644 --- a/datahub-web-react/src/app/entity/shared/components/legacy/DescriptionModal.tsx +++ b/datahub-web-react/src/app/entity/shared/components/legacy/DescriptionModal.tsx @@ -1,8 +1,9 @@ -import { Typography, Modal, Button, Form } from 'antd'; +import { Button, Form, Modal, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Editor } from '../../tabs/Documentation/components/editor/Editor'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; const FormLabel = styled(Typography.Text)` font-size: 10px; diff --git a/datahub-web-react/src/app/entity/shared/components/legacy/MarkdownViewer.tsx b/datahub-web-react/src/app/entity/shared/components/legacy/MarkdownViewer.tsx index 579c58214a..ab52706eee 100644 --- a/datahub-web-react/src/app/entity/shared/components/legacy/MarkdownViewer.tsx +++ b/datahub-web-react/src/app/entity/shared/components/legacy/MarkdownViewer.tsx @@ -1,7 +1,7 @@ -import React, { useState, useRef, useEffect } from 'react'; -import { Button } from 'antd'; import { EditOutlined } from '@ant-design/icons'; import MDEditor from '@uiw/react-md-editor'; +import { Button } from 'antd'; +import React, { useEffect, useRef, useState } from 'react'; import styled from 'styled-components'; const EditIcon = styled(EditOutlined)` diff --git a/datahub-web-react/src/app/entity/shared/components/legacy/Properties.tsx b/datahub-web-react/src/app/entity/shared/components/legacy/Properties.tsx index 7b0de67195..075c458e0a 100644 --- a/datahub-web-react/src/app/entity/shared/components/legacy/Properties.tsx +++ b/datahub-web-react/src/app/entity/shared/components/legacy/Properties.tsx @@ -1,7 +1,8 @@ import { Space, Table, Typography } from 'antd'; -import React from 'react'; import { ColumnsType } from 'antd/es/table'; -import { StringMapEntry } from '../../../../../types.generated'; +import React from 'react'; + +import { StringMapEntry } from '@types'; export type Props = { properties: StringMapEntry[]; diff --git a/datahub-web-react/src/app/entity/shared/components/legacy/UpdatableDescription.tsx b/datahub-web-react/src/app/entity/shared/components/legacy/UpdatableDescription.tsx index 543200d367..70eb7a1ff7 100644 --- a/datahub-web-react/src/app/entity/shared/components/legacy/UpdatableDescription.tsx +++ b/datahub-web-react/src/app/entity/shared/components/legacy/UpdatableDescription.tsx @@ -1,11 +1,13 @@ -import { message, Tag } from 'antd'; -import React, { useState } from 'react'; import { FetchResult, MutationFunctionOptions } from '@apollo/client'; +import { Tag, message } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; -import MarkdownViewer from './MarkdownViewer'; -import UpdateDescriptionModal from './DescriptionModal'; -import analytics, { EventType, EntityActionType } from '../../../../analytics'; -import { EntityType } from '../../../../../types.generated'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import UpdateDescriptionModal from '@app/entity/shared/components/legacy/DescriptionModal'; +import MarkdownViewer from '@app/entity/shared/components/legacy/MarkdownViewer'; + +import { EntityType } from '@types'; const DescriptionText = styled(MarkdownViewer)` ${(props) => (props.isCompact ? 'max-width: 377px;' : '')}; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/AddLinkModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/AddLinkModal.tsx index 2caa116709..f6266f2cfa 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/AddLinkModal.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/AddLinkModal.tsx @@ -1,11 +1,13 @@ -import React, { useState } from 'react'; -import { message, Modal, Button, Form, Input } from 'antd'; import { PlusOutlined } from '@ant-design/icons'; -import { useEntityData, useMutationUrn } from '../../EntityContext'; -import { useAddLinkMutation } from '../../../../../graphql/mutations.generated'; -import analytics, { EventType, EntityActionType } from '../../../../analytics'; -import { useUserContext } from '../../../../context/useUserContext'; -import { getModalDomContainer } from '../../../../../utils/focus'; +import { Button, Form, Input, Modal, message } from 'antd'; +import React, { useState } from 'react'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData, useMutationUrn } from '@app/entity/shared/EntityContext'; +import { getModalDomContainer } from '@utils/focus'; + +import { useAddLinkMutation } from '@graphql/mutations.generated'; type AddLinkProps = { buttonProps?: Record; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/DeprecationPill.tsx b/datahub-web-react/src/app/entity/shared/components/styled/DeprecationPill.tsx index 613264709a..39514991e9 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/DeprecationPill.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/DeprecationPill.tsx @@ -1,15 +1,17 @@ -import React, { useState } from 'react'; -import { InfoCircleOutlined } from '@ant-design/icons'; -import { Divider, message, Modal, Popover, Tooltip, Typography } from 'antd'; import { blue } from '@ant-design/colors'; -import styled from 'styled-components'; +import { InfoCircleOutlined } from '@ant-design/icons'; +import { Divider, Modal, Popover, Tooltip, Typography, message } from 'antd'; import moment from 'moment'; -import { Deprecation } from '../../../../../types.generated'; -import { getLocaleTimezone } from '../../../../shared/time/timeUtils'; -import { ANTD_GRAY } from '../../constants'; -import { useBatchUpdateDeprecationMutation } from '../../../../../graphql/mutations.generated'; -import { Editor } from '../../tabs/Documentation/components/editor/Editor'; -import StripMarkdownText, { removeMarkdown } from './StripMarkdownText'; +import React, { useState } from 'react'; +import styled from 'styled-components'; + +import StripMarkdownText, { removeMarkdown } from '@app/entity/shared/components/styled/StripMarkdownText'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; +import { getLocaleTimezone } from '@app/shared/time/timeUtils'; + +import { useBatchUpdateDeprecationMutation } from '@graphql/mutations.generated'; +import { Deprecation } from '@types'; const DeprecatedContainer = styled.div` height: 18px; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx index 4d83b0c3fd..fc29a3ba42 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx @@ -1,25 +1,28 @@ -import React, { useState } from 'react'; -import { Button, Form, Input, message, Modal, Table } from 'antd'; -import TextArea from 'antd/lib/input/TextArea'; import { PlusOutlined } from '@ant-design/icons'; -import arrow from '../../../../../../images/Arrow.svg'; -import './CreateERModelRelationModal.less'; -import { EntityType, ErModelRelationship, OwnerEntityType } from '../../../../../../types.generated'; +import { Button, Form, Input, Modal, Table, message } from 'antd'; +import TextArea from 'antd/lib/input/TextArea'; +import React, { useState } from 'react'; + +import { useUserContext } from '@app/context/useUserContext'; +import '@app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.less'; +import { + ERModelRelationDataType, + checkDuplicateERModelRelation, + getDatasetName, + validateERModelRelation, +} from '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils'; +import { EditableCell } from '@app/entity/shared/components/styled/ERModelRelationship/EditableCell'; +import { EditableRow } from '@app/entity/shared/components/styled/ERModelRelationship/EditableRow'; + import { useCreateErModelRelationshipMutation, useUpdateErModelRelationshipMutation, -} from '../../../../../../graphql/ermodelrelationship.generated'; -import { useUserContext } from '../../../../../context/useUserContext'; -import { EditableRow } from './EditableRow'; -import { EditableCell } from './EditableCell'; -import { - checkDuplicateERModelRelation, - getDatasetName, - ERModelRelationDataType, - validateERModelRelation, -} from './ERModelRelationUtils'; -import { useGetSearchResultsQuery } from '../../../../../../graphql/search.generated'; -import { useAddOwnerMutation } from '../../../../../../graphql/mutations.generated'; +} from '@graphql/ermodelrelationship.generated'; +import { useAddOwnerMutation } from '@graphql/mutations.generated'; +import { useGetSearchResultsQuery } from '@graphql/search.generated'; +import { EntityType, ErModelRelationship, OwnerEntityType } from '@types'; + +import arrow from '@images/Arrow.svg'; type Props = { table1?: any; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.tsx index ef65aed02d..c9b3fa7a06 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.tsx @@ -1,13 +1,16 @@ -import React, { useState } from 'react'; -import { Button, Row, Table } from 'antd'; import { RightOutlined } from '@ant-design/icons'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import arrow from '../../../../../../images/Arrow.svg'; -import editIcon from '../../../../../../images/editIconBlack.svg'; -import './ERModelRelationPreview.less'; -import { EntityType, ErModelRelationship } from '../../../../../../types.generated'; -import { CreateERModelRelationModal } from './CreateERModelRelationModal'; -import { getDatasetName } from './ERModelRelationUtils'; +import { Button, Row, Table } from 'antd'; +import React, { useState } from 'react'; + +import { CreateERModelRelationModal } from '@app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal'; +import '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.less'; +import { getDatasetName } from '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, ErModelRelationship } from '@types'; + +import arrow from '@images/Arrow.svg'; +import editIcon from '@images/editIconBlack.svg'; type ERModelRelationRecord = { sourceField: string; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils.tsx index 811ebf99b1..cd2e39ba1f 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { FormInstance } from 'antd'; -import { EntityType } from '../../../../../../types.generated'; +import React from 'react'; + +import { EntityType } from '@types'; export const EditableContext = React.createContext | null>(null); export interface ERModelRelationDataType { diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableCell.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableCell.tsx index 4320aacd53..26c4405464 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableCell.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableCell.tsx @@ -1,7 +1,9 @@ -import React, { useContext } from 'react'; import { Form, Select } from 'antd'; -import { EditableContext } from './ERModelRelationUtils'; -import { Dataset } from '../../../../../../types.generated'; +import React, { useContext } from 'react'; + +import { EditableContext } from '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils'; + +import { Dataset } from '@types'; interface EditableCellProps { editable: boolean; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableRow.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableRow.tsx index 120dff44cf..54c79ae882 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableRow.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableRow.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Form } from 'antd'; -import { EditableContext } from './ERModelRelationUtils'; +import React from 'react'; + +import { EditableContext } from '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils'; interface EditableRowProps { index: number; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/EmptyTab.tsx b/datahub-web-react/src/app/entity/shared/components/styled/EmptyTab.tsx index 03fe63ca02..0a10732483 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/EmptyTab.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/EmptyTab.tsx @@ -1,7 +1,8 @@ +import { Empty, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Empty, Typography } from 'antd'; -import { EMPTY_MESSAGES } from '../../constants'; + +import { EMPTY_MESSAGES } from '@app/entity/shared/constants'; const StyledEmpty = styled(Empty)` padding: 40px; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/EntityIcon.tsx b/datahub-web-react/src/app/entity/shared/components/styled/EntityIcon.tsx index bd001b51d5..f9d852c5cc 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/EntityIcon.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/EntityIcon.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { PlatformIcon } from '../../../../search/filters/utils'; -import { Entity } from '../../../../../types.generated'; -import { IconStyleType } from '../../../Entity'; -import { ANTD_GRAY } from '../../constants'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { PlatformIcon } from '@app/search/filters/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity } from '@types'; interface Props { entity: Entity; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActor.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActor.tsx index 3c5e749523..5ad87d4068 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActor.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActor.tsx @@ -2,9 +2,11 @@ import { Popover, Tag } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { CorpGroup, CorpUser, EntityType } from '../../../../../types.generated'; -import { CustomAvatar } from '../../../../shared/avatar'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; + +import { CustomAvatar } from '@app/shared/avatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpGroup, CorpUser, EntityType } from '@types'; type Props = { actor: CorpUser | CorpGroup; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActorGroup.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActorGroup.tsx index c5f96cda3c..ce7e29a9bd 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActorGroup.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActorGroup.tsx @@ -1,8 +1,10 @@ import { Popover, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { CorpGroup, CorpUser } from '../../../../../types.generated'; -import { ExpandedActor } from './ExpandedActor'; + +import { ExpandedActor } from '@app/entity/shared/components/styled/ExpandedActor'; + +import { CorpGroup, CorpUser } from '@types'; const PopoverActors = styled.div` max-width: 600px; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx index dac382ab84..eb1b94d209 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx @@ -1,15 +1,17 @@ -import { message, Modal, Tag } from 'antd'; +import { Modal, Tag, message } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { useRemoveOwnerMutation } from '../../../../../../graphql/mutations.generated'; -import { EntityType, Owner } from '../../../../../../types.generated'; -import { getNameFromType } from '../../../containers/profile/sidebar/Ownership/ownershipUtils'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import analytics, { EventType, EntityActionType } from '../../../../../analytics'; -import { useEntityData } from '../../../EntityContext'; -import OwnerContent from './OwnerContent'; -import { useEmbeddedProfileLinkProps } from '../../../../../shared/useEmbeddedProfileLinkProps'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import OwnerContent from '@app/entity/shared/components/styled/ExpandedOwner/OwnerContent'; +import { getNameFromType } from '@app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils'; +import { useEmbeddedProfileLinkProps } from '@app/shared/useEmbeddedProfileLinkProps'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useRemoveOwnerMutation } from '@graphql/mutations.generated'; +import { EntityType, Owner } from '@types'; const OwnerTag = styled(Tag)` margin: 0; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner/OwnerContent.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner/OwnerContent.tsx index 2ed7536dcd..0af3ec20e8 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner/OwnerContent.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner/OwnerContent.tsx @@ -1,10 +1,15 @@ -import React from 'react'; import { Popover, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import { Owner } from '../../../../../../types.generated'; -import { CustomAvatar } from '../../../../../shared/avatar'; -import { getDescriptionFromType, getNameFromType } from '../../../containers/profile/sidebar/Ownership/ownershipUtils'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; + +import { + getDescriptionFromType, + getNameFromType, +} from '@app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils'; +import { CustomAvatar } from '@app/shared/avatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Owner } from '@types'; const TextWrapper = styled.span<{ fontSize?: number }>` ${(props) => props.fontSize && `font-size: ${props.fontSize}px;`} diff --git a/datahub-web-react/src/app/entity/shared/components/styled/InfoItem.tsx b/datahub-web-react/src/app/entity/shared/components/styled/InfoItem.tsx index 472b1c35f4..a0b31e70a9 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/InfoItem.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/InfoItem.tsx @@ -1,7 +1,8 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const HeaderInfoItem = styled.div<{ onClick?: () => void; width?: string }>` display: inline-block; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/SeeMore.tsx b/datahub-web-react/src/app/entity/shared/components/styled/SeeMore.tsx index 289e39b66d..47c4ef085a 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/SeeMore.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/SeeMore.tsx @@ -1,6 +1,7 @@ import { Button } from 'antd'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export const SeeMore = styled(Button)` margin-top: -20px; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StatsSummary.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StatsSummary.tsx index 9694fb631f..40bab995f2 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StatsSummary.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StatsSummary.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; type Props = { stats: Array; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StripMarkdownText.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StripMarkdownText.tsx index 212813ffcb..9ed9c8fbec 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StripMarkdownText.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StripMarkdownText.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import removeMd from '@tommoor/remove-markdown'; +import React from 'react'; import styled from 'styled-components'; const RemoveMarkdownContainer = styled.div<{ shouldWrap: boolean }>` diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/DateInput.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/DateInput.tsx index 23c322ea4c..6ea872b93c 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/DateInput.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/DateInput.tsx @@ -1,6 +1,6 @@ import { DatePicker } from 'antd'; -import React from 'react'; import moment, { Moment } from 'moment'; +import React from 'react'; interface Props { selectedValues: any[]; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/MultiSelectInput.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/MultiSelectInput.tsx index cc28effa87..91b2cb6c67 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/MultiSelectInput.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/MultiSelectInput.tsx @@ -1,11 +1,13 @@ import { Checkbox, Select, Tag } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY_V2 } from '../../../constants'; -import { getStructuredPropertyValue } from '../../../utils'; -import ValueDescription from '../../../entityForm/prompts/StructuredPropertyPrompt/ValueDescription'; -import { AllowedValue } from '../../../../../../types.generated'; -import DropdownLabel from './DropdownLabel'; + +import DropdownLabel from '@app/entity/shared/components/styled/StructuredProperty/DropdownLabel'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import ValueDescription from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/ValueDescription'; +import { getStructuredPropertyValue } from '@app/entity/shared/utils'; + +import { AllowedValue } from '@types'; const StyledCheckbox = styled(Checkbox)` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/MultipleOpenEndedInput.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/MultipleOpenEndedInput.tsx index fe6cd11154..c57836a4cd 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/MultipleOpenEndedInput.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/MultipleOpenEndedInput.tsx @@ -2,7 +2,8 @@ import { DeleteOutlined } from '@ant-design/icons'; import { Button, Input } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY_V2 } from '../../../constants'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; const MultiStringWrapper = styled.div``; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/NumberInput.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/NumberInput.tsx index f4cedc4cf8..d1814d1f62 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/NumberInput.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/NumberInput.tsx @@ -1,9 +1,10 @@ import { Input } from 'antd'; import React, { ChangeEvent } from 'react'; import styled from 'styled-components'; + +import MultipleOpenEndedInput from '@app/entity/shared/components/styled/StructuredProperty/MultipleOpenEndedInput'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; import { PropertyCardinality } from '@src/types.generated'; -import { ANTD_GRAY_V2 } from '../../../constants'; -import MultipleOpenEndedInput from './MultipleOpenEndedInput'; const StyledInput = styled(Input)` border: 1px solid ${ANTD_GRAY_V2[6]}; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/RichTextInput.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/RichTextInput.tsx index 5456d714c1..273825f9cb 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/RichTextInput.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/RichTextInput.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { Editor } from '../../../tabs/Documentation/components/editor/Editor'; -import { ANTD_GRAY_V2 } from '../../../constants'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; const StyledEditor = styled(Editor)` border: 1px solid ${ANTD_GRAY_V2[6]}; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/SingleSelectInput.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/SingleSelectInput.tsx index 93f0cf59ad..14592c2c43 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/SingleSelectInput.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/SingleSelectInput.tsx @@ -1,11 +1,13 @@ import { Radio, Select } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY_V2 } from '../../../constants'; -import { getStructuredPropertyValue } from '../../../utils'; -import ValueDescription from '../../../entityForm/prompts/StructuredPropertyPrompt/ValueDescription'; -import { AllowedValue } from '../../../../../../types.generated'; -import DropdownLabel from './DropdownLabel'; + +import DropdownLabel from '@app/entity/shared/components/styled/StructuredProperty/DropdownLabel'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import ValueDescription from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/ValueDescription'; +import { getStructuredPropertyValue } from '@app/entity/shared/utils'; + +import { AllowedValue } from '@types'; const StyledRadio = styled(Radio)` display: block; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/StringInput.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/StringInput.tsx index 47912dbc22..d64a93d0a0 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/StringInput.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/StringInput.tsx @@ -1,9 +1,11 @@ import { Input } from 'antd'; import React, { ChangeEvent } from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY_V2 } from '../../../constants'; -import { PropertyCardinality } from '../../../../../../types.generated'; -import MultipleOpenEndedInput from './MultipleOpenEndedInput'; + +import MultipleOpenEndedInput from '@app/entity/shared/components/styled/StructuredProperty/MultipleOpenEndedInput'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; + +import { PropertyCardinality } from '@types'; const StyledInput = styled(Input)` width: 75%; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/StructuredPropertyInput.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/StructuredPropertyInput.tsx index 1e3c6dbea0..f3ab50dbc3 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/StructuredPropertyInput.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StructuredProperty/StructuredPropertyInput.tsx @@ -1,13 +1,14 @@ -import { PropertyCardinality, StdDataType, StructuredPropertyEntity } from '@src/types.generated'; import React from 'react'; -import StructuredPropertySearchSelectUrnInput from '../../../entityForm/prompts/StructuredPropertyPrompt/UrnInput/StructuredPropertySearchSelectUrnInput'; -import UrnInput from '../../../entityForm/prompts/StructuredPropertyPrompt/UrnInput/UrnInput'; -import DateInput from './DateInput'; -import MultiSelectInput from './MultiSelectInput'; -import NumberInput from './NumberInput'; -import RichTextInput from './RichTextInput'; -import SingleSelectInput from './SingleSelectInput'; -import StringInput from './StringInput'; + +import DateInput from '@app/entity/shared/components/styled/StructuredProperty/DateInput'; +import MultiSelectInput from '@app/entity/shared/components/styled/StructuredProperty/MultiSelectInput'; +import NumberInput from '@app/entity/shared/components/styled/StructuredProperty/NumberInput'; +import RichTextInput from '@app/entity/shared/components/styled/StructuredProperty/RichTextInput'; +import SingleSelectInput from '@app/entity/shared/components/styled/StructuredProperty/SingleSelectInput'; +import StringInput from '@app/entity/shared/components/styled/StructuredProperty/StringInput'; +import StructuredPropertySearchSelectUrnInput from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/StructuredPropertySearchSelectUrnInput'; +import UrnInput from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/UrnInput'; +import { PropertyCardinality, StdDataType, StructuredPropertyEntity } from '@src/types.generated'; interface Props { structuredProperty: StructuredPropertyEntity; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StyledMDEditor.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StyledMDEditor.tsx index 6ff965cd4c..ca44fa319b 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StyledMDEditor.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StyledMDEditor.tsx @@ -1,6 +1,7 @@ import MDEditor from '@uiw/react-md-editor'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export default styled(MDEditor)` height: calc(100% - 46px) !important; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StyledTable.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StyledTable.tsx index 0fe8129e1d..f0d1409a5f 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StyledTable.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StyledTable.tsx @@ -1,6 +1,7 @@ import { Table } from 'antd'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export const StyledTable = styled(Table)` overflow: inherit; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StyledTag.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StyledTag.tsx index 08087bfd79..d6203b0010 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/StyledTag.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/StyledTag.tsx @@ -1,6 +1,6 @@ import { Tag } from 'antd'; -import styled, { css } from 'styled-components'; import ColorHash from 'color-hash'; +import styled, { css } from 'styled-components'; export const generateColor = new ColorHash({ saturation: 0.9, diff --git a/datahub-web-react/src/app/entity/shared/components/styled/TabToolbar.tsx b/datahub-web-react/src/app/entity/shared/components/styled/TabToolbar.tsx index 6c3d2ad3e6..6d656f950a 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/TabToolbar.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/TabToolbar.tsx @@ -1,5 +1,6 @@ import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export default styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/DownloadAsCsvButton.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/DownloadAsCsvButton.tsx index cb01ff88a2..f1c2f7e2a6 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/DownloadAsCsvButton.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/DownloadAsCsvButton.tsx @@ -1,6 +1,6 @@ -import React from 'react'; -import { Button } from 'antd'; import { DownloadOutlined } from '@ant-design/icons'; +import { Button } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const DownloadCsvButton = styled(Button)` diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/DownloadAsCsvModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/DownloadAsCsvModal.tsx index f5bdd20504..4355d1a5ad 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/DownloadAsCsvModal.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/DownloadAsCsvModal.tsx @@ -1,14 +1,19 @@ +import { LoadingOutlined } from '@ant-design/icons'; +import { Button, Input, Modal, Spin, notification } from 'antd'; import React, { useState } from 'react'; import { useLocation } from 'react-router'; -import { Button, Input, Modal, Spin, notification } from 'antd'; -import { LoadingOutlined } from '@ant-design/icons'; -import { AndFilterInput } from '../../../../../../types.generated'; -import { getSearchCsvDownloadHeader, transformResultsToCsvRow } from './downloadAsCsvUtil'; -import { downloadRowsAsCsv } from '../../../../../search/utils/csvUtils'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { useEntityData } from '../../../EntityContext'; -import analytics, { EventType } from '../../../../../analytics'; -import { DownloadSearchResultsInput, DownloadSearchResults } from '../../../../../search/utils/types'; + +import analytics, { EventType } from '@app/analytics'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { + getSearchCsvDownloadHeader, + transformResultsToCsvRow, +} from '@app/entity/shared/components/styled/search/downloadAsCsvUtil'; +import { downloadRowsAsCsv } from '@app/search/utils/csvUtils'; +import { DownloadSearchResults, DownloadSearchResultsInput } from '@app/search/utils/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { AndFilterInput } from '@types'; type Props = { downloadSearchResults: (input: DownloadSearchResultsInput) => Promise; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearch.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearch.tsx index 2d93f3cc73..2dedbb6e11 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearch.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearch.tsx @@ -1,33 +1,34 @@ -import React, { useState, useEffect } from 'react'; -import styled from 'styled-components'; import { ApolloError } from '@apollo/client'; +import React, { useEffect, useState } from 'react'; +import styled from 'styled-components'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityContext } from '@app/entity/shared/EntityContext'; +import EmbeddedListSearchHeader from '@app/entity/shared/components/styled/search/EmbeddedListSearchHeader'; +import { EmbeddedListSearchResults } from '@app/entity/shared/components/styled/search/EmbeddedListSearchResults'; +import { EntityActionProps } from '@app/entity/shared/components/styled/search/EntitySearchResults'; import { - EntityType, - FacetFilterInput, - FacetMetadata, - SearchAcrossEntitiesInput, -} from '../../../../../../types.generated'; -import { DEGREE_FILTER_NAME, UnionType } from '../../../../../search/utils/constants'; -import { SearchCfg } from '../../../../../../conf'; -import { EmbeddedListSearchResults } from './EmbeddedListSearchResults'; -import EmbeddedListSearchHeader from './EmbeddedListSearchHeader'; -import { useGetSearchResultsForMultipleQuery } from '../../../../../../graphql/search.generated'; -import { FilterSet, GetSearchResultsParams, SearchResultsInterface } from './types'; -import { isListSubset } from '../../../utils'; -import { EntityAndType } from '../../../types'; -import { Message } from '../../../../../shared/Message'; -import { generateOrFilters } from '../../../../../search/utils/generateOrFilters'; -import { mergeFilterSets } from '../../../../../search/utils/filterUtils'; -import { useDownloadScrollAcrossEntitiesSearchResults } from '../../../../../search/utils/useDownloadScrollAcrossEntitiesSearchResults'; + FilterSet, + GetSearchResultsParams, + SearchResultsInterface, +} from '@app/entity/shared/components/styled/search/types'; +import { EntityAndType } from '@app/entity/shared/types'; +import { isListSubset } from '@app/entity/shared/utils'; +import { DEGREE_FILTER_NAME, UnionType } from '@app/search/utils/constants'; +import { mergeFilterSets } from '@app/search/utils/filterUtils'; +import { generateOrFilters } from '@app/search/utils/generateOrFilters'; import { - DownloadSearchResultsParams, - DownloadSearchResultsInput, DownloadSearchResults, -} from '../../../../../search/utils/types'; -import { useEntityContext } from '../../../EntityContext'; -import { EntityActionProps } from './EntitySearchResults'; -import { useUserContext } from '../../../../../context/useUserContext'; -import analytics, { EventType } from '../../../../../analytics'; + DownloadSearchResultsInput, + DownloadSearchResultsParams, +} from '@app/search/utils/types'; +import { useDownloadScrollAcrossEntitiesSearchResults } from '@app/search/utils/useDownloadScrollAcrossEntitiesSearchResults'; +import { Message } from '@app/shared/Message'; +import { SearchCfg } from '@src/conf'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { EntityType, FacetFilterInput, FacetMetadata, SearchAcrossEntitiesInput } from '@types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchHeader.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchHeader.tsx index a69af3e658..065886e0a3 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchHeader.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchHeader.tsx @@ -1,15 +1,17 @@ -import React from 'react'; -import { Button, Typography } from 'antd'; import { FilterOutlined } from '@ant-design/icons'; +import { Button, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import TabToolbar from '../TabToolbar'; -import { SearchBar } from '../../../../../search/SearchBar'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { AndFilterInput } from '../../../../../../types.generated'; -import SearchExtendedMenu from './SearchExtendedMenu'; -import { SearchSelectBar } from './SearchSelectBar'; -import { EntityAndType } from '../../../types'; -import { DownloadSearchResultsInput, DownloadSearchResults } from '../../../../../search/utils/types'; + +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import SearchExtendedMenu from '@app/entity/shared/components/styled/search/SearchExtendedMenu'; +import { SearchSelectBar } from '@app/entity/shared/components/styled/search/SearchSelectBar'; +import { EntityAndType } from '@app/entity/shared/types'; +import { SearchBar } from '@app/search/SearchBar'; +import { DownloadSearchResults, DownloadSearchResultsInput } from '@app/search/utils/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { AndFilterInput } from '@types'; const HeaderContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchModal.tsx index 4af657a46c..b27fecc7ce 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchModal.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchModal.tsx @@ -1,11 +1,13 @@ -import React, { useState } from 'react'; import { Button, Modal } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; -import { FacetFilterInput } from '../../../../../../types.generated'; -import { EmbeddedListSearch } from './EmbeddedListSearch'; -import { UnionType } from '../../../../../search/utils/constants'; -import { FilterSet } from './types'; -import { EntityActionProps } from './EntitySearchResults'; + +import { EmbeddedListSearch } from '@app/entity/shared/components/styled/search/EmbeddedListSearch'; +import { EntityActionProps } from '@app/entity/shared/components/styled/search/EntitySearchResults'; +import { FilterSet } from '@app/entity/shared/components/styled/search/types'; +import { UnionType } from '@app/search/utils/constants'; + +import { FacetFilterInput } from '@types'; const SearchContainer = styled.div` height: 500px; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchResults.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchResults.tsx index 0749ff369c..f0670f5c44 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchResults.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchResults.tsx @@ -1,17 +1,22 @@ -import React from 'react'; -import { Button, Pagination, Spin, Typography } from 'antd'; import { LoadingOutlined } from '@ant-design/icons'; +import { Button, Pagination, Spin, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata, SearchResults as SearchResultType } from '../../../../../../types.generated'; -import { SearchCfg } from '../../../../../../conf'; -import { EntityAndType } from '../../../types'; -import { UnionType } from '../../../../../search/utils/constants'; -import { SearchFiltersSection } from '../../../../../search/SearchFiltersSection'; -import { EntitySearchResults, EntityActionProps } from './EntitySearchResults'; -import MatchingViewsLabel from './MatchingViewsLabel'; -import { ANTD_GRAY } from '../../../constants'; -import { useIsShowSeparateSiblingsEnabled } from '../../../../../useAppConfig'; -import { combineSiblingsInSearchResults } from '../../../../../search/utils/combineSiblingsInSearchResults'; + +import { + EntityActionProps, + EntitySearchResults, +} from '@app/entity/shared/components/styled/search/EntitySearchResults'; +import MatchingViewsLabel from '@app/entity/shared/components/styled/search/MatchingViewsLabel'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { EntityAndType } from '@app/entity/shared/types'; +import { SearchFiltersSection } from '@app/search/SearchFiltersSection'; +import { combineSiblingsInSearchResults } from '@app/search/utils/combineSiblingsInSearchResults'; +import { UnionType } from '@app/search/utils/constants'; +import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig'; +import { SearchCfg } from '@src/conf'; + +import { FacetFilterInput, FacetMetadata, SearchResults as SearchResultType } from '@types'; const SearchBody = styled.div` height: 100%; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchSection.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchSection.tsx index aa897584f2..8a302b7ebc 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchSection.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchSection.tsx @@ -1,19 +1,25 @@ -import React from 'react'; -import * as QueryString from 'query-string'; -import { useHistory, useLocation } from 'react-router'; import { ApolloError } from '@apollo/client'; -import { FacetFilterInput } from '../../../../../../types.generated'; -import useFilters from '../../../../../search/utils/useFilters'; -import { navigateToEntitySearchUrl } from './navigateToEntitySearchUrl'; -import { FilterSet, GetSearchResultsParams, SearchResultsInterface } from './types'; -import { useEntityQueryParams } from '../../../containers/profile/utils'; -import { EmbeddedListSearch } from './EmbeddedListSearch'; -import { EMBEDDED_LIST_SEARCH_ENTITY_TYPES, UnionType } from '../../../../../search/utils/constants'; +import * as QueryString from 'query-string'; +import React from 'react'; +import { useHistory, useLocation } from 'react-router'; + +import { EmbeddedListSearch } from '@app/entity/shared/components/styled/search/EmbeddedListSearch'; +import { navigateToEntitySearchUrl } from '@app/entity/shared/components/styled/search/navigateToEntitySearchUrl'; +import { + FilterSet, + GetSearchResultsParams, + SearchResultsInterface, +} from '@app/entity/shared/components/styled/search/types'; +import { useEntityQueryParams } from '@app/entity/shared/containers/profile/utils'; +import { EMBEDDED_LIST_SEARCH_ENTITY_TYPES, UnionType } from '@app/search/utils/constants'; import { DownloadSearchResults, DownloadSearchResultsInput, DownloadSearchResultsParams, -} from '../../../../../search/utils/types'; +} from '@app/search/utils/types'; +import useFilters from '@app/search/utils/useFilters'; + +import { FacetFilterInput } from '@types'; const FILTER = 'filter'; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/EntitySearchResults.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/EntitySearchResults.tsx index 546fb60e2c..708ef95ccf 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/EntitySearchResults.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/EntitySearchResults.tsx @@ -1,10 +1,12 @@ -import React from 'react'; import { Checkbox, Radio } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { EntityPath, EntityType, SearchResult } from '../../../../../../types.generated'; -import { EntityAndType } from '../../../types'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { ListItem, StyledList, ThinDivider } from '../../../../../recommendations/renderer/component/EntityNameList'; + +import { EntityAndType } from '@app/entity/shared/types'; +import { ListItem, StyledList, ThinDivider } from '@app/recommendations/renderer/component/EntityNameList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityPath, EntityType, SearchResult } from '@types'; const StyledCheckbox = styled(Checkbox)` margin-right: 12px; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/MatchingViewsLabel.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/MatchingViewsLabel.tsx index 4af0998d02..eeab55d21c 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/MatchingViewsLabel.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/MatchingViewsLabel.tsx @@ -1,11 +1,13 @@ -import React from 'react'; import { Button, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; -import { useListGlobalViewsQuery, useListMyViewsQuery } from '../../../../../../graphql/view.generated'; -import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '../../../../view/utils'; -import { useUserContext } from '../../../../../context/useUserContext'; -import { DataHubViewType } from '../../../../../../types.generated'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '@app/entity/view/utils'; + +import { useListGlobalViewsQuery, useListMyViewsQuery } from '@graphql/view.generated'; +import { DataHubViewType } from '@types'; const MatchingViewsLabel = () => { const userContext = useUserContext(); diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchExtendedMenu.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchExtendedMenu.tsx index b9ab2a4bd4..81f52ccc17 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchExtendedMenu.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchExtendedMenu.tsx @@ -1,12 +1,14 @@ -import React, { useState } from 'react'; -import { Button, Dropdown } from 'antd'; import { FormOutlined, MoreOutlined } from '@ant-design/icons'; +import { Button, Dropdown } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { AndFilterInput } from '../../../../../../types.generated'; -import DownloadAsCsvButton from './DownloadAsCsvButton'; -import DownloadAsCsvModal from './DownloadAsCsvModal'; -import { DownloadSearchResultsInput, DownloadSearchResults } from '../../../../../search/utils/types'; -import { MenuItemStyle } from '../../../../view/menu/item/styledComponent'; + +import DownloadAsCsvButton from '@app/entity/shared/components/styled/search/DownloadAsCsvButton'; +import DownloadAsCsvModal from '@app/entity/shared/components/styled/search/DownloadAsCsvModal'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; +import { DownloadSearchResults, DownloadSearchResultsInput } from '@app/search/utils/types'; + +import { AndFilterInput } from '@types'; const MenuIcon = styled(MoreOutlined)` font-size: 20px; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelect.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelect.tsx index 593a6d804b..d9a6890ead 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelect.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelect.tsx @@ -1,20 +1,21 @@ -import React, { useState } from 'react'; -import { Button, message, Typography } from 'antd'; -import styled from 'styled-components'; import { FilterOutlined } from '@ant-design/icons'; +import { Button, Typography, message } from 'antd'; +import React, { useState } from 'react'; +import styled from 'styled-components'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { EntityType, FacetFilterInput, FilterOperator } from '../../../../../../types.generated'; -import { ENTITY_FILTER_NAME, UnionType } from '../../../../../search/utils/constants'; -import { SearchCfg } from '../../../../../../conf'; -import { EmbeddedListSearchResults } from './EmbeddedListSearchResults'; -import { useGetSearchResultsForMultipleQuery } from '../../../../../../graphql/search.generated'; -import { isListSubset } from '../../../utils'; -import { SearchBar } from '../../../../../search/SearchBar'; -import { ANTD_GRAY } from '../../../constants'; -import { EntityAndType } from '../../../types'; -import { SearchSelectBar } from './SearchSelectBar'; -import TabToolbar from '../TabToolbar'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { EmbeddedListSearchResults } from '@app/entity/shared/components/styled/search/EmbeddedListSearchResults'; +import { SearchSelectBar } from '@app/entity/shared/components/styled/search/SearchSelectBar'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { EntityAndType } from '@app/entity/shared/types'; +import { isListSubset } from '@app/entity/shared/utils'; +import { SearchBar } from '@app/search/SearchBar'; +import { ENTITY_FILTER_NAME, UnionType } from '@app/search/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { SearchCfg } from '@src/conf'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { EntityType, FacetFilterInput, FilterOperator } from '@types'; const Container = styled.span` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectActions.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectActions.tsx index fc16b5146c..50eaec9eee 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectActions.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectActions.tsx @@ -1,16 +1,18 @@ import React from 'react'; -import OwnersDropdown from './action/OwnersDropdown'; -import GlossaryTermDropdown from './action/GlossaryTermsDropdown'; -import TagsDropdown from './action/TagsDropdown'; -import DomainDropdown from './action/DomainsDropdown'; -import DeprecationDropdown from './action/DeprecationDropdown'; -import DeleteDropdown from './action/DeleteDropdown'; -import DataProductsDropdown from './action/DataProductsDropdown'; -import { EntityType } from '../../../../../../types.generated'; -import { EntityCapabilityType } from '../../../../Entity'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { EntityAndType } from '../../../types'; -import { SelectActionGroups } from './types'; + +import { EntityCapabilityType } from '@app/entity/Entity'; +import DataProductsDropdown from '@app/entity/shared/components/styled/search/action/DataProductsDropdown'; +import DeleteDropdown from '@app/entity/shared/components/styled/search/action/DeleteDropdown'; +import DeprecationDropdown from '@app/entity/shared/components/styled/search/action/DeprecationDropdown'; +import DomainDropdown from '@app/entity/shared/components/styled/search/action/DomainsDropdown'; +import GlossaryTermDropdown from '@app/entity/shared/components/styled/search/action/GlossaryTermsDropdown'; +import OwnersDropdown from '@app/entity/shared/components/styled/search/action/OwnersDropdown'; +import TagsDropdown from '@app/entity/shared/components/styled/search/action/TagsDropdown'; +import { SelectActionGroups } from '@app/entity/shared/components/styled/search/types'; +import { EntityAndType } from '@app/entity/shared/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; /** * The set of action groups that are visible by default. diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectBar.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectBar.tsx index 37bab2ef8f..7c2c0e54f4 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectBar.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectBar.tsx @@ -1,9 +1,10 @@ -import React from 'react'; import { Button, Checkbox, Modal, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; -import { EntityAndType } from '../../../types'; -import { SearchSelectActions } from './SearchSelectActions'; + +import { SearchSelectActions } from '@app/entity/shared/components/styled/search/SearchSelectActions'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { EntityAndType } from '@app/entity/shared/types'; const CheckboxContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectModal.tsx index 53d8afca8c..408a5a83c8 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectModal.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectModal.tsx @@ -1,12 +1,14 @@ import { Modal } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; + +import { SearchSelect } from '@app/entity/shared/components/styled/search/SearchSelect'; +import { EntityAndType } from '@app/entity/shared/types'; +import ClickOutside from '@app/shared/ClickOutside'; import { Button } from '@src/alchemy-components'; import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; -import { EntityType } from '../../../../../../types.generated'; -import ClickOutside from '../../../../../shared/ClickOutside'; -import { EntityAndType } from '../../../types'; -import { SearchSelect } from './SearchSelect'; + +import { EntityType } from '@types'; const StyledModal = styled(Modal)` top: 30px; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/ActionDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/ActionDropdown.tsx index c958d3b82a..d64cd17585 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/action/ActionDropdown.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/action/ActionDropdown.tsx @@ -1,9 +1,10 @@ -import React from 'react'; -import { Button, Dropdown, Tooltip } from 'antd'; import { CaretDownOutlined } from '@ant-design/icons'; +import { Button, Dropdown, Tooltip } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../constants'; -import { MenuItemStyle } from '../../../../../view/menu/item/styledComponent'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; const DownArrow = styled(CaretDownOutlined)` && { diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/DataProductsDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/DataProductsDropdown.tsx index 08dab767fa..66a3e90031 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/action/DataProductsDropdown.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/action/DataProductsDropdown.tsx @@ -1,9 +1,11 @@ -import { message, Modal } from 'antd'; +import { Modal, message } from 'antd'; import React, { useState } from 'react'; -import ActionDropdown from './ActionDropdown'; -import { handleBatchError } from '../../../../utils'; -import { useBatchSetDataProductMutation } from '../../../../../../../graphql/dataProduct.generated'; -import SetDataProductModal from '../../../../containers/profile/sidebar/DataProduct/SetDataProductModal'; + +import ActionDropdown from '@app/entity/shared/components/styled/search/action/ActionDropdown'; +import SetDataProductModal from '@app/entity/shared/containers/profile/sidebar/DataProduct/SetDataProductModal'; +import { handleBatchError } from '@app/entity/shared/utils'; + +import { useBatchSetDataProductMutation } from '@graphql/dataProduct.generated'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/DeleteDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/DeleteDropdown.tsx index c79d43a21e..f7a7f0d7e9 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/action/DeleteDropdown.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/action/DeleteDropdown.tsx @@ -1,8 +1,10 @@ -import { message, Modal } from 'antd'; +import { Modal, message } from 'antd'; import React from 'react'; -import { useBatchUpdateSoftDeletedMutation } from '../../../../../../../graphql/mutations.generated'; -import ActionDropdown from './ActionDropdown'; -import { handleBatchError } from '../../../../utils'; + +import ActionDropdown from '@app/entity/shared/components/styled/search/action/ActionDropdown'; +import { handleBatchError } from '@app/entity/shared/utils'; + +import { useBatchUpdateSoftDeletedMutation } from '@graphql/mutations.generated'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/DeprecationDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/DeprecationDropdown.tsx index 981a1a8a0d..1e3fff7a04 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/action/DeprecationDropdown.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/action/DeprecationDropdown.tsx @@ -1,9 +1,11 @@ -import { message, Modal } from 'antd'; +import { Modal, message } from 'antd'; import React, { useState } from 'react'; -import { useBatchUpdateDeprecationMutation } from '../../../../../../../graphql/mutations.generated'; -import { UpdateDeprecationModal } from '../../../../EntityDropdown/UpdateDeprecationModal'; -import ActionDropdown from './ActionDropdown'; -import { handleBatchError } from '../../../../utils'; + +import { UpdateDeprecationModal } from '@app/entity/shared/EntityDropdown/UpdateDeprecationModal'; +import ActionDropdown from '@app/entity/shared/components/styled/search/action/ActionDropdown'; +import { handleBatchError } from '@app/entity/shared/utils'; + +import { useBatchUpdateDeprecationMutation } from '@graphql/mutations.generated'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/DomainsDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/DomainsDropdown.tsx index ad9c58c67d..f46d54f563 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/action/DomainsDropdown.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/action/DomainsDropdown.tsx @@ -1,9 +1,11 @@ -import { message, Modal } from 'antd'; +import { Modal, message } from 'antd'; import React, { useState } from 'react'; -import { useBatchSetDomainMutation } from '../../../../../../../graphql/mutations.generated'; -import { SetDomainModal } from '../../../../containers/profile/sidebar/Domain/SetDomainModal'; -import ActionDropdown from './ActionDropdown'; -import { handleBatchError } from '../../../../utils'; + +import ActionDropdown from '@app/entity/shared/components/styled/search/action/ActionDropdown'; +import { SetDomainModal } from '@app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal'; +import { handleBatchError } from '@app/entity/shared/utils'; + +import { useBatchSetDomainMutation } from '@graphql/mutations.generated'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/GlossaryTermsDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/GlossaryTermsDropdown.tsx index 9083567d0f..4ddc25577d 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/action/GlossaryTermsDropdown.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/action/GlossaryTermsDropdown.tsx @@ -1,7 +1,9 @@ import React, { useState } from 'react'; -import { EntityType } from '../../../../../../../types.generated'; -import EditTagTermsModal, { OperationType } from '../../../../../../shared/tags/AddTagsTermsModal'; -import ActionDropdown from './ActionDropdown'; + +import ActionDropdown from '@app/entity/shared/components/styled/search/action/ActionDropdown'; +import EditTagTermsModal, { OperationType } from '@app/shared/tags/AddTagsTermsModal'; + +import { EntityType } from '@types'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/OwnersDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/OwnersDropdown.tsx index 5482d287ad..79f5060c11 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/action/OwnersDropdown.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/action/OwnersDropdown.tsx @@ -1,6 +1,10 @@ import React, { useState } from 'react'; -import { EditOwnersModal, OperationType } from '../../../../containers/profile/sidebar/Ownership/EditOwnersModal'; -import ActionDropdown from './ActionDropdown'; + +import ActionDropdown from '@app/entity/shared/components/styled/search/action/ActionDropdown'; +import { + EditOwnersModal, + OperationType, +} from '@app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/TagsDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/TagsDropdown.tsx index 94dcd4d245..abe2a079b7 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/action/TagsDropdown.tsx +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/action/TagsDropdown.tsx @@ -1,7 +1,9 @@ import React, { useState } from 'react'; -import { EntityType } from '../../../../../../../types.generated'; -import EditTagTermsModal, { OperationType } from '../../../../../../shared/tags/AddTagsTermsModal'; -import ActionDropdown from './ActionDropdown'; + +import ActionDropdown from '@app/entity/shared/components/styled/search/action/ActionDropdown'; +import EditTagTermsModal, { OperationType } from '@app/shared/tags/AddTagsTermsModal'; + +import { EntityType } from '@types'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/downloadAsCsvUtil.ts b/datahub-web-react/src/app/entity/shared/components/styled/search/downloadAsCsvUtil.ts index d000359499..5232bfe7e1 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/downloadAsCsvUtil.ts +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/downloadAsCsvUtil.ts @@ -1,8 +1,9 @@ -import { CorpGroup, CorpUser, EntityType } from '../../../../../../types.generated'; -import { capitalizeFirstLetterOnly } from '../../../../../shared/textUtil'; -import EntityRegistry from '../../../../EntityRegistry'; -import { GenericEntityProperties } from '../../../types'; -import { SearchResultInterface } from './types'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { SearchResultInterface } from '@app/entity/shared/components/styled/search/types'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { CorpGroup, CorpUser, EntityType } from '@types'; const searchCsvDownloadHeader = [ 'urn', diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/navigateToEntitySearchUrl.ts b/datahub-web-react/src/app/entity/shared/components/styled/search/navigateToEntitySearchUrl.ts index 44459e590b..132ed49f23 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/navigateToEntitySearchUrl.ts +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/navigateToEntitySearchUrl.ts @@ -1,8 +1,10 @@ -import { RouteComponentProps } from 'react-router'; import * as QueryString from 'query-string'; -import { EntityType, FacetFilterInput } from '../../../../../../types.generated'; -import filtersToQueryStringParams from '../../../../../search/utils/filtersToQueryStringParams'; -import { UnionType } from '../../../../../search/utils/constants'; +import { RouteComponentProps } from 'react-router'; + +import { UnionType } from '@app/search/utils/constants'; +import filtersToQueryStringParams from '@app/search/utils/filtersToQueryStringParams'; + +import { EntityType, FacetFilterInput } from '@types'; export const navigateToEntitySearchUrl = ({ baseUrl, diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/types.ts b/datahub-web-react/src/app/entity/shared/components/styled/search/types.ts index 5509bb8d66..cfa997c96c 100644 --- a/datahub-web-react/src/app/entity/shared/components/styled/search/types.ts +++ b/datahub-web-react/src/app/entity/shared/components/styled/search/types.ts @@ -1,3 +1,5 @@ +import { UnionType } from '@app/search/utils/constants'; + import { Entity, FacetFilterInput, @@ -7,8 +9,7 @@ import { Scalars, SearchAcrossEntitiesInput, SearchInsight, -} from '../../../../../../types.generated'; -import { UnionType } from '../../../../../search/utils/constants'; +} from '@types'; export type GetSearchResultsParams = { variables: { diff --git a/datahub-web-react/src/app/entity/shared/constants.ts b/datahub-web-react/src/app/entity/shared/constants.ts index e4bca0e5ad..ff6adf11d1 100644 --- a/datahub-web-react/src/app/entity/shared/constants.ts +++ b/datahub-web-react/src/app/entity/shared/constants.ts @@ -1,4 +1,4 @@ -import { EntityType } from '../../../types.generated'; +import { EntityType } from '@types'; // TODO(Gabe): integrate this w/ the theme export const REDESIGN_COLORS = { diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/EntityProfile.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/EntityProfile.tsx index 8ceba1e426..0855e31bb3 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/EntityProfile.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/EntityProfile.tsx @@ -1,51 +1,53 @@ -import React, { useCallback, useState } from 'react'; -import { Alert, Divider } from 'antd'; import { MutationHookOptions, MutationTuple, QueryHookOptions, QueryResult } from '@apollo/client/react/types/types'; -import styled from 'styled-components/macro'; +import { Alert, Divider } from 'antd'; +import React, { useCallback, useState } from 'react'; import { useHistory } from 'react-router'; -import { EntityType, Exact } from '../../../../../types.generated'; +import styled from 'styled-components/macro'; + +import analytics, { EventType } from '@app/analytics'; +import { useUpdateDomainEntityDataOnChange } from '@app/domain/utils'; +import { EntityContext } from '@app/entity/shared/EntityContext'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { EntityHeader } from '@app/entity/shared/containers/profile/header/EntityHeader'; +import { EntityTabs } from '@app/entity/shared/containers/profile/header/EntityTabs'; +import { EntityProfileNavBar } from '@app/entity/shared/containers/profile/nav/EntityProfileNavBar'; +import { EntitySidebar } from '@app/entity/shared/containers/profile/sidebar/EntitySidebar'; +import SidebarFormInfoWrapper from '@app/entity/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper'; +import ProfileSidebar from '@app/entity/shared/containers/profile/sidebar/ProfileSidebar'; +import useGetDataForProfile from '@app/entity/shared/containers/profile/useGetDataForProfile'; import { getEntityPath, getOnboardingStepIdsForEntityType, sortEntityProfileTabs, useRoutedTab, useUpdateGlossaryEntityDataOnChange, -} from './utils'; +} from '@app/entity/shared/containers/profile/utils'; +import { EntityActionItem } from '@app/entity/shared/entity/EntityActions'; +import NonExistentEntityPage from '@app/entity/shared/entity/NonExistentEntityPage'; +import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import DynamicTab from '@app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTab'; import { EntitySidebarSection, EntitySubHeaderSection, EntityTab, GenericEntityProperties, GenericEntityUpdate, -} from '../../types'; -import { EntityProfileNavBar } from './nav/EntityProfileNavBar'; -import { ANTD_GRAY } from '../../constants'; -import { EntityHeader } from './header/EntityHeader'; -import { EntityTabs } from './header/EntityTabs'; -import { EntitySidebar } from './sidebar/EntitySidebar'; -import { EntityContext } from '../../EntityContext'; -import useIsLineageMode from '../../../../lineage/utils/useIsLineageMode'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import LineageExplorer from '../../../../lineage/LineageExplorer'; -import CompactContext from '../../../../shared/CompactContext'; -import DynamicTab from '../../tabs/Entity/weaklyTypedAspects/DynamicTab'; -import analytics, { EventType } from '../../../../analytics'; -import { EntityMenuItems } from '../../EntityDropdown/EntityDropdown'; -import { useIsSeparateSiblingsMode } from '../../siblingUtils'; -import { EntityActionItem } from '../../entity/EntityActions'; -import { ErrorSection } from '../../../../shared/error/ErrorSection'; -import { EntityHead } from '../../../../shared/EntityHead'; -import { OnboardingTour } from '../../../../onboarding/OnboardingTour'; -import useGetDataForProfile from './useGetDataForProfile'; -import NonExistentEntityPage from '../../entity/NonExistentEntityPage'; +} from '@app/entity/shared/types'; +import LineageExplorer from '@app/lineage/LineageExplorer'; +import useIsLineageMode from '@app/lineage/utils/useIsLineageMode'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; import { LINEAGE_GRAPH_INTRO_ID, LINEAGE_GRAPH_TIME_FILTER_ID, -} from '../../../../onboarding/config/LineageGraphOnboardingConfig'; -import { useAppConfig } from '../../../../useAppConfig'; -import { useUpdateDomainEntityDataOnChange } from '../../../../domain/utils'; -import ProfileSidebar from './sidebar/ProfileSidebar'; -import SidebarFormInfoWrapper from './sidebar/FormInfo/SidebarFormInfoWrapper'; +} from '@app/onboarding/config/LineageGraphOnboardingConfig'; +import CompactContext from '@app/shared/CompactContext'; +import { EntityHead } from '@app/shared/EntityHead'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, Exact } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityHeader.test.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityHeader.test.tsx index ec6a91df90..0930856758 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityHeader.test.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityHeader.test.tsx @@ -1,6 +1,7 @@ -import { platformPrivileges } from '../../../../../../Mocks'; -import { EntityType } from '../../../../../../types.generated'; -import { getCanEditName } from '../header/EntityHeader'; +import { getCanEditName } from '@app/entity/shared/containers/profile/header/EntityHeader'; +import { platformPrivileges } from '@src/Mocks'; + +import { EntityType } from '@types'; describe('getCanEditName', () => { const entityDataWithManagePrivileges = { privileges: { canManageEntity: true, canEditProperties: true } }; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx index 68429e25cf..23154e320b 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx @@ -1,25 +1,23 @@ -import React from 'react'; -import { fireEvent, render, waitFor } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; -import TestPageContainer from '../../../../../../utils/test-utils/TestPageContainer'; -import { mocks } from '../../../../../../Mocks'; -import { EntityProfile } from '../EntityProfile'; -import { - useGetDatasetQuery, - useUpdateDatasetMutation, - GetDatasetQuery, -} from '../../../../../../graphql/dataset.generated'; -import { EntityType } from '../../../../../../types.generated'; -import QueriesTab from '../../../tabs/Dataset/Queries/QueriesTab'; -import { SchemaTab } from '../../../tabs/Dataset/Schema/SchemaTab'; -import StatsTab from '../../../tabs/Dataset/Stats/StatsTab'; -import { DocumentationTab } from '../../../tabs/Documentation/DocumentationTab'; -import { LineageTab } from '../../../tabs/Lineage/LineageTab'; -import { PropertiesTab } from '../../../tabs/Properties/PropertiesTab'; -import { SidebarStatsSection } from '../sidebar/Dataset/StatsSidebarSection'; -import { SidebarOwnerSection } from '../sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { SidebarAboutSection } from '../sidebar/AboutSection/SidebarAboutSection'; -import { SidebarTagsSection } from '../sidebar/SidebarTagsSection'; +import { fireEvent, render, waitFor } from '@testing-library/react'; +import React from 'react'; + +import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import { SidebarStatsSection } from '@app/entity/shared/containers/profile/sidebar/Dataset/StatsSidebarSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import QueriesTab from '@app/entity/shared/tabs/Dataset/Queries/QueriesTab'; +import { SchemaTab } from '@app/entity/shared/tabs/Dataset/Schema/SchemaTab'; +import StatsTab from '@app/entity/shared/tabs/Dataset/Stats/StatsTab'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { GetDatasetQuery, useGetDatasetQuery, useUpdateDatasetMutation } from '@graphql/dataset.generated'; +import { EntityType } from '@types'; describe('EntityProfile', () => { it('renders dataset page', async () => { diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/PlatformContent.test.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/PlatformContent.test.tsx index 5d04a50921..75d840fa98 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/PlatformContent.test.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/PlatformContent.test.tsx @@ -1,9 +1,13 @@ -import React from 'react'; import { render, screen } from '@testing-library/react'; +import React from 'react'; import { BrowserRouter } from 'react-router-dom'; -import PlatformContentView, { getParentContainerNames } from '../header/PlatformContent/PlatformContentView'; -import { EntityType } from '../../../../../../types.generated'; -import { container1, container2 } from '../../../../../../Mocks'; + +import PlatformContentView, { + getParentContainerNames, +} from '@app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView'; +import { container1, container2 } from '@src/Mocks'; + +import { EntityType } from '@types'; vi.mock('../../../../../useEntityRegistry', () => ({ useEntityRegistry: () => ({ diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityCount.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityCount.tsx index f1feb258e2..b30da68212 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityCount.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityCount.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export const EntityCountText = styled(Typography.Text)` display: inline-block; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx index 7dd2888ba1..b2c35ce502 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx @@ -1,24 +1,26 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { useEntityData, useRefetch } from '../../../EntityContext'; -import EntityDropdown, { EntityMenuItems } from '../../../EntityDropdown/EntityDropdown'; -import PlatformContent from './PlatformContent'; -import { getPlatformName } from '../../../utils'; -import { EntityType, PlatformPrivileges } from '../../../../../../types.generated'; -import EntityCount from './EntityCount'; -import { EntityHealth } from './EntityHealth'; -import EntityName from './EntityName'; -import { DeprecationPill } from '../../../components/styled/DeprecationPill'; -import { EntitySubHeaderSection, GenericEntityProperties } from '../../../types'; -import EntityActions, { EntityActionItem } from '../../../entity/EntityActions'; -import ExternalUrlButton from '../../../ExternalUrlButton'; -import ShareButton from '../../../../../shared/share/ShareButton'; -import { capitalizeFirstLetterOnly } from '../../../../../shared/textUtil'; -import { useUserContext } from '../../../../../context/useUserContext'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import EntityHeaderLoadingSection from './EntityHeaderLoadingSection'; -import { useIsEditableDatasetNameEnabled } from '../../../../../useAppConfig'; -import StructuredPropertyBadge from './StructuredPropertyBadge'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import EntityDropdown, { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import ExternalUrlButton from '@app/entity/shared/ExternalUrlButton'; +import { DeprecationPill } from '@app/entity/shared/components/styled/DeprecationPill'; +import EntityCount from '@app/entity/shared/containers/profile/header/EntityCount'; +import EntityHeaderLoadingSection from '@app/entity/shared/containers/profile/header/EntityHeaderLoadingSection'; +import { EntityHealth } from '@app/entity/shared/containers/profile/header/EntityHealth'; +import EntityName from '@app/entity/shared/containers/profile/header/EntityName'; +import PlatformContent from '@app/entity/shared/containers/profile/header/PlatformContent'; +import StructuredPropertyBadge from '@app/entity/shared/containers/profile/header/StructuredPropertyBadge'; +import EntityActions, { EntityActionItem } from '@app/entity/shared/entity/EntityActions'; +import { EntitySubHeaderSection, GenericEntityProperties } from '@app/entity/shared/types'; +import { getPlatformName } from '@app/entity/shared/utils'; +import ShareButton from '@app/shared/share/ShareButton'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useIsEditableDatasetNameEnabled } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, PlatformPrivileges } from '@types'; const TitleWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeaderLoadingSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeaderLoadingSection.tsx index bbf813804e..bbb87a905f 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeaderLoadingSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeaderLoadingSection.tsx @@ -1,7 +1,8 @@ -import * as React from 'react'; import { Skeleton, Space } from 'antd'; +import * as React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const ContextSkeleton = styled(Skeleton.Input)` && { diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealth.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealth.tsx index ad14d92a39..17006cc9cf 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealth.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealth.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import styled from 'styled-components'; import { Link } from 'react-router-dom'; -import { Health } from '../../../../../../types.generated'; -import { getHealthSummaryIcon, HealthSummaryIconType, isUnhealthy } from '../../../../../shared/health/healthUtils'; -import { EntityHealthPopover } from './EntityHealthPopover'; +import styled from 'styled-components'; + +import { EntityHealthPopover } from '@app/entity/shared/containers/profile/header/EntityHealthPopover'; +import { HealthSummaryIconType, getHealthSummaryIcon, isUnhealthy } from '@app/shared/health/healthUtils'; + +import { Health } from '@types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealthPopover.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealthPopover.tsx index d10601b39b..38e2a39a69 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealthPopover.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealthPopover.tsx @@ -1,14 +1,12 @@ +import { Divider, Popover } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Popover, Divider } from 'antd'; -import { - getHealthSummaryIcon, - getHealthSummaryMessage, - HealthSummaryIconType, -} from '../../../../../shared/health/healthUtils'; -import { EntityHealthStatus } from './EntityHealthStatus'; -import { Health } from '../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { EntityHealthStatus } from '@app/entity/shared/containers/profile/header/EntityHealthStatus'; +import { HealthSummaryIconType, getHealthSummaryIcon, getHealthSummaryMessage } from '@app/shared/health/healthUtils'; + +import { Health } from '@types'; const Header = styled.span` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealthStatus.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealthStatus.tsx index 27c85b8516..369384d49c 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealthStatus.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealthStatus.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import styled from 'styled-components'; import { Link } from 'react-router-dom'; -import { getHealthTypeName, getHealthRedirectPath } from '../../../../../shared/health/healthUtils'; -import { HealthStatusType } from '../../../../../../types.generated'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../constants'; +import styled from 'styled-components'; + +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entity/shared/constants'; +import { getHealthRedirectPath, getHealthTypeName } from '@app/shared/health/healthUtils'; + +import { HealthStatusType } from '@types'; const StatusContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityName.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityName.tsx index 549724bd19..c2a4c58090 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityName.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityName.tsx @@ -1,11 +1,13 @@ -import { message, Typography } from 'antd'; -import React, { useState, useEffect } from 'react'; +import { Typography, message } from 'antd'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components/macro'; -import { useUpdateNameMutation } from '../../../../../../graphql/mutations.generated'; -import { getParentNodeToUpdate, updateGlossarySidebar } from '../../../../../glossary/utils'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { useEntityData, useRefetch } from '../../../EntityContext'; -import { useGlossaryEntityData } from '../../../GlossaryEntityContext'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { useGlossaryEntityData } from '@app/entity/shared/GlossaryEntityContext'; +import { getParentNodeToUpdate, updateGlossarySidebar } from '@app/glossary/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useUpdateNameMutation } from '@graphql/mutations.generated'; export const EntityTitle = styled(Typography.Title)` &&& { diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityTabs.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityTabs.tsx index 25e044259f..e544c5e818 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityTabs.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityTabs.tsx @@ -1,9 +1,9 @@ -import React, { useEffect } from 'react'; import { Tabs } from 'antd'; +import React, { useEffect } from 'react'; import styled from 'styled-components/macro'; -import { EntityTab } from '../../../types'; -import { useBaseEntity, useEntityData, useRouteToTab } from '../../../EntityContext'; +import { useBaseEntity, useEntityData, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { EntityTab } from '@app/entity/shared/types'; type Props = { tabs: EntityTab[]; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/ContainerLink.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/ContainerLink.tsx index 76eb66cb68..6830d240ae 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/ContainerLink.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/ContainerLink.tsx @@ -1,12 +1,14 @@ -import React from 'react'; -import styled from 'styled-components'; -import { Link } from 'react-router-dom'; -import { Typography } from 'antd'; import { FolderOpenOutlined } from '@ant-design/icons'; +import { Typography } from 'antd'; import { Maybe } from 'graphql/jsutils/Maybe'; -import { Container, EntityType } from '../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../constants'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; +import React from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Container, EntityType } from '@types'; const ContainerText = styled(Typography.Text)` font-size: 12px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/DatasetLink.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/DatasetLink.tsx index cf4891acd3..61b62308df 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/DatasetLink.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/DatasetLink.tsx @@ -1,11 +1,13 @@ -import React from 'react'; -import styled from 'styled-components'; -import { Link } from 'react-router-dom'; import { Typography } from 'antd'; -import { Dataset, EntityType } from '../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../constants'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { IconStyleType } from '../../../../../Entity'; +import React from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Dataset, EntityType } from '@types'; const DatasetText = styled(Typography.Text)` font-size: 12px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx index 719da1bf8b..6daff61126 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx @@ -1,11 +1,13 @@ +import { FolderOutlined, RightOutlined } from '@ant-design/icons'; +import { Tooltip, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography, Tooltip } from 'antd'; -import { FolderOutlined, RightOutlined } from '@ant-design/icons'; -import { ANTD_GRAY } from '../../../../constants'; -import { EntityType, GlossaryNode } from '../../../../../../../types.generated'; -import useContentTruncation from '../../../../../../shared/useContentTruncation'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import useContentTruncation from '@app/shared/useContentTruncation'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, GlossaryNode } from '@types'; export const StyledRightOutlined = styled(RightOutlined)` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx index 0eb223c04d..11cf05ee5e 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx @@ -1,14 +1,16 @@ import React from 'react'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { IconStyleType } from '../../../../../Entity'; -import { useEntityData } from '../../../../EntityContext'; -import { capitalizeFirstLetterOnly } from '../../../../../../shared/textUtil'; -import { getPlatformName } from '../../../../utils'; -import PlatformContentView from './PlatformContentView'; -import { GenericEntityProperties } from '../../../../types'; -import EntityRegistry from '../../../../../EntityRegistry'; -import { EntityType } from '../../../../../../../types.generated'; -import useContentTruncation from '../../../../../../shared/useContentTruncation'; + +import { IconStyleType } from '@app/entity/Entity'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import PlatformContentView from '@app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getPlatformName } from '@app/entity/shared/utils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import useContentTruncation from '@app/shared/useContentTruncation'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; export function getDisplayedEntityType( entityData: GenericEntityProperties | null, diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx index 70cc5fa3b3..df12a6b301 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx @@ -1,19 +1,21 @@ +import { Image, Typography } from 'antd'; +import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import styled from 'styled-components'; -import { Typography, Image } from 'antd'; -import { Maybe } from 'graphql/jsutils/Maybe'; -import { Container, Dataset, Entity } from '../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../constants'; -import ContainerLink from './ContainerLink'; -import DatasetLink from './DatasetLink'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import ContainerLink from '@app/entity/shared/containers/profile/header/PlatformContent/ContainerLink'; +import DatasetLink from '@app/entity/shared/containers/profile/header/PlatformContent/DatasetLink'; import { - StyledRightOutlined, - ParentNodesWrapper as ParentContainersWrapper, Ellipsis, + ParentNodesWrapper as ParentContainersWrapper, + StyledRightOutlined, StyledTooltip, -} from './ParentNodesView'; -import ParentEntities from '../../../../../../search/filters/ParentEntities'; -import { useIsShowSeparateSiblingsEnabled } from '../../../../../../useAppConfig'; +} from '@app/entity/shared/containers/profile/header/PlatformContent/ParentNodesView'; +import ParentEntities from '@app/search/filters/ParentEntities'; +import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig'; + +import { Container, Dataset, Entity } from '@types'; export const LogoIcon = styled.span` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/index.ts b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/index.ts index e41f35d7b4..d2083b6ad2 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/index.ts +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/index.ts @@ -1,3 +1,3 @@ -import PlatformContentContainer from './PlatformContentContainer'; +import PlatformContentContainer from '@app/entity/shared/containers/profile/header/PlatformContent/PlatformContentContainer'; export default PlatformContentContainer; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/StructuredPropertyBadge.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/StructuredPropertyBadge.tsx index 37efdfaf44..60daa21513 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/StructuredPropertyBadge.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/StructuredPropertyBadge.tsx @@ -1,11 +1,12 @@ -import { colors, Pill, Text, Tooltip } from '@src/alchemy-components'; +import React from 'react'; +import styled from 'styled-components'; + +import { filterForAssetBadge } from '@app/entity/shared/containers/profile/header/utils'; +import { mapStructuredPropertyToPropertyRow } from '@app/entity/shared/tabs/Properties/useStructuredProperties'; +import { Pill, Text, Tooltip, colors } from '@src/alchemy-components'; import { getStructuredPropertyValue } from '@src/app/entity/shared/utils'; import { getDisplayName } from '@src/app/govern/structuredProperties/utils'; import { StructuredProperties } from '@src/types.generated'; -import React from 'react'; -import styled from 'styled-components'; -import { mapStructuredPropertyToPropertyRow } from '../../../tabs/Properties/useStructuredProperties'; -import { filterForAssetBadge } from './utils'; export const MAX_PROP_BADGE_WIDTH = 150; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/utils.ts b/datahub-web-react/src/app/entity/shared/containers/profile/header/utils.ts index 6ab469725b..85a4624941 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/utils.ts +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/utils.ts @@ -1,7 +1,8 @@ +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; import EntityRegistry from '@src/app/entity/EntityRegistry'; -import { EntityType, StructuredPropertiesEntry } from '../../../../../../types.generated'; -import { capitalizeFirstLetterOnly } from '../../../../../shared/textUtil'; -import { GenericEntityProperties } from '../../../types'; + +import { EntityType, StructuredPropertiesEntry } from '@types'; export function getDisplayedEntityType( entityData: GenericEntityProperties | null, diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/nav/EntityProfileNavBar.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/nav/EntityProfileNavBar.tsx index 1b324412fb..0139024144 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/nav/EntityProfileNavBar.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/nav/EntityProfileNavBar.tsx @@ -1,12 +1,14 @@ +import { Affix } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Affix } from 'antd'; -import { useGetBrowsePathsQuery } from '../../../../../../graphql/browse.generated'; -import { EntityType } from '../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { ProfileNavBrowsePath } from './ProfileNavBrowsePath'; -import ProfileNavBrowsePathV2 from './ProfileNavBrowsePathV2'; -import { useIsBrowseV2 } from '../../../../../search/useSearchAndBrowseVersion'; + +import { ProfileNavBrowsePath } from '@app/entity/shared/containers/profile/nav/ProfileNavBrowsePath'; +import ProfileNavBrowsePathV2 from '@app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2'; +import { useIsBrowseV2 } from '@app/search/useSearchAndBrowseVersion'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetBrowsePathsQuery } from '@graphql/browse.generated'; +import { EntityType } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/nav/LineageSelector.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/nav/LineageSelector.tsx index 42d50ead31..b144f2a64f 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/nav/LineageSelector.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/nav/LineageSelector.tsx @@ -1,16 +1,18 @@ -import React from 'react'; -import styled from 'styled-components/macro'; -import { useHistory, useLocation } from 'react-router-dom'; -import { Badge } from 'antd'; +import { blue, grey } from '@ant-design/colors'; import { InfoCircleOutlined, PartitionOutlined } from '@ant-design/icons'; -import { grey, blue } from '@ant-design/colors'; -import { EntityType } from '../../../../../../types.generated'; -import { navigateToLineageUrl } from '../../../../../lineage/utils/navigateToLineageUrl'; -import { ANTD_GRAY, ENTITY_TYPES_WITH_MANUAL_LINEAGE } from '../../../constants'; -import useIsLineageMode from '../../../../../lineage/utils/useIsLineageMode'; -import { useGetLineageTimeParams } from '../../../../../lineage/utils/useGetLineageTimeParams'; -import { useIsSeparateSiblingsMode } from '../../../siblingUtils'; -import { useGetLineageCountsQuery } from '../../../../../../graphql/lineage.generated'; +import { Badge } from 'antd'; +import React from 'react'; +import { useHistory, useLocation } from 'react-router-dom'; +import styled from 'styled-components/macro'; + +import { ANTD_GRAY, ENTITY_TYPES_WITH_MANUAL_LINEAGE } from '@app/entity/shared/constants'; +import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import { navigateToLineageUrl } from '@app/lineage/utils/navigateToLineageUrl'; +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; +import useIsLineageMode from '@app/lineage/utils/useIsLineageMode'; + +import { useGetLineageCountsQuery } from '@graphql/lineage.generated'; +import { EntityType } from '@types'; const LineageIconGroup = styled.div` width: 180px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePath.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePath.tsx index 1026251ac6..b6f2638c07 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePath.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePath.tsx @@ -1,12 +1,14 @@ +import { Breadcrumb, Row } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { Breadcrumb, Row } from 'antd'; -import { EntityType } from '../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { PageRoutes } from '../../../../../../conf/Global'; -import { ANTD_GRAY } from '../../../constants'; -import { LineageSelector } from './LineageSelector'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { LineageSelector } from '@app/entity/shared/containers/profile/nav/LineageSelector'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; + +import { EntityType } from '@types'; export const BrowseRow = styled(Row)` padding: 10px 20px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2.tsx index 7805c8c73b..1969cfe594 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2.tsx @@ -1,21 +1,23 @@ +import { Breadcrumb } from 'antd'; import React from 'react'; import { useHistory } from 'react-router'; -import { Breadcrumb } from 'antd'; import styled from 'styled-components'; -import { BreadcrumbItem, BrowseRow } from './ProfileNavBrowsePath'; -import { useEntityData } from '../../../EntityContext'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { navigateToSearchUrl } from '../../../../../search/utils/navigateToSearchUrl'; -import { BrowsePathV2, EntityType, FabricType, FacetFilterInput } from '../../../../../../types.generated'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { LineageSelector } from '@app/entity/shared/containers/profile/nav/LineageSelector'; +import { BreadcrumbItem, BrowseRow } from '@app/entity/shared/containers/profile/nav/ProfileNavBrowsePath'; +import useHasMultipleEnvironmentsQuery from '@app/entity/shared/containers/profile/nav/useHasMultipleEnvironmentsQuery'; +import { createBrowseV2SearchFilter } from '@app/search/filters/utils'; import { BROWSE_PATH_V2_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME, -} from '../../../../../search/utils/constants'; -import useHasMultipleEnvironmentsQuery from './useHasMultipleEnvironmentsQuery'; -import { createBrowseV2SearchFilter } from '../../../../../search/filters/utils'; -import { LineageSelector } from './LineageSelector'; +} from '@app/search/utils/constants'; +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { BrowsePathV2, EntityType, FabricType, FacetFilterInput } from '@types'; const StyledBreadcrumb = styled(Breadcrumb)` font-size: 16px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/nav/useHasMultipleEnvironmentsQuery.ts b/datahub-web-react/src/app/entity/shared/containers/profile/nav/useHasMultipleEnvironmentsQuery.ts index 9bcb4ef6e7..e82f7d3336 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/nav/useHasMultipleEnvironmentsQuery.ts +++ b/datahub-web-react/src/app/entity/shared/containers/profile/nav/useHasMultipleEnvironmentsQuery.ts @@ -1,6 +1,7 @@ -import { useAggregateAcrossEntitiesQuery } from '../../../../../../graphql/search.generated'; -import { ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME } from '../../../../../search/utils/constants'; -import { EntityType } from '../../../../../../types.generated'; +import { ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME } from '@app/search/utils/constants'; + +import { useAggregateAcrossEntitiesQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; export default function useHasMultipleEnvironmentsQuery(entityType: EntityType) { const { data } = useAggregateAcrossEntitiesQuery({ diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx index 6e7542c065..6ad2f233ff 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx @@ -1,16 +1,18 @@ import { Typography } from 'antd'; -import React, { useState } from 'react'; -import styled from 'styled-components/macro'; -import { useHistory } from 'react-router'; import DOMPurify from 'dompurify'; -import CompactContext from '../../../../../../shared/CompactContext'; -import MarkdownViewer, { MarkdownView } from '../../../../components/legacy/MarkdownViewer'; -import NoMarkdownViewer, { removeMarkdown } from '../../../../components/styled/StripMarkdownText'; -import { useRouteToTab } from '../../../../EntityContext'; -import { useIsOnTab } from '../../utils'; -import { ANTD_GRAY } from '../../../../constants'; -import { EntityType } from '../../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; +import React, { useState } from 'react'; +import { useHistory } from 'react-router'; +import styled from 'styled-components/macro'; + +import { useRouteToTab } from '@app/entity/shared/EntityContext'; +import MarkdownViewer, { MarkdownView } from '@app/entity/shared/components/legacy/MarkdownViewer'; +import NoMarkdownViewer, { removeMarkdown } from '@app/entity/shared/components/styled/StripMarkdownText'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useIsOnTab } from '@app/entity/shared/containers/profile/utils'; +import CompactContext from '@app/shared/CompactContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const ABBREVIATED_LIMIT = 150; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx index de534fce84..fc28328fe7 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx @@ -1,10 +1,11 @@ -import { Button, Typography } from 'antd'; import { EditOutlined } from '@ant-design/icons'; +import { Button, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { useRefetch, useRouteToTab } from '../../../../EntityContext'; -import { EMPTY_MESSAGES } from '../../../../constants'; -import { AddLinkModal } from '../../../../components/styled/AddLinkModal'; + +import { useRefetch, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { AddLinkModal } from '@app/entity/shared/components/styled/AddLinkModal'; +import { EMPTY_MESSAGES } from '@app/entity/shared/constants'; const EmptyContentWrapper = styled.div` margin-bottom: 5px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx index 0bdb764c0e..c3fcbe812e 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import LinkButton from '../LinkButton'; -import { useEntityData, useRefetch } from '../../../../EntityContext'; -import { AddLinkModal } from '../../../../components/styled/AddLinkModal'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { AddLinkModal } from '@app/entity/shared/components/styled/AddLinkModal'; +import LinkButton from '@app/entity/shared/containers/profile/sidebar/LinkButton'; const AddLinksWrapper = styled.div` margin-left: -15px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx index 8e3ddeac5d..66c05720f4 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx @@ -1,12 +1,13 @@ -import { Button } from 'antd'; import { EditOutlined } from '@ant-design/icons'; +import { Button } from 'antd'; import React from 'react'; -import { useEntityData, useRouteToTab } from '../../../../EntityContext'; -import { SidebarHeader } from '../SidebarHeader'; -import DescriptionSection from './DescriptionSection'; -import LinksSection from './LinksSection'; -import SourceRefSection from './SourceRefSection'; -import EmptyContentSection from './EmptyContentSection'; + +import { useEntityData, useRouteToTab } from '@app/entity/shared/EntityContext'; +import DescriptionSection from '@app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection'; +import EmptyContentSection from '@app/entity/shared/containers/profile/sidebar/AboutSection/EmptyContentSection'; +import LinksSection from '@app/entity/shared/containers/profile/sidebar/AboutSection/LinksSection'; +import SourceRefSection from '@app/entity/shared/containers/profile/sidebar/AboutSection/SourceRefSection'; +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; interface Properties { hideLinksButton?: boolean; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx index 985f2535c1..1bdb8c94f8 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx @@ -1,9 +1,10 @@ import { LinkOutlined } from '@ant-design/icons'; import { Typography } from 'antd'; import React from 'react'; -import { useEntityData } from '../../../../EntityContext'; -import { SidebarHeader } from '../SidebarHeader'; -import { StyledLink } from '../LinkButton'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { StyledLink } from '@app/entity/shared/containers/profile/sidebar/LinkButton'; +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; export default function SourceRefSection() { const { entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx index 818d75c376..8d9ddf8c67 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx @@ -1,12 +1,14 @@ import { Button, Form, Modal, Select, Tag, Tooltip } from 'antd'; import React, { ReactNode, useRef, useState } from 'react'; import styled from 'styled-components/macro'; -import { useGetSearchResultsLazyQuery } from '../../../../../../../graphql/search.generated'; -import { Container, Entity, EntityType } from '../../../../../../../types.generated'; -import { useEnterKeyListener } from '../../../../../../shared/useEnterKeyListener'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { getParentEntities } from '../../../../../../search/filters/utils'; -import ParentEntities from '../../../../../../search/filters/ParentEntities'; + +import ParentEntities from '@app/search/filters/ParentEntities'; +import { getParentEntities } from '@app/search/filters/utils'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { Container, Entity, EntityType } from '@types'; type Props = { onCloseModal: () => void; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx index 34d00836f0..305c896b2c 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx @@ -2,13 +2,15 @@ import { EditOutlined } from '@ant-design/icons'; import { Button, Modal, Typography, message } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { SidebarHeader } from '../SidebarHeader'; -import { useEntityData } from '../../../../EntityContext'; -import { EMPTY_MESSAGES } from '../../../../constants'; -import SetDataProductModal from './SetDataProductModal'; -import { DataProductLink } from '../../../../../../shared/tags/DataProductLink'; -import { useBatchSetDataProductMutation } from '../../../../../../../graphql/dataProduct.generated'; -import { DataProduct } from '../../../../../../../types.generated'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { EMPTY_MESSAGES } from '@app/entity/shared/constants'; +import SetDataProductModal from '@app/entity/shared/containers/profile/sidebar/DataProduct/SetDataProductModal'; +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; +import { DataProductLink } from '@app/shared/tags/DataProductLink'; + +import { useBatchSetDataProductMutation } from '@graphql/dataProduct.generated'; +import { DataProduct } from '@types'; const EmptyText = styled(Typography.Paragraph)` &&& { diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx index ece50e5ae1..d06a1d6e47 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx @@ -1,16 +1,18 @@ -import Modal from 'antd/lib/modal/Modal'; import { Button, Select, message } from 'antd'; +import Modal from 'antd/lib/modal/Modal'; import React, { useRef, useState } from 'react'; import styled from 'styled-components'; -import { useGetSearchResultsForMultipleQuery } from '../../../../../../../graphql/search.generated'; -import { DataProduct, EntityType } from '../../../../../../../types.generated'; -import { useEnterKeyListener } from '../../../../../../shared/useEnterKeyListener'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { IconStyleType } from '../../../../../Entity'; -import { tagRender } from '../tagRenderer'; -import { useBatchSetDataProductMutation } from '../../../../../../../graphql/dataProduct.generated'; -import { handleBatchError } from '../../../../utils'; -import { getModalDomContainer } from '../../../../../../../utils/focus'; + +import { IconStyleType } from '@app/entity/Entity'; +import { tagRender } from '@app/entity/shared/containers/profile/sidebar/tagRenderer'; +import { handleBatchError } from '@app/entity/shared/utils'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { getModalDomContainer } from '@utils/focus'; + +import { useBatchSetDataProductMutation } from '@graphql/dataProduct.generated'; +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { DataProduct, EntityType } from '@types'; const OptionWrapper = styled.div` padding: 2px 0; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx index dfde26412a..ae1c544f71 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx @@ -1,14 +1,16 @@ import { Button, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { GetDatasetQuery } from '../../../../../../../graphql/dataset.generated'; -import { DatasetProfile, Operation, UsageQueryResult } from '../../../../../../../types.generated'; -import UsageFacepile from '../../../../../dataset/profile/UsageFacepile'; -import { ANTD_GRAY } from '../../../../constants'; -import { useBaseEntity, useRouteToTab } from '../../../../EntityContext'; -import { SidebarHeader } from '../SidebarHeader'; -import { InfoItem } from '../../../../components/styled/InfoItem'; -import { formatNumberWithoutAbbreviation } from '../../../../../../shared/formatNumber'; + +import UsageFacepile from '@app/entity/dataset/profile/UsageFacepile'; +import { useBaseEntity, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { InfoItem } from '@app/entity/shared/components/styled/InfoItem'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { DatasetProfile, Operation, UsageQueryResult } from '@types'; const HeaderInfoBody = styled(Typography.Text)` font-size: 16px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx index f3794ce4ea..a52e2cb599 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx @@ -1,11 +1,13 @@ import { Button, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { GetDatasetQuery } from '../../../../../../../../graphql/dataset.generated'; -import { InfoItem } from '../../../../../components/styled/InfoItem'; -import { ANTD_GRAY } from '../../../../../constants'; -import { useBaseEntity, useRouteToTab } from '../../../../../EntityContext'; -import { SidebarHeader } from '../../SidebarHeader'; + +import { useBaseEntity, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { InfoItem } from '@app/entity/shared/components/styled/InfoItem'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; const HeaderInfoBody = styled(Typography.Text)` font-size: 16px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx index f0c315332a..c56ac84959 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx @@ -1,23 +1,24 @@ -import React, { useRef, useState } from 'react'; -import { Button, Form, message, Modal, Select, Empty } from 'antd'; import { LoadingOutlined } from '@ant-design/icons'; - +import { Button, Empty, Form, Modal, Select, message } from 'antd'; +import React, { useRef, useState } from 'react'; import styled from 'styled-components/macro'; -import { useGetSearchResultsLazyQuery } from '../../../../../../../graphql/search.generated'; -import { Domain, Entity, EntityType } from '../../../../../../../types.generated'; -import { useBatchSetDomainMutation } from '../../../../../../../graphql/mutations.generated'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { useEnterKeyListener } from '../../../../../../shared/useEnterKeyListener'; -import { DomainLabel } from '../../../../../../shared/DomainLabel'; -import { handleBatchError } from '../../../../utils'; -import { tagRender } from '../tagRenderer'; -import { BrowserWrapper } from '../../../../../../shared/tags/AddTagsTermsModal'; -import DomainNavigator from '../../../../../../domain/nestedDomains/domainNavigator/DomainNavigator'; -import ClickOutside from '../../../../../../shared/ClickOutside'; -import { ANTD_GRAY } from '../../../../constants'; -import { getModalDomContainer } from '../../../../../../../utils/focus'; -import ParentEntities from '../../../../../../search/filters/ParentEntities'; -import { getParentDomains } from '../../../../../../domain/utils'; + +import DomainNavigator from '@app/domain/nestedDomains/domainNavigator/DomainNavigator'; +import { getParentDomains } from '@app/domain/utils'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { tagRender } from '@app/entity/shared/containers/profile/sidebar/tagRenderer'; +import { handleBatchError } from '@app/entity/shared/utils'; +import ParentEntities from '@app/search/filters/ParentEntities'; +import ClickOutside from '@app/shared/ClickOutside'; +import { DomainLabel } from '@app/shared/DomainLabel'; +import { BrowserWrapper } from '@app/shared/tags/AddTagsTermsModal'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { getModalDomContainer } from '@utils/focus'; + +import { useBatchSetDomainMutation } from '@graphql/mutations.generated'; +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { Domain, Entity, EntityType } from '@types'; type Props = { urns: string[]; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx index eadf74041a..631671d468 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx @@ -1,14 +1,16 @@ -import { Typography, Button, Modal, message } from 'antd'; -import React, { useState } from 'react'; import { EditOutlined } from '@ant-design/icons'; +import { Button, Modal, Typography, message } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; -import { EMPTY_MESSAGES } from '../../../../constants'; -import { useEntityData, useMutationUrn, useRefetch } from '../../../../EntityContext'; -import { SidebarHeader } from '../SidebarHeader'; -import { SetDomainModal } from './SetDomainModal'; -import { useUnsetDomainMutation } from '../../../../../../../graphql/mutations.generated'; -import { DomainLink } from '../../../../../../shared/tags/DomainLink'; -import { ENTITY_PROFILE_DOMAINS_ID } from '../../../../../../onboarding/config/EntityProfileOnboardingConfig'; + +import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import { EMPTY_MESSAGES } from '@app/entity/shared/constants'; +import { SetDomainModal } from '@app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal'; +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; +import { ENTITY_PROFILE_DOMAINS_ID } from '@app/onboarding/config/EntityProfileOnboardingConfig'; +import { DomainLink } from '@app/shared/tags/DomainLink'; + +import { useUnsetDomainMutation } from '@graphql/mutations.generated'; const StyledButton = styled(Button)` display: block; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx index 1c09b5291f..c0eaad6ed2 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx @@ -1,13 +1,15 @@ import Link from 'antd/lib/typography/Link'; import React from 'react'; import styled from 'styled-components'; -import PlatformContent from '../../header/PlatformContent'; -import { useEntityData } from '../../../../EntityContext'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { StyledDivider } from '../FormInfo/components'; -import { DatasetStatsSummarySubHeader } from '../../../../../dataset/profile/stats/stats/DatasetStatsSummarySubHeader'; -import LinkOut from '../../../../../../../images/link-out.svg?react'; -import FormInfo from '../FormInfo/FormInfo'; + +import { DatasetStatsSummarySubHeader } from '@app/entity/dataset/profile/stats/stats/DatasetStatsSummarySubHeader'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import PlatformContent from '@app/entity/shared/containers/profile/header/PlatformContent'; +import FormInfo from '@app/entity/shared/containers/profile/sidebar/FormInfo/FormInfo'; +import { StyledDivider } from '@app/entity/shared/containers/profile/sidebar/FormInfo/components'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import LinkOut from '@images/link-out.svg?react'; const EntityName = styled.div` font-size: 16px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/EntitySidebar.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/EntitySidebar.tsx index b5e3b221c7..cdafb88336 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/EntitySidebar.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/EntitySidebar.tsx @@ -1,10 +1,10 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../../../constants'; -import { useBaseEntity, useEntityData } from '../../../EntityContext'; -import { EntitySidebarSection } from '../../../types'; -import LastIngested from './LastIngested'; +import { useBaseEntity, useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import LastIngested from '@app/entity/shared/containers/profile/sidebar/LastIngested'; +import { EntitySidebarSection } from '@app/entity/shared/types'; const ContentContainer = styled.div` position: relative; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/CompletedView.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/CompletedView.tsx index f8c0b74cc2..2b67642243 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/CompletedView.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/CompletedView.tsx @@ -1,11 +1,19 @@ import Link from 'antd/lib/typography/Link'; import React from 'react'; import styled from 'styled-components'; -import GreenVerificationLogo from '../../../../../../../images/verificationGreen.svg?react'; -import PurpleVerificationLogo from '../../../../../../../images/verificationPurple.svg?react'; -import { CTAWrapper, FlexWrapper, StyledIcon, StyledReadOutlined, Title } from './components'; -import OptionalPromptsRemaining from './OptionalPromptsRemaining'; -import VerificationAuditStamp from './VerificationAuditStamp'; + +import OptionalPromptsRemaining from '@app/entity/shared/containers/profile/sidebar/FormInfo/OptionalPromptsRemaining'; +import VerificationAuditStamp from '@app/entity/shared/containers/profile/sidebar/FormInfo/VerificationAuditStamp'; +import { + CTAWrapper, + FlexWrapper, + StyledIcon, + StyledReadOutlined, + Title, +} from '@app/entity/shared/containers/profile/sidebar/FormInfo/components'; + +import GreenVerificationLogo from '@images/verificationGreen.svg?react'; +import PurpleVerificationLogo from '@images/verificationPurple.svg?react'; const StyledLink = styled(Link)` margin-top: 8px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/FormInfo.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/FormInfo.tsx index 681555a919..7d26c72fa3 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/FormInfo.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/FormInfo.tsx @@ -1,10 +1,14 @@ import React from 'react'; -import { useEntityData } from '../../../../EntityContext'; -import useGetPromptInfo from './useGetPromptInfo'; -import { isVerificationComplete, shouldShowVerificationInfo } from './utils'; -import CompletedView from './CompletedView'; -import IncompleteView from './IncompleteView'; -import useIsUserAssigned from './useIsUserAssigned'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import CompletedView from '@app/entity/shared/containers/profile/sidebar/FormInfo/CompletedView'; +import IncompleteView from '@app/entity/shared/containers/profile/sidebar/FormInfo/IncompleteView'; +import useGetPromptInfo from '@app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo'; +import useIsUserAssigned from '@app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned'; +import { + isVerificationComplete, + shouldShowVerificationInfo, +} from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; interface Props { formUrn?: string; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/IncompleteView.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/IncompleteView.tsx index b08e1baec5..b85758ec64 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/IncompleteView.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/IncompleteView.tsx @@ -1,11 +1,19 @@ import { Button } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import PurpleVerificationLogo from '../../../../../../../images/verificationPurple.svg?react'; -import GrayVerificationIcon from '../../../../../../../images/verificationWarningGray.svg?react'; -import { CTAWrapper, FlexWrapper, StyledIcon, StyledReadFilled, Title } from './components'; -import OptionalPromptsRemaining from './OptionalPromptsRemaining'; -import RequiredPromptsRemaining from './RequiredPromptsRemaining'; + +import OptionalPromptsRemaining from '@app/entity/shared/containers/profile/sidebar/FormInfo/OptionalPromptsRemaining'; +import RequiredPromptsRemaining from '@app/entity/shared/containers/profile/sidebar/FormInfo/RequiredPromptsRemaining'; +import { + CTAWrapper, + FlexWrapper, + StyledIcon, + StyledReadFilled, + Title, +} from '@app/entity/shared/containers/profile/sidebar/FormInfo/components'; + +import PurpleVerificationLogo from '@images/verificationPurple.svg?react'; +import GrayVerificationIcon from '@images/verificationWarningGray.svg?react'; const StyledButton = styled(Button)` width: 100%; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/OptionalPromptsRemaining.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/OptionalPromptsRemaining.tsx index 3198453ce4..2b89d56aa7 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/OptionalPromptsRemaining.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/OptionalPromptsRemaining.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { pluralize } from '../../../../../../shared/textUtil'; -import { ANTD_GRAY_V2 } from '../../../../constants'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { pluralize } from '@app/shared/textUtil'; const OptionalPromptsWrapper = styled.div` color: ${ANTD_GRAY_V2[8]}; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/RequiredPromptsRemaining.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/RequiredPromptsRemaining.tsx index e275b2d751..57c18cddf4 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/RequiredPromptsRemaining.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/RequiredPromptsRemaining.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { pluralize } from '../../../../../../shared/textUtil'; -import { SubTitle } from './components'; + +import { SubTitle } from '@app/entity/shared/containers/profile/sidebar/FormInfo/components'; +import { pluralize } from '@app/shared/textUtil'; interface Props { numRemaining: number; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx index 9340a7f51d..ab565d9f31 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx @@ -1,11 +1,12 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import EntityFormModal from '../../../../entityForm/EntityFormModal'; -import FormInfo from './FormInfo'; -import { StyledDivider } from './components'; -import { useEntityData } from '../../../../EntityContext'; -import { getFormAssociations } from './utils'; -import FormSelectionModal from '../../../../entityForm/FormSelectionModal/FormSelectionModal'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import FormInfo from '@app/entity/shared/containers/profile/sidebar/FormInfo/FormInfo'; +import { StyledDivider } from '@app/entity/shared/containers/profile/sidebar/FormInfo/components'; +import { getFormAssociations } from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; +import EntityFormModal from '@app/entity/shared/entityForm/EntityFormModal'; +import FormSelectionModal from '@app/entity/shared/entityForm/FormSelectionModal/FormSelectionModal'; const FormInfoWrapper = styled.div` margin-top: 16px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/VerificationAuditStamp.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/VerificationAuditStamp.tsx index f437363241..4c0eb5ea4a 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/VerificationAuditStamp.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/VerificationAuditStamp.tsx @@ -1,8 +1,9 @@ import dayjs from 'dayjs'; import React from 'react'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { getVerificationAuditStamp } from './utils'; -import { useEntityData } from '../../../../EntityContext'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { getVerificationAuditStamp } from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; interface Props { formUrn?: string; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/__tests__/utils.test.ts b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/__tests__/utils.test.ts index 7898befaf7..e62a517baf 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/__tests__/utils.test.ts @@ -1,6 +1,4 @@ -import { FormAssociation, FormPrompt } from '../../../../../../../../types.generated'; -import { mockEntityData, mockEntityDataAllVerified } from '../../../../../entityForm/mocks'; -import { isAssignedToForm } from '../useIsUserAssigned'; +import { isAssignedToForm } from '@app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned'; import { getEntityPromptsInfo, getFieldPromptsInfo, @@ -12,7 +10,10 @@ import { getVerificationAuditStamp, isVerificationComplete, shouldShowVerificationInfo, -} from '../utils'; +} from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; +import { mockEntityData, mockEntityDataAllVerified } from '@app/entity/shared/entityForm/mocks'; + +import { FormAssociation, FormPrompt } from '@types'; // only looking at IDs const prompts = [{ id: '1' }, { id: '2' }, { id: '3' }, { id: '4' }] as FormPrompt[]; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo.ts b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo.ts index e141114f2c..ccdc2d22b7 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo.ts +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo.ts @@ -1,7 +1,13 @@ import { useMemo } from 'react'; -import { useEntityData } from '../../../../EntityContext'; -import { useGetEntityWithSchema } from '../../../../tabs/Dataset/Schema/useGetEntitySchema'; -import { getAllPrompts, getEntityPromptsInfo, getFieldPromptsInfo, getPromptsForForm } from './utils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { + getAllPrompts, + getEntityPromptsInfo, + getFieldPromptsInfo, + getPromptsForForm, +} from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; +import { useGetEntityWithSchema } from '@app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema'; export default function useGetPromptInfo(formUrn?: string) { const { entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned.ts b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned.ts index 067513bfef..65141df188 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned.ts +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned.ts @@ -1,7 +1,8 @@ -import { FormAssociation } from '../../../../../../../types.generated'; -import { useUserContext } from '../../../../../../context/useUserContext'; -import { useEntityData } from '../../../../EntityContext'; -import { getFormAssociations } from './utils'; +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { getFormAssociations } from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; + +import { FormAssociation } from '@types'; export function isAssignedToForm(formAssociation: FormAssociation, isUserAnOwner: boolean) { const { isAssignedToMe, owners: isAssignedToOwners } = formAssociation.form.info.actors; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/utils.ts b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/utils.ts index c7c0e6f48b..44447ddd7f 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/utils.ts +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/utils.ts @@ -1,4 +1,8 @@ import { Maybe } from 'graphql/jsutils/Maybe'; + +import { SCHEMA_FIELD_PROMPT_TYPES } from '@app/entity/shared/entityForm/constants'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + import { FieldFormPromptAssociation, FormAssociation, @@ -7,9 +11,7 @@ import { FormType, ResolvedAuditStamp, SchemaField, -} from '../../../../../../../types.generated'; -import { SCHEMA_FIELD_PROMPT_TYPES } from '../../../../entityForm/constants'; -import { GenericEntityProperties } from '../../../../types'; +} from '@types'; export function getFormAssociations(entityData: GenericEntityProperties | null) { return [...(entityData?.forms?.incompleteForms || []), ...(entityData?.forms?.completedForms || [])]; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/HeaderAndTabs.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/HeaderAndTabs.tsx index ac9ae7b1ab..e1fa4129c2 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/HeaderAndTabs.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/HeaderAndTabs.tsx @@ -1,4 +1,4 @@ -import React, { useState, useCallback } from 'react'; +import React, { useCallback, useState } from 'react'; import styled from 'styled-components'; let isResizing = false; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/LastIngested.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/LastIngested.tsx index 5296893974..e8de9debba 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/LastIngested.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/LastIngested.tsx @@ -1,15 +1,16 @@ import { green, orange, red } from '@ant-design/colors'; +import { QuestionCircleOutlined } from '@ant-design/icons'; import { Image, Popover } from 'antd'; -import styled from 'styled-components/macro'; import moment from 'moment-timezone'; import React from 'react'; -import { QuestionCircleOutlined } from '@ant-design/icons'; -import { toLocalDateTimeString, toRelativeTimeString } from '../../../../../shared/time/timeUtils'; -import { ANTD_GRAY } from '../../../constants'; -import { useEntityData } from '../../../EntityContext'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { getPlatformName } from '../../../utils'; -import { getDisplayedEntityType } from '../header/PlatformContent/PlatformContentContainer'; +import styled from 'styled-components/macro'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { getDisplayedEntityType } from '@app/entity/shared/containers/profile/header/PlatformContent/PlatformContentContainer'; +import { getPlatformName } from '@app/entity/shared/utils'; +import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const StyledDot = styled.div<{ color: string }>` border: 1px solid ${ANTD_GRAY[5]}; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/LinkButton.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/LinkButton.tsx index c3896baeda..65f47712f4 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/LinkButton.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/LinkButton.tsx @@ -2,7 +2,8 @@ import { LinkOutlined } from '@ant-design/icons'; import { Button } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { InstitutionalMemoryMetadata } from '../../../../../../types.generated'; + +import { InstitutionalMemoryMetadata } from '@types'; export const StyledLink = styled(Button)` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx index 2e2962ed86..0440957072 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx @@ -1,26 +1,18 @@ +import { Button, Form, Modal, Select, Tag, Typography, message } from 'antd'; import React, { ReactNode, useEffect, useMemo, useRef, useState } from 'react'; -import { Button, Form, message, Modal, Select, Tag, Typography } from 'antd'; import styled from 'styled-components/macro'; -import { - CorpUser, - Entity, - EntityType, - OwnerEntityType, - OwnershipTypeEntity, -} from '../../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import analytics, { EventType, EntityActionType } from '../../../../../../analytics'; -import { - useBatchAddOwnersMutation, - useBatchRemoveOwnersMutation, -} from '../../../../../../../graphql/mutations.generated'; -import { useGetSearchResultsLazyQuery } from '../../../../../../../graphql/search.generated'; -import { useGetRecommendations } from '../../../../../../shared/recommendation'; -import { OwnerLabel } from '../../../../../../shared/OwnerLabel'; -import { handleBatchError } from '../../../../utils'; -import { useListOwnershipTypesQuery } from '../../../../../../../graphql/ownership.generated'; -import { getModalDomContainer } from '../../../../../../../utils/focus'; +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { handleBatchError } from '@app/entity/shared/utils'; +import { OwnerLabel } from '@app/shared/OwnerLabel'; +import { useGetRecommendations } from '@app/shared/recommendation'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { getModalDomContainer } from '@utils/focus'; + +import { useBatchAddOwnersMutation, useBatchRemoveOwnersMutation } from '@graphql/mutations.generated'; +import { useListOwnershipTypesQuery } from '@graphql/ownership.generated'; +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { CorpUser, Entity, EntityType, OwnerEntityType, OwnershipTypeEntity } from '@types'; const SelectInput = styled(Select)` width: 480px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx index 9ff7ed8f29..c0c1ed4f16 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx @@ -1,8 +1,9 @@ import { AutoComplete, Form } from 'antd'; import { FormInstance } from 'antd/es/form/Form'; import React, { useState } from 'react'; -import { useGetAutoCompleteResultsLazyQuery } from '../../../../../../../graphql/search.generated'; -import { EntityType } from '../../../../../../../types.generated'; + +import { useGetAutoCompleteResultsLazyQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; const OWNER_SEARCH_PLACEHOLDER = 'Search an LDAP'; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts index e808cb587d..9c617cb166 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts @@ -1,4 +1,4 @@ -import { OwnershipType, OwnershipTypeEntity } from '../../../../../../../types.generated'; +import { OwnershipType, OwnershipTypeEntity } from '@types'; /** * A mapping from OwnershipType to it's display name & description. In the future, diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx index 03c25193d8..74d4c6d825 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx @@ -1,10 +1,12 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Typography } from 'antd'; -import { Owner, OwnershipTypeEntity } from '../../../../../../../../types.generated'; -import { ExpandedOwner } from '../../../../../components/styled/ExpandedOwner/ExpandedOwner'; -import { useMutationUrn, useRefetch } from '../../../../../EntityContext'; -import { getOwnershipTypeName } from '../ownershipUtils'; + +import { useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import { ExpandedOwner } from '@app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner'; +import { getOwnershipTypeName } from '@app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils'; + +import { Owner, OwnershipTypeEntity } from '@types'; const OwnershipTypeContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx index aa9a337d4b..10a8cc68d7 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx @@ -1,15 +1,17 @@ -import React, { useState } from 'react'; -import { Typography, Button } from 'antd'; import { PlusOutlined } from '@ant-design/icons'; +import { Button, Typography } from 'antd'; +import React, { useState } from 'react'; + +import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; // import { ExpandedOwner } from '../../../../../components/styled/ExpandedOwner/ExpandedOwner'; -import { EMPTY_MESSAGES } from '../../../../../constants'; -import { Owner, OwnershipType, OwnershipTypeEntity } from '../../../../../../../../types.generated'; -import { useEntityData, useMutationUrn, useRefetch } from '../../../../../EntityContext'; -import { SidebarHeader } from '../../SidebarHeader'; -import { EditOwnersModal } from '../EditOwnersModal'; -import { ENTITY_PROFILE_OWNERS_ID } from '../../../../../../../onboarding/config/EntityProfileOnboardingConfig'; -import { OwnershipTypeSection } from './OwnershipTypeSection'; -import { getOwnershipTypeName } from '../ownershipUtils'; +import { EMPTY_MESSAGES } from '@app/entity/shared/constants'; +import { EditOwnersModal } from '@app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal'; +import { getOwnershipTypeName } from '@app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils'; +import { OwnershipTypeSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection'; +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; +import { ENTITY_PROFILE_OWNERS_ID } from '@app/onboarding/config/EntityProfileOnboardingConfig'; + +import { Owner, OwnershipType, OwnershipTypeEntity } from '@types'; interface Props { properties?: any; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx index 6a5f90e872..db6bef414c 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx @@ -1,9 +1,11 @@ import { Button, Form, Modal, Select, Tag, Tooltip } from 'antd'; import React, { ReactNode, useRef, useState } from 'react'; import styled from 'styled-components/macro'; -import { useGetSearchResultsLazyQuery } from '../../../../../../../graphql/search.generated'; -import { DataPlatform, Entity, EntityType } from '../../../../../../../types.generated'; -import { useEnterKeyListener } from '../../../../../../shared/useEnterKeyListener'; + +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; + +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { DataPlatform, Entity, EntityType } from '@types'; type Props = { onCloseModal: () => void; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/ProfileSidebar.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/ProfileSidebar.tsx index b5e6737c16..625d5ac9d3 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/ProfileSidebar.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/ProfileSidebar.tsx @@ -1,8 +1,9 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import { ProfileSidebarResizer } from './ProfileSidebarResizer'; -import { EntitySidebar } from './EntitySidebar'; -import { EntitySidebarSection } from '../../../types'; + +import { EntitySidebar } from '@app/entity/shared/containers/profile/sidebar/EntitySidebar'; +import { ProfileSidebarResizer } from '@app/entity/shared/containers/profile/sidebar/ProfileSidebarResizer'; +import { EntitySidebarSection } from '@app/entity/shared/types'; export const MAX_SIDEBAR_WIDTH = 800; export const MIN_SIDEBAR_WIDTH = 200; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/ProfileSidebarResizer.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/ProfileSidebarResizer.tsx index 6927f4d609..a2e5dbb0f2 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/ProfileSidebarResizer.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/ProfileSidebarResizer.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; type Props = { setSidePanelWidth: (width: number) => void; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx index db233598f3..d8fd8a637e 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx @@ -1,14 +1,12 @@ import React from 'react'; import styled from 'styled-components'; -import { useListRecommendationsQuery } from '../../../../../../../graphql/recommendations.generated'; -import { - EntityType, - ScenarioType, - RecommendationModule as RecommendationModuleType, -} from '../../../../../../../types.generated'; -import { RecommendationModule } from '../../../../../../recommendations/RecommendationModule'; -import { RecommendationDisplayType } from '../../../../../../recommendations/types'; -import { SidebarHeader } from '../SidebarHeader'; + +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; +import { RecommendationModule } from '@app/recommendations/RecommendationModule'; +import { RecommendationDisplayType } from '@app/recommendations/types'; + +import { useListRecommendationsQuery } from '@graphql/recommendations.generated'; +import { EntityType, RecommendationModule as RecommendationModuleType, ScenarioType } from '@types'; const RecommendationsContainer = styled.div``; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx index 002db71f22..a5b4bbb571 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import { useUserContext } from '../../../../../../context/useUserContext'; -import { useEntityData } from '../../../../EntityContext'; -import { SidebarEntityRecommendations } from './SidebarEntityRecommendations'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { SidebarEntityRecommendations } from '@app/entity/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations'; const RecommendationsContainer = styled.div``; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarHeader.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarHeader.tsx index a5c7cce93a..212cd8e076 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarHeader.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarHeader.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const HeaderContainer = styled.div` diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx index 797cd9d09f..d4b18b1c64 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx @@ -1,13 +1,18 @@ import React from 'react'; import styled from 'styled-components'; -import { useDataNotCombinedWithSiblings, useEntityData } from '../../../EntityContext'; -import { SidebarHeader } from './SidebarHeader'; -import { CompactEntityNameList } from '../../../../../recommendations/renderer/component/CompactEntityNameList'; -import { Dataset, Entity } from '../../../../../../types.generated'; -import { SEPARATE_SIBLINGS_URL_PARAM, stripSiblingsFromEntity, useIsSeparateSiblingsMode } from '../../../siblingUtils'; -import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated'; -import { useIsShowSeparateSiblingsEnabled } from '../../../../../useAppConfig'; +import { useDataNotCombinedWithSiblings, useEntityData } from '@app/entity/shared/EntityContext'; +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; +import { + SEPARATE_SIBLINGS_URL_PARAM, + stripSiblingsFromEntity, + useIsSeparateSiblingsMode, +} from '@app/entity/shared/siblingUtils'; +import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList'; +import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { Dataset, Entity } from '@types'; const EntityListContainer = styled.div` margin-left: -8px; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarTagsSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarTagsSection.tsx index 955152443e..4f7e739528 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarTagsSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarTagsSection.tsx @@ -1,15 +1,15 @@ -import React from 'react'; import { Divider } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import TagTermGroup from '../../../../../shared/tags/TagTermGroup'; -import { SidebarHeader } from './SidebarHeader'; -import { useEntityData, useMutationUrn, useRefetch } from '../../../EntityContext'; +import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; +import { getNestedValue } from '@app/entity/shared/containers/profile/utils'; import { ENTITY_PROFILE_GLOSSARY_TERMS_ID, ENTITY_PROFILE_TAGS_ID, -} from '../../../../../onboarding/config/EntityProfileOnboardingConfig'; -import { getNestedValue } from '../utils'; +} from '@app/onboarding/config/EntityProfileOnboardingConfig'; +import TagTermGroup from '@app/shared/tags/TagTermGroup'; const StyledDivider = styled(Divider)` margin: 16px 0; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection.tsx index 41e07d49b2..5162b8cd0b 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection.tsx @@ -1,30 +1,31 @@ +import React from 'react'; + +import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader'; import { useUserContext } from '@src/app/context/useUserContext'; import { useEntityData } from '@src/app/entity/shared/EntityContext'; import { StyledList } from '@src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties'; +import { + SectionHeader, + StyledDivider, +} from '@src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import { useGetEntityWithSchema } from '@src/app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema'; import { EditColumn } from '@src/app/entity/shared/tabs/Properties/Edit/EditColumn'; import StructuredPropertyValue from '@src/app/entity/shared/tabs/Properties/StructuredPropertyValue'; import { PropertyRow } from '@src/app/entity/shared/tabs/Properties/types'; -import EmptySectionText from '@src/app/shared/sidebar/EmptySectionText'; import { getDisplayName, getEntityTypesPropertyFilter, getNotHiddenPropertyFilter, getPropertyRowFromSearchResult, } from '@src/app/govern/structuredProperties/utils'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated'; -import { EntityType, SchemaField, SearchResult, StdDataType, StructuredPropertyEntity } from '@src/types.generated'; import { SHOW_IN_ASSET_SUMMARY_PROPERTY_FILTER_NAME, SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME, } from '@src/app/search/utils/constants'; -import { - SectionHeader, - StyledDivider, -} from '@src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; -import { useGetEntityWithSchema } from '@src/app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema'; -import React from 'react'; -import { SidebarHeader } from '../SidebarHeader'; +import EmptySectionText from '@src/app/shared/sidebar/EmptySectionText'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated'; +import { EntityType, SchemaField, SearchResult, StdDataType, StructuredPropertyEntity } from '@src/types.generated'; interface Props { properties?: { diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx index 8608e40d84..87bc718699 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx @@ -1,6 +1,7 @@ import { green, orange, red } from '@ant-design/colors'; import moment from 'moment-timezone'; -import { getLastIngestedColor } from '../LastIngested'; + +import { getLastIngestedColor } from '@app/entity/shared/containers/profile/sidebar/LastIngested'; describe('getLastIngestedColor', () => { it('should return green if the last ingested date is the present moment', () => { diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/tagRenderer.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/tagRenderer.tsx index b188d96f81..ed8dd44d15 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/tagRenderer.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/tagRenderer.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Tag } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const StyleTag = styled(Tag)` diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/useGetDataForProfile.ts b/datahub-web-react/src/app/entity/shared/containers/profile/useGetDataForProfile.ts index ae87eeb1a8..4fc7d75295 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/useGetDataForProfile.ts +++ b/datahub-web-react/src/app/entity/shared/containers/profile/useGetDataForProfile.ts @@ -1,8 +1,10 @@ import { QueryHookOptions, QueryResult } from '@apollo/client'; -import { getDataForEntityType } from './utils'; -import { combineEntityDataWithSiblings, useIsSeparateSiblingsMode } from '../../siblingUtils'; -import { GenericEntityProperties } from '../../types'; -import { EntityType, Exact } from '../../../../../types.generated'; + +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { combineEntityDataWithSiblings, useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + +import { EntityType, Exact } from '@types'; interface Props { urn: string; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/utils.ts b/datahub-web-react/src/app/entity/shared/containers/profile/utils.ts index ac074cc54a..d169de37a3 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/utils.ts +++ b/datahub-web-react/src/app/entity/shared/containers/profile/utils.ts @@ -1,13 +1,14 @@ +import { isEqual } from 'lodash'; +import queryString from 'query-string'; import { useEffect } from 'react'; import { useLocation } from 'react-router'; -import queryString from 'query-string'; -import { isEqual } from 'lodash'; -import { AppConfig, EntityType } from '../../../../../types.generated'; -import useIsLineageMode from '../../../../lineage/utils/useIsLineageMode'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import EntityRegistry from '../../../EntityRegistry'; -import { EntityTab, GenericEntityProperties } from '../../types'; -import { useIsSeparateSiblingsMode, SEPARATE_SIBLINGS_URL_PARAM } from '../../siblingUtils'; + +import EntityRegistry from '@app/entity/EntityRegistry'; +import { useGlossaryEntityData } from '@app/entity/shared/GlossaryEntityContext'; +import { GLOSSARY_ENTITY_TYPES } from '@app/entity/shared/constants'; +import { SEPARATE_SIBLINGS_URL_PARAM, useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import { EntityTab, GenericEntityProperties } from '@app/entity/shared/types'; +import useIsLineageMode from '@app/lineage/utils/useIsLineageMode'; import { ENTITY_PROFILE_DOCUMENTATION_ID, ENTITY_PROFILE_DOMAINS_ID, @@ -18,10 +19,11 @@ import { ENTITY_PROFILE_PROPERTIES_ID, ENTITY_PROFILE_SCHEMA_ID, ENTITY_PROFILE_TAGS_ID, -} from '../../../../onboarding/config/EntityProfileOnboardingConfig'; -import { useGlossaryEntityData } from '../../GlossaryEntityContext'; -import usePrevious from '../../../../shared/usePrevious'; -import { GLOSSARY_ENTITY_TYPES } from '../../constants'; +} from '@app/onboarding/config/EntityProfileOnboardingConfig'; +import usePrevious from '@app/shared/usePrevious'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { AppConfig, EntityType } from '@types'; /** * The structure of our path will be diff --git a/datahub-web-react/src/app/entity/shared/embed/EmbeddedHeader.tsx b/datahub-web-react/src/app/entity/shared/embed/EmbeddedHeader.tsx index d4c3f2b218..b477fb65ca 100644 --- a/datahub-web-react/src/app/entity/shared/embed/EmbeddedHeader.tsx +++ b/datahub-web-react/src/app/entity/shared/embed/EmbeddedHeader.tsx @@ -1,17 +1,18 @@ +import { ArrowRightOutlined } from '@ant-design/icons'; import { Image, Typography } from 'antd'; +import Link from 'antd/lib/typography/Link'; import React from 'react'; import styled, { useTheme } from 'styled-components/macro'; -import Link from 'antd/lib/typography/Link'; -import { ArrowRightOutlined } from '@ant-design/icons'; -import { DEFAULT_APP_CONFIG } from '../../../../appConfigContext'; -import { useAppConfig } from '../../../useAppConfig'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; -import { useEntityData } from '../EntityContext'; -import { getDisplayedEntityType } from '../containers/profile/header/PlatformContent/PlatformContentContainer'; -import { ANTD_GRAY } from '../constants'; -import analytics from '../../../analytics/analytics'; -import { EventType } from '../../../analytics'; + +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import { IconStyleType } from '@app/entity/Entity'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { getDisplayedEntityType } from '@app/entity/shared/containers/profile/header/PlatformContent/PlatformContentContainer'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { DEFAULT_APP_CONFIG } from '@src/appConfigContext'; const HeaderWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/embed/EmbeddedProfile.tsx b/datahub-web-react/src/app/entity/shared/embed/EmbeddedProfile.tsx index fc3f015ec4..4b1f7b7d51 100644 --- a/datahub-web-react/src/app/entity/shared/embed/EmbeddedProfile.tsx +++ b/datahub-web-react/src/app/entity/shared/embed/EmbeddedProfile.tsx @@ -3,18 +3,20 @@ import { QueryHookOptions, QueryResult } from '@apollo/client'; import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { EntityType, Exact } from '../../../../types.generated'; -import useGetDataForProfile from '../containers/profile/useGetDataForProfile'; -import { EntityContext } from '../EntityContext'; -import { GenericEntityProperties } from '../types'; -import EmbeddedHeader from './EmbeddedHeader'; -import { SidebarAboutSection } from '../containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarOwnerSection } from '../containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { SidebarTagsSection } from '../containers/profile/sidebar/SidebarTagsSection'; -import { SidebarDomainSection } from '../containers/profile/sidebar/Domain/SidebarDomainSection'; -import UpstreamHealth from './UpstreamHealth/UpstreamHealth'; -import NonExistentEntityPage from '../entity/NonExistentEntityPage'; -import DataProductSection from '../containers/profile/sidebar/DataProduct/DataProductSection'; + +import { EntityContext } from '@app/entity/shared/EntityContext'; +import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection'; +import useGetDataForProfile from '@app/entity/shared/containers/profile/useGetDataForProfile'; +import EmbeddedHeader from '@app/entity/shared/embed/EmbeddedHeader'; +import UpstreamHealth from '@app/entity/shared/embed/UpstreamHealth/UpstreamHealth'; +import NonExistentEntityPage from '@app/entity/shared/entity/NonExistentEntityPage'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + +import { EntityType, Exact } from '@types'; const LoadingWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingAssertions.tsx b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingAssertions.tsx index 939418ffc1..3ed9fd08cf 100644 --- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingAssertions.tsx +++ b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingAssertions.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import FailingEntity from './FailingEntity'; -import { getNumAssertionsFailing, UpstreamSummary } from './utils'; + +import FailingEntity from '@app/entity/shared/embed/UpstreamHealth/FailingEntity'; +import { UpstreamSummary, getNumAssertionsFailing } from '@app/entity/shared/embed/UpstreamHealth/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const FailingSectionWrapper = styled.div` margin: 5px 0 0 34px; diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingEntity.tsx b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingEntity.tsx index 1af749c239..34473f2d30 100644 --- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingEntity.tsx +++ b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingEntity.tsx @@ -3,7 +3,8 @@ import Icon from '@ant-design/icons/lib/components/Icon'; import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import ExternalLink from '../../../../../images/link-out.svg?react'; + +import ExternalLink from '@images/link-out.svg?react'; const DatasetWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingInputs.tsx b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingInputs.tsx index 3a34ee1a8c..fd998d7952 100644 --- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingInputs.tsx +++ b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingInputs.tsx @@ -2,9 +2,10 @@ import { orange } from '@ant-design/colors'; import { DownOutlined, WarningFilled } from '@ant-design/icons'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; -import FailingAssertions from './FailingAssertions'; -import { UpstreamSummary } from './utils'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import FailingAssertions from '@app/entity/shared/embed/UpstreamHealth/FailingAssertions'; +import { UpstreamSummary } from '@app/entity/shared/embed/UpstreamHealth/utils'; const TextWrapper = styled.span` font-size: 16px; diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/UpstreamHealth.tsx b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/UpstreamHealth.tsx index 2c5ddf6dde..90387b4c90 100644 --- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/UpstreamHealth.tsx +++ b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/UpstreamHealth.tsx @@ -3,13 +3,16 @@ import { CheckCircleFilled, LoadingOutlined } from '@ant-design/icons'; import Icon from '@ant-design/icons/lib/components/Icon'; import React from 'react'; import styled from 'styled-components'; -import { useSearchAcrossLineageQuery } from '../../../../../graphql/search.generated'; -import { Entity, EntityType, FilterOperator, LineageDirection } from '../../../../../types.generated'; -import { ANTD_GRAY } from '../../constants'; -import { useEntityData } from '../../EntityContext'; -import { extractUpstreamSummary } from './utils'; -import FailingInputs from './FailingInputs'; -import SubtractIcon from '../../../../../images/subtractIcon.svg?react'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import FailingInputs from '@app/entity/shared/embed/UpstreamHealth/FailingInputs'; +import { extractUpstreamSummary } from '@app/entity/shared/embed/UpstreamHealth/utils'; + +import { useSearchAcrossLineageQuery } from '@graphql/search.generated'; +import { Entity, EntityType, FilterOperator, LineageDirection } from '@types'; + +import SubtractIcon from '@images/subtractIcon.svg?react'; const LoadingWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/__tests__/utils.test.tsx b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/__tests__/utils.test.tsx index 9af5b61685..887a2f9ec1 100644 --- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/__tests__/utils.test.tsx +++ b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/__tests__/utils.test.tsx @@ -1,6 +1,7 @@ -import { dataset1, dataset2, dataset3 } from '../../../../../../Mocks'; -import { Dataset } from '../../../../../../types.generated'; -import * as utils from '../utils'; +import * as utils from '@app/entity/shared/embed/UpstreamHealth/utils'; +import { dataset1, dataset2, dataset3 } from '@src/Mocks'; + +import { Dataset } from '@types'; // has 1 passing and 1 failing assertion const dataset1WithAssertions = { diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/utils.ts b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/utils.ts index 84b1872597..a3b22bedd4 100644 --- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/utils.ts +++ b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/utils.ts @@ -1,4 +1,4 @@ -import { Dataset, Entity, EntityType } from '../../../../../types.generated'; +import { Dataset, Entity, EntityType } from '@types'; function getAssertionsSummary(dataset: Dataset) { let numAssertionsFailing = 0; diff --git a/datahub-web-react/src/app/entity/shared/entity/EntityActions.tsx b/datahub-web-react/src/app/entity/shared/entity/EntityActions.tsx index 6d15ea8f6c..3f92562263 100644 --- a/datahub-web-react/src/app/entity/shared/entity/EntityActions.tsx +++ b/datahub-web-react/src/app/entity/shared/entity/EntityActions.tsx @@ -1,13 +1,15 @@ -import React, { useState } from 'react'; -import { Button, message } from 'antd'; import { LinkOutlined } from '@ant-design/icons'; -import { SearchSelectModal } from '../components/styled/search/SearchSelectModal'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { EntityCapabilityType } from '../../Entity'; -import { useBatchAddTermsMutation, useBatchSetDomainMutation } from '../../../../graphql/mutations.generated'; -import { handleBatchError } from '../utils'; -import { useBatchSetDataProductMutation } from '../../../../graphql/dataProduct.generated'; -import { useEntityContext } from '../EntityContext'; +import { Button, message } from 'antd'; +import React, { useState } from 'react'; + +import { EntityCapabilityType } from '@app/entity/Entity'; +import { useEntityContext } from '@app/entity/shared/EntityContext'; +import { SearchSelectModal } from '@app/entity/shared/components/styled/search/SearchSelectModal'; +import { handleBatchError } from '@app/entity/shared/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useBatchSetDataProductMutation } from '@graphql/dataProduct.generated'; +import { useBatchAddTermsMutation, useBatchSetDomainMutation } from '@graphql/mutations.generated'; export enum EntityActionItem { /** diff --git a/datahub-web-react/src/app/entity/shared/entityForm/EntityForm.tsx b/datahub-web-react/src/app/entity/shared/entityForm/EntityForm.tsx index 136bbabb61..b2ee5a81a6 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/EntityForm.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/EntityForm.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import FormByEntity from './FormByEntity'; -import { FormView, useEntityFormContext } from './EntityFormContext'; + +import { FormView, useEntityFormContext } from '@app/entity/shared/entityForm/EntityFormContext'; +import FormByEntity from '@app/entity/shared/entityForm/FormByEntity'; interface Props { formUrn: string; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContext.tsx b/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContext.tsx index aa5e1e3c4a..d8d43fe0ec 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContext.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContext.tsx @@ -1,6 +1,8 @@ import React, { useContext } from 'react'; -import { Entity } from '../../../../types.generated'; -import { EntityAndType, GenericEntityProperties } from '../types'; + +import { EntityAndType, GenericEntityProperties } from '@app/entity/shared/types'; + +import { Entity } from '@types'; export enum FormView { BY_ENTITY, diff --git a/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContextProvider.tsx b/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContextProvider.tsx index 44d771515f..d9690196a9 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContextProvider.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContextProvider.tsx @@ -1,13 +1,18 @@ import React, { useEffect, useState } from 'react'; -import { EntityFormContext, FormView } from './EntityFormContext'; -import { useEntityContext } from '../EntityContext'; -import { Entity } from '../../../../types.generated'; -import { useGetDatasetQuery } from '../../../../graphql/dataset.generated'; -import { EntityAndType, GenericEntityProperties } from '../types'; -import { getFormAssociation, isFormVerificationType } from '../containers/profile/sidebar/FormInfo/utils'; -import usePrevious from '../../../shared/usePrevious'; -import { SCHEMA_FIELD_PROMPT_TYPES } from './constants'; -import { useEntityRegistry } from '../../../useEntityRegistry'; + +import { useEntityContext } from '@app/entity/shared/EntityContext'; +import { + getFormAssociation, + isFormVerificationType, +} from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; +import { EntityFormContext, FormView } from '@app/entity/shared/entityForm/EntityFormContext'; +import { SCHEMA_FIELD_PROMPT_TYPES } from '@app/entity/shared/entityForm/constants'; +import { EntityAndType, GenericEntityProperties } from '@app/entity/shared/types'; +import usePrevious from '@app/shared/usePrevious'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetDatasetQuery } from '@graphql/dataset.generated'; +import { Entity } from '@types'; interface Props { children: React.ReactNode; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/EntityFormModal.tsx b/datahub-web-react/src/app/entity/shared/entityForm/EntityFormModal.tsx index 47026472c4..0f7797ccb4 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/EntityFormModal.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/EntityFormModal.tsx @@ -1,10 +1,11 @@ import { CloseOutlined } from '@ant-design/icons'; -import React from 'react'; import { Modal } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import EntityForm from './EntityForm'; -import FormPageHeader from './FormHeader/FormPageHeader'; -import EntityFormContextProvider from './EntityFormContextProvider'; + +import EntityForm from '@app/entity/shared/entityForm/EntityForm'; +import EntityFormContextProvider from '@app/entity/shared/entityForm/EntityFormContextProvider'; +import FormPageHeader from '@app/entity/shared/entityForm/FormHeader/FormPageHeader'; const StyledModal = styled(Modal)` &&& .ant-modal-content { diff --git a/datahub-web-react/src/app/entity/shared/entityForm/Form.tsx b/datahub-web-react/src/app/entity/shared/entityForm/Form.tsx index b5f3cd7700..9ca1ee88ac 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/Form.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/Form.tsx @@ -1,21 +1,23 @@ import React from 'react'; import styled from 'styled-components'; -import { useEntityData } from '../EntityContext'; -import { FormPrompt } from '../../../../types.generated'; -import Prompt, { PromptWrapper } from './prompts/Prompt'; -import { ANTD_GRAY_V2 } from '../constants'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { PromptSubTitle } from './prompts/StructuredPropertyPrompt/StructuredPropertyPrompt'; -import SchemaFieldPrompts from './schemaFieldPrompts/SchemaFieldPrompts'; -import useGetPromptInfo from '../containers/profile/sidebar/FormInfo/useGetPromptInfo'; -import VerificationPrompt from './prompts/VerificationPrompt'; -import useShouldShowVerificationPrompt from './useShouldShowVerificationPrompt'; -import { getFormAssociation } from '../containers/profile/sidebar/FormInfo/utils'; -import FormRequestedBy from './FormSelectionModal/FormRequestedBy'; -import useHasComponentRendered from '../../../shared/useHasComponentRendered'; -import Loading from '../../../shared/Loading'; -import { DeferredRenderComponent } from '../../../shared/DeferredRenderComponent'; -import { Editor } from '../tabs/Documentation/components/editor/Editor'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import useGetPromptInfo from '@app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo'; +import { getFormAssociation } from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; +import FormRequestedBy from '@app/entity/shared/entityForm/FormSelectionModal/FormRequestedBy'; +import Prompt, { PromptWrapper } from '@app/entity/shared/entityForm/prompts/Prompt'; +import { PromptSubTitle } from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/StructuredPropertyPrompt'; +import VerificationPrompt from '@app/entity/shared/entityForm/prompts/VerificationPrompt'; +import SchemaFieldPrompts from '@app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldPrompts'; +import useShouldShowVerificationPrompt from '@app/entity/shared/entityForm/useShouldShowVerificationPrompt'; +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; +import { DeferredRenderComponent } from '@app/shared/DeferredRenderComponent'; +import Loading from '@app/shared/Loading'; +import useHasComponentRendered from '@app/shared/useHasComponentRendered'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { FormPrompt } from '@types'; const TabWrapper = styled.div` background-color: ${ANTD_GRAY_V2[1]}; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx b/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx index a6c3fdae71..3cdbdf298e 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx @@ -1,15 +1,15 @@ import React from 'react'; import styled from 'styled-components'; -import Form from './Form'; -import { ANTD_GRAY_V2 } from '../constants'; -import ProfileSidebar from '../containers/profile/sidebar/ProfileSidebar'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { EntityContext, useEntityContext } from '../EntityContext'; -import EntityInfo from '../containers/profile/sidebar/EntityInfo/EntityInfo'; -import { useEntityFormContext } from './EntityFormContext'; -import ProgressBar from './ProgressBar'; -import { useIsThemeV2 } from '../../../useIsThemeV2'; +import { EntityContext, useEntityContext } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import EntityInfo from '@app/entity/shared/containers/profile/sidebar/EntityInfo/EntityInfo'; +import ProfileSidebar from '@app/entity/shared/containers/profile/sidebar/ProfileSidebar'; +import { useEntityFormContext } from '@app/entity/shared/entityForm/EntityFormContext'; +import Form from '@app/entity/shared/entityForm/Form'; +import ProgressBar from '@app/entity/shared/entityForm/ProgressBar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { useIsThemeV2 } from '@app/useIsThemeV2'; const ContentWrapper = styled.div` background-color: ${ANTD_GRAY_V2[1]}; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormHeader/FormPageHeader.tsx b/datahub-web-react/src/app/entity/shared/entityForm/FormHeader/FormPageHeader.tsx index 4baa762fcf..7620a43ce8 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/FormHeader/FormPageHeader.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/FormHeader/FormPageHeader.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import AppLogoLink from '../../../../shared/AppLogoLink'; + +import AppLogoLink from '@app/shared/AppLogoLink'; const Header = styled.div` padding: 12px 24px; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormHeader/components.ts b/datahub-web-react/src/app/entity/shared/entityForm/FormHeader/components.ts index c94dc0ef63..9d2b386ab9 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/FormHeader/components.ts +++ b/datahub-web-react/src/app/entity/shared/entityForm/FormHeader/components.ts @@ -1,7 +1,9 @@ import { ArrowLeftOutlined, ArrowRightOutlined } from '@ant-design/icons'; import styled from 'styled-components'; -import { ANTD_GRAY_V2 } from '../../constants'; -import BackgroundDots from '../../../../../images/background_dots.svg'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; + +import BackgroundDots from '@images/background_dots.svg'; export const BulkNavigationWrapper = styled.div<{ $hideBackground?: boolean }>` padding: 16px 68px 16px 24px; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormItem.tsx b/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormItem.tsx index c23fd39d8a..684e56e4dc 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormItem.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormItem.tsx @@ -1,15 +1,20 @@ import { Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { FormAssociation } from '../../../../../types.generated'; -import useGetPromptInfo from '../../containers/profile/sidebar/FormInfo/useGetPromptInfo'; -import { useEntityData } from '../../EntityContext'; -import { isVerificationComplete, shouldShowVerificationInfo } from '../../containers/profile/sidebar/FormInfo/utils'; -import { pluralize } from '../../../../shared/textUtil'; -import { WhiteButton } from '../../../../shared/components'; -import { ANTD_GRAY_V2 } from '../../constants'; -import useIsUserAssigned from '../../containers/profile/sidebar/FormInfo/useIsUserAssigned'; -import FormRequestedBy from './FormRequestedBy'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import useGetPromptInfo from '@app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo'; +import useIsUserAssigned from '@app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned'; +import { + isVerificationComplete, + shouldShowVerificationInfo, +} from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; +import FormRequestedBy from '@app/entity/shared/entityForm/FormSelectionModal/FormRequestedBy'; +import { WhiteButton } from '@app/shared/components'; +import { pluralize } from '@app/shared/textUtil'; + +import { FormAssociation } from '@types'; const FormItemWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormRequestedBy.tsx b/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormRequestedBy.tsx index fa4834b5a4..7dd83f9245 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormRequestedBy.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormRequestedBy.tsx @@ -1,6 +1,8 @@ import React from 'react'; -import { Owner } from '../../../../../types.generated'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; + +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Owner } from '@types'; interface Props { owners: Owner[]; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormSelectionModal.tsx b/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormSelectionModal.tsx index 17452b30f6..c29f4f2e61 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormSelectionModal.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormSelectionModal.tsx @@ -1,6 +1,7 @@ import { Modal } from 'antd'; import React from 'react'; -import FormSelector from './FormSelector'; + +import FormSelector from '@app/entity/shared/entityForm/FormSelectionModal/FormSelector'; interface Props { isFormSelectionModalVisible: boolean; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormSelector.tsx b/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormSelector.tsx index 6c9d593b38..1beecc65c8 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormSelector.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/FormSelectionModal/FormSelector.tsx @@ -1,9 +1,10 @@ import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { useEntityData } from '../../EntityContext'; -import { getFormAssociations } from '../../containers/profile/sidebar/FormInfo/utils'; -import FormItem from './FormItem'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { getFormAssociations } from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; +import FormItem from '@app/entity/shared/entityForm/FormSelectionModal/FormItem'; const FormSelectorWrapper = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/ProgressBar.tsx b/datahub-web-react/src/app/entity/shared/entityForm/ProgressBar.tsx index a4473fc825..f611c5c17a 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/ProgressBar.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/ProgressBar.tsx @@ -1,8 +1,9 @@ import { Progress } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import useGetPromptInfo from '../containers/profile/sidebar/FormInfo/useGetPromptInfo'; -import { ANTD_GRAY } from '../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import useGetPromptInfo from '@app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo'; const StyledProgress = styled(Progress)` &&& .ant-progress-outer { diff --git a/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx b/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx index 88507b9551..d5551fb37a 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx @@ -1,12 +1,14 @@ import { MockedProvider } from '@apollo/client/testing'; -import React from 'react'; import { render, waitFor } from '@testing-library/react'; -import { EntityContext } from '../../EntityContext'; -import { mockEntityDataWithFieldPrompts, mockEntityData } from '../mocks'; -import { EntityType } from '../../../../../types.generated'; -import Form from '../Form'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { mocks } from '../../../../../Mocks'; +import React from 'react'; + +import { EntityContext } from '@app/entity/shared/EntityContext'; +import Form from '@app/entity/shared/entityForm/Form'; +import { mockEntityData, mockEntityDataWithFieldPrompts } from '@app/entity/shared/entityForm/mocks'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { EntityType } from '@types'; beforeEach(() => { // IntersectionObserver isn't available in test environment diff --git a/datahub-web-react/src/app/entity/shared/entityForm/__tests__/useShouldShowVerificationPrompt.test.ts b/datahub-web-react/src/app/entity/shared/entityForm/__tests__/useShouldShowVerificationPrompt.test.ts index 93413fcf63..7b6d8880c8 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/__tests__/useShouldShowVerificationPrompt.test.ts +++ b/datahub-web-react/src/app/entity/shared/entityForm/__tests__/useShouldShowVerificationPrompt.test.ts @@ -1,5 +1,6 @@ -import { FormType, FormVerificationAssociation } from '../../../../../types.generated'; -import { shouldShowVerificationPrompt } from '../useShouldShowVerificationPrompt'; +import { shouldShowVerificationPrompt } from '@app/entity/shared/entityForm/useShouldShowVerificationPrompt'; + +import { FormType, FormVerificationAssociation } from '@types'; describe('shouldShowVerificationPrompt', () => { const formVerification = { diff --git a/datahub-web-react/src/app/entity/shared/entityForm/constants.ts b/datahub-web-react/src/app/entity/shared/entityForm/constants.ts index fb62ab5de7..2844a95cb5 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/constants.ts +++ b/datahub-web-react/src/app/entity/shared/entityForm/constants.ts @@ -1,3 +1,3 @@ -import { FormPromptType } from '../../../../types.generated'; +import { FormPromptType } from '@types'; export const SCHEMA_FIELD_PROMPT_TYPES = [FormPromptType.FieldsStructuredProperty]; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/mocks.ts b/datahub-web-react/src/app/entity/shared/entityForm/mocks.ts index b29848e4b1..546f717523 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/mocks.ts +++ b/datahub-web-react/src/app/entity/shared/entityForm/mocks.ts @@ -1,5 +1,6 @@ -import { EntityType, FormPromptType, FormType } from '../../../../types.generated'; -import { GenericEntityProperties } from '../types'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + +import { EntityType, FormPromptType, FormType } from '@types'; const form1 = { urn: 'urn:li:form:1', diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/Prompt.tsx b/datahub-web-react/src/app/entity/shared/entityForm/prompts/Prompt.tsx index 23512dff59..8acbe9ed46 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/Prompt.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/Prompt.tsx @@ -1,15 +1,12 @@ import { message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { - FormPrompt as PromptEntity, - FormPromptType, - SubmitFormPromptInput, - SchemaField, -} from '../../../../../types.generated'; -import StructuredPropertyPrompt from './StructuredPropertyPrompt/StructuredPropertyPrompt'; -import { useSubmitFormPromptMutation } from '../../../../../graphql/form.generated'; -import { useMutationUrn } from '../../EntityContext'; + +import { useMutationUrn } from '@app/entity/shared/EntityContext'; +import StructuredPropertyPrompt from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/StructuredPropertyPrompt'; + +import { useSubmitFormPromptMutation } from '@graphql/form.generated'; +import { FormPromptType, FormPrompt as PromptEntity, SchemaField, SubmitFormPromptInput } from '@types'; export const PromptWrapper = styled.div` background-color: white; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/CompletedPromptAuditStamp.tsx b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/CompletedPromptAuditStamp.tsx index ff11f0db5f..3d0325634e 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/CompletedPromptAuditStamp.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/CompletedPromptAuditStamp.tsx @@ -1,9 +1,11 @@ +import Icon from '@ant-design/icons'; import { Typography } from 'antd'; import React from 'react'; -import Icon from '@ant-design/icons'; import styled from 'styled-components'; -import GreenCircleIcon from '../../../../../../images/greenCircleTwoTone.svg?react'; -import { ANTD_GRAY_V2 } from '../../../constants'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; + +import GreenCircleIcon from '@images/greenCircleTwoTone.svg?react'; const PadIcon = styled.div` align-items: flex-start; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/StructuredPropertyPrompt.tsx b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/StructuredPropertyPrompt.tsx index 96602ae6f1..7de28ab51e 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/StructuredPropertyPrompt.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/StructuredPropertyPrompt.tsx @@ -1,12 +1,14 @@ import { Button } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { FormPrompt, SchemaField, SubmitFormPromptInput } from '../../../../../../types.generated'; -import useStructuredPropertyPrompt from './useStructuredPropertyPrompt'; -import CompletedPromptAuditStamp from './CompletedPromptAuditStamp'; -import { applyOpacity } from '../../../../../shared/styleUtils'; -import usePromptCompletionInfo from '../usePromptCompletionInfo'; -import StructuredPropertyInput from '../../../components/styled/StructuredProperty/StructuredPropertyInput'; + +import StructuredPropertyInput from '@app/entity/shared/components/styled/StructuredProperty/StructuredPropertyInput'; +import CompletedPromptAuditStamp from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/CompletedPromptAuditStamp'; +import useStructuredPropertyPrompt from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/useStructuredPropertyPrompt'; +import usePromptCompletionInfo from '@app/entity/shared/entityForm/prompts/usePromptCompletionInfo'; +import { applyOpacity } from '@app/shared/styleUtils'; + +import { FormPrompt, SchemaField, SubmitFormPromptInput } from '@types'; const PromptWrapper = styled.div<{ displayBulkStyles?: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/SelectedEntity.tsx b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/SelectedEntity.tsx index d5ed2e9693..b1ee8ce859 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/SelectedEntity.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/SelectedEntity.tsx @@ -1,9 +1,11 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Entity } from '../../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import EntityIcon from '../../../../components/styled/EntityIcon'; + +import EntityIcon from '@app/entity/shared/components/styled/EntityIcon'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity } from '@types'; const SelectedEntityWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/StructuredPropertySearchSelectUrnInput.tsx b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/StructuredPropertySearchSelectUrnInput.tsx index 6cda6de703..51660c19a0 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/StructuredPropertySearchSelectUrnInput.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/StructuredPropertySearchSelectUrnInput.tsx @@ -1,6 +1,8 @@ -import { SearchSelectUrnInput } from '@src/app/entityV2/shared/components/styled/search/SearchSelectUrnInput'; import React, { useMemo } from 'react'; -import { EntityType, PropertyCardinality, StructuredPropertyEntity } from '../../../../../../../types.generated'; + +import { SearchSelectUrnInput } from '@src/app/entityV2/shared/components/styled/search/SearchSelectUrnInput'; + +import { EntityType, PropertyCardinality, StructuredPropertyEntity } from '@types'; interface StructuredPropertySearchSelectUrnInputProps { structuredProperty: StructuredPropertyEntity; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/UrnInput.tsx b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/UrnInput.tsx index 62ccc9ee2e..14cb483ad3 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/UrnInput.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/UrnInput.tsx @@ -2,9 +2,11 @@ import { LoadingOutlined } from '@ant-design/icons'; import { Select } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { StructuredPropertyEntity } from '../../../../../../../types.generated'; -import SelectedEntity from './SelectedEntity'; -import useUrnInput from './useUrnInput'; + +import SelectedEntity from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/SelectedEntity'; +import useUrnInput from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/useUrnInput'; + +import { StructuredPropertyEntity } from '@types'; const EntitySelect = styled(Select)` width: 75%; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/useUrnInput.tsx b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/useUrnInput.tsx index fba2ef933c..cb3a6210ac 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/useUrnInput.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/useUrnInput.tsx @@ -1,14 +1,16 @@ import { Tag } from 'antd'; +import { isEqual } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import styled from 'styled-components'; -import { isEqual } from 'lodash'; -import { Entity, PropertyCardinality, StructuredPropertyEntity } from '../../../../../../../types.generated'; -import { useGetSearchResultsForMultipleLazyQuery } from '../../../../../../../graphql/search.generated'; -import usePrevious from '../../../../../../shared/usePrevious'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { useEntityData } from '../../../../EntityContext'; -import { getInitialEntitiesForUrnPrompt } from '../utils'; -import SelectedEntity from './SelectedEntity'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import SelectedEntity from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/UrnInput/SelectedEntity'; +import { getInitialEntitiesForUrnPrompt } from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/utils'; +import usePrevious from '@app/shared/usePrevious'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsForMultipleLazyQuery } from '@graphql/search.generated'; +import { Entity, PropertyCardinality, StructuredPropertyEntity } from '@types'; const StyleTag = styled(Tag)` margin: 2px; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/ValueDescription.tsx b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/ValueDescription.tsx index 716bd74fe6..f1b7606de9 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/ValueDescription.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/ValueDescription.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY_V2 } from '../../../constants'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; const DescriptionText = styled.span` color: ${ANTD_GRAY_V2[8]}; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/useStructuredPropertyPrompt.ts b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/useStructuredPropertyPrompt.ts index 6ad4ab15e0..5b8ba89b41 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/useStructuredPropertyPrompt.ts +++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/useStructuredPropertyPrompt.ts @@ -1,12 +1,14 @@ import { useEffect, useMemo } from 'react'; -import { useEntityContext } from '../../../EntityContext'; -import { FormPrompt, FormPromptType, SchemaField, SubmitFormPromptInput } from '../../../../../../types.generated'; -import { getInitialValues } from './utils'; -import usePrevious from '../../../../../shared/usePrevious'; -import { useGetEntityWithSchema } from '../../../tabs/Dataset/Schema/useGetEntitySchema'; -import { FormView, useEntityFormContext } from '../../EntityFormContext'; -import { SCHEMA_FIELD_PROMPT_TYPES } from '../../constants'; -import { useEditStructuredProperty } from '../../../components/styled/StructuredProperty/useEditStructuredProperty'; + +import { useEntityContext } from '@app/entity/shared/EntityContext'; +import { useEditStructuredProperty } from '@app/entity/shared/components/styled/StructuredProperty/useEditStructuredProperty'; +import { FormView, useEntityFormContext } from '@app/entity/shared/entityForm/EntityFormContext'; +import { SCHEMA_FIELD_PROMPT_TYPES } from '@app/entity/shared/entityForm/constants'; +import { getInitialValues } from '@app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/utils'; +import { useGetEntityWithSchema } from '@app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema'; +import usePrevious from '@app/shared/usePrevious'; + +import { FormPrompt, FormPromptType, SchemaField, SubmitFormPromptInput } from '@types'; interface Props { prompt: FormPrompt; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/utils.ts b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/utils.ts index 9840f9a2cb..9c092063b2 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/utils.ts +++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/StructuredPropertyPrompt/utils.ts @@ -1,12 +1,7 @@ -import { getStructuredPropertyValue } from '../../../utils'; -import { GenericEntityProperties } from '../../../types'; -import { - Entity, - FormPrompt, - PropertyValue, - SchemaField, - StructuredPropertiesEntry, -} from '../../../../../../types.generated'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getStructuredPropertyValue } from '@app/entity/shared/utils'; + +import { Entity, FormPrompt, PropertyValue, SchemaField, StructuredPropertiesEntry } from '@types'; export function getInitialValues(prompt: FormPrompt, entityData: GenericEntityProperties | null, field?: SchemaField) { const structuredProperty = prompt.structuredPropertyParams?.structuredProperty; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/VerificationPrompt.tsx b/datahub-web-react/src/app/entity/shared/entityForm/prompts/VerificationPrompt.tsx index 56b3d9c73e..316db2d02f 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/VerificationPrompt.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/VerificationPrompt.tsx @@ -1,9 +1,11 @@ +import { Button, Divider, message } from 'antd'; import React, { useEffect, useRef } from 'react'; import styled from 'styled-components'; -import { Button, Divider, message } from 'antd'; -import { useVerifyFormMutation } from '../../../../../graphql/form.generated'; -import { useEntityContext, useMutationUrn } from '../../EntityContext'; -import { PromptWrapper } from './Prompt'; + +import { useEntityContext, useMutationUrn } from '@app/entity/shared/EntityContext'; +import { PromptWrapper } from '@app/entity/shared/entityForm/prompts/Prompt'; + +import { useVerifyFormMutation } from '@graphql/form.generated'; const ContentWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/prompts/usePromptCompletionInfo.ts b/datahub-web-react/src/app/entity/shared/entityForm/prompts/usePromptCompletionInfo.ts index 257717082e..b5ca70ea95 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/prompts/usePromptCompletionInfo.ts +++ b/datahub-web-react/src/app/entity/shared/entityForm/prompts/usePromptCompletionInfo.ts @@ -1,8 +1,7 @@ import { useMemo } from 'react'; -import { EntityType, FormPrompt, SchemaField } from '../../../../../types.generated'; -import { useUserContext } from '../../../../context/useUserContext'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { useEntityData } from '../../EntityContext'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData } from '@app/entity/shared/EntityContext'; import { findCompletedFieldPrompt, findPromptAssociation, @@ -10,8 +9,11 @@ import { getIncompletePrompts, isFieldPromptComplete, isPromptComplete, -} from '../../containers/profile/sidebar/FormInfo/utils'; -import { getTimeFromNow } from '../../../../shared/time/timeUtils'; +} from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; +import { getTimeFromNow } from '@app/shared/time/timeUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, FormPrompt, SchemaField } from '@types'; interface CompletionProps { prompt: FormPrompt; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/DropdownHeader.tsx b/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/DropdownHeader.tsx index 0d09cce4a9..8814ea79f9 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/DropdownHeader.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/DropdownHeader.tsx @@ -1,14 +1,17 @@ import Icon from '@ant-design/icons/lib/components/Icon'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import GreenCircleIcon from '../../../../../images/greenCircleTwoTone.svg?react'; -import { SchemaField } from '../../../../../types.generated'; -import translateFieldPath from '../../../dataset/profile/schema/utils/translateFieldPath'; -import { getNumPromptsCompletedForField } from '../../containers/profile/sidebar/FormInfo/utils'; -import { useEntityData } from '../../EntityContext'; -import { ANTD_GRAY_V2 } from '../../constants'; -import { pluralize } from '../../../../shared/textUtil'; -import { useEntityFormContext } from '../EntityFormContext'; + +import translateFieldPath from '@app/entity/dataset/profile/schema/utils/translateFieldPath'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { getNumPromptsCompletedForField } from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; +import { useEntityFormContext } from '@app/entity/shared/entityForm/EntityFormContext'; +import { pluralize } from '@app/shared/textUtil'; + +import { SchemaField } from '@types'; + +import GreenCircleIcon from '@images/greenCircleTwoTone.svg?react'; const HeaderWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldDropdown.tsx b/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldDropdown.tsx index bdb6b99dc1..e54ffa7d8f 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldDropdown.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldDropdown.tsx @@ -1,9 +1,11 @@ +import { Collapse } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Collapse } from 'antd'; -import { FormPrompt, SchemaField } from '../../../../../types.generated'; -import Prompt from '../prompts/Prompt'; -import DropdownHeader from './DropdownHeader'; + +import Prompt from '@app/entity/shared/entityForm/prompts/Prompt'; +import DropdownHeader from '@app/entity/shared/entityForm/schemaFieldPrompts/DropdownHeader'; + +import { FormPrompt, SchemaField } from '@types'; const StyledCollapse = styled(Collapse)` margin-bottom: 16px; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldPrompts.tsx b/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldPrompts.tsx index 0a39d2ef8a..981eb2fdad 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldPrompts.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldPrompts.tsx @@ -1,10 +1,12 @@ +import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Divider } from 'antd'; -import { FormPrompt, SchemaField } from '../../../../../types.generated'; -import { useGetEntityWithSchema } from '../../tabs/Dataset/Schema/useGetEntitySchema'; -import SchemaFieldDropdown from './SchemaFieldDropdown'; -import VirtualScrollChild from '../../../../shared/VirtualScrollChild'; + +import SchemaFieldDropdown from '@app/entity/shared/entityForm/schemaFieldPrompts/SchemaFieldDropdown'; +import { useGetEntityWithSchema } from '@app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema'; +import VirtualScrollChild from '@app/shared/VirtualScrollChild'; + +import { FormPrompt, SchemaField } from '@types'; const FieldPromptsTitle = styled.div` margin-bottom: 16px; diff --git a/datahub-web-react/src/app/entity/shared/entityForm/useShouldShowVerificationPrompt.ts b/datahub-web-react/src/app/entity/shared/entityForm/useShouldShowVerificationPrompt.ts index 8987848dc1..47af14dcfe 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/useShouldShowVerificationPrompt.ts +++ b/datahub-web-react/src/app/entity/shared/entityForm/useShouldShowVerificationPrompt.ts @@ -1,7 +1,8 @@ -import { FormType, FormVerificationAssociation } from '../../../../types.generated'; -import { useEntityData } from '../EntityContext'; -import useGetPromptInfo from '../containers/profile/sidebar/FormInfo/useGetPromptInfo'; -import { getFormAssociation, getFormVerification } from '../containers/profile/sidebar/FormInfo/utils'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import useGetPromptInfo from '@app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo'; +import { getFormAssociation, getFormVerification } from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; + +import { FormType, FormVerificationAssociation } from '@types'; interface ShowVerificationPromptProps { formType?: FormType; diff --git a/datahub-web-react/src/app/entity/shared/propagation/PropagationDetails.tsx b/datahub-web-react/src/app/entity/shared/propagation/PropagationDetails.tsx index b5629d806f..56e4404d01 100644 --- a/datahub-web-react/src/app/entity/shared/propagation/PropagationDetails.tsx +++ b/datahub-web-react/src/app/entity/shared/propagation/PropagationDetails.tsx @@ -1,10 +1,12 @@ +import { Popover } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Popover } from 'antd'; -import { StringMapEntry } from '../../../../types.generated'; -import PropagationEntityLink from './PropagationEntityLink'; -import { usePropagationDetails } from './utils'; -import { PropagateThunderbolt, PropagateThunderboltFilled } from './PropagationIcon'; + +import PropagationEntityLink from '@app/entity/shared/propagation/PropagationEntityLink'; +import { PropagateThunderbolt, PropagateThunderboltFilled } from '@app/entity/shared/propagation/PropagationIcon'; +import { usePropagationDetails } from '@app/entity/shared/propagation/utils'; + +import { StringMapEntry } from '@types'; const PopoverWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/propagation/PropagationEntityLink.tsx b/datahub-web-react/src/app/entity/shared/propagation/PropagationEntityLink.tsx index 8c1285dd58..2f5401bf23 100644 --- a/datahub-web-react/src/app/entity/shared/propagation/PropagationEntityLink.tsx +++ b/datahub-web-react/src/app/entity/shared/propagation/PropagationEntityLink.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import styled from 'styled-components'; import { Link } from 'react-router-dom'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { Entity, EntityType, SchemaFieldEntity } from '../../../../types.generated'; -import { GenericEntityProperties } from '../types'; +import styled from 'styled-components'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, EntityType, SchemaFieldEntity } from '@types'; const PreviewImage = styled.img<{ size: number }>` height: ${(props) => props.size}px; diff --git a/datahub-web-react/src/app/entity/shared/propagation/PropagationIcon.tsx b/datahub-web-react/src/app/entity/shared/propagation/PropagationIcon.tsx index 01b4570c4c..5c57d4a2d1 100644 --- a/datahub-web-react/src/app/entity/shared/propagation/PropagationIcon.tsx +++ b/datahub-web-react/src/app/entity/shared/propagation/PropagationIcon.tsx @@ -1,6 +1,7 @@ -import styled from 'styled-components'; import { ThunderboltFilled } from '@ant-design/icons'; -import { REDESIGN_COLORS } from '../constants'; +import styled from 'styled-components'; + +import { REDESIGN_COLORS } from '@app/entity/shared/constants'; export const PropagateThunderbolt = styled(ThunderboltFilled)` && { diff --git a/datahub-web-react/src/app/entity/shared/propagation/utils.ts b/datahub-web-react/src/app/entity/shared/propagation/utils.ts index d8b4d4d931..e16460672a 100644 --- a/datahub-web-react/src/app/entity/shared/propagation/utils.ts +++ b/datahub-web-react/src/app/entity/shared/propagation/utils.ts @@ -1,5 +1,6 @@ -import { StringMapEntry } from '../../../../types.generated'; -import { useGetEntities } from '../useGetEntities'; +import { useGetEntities } from '@app/entity/shared/useGetEntities'; + +import { StringMapEntry } from '@types'; export function usePropagationDetails(sourceDetail?: StringMapEntry[] | null) { const isPropagated = !!sourceDetail?.find((mapEntry) => mapEntry.key === 'propagated' && mapEntry.value === 'true'); diff --git a/datahub-web-react/src/app/entity/shared/siblingUtils.ts b/datahub-web-react/src/app/entity/shared/siblingUtils.ts index 3b202cfb0a..3541337585 100644 --- a/datahub-web-react/src/app/entity/shared/siblingUtils.ts +++ b/datahub-web-react/src/app/entity/shared/siblingUtils.ts @@ -1,8 +1,13 @@ -import { useEntityData } from '@app/entity/shared/EntityContext'; import merge from 'deepmerge'; import { keyBy, unionBy, values } from 'lodash'; import * as QueryString from 'query-string'; import { useLocation } from 'react-router-dom'; + +import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig'; + import { Dataset, Entity, @@ -10,13 +15,10 @@ import { HealthStatus, HealthStatusType, Maybe, - ScrollResults, Operation, + ScrollResults, SiblingProperties, -} from '../../../types.generated'; -import { GenericEntityProperties } from './types'; -import { useIsShowSeparateSiblingsEnabled } from '../../useAppConfig'; -import { downgradeV2FieldPath } from '../dataset/profile/schema/utils/utils'; +} from '@types'; export function stripSiblingsFromEntity(entity: any) { return { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessManagement.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessManagement.tsx index f5789447d9..8416e3ff90 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessManagement.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessManagement.tsx @@ -1,12 +1,14 @@ -import React from 'react'; -import styled from 'styled-components'; +import { LoadingOutlined } from '@ant-design/icons'; import { Button, Table } from 'antd'; import { SpinProps } from 'antd/es/spin'; -import { LoadingOutlined } from '@ant-design/icons'; -import { useEntityData } from '../../../EntityContext'; -import { useGetExternalRolesQuery } from '../../../../../../graphql/dataset.generated'; -import { handleAccessRoles } from './utils'; -import AccessManagerDescription from './AccessManagerDescription'; +import React from 'react'; +import styled from 'styled-components'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import AccessManagerDescription from '@app/entity/shared/tabs/Dataset/AccessManagement/AccessManagerDescription'; +import { handleAccessRoles } from '@app/entity/shared/tabs/Dataset/AccessManagement/utils'; + +import { useGetExternalRolesQuery } from '@graphql/dataset.generated'; const StyledTable = styled(Table)` overflow: inherit; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx index c87a499e34..06b55b67c6 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx @@ -1,6 +1,6 @@ +import { Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; export type Props = { description: any; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts index 51003100d7..4dfb6b1017 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts @@ -1,5 +1,6 @@ -import { handleAccessRoles } from '../utils'; -import { GetExternalRolesQuery } from '../../../../../../../graphql/dataset.generated'; +import { handleAccessRoles } from '@app/entity/shared/tabs/Dataset/AccessManagement/utils'; + +import { GetExternalRolesQuery } from '@graphql/dataset.generated'; describe('handleAccessRoles', () => { it('should properly map the externalroles', () => { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/GovernanceTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/GovernanceTab.tsx index 213716ed50..5a011b4029 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/GovernanceTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/GovernanceTab.tsx @@ -1,13 +1,14 @@ -import React, { useEffect } from 'react'; +import { FileDoneOutlined } from '@ant-design/icons'; import { Button } from 'antd'; +import React, { useEffect } from 'react'; import { useHistory, useLocation } from 'react-router'; import styled from 'styled-components'; -import { FileDoneOutlined } from '@ant-design/icons'; -import { useEntityData } from '../../../EntityContext'; -import { TestResults } from './TestResults'; -import TabToolbar from '../../../components/styled/TabToolbar'; -import { ANTD_GRAY } from '../../../constants'; -import { useGetValidationsTab } from '../Validations/useGetValidationsTab'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { TestResults } from '@app/entity/shared/tabs/Dataset/Governance/TestResults'; +import { useGetValidationsTab } from '@app/entity/shared/tabs/Dataset/Validations/useGetValidationsTab'; const TabTitle = styled.span` margin-left: 4px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResults.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResults.tsx index fd1ce5fadc..f29d5a77aa 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResults.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResults.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import { TestResult } from '../../../../../../types.generated'; -import { TestResultsList } from './TestResultsList'; -import { TestResultsSummary } from './TestResultsSummary'; + +import { TestResultsList } from '@app/entity/shared/tabs/Dataset/Governance/TestResultsList'; +import { TestResultsSummary } from '@app/entity/shared/tabs/Dataset/Governance/TestResultsSummary'; + +import { TestResult } from '@types'; type Props = { passing: Array; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsList.tsx index ee52c15c9c..2d95d5dabe 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsList.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsList.tsx @@ -1,10 +1,12 @@ import { CopyOutlined, StopOutlined } from '@ant-design/icons'; import { Button, Divider, Empty, Tag, Tooltip, Typography } from 'antd'; -import styled from 'styled-components'; import React from 'react'; -import { TestResult } from '../../../../../../types.generated'; -import { StyledTable } from '../../../components/styled/StyledTable'; -import { getResultColor, getResultIcon, getResultText } from './testUtils'; +import styled from 'styled-components'; + +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import { getResultColor, getResultIcon, getResultText } from '@app/entity/shared/tabs/Dataset/Governance/testUtils'; + +import { TestResult } from '@types'; const ResultContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsSummary.tsx index 9e9addcc00..4676618abc 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsSummary.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsSummary.tsx @@ -2,7 +2,8 @@ import { CheckCircleFilled, CloseCircleFilled, StopOutlined } from '@ant-design/ import { Tooltip, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const SummaryHeader = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/testUtils.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/testUtils.tsx index 8a0ef59c81..0da8da7327 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/testUtils.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/testUtils.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons'; -import { TestResultType } from '../../../../../../types.generated'; +import React from 'react'; + +import { TestResultType } from '@types'; /** * Returns the display text assoociated with an Test Result Type diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/CopyQuery.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/CopyQuery.tsx index 91f9680379..76d3b4ad4f 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/CopyQuery.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/CopyQuery.tsx @@ -1,6 +1,6 @@ -import React, { useState } from 'react'; import { CheckOutlined, CopyOutlined } from '@ant-design/icons'; import { Button, Tooltip } from 'antd'; +import React, { useState } from 'react'; export type Props = { query: string; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/EmptyQueries.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/EmptyQueries.tsx index e251be5385..d2abc190b3 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/EmptyQueries.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/EmptyQueries.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { PlusOutlined } from '@ant-design/icons'; import { Button } from 'antd'; -import { EmptyTab } from '../../../components/styled/EmptyTab'; +import React from 'react'; + +import { EmptyTab } from '@app/entity/shared/components/styled/EmptyTab'; export type Props = { message?: string; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesList.tsx index e5519a7d32..59468845e3 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesList.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesList.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import Query from './Query'; -import { Query as QueryType } from './types'; + +import Query from '@app/entity/shared/tabs/Dataset/Queries/Query'; +import { Query as QueryType } from '@app/entity/shared/tabs/Dataset/Queries/types'; const List = styled.div` margin-bottom: 28px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesListSection.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesListSection.tsx index 742cb3ee50..e3a199b762 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesListSection.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesListSection.tsx @@ -1,12 +1,13 @@ -import React, { useEffect, useRef, useState } from 'react'; -import { Pagination, Tooltip, Typography } from 'antd'; import { InfoCircleOutlined } from '@ant-design/icons'; +import { Pagination, Tooltip, Typography } from 'antd'; +import React, { useEffect, useRef, useState } from 'react'; import styled from 'styled-components'; -import QueriesList from './QueriesList'; -import { Query } from './types'; -import { DEFAULT_PAGE_SIZE } from './utils/constants'; -import { getQueriesForPage } from './utils/getCurrentPage'; -import { ANTD_GRAY } from '../../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import QueriesList from '@app/entity/shared/tabs/Dataset/Queries/QueriesList'; +import { Query } from '@app/entity/shared/tabs/Dataset/Queries/types'; +import { DEFAULT_PAGE_SIZE } from '@app/entity/shared/tabs/Dataset/Queries/utils/constants'; +import { getQueriesForPage } from '@app/entity/shared/tabs/Dataset/Queries/utils/getCurrentPage'; const QueriesTitleSection = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTab.tsx index 94af5d8f48..b21ab0bf17 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTab.tsx @@ -1,23 +1,29 @@ -import styled from 'styled-components'; -import React, { useState } from 'react'; import { debounce } from 'lodash'; -import { useListQueriesQuery } from '../../../../../../graphql/query.generated'; -import { GetDatasetQuery, useGetRecentQueriesQuery } from '../../../../../../graphql/dataset.generated'; -import { useBaseEntity } from '../../../EntityContext'; -import getTopNQueries from './utils/getTopNQueries'; -import { useAppConfig } from '../../../../../useAppConfig'; -import QueryBuilderModal from './QueryBuilderModal'; -import EmptyQueries from './EmptyQueries'; -import { addQueryToListQueriesCache, removeQueryFromListQueriesCache, updateListQueriesCache } from './cacheUtils'; +import React, { useState } from 'react'; +import styled from 'styled-components'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import EmptyQueries from '@app/entity/shared/tabs/Dataset/Queries/EmptyQueries'; +import QueriesListSection from '@app/entity/shared/tabs/Dataset/Queries/QueriesListSection'; +import QueriesTabToolbar from '@app/entity/shared/tabs/Dataset/Queries/QueriesTabToolbar'; +import QueryBuilderModal from '@app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal'; +import { + addQueryToListQueriesCache, + removeQueryFromListQueriesCache, + updateListQueriesCache, +} from '@app/entity/shared/tabs/Dataset/Queries/cacheUtils'; import { DEFAULT_MAX_RECENT_QUERIES, HALF_SECOND_IN_MS, MAX_QUERIES_COUNT, MAX_ROWS_BEFORE_DEBOUNCE, -} from './utils/constants'; -import { filterQueries } from './utils/filterQueries'; -import QueriesTabToolbar from './QueriesTabToolbar'; -import QueriesListSection from './QueriesListSection'; +} from '@app/entity/shared/tabs/Dataset/Queries/utils/constants'; +import { filterQueries } from '@app/entity/shared/tabs/Dataset/Queries/utils/filterQueries'; +import getTopNQueries from '@app/entity/shared/tabs/Dataset/Queries/utils/getTopNQueries'; +import { useAppConfig } from '@app/useAppConfig'; + +import { GetDatasetQuery, useGetRecentQueriesQuery } from '@graphql/dataset.generated'; +import { useListQueriesQuery } from '@graphql/query.generated'; const Content = styled.div` padding: 24px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTabToolbar.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTabToolbar.tsx index 7dfe3c2289..5ef4c8486e 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTabToolbar.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTabToolbar.tsx @@ -1,10 +1,11 @@ +import { PlusOutlined } from '@ant-design/icons'; import { Icon } from '@components'; import { Button, Input, Tooltip } from 'antd'; -import { PlusOutlined } from '@ant-design/icons'; -import styled from 'styled-components'; import React from 'react'; -import TabToolbar from '../../../components/styled/TabToolbar'; -import { ADD_UNAUTHORIZED_MESSAGE } from './utils/constants'; +import styled from 'styled-components'; + +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { ADD_UNAUTHORIZED_MESSAGE } from '@app/entity/shared/tabs/Dataset/Queries/utils/constants'; const StyledInput = styled(Input)` border-radius: 70px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/Query.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/Query.tsx index ccbf95a04a..d83d3940f4 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/Query.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/Query.tsx @@ -1,7 +1,8 @@ import React, { useState } from 'react'; -import QueryModal from './QueryModal'; -import QueryBuilderModal from './QueryBuilderModal'; -import QueryCard from './QueryCard'; + +import QueryBuilderModal from '@app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal'; +import QueryCard from '@app/entity/shared/tabs/Dataset/Queries/QueryCard'; +import QueryModal from '@app/entity/shared/tabs/Dataset/Queries/QueryModal'; export type Props = { urn?: string; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx index 8e65c6b5ad..f2536e6986 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx @@ -1,10 +1,11 @@ -import React from 'react'; import Editor from '@monaco-editor/react'; -import styled from 'styled-components'; import { Form, Input, Typography } from 'antd'; -import { ANTD_GRAY } from '../../../constants'; -import { QueryBuilderState } from './types'; -import { Editor as MarkdownEditor } from '../../Documentation/components/editor/Editor'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { QueryBuilderState } from '@app/entity/shared/tabs/Dataset/Queries/types'; +import { Editor as MarkdownEditor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; const EditorWrapper = styled.div` border: 1px solid ${ANTD_GRAY[5]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx index 063408fbf5..b3ee589ee9 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx @@ -1,12 +1,14 @@ +import { Button, Modal, Typography, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Button, message, Modal, Typography } from 'antd'; -import { useCreateQueryMutation, useUpdateQueryMutation } from '../../../../../../graphql/query.generated'; -import { QueryLanguage } from '../../../../../../types.generated'; -import { QueryBuilderState } from './types'; -import ClickOutside from '../../../../../shared/ClickOutside'; -import QueryBuilderForm from './QueryBuilderForm'; -import analytics, { EventType } from '../../../../../analytics'; + +import analytics, { EventType } from '@app/analytics'; +import QueryBuilderForm from '@app/entity/shared/tabs/Dataset/Queries/QueryBuilderForm'; +import { QueryBuilderState } from '@app/entity/shared/tabs/Dataset/Queries/types'; +import ClickOutside from '@app/shared/ClickOutside'; + +import { useCreateQueryMutation, useUpdateQueryMutation } from '@graphql/query.generated'; +import { QueryLanguage } from '@types'; const StyledModal = styled(Modal)` top: 4vh; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCard.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCard.tsx index a60f473716..3ed4ebf13d 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCard.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCard.tsx @@ -1,9 +1,10 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; -import QueryCardHeader from './QueryCardHeader'; -import QueryCardQuery from './QueryCardQuery'; -import QueryCardDetails from './QueryCardDetails'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import QueryCardDetails from '@app/entity/shared/tabs/Dataset/Queries/QueryCardDetails'; +import QueryCardHeader from '@app/entity/shared/tabs/Dataset/Queries/QueryCardHeader'; +import QueryCardQuery from '@app/entity/shared/tabs/Dataset/Queries/QueryCardQuery'; const Card = styled.div` border: 1px solid ${ANTD_GRAY[5]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetails.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetails.tsx index 90a7a9ba40..d4d492433c 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetails.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetails.tsx @@ -1,11 +1,12 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { ANTD_GRAY } from '../../../constants'; -import { toLocalDateString } from '../../../../../shared/time/timeUtils'; -import NoMarkdownViewer from '../../../components/styled/StripMarkdownText'; -import QueryCardDetailsMenu from './QueryCardDetailsMenu'; -import QueryCardEditButton from './QueryCardEditButton'; + +import NoMarkdownViewer from '@app/entity/shared/components/styled/StripMarkdownText'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import QueryCardDetailsMenu from '@app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu'; +import QueryCardEditButton from '@app/entity/shared/tabs/Dataset/Queries/QueryCardEditButton'; +import { toLocalDateString } from '@app/shared/time/timeUtils'; const Title = styled(Typography.Title)<{ secondary?: boolean }>` && { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx index cff45f153c..64280a3451 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx @@ -1,10 +1,12 @@ +import { DeleteOutlined, MoreOutlined } from '@ant-design/icons'; +import { Dropdown, Modal, message } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { DeleteOutlined, MoreOutlined } from '@ant-design/icons'; -import { Dropdown, message, Modal } from 'antd'; -import { useDeleteQueryMutation } from '../../../../../../graphql/query.generated'; -import handleGraphQLError from '../../../../../shared/handleGraphQLError'; -import { MenuItemStyle } from '../../../../view/menu/item/styledComponent'; + +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; +import handleGraphQLError from '@app/shared/handleGraphQLError'; + +import { useDeleteQueryMutation } from '@graphql/query.generated'; const StyledMoreOutlined = styled(MoreOutlined)` font-size: 14px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx index d0ebf23a40..79451ec9eb 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx @@ -1,7 +1,7 @@ -import React from 'react'; -import styled from 'styled-components'; import { EditOutlined } from '@ant-design/icons'; import { Button } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; const EditQueryActionButton = styled(Button)` && { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardHeader.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardHeader.tsx index d605830b70..4e8ee364b6 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardHeader.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardHeader.tsx @@ -1,8 +1,9 @@ -import React from 'react'; -import styled from 'styled-components'; import { ExpandOutlined } from '@ant-design/icons'; import { Button } from 'antd'; -import CopyQuery from './CopyQuery'; +import React from 'react'; +import styled from 'styled-components'; + +import CopyQuery from '@app/entity/shared/tabs/Dataset/Queries/CopyQuery'; const Header = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardQuery.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardQuery.tsx index f7a61993f8..e89846dbd3 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardQuery.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardQuery.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import styled from 'styled-components'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; -import { ANTD_GRAY } from '../../../constants'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Statement = styled.div<{ fullHeight?: boolean }>` background-color: ${ANTD_GRAY[2]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryModal.tsx index 32ac91071a..ae31c7d165 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryModal.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryModal.tsx @@ -1,10 +1,11 @@ -import React from 'react'; import { Button, Modal, Typography } from 'antd'; +import React from 'react'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; import styled from 'styled-components'; -import CopyQuery from './CopyQuery'; -import { ANTD_GRAY } from '../../../constants'; -import { Editor as MarkdownEditor } from '../../Documentation/components/editor/Editor'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import CopyQuery from '@app/entity/shared/tabs/Dataset/Queries/CopyQuery'; +import { Editor as MarkdownEditor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; const StyledModal = styled(Modal)` top: 4vh; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/cacheUtils.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/cacheUtils.ts index 29fbfa7bc6..d654dac7af 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/cacheUtils.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/cacheUtils.ts @@ -1,5 +1,5 @@ -import { ListQueriesDocument, ListQueriesQuery } from '../../../../../../graphql/query.generated'; -import { QueryEntity } from '../../../../../../types.generated'; +import { ListQueriesDocument, ListQueriesQuery } from '@graphql/query.generated'; +import { QueryEntity } from '@types'; export const removeQueryFromListQueriesCache = (urn, client, page, pageSize, datasetUrn) => { const currData: ListQueriesQuery | null = client.readQuery({ diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/filterQueries.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/filterQueries.ts index fb97c8235c..6f33d48885 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/filterQueries.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/filterQueries.ts @@ -1,4 +1,4 @@ -import { Query } from '../types'; +import { Query } from '@app/entity/shared/tabs/Dataset/Queries/types'; /** * Filter queries by a search string. Compares name, description, and query statement. diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts index db3c11e28d..3cda40bc6d 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts @@ -1,4 +1,4 @@ -import { UsageAggregation, Maybe } from '../../../../../../../types.generated'; +import { Maybe, UsageAggregation } from '@types'; type RecentQuery = { query: string; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.tsx index 84ed707753..43a6e87aea 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.tsx @@ -1,23 +1,22 @@ +import { ExclamationCircleFilled, LoadingOutlined, PlusOutlined } from '@ant-design/icons'; import { Icon } from '@components'; import { Button, Card, Divider, Empty, Input, Modal, Pagination } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { ExclamationCircleFilled, LoadingOutlined, PlusOutlined } from '@ant-design/icons'; -import { useBaseEntity } from '../../../EntityContext'; -import './RelationshipsTab.less'; -import { EntityType, ErModelRelationship } from '../../../../../../types.generated'; -import { useGetSearchResultsQuery } from '../../../../../../graphql/search.generated'; -import { - GetDatasetQuery, - useGetDatasetLazyQuery, - useGetDatasetSchemaLazyQuery, -} from '../../../../../../graphql/dataset.generated'; -import { useGetEntityWithSchema } from '../Schema/useGetEntitySchema'; -import closeIcon from '../../../../../../images/close_dark.svg'; -import { CreateERModelRelationModal } from '../../../components/styled/ERModelRelationship/CreateERModelRelationModal'; -import { ERModelRelationPreview } from '../../../components/styled/ERModelRelationship/ERModelRelationPreview'; -import { SearchSelectModal } from '../../../components/styled/search/SearchSelectModal'; -import { ANTD_GRAY } from '../../../constants'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { CreateERModelRelationModal } from '@app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal'; +import { ERModelRelationPreview } from '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview'; +import { SearchSelectModal } from '@app/entity/shared/components/styled/search/SearchSelectModal'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import '@app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.less'; +import { useGetEntityWithSchema } from '@app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema'; + +import { GetDatasetQuery, useGetDatasetLazyQuery, useGetDatasetSchemaLazyQuery } from '@graphql/dataset.generated'; +import { useGetSearchResultsQuery } from '@graphql/search.generated'; +import { EntityType, ErModelRelationship } from '@types'; + +import closeIcon from '@images/close_dark.svg'; const StyledPagination = styled(Pagination)` margin: 0px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaContext.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaContext.tsx index 5470e89527..3fcc72f379 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaContext.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaContext.tsx @@ -1,5 +1,6 @@ import React, { useContext } from 'react'; -import { SchemaContextType } from '../../../types'; + +import { SchemaContextType } from '@app/entity/shared/types'; const SchemaContext = React.createContext({ refetch: () => Promise.resolve({}), diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTab.tsx index 52c141282c..55fd065d2a 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTab.tsx @@ -1,27 +1,29 @@ +import { LoadingOutlined } from '@ant-design/icons'; import { Empty } from 'antd'; import React, { useEffect, useMemo, useState } from 'react'; -import styled from 'styled-components'; -import { LoadingOutlined } from '@ant-design/icons'; import { useLocation } from 'react-router'; -import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated'; -import { useGetSchemaBlameQuery, useGetSchemaVersionListQuery } from '../../../../../../graphql/schemaBlame.generated'; -import SchemaEditableContext from '../../../../../shared/SchemaEditableContext'; -import SchemaHeader from '../../../../dataset/profile/schema/components/SchemaHeader'; -import SchemaRawView from '../../../../dataset/profile/schema/components/SchemaRawView'; -import { KEY_SCHEMA_PREFIX } from '../../../../dataset/profile/schema/utils/constants'; -import { groupByFieldPath } from '../../../../dataset/profile/schema/utils/utils'; -import { ANTD_GRAY } from '../../../constants'; -import { useBaseEntity } from '../../../EntityContext'; -import { SchemaFieldBlame, SemanticVersionStruct } from '../../../../../../types.generated'; -import SchemaTable from './SchemaTable'; -import useGetSemanticVersionFromUrlParams from './utils/useGetSemanticVersionFromUrlParams'; -import { useGetVersionedDatasetQuery } from '../../../../../../graphql/versionedDataset.generated'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { filterSchemaRows } from './utils/filterSchemaRows'; -import getSchemaFilterFromQueryString from './utils/getSchemaFilterFromQueryString'; -import useUpdateSchemaFilterQueryString from './utils/updateSchemaFilterQueryString'; -import { useGetEntityWithSchema } from './useGetEntitySchema'; -import SchemaContext from './SchemaContext'; +import styled from 'styled-components'; + +import SchemaHeader from '@app/entity/dataset/profile/schema/components/SchemaHeader'; +import SchemaRawView from '@app/entity/dataset/profile/schema/components/SchemaRawView'; +import { KEY_SCHEMA_PREFIX } from '@app/entity/dataset/profile/schema/utils/constants'; +import { groupByFieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import SchemaContext from '@app/entity/shared/tabs/Dataset/Schema/SchemaContext'; +import SchemaTable from '@app/entity/shared/tabs/Dataset/Schema/SchemaTable'; +import { useGetEntityWithSchema } from '@app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema'; +import { filterSchemaRows } from '@app/entity/shared/tabs/Dataset/Schema/utils/filterSchemaRows'; +import getSchemaFilterFromQueryString from '@app/entity/shared/tabs/Dataset/Schema/utils/getSchemaFilterFromQueryString'; +import useUpdateSchemaFilterQueryString from '@app/entity/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString'; +import useGetSemanticVersionFromUrlParams from '@app/entity/shared/tabs/Dataset/Schema/utils/useGetSemanticVersionFromUrlParams'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { useGetSchemaBlameQuery, useGetSchemaVersionListQuery } from '@graphql/schemaBlame.generated'; +import { useGetVersionedDatasetQuery } from '@graphql/versionedDataset.generated'; +import { SchemaFieldBlame, SemanticVersionStruct } from '@types'; const NoSchema = styled(Empty)` color: ${ANTD_GRAY[6]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx index e287e3675c..bf7db18c75 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx @@ -1,8 +1,28 @@ -import React, { useEffect, useMemo, useState } from 'react'; import { ColumnsType } from 'antd/es/table'; -import { useVT } from 'virtualizedtableforantd4'; import ResizeObserver from 'rc-resize-observer'; +import React, { useEffect, useMemo, useState } from 'react'; import styled from 'styled-components'; +import { useVT } from 'virtualizedtableforantd4'; + +import useSchemaTitleRenderer from '@app/entity/dataset/profile/schema/utils/schemaTitleRenderer'; +import translateFieldPath from '@app/entity/dataset/profile/schema/utils/translateFieldPath'; +import { ExtendedSchemaFields } from '@app/entity/dataset/profile/schema/utils/types'; +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import { ANTD_GRAY, ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import ExpandIcon from '@app/entity/shared/tabs/Dataset/Schema/components/ExpandIcon'; +import PropertiesColumn from '@app/entity/shared/tabs/Dataset/Schema/components/PropertiesColumn'; +import SchemaFieldDrawer from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer'; +import { SchemaRow } from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaRow'; +import { useGetStructuredPropColumns } from '@app/entity/shared/tabs/Dataset/Schema/useGetStructuredPropColumns'; +import { useGetTableColumnProperties } from '@app/entity/shared/tabs/Dataset/Schema/useGetTableColumnProperties'; +import { FkContext } from '@app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext'; +import useBusinessAttributeRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useBusinessAttributeRenderer'; +import useDescriptionRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer'; +import useSchemaBlameRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useSchemaBlameRenderer'; +import useTagsAndTermsRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer'; +import useUsageStatsRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer'; +import { useBusinessAttributesFlag } from '@app/useAppConfig'; + import { EditableSchemaMetadata, ForeignKeyConstraint, @@ -10,25 +30,7 @@ import { SchemaFieldBlame, SchemaMetadata, UsageQueryResult, -} from '../../../../../../types.generated'; -import useSchemaTitleRenderer from '../../../../dataset/profile/schema/utils/schemaTitleRenderer'; -import { ExtendedSchemaFields } from '../../../../dataset/profile/schema/utils/types'; -import useDescriptionRenderer from './utils/useDescriptionRenderer'; -import useUsageStatsRenderer from './utils/useUsageStatsRenderer'; -import useTagsAndTermsRenderer from './utils/useTagsAndTermsRenderer'; -import ExpandIcon from './components/ExpandIcon'; -import { StyledTable } from '../../../components/styled/StyledTable'; -import { SchemaRow } from './components/SchemaRow'; -import { FkContext } from './utils/selectedFkContext'; -import useSchemaBlameRenderer from './utils/useSchemaBlameRenderer'; -import { ANTD_GRAY, ANTD_GRAY_V2 } from '../../../constants'; -import translateFieldPath from '../../../../dataset/profile/schema/utils/translateFieldPath'; -import PropertiesColumn from './components/PropertiesColumn'; -import SchemaFieldDrawer from './components/SchemaFieldDrawer/SchemaFieldDrawer'; -import useBusinessAttributeRenderer from './utils/useBusinessAttributeRenderer'; -import { useBusinessAttributesFlag } from '../../../../../useAppConfig'; -import { useGetTableColumnProperties } from './useGetTableColumnProperties'; -import { useGetStructuredPropColumns } from './useGetStructuredPropColumns'; +} from '@types'; const TableContainer = styled.div` overflow: inherit; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts index 87fca3b898..97819919b1 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts @@ -1,7 +1,8 @@ -import { glossaryTerm1, sampleTag } from '../../../../../../../Mocks'; -import { SchemaField } from '../../../../../../../types.generated'; -import { getTestEntityRegistry } from '../../../../../../../utils/test-utils/TestPageContainer'; -import { filterSchemaRows } from '../utils/filterSchemaRows'; +import { filterSchemaRows } from '@app/entity/shared/tabs/Dataset/Schema/utils/filterSchemaRows'; +import { glossaryTerm1, sampleTag } from '@src/Mocks'; +import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer'; + +import { SchemaField } from '@types'; describe('filterSchemaRows', () => { const testEntityRegistry = getTestEntityRegistry(); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ChildCountLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ChildCountLabel.tsx index 44bd486206..420f9550dc 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ChildCountLabel.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ChildCountLabel.tsx @@ -1,8 +1,8 @@ -import React from 'react'; import { Badge } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY_V2 } from '../../../../constants'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; type Props = { count: number; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx index ff08d0de11..4f71d66292 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { DownOutlined, RightOutlined } from '@ant-design/icons'; import { RenderExpandIconProps } from 'rc-table/lib/interface'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Prefix = styled.div<{ padding: number }>` padding-left: ${(props) => props.padding}px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx index 7aec54d9f3..ea22e36fab 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx @@ -1,11 +1,12 @@ -import React, { useContext } from 'react'; -import { Badge } from 'antd'; -import styled from 'styled-components'; import { green } from '@ant-design/colors'; +import { Badge } from 'antd'; +import React, { useContext } from 'react'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../constants'; -import { ForeignKeyConstraint } from '../../../../../../../types.generated'; -import { FkContext } from '../utils/selectedFkContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { FkContext } from '@app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext'; + +import { ForeignKeyConstraint } from '@types'; const ForeignKeyBadge = styled(Badge)<{ $highlight: boolean }>` margin-left: 4px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/MenuColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/MenuColumn.tsx index 8c97bfbf59..1d23138664 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/MenuColumn.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/MenuColumn.tsx @@ -1,13 +1,15 @@ +import { CopyOutlined } from '@ant-design/icons'; +import { Dropdown } from 'antd'; import React from 'react'; import { VscGraphLeft } from 'react-icons/vsc'; -import { CopyOutlined } from '@ant-design/icons'; import styled from 'styled-components/macro'; -import { Dropdown } from 'antd'; -import { MenuIcon } from '../../../../EntityDropdown/EntityDropdown'; -import { useEntityData, useRouteToTab } from '../../../../EntityContext'; -import { SchemaField } from '../../../../../../../types.generated'; -import { generateSchemaFieldUrn } from '../../../Lineage/utils'; -import { MenuItemStyle } from '../../../../../view/menu/item/styledComponent'; + +import { useEntityData, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { MenuIcon } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { generateSchemaFieldUrn } from '@app/entity/shared/tabs/Lineage/utils'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; + +import { SchemaField } from '@types'; export const ImpactAnalysisIcon = styled(VscGraphLeft)` transform: scaleX(-1); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/NullableLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/NullableLabel.tsx index 1d624ea9a2..03220ae8ed 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/NullableLabel.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/NullableLabel.tsx @@ -1,9 +1,9 @@ -import React from 'react'; -import { Badge } from 'antd'; -import styled from 'styled-components'; import { blue } from '@ant-design/colors'; +import { Badge } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../constants'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; const NullableBadge = styled(Badge)` margin-left: 4px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PartitioningKeyLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PartitioningKeyLabel.tsx index dbf259aa4c..ef1bfb1648 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PartitioningKeyLabel.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PartitioningKeyLabel.tsx @@ -1,8 +1,9 @@ -import React from 'react'; -import { Badge } from 'antd'; -import styled from 'styled-components'; import { blue } from '@ant-design/colors'; -import { ANTD_GRAY } from '../../../../constants'; +import { Badge } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const PartitioningKeyBadge = styled(Badge)` margin-left: 4px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PrimaryKeyLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PrimaryKeyLabel.tsx index 7535099e7b..0e9d7b21fc 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PrimaryKeyLabel.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PrimaryKeyLabel.tsx @@ -1,9 +1,9 @@ -import React from 'react'; -import { Badge } from 'antd'; -import styled from 'styled-components'; import { blue } from '@ant-design/colors'; +import { Badge } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../constants'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; const PrimaryKeyBadge = styled(Badge)` margin-left: 4px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertiesColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertiesColumn.tsx index 74d14cb0db..a6d59725f1 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertiesColumn.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertiesColumn.tsx @@ -1,7 +1,8 @@ import { ControlOutlined } from '@ant-design/icons'; import React from 'react'; import styled from 'styled-components'; -import { SchemaField } from '../../../../../../../types.generated'; + +import { SchemaField } from '@types'; const ColumnWrapper = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel.tsx index 775680cb1e..15a455146f 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel.tsx @@ -1,11 +1,13 @@ -import React from 'react'; import { Badge } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { capitalizeFirstLetterOnly } from '../../../../../../shared/textUtil'; -import { DataTypeEntity, SchemaFieldDataType } from '../../../../../../../types.generated'; -import { truncate } from '../../../../utils'; -import { ANTD_GRAY, ANTD_GRAY_V2 } from '../../../../constants'; -import { TypeData } from '../../../Properties/types'; + +import { ANTD_GRAY, ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { TypeData } from '@app/entity/shared/tabs/Properties/types'; +import { truncate } from '@app/entity/shared/utils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { DataTypeEntity, SchemaFieldDataType } from '@types'; type Props = { type: TypeData; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerHeader.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerHeader.tsx index 13f8ec8691..bfa04f4a09 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerHeader.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerHeader.tsx @@ -2,9 +2,11 @@ import { CaretLeftOutlined, CaretRightOutlined, CloseOutlined } from '@ant-desig import { Button } from 'antd'; import React, { useEffect } from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY_V2 } from '../../../../../constants'; -import { SchemaField } from '../../../../../../../../types.generated'; -import { pluralize } from '../../../../../../../shared/textUtil'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { pluralize } from '@app/shared/textUtil'; + +import { SchemaField } from '@types'; const HeaderWrapper = styled.div` border-bottom: 1px solid ${ANTD_GRAY_V2[4]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldAttribute.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldAttribute.tsx index 2a057e026a..bcc45e7f08 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldAttribute.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldAttribute.tsx @@ -1,9 +1,14 @@ import React from 'react'; -import { SchemaField } from '../../../../../../../../types.generated'; -import useBusinessAttributeRenderer from '../../utils/useBusinessAttributeRenderer'; -import { SectionHeader, StyledDivider } from './components'; -import SchemaEditableContext from '../../../../../../../shared/SchemaEditableContext'; -import { useBusinessAttributesFlag } from '../../../../../../../useAppConfig'; + +import { + SectionHeader, + StyledDivider, +} from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import useBusinessAttributeRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useBusinessAttributeRenderer'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; +import { useBusinessAttributesFlag } from '@app/useAppConfig'; + +import { SchemaField } from '@types'; interface Props { expandedField: SchemaField; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx index e64a1436b0..391b86331e 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx @@ -3,17 +3,22 @@ import { Button, message } from 'antd'; import DOMPurify from 'dompurify'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { SectionHeader, StyledDivider } from './components'; -import UpdateDescriptionModal from '../../../../../components/legacy/DescriptionModal'; -import { EditableSchemaFieldInfo, SchemaField, SubResourceType } from '../../../../../../../../types.generated'; -import { getFieldDescriptionDetails } from '../../utils/getFieldDescriptionDetails'; -import PropagationDetails from '../../../../../propagation/PropagationDetails'; -import DescriptionSection from '../../../../../containers/profile/sidebar/AboutSection/DescriptionSection'; -import { useEntityData, useMutationUrn, useRefetch } from '../../../../../EntityContext'; -import { useSchemaRefetch } from '../../SchemaContext'; -import { useUpdateDescriptionMutation } from '../../../../../../../../graphql/mutations.generated'; -import analytics, { EntityActionType, EventType } from '../../../../../../../analytics'; -import SchemaEditableContext from '../../../../../../../shared/SchemaEditableContext'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import UpdateDescriptionModal from '@app/entity/shared/components/legacy/DescriptionModal'; +import DescriptionSection from '@app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection'; +import PropagationDetails from '@app/entity/shared/propagation/PropagationDetails'; +import { useSchemaRefetch } from '@app/entity/shared/tabs/Dataset/Schema/SchemaContext'; +import { + SectionHeader, + StyledDivider, +} from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import { getFieldDescriptionDetails } from '@app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; + +import { useUpdateDescriptionMutation } from '@graphql/mutations.generated'; +import { EditableSchemaFieldInfo, SchemaField, SubResourceType } from '@types'; const EditIcon = styled(Button)` border: none; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx index 7b06ff4339..2649085c62 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx @@ -1,14 +1,16 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import translateFieldPath from '../../../../../../dataset/profile/schema/utils/translateFieldPath'; -import TypeLabel from '../TypeLabel'; -import PrimaryKeyLabel from '../PrimaryKeyLabel'; -import PartitioningKeyLabel from '../PartitioningKeyLabel'; -import NullableLabel from '../NullableLabel'; -import MenuColumn from '../MenuColumn'; -import { ANTD_GRAY_V2 } from '../../../../../constants'; -import { SchemaField } from '../../../../../../../../types.generated'; + +import translateFieldPath from '@app/entity/dataset/profile/schema/utils/translateFieldPath'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import MenuColumn from '@app/entity/shared/tabs/Dataset/Schema/components/MenuColumn'; +import NullableLabel from '@app/entity/shared/tabs/Dataset/Schema/components/NullableLabel'; +import PartitioningKeyLabel from '@app/entity/shared/tabs/Dataset/Schema/components/PartitioningKeyLabel'; +import PrimaryKeyLabel from '@app/entity/shared/tabs/Dataset/Schema/components/PrimaryKeyLabel'; +import TypeLabel from '@app/entity/shared/tabs/Dataset/Schema/components/TypeLabel'; + +import { SchemaField } from '@types'; const FieldHeaderWrapper = styled.div` padding: 16px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx index 98cfa29650..83db77a094 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx @@ -1,13 +1,15 @@ -import { useEntityData } from '@src/app/entity/shared/EntityContext'; import React from 'react'; import styled from 'styled-components'; -import { SchemaField, SearchResult, StdDataType } from '../../../../../../../../types.generated'; -import AddPropertyButton from '../../../../Properties/AddPropertyButton'; -import { EditColumn } from '../../../../Properties/Edit/EditColumn'; -import StructuredPropertyValue from '../../../../Properties/StructuredPropertyValue'; -import { mapStructuredPropertyValues } from '../../../../Properties/useStructuredProperties'; -import { useGetEntityWithSchema } from '../../useGetEntitySchema'; -import { StyledDivider } from './components'; + +import { StyledDivider } from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import { useGetEntityWithSchema } from '@app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema'; +import AddPropertyButton from '@app/entity/shared/tabs/Properties/AddPropertyButton'; +import { EditColumn } from '@app/entity/shared/tabs/Properties/Edit/EditColumn'; +import StructuredPropertyValue from '@app/entity/shared/tabs/Properties/StructuredPropertyValue'; +import { mapStructuredPropertyValues } from '@app/entity/shared/tabs/Properties/useStructuredProperties'; +import { useEntityData } from '@src/app/entity/shared/EntityContext'; + +import { SchemaField, SearchResult, StdDataType } from '@types'; export const PropertyTitle = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx index c071506d3a..d9f102c2d4 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx @@ -1,8 +1,13 @@ import React from 'react'; -import { EditableSchemaMetadata, GlobalTags, SchemaField } from '../../../../../../../../types.generated'; -import useTagsAndTermsRenderer from '../../utils/useTagsAndTermsRenderer'; -import { SectionHeader, StyledDivider } from './components'; -import SchemaEditableContext from '../../../../../../../shared/SchemaEditableContext'; + +import { + SectionHeader, + StyledDivider, +} from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import useTagsAndTermsRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; + +import { EditableSchemaMetadata, GlobalTags, SchemaField } from '@types'; interface Props { expandedField: SchemaField; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx index 9434983653..34d83898f1 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx @@ -1,8 +1,13 @@ import React from 'react'; -import { EditableSchemaMetadata, GlobalTags, SchemaField } from '../../../../../../../../types.generated'; -import useTagsAndTermsRenderer from '../../utils/useTagsAndTermsRenderer'; -import { SectionHeader, StyledDivider } from './components'; -import SchemaEditableContext from '../../../../../../../shared/SchemaEditableContext'; + +import { + SectionHeader, + StyledDivider, +} from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import useTagsAndTermsRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; + +import { EditableSchemaMetadata, GlobalTags, SchemaField } from '@types'; interface Props { expandedField: SchemaField; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx index 355c3c25fe..b2fd00982c 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx @@ -1,12 +1,17 @@ import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { GetDatasetQuery } from '../../../../../../../../graphql/dataset.generated'; -import { useBaseEntity } from '../../../../../EntityContext'; -import { ANTD_GRAY_V2 } from '../../../../../constants'; -import { SectionHeader, StyledDivider } from './components'; -import { pathMatchesNewPath } from '../../../../../../dataset/profile/schema/utils/utils'; -import { UsageBar } from '../../utils/useUsageStatsRenderer'; -import { SchemaField } from '../../../../../../../../types.generated'; + +import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { + SectionHeader, + StyledDivider, +} from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import { UsageBar } from '@app/entity/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { SchemaField } from '@types'; const USAGE_BAR_MAX_WIDTH = 100; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx index 798795c19d..71a25aecd9 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx @@ -1,18 +1,20 @@ import { Drawer } from 'antd'; import React, { useMemo } from 'react'; import styled from 'styled-components'; + +import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import DrawerHeader from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerHeader'; +import FieldAttribute from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldAttribute'; +import FieldDescription from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription'; +import FieldHeader from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader'; +import FieldProperties from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties'; +import FieldTags from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags'; +import FieldTerms from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms'; +import FieldUsageStats from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats'; +import useGetSchemaColumnProperties from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/useGetSchemaColumnProperties'; import SidebarStructuredPropsSection from '@src/app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection'; -import DrawerHeader from './DrawerHeader'; -import FieldHeader from './FieldHeader'; -import FieldDescription from './FieldDescription'; -import { EditableSchemaMetadata, SchemaField } from '../../../../../../../../types.generated'; -import { pathMatchesNewPath } from '../../../../../../dataset/profile/schema/utils/utils'; -import FieldUsageStats from './FieldUsageStats'; -import FieldTags from './FieldTags'; -import FieldTerms from './FieldTerms'; -import FieldProperties from './FieldProperties'; -import FieldAttribute from './FieldAttribute'; -import useGetSchemaColumnProperties from './useGetSchemaColumnProperties'; + +import { EditableSchemaMetadata, SchemaField } from '@types'; const StyledDrawer = styled(Drawer)` position: absolute; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaRow.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaRow.tsx index 905efefeab..a72c218b87 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaRow.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaRow.tsx @@ -2,14 +2,16 @@ import { Badge } from 'antd'; import React, { useContext } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { GetDatasetQuery } from '../../../../../../../graphql/dataset.generated'; -import { EntityType } from '../../../../../../../types.generated'; -import { decodeSchemaField } from '../../../../../../lineage/utils/columnLineageUtils'; -import CompactContext from '../../../../../../shared/CompactContext'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../../../constants'; -import { useBaseEntity } from '../../../../EntityContext'; -import { FkContext } from '../utils/selectedFkContext'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { FkContext } from '@app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext'; +import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils'; +import CompactContext from '@app/shared/CompactContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { EntityType } from '@types'; const ForeignKeyContent = styled.tr` position: absolute; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/TypeLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/TypeLabel.tsx index 0ebb1edc3a..7917712dab 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/TypeLabel.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/TypeLabel.tsx @@ -1,11 +1,12 @@ +import { Badge, Tooltip } from 'antd'; import React from 'react'; -import { Tooltip, Badge } from 'antd'; import styled from 'styled-components'; -import { capitalizeFirstLetter } from '../../../../../../shared/textUtil'; -import { SchemaFieldDataType } from '../../../../../../../types.generated'; -import { truncate } from '../../../../utils'; -import { ANTD_GRAY } from '../../../../constants'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { truncate } from '@app/entity/shared/utils'; +import { capitalizeFirstLetter } from '@app/shared/textUtil'; + +import { SchemaFieldDataType } from '@types'; type Props = { type: SchemaFieldDataType; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema.tsx index df3f980aae..3e630a83d4 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema.tsx @@ -1,8 +1,10 @@ import { cloneDeep } from 'lodash'; -import { EntityType } from '../../../../../../types.generated'; -import { useEntityData } from '../../../EntityContext'; -import { useGetDatasetSchemaQuery } from '../../../../../../graphql/dataset.generated'; -import { combineEntityDataWithSiblings, useIsSeparateSiblingsMode } from '../../../siblingUtils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { combineEntityDataWithSiblings, useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; + +import { useGetDatasetSchemaQuery } from '@graphql/dataset.generated'; +import { EntityType } from '@types'; // Whether to dynamically load the schema from the backend. const shouldLoadSchema = (entityType, entityData) => { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetStructuredPropColumns.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetStructuredPropColumns.tsx index eed3fd5107..3cec7c3216 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetStructuredPropColumns.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetStructuredPropColumns.tsx @@ -1,7 +1,8 @@ +import React, { useMemo } from 'react'; + import StructuredPropValues from '@src/app/entity/dataset/profile/schema/components/StructuredPropValues'; import { getDisplayName } from '@src/app/govern/structuredProperties/utils'; import { SearchResult, StructuredPropertyEntity } from '@src/types.generated'; -import React, { useMemo } from 'react'; export const useGetStructuredPropColumns = (properties: SearchResult[] | undefined) => { const columns = useMemo(() => { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts index 53b76d53f8..cbfaca4e02 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts @@ -1,5 +1,6 @@ -import { EntityType, SchemaField } from '../../../../../../../types.generated'; -import EntityRegistry from '../../../../../EntityRegistry'; +import EntityRegistry from '@app/entity/EntityRegistry'; + +import { EntityType, SchemaField } from '@types'; function matchesTagsOrTermsOrDescription(field: SchemaField, filterText: string, entityRegistry: EntityRegistry) { return ( diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts index c603372de3..9c3aebff99 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts @@ -1,8 +1,4 @@ -import { - EditableSchemaFieldInfo, - SchemaFieldEntity, - DocumentationAssociation, -} from '../../../../../../../types.generated'; +import { DocumentationAssociation, EditableSchemaFieldInfo, SchemaFieldEntity } from '@types'; interface Props { schemaFieldEntity?: SchemaFieldEntity | null; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext.ts index 88fd8189e1..59ae72e5fd 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext.ts @@ -1,5 +1,6 @@ import React from 'react'; -import { ForeignKeyConstraint } from '../../../../../../../types.generated'; + +import { ForeignKeyConstraint } from '@types'; export const FkContext = React.createContext<{ fieldPath: string; constraint?: ForeignKeyConstraint | null } | null>( null, diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts index 336a365818..25855dbad7 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts @@ -1,6 +1,6 @@ -import { useHistory, useLocation } from 'react-router'; import * as QueryString from 'query-string'; import { useEffect } from 'react'; +import { useHistory, useLocation } from 'react-router'; export default function useUpdateSchemaFilterQueryString(filterText: string) { const location = useLocation(); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useBusinessAttributeRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useBusinessAttributeRenderer.tsx index 568ac17857..7f884fd2bd 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useBusinessAttributeRenderer.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useBusinessAttributeRenderer.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { EntityType, SchemaField } from '../../../../../../../types.generated'; -import { useRefetch } from '../../../../EntityContext'; -import { useSchemaRefetch } from '../SchemaContext'; -import BusinessAttributeGroup from '../../../../../../shared/businessAttribute/BusinessAttributeGroup'; -import { useBusinessAttributesFlag } from '../../../../../../useAppConfig'; + +import { useRefetch } from '@app/entity/shared/EntityContext'; +import { useSchemaRefetch } from '@app/entity/shared/tabs/Dataset/Schema/SchemaContext'; +import BusinessAttributeGroup from '@app/shared/businessAttribute/BusinessAttributeGroup'; +import { useBusinessAttributesFlag } from '@app/useAppConfig'; + +import { EntityType, SchemaField } from '@types'; export default function useBusinessAttributeRenderer(filterText: string, canEdit: boolean) { const refetch = useRefetch(); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx index b754624446..70c7d7ab98 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx @@ -1,12 +1,14 @@ -import React, { useState } from 'react'; import DOMPurify from 'dompurify'; -import { EditableSchemaMetadata, SchemaField, SubResourceType } from '../../../../../../../types.generated'; -import DescriptionField from '../../../../../dataset/profile/schema/components/SchemaDescriptionField'; -import { useUpdateDescriptionMutation } from '../../../../../../../graphql/mutations.generated'; -import { useMutationUrn, useRefetch } from '../../../../EntityContext'; -import { useSchemaRefetch } from '../SchemaContext'; -import { pathMatchesNewPath } from '../../../../../dataset/profile/schema/utils/utils'; -import { getFieldDescriptionDetails } from './getFieldDescriptionDetails'; +import React, { useState } from 'react'; + +import DescriptionField from '@app/entity/dataset/profile/schema/components/SchemaDescriptionField'; +import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import { useSchemaRefetch } from '@app/entity/shared/tabs/Dataset/Schema/SchemaContext'; +import { getFieldDescriptionDetails } from '@app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails'; + +import { useUpdateDescriptionMutation } from '@graphql/mutations.generated'; +import { EditableSchemaMetadata, SchemaField, SubResourceType } from '@types'; export default function useDescriptionRenderer(editableSchemaMetadata: EditableSchemaMetadata | null | undefined) { const urn = useMutationUrn(); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useSchemaBlameRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useSchemaBlameRenderer.tsx index da8959e2e7..c8f3d9ea13 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useSchemaBlameRenderer.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useSchemaBlameRenderer.tsx @@ -1,12 +1,14 @@ +import { ScanOutlined } from '@ant-design/icons'; +import { Button, Tooltip, Typography } from 'antd'; import React from 'react'; import { useHistory, useLocation } from 'react-router-dom'; -import { Button, Tooltip, Typography } from 'antd'; -import { ScanOutlined } from '@ant-design/icons'; import styled from 'styled-components'; -import { SchemaField, SchemaFieldBlame } from '../../../../../../../types.generated'; -import { pathMatchesNewPath } from '../../../../../dataset/profile/schema/utils/utils'; -import { toRelativeTimeString } from '../../../../../../shared/time/timeUtils'; -import { navigateToVersionedDatasetUrl } from './navigateToVersionedDatasetUrl'; + +import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { navigateToVersionedDatasetUrl } from '@app/entity/shared/tabs/Dataset/Schema/utils/navigateToVersionedDatasetUrl'; +import { toRelativeTimeString } from '@app/shared/time/timeUtils'; + +import { SchemaField, SchemaFieldBlame } from '@types'; const HeadingDiv = styled.div` vertical-align: top; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx index e5f27a5001..d10e52d642 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '../../../../../../../types.generated'; -import TagTermGroup from '../../../../../../shared/tags/TagTermGroup'; -import { pathMatchesNewPath } from '../../../../../dataset/profile/schema/utils/utils'; -import { useSchemaRefetch } from '../SchemaContext'; -import { useMutationUrn, useRefetch } from '../../../../EntityContext'; + +import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import { useSchemaRefetch } from '@app/entity/shared/tabs/Dataset/Schema/SchemaContext'; +import TagTermGroup from '@app/shared/tags/TagTermGroup'; + +import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '@types'; export default function useTagsAndTermsRenderer( editableSchemaMetadata: EditableSchemaMetadata | null | undefined, diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx index ac3e13dabc..20fdec4d03 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '../../../../../../../types.generated'; -import TagTermGroup from '../../../../../../shared/tags/TagTermGroup'; -import { pathMatchesNewPath } from '../../../../../dataset/profile/schema/utils/utils'; -import { useEntityData, useRefetch } from '../../../../EntityContext'; + +import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import TagTermGroup from '@app/shared/tags/TagTermGroup'; + +import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '@types'; export default function useTagsAndTermsRendererFeatureTable( editableSchemaMetadata: EditableSchemaMetadata | null | undefined, diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx index e6b58eeb37..5595213b2c 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx @@ -2,8 +2,10 @@ import { geekblue } from '@ant-design/colors'; import { Tooltip } from 'antd'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { UsageQueryResult } from '../../../../../../../types.generated'; -import { pathMatchesNewPath } from '../../../../../dataset/profile/schema/utils/utils'; + +import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils'; + +import { UsageQueryResult } from '@types'; const USAGE_BAR_MAX_WIDTH = 50; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsHeader.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsHeader.tsx index 5d4dd3083b..03cf364fdd 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsHeader.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsHeader.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import { Button, Typography } from 'antd'; import { ClockCircleOutlined, LineChartOutlined } from '@ant-design/icons'; - +import { Button, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ViewType } from './viewType'; -import TabToolbar from '../../../components/styled/TabToolbar'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../constants'; -import { LookbackWindow } from './lookbackWindows'; -import LookbackWindowSelect from './historical/LookbackWindowSelect'; + +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entity/shared/constants'; +import LookbackWindowSelect from '@app/entity/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect'; +import { LookbackWindow } from '@app/entity/shared/tabs/Dataset/Stats/lookbackWindows'; +import { ViewType } from '@app/entity/shared/tabs/Dataset/Stats/viewType'; const StatsHeaderContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsSection.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsSection.tsx index c0a98e44f8..32244ee67c 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsSection.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsSection.tsx @@ -1,6 +1,6 @@ import { Divider, Row, Typography } from 'antd'; -import styled from 'styled-components'; import React from 'react'; +import styled from 'styled-components'; const Section = styled.div` padding-top: 24px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsTab.tsx index babf9312f3..a7d9534fc8 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsTab.tsx @@ -1,14 +1,16 @@ import React, { useState } from 'react'; -import { GetDatasetQuery, useGetLastMonthUsageAggregationsQuery } from '../../../../../../graphql/dataset.generated'; -import { DatasetProfile, Operation, UsageQueryResult } from '../../../../../../types.generated'; -import { useBaseEntity } from '../../../EntityContext'; -import { toLocalDateString, toLocalTimeString, toLocalDateTimeString } from '../../../../../shared/time/timeUtils'; -import HistoricalStats from './historical/HistoricalStats'; -import { LOOKBACK_WINDOWS } from './lookbackWindows'; -import ColumnStats from './snapshot/ColumnStats'; -import TableStats from './snapshot/TableStats'; -import StatsHeader from './StatsHeader'; -import { ViewType } from './viewType'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import StatsHeader from '@app/entity/shared/tabs/Dataset/Stats/StatsHeader'; +import HistoricalStats from '@app/entity/shared/tabs/Dataset/Stats/historical/HistoricalStats'; +import { LOOKBACK_WINDOWS } from '@app/entity/shared/tabs/Dataset/Stats/lookbackWindows'; +import ColumnStats from '@app/entity/shared/tabs/Dataset/Stats/snapshot/ColumnStats'; +import TableStats from '@app/entity/shared/tabs/Dataset/Stats/snapshot/TableStats'; +import { ViewType } from '@app/entity/shared/tabs/Dataset/Stats/viewType'; +import { toLocalDateString, toLocalDateTimeString, toLocalTimeString } from '@app/shared/time/timeUtils'; + +import { GetDatasetQuery, useGetLastMonthUsageAggregationsQuery } from '@graphql/dataset.generated'; +import { DatasetProfile, Operation, UsageQueryResult } from '@types'; export default function StatsTab() { const baseEntity = useBaseEntity(); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx index 8e5e8fde28..743b531b0d 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx @@ -1,16 +1,18 @@ +import { Divider, Typography } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { Divider, Typography } from 'antd'; -import ProfilingRunsChart from './charts/ProfilingRunsChart'; -import StatChart from './charts/StatChart'; -import { DatasetProfile, DateInterval } from '../../../../../../../types.generated'; -import { getFixedLookbackWindow, TimeWindowSize } from '../../../../../../shared/time/timeUtils'; -import { useGetDataProfilesLazyQuery } from '../../../../../../../graphql/dataset.generated'; -import { Message } from '../../../../../../shared/Message'; -import { LookbackWindow } from '../lookbackWindows'; -import { ANTD_GRAY } from '../../../../constants'; -import PrefixedSelect from './shared/PrefixedSelect'; -import { formatBytes } from '../../../../../../shared/formatNumber'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import ProfilingRunsChart from '@app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart'; +import StatChart from '@app/entity/shared/tabs/Dataset/Stats/historical/charts/StatChart'; +import PrefixedSelect from '@app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect'; +import { LookbackWindow } from '@app/entity/shared/tabs/Dataset/Stats/lookbackWindows'; +import { Message } from '@app/shared/Message'; +import { formatBytes } from '@app/shared/formatNumber'; +import { TimeWindowSize, getFixedLookbackWindow } from '@app/shared/time/timeUtils'; + +import { useGetDataProfilesLazyQuery } from '@graphql/dataset.generated'; +import { DatasetProfile, DateInterval } from '@types'; // TODO: Reuse stat sections. const StatSection = styled.div` diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx index adc9caf2f8..294d3e9dc0 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { SelectValue } from 'antd/lib/select'; -import { LookbackWindow, LOOKBACK_WINDOWS } from '../lookbackWindows'; -import PrefixedSelect from './shared/PrefixedSelect'; +import React from 'react'; + +import PrefixedSelect from '@app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect'; +import { LOOKBACK_WINDOWS, LookbackWindow } from '@app/entity/shared/tabs/Dataset/Stats/lookbackWindows'; type Props = { lookbackWindow: LookbackWindow; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx index 0b2eb6db1c..0cd9654e7e 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx @@ -1,10 +1,12 @@ import { Button, Modal, Table, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { DatasetProfile } from '../../../../../../../../types.generated'; -import ColumnStats from '../../snapshot/ColumnStats'; -import TableStats from '../../snapshot/TableStats'; -import { formatBytes, formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber'; + +import ColumnStats from '@app/entity/shared/tabs/Dataset/Stats/snapshot/ColumnStats'; +import TableStats from '@app/entity/shared/tabs/Dataset/Stats/snapshot/TableStats'; +import { formatBytes, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; + +import { DatasetProfile } from '@types'; export const ChartTable = styled(Table)` margin-top: 16px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx index e3955bc27b..f4568bc344 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx @@ -1,10 +1,12 @@ import { Card, Typography } from 'antd'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { DateInterval, DateRange } from '../../../../../../../../types.generated'; -import { ChartContainer } from '../../../../../../../analyticsDashboard/components/ChartContainer'; -import { TimeSeriesChart } from '../../../../../../../analyticsDashboard/components/TimeSeriesChart'; -import { ANTD_GRAY } from '../../../../../constants'; + +import { ChartContainer } from '@app/analyticsDashboard/components/ChartContainer'; +import { TimeSeriesChart } from '@app/analyticsDashboard/components/TimeSeriesChart'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; + +import { DateInterval, DateRange } from '@types'; const ChartTitle = styled(Typography.Text)` && { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx index 51b4797dd4..14fc690350 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Select, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; type Props = { prefixText: string; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/lookbackWindows.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/lookbackWindows.ts index 620837d157..98c6888851 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/lookbackWindows.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/lookbackWindows.ts @@ -1,4 +1,4 @@ -import { DateInterval } from '../../../../../../types.generated'; +import { DateInterval } from '@types'; /** * Change this to add or modify the lookback windows that are selectable via the UI. diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx index e7e32c3daa..ae21afcc4f 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx @@ -1,11 +1,13 @@ import { Typography } from 'antd'; -import { ColumnsType, ColumnType } from 'antd/lib/table'; +import { ColumnType, ColumnsType } from 'antd/lib/table'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { DatasetFieldProfile } from '../../../../../../../types.generated'; -import { StyledTable } from '../../../../components/styled/StyledTable'; -import { ANTD_GRAY } from '../../../../constants'; -import SampleValueTag from './SampleValueTag'; + +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import SampleValueTag from '@app/entity/shared/tabs/Dataset/Stats/snapshot/SampleValueTag'; + +import { DatasetFieldProfile } from '@types'; type Props = { columnStats: Array; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx index 3f2df14eaa..216fed66c9 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx @@ -1,5 +1,5 @@ -import React, { useState } from 'react'; import { Tag, Tooltip } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; const StyledTag = styled(Tag)` diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx index eb39b9f420..3df53e8dd4 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx @@ -1,12 +1,14 @@ import { Tooltip, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { CorpUser, Maybe, UserUsageCounts } from '../../../../../../../types.generated'; -import { InfoItem } from '../../../../components/styled/InfoItem'; -import { ANTD_GRAY } from '../../../../constants'; -import { countFormatter } from '../../../../../../../utils/formatter/index'; -import { ExpandedActorGroup } from '../../../../components/styled/ExpandedActorGroup'; -import { formatNumberWithoutAbbreviation } from '../../../../../../shared/formatNumber'; + +import { ExpandedActorGroup } from '@app/entity/shared/components/styled/ExpandedActorGroup'; +import { InfoItem } from '@app/entity/shared/components/styled/InfoItem'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { countFormatter } from '@utils/formatter/index'; + +import { CorpUser, Maybe, UserUsageCounts } from '@types'; type Props = { rowCount?: number; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/Assertions.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/Assertions.tsx index 77e72441cd..a07bfe74c7 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/Assertions.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/Assertions.tsx @@ -1,12 +1,14 @@ import React, { useState } from 'react'; -import { useGetDatasetAssertionsQuery } from '../../../../../../graphql/dataset.generated'; -import { Assertion, AssertionResultType } from '../../../../../../types.generated'; -import { useEntityData } from '../../../EntityContext'; -import { DatasetAssertionsList } from './DatasetAssertionsList'; -import { DatasetAssertionsSummary } from './DatasetAssertionsSummary'; -import { sortAssertions } from './assertionUtils'; -import { combineEntityDataWithSiblings, useIsSeparateSiblingsMode } from '../../../siblingUtils'; -import { useGetDatasetContractQuery } from '../../../../../../graphql/contract.generated'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { combineEntityDataWithSiblings, useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import { DatasetAssertionsList } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList'; +import { DatasetAssertionsSummary } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsSummary'; +import { sortAssertions } from '@app/entity/shared/tabs/Dataset/Validations/assertionUtils'; + +import { useGetDatasetContractQuery } from '@graphql/contract.generated'; +import { useGetDatasetAssertionsQuery } from '@graphql/dataset.generated'; +import { Assertion, AssertionResultType } from '@types'; /** * Returns a status summary for the assertions associated with a Dataset. diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/BooleanTimeline.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/BooleanTimeline.tsx index 27db7b0e96..a5ff0c66e8 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/BooleanTimeline.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/BooleanTimeline.tsx @@ -1,10 +1,11 @@ -import React, { useMemo } from 'react'; -import { Popover } from 'antd'; -import { Bar } from '@visx/shape'; -import { Group } from '@visx/group'; import { AxisBottom } from '@visx/axis'; +import { Group } from '@visx/group'; import { scaleUtc } from '@visx/scale'; -import { ANTD_GRAY } from '../../../constants'; +import { Bar } from '@visx/shape'; +import { Popover } from 'antd'; +import React, { useMemo } from 'react'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export type BooleanResult = { result: boolean; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx index 3318baf6d0..47f6910901 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx @@ -1,6 +1,11 @@ -import { Popover, Typography, Button } from 'antd'; +import { Button, Popover, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; + +import { DatasetAssertionLogicModal } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal'; +import { getFormattedParameterValue } from '@app/entity/shared/tabs/Dataset/Validations/assertionUtils'; +import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils'; + import { AssertionStdAggregation, AssertionStdOperator, @@ -8,10 +13,7 @@ import { DatasetAssertionInfo, DatasetAssertionScope, SchemaFieldRef, -} from '../../../../../../types.generated'; -import { decodeSchemaField } from '../../../../../lineage/utils/columnLineageUtils'; -import { getFormattedParameterValue } from './assertionUtils'; -import { DatasetAssertionLogicModal } from './DatasetAssertionLogicModal'; +} from '@types'; const ViewLogicButton = styled(Button)` padding: 0px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx index ad2c4e05d7..885147b434 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx @@ -2,16 +2,22 @@ import { Tooltip, Typography } from 'antd'; import { SelectValue } from 'antd/lib/select'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { useGetAssertionRunsLazyQuery } from '../../../../../../graphql/assertion.generated'; -import { AssertionResultType, AssertionRunStatus } from '../../../../../../types.generated'; -import { formatNumber } from '../../../../../shared/formatNumber'; -import { getFixedLookbackWindow, getLocaleTimezone } from '../../../../../shared/time/timeUtils'; -import { ANTD_GRAY } from '../../../constants'; -import PrefixedSelect from '../Stats/historical/shared/PrefixedSelect'; -import { LOOKBACK_WINDOWS } from '../Stats/lookbackWindows'; -import { getResultColor, getResultIcon, getResultText } from './assertionUtils'; -import { BooleanTimeline } from './BooleanTimeline'; -import { DatasetAssertionResultDetails } from './DatasetAssertionResultDetails'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import PrefixedSelect from '@app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect'; +import { LOOKBACK_WINDOWS } from '@app/entity/shared/tabs/Dataset/Stats/lookbackWindows'; +import { BooleanTimeline } from '@app/entity/shared/tabs/Dataset/Validations/BooleanTimeline'; +import { DatasetAssertionResultDetails } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails'; +import { + getResultColor, + getResultIcon, + getResultText, +} from '@app/entity/shared/tabs/Dataset/Validations/assertionUtils'; +import { formatNumber } from '@app/shared/formatNumber'; +import { getFixedLookbackWindow, getLocaleTimezone } from '@app/shared/time/timeUtils'; + +import { useGetAssertionRunsLazyQuery } from '@graphql/assertion.generated'; +import { AssertionResultType, AssertionRunStatus } from '@types'; const RESULT_CHART_WIDTH_PX = 800; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx index 627deb163c..fc783468df 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx @@ -1,6 +1,7 @@ -import { Modal, Button } from 'antd'; +import { Button, Modal } from 'antd'; import React from 'react'; -import Query from '../Queries/Query'; + +import Query from '@app/entity/shared/tabs/Dataset/Queries/Query'; export type AssertionsSummary = { totalAssertions: number; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx index 424c89994d..1edde5647f 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx @@ -1,6 +1,7 @@ import { Typography } from 'antd'; import React from 'react'; -import { AssertionResult } from '../../../../../../types.generated'; + +import { AssertionResult } from '@types'; type Props = { result: AssertionResult; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx index 92f9b6a1d5..f230591069 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx @@ -1,27 +1,33 @@ -import { Button, Dropdown, Empty, Image, message, Modal, Tag, Tooltip, Typography, Checkbox } from 'antd'; -import React from 'react'; -import styled from 'styled-components'; import { + AuditOutlined, DeleteOutlined, DownOutlined, MoreOutlined, RightOutlined, StopOutlined, - AuditOutlined, } from '@ant-design/icons'; +import { Button, Checkbox, Dropdown, Empty, Image, Modal, Tag, Tooltip, Typography, message } from 'antd'; +import React from 'react'; import { Link } from 'react-router-dom'; -import { DatasetAssertionDescription } from './DatasetAssertionDescription'; -import { StyledTable } from '../../../components/styled/StyledTable'; -import { DatasetAssertionDetails } from './DatasetAssertionDetails'; -import { Assertion, AssertionRunStatus, DataContract, EntityType } from '../../../../../../types.generated'; -import { getResultColor, getResultIcon, getResultText } from './assertionUtils'; -import { useDeleteAssertionMutation } from '../../../../../../graphql/assertion.generated'; -import { capitalizeFirstLetterOnly } from '../../../../../shared/textUtil'; -import { REDESIGN_COLORS } from '../../../constants'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { isAssertionPartOfContract } from './contract/utils'; -import { useEntityData } from '../../../EntityContext'; -import CopyUrnMenuItem from '../../../../../shared/share/items/CopyUrnMenuItem'; +import styled from 'styled-components'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import { REDESIGN_COLORS } from '@app/entity/shared/constants'; +import { DatasetAssertionDescription } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription'; +import { DatasetAssertionDetails } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails'; +import { + getResultColor, + getResultIcon, + getResultText, +} from '@app/entity/shared/tabs/Dataset/Validations/assertionUtils'; +import { isAssertionPartOfContract } from '@app/entity/shared/tabs/Dataset/Validations/contract/utils'; +import CopyUrnMenuItem from '@app/shared/share/items/CopyUrnMenuItem'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useDeleteAssertionMutation } from '@graphql/assertion.generated'; +import { Assertion, AssertionRunStatus, DataContract, EntityType } from '@types'; const ResultContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx index e61358f3f1..81e07d4225 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx @@ -2,7 +2,8 @@ import { CheckCircleFilled, CloseCircleFilled, StopOutlined } from '@ant-design/ import { Tooltip, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const SummaryHeader = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx index a104903dc7..65ec918895 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx @@ -1,12 +1,14 @@ -import React from 'react'; import { Typography } from 'antd'; -import { FieldAssertionInfo } from '../../../../../../types.generated'; +import React from 'react'; + import { getFieldDescription, getFieldOperatorDescription, getFieldParametersDescription, getFieldTransformDescription, -} from './fieldDescriptionUtils'; +} from '@app/entity/shared/tabs/Dataset/Validations/fieldDescriptionUtils'; + +import { FieldAssertionInfo } from '@types'; type Props = { assertionInfo: FieldAssertionInfo; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx index 047f7c7db2..4eb652aa90 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { AssertionInfo } from '../../../../../../types.generated'; +import React from 'react'; + +import { AssertionInfo } from '@types'; type Props = { assertionInfo: AssertionInfo; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/ValidationsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/ValidationsTab.tsx index 006823db53..ae1a3148cf 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/ValidationsTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/ValidationsTab.tsx @@ -1,15 +1,16 @@ -import React, { useEffect } from 'react'; +import { AuditOutlined, FileProtectOutlined } from '@ant-design/icons'; import { Button } from 'antd'; +import React, { useEffect } from 'react'; import { useHistory, useLocation } from 'react-router'; import styled from 'styled-components'; -import { AuditOutlined, FileProtectOutlined } from '@ant-design/icons'; -import { useEntityData } from '../../../EntityContext'; -import { Assertions } from './Assertions'; -import TabToolbar from '../../../components/styled/TabToolbar'; -import { useGetValidationsTab } from './useGetValidationsTab'; -import { ANTD_GRAY } from '../../../constants'; -import { useAppConfig } from '../../../../../useAppConfig'; -import { DataContractTab } from './contract/DataContractTab'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { Assertions } from '@app/entity/shared/tabs/Dataset/Validations/Assertions'; +import { DataContractTab } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractTab'; +import { useGetValidationsTab } from '@app/entity/shared/tabs/Dataset/Validations/useGetValidationsTab'; +import { useAppConfig } from '@app/useAppConfig'; const TabTitle = styled.span` margin-left: 4px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx index 26634c459d..093a817c38 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx @@ -1,10 +1,6 @@ -import React from 'react'; import { Typography } from 'antd'; -import { - IncrementingSegmentRowCountChange, - RowCountChange, - VolumeAssertionInfo, -} from '../../../../../../types.generated'; +import React from 'react'; + import { getIsRowCountChange, getOperatorDescription, @@ -12,7 +8,9 @@ import { getValueChangeTypeDescription, getVolumeTypeDescription, getVolumeTypeInfo, -} from './utils'; +} from '@app/entity/shared/tabs/Dataset/Validations/utils'; + +import { IncrementingSegmentRowCountChange, RowCountChange, VolumeAssertionInfo } from '@types'; type Props = { assertionInfo: VolumeAssertionInfo; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts index f65c337215..053a73aaa9 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts @@ -1,4 +1,4 @@ -import { useGetValidationsTab } from '../useGetValidationsTab'; +import { useGetValidationsTab } from '@app/entity/shared/tabs/Dataset/Validations/useGetValidationsTab'; describe('useGetValidationsTab', () => { it('should correctly extract valid tab', () => { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/acrylTypes.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/acrylTypes.tsx index 8a70a3d87c..abb91d7de1 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/acrylTypes.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/acrylTypes.tsx @@ -1,4 +1,4 @@ -import { Assertion, AssertionType } from '../../../../../../types.generated'; +import { Assertion, AssertionType } from '@types'; export type AssertionStatusSummary = { passing: number; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/assertionUtils.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/assertionUtils.tsx index 341742f407..55d693a2ed 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/assertionUtils.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/assertionUtils.tsx @@ -1,12 +1,13 @@ -import React from 'react'; import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons'; +import React from 'react'; + import { AssertionResultType, AssertionStdParameter, AssertionStdParameterType, DatasetAssertionInfo, StringMapEntry, -} from '../../../../../../types.generated'; +} from '@types'; /** * Utility methods diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx index c36bef09cd..7377d45acd 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx @@ -1,14 +1,16 @@ +import { StopOutlined } from '@ant-design/icons'; +import { Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from 'antd'; -import { StopOutlined } from '@ant-design/icons'; -import { Assertion, AssertionResultType } from '../../../../../../../types.generated'; + import { StyledCheckOutlined, StyledClockCircleOutlined, StyledCloseOutlined, StyledExclamationOutlined, -} from '../shared/styledComponents'; +} from '@app/entity/shared/tabs/Dataset/Validations/shared/styledComponents'; + +import { Assertion, AssertionResultType } from '@types'; const StatusContainer = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractEmptyState.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractEmptyState.tsx index 36004cb135..376e42a9d2 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractEmptyState.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractEmptyState.tsx @@ -1,9 +1,9 @@ +import { PlusOutlined } from '@ant-design/icons'; +import { Button, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Button, Typography } from 'antd'; -import { PlusOutlined } from '@ant-design/icons'; -import { ANTD_GRAY } from '../../../../constants'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Container = styled.div``; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx index 9b684486cb..a219197553 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx @@ -1,11 +1,17 @@ -import React from 'react'; -import styled from 'styled-components'; import { EditFilled } from '@ant-design/icons'; import { Button, Typography } from 'antd'; -import { DataContractState } from '../../../../../../../types.generated'; -import { AssertionStatusSummary } from '../types'; -import { getContractSummaryIcon, getContractSummaryTitle, getContractSummaryMessage } from './utils'; -import { ANTD_GRAY } from '../../../../constants'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { + getContractSummaryIcon, + getContractSummaryMessage, + getContractSummaryTitle, +} from '@app/entity/shared/tabs/Dataset/Validations/contract/utils'; +import { AssertionStatusSummary } from '@app/entity/shared/tabs/Dataset/Validations/types'; + +import { DataContractState } from '@types'; const SummaryHeader = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx index 6a892ebe24..f6ad73fcc1 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx @@ -1,11 +1,17 @@ -import React from 'react'; -import styled from 'styled-components'; import { ArrowRightOutlined } from '@ant-design/icons'; import { Button } from 'antd'; -import { Assertion } from '../../../../../../../types.generated'; -import { StyledCheckOutlined, StyledCloseOutlined, StyledExclamationOutlined } from '../shared/styledComponents'; -import { getAssertionsSummary } from '../utils'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../../constants'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entity/shared/constants'; +import { + StyledCheckOutlined, + StyledCloseOutlined, + StyledExclamationOutlined, +} from '@app/entity/shared/tabs/Dataset/Validations/shared/styledComponents'; +import { getAssertionsSummary } from '@app/entity/shared/tabs/Dataset/Validations/utils'; + +import { Assertion } from '@types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx index 52a7eca873..4f934faf35 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx @@ -1,16 +1,18 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import { useGetDatasetContractQuery } from '../../../../../../../graphql/contract.generated'; -import { DataContractState } from '../../../../../../../types.generated'; -import { useEntityData } from '../../../../EntityContext'; -import { DataContractEmptyState } from './DataContractEmptyState'; -import { DataContractSummary } from './DataContractSummary'; -import { DataQualityContractSummary } from './DataQualityContractSummary'; -import { SchemaContractSummary } from './SchemaContractSummary'; -import { FreshnessContractSummary } from './FreshnessContractSummary'; -import { DataContractBuilderModal } from './builder/DataContractBuilderModal'; -import { createBuilderState } from './builder/utils'; -import { getAssertionsSummary } from '../utils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { DataContractEmptyState } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractEmptyState'; +import { DataContractSummary } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummary'; +import { DataQualityContractSummary } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary'; +import { FreshnessContractSummary } from '@app/entity/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary'; +import { SchemaContractSummary } from '@app/entity/shared/tabs/Dataset/Validations/contract/SchemaContractSummary'; +import { DataContractBuilderModal } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal'; +import { createBuilderState } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/utils'; +import { getAssertionsSummary } from '@app/entity/shared/tabs/Dataset/Validations/utils'; + +import { useGetDatasetContractQuery } from '@graphql/contract.generated'; +import { DataContractState } from '@types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx index 5b01540f85..0197cf487d 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx @@ -1,14 +1,16 @@ +import { Table } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Table } from 'antd'; -import { Assertion, DataQualityContract, DatasetAssertionInfo } from '../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../constants'; -import { DataContractAssertionStatus } from './DataContractAssertionStatus'; -import { DataContractSummaryFooter } from './DataContractSummaryFooter'; -import { DatasetAssertionDescription } from '../DatasetAssertionDescription'; -import { FieldAssertionDescription } from '../FieldAssertionDescription'; -import { SqlAssertionDescription } from '../SqlAssertionDescription'; -import { VolumeAssertionDescription } from '../VolumeAssertionDescription'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DatasetAssertionDescription } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription'; +import { FieldAssertionDescription } from '@app/entity/shared/tabs/Dataset/Validations/FieldAssertionDescription'; +import { SqlAssertionDescription } from '@app/entity/shared/tabs/Dataset/Validations/SqlAssertionDescription'; +import { VolumeAssertionDescription } from '@app/entity/shared/tabs/Dataset/Validations/VolumeAssertionDescription'; +import { DataContractAssertionStatus } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus'; +import { DataContractSummaryFooter } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter'; + +import { Assertion, DataQualityContract, DatasetAssertionInfo } from '@types'; const TitleText = styled.div` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx index efd0151b69..d9780856da 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx @@ -1,11 +1,13 @@ +import { ClockCircleOutlined } from '@ant-design/icons'; +import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Divider } from 'antd'; -import { ClockCircleOutlined } from '@ant-design/icons'; -import { FreshnessContract } from '../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../constants'; -import { DataContractSummaryFooter } from './DataContractSummaryFooter'; -import { FreshnessScheduleSummary } from './FreshnessScheduleSummary'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DataContractSummaryFooter } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter'; +import { FreshnessScheduleSummary } from '@app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary'; + +import { FreshnessContract } from '@types'; const Container = styled.div` padding: 28px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx index 3659e527a8..e51918a95e 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx @@ -1,11 +1,9 @@ -import React from 'react'; import cronstrue from 'cronstrue'; -import { - FreshnessAssertionSchedule, - FreshnessAssertionScheduleType, - CronSchedule, -} from '../../../../../../../types.generated'; -import { capitalizeFirstLetter } from '../../../../../../shared/textUtil'; +import React from 'react'; + +import { capitalizeFirstLetter } from '@app/shared/textUtil'; + +import { CronSchedule, FreshnessAssertionSchedule, FreshnessAssertionScheduleType } from '@types'; type Props = { definition: FreshnessAssertionSchedule; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx index 7313a10646..3f8315b4a3 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx @@ -1,9 +1,11 @@ +import { Table } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Table } from 'antd'; -import { SchemaContract } from '../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../constants'; -import { DataContractSummaryFooter } from './DataContractSummaryFooter'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DataContractSummaryFooter } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter'; + +import { SchemaContract } from '@types'; const TitleText = styled.div` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx index f96149dd0b..8e4a3d8e35 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx @@ -1,9 +1,11 @@ import React from 'react'; import styled from 'styled-components'; -import { Assertion } from '../../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../../constants'; -import { DataContractCategoryType } from './types'; -import { DatasetAssertionsList } from '../../DatasetAssertionsList'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DatasetAssertionsList } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList'; +import { DataContractCategoryType } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/types'; + +import { Assertion } from '@types'; const Category = styled.div` padding: 20px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx index 0e6aef52a1..f29a33b160 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx @@ -1,16 +1,22 @@ -import React, { useState } from 'react'; -import { message, Button } from 'antd'; -import styled from 'styled-components'; +import { Button, message } from 'antd'; import lodash from 'lodash'; -import { DataContract, AssertionType, Assertion } from '../../../../../../../../types.generated'; -import { DataContractBuilderState, DataContractCategoryType, DEFAULT_BUILDER_STATE } from './types'; -import { buildUpsertDataContractMutationVariables } from './utils'; -import { useUpsertDataContractMutation } from '../../../../../../../../graphql/contract.generated'; -import { createAssertionGroups } from '../../utils'; -import { DataContractAssertionGroupSelect } from './DataContractAssertionGroupSelect'; -import { ANTD_GRAY } from '../../../../../constants'; -import { DATA_QUALITY_ASSERTION_TYPES } from '../utils'; -import { useGetDatasetAssertionsQuery } from '../../../../../../../../graphql/dataset.generated'; +import React, { useState } from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DataContractAssertionGroupSelect } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect'; +import { + DEFAULT_BUILDER_STATE, + DataContractBuilderState, + DataContractCategoryType, +} from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/types'; +import { buildUpsertDataContractMutationVariables } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/utils'; +import { DATA_QUALITY_ASSERTION_TYPES } from '@app/entity/shared/tabs/Dataset/Validations/contract/utils'; +import { createAssertionGroups } from '@app/entity/shared/tabs/Dataset/Validations/utils'; + +import { useUpsertDataContractMutation } from '@graphql/contract.generated'; +import { useGetDatasetAssertionsQuery } from '@graphql/dataset.generated'; +import { Assertion, AssertionType, DataContract } from '@types'; const AssertionsSection = styled.div` border: 0.5px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx index e678ce5c33..44c1ba8afc 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx @@ -1,9 +1,11 @@ -import React from 'react'; import { Modal, Typography } from 'antd'; -import { DataContract } from '../../../../../../../../types.generated'; -import ClickOutside from '../../../../../../../shared/ClickOutside'; -import { DataContractBuilderState } from './types'; -import { DataContractBuilder } from './DataContractBuilder'; +import React from 'react'; + +import { DataContractBuilder } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder'; +import { DataContractBuilderState } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/types'; +import ClickOutside from '@app/shared/ClickOutside'; + +import { DataContract } from '@types'; const modalStyle = {}; const modalBodyStyle = { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/utils.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/utils.ts index 7eeb526d2b..1cbe574ec1 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/utils.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/utils.ts @@ -1,5 +1,9 @@ -import { DataContract } from '../../../../../../../../types.generated'; -import { DataContractBuilderState, DataContractCategoryType } from './types'; +import { + DataContractBuilderState, + DataContractCategoryType, +} from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/types'; + +import { DataContract } from '@types'; /** * Creates a builder state instance from a Data Contract object. diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/utils.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/utils.tsx index 537750ec27..efa53dc33d 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/utils.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/utils.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { CheckOutlined, ClockCircleOutlined, @@ -6,11 +5,18 @@ import { ExclamationCircleFilled, StopOutlined, } from '@ant-design/icons'; -import { Assertion, AssertionType, DataContract, DataContractState } from '../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../constants'; -import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX, WARNING_COLOR_HEX } from '../utils'; -import { DataContractCategoryType } from './builder/types'; -import { AssertionStatusSummary } from '../types'; +import React from 'react'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DataContractCategoryType } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/types'; +import { AssertionStatusSummary } from '@app/entity/shared/tabs/Dataset/Validations/types'; +import { + FAILURE_COLOR_HEX, + SUCCESS_COLOR_HEX, + WARNING_COLOR_HEX, +} from '@app/entity/shared/tabs/Dataset/Validations/utils'; + +import { Assertion, AssertionType, DataContract, DataContractState } from '@types'; export const getContractSummaryIcon = (state: DataContractState, summary: AssertionStatusSummary) => { if (state === DataContractState.Pending) { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts index 3c6e14f1d8..cd6039a849 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts @@ -1,3 +1,6 @@ +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { parseMaybeStringAsFloatOrDefault } from '@app/shared/numberUtil'; + import { AssertionStdOperator, AssertionStdParameters, @@ -5,9 +8,7 @@ import { FieldAssertionType, FieldMetricType, FieldTransformType, -} from '../../../../../../types.generated'; -import { formatNumberWithoutAbbreviation } from '../../../../../shared/formatNumber'; -import { parseMaybeStringAsFloatOrDefault } from '../../../../../shared/numberUtil'; +} from '@types'; const ASSERTION_OPERATOR_TO_DESCRIPTION: Record = { [AssertionStdOperator.EqualTo]: 'Is equal to', diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/shared/styledComponents.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/shared/styledComponents.tsx index 14651899a3..66661f224b 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/shared/styledComponents.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/shared/styledComponents.tsx @@ -1,7 +1,12 @@ -import styled from 'styled-components'; import { CheckOutlined, ClockCircleOutlined, CloseOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; -import { ANTD_GRAY } from '../../../../constants'; -import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX, WARNING_COLOR_HEX } from '../utils'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { + FAILURE_COLOR_HEX, + SUCCESS_COLOR_HEX, + WARNING_COLOR_HEX, +} from '@app/entity/shared/tabs/Dataset/Validations/utils'; export const StyledCheckOutlined = styled(CheckOutlined)` color: ${SUCCESS_COLOR_HEX}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/types.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/types.tsx index 8a70a3d87c..abb91d7de1 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/types.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/types.tsx @@ -1,4 +1,4 @@ -import { Assertion, AssertionType } from '../../../../../../types.generated'; +import { Assertion, AssertionType } from '@types'; export type AssertionStatusSummary = { passing: number; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/utils.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/utils.tsx index 019271b473..060fed7c19 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/utils.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/utils.tsx @@ -1,16 +1,22 @@ +import { + ApiOutlined, + CheckOutlined, + ClockCircleOutlined, + CloseOutlined, + CodeOutlined, + ConsoleSqlOutlined, + ExclamationCircleOutlined, + ProjectOutlined, + TableOutlined, +} from '@ant-design/icons'; import React from 'react'; import styled from 'styled-components'; -import { - ClockCircleOutlined, - TableOutlined, - ProjectOutlined, - ConsoleSqlOutlined, - CheckOutlined, - CloseOutlined, - ApiOutlined, - CodeOutlined, - ExclamationCircleOutlined, -} from '@ant-design/icons'; + +import { sortAssertions } from '@app/entity/shared/tabs/Dataset/Validations/assertionUtils'; +import { AssertionGroup, AssertionStatusSummary } from '@app/entity/shared/tabs/Dataset/Validations/types'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { parseMaybeStringAsFloatOrDefault } from '@app/shared/numberUtil'; + import { Assertion, AssertionResultType, @@ -21,11 +27,7 @@ import { EntityType, VolumeAssertionInfo, VolumeAssertionType, -} from '../../../../../../types.generated'; -import { sortAssertions } from './assertionUtils'; -import { AssertionGroup, AssertionStatusSummary } from './types'; -import { formatNumberWithoutAbbreviation } from '../../../../../shared/formatNumber'; -import { parseMaybeStringAsFloatOrDefault } from '../../../../../shared/numberUtil'; +} from '@types'; export const SUCCESS_COLOR_HEX = '#52C41A'; export const FAILURE_COLOR_HEX = '#F5222D'; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/View/ViewDefinitionTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/View/ViewDefinitionTab.tsx index 3f8dc21d52..39ede18bd2 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/View/ViewDefinitionTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/View/ViewDefinitionTab.tsx @@ -1,12 +1,14 @@ import { Radio, Typography } from 'antd'; import React, { useState } from 'react'; -import styled from 'styled-components'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; -import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated'; -import { ANTD_GRAY } from '../../../constants'; -import { useBaseEntity } from '../../../EntityContext'; -import { InfoItem } from '../../../components/styled/InfoItem'; -import { DBT_URN } from '../../../../../ingest/source/builder/constants'; +import styled from 'styled-components'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { InfoItem } from '@app/entity/shared/components/styled/InfoItem'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DBT_URN } from '@app/ingest/source/builder/constants'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; const InfoSection = styled.div` border-bottom: 1px solid ${ANTD_GRAY[4.5]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/DocumentationTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/DocumentationTab.tsx index 344c2aef87..dbea1ecff0 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/DocumentationTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/DocumentationTab.tsx @@ -1,21 +1,19 @@ -import React, { useEffect } from 'react'; -import queryString from 'query-string'; -import { useLocation } from 'react-router-dom'; - -import styled from 'styled-components'; -import { Button, Divider, Typography } from 'antd'; import { EditOutlined, ExpandAltOutlined } from '@ant-design/icons'; +import { Button, Divider, Typography } from 'antd'; +import queryString from 'query-string'; +import React, { useEffect } from 'react'; +import { useLocation } from 'react-router-dom'; +import styled from 'styled-components'; -import TabToolbar from '../../components/styled/TabToolbar'; -import { AddLinkModal } from '../../components/styled/AddLinkModal'; -import { EmptyTab } from '../../components/styled/EmptyTab'; -import { DescriptionEditor } from './components/DescriptionEditor'; -import { LinkList } from './components/LinkList'; - -import { useEntityData, useRefetch, useRouteToTab } from '../../EntityContext'; -import { EDITED_DESCRIPTIONS_CACHE_NAME } from '../../utils'; -import { Editor } from './components/editor/Editor'; -import { DescriptionPreviewModal } from './components/DescriptionPreviewModal'; +import { useEntityData, useRefetch, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { AddLinkModal } from '@app/entity/shared/components/styled/AddLinkModal'; +import { EmptyTab } from '@app/entity/shared/components/styled/EmptyTab'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { DescriptionEditor } from '@app/entity/shared/tabs/Documentation/components/DescriptionEditor'; +import { DescriptionPreviewModal } from '@app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal'; +import { LinkList } from '@app/entity/shared/tabs/Documentation/components/LinkList'; +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; +import { EDITED_DESCRIPTIONS_CACHE_NAME } from '@app/entity/shared/utils'; const DocumentationContainer = styled.div` margin: 0 32px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx index ea8afce4e9..172e6ed4f1 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx @@ -2,11 +2,13 @@ import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import DOMPurify from 'dompurify'; import React from 'react'; -import { mocks } from '../../../../../../Mocks'; -import { EntityType } from '../../../../../../types.generated'; -import TestPageContainer from '../../../../../../utils/test-utils/TestPageContainer'; -import { EntityContext } from '../../../EntityContext'; -import { DocumentationTab } from '../DocumentationTab'; + +import { EntityContext } from '@app/entity/shared/EntityContext'; +import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { EntityType } from '@types'; describe('SchemaDescriptionField', () => { it('renders original description', async () => { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx index 0877779d8b..939c88a178 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx @@ -1,4 +1,4 @@ -import { htmlToMarkdown } from '../../../../components/editor/extensions/htmlToMarkdown'; +import { htmlToMarkdown } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown'; const cases = [ ['strike', 'Lorem ipsum', '~Lorem ipsum~'], diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx index 5e2e9034a9..c10e8c82b9 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx @@ -1,4 +1,4 @@ -import { markdownToHtml } from '../../../../components/editor/extensions/markdownToHtml'; +import { markdownToHtml } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/markdownToHtml'; const cases = [ [ diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx index a4dbb2a1f9..8f056ae798 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx @@ -1,7 +1,8 @@ import React, { useCallback, useEffect, useState } from 'react'; import styled from 'styled-components'; + +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; import { Button } from '@src/alchemy-components'; -import { Editor } from './editor/Editor'; const LINE_HEIGHT = 1.5; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditor.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditor.tsx index 49bf682944..5ff348a363 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditor.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditor.tsx @@ -1,15 +1,17 @@ -import React, { useState, useEffect } from 'react'; import { message } from 'antd'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components/macro'; -import analytics, { EventType, EntityActionType } from '../../../../../analytics'; -import { GenericEntityUpdate } from '../../../types'; -import { useEntityData, useEntityUpdate, useMutationUrn, useRefetch } from '../../../EntityContext'; -import { useUpdateDescriptionMutation } from '../../../../../../graphql/mutations.generated'; -import { DiscardDescriptionModal } from './DiscardDescriptionModal'; -import { EDITED_DESCRIPTIONS_CACHE_NAME } from '../../../utils'; -import { DescriptionEditorToolbar } from './DescriptionEditorToolbar'; -import { Editor } from './editor/Editor'; -import SourceDescription from './SourceDesription'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useEntityData, useEntityUpdate, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import { DescriptionEditorToolbar } from '@app/entity/shared/tabs/Documentation/components/DescriptionEditorToolbar'; +import { DiscardDescriptionModal } from '@app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal'; +import SourceDescription from '@app/entity/shared/tabs/Documentation/components/SourceDesription'; +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; +import { GenericEntityUpdate } from '@app/entity/shared/types'; +import { EDITED_DESCRIPTIONS_CACHE_NAME } from '@app/entity/shared/utils'; + +import { useUpdateDescriptionMutation } from '@graphql/mutations.generated'; const EditorContainer = styled.div` flex: 1; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx index 07e197049c..b8d5edced7 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx @@ -1,7 +1,8 @@ import { CheckOutlined } from '@ant-design/icons'; import { Button } from 'antd'; import React from 'react'; -import TabToolbar from '../../../components/styled/TabToolbar'; + +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; type DescriptionEditorToolbarProps = { disableSave: boolean; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreview.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreview.tsx index 90f887976e..b6346e23dc 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreview.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreview.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { Editor } from './editor/Editor'; -import { DescriptionPreviewToolbar } from './DescriptionPreviewToolbar'; + +import { DescriptionPreviewToolbar } from '@app/entity/shared/tabs/Documentation/components/DescriptionPreviewToolbar'; +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; const EditorContainer = styled.div` overflow: auto; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx index fe91668ef0..f5810ca1d2 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx @@ -1,9 +1,10 @@ -import React from 'react'; import { Modal } from 'antd'; -import ClickOutside from '../../../../../shared/ClickOutside'; -import { DescriptionEditor } from './DescriptionEditor'; -import { DescriptionPreview } from './DescriptionPreview'; -import { useRouteToTab } from '../../../EntityContext'; +import React from 'react'; + +import { useRouteToTab } from '@app/entity/shared/EntityContext'; +import { DescriptionEditor } from '@app/entity/shared/tabs/Documentation/components/DescriptionEditor'; +import { DescriptionPreview } from '@app/entity/shared/tabs/Documentation/components/DescriptionPreview'; +import ClickOutside from '@app/shared/ClickOutside'; const modalStyle = { top: '5%', diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx index 590322190e..e76f18bc4e 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { EditOutlined } from '@ant-design/icons'; import { Button } from 'antd'; -import TabToolbar from '../../../components/styled/TabToolbar'; +import React from 'react'; + +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; type DescriptionPreviewToolbarProps = { onEdit: () => void; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx index 72a7b9c5e9..0fd3399398 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx @@ -1,5 +1,5 @@ +import { Button, Modal } from 'antd'; import React from 'react'; -import { Modal, Button } from 'antd'; type Props = { cancelModalVisible?: boolean; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx index bfc516a796..c98755a707 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx @@ -1,15 +1,17 @@ +import { DeleteOutlined, EditOutlined, LinkOutlined } from '@ant-design/icons'; +import { Button, Form, Input, List, Modal, Typography, message } from 'antd'; import React, { useState } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { message, Button, List, Typography, Modal, Form, Input } from 'antd'; -import { LinkOutlined, DeleteOutlined, EditOutlined } from '@ant-design/icons'; -import { InstitutionalMemoryMetadata } from '../../../../../../types.generated'; -import { useEntityData, useMutationUrn } from '../../../EntityContext'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../../constants'; -import { formatDateString } from '../../../containers/profile/utils'; -import { useAddLinkMutation, useRemoveLinkMutation } from '../../../../../../graphql/mutations.generated'; -import analytics, { EntityActionType, EventType } from '../../../../../analytics'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useEntityData, useMutationUrn } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { formatDateString } from '@app/entity/shared/containers/profile/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useAddLinkMutation, useRemoveLinkMutation } from '@graphql/mutations.generated'; +import { InstitutionalMemoryMetadata } from '@types'; const LinkListItem = styled(List.Item)` border-radius: 5px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/SourceDesription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/SourceDesription.tsx index 18a2aa8379..b76d3fcb69 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/SourceDesription.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/SourceDesription.tsx @@ -1,9 +1,10 @@ import React from 'react'; import styled from 'styled-components'; -import { useEntityData } from '../../../EntityContext'; -import { ANTD_GRAY } from '../../../constants'; -import DescriptionSection from '../../../containers/profile/sidebar/AboutSection/DescriptionSection'; -import { getPlatformName } from '../../../utils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import DescriptionSection from '@app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection'; +import { getPlatformName } from '@app/entity/shared/utils'; const SourceDescriptionWrapper = styled.div` border-top: 1px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/Editor.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/Editor.tsx index 8ee0f63709..617b4a7ebe 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/Editor.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/Editor.tsx @@ -1,5 +1,7 @@ -import React, { forwardRef, useEffect, useImperativeHandle, useState } from 'react'; +import { EditorComponent, Remirror, TableComponents, ThemeProvider, useRemirror } from '@remirror/react'; import DOMPurify from 'dompurify'; +import React, { forwardRef, useEffect, useImperativeHandle, useState } from 'react'; +import { useMount } from 'react-use'; import { BlockquoteExtension, BoldExtension, @@ -21,18 +23,17 @@ import { TableExtension, UnderlineExtension, } from 'remirror/extensions'; -import { EditorComponent, Remirror, useRemirror, ThemeProvider, TableComponents } from '@remirror/react'; -import { useMount } from 'react-use'; -import { EditorContainer, EditorTheme } from './EditorTheme'; -import { htmlToMarkdown } from './extensions/htmlToMarkdown'; -import { markdownToHtml } from './extensions/markdownToHtml'; -import { CodeBlockToolbar } from './toolbar/CodeBlockToolbar'; -import { FloatingToolbar } from './toolbar/FloatingToolbar'; -import { Toolbar } from './toolbar/Toolbar'; -import { OnChangeMarkdown } from './OnChangeMarkdown'; -import { TableCellMenu } from './toolbar/TableCellMenu'; -import { DataHubMentionsExtension } from './extensions/mentions/DataHubMentionsExtension'; -import { MentionsComponent } from './extensions/mentions/MentionsComponent'; + +import { EditorContainer, EditorTheme } from '@app/entity/shared/tabs/Documentation/components/editor/EditorTheme'; +import { OnChangeMarkdown } from '@app/entity/shared/tabs/Documentation/components/editor/OnChangeMarkdown'; +import { htmlToMarkdown } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown'; +import { markdownToHtml } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/markdownToHtml'; +import { DataHubMentionsExtension } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension'; +import { MentionsComponent } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent'; +import { CodeBlockToolbar } from '@app/entity/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar'; +import { FloatingToolbar } from '@app/entity/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar'; +import { TableCellMenu } from '@app/entity/shared/tabs/Documentation/components/editor/toolbar/TableCellMenu'; +import { Toolbar } from '@app/entity/shared/tabs/Documentation/components/editor/toolbar/Toolbar'; type EditorProps = { readOnly?: boolean; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/EditorTheme.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/EditorTheme.tsx index b3cc3c6a22..58bed377ab 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/EditorTheme.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/EditorTheme.tsx @@ -1,7 +1,3 @@ -import { defaultRemirrorTheme } from '@remirror/theme'; -import type { RemirrorThemeType } from '@remirror/theme'; -import styled from 'styled-components'; - import { extensionBlockquoteStyledCss, extensionCalloutStyledCss, @@ -15,8 +11,11 @@ import { extensionPositionerStyledCss, extensionTablesStyledCss, } from '@remirror/styles/styled-components'; +import { defaultRemirrorTheme } from '@remirror/theme'; +import type { RemirrorThemeType } from '@remirror/theme'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../constants'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; export const EditorTheme: RemirrorThemeType = { ...defaultRemirrorTheme, diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx index b6a090f892..f1e1759f49 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx @@ -1,6 +1,6 @@ -import { useCallback } from 'react'; -import { useExtensionEvent, useHelpers } from '@remirror/react'; import { DocChangedExtension } from '@remirror/core'; +import { useExtensionEvent, useHelpers } from '@remirror/react'; +import { useCallback } from 'react'; export interface OnChangeMarkdownProps { onChange: (md: string) => void; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx index 08be95192d..5fc46f37cc 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { render } from '@testing-library/react'; -import { Editor } from '../Editor'; +import React from 'react'; + +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; // setupTests mocks Editor for all tests. We want to use the actual editor for this test module vi.mock('../Editor', async () => vi.importActual('../Editor')); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown.tsx index 45a9e85882..1693c96bb8 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown.tsx @@ -1,7 +1,8 @@ +import { ErrorConstant, defaultImport, invariant, isElementDomNode } from '@remirror/core'; import _TurndownService from 'turndown'; import { gfm } from 'turndown-plugin-gfm'; -import { defaultImport, ErrorConstant, invariant, isElementDomNode } from '@remirror/core'; -import { DATAHUB_MENTION_ATTRS } from './mentions/DataHubMentionsExtension'; + +import { DATAHUB_MENTION_ATTRS } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension'; const TurndownService = defaultImport(_TurndownService); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/markdownToHtml.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/markdownToHtml.tsx index 07efa16a98..0e74fb51e5 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/markdownToHtml.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/markdownToHtml.tsx @@ -1,5 +1,6 @@ import { marked } from 'marked'; -import { DATAHUB_MENTION_ATTRS } from './mentions/DataHubMentionsExtension'; + +import { DATAHUB_MENTION_ATTRS } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension'; marked.use({ renderer: { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension.tsx index ed7881b340..612ea40b6c 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension.tsx @@ -1,19 +1,17 @@ /* eslint-disable class-methods-use-this */ -import React, { ComponentType } from 'react'; -import type { Plugin } from 'prosemirror-state'; import { ApplySchemaAttributes, CommandFunction, - extension, ExtensionTag, FromToProps, Handler, - isElementDomNode, NodeExtension, NodeExtensionSpec, NodeSpecOverride, - omitExtraAttributes, ProsemirrorAttributes, + extension, + isElementDomNode, + omitExtraAttributes, } from '@remirror/core'; import { NodeViewComponentProps } from '@remirror/react'; import autocomplete, { @@ -21,7 +19,10 @@ import autocomplete, { AutocompleteAction, pluginKey as acPluginKey, } from 'prosemirror-autocomplete'; -import { MentionsNodeView } from './MentionsNodeView'; +import type { Plugin } from 'prosemirror-state'; +import React, { ComponentType } from 'react'; + +import { MentionsNodeView } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView'; export const DATAHUB_MENTION_ATTRS = { urn: 'data-datahub-mention-urn', diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent.tsx index ded444d940..d4ba913a70 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent.tsx @@ -1,13 +1,15 @@ -import React, { useEffect, useState } from 'react'; -import { useDebounce } from 'react-use'; import { FloatingWrapper } from '@remirror/react'; import { Empty, Spin } from 'antd'; -import styled from 'styled-components'; +import React, { useEffect, useState } from 'react'; +import { useDebounce } from 'react-use'; import { Positioner, selectionPositioner } from 'remirror/extensions'; -import { useGetAutoCompleteMultipleResultsLazyQuery } from '../../../../../../../../../graphql/search.generated'; -import { MentionsDropdown } from './MentionsDropdown'; -import { useDataHubMentions } from './useDataHubMentions'; -import { useUserContext } from '../../../../../../../../context/useUserContext'; +import styled from 'styled-components'; + +import { useUserContext } from '@app/context/useUserContext'; +import { MentionsDropdown } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown'; +import { useDataHubMentions } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions'; + +import { useGetAutoCompleteMultipleResultsLazyQuery } from '@graphql/search.generated'; const Container = styled.div` position: relative; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown.tsx index f4720f5e80..d47a2c3ea0 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown.tsx @@ -1,13 +1,15 @@ -import React, { useCallback, useMemo, useState } from 'react'; -import { Typography } from 'antd'; -import styled from 'styled-components'; -import { useDebounce } from 'react-use'; import { useCommands } from '@remirror/react'; -import { AutoCompleteResultForEntity, Entity, EntityType } from '../../../../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../../../../../constants'; -import { useDataHubMentions } from './useDataHubMentions'; -import AutoCompleteItem from '../../../../../../../../search/autoComplete/AutoCompleteItem'; +import { Typography } from 'antd'; +import React, { useCallback, useMemo, useState } from 'react'; +import { useDebounce } from 'react-use'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useDataHubMentions } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions'; +import AutoCompleteItem from '@app/search/autoComplete/AutoCompleteItem'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { AutoCompleteResultForEntity, Entity, EntityType } from '@types'; const HeaderItem = styled(Typography.Text)` display: block; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView.tsx index 842343dba7..b3941fe38b 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView.tsx @@ -1,13 +1,14 @@ -import React from 'react'; +import { NodeViewComponentProps } from '@remirror/react'; import { Tooltip, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { NodeViewComponentProps } from '@remirror/react'; -import { HoverEntityTooltip } from '../../../../../../../../recommendations/renderer/component/HoverEntityTooltip'; -import { useGetEntityMentionNodeQuery } from '../../../../../../../../../graphql/search.generated'; -import { useEntityRegistry } from '../../../../../../../../useEntityRegistry'; -import { IconStyleType } from '../../../../../../../Entity'; -import { ANTD_GRAY } from '../../../../../../constants'; +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetEntityMentionNodeQuery } from '@graphql/search.generated'; const { Text } = Typography; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions.ts b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions.ts index 8a4fd37b5e..b8a72ad187 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions.ts @@ -1,7 +1,8 @@ -import { useCallback, useEffect, useState } from 'react'; import { useRemirrorContext } from '@remirror/react'; import { ActionKind, AutocompleteAction, FromTo } from 'prosemirror-autocomplete'; -import { DataHubMentionsExtension } from './DataHubMentionsExtension'; +import { useCallback, useEffect, useState } from 'react'; + +import { DataHubMentionsExtension } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension'; type State = { active: boolean; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx index 5dc18564a0..528c86f699 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx @@ -1,8 +1,9 @@ -import React, { useState } from 'react'; -import { Form, Input, Modal, Typography } from 'antd'; import { PictureOutlined } from '@ant-design/icons'; import { useCommands } from '@remirror/react'; -import { CommandButton } from './CommandButton'; +import { Form, Input, Modal, Typography } from 'antd'; +import React, { useState } from 'react'; + +import { CommandButton } from '@app/entity/shared/tabs/Documentation/components/editor/toolbar/CommandButton'; export const AddImageButton = () => { const [isModalVisible, setModalVisible] = useState(false); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx index f448d649ca..95359321da 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx @@ -1,9 +1,9 @@ -import React, { useState } from 'react'; import { LinkOutlined } from '@ant-design/icons'; import { useActive } from '@remirror/react'; +import React, { useState } from 'react'; -import { CommandButton } from './CommandButton'; -import { LinkModal } from './LinkModal'; +import { CommandButton } from '@app/entity/shared/tabs/Documentation/components/editor/toolbar/CommandButton'; +import { LinkModal } from '@app/entity/shared/tabs/Documentation/components/editor/toolbar/LinkModal'; export const AddLinkButton = () => { const [isModalVisible, setModalVisible] = useState(false); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx index 1aa7b0e514..0b4da056bc 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx @@ -1,11 +1,12 @@ -import React from 'react'; -import styled from 'styled-components'; -import { Select } from 'antd'; import { findParentNodeOfType, isElementDomNode } from '@remirror/core'; -import { defaultAbsolutePosition, hasStateChanged, isPositionVisible, Positioner } from 'remirror/extensions'; import { FloatingWrapper, useAttrs, useCommands } from '@remirror/react'; +import { Select } from 'antd'; +import React from 'react'; import { listLanguages } from 'refractor'; -import { ToolbarContainer } from './FloatingToolbar'; +import { Positioner, defaultAbsolutePosition, hasStateChanged, isPositionVisible } from 'remirror/extensions'; +import styled from 'styled-components'; + +import { ToolbarContainer } from '@app/entity/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar'; const StyledSelect = styled(Select)` min-width: 120px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx index 1ad47e5a0d..8abde14800 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx @@ -1,7 +1,7 @@ -import React, { MouseEventHandler, useCallback } from 'react'; -import { Button, ButtonProps, Tooltip } from 'antd'; import { capitalCase } from '@remirror/core'; import { useHelpers } from '@remirror/react'; +import { Button, ButtonProps, Tooltip } from 'antd'; +import React, { MouseEventHandler, useCallback } from 'react'; export interface CommandButtonProps extends Omit { active?: boolean; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx index bcd8e44b36..975cd014da 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx @@ -1,6 +1,3 @@ -import React, { useMemo, useState } from 'react'; -import styled from 'styled-components'; -import { Typography } from 'antd'; import { BoldOutlined, DisconnectOutlined, @@ -10,12 +7,15 @@ import { UnderlineOutlined, } from '@ant-design/icons'; import { FloatingWrapper, useActive, useAttrs, useCommands } from '@remirror/react'; +import { Typography } from 'antd'; +import React, { useMemo, useState } from 'react'; import { createMarkPositioner } from 'remirror/extensions'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../constants'; -import { CommandButton } from './CommandButton'; -import { LinkModal } from './LinkModal'; -import { CodeIcon } from './Icons'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { CommandButton } from '@app/entity/shared/tabs/Documentation/components/editor/toolbar/CommandButton'; +import { CodeIcon } from '@app/entity/shared/tabs/Documentation/components/editor/toolbar/Icons'; +import { LinkModal } from '@app/entity/shared/tabs/Documentation/components/editor/toolbar/LinkModal'; const { Text } = Typography; @@ -25,7 +25,10 @@ export const ToolbarContainer = styled.span` padding: 2px; background-color: ${ANTD_GRAY[1]}; border-radius: 4px; - box-shadow: 0 3px 6px -4px #0000001f, 0 6px 16px #00000014, 0 9px 28px 8px #0000000d; + box-shadow: + 0 3px 6px -4px #0000001f, + 0 6px 16px #00000014, + 0 9px 28px 8px #0000000d; overflow: hidden; z-index: 300; `; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/HeadingMenu.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/HeadingMenu.tsx index 0c24aadfd1..e62668ed64 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/HeadingMenu.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/HeadingMenu.tsx @@ -1,7 +1,7 @@ -import React, { MouseEventHandler, useCallback } from 'react'; -import { Select } from 'antd'; -import styled from 'styled-components'; import { useActive, useCommands } from '@remirror/react'; +import { Select } from 'antd'; +import React, { MouseEventHandler, useCallback } from 'react'; +import styled from 'styled-components'; const { Option } = Select; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/Icons.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/Icons.tsx index b7954fd7b6..2f967abaf9 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/Icons.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/Icons.tsx @@ -1,6 +1,6 @@ -import React from 'react'; import Icon from '@ant-design/icons'; import { CustomIconComponentProps } from '@ant-design/icons/lib/components/Icon'; +import React from 'react'; export const CodeIcon = (props: Partial) => ( { const { entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Embed/EmbedTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Embed/EmbedTab.tsx index 8732362b31..23bd630a93 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Embed/EmbedTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Embed/EmbedTab.tsx @@ -1,8 +1,9 @@ import { Empty } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; -import { useEntityData } from '../../EntityContext'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; const EmbedContainer = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/ChartDashboardsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/ChartDashboardsTab.tsx index fc1ff4784d..7119eaa840 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Entity/ChartDashboardsTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/ChartDashboardsTab.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { useBaseEntity } from '../../EntityContext'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from './components/EntityList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; export const ChartDashboardsTab = () => { const entity = useBaseEntity() as any; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardChartsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardChartsTab.tsx index 1b099eb1be..9990862c37 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardChartsTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardChartsTab.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { useBaseEntity } from '../../EntityContext'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from './components/EntityList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; export const DashboardChartsTab = () => { const entity = useBaseEntity() as any; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardDatasetsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardDatasetsTab.tsx index 758c412e03..c2629c449b 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardDatasetsTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardDatasetsTab.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { useBaseEntity } from '../../EntityContext'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from './components/EntityList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; export const DashboardDatasetsTab = () => { const entity = useBaseEntity() as any; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/DataFlowJobsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/DataFlowJobsTab.tsx index cccf8e1449..146f6efe94 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Entity/DataFlowJobsTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/DataFlowJobsTab.tsx @@ -1,9 +1,11 @@ import React, { useState } from 'react'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from './components/EntityList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { useGetDataFlowChildJobsQuery } from '../../../../../graphql/dataFlow.generated'; -import { SearchCfg } from '../../../../../conf'; + +import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { SearchCfg } from '@src/conf'; + +import { useGetDataFlowChildJobsQuery } from '@graphql/dataFlow.generated'; +import { EntityType } from '@types'; interface Props { properties?: { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/DataJobFlowTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/DataJobFlowTab.tsx index 1371a0aeb4..efa6685eda 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Entity/DataJobFlowTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/DataJobFlowTab.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { useBaseEntity } from '../../EntityContext'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from './components/EntityList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; export const DataJobFlowTab = () => { const entity = useBaseEntity() as any; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/InputFieldsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/InputFieldsTab.tsx index cee65793a8..7c4e7460c0 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Entity/InputFieldsTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/InputFieldsTab.tsx @@ -1,12 +1,14 @@ import { Empty } from 'antd'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { SchemaField } from '../../../../../types.generated'; -import SchemaEditableContext from '../../../../shared/SchemaEditableContext'; -import { groupByFieldPath } from '../../../dataset/profile/schema/utils/utils'; -import { ANTD_GRAY } from '../../constants'; -import { useEntityData } from '../../EntityContext'; -import SchemaTable from '../Dataset/Schema/SchemaTable'; + +import { groupByFieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import SchemaTable from '@app/entity/shared/tabs/Dataset/Schema/SchemaTable'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; + +import { SchemaField } from '@types'; const NoSchema = styled(Empty)` color: ${ANTD_GRAY[6]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx index 2e90dcedd1..e6c26e29c6 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx @@ -1,12 +1,14 @@ import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import React from 'react'; -import { dataJob1, mocks } from '../../../../../../Mocks'; -import { EntityType } from '../../../../../../types.generated'; -import TestPageContainer from '../../../../../../utils/test-utils/TestPageContainer'; -import { getDataForEntityType } from '../../../containers/profile/utils'; -import { EntityContext } from '../../../EntityContext'; -import { DataJobFlowTab } from '../DataJobFlowTab'; + +import { EntityContext } from '@app/entity/shared/EntityContext'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { DataJobFlowTab } from '@app/entity/shared/tabs/Entity/DataJobFlowTab'; +import { dataJob1, mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { EntityType } from '@types'; describe('DataJobFlowTab', () => { it('renders fields', async () => { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/components/EntityList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/components/EntityList.tsx index 9e07e928be..cd55622c43 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Entity/components/EntityList.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/components/EntityList.tsx @@ -1,11 +1,13 @@ -import React from 'react'; import { List, Pagination, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { PreviewType } from '../../../../Entity'; -import { EntityType } from '../../../../../../types.generated'; -import { SearchCfg } from '../../../../../../conf'; -import { Message } from '../../../../../shared/Message'; + +import { PreviewType } from '@app/entity/Entity'; +import { Message } from '@app/shared/Message'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { SearchCfg } from '@src/conf'; + +import { EntityType } from '@types'; const ScrollWrapper = styled.div` overflow: auto; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx index aea879d723..00eff5fae3 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx @@ -1,10 +1,10 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { StyledTable } from '../../../components/styled/StyledTable'; -import { ANTD_GRAY } from '../../../constants'; -import TableValueElement from './TableValueElement'; +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import TableValueElement from '@app/entity/shared/tabs/Entity/weaklyTypedAspects/TableValueElement'; type Props = { payload: string | undefined | null; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx index 419a2ae9f3..00fcf7d613 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx @@ -1,12 +1,13 @@ -import React from 'react'; import { Typography } from 'antd'; -import styled from 'styled-components'; +import React from 'react'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; -import DynamicTabularTab from './DynamicTabularTab'; -import DynamicPropertiesTab from './DynamicPropertiesTab'; -import { AspectRenderSpec } from '../../../../../../types.generated'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import DynamicPropertiesTab from '@app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab'; +import DynamicTabularTab from '@app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab'; + +import { AspectRenderSpec } from '@types'; type Props = { payload: string | undefined | null; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx index ea30dcc0b4..b5456381eb 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { StyledTable } from '../../../components/styled/StyledTable'; -import TableValueElement from './TableValueElement'; + +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import TableValueElement from '@app/entity/shared/tabs/Entity/weaklyTypedAspects/TableValueElement'; type Props = { payload: string | undefined | null; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/IncidentTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Incident/IncidentTab.tsx index f2b03a11ff..7100bba6af 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Incident/IncidentTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/IncidentTab.tsx @@ -1,18 +1,24 @@ +import { PlusOutlined } from '@ant-design/icons'; +import { Button, Empty, List, Select, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Button, Empty, List, Select, Typography } from 'antd'; -import { PlusOutlined } from '@ant-design/icons'; -import { useGetEntityIncidentsQuery } from '../../../../../graphql/incident.generated'; -import TabToolbar from '../../components/styled/TabToolbar'; -import { useEntityData } from '../../EntityContext'; -import IncidentListItem from './components/IncidentListItem'; -import { INCIDENT_DISPLAY_STATES, PAGE_SIZE, getIncidentsStatusSummary } from './incidentUtils'; -import { EntityType, Incident, IncidentState } from '../../../../../types.generated'; -import { IncidentSummary } from './components/IncidentSummary'; -import { AddIncidentModal } from './components/AddIncidentModal'; -import { combineEntityDataWithSiblings } from '../../siblingUtils'; -import { IncidentsLoadingSection } from './components/IncidentsLoadingSection'; -import { ANTD_GRAY } from '../../constants'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { combineEntityDataWithSiblings } from '@app/entity/shared/siblingUtils'; +import { AddIncidentModal } from '@app/entity/shared/tabs/Incident/components/AddIncidentModal'; +import IncidentListItem from '@app/entity/shared/tabs/Incident/components/IncidentListItem'; +import { IncidentSummary } from '@app/entity/shared/tabs/Incident/components/IncidentSummary'; +import { IncidentsLoadingSection } from '@app/entity/shared/tabs/Incident/components/IncidentsLoadingSection'; +import { + INCIDENT_DISPLAY_STATES, + PAGE_SIZE, + getIncidentsStatusSummary, +} from '@app/entity/shared/tabs/Incident/incidentUtils'; + +import { useGetEntityIncidentsQuery } from '@graphql/incident.generated'; +import { EntityType, Incident, IncidentState } from '@types'; const Header = styled.div` border-bottom: 1px solid ${ANTD_GRAY[3]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/AddIncidentModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/AddIncidentModal.tsx index 663575f062..6d9607dd9a 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/AddIncidentModal.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/AddIncidentModal.tsx @@ -1,16 +1,22 @@ -import React, { useState } from 'react'; -import { message, Modal, Button, Form, Input, Typography, Select } from 'antd'; import { useApolloClient } from '@apollo/client'; +import { Button, Form, Input, Modal, Select, Typography, message } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; -import analytics, { EventType, EntityActionType } from '../../../../../analytics'; -import { useEntityData } from '../../../EntityContext'; -import { EntityType, IncidentSourceType, IncidentState, IncidentType } from '../../../../../../types.generated'; -import { INCIDENT_DISPLAY_TYPES, PAGE_SIZE, addActiveIncidentToCache } from '../incidentUtils'; -import { useRaiseIncidentMutation } from '../../../../../../graphql/mutations.generated'; -import handleGraphQLError from '../../../../../shared/handleGraphQLError'; -import { useUserContext } from '../../../../../context/useUserContext'; -import { Editor } from '../../Documentation/components/editor/Editor'; -import { ANTD_GRAY } from '../../../constants'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; +import { + INCIDENT_DISPLAY_TYPES, + PAGE_SIZE, + addActiveIncidentToCache, +} from '@app/entity/shared/tabs/Incident/incidentUtils'; +import handleGraphQLError from '@app/shared/handleGraphQLError'; + +import { useRaiseIncidentMutation } from '@graphql/mutations.generated'; +import { EntityType, IncidentSourceType, IncidentState, IncidentType } from '@types'; const StyledEditor = styled(Editor)` border: 1px solid ${ANTD_GRAY[4.5]}; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentListItem.tsx b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentListItem.tsx index 5c413b1e8b..7c68d9ad04 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentListItem.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentListItem.tsx @@ -1,20 +1,22 @@ -import React, { useState } from 'react'; -import styled from 'styled-components'; -import { Button, Dropdown, List, message, Popover, Tag, Tooltip, Typography } from 'antd'; import { CheckCircleFilled, CheckOutlined, MoreOutlined, WarningFilled } from '@ant-design/icons'; +import { Button, Dropdown, List, Popover, Tag, Tooltip, Typography, message } from 'antd'; +import React, { useState } from 'react'; import { Link } from 'react-router-dom'; -import { EntityType, IncidentState, IncidentType } from '../../../../../../types.generated'; -import { FAILURE_COLOR_HEX, getNameFromType, SUCCESS_COLOR_HEX } from '../incidentUtils'; -import { useGetUserQuery } from '../../../../../../graphql/user.generated'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { toLocalDateTimeString, toRelativeTimeString } from '../../../../../shared/time/timeUtils'; -import { useEntityData, useRefetch } from '../../../EntityContext'; -import analytics, { EntityActionType, EventType } from '../../../../../analytics'; -import { useUpdateIncidentStatusMutation } from '../../../../../../graphql/mutations.generated'; -import { ResolveIncidentModal } from './ResolveIncidentModal'; -import handleGraphQLError from '../../../../../shared/handleGraphQLError'; -import { MenuItemStyle } from '../../../../view/menu/item/styledComponent'; -import MarkdownViewer from '../../../components/legacy/MarkdownViewer'; +import styled from 'styled-components'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import MarkdownViewer from '@app/entity/shared/components/legacy/MarkdownViewer'; +import { ResolveIncidentModal } from '@app/entity/shared/tabs/Incident/components/ResolveIncidentModal'; +import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX, getNameFromType } from '@app/entity/shared/tabs/Incident/incidentUtils'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; +import handleGraphQLError from '@app/shared/handleGraphQLError'; +import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useUpdateIncidentStatusMutation } from '@graphql/mutations.generated'; +import { useGetUserQuery } from '@graphql/user.generated'; +import { EntityType, IncidentState, IncidentType } from '@types'; type Props = { incident: any; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentSummary.tsx index deea514aa6..a08c072607 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentSummary.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentSummary.tsx @@ -1,9 +1,10 @@ -import React from 'react'; -import { CheckCircleFilled, WarningFilled, StopOutlined } from '@ant-design/icons'; +import { CheckCircleFilled, StopOutlined, WarningFilled } from '@ant-design/icons'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; -import { SUCCESS_COLOR_HEX, FAILURE_COLOR_HEX } from '../incidentUtils'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@app/entity/shared/tabs/Incident/incidentUtils'; const SummaryHeader = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentsLoadingSection.tsx b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentsLoadingSection.tsx index fd5d31ac9e..e0d51502ed 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentsLoadingSection.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentsLoadingSection.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Divider, Skeleton } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const Container = styled.div` diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/ResolveIncidentModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/ResolveIncidentModal.tsx index cdc82420a7..61ed37b1e3 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/ResolveIncidentModal.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/ResolveIncidentModal.tsx @@ -1,6 +1,7 @@ +import { Button, Form, Input, Modal } from 'antd'; import React from 'react'; -import { Modal, Button, Form, Input } from 'antd'; -import { IncidentState } from '../../../../../../types.generated'; + +import { IncidentState } from '@types'; const { TextArea } = Input; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/incidentUtils.ts b/datahub-web-react/src/app/entity/shared/tabs/Incident/incidentUtils.ts index 32e15b4cde..d6048d2edf 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Incident/incidentUtils.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/incidentUtils.ts @@ -1,6 +1,5 @@ -import { GetEntityIncidentsDocument } from '../../../../../graphql/incident.generated'; - -import { IncidentType, IncidentState, Incident } from '../../../../../types.generated'; +import { GetEntityIncidentsDocument } from '@graphql/incident.generated'; +import { Incident, IncidentState, IncidentType } from '@types'; export const PAGE_SIZE = 100; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx index 3b626181f8..7a381fb5ea 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx @@ -1,14 +1,15 @@ -import * as React from 'react'; -import { Button, Select, Tooltip } from 'antd'; -import { CaretDownOutlined } from '@ant-design/icons'; -import styled from 'styled-components/macro'; import { blue } from '@ant-design/colors'; +import { CaretDownOutlined } from '@ant-design/icons'; +import { Button, Select, Tooltip } from 'antd'; +import * as React from 'react'; import { useHistory, useLocation } from 'react-router'; -import { ImpactAnalysisIcon } from '../Dataset/Schema/components/MenuColumn'; -import updateQueryParams from '../../../../shared/updateQueryParams'; -import { downgradeV2FieldPath } from '../../../dataset/profile/schema/utils/utils'; -import { useEntityData } from '../../EntityContext'; -import { useGetEntityWithSchema } from '../Dataset/Schema/useGetEntitySchema'; +import styled from 'styled-components/macro'; + +import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ImpactAnalysisIcon } from '@app/entity/shared/tabs/Dataset/Schema/components/MenuColumn'; +import { useGetEntityWithSchema } from '@app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema'; +import updateQueryParams from '@app/shared/updateQueryParams'; const StyledSelect = styled(Select)` margin-right: 5px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/ImpactAnalysis.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/ImpactAnalysis.tsx index 7eeff26cc8..567ad548c6 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/ImpactAnalysis.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Lineage/ImpactAnalysis.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { LineageDirection } from '../../../../../types.generated'; -import generateUseSearchResultsViaRelationshipHook from './generateUseSearchResultsViaRelationshipHook'; -import { EmbeddedListSearchSection } from '../../components/styled/search/EmbeddedListSearchSection'; -import generateUseDownloadScrollAcrossLineageSearchResultsHook from './generateUseDownloadScrollAcrossLineageSearchResultsHook'; + +import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection'; +import generateUseDownloadScrollAcrossLineageSearchResultsHook from '@app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook'; +import generateUseSearchResultsViaRelationshipHook from '@app/entity/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook'; + +import { LineageDirection } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTab.tsx index a5debe43d4..9a94128576 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTab.tsx @@ -1,7 +1,3 @@ -import React, { useCallback, useState } from 'react'; -import { Button, Select, Tooltip, Typography } from 'antd'; -import * as QueryString from 'query-string'; -import { useHistory, useLocation } from 'react-router'; import { ArrowDownOutlined, ArrowUpOutlined, @@ -11,22 +7,27 @@ import { ReloadOutlined, SubnodeOutlined, } from '@ant-design/icons'; +import { Button, Select, Tooltip, Typography } from 'antd'; +import * as QueryString from 'query-string'; +import React, { useCallback, useState } from 'react'; +import { useHistory, useLocation } from 'react-router'; import styled from 'styled-components/macro'; -import { useEntityData } from '../../EntityContext'; -import TabToolbar from '../../components/styled/TabToolbar'; -import { getEntityPath } from '../../containers/profile/utils'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { ImpactAnalysis } from './ImpactAnalysis'; -import { LineageDirection } from '../../../../../types.generated'; -import { generateSchemaFieldUrn } from './utils'; -import { downgradeV2FieldPath } from '../../../dataset/profile/schema/utils/utils'; -import ColumnsLineageSelect from './ColumnLineageSelect'; -import { LineageTabContext } from './LineageTabContext'; -import ManageLineageMenu from '../../../../lineage/manage/ManageLineageMenu'; -import LineageTabTimeSelector from './LineageTabTimeSelector'; -import { useGetLineageTimeParams } from '../../../../lineage/utils/useGetLineageTimeParams'; -import { ANTD_GRAY } from '../../constants'; +import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { getEntityPath } from '@app/entity/shared/containers/profile/utils'; +import ColumnsLineageSelect from '@app/entity/shared/tabs/Lineage/ColumnLineageSelect'; +import { ImpactAnalysis } from '@app/entity/shared/tabs/Lineage/ImpactAnalysis'; +import { LineageTabContext } from '@app/entity/shared/tabs/Lineage/LineageTabContext'; +import LineageTabTimeSelector from '@app/entity/shared/tabs/Lineage/LineageTabTimeSelector'; +import { generateSchemaFieldUrn } from '@app/entity/shared/tabs/Lineage/utils'; +import ManageLineageMenu from '@app/lineage/manage/ManageLineageMenu'; +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { LineageDirection } from '@types'; const StyledTabToolbar = styled(TabToolbar)` justify-content: space-between; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabContext.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabContext.tsx index 4ef3728ebb..13f402e6cc 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabContext.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabContext.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { LineageDirection } from '../../../../../types.generated'; + +import { LineageDirection } from '@types'; export const LineageTabContext = React.createContext({ isColumnLevelLineage: false, diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabTimeSelector.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabTimeSelector.tsx index 9734bf8993..9562c5e931 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabTimeSelector.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabTimeSelector.tsx @@ -1,11 +1,12 @@ -import React from 'react'; import moment from 'moment'; +import React from 'react'; import { useHistory, useLocation } from 'react-router'; -import analytics, { EventType } from '../../../../analytics'; -import LineageTimeSelector from '../../../../lineage/LineageTimeSelector'; -import { getTimeFromNow } from '../../../../shared/time/timeUtils'; -import updateQueryParams from '../../../../shared/updateQueryParams'; -import { useGetLineageTimeParams } from '../../../../lineage/utils/useGetLineageTimeParams'; + +import analytics, { EventType } from '@app/analytics'; +import LineageTimeSelector from '@app/lineage/LineageTimeSelector'; +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; +import { getTimeFromNow } from '@app/shared/time/timeUtils'; +import updateQueryParams from '@app/shared/updateQueryParams'; export default function LineageTabTimeSelector() { const history = useHistory(); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTable.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTable.tsx index a31b24b3a0..1120339a1a 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTable.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTable.tsx @@ -1,12 +1,13 @@ -import React from 'react'; import { List } from 'antd'; -import styled from 'styled-components'; +import React from 'react'; import VisiblitySensor from 'react-visibility-sensor'; +import styled from 'styled-components'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { PreviewType } from '../../../Entity'; -import { Entity } from '../../../../../types.generated'; -import { ANTD_GRAY } from '../../constants'; +import { PreviewType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity } from '@types'; const LineageList = styled(List)` padding-left: 40px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts b/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts index 156471a6dd..9962726152 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts @@ -1,10 +1,11 @@ -import { useGetDownloadScrollAcrossLineageResultsQuery } from '../../../../../graphql/scroll.generated'; -import { LineageDirection } from '../../../../../types.generated'; import { DownloadSearchResults, DownloadSearchResultsInput, DownloadSearchResultsParams, -} from '../../../../search/utils/types'; +} from '@app/search/utils/types'; + +import { useGetDownloadScrollAcrossLineageResultsQuery } from '@graphql/scroll.generated'; +import { LineageDirection } from '@types'; /** * Generates a hook which can be used to download Scroll Across Lineage Results to CSV inside the diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts b/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts index e26aa01c38..6170414c89 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts @@ -1,7 +1,9 @@ import { useEffect } from 'react'; -import { useSearchAcrossLineageQuery } from '../../../../../graphql/search.generated'; -import { LineageDirection } from '../../../../../types.generated'; -import { GetSearchResultsParams } from '../../components/styled/search/types'; + +import { GetSearchResultsParams } from '@app/entity/shared/components/styled/search/types'; + +import { useSearchAcrossLineageQuery } from '@graphql/search.generated'; +import { LineageDirection } from '@types'; const filtersExist = (filters, orFilters) => { return filters?.length || orFilters?.length; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/utils.ts b/datahub-web-react/src/app/entity/shared/tabs/Lineage/utils.ts index ab43fe1214..ffadffaae1 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/utils.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Lineage/utils.ts @@ -1,4 +1,4 @@ -import { encodeSchemaField } from '../../../../lineage/utils/columnLineageUtils'; +import { encodeSchemaField } from '@app/lineage/utils/columnLineageUtils'; export function generateSchemaFieldUrn(fieldPath: string | undefined, resourceUrn: string) { if (!fieldPath) return null; diff --git a/datahub-web-react/src/app/entity/shared/tabs/ML/MlFeatureFeatureTableTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/ML/MlFeatureFeatureTableTab.tsx index bf2e42e8ea..4d815a5184 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/ML/MlFeatureFeatureTableTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/ML/MlFeatureFeatureTableTab.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { useBaseEntity } from '../../EntityContext'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from '../Entity/components/EntityList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { GetMlFeatureQuery } from '../../../../../graphql/mlFeature.generated'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetMlFeatureQuery } from '@graphql/mlFeature.generated'; +import { EntityType } from '@types'; export const FeatureTableTab = () => { const entity = useBaseEntity() as GetMlFeatureQuery; diff --git a/datahub-web-react/src/app/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx index ecad39fd45..f2054aa056 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { useBaseEntity } from '../../EntityContext'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from '../Entity/components/EntityList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { GetMlPrimaryKeyQuery } from '../../../../../graphql/mlPrimaryKey.generated'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetMlPrimaryKeyQuery } from '@graphql/mlPrimaryKey.generated'; +import { EntityType } from '@types'; export const FeatureTableTab = () => { const entity = useBaseEntity() as GetMlPrimaryKeyQuery; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/AddPropertyButton.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/AddPropertyButton.tsx index ca378af088..18e57f5edc 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/AddPropertyButton.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/AddPropertyButton.tsx @@ -1,5 +1,13 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { colors, Icon, Input as InputComponent, Text } from '@src/alchemy-components'; +import { Tooltip } from '@components'; +import { Dropdown } from 'antd'; +import React, { useMemo, useState } from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import EditStructuredPropertyModal from '@app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal'; +import { Icon, Input as InputComponent, Text, colors } from '@src/alchemy-components'; import { useUserContext } from '@src/app/context/useUserContext'; import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants'; import { getEntityTypesPropertyFilter, getNotHiddenPropertyFilter } from '@src/app/govern/structuredProperties/utils'; @@ -7,14 +15,7 @@ import { useEntityRegistry } from '@src/app/useEntityRegistry'; import { useIsThemeV2 } from '@src/app/useIsThemeV2'; import { PageRoutes } from '@src/conf/Global'; import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated'; -import { Dropdown } from 'antd'; -import { Tooltip } from '@components'; import { EntityType, Maybe, StructuredProperties, StructuredPropertyEntity } from '@src/types.generated'; -import React, { useMemo, useState } from 'react'; -import { Link } from 'react-router-dom'; -import styled from 'styled-components'; -import { useEntityData } from '../../EntityContext'; -import EditStructuredPropertyModal from './Edit/EditStructuredPropertyModal'; const AddButton = styled.div<{ isThemeV2: boolean; isV1Drawer?: boolean }>` border-radius: 200px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/CardinalityLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/CardinalityLabel.tsx index 14d3b21665..c260268f87 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/CardinalityLabel.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/CardinalityLabel.tsx @@ -1,9 +1,11 @@ import { Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { PropertyCardinality, StructuredPropertyEntity } from '../../../../../types.generated'; -import { PropertyTypeBadge } from '../Dataset/Schema/components/PropertyTypeLabel'; -import { getStructuredPropertyValue } from '../../utils'; + +import { PropertyTypeBadge } from '@app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel'; +import { getStructuredPropertyValue } from '@app/entity/shared/utils'; + +import { PropertyCardinality, StructuredPropertyEntity } from '@types'; const Header = styled.div` font-size: 10px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx index a5eafbae35..711ebb8e3c 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx @@ -1,15 +1,16 @@ -import { colors, Icon, Text } from '@src/alchemy-components'; -import analytics, { EventType } from '@src/app/analytics'; -import { MenuItem } from '@src/app/govern/structuredProperties/styledComponents'; -import { ConfirmationModal } from '@src/app/sharedV2/modals/ConfirmationModal'; -import { showToastMessage, ToastType } from '@src/app/sharedV2/toastMessageUtils'; -import { useRemoveStructuredPropertiesMutation } from '@src/graphql/structuredProperties.generated'; -import { EntityType, StructuredPropertyEntity } from '@src/types.generated'; import { Dropdown } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { useEntityContext, useEntityData, useMutationUrn } from '../../../EntityContext'; -import EditStructuredPropertyModal from './EditStructuredPropertyModal'; + +import { useEntityContext, useEntityData, useMutationUrn } from '@app/entity/shared/EntityContext'; +import EditStructuredPropertyModal from '@app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal'; +import { Icon, Text, colors } from '@src/alchemy-components'; +import analytics, { EventType } from '@src/app/analytics'; +import { MenuItem } from '@src/app/govern/structuredProperties/styledComponents'; +import { ConfirmationModal } from '@src/app/sharedV2/modals/ConfirmationModal'; +import { ToastType, showToastMessage } from '@src/app/sharedV2/toastMessageUtils'; +import { useRemoveStructuredPropertiesMutation } from '@src/graphql/structuredProperties.generated'; +import { EntityType, StructuredPropertyEntity } from '@src/types.generated'; export const MoreOptionsContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx index c8eb8eb095..e66de15e77 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx @@ -1,20 +1,17 @@ -import { Button } from '@src/alchemy-components'; -import analytics, { EventType } from '@src/app/analytics'; -import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; import { Modal, message } from 'antd'; import React, { useEffect, useMemo } from 'react'; import styled from 'styled-components'; -import { useUpsertStructuredPropertiesMutation } from '../../../../../../graphql/structuredProperties.generated'; -import { - EntityType, - PropertyValueInput, - StdDataType, - StructuredPropertyEntity, -} from '../../../../../../types.generated'; -import handleGraphQLError from '../../../../../shared/handleGraphQLError'; -import StructuredPropertyInput from '../../../components/styled/StructuredProperty/StructuredPropertyInput'; -import { useEditStructuredProperty } from '../../../components/styled/StructuredProperty/useEditStructuredProperty'; -import { useEntityContext, useEntityData, useMutationUrn } from '../../../EntityContext'; + +import { useEntityContext, useEntityData, useMutationUrn } from '@app/entity/shared/EntityContext'; +import StructuredPropertyInput from '@app/entity/shared/components/styled/StructuredProperty/StructuredPropertyInput'; +import { useEditStructuredProperty } from '@app/entity/shared/components/styled/StructuredProperty/useEditStructuredProperty'; +import handleGraphQLError from '@app/shared/handleGraphQLError'; +import { Button } from '@src/alchemy-components'; +import analytics, { EventType } from '@src/app/analytics'; +import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; + +import { useUpsertStructuredPropertiesMutation } from '@graphql/structuredProperties.generated'; +import { EntityType, PropertyValueInput, StdDataType, StructuredPropertyEntity } from '@types'; const Description = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/NameColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/NameColumn.tsx index 069ba991b9..31fb3dbe05 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/NameColumn.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/NameColumn.tsx @@ -1,12 +1,13 @@ import { Tooltip, Typography } from 'antd'; import React from 'react'; -import styled from 'styled-components'; import Highlight from 'react-highlighter'; -import { PropertyRow } from './types'; -import ChildCountLabel from '../Dataset/Schema/components/ChildCountLabel'; -import PropertyTypeLabel from '../Dataset/Schema/components/PropertyTypeLabel'; -import StructuredPropertyTooltip from './StructuredPropertyTooltip'; -import CardinalityLabel from './CardinalityLabel'; +import styled from 'styled-components'; + +import ChildCountLabel from '@app/entity/shared/tabs/Dataset/Schema/components/ChildCountLabel'; +import PropertyTypeLabel from '@app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel'; +import CardinalityLabel from '@app/entity/shared/tabs/Properties/CardinalityLabel'; +import StructuredPropertyTooltip from '@app/entity/shared/tabs/Properties/StructuredPropertyTooltip'; +import { PropertyRow } from '@app/entity/shared/tabs/Properties/types'; const ParentNameText = styled(Typography.Text)` color: #373d44; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/PropertiesTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/PropertiesTab.tsx index 5fc209688c..6e67f297fb 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/PropertiesTab.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/PropertiesTab.tsx @@ -1,17 +1,21 @@ -import styled from 'styled-components'; import React, { useState } from 'react'; -import ExpandIcon from '../Dataset/Schema/components/ExpandIcon'; -import { StyledTable as Table } from '../../components/styled/StyledTable'; -import { useEntityData } from '../../EntityContext'; -import { PropertyRow } from './types'; -import useStructuredProperties from './useStructuredProperties'; -import { getFilteredCustomProperties, mapCustomPropertiesToPropertyRows } from './utils'; -import ValuesColumn from './ValuesColumn'; -import NameColumn from './NameColumn'; -import TabHeader from './TabHeader'; -import useUpdateExpandedRowsFromFilter from './useUpdateExpandedRowsFromFilter'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { EditColumn } from './Edit/EditColumn'; +import styled from 'styled-components'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { StyledTable as Table } from '@app/entity/shared/components/styled/StyledTable'; +import ExpandIcon from '@app/entity/shared/tabs/Dataset/Schema/components/ExpandIcon'; +import { EditColumn } from '@app/entity/shared/tabs/Properties/Edit/EditColumn'; +import NameColumn from '@app/entity/shared/tabs/Properties/NameColumn'; +import TabHeader from '@app/entity/shared/tabs/Properties/TabHeader'; +import ValuesColumn from '@app/entity/shared/tabs/Properties/ValuesColumn'; +import { PropertyRow } from '@app/entity/shared/tabs/Properties/types'; +import useStructuredProperties from '@app/entity/shared/tabs/Properties/useStructuredProperties'; +import useUpdateExpandedRowsFromFilter from '@app/entity/shared/tabs/Properties/useUpdateExpandedRowsFromFilter'; +import { + getFilteredCustomProperties, + mapCustomPropertiesToPropertyRows, +} from '@app/entity/shared/tabs/Properties/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const StyledTable = styled(Table)` &&& .ant-table-cell-with-append { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyTooltip.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyTooltip.tsx index be0f443ce0..64a7da40cc 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyTooltip.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyTooltip.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { StructuredPropertyEntity } from '../../../../../types.generated'; + +import { StructuredPropertyEntity } from '@types'; const ContentWrapper = styled.div` font-size: 12px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyValue.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyValue.tsx index 2ed4ab79a4..9fc7f469b2 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyValue.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyValue.tsx @@ -1,14 +1,16 @@ import Icon from '@ant-design/icons/lib/components/Icon'; +import { Typography } from 'antd'; import React from 'react'; import Highlight from 'react-highlighter'; -import { Typography } from 'antd'; import styled from 'styled-components'; -import { ValueColumnData } from './types'; -import { ANTD_GRAY } from '../../constants'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import ExternalLink from '../../../../../images/link-out.svg?react'; -import CompactMarkdownViewer from '../Documentation/components/CompactMarkdownViewer'; -import EntityIcon from '../../components/styled/EntityIcon'; + +import EntityIcon from '@app/entity/shared/components/styled/EntityIcon'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import CompactMarkdownViewer from '@app/entity/shared/tabs/Documentation/components/CompactMarkdownViewer'; +import { ValueColumnData } from '@app/entity/shared/tabs/Properties/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import ExternalLink from '@images/link-out.svg?react'; const ValueText = styled(Typography.Text)` font-family: 'Manrope'; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/TabHeader.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/TabHeader.tsx index 4ba48e1c71..a7e82aedc6 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/TabHeader.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/TabHeader.tsx @@ -1,10 +1,11 @@ import { Icon } from '@components'; -import { Maybe, StructuredProperties } from '@src/types.generated'; import { Input } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; -import AddPropertyButton from './AddPropertyButton'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import AddPropertyButton from '@app/entity/shared/tabs/Properties/AddPropertyButton'; +import { Maybe, StructuredProperties } from '@src/types.generated'; const StyledInput = styled(Input)` border-radius: 70px; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/ValuesColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/ValuesColumn.tsx index 3e21f1b5e2..30ef3f24e3 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/ValuesColumn.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/ValuesColumn.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import { PropertyRow } from './types'; -import { StdDataType } from '../../../../../types.generated'; -import StructuredPropertyValue from './StructuredPropertyValue'; + +import StructuredPropertyValue from '@app/entity/shared/tabs/Properties/StructuredPropertyValue'; +import { PropertyRow } from '@app/entity/shared/tabs/Properties/types'; + +import { StdDataType } from '@types'; interface Props { propertyRow: PropertyRow; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts b/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts index ff7c6e51a0..027b248236 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts @@ -1,4 +1,4 @@ -import { identifyAndAddParentRows } from '../useStructuredProperties'; +import { identifyAndAddParentRows } from '@app/entity/shared/tabs/Properties/useStructuredProperties'; describe('identifyAndAddParentRows', () => { it('should not return parent rows when there are none', () => { diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/utils.test.ts b/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/utils.test.ts index 512510732d..3b5e1d6e37 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/utils.test.ts @@ -1,6 +1,6 @@ -import { getTestEntityRegistry } from '../../../../../../utils/test-utils/TestPageContainer'; -import { PropertyRow } from '../types'; -import { filterStructuredProperties } from '../utils'; +import { PropertyRow } from '@app/entity/shared/tabs/Properties/types'; +import { filterStructuredProperties } from '@app/entity/shared/tabs/Properties/utils'; +import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer'; describe('filterSchemaRows', () => { const testEntityRegistry = getTestEntityRegistry(); diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/types.ts b/datahub-web-react/src/app/entity/shared/tabs/Properties/types.ts index 4adaafc3d9..370fc94488 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/types.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/types.ts @@ -1,4 +1,4 @@ -import { DataTypeEntity, Entity, StructuredPropertyEntity } from '../../../../../types.generated'; +import { DataTypeEntity, Entity, StructuredPropertyEntity } from '@types'; export interface ValueColumnData { value: string | number | null; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/useStructuredProperties.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/useStructuredProperties.tsx index 60d0aac30e..bb4d51e89b 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/useStructuredProperties.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/useStructuredProperties.tsx @@ -1,10 +1,11 @@ -import { PropertyValue, StructuredPropertiesEntry } from '../../../../../types.generated'; -import EntityRegistry from '../../../EntityRegistry'; -import { useEntityData } from '../../EntityContext'; -import { GenericEntityProperties } from '../../types'; -import { getStructuredPropertyValue } from '../../utils'; -import { PropertyRow } from './types'; -import { filterStructuredProperties } from './utils'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { PropertyRow } from '@app/entity/shared/tabs/Properties/types'; +import { filterStructuredProperties } from '@app/entity/shared/tabs/Properties/utils'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getStructuredPropertyValue } from '@app/entity/shared/utils'; + +import { PropertyValue, StructuredPropertiesEntry } from '@types'; const typeNameToType = { StringValue: { type: 'string', nativeDataType: 'text' }, diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts b/datahub-web-react/src/app/entity/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts index 0dbe762c53..9dcd33e368 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts @@ -1,6 +1,7 @@ -import { useEffect } from 'react'; import { isEqual } from 'lodash'; -import usePrevious from '../../../../shared/usePrevious'; +import { useEffect } from 'react'; + +import usePrevious from '@app/shared/usePrevious'; interface Props { expandedRowsFromFilter: Set; diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/utils.ts b/datahub-web-react/src/app/entity/shared/tabs/Properties/utils.ts index 91870e2e37..a53544d4db 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/utils.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/utils.ts @@ -1,7 +1,8 @@ -import { CustomPropertiesEntry } from '../../../../../types.generated'; -import EntityRegistry from '../../../EntityRegistry'; -import { GenericEntityProperties } from '../../types'; -import { PropertyRow, ValueColumnData } from './types'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { PropertyRow, ValueColumnData } from '@app/entity/shared/tabs/Properties/types'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + +import { CustomPropertiesEntry } from '@types'; export function mapCustomPropertiesToPropertyRows(customProperties: CustomPropertiesEntry[]) { return (customProperties?.map((customProp) => ({ diff --git a/datahub-web-react/src/app/entity/shared/types.ts b/datahub-web-react/src/app/entity/shared/types.ts index 8f76e55d10..574e51df31 100644 --- a/datahub-web-react/src/app/entity/shared/types.ts +++ b/datahub-web-react/src/app/entity/shared/types.ts @@ -1,53 +1,54 @@ -import { MutationFunctionOptions, FetchResult } from '@apollo/client'; +import { FetchResult, MutationFunctionOptions } from '@apollo/client'; import React from 'react'; +import { FetchedEntity } from '@app/lineage/types'; + import { + BrowsePathV2, + Container, + CustomPropertiesEntry, + DataJobInputOutput, DataPlatform, + DataPlatformInstance, + DataProcessRunEvent, DatasetEditableProperties, DatasetEditablePropertiesUpdate, - RawAspect, + Deprecation, + DisplayProperties, + Documentation, + DomainAssociation, EditableSchemaMetadata, EditableSchemaMetadataUpdate, + Embed, + EntityLineageResult, + EntityPrivileges, + EntityRelationshipsResult, EntityType, + FabricType, + FineGrainedLineage, + Forms, GlobalTags, GlobalTagsUpdate, GlossaryTerms, + Health, + InputFields, InstitutionalMemory, InstitutionalMemoryUpdate, Maybe, Ownership, OwnershipUpdate, - SchemaMetadata, - EntityLineageResult, - SubTypes, - Container, - Health, - Status, - Deprecation, - DataPlatformInstance, ParentContainersResult, - EntityRelationshipsResult, - ParentNodesResult, - SiblingProperties, - CustomPropertiesEntry, - DomainAssociation, - InputFields, - FineGrainedLineage, - EntityPrivileges, - Embed, - FabricType, - BrowsePathV2, - DataJobInputOutput, ParentDomainsResult, - StructuredProperties, - Forms, + ParentNodesResult, + RawAspect, + SchemaMetadata, ScrollResults, - Documentation, - DisplayProperties, + SiblingProperties, + Status, + StructuredProperties, + SubTypes, VersionProperties, - DataProcessRunEvent, -} from '../../../types.generated'; -import { FetchedEntity } from '../../lineage/types'; +} from '@types'; export type EntityTab = { name: string; diff --git a/datahub-web-react/src/app/entity/shared/useGetEntities.ts b/datahub-web-react/src/app/entity/shared/useGetEntities.ts index 9391bc17d7..8250693ffc 100644 --- a/datahub-web-react/src/app/entity/shared/useGetEntities.ts +++ b/datahub-web-react/src/app/entity/shared/useGetEntities.ts @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; -import { useGetEntitiesQuery } from '../../../graphql/entity.generated'; -import { Entity } from '../../../types.generated'; + +import { useGetEntitiesQuery } from '@graphql/entity.generated'; +import { Entity } from '@types'; export function useGetEntities(urns: string[]): Entity[] { const [verifiedUrns, setVerifiedUrns] = useState([]); diff --git a/datahub-web-react/src/app/entity/shared/utils.ts b/datahub-web-react/src/app/entity/shared/utils.ts index 8baf8030f9..6074051e00 100644 --- a/datahub-web-react/src/app/entity/shared/utils.ts +++ b/datahub-web-react/src/app/entity/shared/utils.ts @@ -1,8 +1,9 @@ import { Maybe } from 'graphql/jsutils/Maybe'; -import { Entity, EntityType, EntityRelationshipsResult, DataProduct, PropertyValue } from '../../../types.generated'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import { GenericEntityProperties } from './types'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { DataProduct, Entity, EntityRelationshipsResult, EntityType, PropertyValue } from '@types'; export function dictToQueryStringParams(params: Record) { return Object.keys(params) diff --git a/datahub-web-react/src/app/entity/structuredProperty/StructuredPropertyEntity.tsx b/datahub-web-react/src/app/entity/structuredProperty/StructuredPropertyEntity.tsx index 2bdfd55065..580b660685 100644 --- a/datahub-web-react/src/app/entity/structuredProperty/StructuredPropertyEntity.tsx +++ b/datahub-web-react/src/app/entity/structuredProperty/StructuredPropertyEntity.tsx @@ -1,12 +1,14 @@ import * as React from 'react'; import styled from 'styled-components'; -import TableIcon from '@src/images/table-icon.svg?react'; -import { TYPE_ICON_CLASS_NAME } from '@src/app/shared/constants'; + +import { Entity, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { urlEncodeUrn } from '@app/entity/shared/utils'; import DefaultPreviewCard from '@src/app/preview/DefaultPreviewCard'; -import { EntityType, SearchResult, StructuredPropertyEntity as StructuredProperty } from '../../../types.generated'; -import { Entity, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { urlEncodeUrn } from '../shared/utils'; +import { TYPE_ICON_CLASS_NAME } from '@src/app/shared/constants'; +import TableIcon from '@src/images/table-icon.svg?react'; + +import { EntityType, SearchResult, StructuredPropertyEntity as StructuredProperty } from '@types'; const PreviewPropIcon = styled(TableIcon)` font-size: 20px; diff --git a/datahub-web-react/src/app/entity/tag/Tag.tsx b/datahub-web-react/src/app/entity/tag/Tag.tsx index d3c5b07966..f55ba02ec2 100644 --- a/datahub-web-react/src/app/entity/tag/Tag.tsx +++ b/datahub-web-react/src/app/entity/tag/Tag.tsx @@ -1,13 +1,15 @@ -import { TagOutlined, TagFilled } from '@ant-design/icons'; +import { TagFilled, TagOutlined } from '@ant-design/icons'; import * as React from 'react'; import styled from 'styled-components'; -import { Tag, EntityType, SearchResult } from '../../../types.generated'; -import DefaultPreviewCard from '../../preview/DefaultPreviewCard'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { urlEncodeUrn } from '../shared/utils'; -import TagProfile from './TagProfile'; -import { useGetTagQuery } from '../../../graphql/tag.generated'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import { urlEncodeUrn } from '@app/entity/shared/utils'; +import TagProfile from '@app/entity/tag/TagProfile'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; + +import { useGetTagQuery } from '@graphql/tag.generated'; +import { EntityType, SearchResult, Tag } from '@types'; const PreviewTagIcon = styled(TagOutlined)` font-size: 20px; diff --git a/datahub-web-react/src/app/entity/tag/TagProfile.tsx b/datahub-web-react/src/app/entity/tag/TagProfile.tsx index 7c99a0eb0f..f86a8dbff1 100644 --- a/datahub-web-react/src/app/entity/tag/TagProfile.tsx +++ b/datahub-web-react/src/app/entity/tag/TagProfile.tsx @@ -1,12 +1,12 @@ import React from 'react'; - import { useParams } from 'react-router'; import styled from 'styled-components'; -import { Message } from '../../shared/Message'; -import { decodeUrn } from '../shared/utils'; -import TagStyleEntity from '../../shared/TagStyleEntity'; -import { useGetTagQuery } from '../../../graphql/tag.generated'; +import { decodeUrn } from '@app/entity/shared/utils'; +import { Message } from '@app/shared/Message'; +import TagStyleEntity from '@app/shared/TagStyleEntity'; + +import { useGetTagQuery } from '@graphql/tag.generated'; const PageContainer = styled.div` padding: 32px 100px; diff --git a/datahub-web-react/src/app/entity/tag/__tests__/TagProfile.test.tsx b/datahub-web-react/src/app/entity/tag/__tests__/TagProfile.test.tsx index 9048d713d5..4c88c0f4ef 100644 --- a/datahub-web-react/src/app/entity/tag/__tests__/TagProfile.test.tsx +++ b/datahub-web-react/src/app/entity/tag/__tests__/TagProfile.test.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import { render, waitFor } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; +import { render, waitFor } from '@testing-library/react'; +import React from 'react'; import { Route } from 'react-router'; -import TagProfile from '../TagProfile'; -import TestPageContainer from '../../../../utils/test-utils/TestPageContainer'; -import { mocks } from '../../../../Mocks'; +import TagProfile from '@app/entity/tag/TagProfile'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('TagProfile', () => { it('renders tag details', async () => { diff --git a/datahub-web-react/src/app/entity/user/User.tsx b/datahub-web-react/src/app/entity/user/User.tsx index 058349f83e..41a12c14fd 100644 --- a/datahub-web-react/src/app/entity/user/User.tsx +++ b/datahub-web-react/src/app/entity/user/User.tsx @@ -1,10 +1,12 @@ import { UserOutlined } from '@ant-design/icons'; import * as React from 'react'; -import { CorpUser, EntityType, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { Preview } from './preview/Preview'; -import UserProfile from './UserProfile'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity'; +import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils'; +import UserProfile from '@app/entity/user/UserProfile'; +import { Preview } from '@app/entity/user/preview/Preview'; + +import { CorpUser, EntityType, SearchResult } from '@types'; /** * Definition of the DataHub Dataset entity. diff --git a/datahub-web-react/src/app/entity/user/UserAssets.tsx b/datahub-web-react/src/app/entity/user/UserAssets.tsx index 2f3393cb99..e2cea33a72 100644 --- a/datahub-web-react/src/app/entity/user/UserAssets.tsx +++ b/datahub-web-react/src/app/entity/user/UserAssets.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; + +import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection'; +import { UnionType } from '@app/search/utils/constants'; import useGetUserGroupUrns from '@src/app/entityV2/user/useGetUserGroupUrns'; -import { UnionType } from '../../search/utils/constants'; -import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection'; const UserAssetsWrapper = styled.div` height: calc(100vh - 114px); diff --git a/datahub-web-react/src/app/entity/user/UserEditProfileModal.tsx b/datahub-web-react/src/app/entity/user/UserEditProfileModal.tsx index 7096534c99..aa93d1ddb7 100644 --- a/datahub-web-react/src/app/entity/user/UserEditProfileModal.tsx +++ b/datahub-web-react/src/app/entity/user/UserEditProfileModal.tsx @@ -1,8 +1,10 @@ +import { Button, Form, Input, Modal, Tooltip, Typography, message } from 'antd'; import React, { useEffect, useState } from 'react'; -import { message, Button, Input, Modal, Typography, Form, Tooltip } from 'antd'; -import { useUpdateCorpUserPropertiesMutation } from '../../../graphql/user.generated'; -import { useEnterKeyListener } from '../../shared/useEnterKeyListener'; -import { useAppConfig } from '../../useAppConfig'; + +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useAppConfig } from '@app/useAppConfig'; + +import { useUpdateCorpUserPropertiesMutation } from '@graphql/user.generated'; type PropsData = { name: string | undefined; diff --git a/datahub-web-react/src/app/entity/user/UserGroups.tsx b/datahub-web-react/src/app/entity/user/UserGroups.tsx index f5e03cf928..55ef6f1ab5 100644 --- a/datahub-web-react/src/app/entity/user/UserGroups.tsx +++ b/datahub-web-react/src/app/entity/user/UserGroups.tsx @@ -2,10 +2,12 @@ import { Col, Pagination, Row, Tooltip } from 'antd'; import React, { useState } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { useGetUserGroupsLazyQuery } from '../../../graphql/user.generated'; -import { CorpGroup, EntityRelationship, EntityType } from '../../../types.generated'; -import { scrollToTop } from '../../shared/searchUtils'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetUserGroupsLazyQuery } from '@graphql/user.generated'; +import { CorpGroup, EntityRelationship, EntityType } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/entity/user/UserHeader.tsx b/datahub-web-react/src/app/entity/user/UserHeader.tsx index 06d88fcf14..11637464c1 100644 --- a/datahub-web-react/src/app/entity/user/UserHeader.tsx +++ b/datahub-web-react/src/app/entity/user/UserHeader.tsx @@ -1,8 +1,9 @@ // import { UserOutlined } from '@ant-design/icons'; -import styled from 'styled-components'; +import { Badge, Divider, Space, Typography } from 'antd'; import React from 'react'; -import { Space, Badge, Typography, Divider } from 'antd'; -import CustomAvatar from '../../shared/avatar/CustomAvatar'; +import styled from 'styled-components'; + +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; type Props = { profileSrc?: string | null; diff --git a/datahub-web-react/src/app/entity/user/UserInfoSideBar.tsx b/datahub-web-react/src/app/entity/user/UserInfoSideBar.tsx index 18c9f4037a..102af7005d 100644 --- a/datahub-web-react/src/app/entity/user/UserInfoSideBar.tsx +++ b/datahub-web-react/src/app/entity/user/UserInfoSideBar.tsx @@ -1,32 +1,35 @@ -import { getCountryName } from '@src/app/shared/sidebar/components'; -import { Divider, message, Space, Button, Typography, Tag } from 'antd'; -import React, { useEffect, useState } from 'react'; import { EditOutlined, MailOutlined, PhoneOutlined, SlackOutlined } from '@ant-design/icons'; -import GlobeIcon from '../../../images/Globe.svg'; -import { useUpdateCorpUserPropertiesMutation } from '../../../graphql/user.generated'; -import { EntityRelationship, DataHubRole } from '../../../types.generated'; -import UserEditProfileModal from './UserEditProfileModal'; -import CustomAvatar from '../../shared/avatar/CustomAvatar'; +import { Button, Divider, Space, Tag, Typography, message } from 'antd'; +import React, { useEffect, useState } from 'react'; + +import { useUserContext } from '@app/context/useUserContext'; +import EntityGroups from '@app/entity/shared/EntityGroups'; import { - SideBar, - SideBarSubSection, - EmptyValue, - SocialDetails, - EditButton, AboutSection, AboutSectionText, + EditButton, + EmptyValue, GroupsSection, - Name, - TitleRole, - Team, LocationSection, LocationSectionText, + Name, + SideBar, + SideBarSubSection, + SocialDetails, + Team, + TitleRole, UserDetails, -} from '../shared/SidebarStyledComponents'; -import EntityGroups from '../shared/EntityGroups'; -import { mapRoleIcon } from '../../identity/user/UserUtils'; -import { useUserContext } from '../../context/useUserContext'; -import { useBrowserTitle } from '../../shared/BrowserTabTitleContext'; +} from '@app/entity/shared/SidebarStyledComponents'; +import UserEditProfileModal from '@app/entity/user/UserEditProfileModal'; +import { mapRoleIcon } from '@app/identity/user/UserUtils'; +import { useBrowserTitle } from '@app/shared/BrowserTabTitleContext'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; +import { getCountryName } from '@src/app/shared/sidebar/components'; + +import { useUpdateCorpUserPropertiesMutation } from '@graphql/user.generated'; +import { DataHubRole, EntityRelationship } from '@types'; + +import GlobeIcon from '@images/Globe.svg'; const { Paragraph } = Typography; diff --git a/datahub-web-react/src/app/entity/user/UserProfile.tsx b/datahub-web-react/src/app/entity/user/UserProfile.tsx index 7d4a3ec663..b25bb092cd 100644 --- a/datahub-web-react/src/app/entity/user/UserProfile.tsx +++ b/datahub-web-react/src/app/entity/user/UserProfile.tsx @@ -1,17 +1,19 @@ import { Col, Row } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import useUserParams from '../../shared/entitySearch/routingUtils/useUserParams'; -import { useGetUserQuery } from '../../../graphql/user.generated'; -import { EntityRelationship, EntityType } from '../../../types.generated'; -import UserGroups from './UserGroups'; -import { RoutedTabs } from '../../shared/RoutedTabs'; -import { UserAssets } from './UserAssets'; -import { decodeUrn } from '../shared/utils'; -import UserInfoSideBar from './UserInfoSideBar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ErrorSection } from '../../shared/error/ErrorSection'; -import NonExistentEntityPage from '../shared/entity/NonExistentEntityPage'; + +import NonExistentEntityPage from '@app/entity/shared/entity/NonExistentEntityPage'; +import { decodeUrn } from '@app/entity/shared/utils'; +import { UserAssets } from '@app/entity/user/UserAssets'; +import UserGroups from '@app/entity/user/UserGroups'; +import UserInfoSideBar from '@app/entity/user/UserInfoSideBar'; +import { RoutedTabs } from '@app/shared/RoutedTabs'; +import useUserParams from '@app/shared/entitySearch/routingUtils/useUserParams'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetUserQuery } from '@graphql/user.generated'; +import { EntityRelationship, EntityType } from '@types'; export interface Props { onTabChange: (selectedTab: string) => void; diff --git a/datahub-web-react/src/app/entity/user/__tests__/UserHeader.test.tsx b/datahub-web-react/src/app/entity/user/__tests__/UserHeader.test.tsx index c225d2c8ed..469e44dc7a 100644 --- a/datahub-web-react/src/app/entity/user/__tests__/UserHeader.test.tsx +++ b/datahub-web-react/src/app/entity/user/__tests__/UserHeader.test.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { render } from '@testing-library/react'; -import UserHeader from '../UserHeader'; +import React from 'react'; + +import UserHeader from '@app/entity/user/UserHeader'; describe('UserHeader', () => { it('renders name, title, skills, teams and email', () => { diff --git a/datahub-web-react/src/app/entity/user/preview/Preview.tsx b/datahub-web-react/src/app/entity/user/preview/Preview.tsx index 05baefb295..580cdedca8 100644 --- a/datahub-web-react/src/app/entity/user/preview/Preview.tsx +++ b/datahub-web-react/src/app/entity/user/preview/Preview.tsx @@ -1,13 +1,15 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../shared/constants'; -import { IconStyleType } from '../../Entity'; -import { CustomAvatar } from '../../../shared/avatar'; -import SearchTextHighlighter from '../../../search/matches/SearchTextHighlighter'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import SearchTextHighlighter from '@app/search/matches/SearchTextHighlighter'; +import { CustomAvatar } from '@app/shared/avatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const PreviewContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/view/ManageViews.tsx b/datahub-web-react/src/app/entity/view/ManageViews.tsx index f32c479e00..0304c6cef5 100644 --- a/datahub-web-react/src/app/entity/view/ManageViews.tsx +++ b/datahub-web-react/src/app/entity/view/ManageViews.tsx @@ -1,7 +1,8 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { ViewsList } from './ViewsList'; + +import { ViewsList } from '@app/entity/view/ViewsList'; const PageContainer = styled.div` padding-top: 20px; diff --git a/datahub-web-react/src/app/entity/view/ViewTypeLabel.tsx b/datahub-web-react/src/app/entity/view/ViewTypeLabel.tsx index 698195ef25..ac37adecff 100644 --- a/datahub-web-react/src/app/entity/view/ViewTypeLabel.tsx +++ b/datahub-web-react/src/app/entity/view/ViewTypeLabel.tsx @@ -1,8 +1,9 @@ +import { GlobalOutlined, LockOutlined } from '@ant-design/icons'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { GlobalOutlined, LockOutlined } from '@ant-design/icons'; -import { DataHubViewType } from '../../../types.generated'; + +import { DataHubViewType } from '@types'; const StyledLockOutlined = styled(LockOutlined)<{ color }>` color: ${(props) => props.color}; diff --git a/datahub-web-react/src/app/entity/view/ViewsList.tsx b/datahub-web-react/src/app/entity/view/ViewsList.tsx index 2487783fff..a548974ad3 100644 --- a/datahub-web-react/src/app/entity/view/ViewsList.tsx +++ b/datahub-web-react/src/app/entity/view/ViewsList.tsx @@ -1,19 +1,21 @@ -import React, { useEffect, useState } from 'react'; -import styled from 'styled-components'; -import { useLocation } from 'react-router'; -import { Button, message, Pagination } from 'antd'; import { PlusOutlined } from '@ant-design/icons'; +import { Button, Pagination, message } from 'antd'; import * as QueryString from 'query-string'; -import { useListMyViewsQuery } from '../../../graphql/view.generated'; -import { SearchBar } from '../../search/SearchBar'; -import TabToolbar from '../shared/components/styled/TabToolbar'; -import { Message } from '../../shared/Message'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { scrollToTop } from '../../shared/searchUtils'; -import { ViewsTable } from './ViewsTable'; -import { DEFAULT_LIST_VIEWS_PAGE_SIZE, searchViews } from './utils'; -import { ViewBuilder } from './builder/ViewBuilder'; -import { ViewBuilderMode } from './builder/types'; +import React, { useEffect, useState } from 'react'; +import { useLocation } from 'react-router'; +import styled from 'styled-components'; + +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { ViewsTable } from '@app/entity/view/ViewsTable'; +import { ViewBuilder } from '@app/entity/view/builder/ViewBuilder'; +import { ViewBuilderMode } from '@app/entity/view/builder/types'; +import { DEFAULT_LIST_VIEWS_PAGE_SIZE, searchViews } from '@app/entity/view/utils'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListMyViewsQuery } from '@graphql/view.generated'; const PaginationContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/view/ViewsTable.tsx b/datahub-web-react/src/app/entity/view/ViewsTable.tsx index 97d1fe18fe..2de13122be 100644 --- a/datahub-web-react/src/app/entity/view/ViewsTable.tsx +++ b/datahub-web-react/src/app/entity/view/ViewsTable.tsx @@ -1,8 +1,15 @@ -import React from 'react'; import { Empty } from 'antd'; -import { StyledTable } from '../shared/components/styled/StyledTable'; -import { ActionsColumn, DescriptionColumn, NameColumn, ViewTypeColumn } from './select/ViewsTableColumns'; -import { DataHubView } from '../../../types.generated'; +import React from 'react'; + +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import { + ActionsColumn, + DescriptionColumn, + NameColumn, + ViewTypeColumn, +} from '@app/entity/view/select/ViewsTableColumns'; + +import { DataHubView } from '@types'; type ViewsTableProps = { views: DataHubView[]; diff --git a/datahub-web-react/src/app/entity/view/builder/ViewBuilder.tsx b/datahub-web-react/src/app/entity/view/builder/ViewBuilder.tsx index 9d8ba3e7a7..7001a39cae 100644 --- a/datahub-web-react/src/app/entity/view/builder/ViewBuilder.tsx +++ b/datahub-web-react/src/app/entity/view/builder/ViewBuilder.tsx @@ -1,16 +1,18 @@ -import React from 'react'; -import { message } from 'antd'; import { useApolloClient } from '@apollo/client'; -import { useCreateViewMutation, useUpdateViewMutation } from '../../../../graphql/view.generated'; -import { ViewBuilderState } from '../types'; -import { ViewBuilderModal } from './ViewBuilderModal'; -import { updateViewSelectCache, updateListMyViewsCache } from '../cacheUtils'; -import { convertStateToUpdateInput, DEFAULT_LIST_VIEWS_PAGE_SIZE } from '../utils'; -import { useUserContext } from '../../../context/useUserContext'; -import { ViewBuilderMode } from './types'; -import analytics, { EventType } from '../../../analytics'; -import { DataHubView } from '../../../../types.generated'; -import { useSearchVersion } from '../../../search/useSearchAndBrowseVersion'; +import { message } from 'antd'; +import React from 'react'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { ViewBuilderModal } from '@app/entity/view/builder/ViewBuilderModal'; +import { ViewBuilderMode } from '@app/entity/view/builder/types'; +import { updateListMyViewsCache, updateViewSelectCache } from '@app/entity/view/cacheUtils'; +import { ViewBuilderState } from '@app/entity/view/types'; +import { DEFAULT_LIST_VIEWS_PAGE_SIZE, convertStateToUpdateInput } from '@app/entity/view/utils'; +import { useSearchVersion } from '@app/search/useSearchAndBrowseVersion'; + +import { useCreateViewMutation, useUpdateViewMutation } from '@graphql/view.generated'; +import { DataHubView } from '@types'; type Props = { mode: ViewBuilderMode; diff --git a/datahub-web-react/src/app/entity/view/builder/ViewBuilderForm.tsx b/datahub-web-react/src/app/entity/view/builder/ViewBuilderForm.tsx index f1dc8c1348..e587e3ce04 100644 --- a/datahub-web-react/src/app/entity/view/builder/ViewBuilderForm.tsx +++ b/datahub-web-react/src/app/entity/view/builder/ViewBuilderForm.tsx @@ -1,13 +1,15 @@ +import { Form, Input, Select, Typography } from 'antd'; import React, { useEffect } from 'react'; import styled from 'styled-components'; -import { Form, Input, Select, Typography } from 'antd'; -import { ViewBuilderState } from '../types'; -import { DataHubViewType } from '../../../../types.generated'; -import { ViewTypeLabel } from '../ViewTypeLabel'; -import { ViewDefinitionBuilder } from './ViewDefinitionBuilder'; -import { ANTD_GRAY } from '../../shared/constants'; -import { useUserContext } from '../../../context/useUserContext'; -import { ViewBuilderMode } from './types'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { ViewTypeLabel } from '@app/entity/view/ViewTypeLabel'; +import { ViewDefinitionBuilder } from '@app/entity/view/builder/ViewDefinitionBuilder'; +import { ViewBuilderMode } from '@app/entity/view/builder/types'; +import { ViewBuilderState } from '@app/entity/view/types'; + +import { DataHubViewType } from '@types'; const StyledFormItem = styled(Form.Item)` margin-bottom: 8px; diff --git a/datahub-web-react/src/app/entity/view/builder/ViewBuilderModal.tsx b/datahub-web-react/src/app/entity/view/builder/ViewBuilderModal.tsx index a85260a032..d1f143af9c 100644 --- a/datahub-web-react/src/app/entity/view/builder/ViewBuilderModal.tsx +++ b/datahub-web-react/src/app/entity/view/builder/ViewBuilderModal.tsx @@ -1,12 +1,13 @@ +import { Modal, Typography } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { Modal, Typography } from 'antd'; + +import { ViewBuilderForm } from '@app/entity/view/builder/ViewBuilderForm'; +import { ViewBuilderMode } from '@app/entity/view/builder/types'; +import { DEFAULT_BUILDER_STATE, ViewBuilderState } from '@app/entity/view/types'; +import ClickOutside from '@app/shared/ClickOutside'; import { Button } from '@src/alchemy-components'; -import { DEFAULT_BUILDER_STATE, ViewBuilderState } from '../types'; -import { ViewBuilderForm } from './ViewBuilderForm'; -import ClickOutside from '../../../shared/ClickOutside'; -import { ViewBuilderMode } from './types'; -import { getModalDomContainer } from '../../../../utils/focus'; +import { getModalDomContainer } from '@utils/focus'; const modalWidth = 700; const modalStyle = { top: 40 }; diff --git a/datahub-web-react/src/app/entity/view/builder/ViewDefinitionBuilder.tsx b/datahub-web-react/src/app/entity/view/builder/ViewDefinitionBuilder.tsx index 5f632d113c..41c8ef284f 100644 --- a/datahub-web-react/src/app/entity/view/builder/ViewDefinitionBuilder.tsx +++ b/datahub-web-react/src/app/entity/view/builder/ViewDefinitionBuilder.tsx @@ -1,19 +1,21 @@ import React, { useEffect, useMemo, useState } from 'react'; import styled from 'styled-components'; -import { useGetEntitiesLazyQuery } from '../../../../graphql/entity.generated'; -import { Entity, FacetFilter, FacetFilterInput, LogicalOperator } from '../../../../types.generated'; -import { AdvancedSearchFilters, LayoutDirection } from '../../../search/AdvancedSearchFilters'; -import { ENTITY_FILTER_NAME } from '../../../search/utils/constants'; -import { ANTD_GRAY } from '../../shared/constants'; -import { ViewBuilderState } from '../types'; -import { ViewBuilderMode } from './types'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { ViewBuilderMode } from '@app/entity/view/builder/types'; import { buildEntityCache, extractEntityTypesFilterValues, fromUnionType, isResolutionRequired, toUnionType, -} from './utils'; +} from '@app/entity/view/builder/utils'; +import { ViewBuilderState } from '@app/entity/view/types'; +import { AdvancedSearchFilters, LayoutDirection } from '@app/search/AdvancedSearchFilters'; +import { ENTITY_FILTER_NAME } from '@app/search/utils/constants'; + +import { useGetEntitiesLazyQuery } from '@graphql/entity.generated'; +import { Entity, FacetFilter, FacetFilterInput, LogicalOperator } from '@types'; const Container = styled.div` border-radius: 4px; diff --git a/datahub-web-react/src/app/entity/view/builder/__tests__/utils.test.ts b/datahub-web-react/src/app/entity/view/builder/__tests__/utils.test.ts index ee1c17a8ff..9ca1c164b0 100644 --- a/datahub-web-react/src/app/entity/view/builder/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/entity/view/builder/__tests__/utils.test.ts @@ -1,9 +1,5 @@ -import { - ENTITY_FILTER_NAME, - ENTITY_SUB_TYPE_FILTER_NAME, - TYPE_NAMES_FILTER_NAME, -} from '../../../../search/utils/constants'; -import { convertNestedSubTypeFilter } from '../utils'; +import { convertNestedSubTypeFilter } from '@app/entity/view/builder/utils'; +import { ENTITY_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, TYPE_NAMES_FILTER_NAME } from '@app/search/utils/constants'; describe('view builder utils', () => { it('should convert the nested subtypes filter properly along with other filters', () => { diff --git a/datahub-web-react/src/app/entity/view/builder/utils.ts b/datahub-web-react/src/app/entity/view/builder/utils.ts index 6f84dcef2d..131d9bc815 100644 --- a/datahub-web-react/src/app/entity/view/builder/utils.ts +++ b/datahub-web-react/src/app/entity/view/builder/utils.ts @@ -1,18 +1,12 @@ -import { - DataHubViewType, - Entity, - EntityType, - FacetFilter, - FacetFilterInput, - LogicalOperator, -} from '../../../../types.generated'; import { ENTITY_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, - UnionType, FILTER_DELIMITER, TYPE_NAMES_FILTER_NAME, -} from '../../../search/utils/constants'; + UnionType, +} from '@app/search/utils/constants'; + +import { DataHubViewType, Entity, EntityType, FacetFilter, FacetFilterInput, LogicalOperator } from '@types'; /** * Extract the special "Entity Type" filter values from a list diff --git a/datahub-web-react/src/app/entity/view/cacheUtils.ts b/datahub-web-react/src/app/entity/view/cacheUtils.ts index c8f6d03ef9..cf5659d919 100644 --- a/datahub-web-react/src/app/entity/view/cacheUtils.ts +++ b/datahub-web-react/src/app/entity/view/cacheUtils.ts @@ -1,11 +1,12 @@ +import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '@app/entity/view/utils'; + import { ListGlobalViewsDocument, ListGlobalViewsQuery, ListMyViewsDocument, ListMyViewsQuery, -} from '../../../graphql/view.generated'; -import { DataHubViewType, DataHubView } from '../../../types.generated'; -import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from './utils'; +} from '@graphql/view.generated'; +import { DataHubView, DataHubViewType } from '@types'; /** * This file contains utility classes for manipulating the Apollo Cache diff --git a/datahub-web-react/src/app/entity/view/menu/ViewDropdownMenu.tsx b/datahub-web-react/src/app/entity/view/menu/ViewDropdownMenu.tsx index f75240aba2..d68672aabd 100644 --- a/datahub-web-react/src/app/entity/view/menu/ViewDropdownMenu.tsx +++ b/datahub-web-react/src/app/entity/view/menu/ViewDropdownMenu.tsx @@ -1,25 +1,27 @@ +import { MoreOutlined } from '@ant-design/icons'; +import { useApolloClient } from '@apollo/client'; +import { Dropdown, Modal, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { useApolloClient } from '@apollo/client'; -import { MoreOutlined } from '@ant-design/icons'; -import { Dropdown, message, Modal } from 'antd'; -import { DataHubView, DataHubViewType } from '../../../../types.generated'; -import { useUserContext } from '../../../context/useUserContext'; -import { useUpdateCorpUserViewsSettingsMutation } from '../../../../graphql/user.generated'; -import { useUpdateGlobalViewsSettingsMutation } from '../../../../graphql/app.generated'; -import { useDeleteViewMutation } from '../../../../graphql/view.generated'; -import { removeFromListMyViewsCache, removeFromViewSelectCaches } from '../cacheUtils'; -import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '../utils'; -import { ViewBuilderMode } from '../builder/types'; -import { ViewBuilder } from '../builder/ViewBuilder'; -import { EditViewItem } from './item/EditViewItem'; -import { PreviewViewItem } from './item/PreviewViewItem'; -import { RemoveUserDefaultItem } from './item/RemoveUserDefaultItem'; -import { SetUserDefaultItem } from './item/SetUserDefaultItem'; -import { RemoveGlobalDefaultItem } from './item/RemoveGlobalDefaultItem'; -import { SetGlobalDefaultItem } from './item/SetGlobalDefaultItem'; -import { DeleteViewItem } from './item/DeleteViewItem'; -import analytics, { EventType } from '../../../analytics'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { ViewBuilder } from '@app/entity/view/builder/ViewBuilder'; +import { ViewBuilderMode } from '@app/entity/view/builder/types'; +import { removeFromListMyViewsCache, removeFromViewSelectCaches } from '@app/entity/view/cacheUtils'; +import { DeleteViewItem } from '@app/entity/view/menu/item/DeleteViewItem'; +import { EditViewItem } from '@app/entity/view/menu/item/EditViewItem'; +import { PreviewViewItem } from '@app/entity/view/menu/item/PreviewViewItem'; +import { RemoveGlobalDefaultItem } from '@app/entity/view/menu/item/RemoveGlobalDefaultItem'; +import { RemoveUserDefaultItem } from '@app/entity/view/menu/item/RemoveUserDefaultItem'; +import { SetGlobalDefaultItem } from '@app/entity/view/menu/item/SetGlobalDefaultItem'; +import { SetUserDefaultItem } from '@app/entity/view/menu/item/SetUserDefaultItem'; +import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '@app/entity/view/utils'; + +import { useUpdateGlobalViewsSettingsMutation } from '@graphql/app.generated'; +import { useUpdateCorpUserViewsSettingsMutation } from '@graphql/user.generated'; +import { useDeleteViewMutation } from '@graphql/view.generated'; +import { DataHubView, DataHubViewType } from '@types'; const MenuButton = styled(MoreOutlined)` width: 20px; diff --git a/datahub-web-react/src/app/entity/view/menu/item/DeleteViewItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/DeleteViewItem.tsx index c6dce2c01e..6d65d31d58 100644 --- a/datahub-web-react/src/app/entity/view/menu/item/DeleteViewItem.tsx +++ b/datahub-web-react/src/app/entity/view/menu/item/DeleteViewItem.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { DeleteOutlined } from '@ant-design/icons'; -import { IconItemTitle } from './IconItemTitle'; -import { MenuItemStyle } from './styledComponent'; +import React from 'react'; + +import { IconItemTitle } from '@app/entity/view/menu/item/IconItemTitle'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entity/view/menu/item/EditViewItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/EditViewItem.tsx index 5301f99771..935901080a 100644 --- a/datahub-web-react/src/app/entity/view/menu/item/EditViewItem.tsx +++ b/datahub-web-react/src/app/entity/view/menu/item/EditViewItem.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { FormOutlined } from '@ant-design/icons'; -import { IconItemTitle } from './IconItemTitle'; -import { MenuItemStyle } from './styledComponent'; +import React from 'react'; + +import { IconItemTitle } from '@app/entity/view/menu/item/IconItemTitle'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entity/view/menu/item/IconItemTitle.tsx b/datahub-web-react/src/app/entity/view/menu/item/IconItemTitle.tsx index 2d366c47c5..b1534d4060 100644 --- a/datahub-web-react/src/app/entity/view/menu/item/IconItemTitle.tsx +++ b/datahub-web-react/src/app/entity/view/menu/item/IconItemTitle.tsx @@ -1,7 +1,8 @@ +import { Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from 'antd'; -import { ANTD_GRAY } from '../../../shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const TitleContainer = styled.span` display: flex; diff --git a/datahub-web-react/src/app/entity/view/menu/item/PreviewViewItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/PreviewViewItem.tsx index eb64ec8101..2f46c03040 100644 --- a/datahub-web-react/src/app/entity/view/menu/item/PreviewViewItem.tsx +++ b/datahub-web-react/src/app/entity/view/menu/item/PreviewViewItem.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { EyeOutlined } from '@ant-design/icons'; -import { IconItemTitle } from './IconItemTitle'; -import { MenuItemStyle } from './styledComponent'; +import React from 'react'; + +import { IconItemTitle } from '@app/entity/view/menu/item/IconItemTitle'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entity/view/menu/item/RemoveGlobalDefaultItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/RemoveGlobalDefaultItem.tsx index 0b66578921..c3f8810784 100644 --- a/datahub-web-react/src/app/entity/view/menu/item/RemoveGlobalDefaultItem.tsx +++ b/datahub-web-react/src/app/entity/view/menu/item/RemoveGlobalDefaultItem.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { StopOutlined } from '@ant-design/icons'; -import { IconItemTitle } from './IconItemTitle'; -import { MenuItemStyle } from './styledComponent'; +import React from 'react'; + +import { IconItemTitle } from '@app/entity/view/menu/item/IconItemTitle'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entity/view/menu/item/RemoveUserDefaultItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/RemoveUserDefaultItem.tsx index 612bcd0a0a..95f82ec37a 100644 --- a/datahub-web-react/src/app/entity/view/menu/item/RemoveUserDefaultItem.tsx +++ b/datahub-web-react/src/app/entity/view/menu/item/RemoveUserDefaultItem.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { StopOutlined } from '@ant-design/icons'; -import { IconItemTitle } from './IconItemTitle'; -import { MenuItemStyle } from './styledComponent'; +import React from 'react'; + +import { IconItemTitle } from '@app/entity/view/menu/item/IconItemTitle'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entity/view/menu/item/SetGlobalDefaultItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/SetGlobalDefaultItem.tsx index 94e1adb280..08fd23de01 100644 --- a/datahub-web-react/src/app/entity/view/menu/item/SetGlobalDefaultItem.tsx +++ b/datahub-web-react/src/app/entity/view/menu/item/SetGlobalDefaultItem.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { GlobalDefaultViewIcon } from '../../shared/GlobalDefaultViewIcon'; -import { IconItemTitle } from './IconItemTitle'; -import { MenuItemStyle } from './styledComponent'; + +import { IconItemTitle } from '@app/entity/view/menu/item/IconItemTitle'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; +import { GlobalDefaultViewIcon } from '@app/entity/view/shared/GlobalDefaultViewIcon'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entity/view/menu/item/SetUserDefaultItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/SetUserDefaultItem.tsx index 4eea8e5c2c..4bdd8e30a5 100644 --- a/datahub-web-react/src/app/entity/view/menu/item/SetUserDefaultItem.tsx +++ b/datahub-web-react/src/app/entity/view/menu/item/SetUserDefaultItem.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { UserDefaultViewIcon } from '../../shared/UserDefaultViewIcon'; -import { IconItemTitle } from './IconItemTitle'; -import { MenuItemStyle } from './styledComponent'; + +import { IconItemTitle } from '@app/entity/view/menu/item/IconItemTitle'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; +import { UserDefaultViewIcon } from '@app/entity/view/shared/UserDefaultViewIcon'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entity/view/select/ViewOption.tsx b/datahub-web-react/src/app/entity/view/select/ViewOption.tsx index b4c7e7db2b..83736e7d7f 100644 --- a/datahub-web-react/src/app/entity/view/select/ViewOption.tsx +++ b/datahub-web-react/src/app/entity/view/select/ViewOption.tsx @@ -1,10 +1,12 @@ import React from 'react'; import styled from 'styled-components'; -import { DataHubView } from '../../../../types.generated'; -import { ViewOptionName } from './ViewOptionName'; -import { ViewDropdownMenu } from '../menu/ViewDropdownMenu'; -import { UserDefaultViewIcon } from '../shared/UserDefaultViewIcon'; -import { GlobalDefaultViewIcon } from '../shared/GlobalDefaultViewIcon'; + +import { ViewDropdownMenu } from '@app/entity/view/menu/ViewDropdownMenu'; +import { ViewOptionName } from '@app/entity/view/select/ViewOptionName'; +import { GlobalDefaultViewIcon } from '@app/entity/view/shared/GlobalDefaultViewIcon'; +import { UserDefaultViewIcon } from '@app/entity/view/shared/UserDefaultViewIcon'; + +import { DataHubView } from '@types'; const ICON_WIDTH = 30; diff --git a/datahub-web-react/src/app/entity/view/select/ViewOptionName.tsx b/datahub-web-react/src/app/entity/view/select/ViewOptionName.tsx index 718e3d136d..bf7afaf314 100644 --- a/datahub-web-react/src/app/entity/view/select/ViewOptionName.tsx +++ b/datahub-web-react/src/app/entity/view/select/ViewOptionName.tsx @@ -1,7 +1,8 @@ +import { Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from 'antd'; -import { ViewOptionTooltipTitle } from './ViewOptionTooltipTitle'; + +import { ViewOptionTooltipTitle } from '@app/entity/view/select/ViewOptionTooltipTitle'; const ViewName = styled.span` width: 200px; diff --git a/datahub-web-react/src/app/entity/view/select/ViewSelect.tsx b/datahub-web-react/src/app/entity/view/select/ViewSelect.tsx index eda9b7d7fe..02e3963b29 100644 --- a/datahub-web-react/src/app/entity/view/select/ViewSelect.tsx +++ b/datahub-web-react/src/app/entity/view/select/ViewSelect.tsx @@ -1,18 +1,20 @@ -import React, { CSSProperties, useEffect, useRef, useState } from 'react'; -import { useHistory } from 'react-router'; import { Select } from 'antd'; -import styled from 'styled-components'; +import React, { CSSProperties, useEffect, useRef, useState } from 'react'; import { VscTriangleDown } from 'react-icons/vsc'; -import { useListMyViewsQuery, useListGlobalViewsQuery } from '../../../../graphql/view.generated'; -import { useUserContext } from '../../../context/useUserContext'; -import { DataHubView, DataHubViewType } from '../../../../types.generated'; -import { ViewBuilder } from '../builder/ViewBuilder'; -import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '../utils'; -import { PageRoutes } from '../../../../conf/Global'; -import { ViewBuilderMode } from '../builder/types'; -import { ViewSelectDropdown } from './ViewSelectDropdown'; -import { renderViewOptionGroup } from './renderViewOptionGroup'; -import { ANTD_GRAY_V2 } from '../../shared/constants'; +import { useHistory } from 'react-router'; +import styled from 'styled-components'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { ViewBuilder } from '@app/entity/view/builder/ViewBuilder'; +import { ViewBuilderMode } from '@app/entity/view/builder/types'; +import { ViewSelectDropdown } from '@app/entity/view/select/ViewSelectDropdown'; +import { renderViewOptionGroup } from '@app/entity/view/select/renderViewOptionGroup'; +import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '@app/entity/view/utils'; +import { PageRoutes } from '@conf/Global'; + +import { useListGlobalViewsQuery, useListMyViewsQuery } from '@graphql/view.generated'; +import { DataHubView, DataHubViewType } from '@types'; type ViewBuilderDisplayState = { mode: ViewBuilderMode; diff --git a/datahub-web-react/src/app/entity/view/select/ViewSelectDropdown.tsx b/datahub-web-react/src/app/entity/view/select/ViewSelectDropdown.tsx index 17e73d3b5a..e89ea29ae6 100644 --- a/datahub-web-react/src/app/entity/view/select/ViewSelectDropdown.tsx +++ b/datahub-web-react/src/app/entity/view/select/ViewSelectDropdown.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { ViewSelectFooter } from './ViewSelectFooter'; -import { ViewSelectHeader } from './ViewSelectHeader'; + +import { ViewSelectFooter } from '@app/entity/view/select/ViewSelectFooter'; +import { ViewSelectHeader } from '@app/entity/view/select/ViewSelectHeader'; type Props = { menu: React.ReactNode; diff --git a/datahub-web-react/src/app/entity/view/select/ViewSelectFooter.tsx b/datahub-web-react/src/app/entity/view/select/ViewSelectFooter.tsx index 2374a0ec78..b667820180 100644 --- a/datahub-web-react/src/app/entity/view/select/ViewSelectFooter.tsx +++ b/datahub-web-react/src/app/entity/view/select/ViewSelectFooter.tsx @@ -1,9 +1,10 @@ +import { PlusOutlined } from '@ant-design/icons'; +import { Button, Typography } from 'antd'; import React, { useRef } from 'react'; import styled from 'styled-components'; -import { Button, Typography } from 'antd'; -import { PlusOutlined } from '@ant-design/icons'; -import { ANTD_GRAY, ANTD_GRAY_V2 } from '../../shared/constants'; -import { NoMarginButton } from './styledComponents'; + +import { ANTD_GRAY, ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { NoMarginButton } from '@app/entity/view/select/styledComponents'; const ButtonContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/view/select/ViewSelectHeader.tsx b/datahub-web-react/src/app/entity/view/select/ViewSelectHeader.tsx index 40640a7162..fa9967869d 100644 --- a/datahub-web-react/src/app/entity/view/select/ViewSelectHeader.tsx +++ b/datahub-web-react/src/app/entity/view/select/ViewSelectHeader.tsx @@ -1,7 +1,8 @@ import React, { useRef } from 'react'; import styled from 'styled-components'; -import { NoMarginButton } from './styledComponents'; -import { ANTD_GRAY_V2 } from '../../shared/constants'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { NoMarginButton } from '@app/entity/view/select/styledComponents'; const ButtonContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entity/view/select/ViewsTableColumns.tsx b/datahub-web-react/src/app/entity/view/select/ViewsTableColumns.tsx index 48eb3b9add..62324082eb 100644 --- a/datahub-web-react/src/app/entity/view/select/ViewsTableColumns.tsx +++ b/datahub-web-react/src/app/entity/view/select/ViewsTableColumns.tsx @@ -1,13 +1,15 @@ +import { Button, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Button, Typography } from 'antd'; -import { DataHubViewType } from '../../../../types.generated'; -import { ANTD_GRAY } from '../../shared/constants'; -import { ViewTypeLabel } from '../ViewTypeLabel'; -import { ViewDropdownMenu } from '../menu/ViewDropdownMenu'; -import { UserDefaultViewIcon } from '../shared/UserDefaultViewIcon'; -import { GlobalDefaultViewIcon } from '../shared/GlobalDefaultViewIcon'; -import { useUserContext } from '../../../context/useUserContext'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { ViewTypeLabel } from '@app/entity/view/ViewTypeLabel'; +import { ViewDropdownMenu } from '@app/entity/view/menu/ViewDropdownMenu'; +import { GlobalDefaultViewIcon } from '@app/entity/view/shared/GlobalDefaultViewIcon'; +import { UserDefaultViewIcon } from '@app/entity/view/shared/UserDefaultViewIcon'; + +import { DataHubViewType } from '@types'; const StyledDescription = styled.div` max-width: 300px; diff --git a/datahub-web-react/src/app/entity/view/select/renderViewOptionGroup.tsx b/datahub-web-react/src/app/entity/view/select/renderViewOptionGroup.tsx index 3cc260bda1..f94a8221d5 100644 --- a/datahub-web-react/src/app/entity/view/select/renderViewOptionGroup.tsx +++ b/datahub-web-react/src/app/entity/view/select/renderViewOptionGroup.tsx @@ -1,8 +1,10 @@ -import React from 'react'; import { Select } from 'antd'; -import { DataHubView } from '../../../../types.generated'; -import { ViewOption } from './ViewOption'; -import { UserContextType } from '../../../context/userContext'; +import React from 'react'; + +import { UserContextType } from '@app/context/userContext'; +import { ViewOption } from '@app/entity/view/select/ViewOption'; + +import { DataHubView } from '@types'; const selectOptionStyle = { paddingLeft: 0 }; diff --git a/datahub-web-react/src/app/entity/view/select/styledComponents.tsx b/datahub-web-react/src/app/entity/view/select/styledComponents.tsx index 30501487bd..a2ba05a83e 100644 --- a/datahub-web-react/src/app/entity/view/select/styledComponents.tsx +++ b/datahub-web-react/src/app/entity/view/select/styledComponents.tsx @@ -1,7 +1,8 @@ import { RightOutlined } from '@ant-design/icons'; import { Button } from 'antd'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export const NoMarginButton = styled(Button)` && { diff --git a/datahub-web-react/src/app/entity/view/shared/DefaultViewIcon.tsx b/datahub-web-react/src/app/entity/view/shared/DefaultViewIcon.tsx index 99e7234b02..8623e11a34 100644 --- a/datahub-web-react/src/app/entity/view/shared/DefaultViewIcon.tsx +++ b/datahub-web-react/src/app/entity/view/shared/DefaultViewIcon.tsx @@ -1,6 +1,6 @@ +import { Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from 'antd'; const CircleContainer = styled.span` width: 10px; diff --git a/datahub-web-react/src/app/entity/view/shared/GlobalDefaultViewIcon.tsx b/datahub-web-react/src/app/entity/view/shared/GlobalDefaultViewIcon.tsx index 1b2720d75b..e30f657683 100644 --- a/datahub-web-react/src/app/entity/view/shared/GlobalDefaultViewIcon.tsx +++ b/datahub-web-react/src/app/entity/view/shared/GlobalDefaultViewIcon.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { ANTD_GRAY } from '../../shared/constants'; -import { DefaultViewIcon } from './DefaultViewIcon'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DefaultViewIcon } from '@app/entity/view/shared/DefaultViewIcon'; type Props = { title?: React.ReactNode; diff --git a/datahub-web-react/src/app/entity/view/shared/UserDefaultViewIcon.tsx b/datahub-web-react/src/app/entity/view/shared/UserDefaultViewIcon.tsx index 3d78e1c49c..6ba383a3c8 100644 --- a/datahub-web-react/src/app/entity/view/shared/UserDefaultViewIcon.tsx +++ b/datahub-web-react/src/app/entity/view/shared/UserDefaultViewIcon.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { REDESIGN_COLORS } from '../../shared/constants'; -import { DefaultViewIcon } from './DefaultViewIcon'; + +import { REDESIGN_COLORS } from '@app/entity/shared/constants'; +import { DefaultViewIcon } from '@app/entity/view/shared/DefaultViewIcon'; type Props = { title?: React.ReactNode; diff --git a/datahub-web-react/src/app/entity/view/types.ts b/datahub-web-react/src/app/entity/view/types.ts index 7cb89869d3..7eb313ab48 100644 --- a/datahub-web-react/src/app/entity/view/types.ts +++ b/datahub-web-react/src/app/entity/view/types.ts @@ -1,4 +1,4 @@ -import { DataHubViewFilter, DataHubViewType, EntityType, LogicalOperator } from '../../../types.generated'; +import { DataHubViewFilter, DataHubViewType, EntityType, LogicalOperator } from '@types'; /** * Default builder state when creating a new View. diff --git a/datahub-web-react/src/app/entity/view/utils.ts b/datahub-web-react/src/app/entity/view/utils.ts index 0952cacb5a..589780e385 100644 --- a/datahub-web-react/src/app/entity/view/utils.ts +++ b/datahub-web-react/src/app/entity/view/utils.ts @@ -1,5 +1,6 @@ -import { DataHubView, DataHubViewType, EntityType, LogicalOperator } from '../../../types.generated'; -import { ViewBuilderState } from './types'; +import { ViewBuilderState } from '@app/entity/view/types'; + +import { DataHubView, DataHubViewType, EntityType, LogicalOperator } from '@types'; /** * The max single-page results in both the View Select and Manage Views list. diff --git a/datahub-web-react/src/app/entityV2/Access/RoleEntity.tsx b/datahub-web-react/src/app/entityV2/Access/RoleEntity.tsx index 6ec79ebfe4..25fcad36fd 100644 --- a/datahub-web-react/src/app/entityV2/Access/RoleEntity.tsx +++ b/datahub-web-react/src/app/entityV2/Access/RoleEntity.tsx @@ -1,13 +1,15 @@ -import { TagOutlined, TagFilled } from '@ant-design/icons'; +import { TagFilled, TagOutlined } from '@ant-design/icons'; import * as React from 'react'; import styled from 'styled-components'; -import { Role, EntityType, SearchResult } from '../../../types.generated'; -import DefaultPreviewCard from '../../previewV2/DefaultPreviewCard'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { urlEncodeUrn } from '../shared/utils'; -import RoleEntityProfile from './RoleEntityProfile'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; + +import RoleEntityProfile from '@app/entityV2/Access/RoleEntityProfile'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import { urlEncodeUrn } from '@app/entityV2/shared/utils'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; + +import { EntityType, Role, SearchResult } from '@types'; const PreviewTagIcon = styled(TagOutlined)` font-size: 20px; diff --git a/datahub-web-react/src/app/entityV2/Access/RoleEntityProfile.tsx b/datahub-web-react/src/app/entityV2/Access/RoleEntityProfile.tsx index d8a31700fb..c1bf5b9dde 100644 --- a/datahub-web-react/src/app/entityV2/Access/RoleEntityProfile.tsx +++ b/datahub-web-react/src/app/entityV2/Access/RoleEntityProfile.tsx @@ -1,13 +1,13 @@ -import React from 'react'; - -import { useParams } from 'react-router'; -import { Divider, Typography } from 'antd'; import { grey } from '@ant-design/colors'; +import { Divider, Typography } from 'antd'; +import React from 'react'; +import { useParams } from 'react-router'; import styled from 'styled-components'; -import { Message } from '../../shared/Message'; -import { decodeUrn } from '../shared/utils'; -import { useGetExternalRoleQuery } from '../../../graphql/accessrole.generated'; +import { decodeUrn } from '@app/entityV2/shared/utils'; +import { Message } from '@app/shared/Message'; + +import { useGetExternalRoleQuery } from '@graphql/accessrole.generated'; const PageContainer = styled.div` padding: 32px 100px; diff --git a/datahub-web-react/src/app/entityV2/DefaultEntity.tsx b/datahub-web-react/src/app/entityV2/DefaultEntity.tsx index 01c496348b..2222776330 100644 --- a/datahub-web-react/src/app/entityV2/DefaultEntity.tsx +++ b/datahub-web-react/src/app/entityV2/DefaultEntity.tsx @@ -1,6 +1,8 @@ import React from 'react'; -import { EntityType, SearchResult } from '../../types.generated'; -import { Entity, EntityMenuActions, IconStyleType, PreviewType } from './Entity'; + +import { Entity, EntityMenuActions, IconStyleType, PreviewType } from '@app/entityV2/Entity'; + +import { EntityType, SearchResult } from '@types'; class DefaultEntity implements Entity { type: EntityType = EntityType.Other; diff --git a/datahub-web-react/src/app/entityV2/Entity.tsx b/datahub-web-react/src/app/entityV2/Entity.tsx index 7df9deabf6..5662a4ec62 100644 --- a/datahub-web-react/src/app/entityV2/Entity.tsx +++ b/datahub-web-react/src/app/entityV2/Entity.tsx @@ -1,8 +1,10 @@ import { QueryHookOptions, QueryResult } from '@apollo/client'; -import { EntityType, Exact, FeatureFlagsConfig, SearchResult } from '../../types.generated'; -import { GenericEntityProperties } from '../entity/shared/types'; -import { FetchedEntity } from '../lineage/types'; -import { EntitySidebarSection, EntitySidebarTab } from './shared/types'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { EntitySidebarSection, EntitySidebarTab } from '@app/entityV2/shared/types'; +import { FetchedEntity } from '@app/lineage/types'; + +import { EntityType, Exact, FeatureFlagsConfig, SearchResult } from '@types'; export enum PreviewType { /** diff --git a/datahub-web-react/src/app/entityV2/EntityPage.tsx b/datahub-web-react/src/app/entityV2/EntityPage.tsx index 84c74b8304..594078e1c0 100644 --- a/datahub-web-react/src/app/entityV2/EntityPage.tsx +++ b/datahub-web-react/src/app/entityV2/EntityPage.tsx @@ -1,21 +1,23 @@ import React, { useEffect, useState } from 'react'; import { useParams } from 'react-router-dom'; -import { EntityType } from '../../types.generated'; -import { BrowsableEntityPage } from '../browse/BrowsableEntityPage'; -import LineageExplorer from '../lineage/LineageExplorer'; -import useIsLineageMode from '../lineage/utils/useIsLineageMode'; -import { useLineageV2 } from '../lineageV2/useLineageV2'; -import useSidebarWidth from '../sharedV2/sidebar/useSidebarWidth'; -import { useEntityRegistry } from '../useEntityRegistry'; -import analytics, { EventType } from '../analytics'; -import { decodeUrn } from './shared/utils'; -import { useGetGrantedPrivilegesQuery } from '../../graphql/policy.generated'; -import { UnauthorizedPage } from '../authorization/UnauthorizedPage'; -import { ErrorSection } from '../shared/error/ErrorSection'; -import { VIEW_ENTITY_PAGE } from './shared/constants'; -import { useUserContext } from '../context/useUserContext'; -import EntitySidebarContext from '../sharedV2/EntitySidebarContext'; -import TabFullSizedContext from '../shared/TabFullsizedContext'; + +import analytics, { EventType } from '@app/analytics'; +import { UnauthorizedPage } from '@app/authorization/UnauthorizedPage'; +import { BrowsableEntityPage } from '@app/browse/BrowsableEntityPage'; +import { useUserContext } from '@app/context/useUserContext'; +import { VIEW_ENTITY_PAGE } from '@app/entityV2/shared/constants'; +import { decodeUrn } from '@app/entityV2/shared/utils'; +import LineageExplorer from '@app/lineage/LineageExplorer'; +import useIsLineageMode from '@app/lineage/utils/useIsLineageMode'; +import { useLineageV2 } from '@app/lineageV2/useLineageV2'; +import TabFullSizedContext from '@app/shared/TabFullsizedContext'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; +import useSidebarWidth from '@app/sharedV2/sidebar/useSidebarWidth'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetGrantedPrivilegesQuery } from '@graphql/policy.generated'; +import { EntityType } from '@types'; interface RouteParams { urn: string; diff --git a/datahub-web-react/src/app/entityV2/EntityRegistry.tsx b/datahub-web-react/src/app/entityV2/EntityRegistry.tsx index 227bb626a7..2e0e0a2377 100644 --- a/datahub-web-react/src/app/entityV2/EntityRegistry.tsx +++ b/datahub-web-react/src/app/entityV2/EntityRegistry.tsx @@ -1,18 +1,20 @@ import { QueryHookOptions, QueryResult } from '@apollo/client'; -import { downgradeV2FieldPath } from '@app/lineageV2/lineageUtils'; import React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import DefaultEntity from '@app/entityV2/DefaultEntity'; +import { Entity, EntityCapabilityType, EntityMenuActions, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import PreviewContext from '@app/entityV2/shared/PreviewContext'; +import { GLOSSARY_ENTITY_TYPES } from '@app/entityV2/shared/constants'; +import { EntitySidebarSection, EntitySidebarTab } from '@app/entityV2/shared/types'; +import { dictToQueryStringParams, getFineGrainedLineageWithSiblings, urlEncodeUrn } from '@app/entityV2/shared/utils'; +import { FetchedEntity } from '@app/lineage/types'; +import { downgradeV2FieldPath } from '@app/lineageV2/lineageUtils'; +import { FetchedEntityV2, FetchedEntityV2Relationship, LineageAsset, LineageAssetType } from '@app/lineageV2/types'; +import { SearchResultProvider } from '@app/search/context/SearchResultContext'; + import { EntityLineageV2Fragment, LineageSchemaFieldFragment } from '@graphql/lineage.generated'; -import { Entity as EntityInterface, EntityType, Exact, FeatureFlagsConfig, SearchResult } from '../../types.generated'; -import { GenericEntityProperties } from '../entity/shared/types'; -import { FetchedEntity } from '../lineage/types'; -import { FetchedEntityV2, FetchedEntityV2Relationship, LineageAsset, LineageAssetType } from '../lineageV2/types'; -import { SearchResultProvider } from '../search/context/SearchResultContext'; -import DefaultEntity from './DefaultEntity'; -import { Entity, EntityCapabilityType, EntityMenuActions, IconStyleType, PreviewType } from './Entity'; -import PreviewContext from './shared/PreviewContext'; -import { GLOSSARY_ENTITY_TYPES } from './shared/constants'; -import { EntitySidebarSection, EntitySidebarTab } from './shared/types'; -import { dictToQueryStringParams, getFineGrainedLineageWithSiblings, urlEncodeUrn } from './shared/utils'; +import { Entity as EntityInterface, EntityType, Exact, FeatureFlagsConfig, SearchResult } from '@types'; function validatedGet(key: K, map: Map, def: V): V { if (map.has(key)) { diff --git a/datahub-web-react/src/app/entityV2/businessAttribute/BusinessAttributeEntity.tsx b/datahub-web-react/src/app/entityV2/businessAttribute/BusinessAttributeEntity.tsx index 218402c753..c3e350fca0 100644 --- a/datahub-web-react/src/app/entityV2/businessAttribute/BusinessAttributeEntity.tsx +++ b/datahub-web-react/src/app/entityV2/businessAttribute/BusinessAttributeEntity.tsx @@ -1,20 +1,22 @@ -import * as React from 'react'; import { GlobalOutlined } from '@ant-design/icons'; -import { BusinessAttribute, EntityType, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { useGetBusinessAttributeQuery } from '../../../graphql/businessAttribute.generated'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { Preview } from './preview/Preview'; -import { PageRoutes } from '../../../conf/Global'; -import BusinessAttributeRelatedEntity from './profile/BusinessAttributeRelatedEntity'; -import { BusinessAttributeDataTypeSection } from './profile/BusinessAttributeDataTypeSection'; +import * as React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { Preview } from '@app/entityV2/businessAttribute/preview/Preview'; +import { BusinessAttributeDataTypeSection } from '@app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection'; +import BusinessAttributeRelatedEntity from '@app/entityV2/businessAttribute/profile/BusinessAttributeRelatedEntity'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { PageRoutes } from '@conf/Global'; + +import { useGetBusinessAttributeQuery } from '@graphql/businessAttribute.generated'; +import { BusinessAttribute, EntityType, SearchResult } from '@types'; /** * Definition of datahub Business Attribute Entity diff --git a/datahub-web-react/src/app/entityV2/businessAttribute/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/businessAttribute/preview/Preview.tsx index 323c287a0a..6d755e68a1 100644 --- a/datahub-web-react/src/app/entityV2/businessAttribute/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/businessAttribute/preview/Preview.tsx @@ -1,11 +1,13 @@ -import React from 'react'; import { GlobalOutlined } from '@ant-design/icons'; -import { EntityType, Owner } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; -import UrlButton from '../../shared/UrlButton'; -import { getRelatedEntitiesUrl } from '../../../businessAttribute/businessAttributeUtils'; +import React from 'react'; + +import { getRelatedEntitiesUrl } from '@app/businessAttribute/businessAttributeUtils'; +import { IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import UrlButton from '@app/entityV2/shared/UrlButton'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, Owner } from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entityV2/businessAttribute/preview/_tests_/Preview.test.tsx b/datahub-web-react/src/app/entityV2/businessAttribute/preview/_tests_/Preview.test.tsx index bca32de985..20c13a256b 100644 --- a/datahub-web-react/src/app/entityV2/businessAttribute/preview/_tests_/Preview.test.tsx +++ b/datahub-web-react/src/app/entityV2/businessAttribute/preview/_tests_/Preview.test.tsx @@ -1,10 +1,11 @@ import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import React from 'react'; -import { mocks } from '../../../../../Mocks'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { Preview } from '../Preview'; -import { PreviewType } from '../../../Entity'; + +import { PreviewType } from '@app/entityV2/Entity'; +import { Preview } from '@app/entityV2/businessAttribute/preview/Preview'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('Preview', () => { it('renders', () => { diff --git a/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx b/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx index 05b649be55..1ee9d90257 100644 --- a/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx +++ b/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx @@ -1,11 +1,13 @@ -import { Button, message, Select } from 'antd'; import { EditOutlined } from '@ant-design/icons'; +import { Button, Select, message } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; + +import { SchemaFieldDataType } from '@app/businessAttribute/businessAttributeUtils'; +import { SidebarHeader } from '@app/entityV2/shared/containers/profile/sidebar/SidebarHeader'; import { useEntityData, useRefetch } from '@src/app/entity/shared/EntityContext'; -import { SidebarHeader } from '../../shared/containers/profile/sidebar/SidebarHeader'; -import { useUpdateBusinessAttributeMutation } from '../../../../graphql/businessAttribute.generated'; -import { SchemaFieldDataType } from '../../../businessAttribute/businessAttributeUtils'; + +import { useUpdateBusinessAttributeMutation } from '@graphql/businessAttribute.generated'; interface Props { readOnly?: boolean; diff --git a/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx b/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx index e7c46021f4..4d2bb7c1ec 100644 --- a/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx +++ b/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx @@ -1,7 +1,8 @@ import * as React from 'react'; + +import { EmbeddedListSearchSection } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchSection'; +import { UnionType } from '@app/search/utils/constants'; import { useEntityData } from '@src/app/entity/shared/EntityContext'; -import { UnionType } from '../../../search/utils/constants'; -import { EmbeddedListSearchSection } from '../../shared/components/styled/search/EmbeddedListSearchSection'; export default function BusinessAttributeRelatedEntity() { const { entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/chart/ChartEntity.tsx b/datahub-web-react/src/app/entityV2/chart/ChartEntity.tsx index e673b061bf..7a846665da 100644 --- a/datahub-web-react/src/app/entityV2/chart/ChartEntity.tsx +++ b/datahub-web-react/src/app/entityV2/chart/ChartEntity.tsx @@ -10,44 +10,51 @@ import { } from '@ant-design/icons'; import { ListBullets, TreeStructure } from '@phosphor-icons/react'; import * as React from 'react'; -import { GetChartQuery, useGetChartQuery, useUpdateChartMutation } from '../../../graphql/chart.generated'; -import { Chart, EntityType, LineageDirection, SearchResult } from '../../../types.generated'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { LOOKER_URN, MODE, MODE_URN } from '../../ingest/source/builder/constants'; -import { MatchedFieldList } from '../../searchV2/matches/MatchedFieldList'; -import { matchedInputFieldRenderer } from '../../searchV2/matches/matchedInputFieldRenderer'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { SubType, TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import SidebarChartHeaderSection from '../shared/containers/profile/sidebar/Chart/Header/SidebarChartHeaderSection'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import SidebarLineageSection from '../shared/containers/profile/sidebar/Lineage/SidebarLineageSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import EmbeddedProfile from '../shared/embed/EmbeddedProfile'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { SUMMARY_TAB_ICON } from '../shared/summary/HeaderComponents'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { EmbedTab } from '../shared/tabs/Embed/EmbedTab'; -import { ChartDashboardsTab } from '../shared/tabs/Entity/ChartDashboardsTab'; -import { InputFieldsTab } from '../shared/tabs/Entity/InputFieldsTab'; -import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount'; -import { IncidentTab } from '../shared/tabs/Incident/IncidentTab'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { SidebarTitleActionType, getDashboardLastUpdatedMs, getDataProduct, isOutputPort } from '../shared/utils'; -import { ChartPreview } from './preview/ChartPreview'; -import { ChartStatsSummarySubHeader } from './profile/stats/ChartStatsSummarySubHeader'; -import ChartSummaryTab from './summary/ChartSummaryTab'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { ChartPreview } from '@app/entityV2/chart/preview/ChartPreview'; +import { ChartStatsSummarySubHeader } from '@app/entityV2/chart/profile/stats/ChartStatsSummarySubHeader'; +import ChartSummaryTab from '@app/entityV2/chart/summary/ChartSummaryTab'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { SubType, TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import SidebarChartHeaderSection from '@app/entityV2/shared/containers/profile/sidebar/Chart/Header/SidebarChartHeaderSection'; +import DataProductSection from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import SidebarLineageSection from '@app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import EmbeddedProfile from '@app/entityV2/shared/embed/EmbeddedProfile'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { SUMMARY_TAB_ICON } from '@app/entityV2/shared/summary/HeaderComponents'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { EmbedTab } from '@app/entityV2/shared/tabs/Embed/EmbedTab'; +import { ChartDashboardsTab } from '@app/entityV2/shared/tabs/Entity/ChartDashboardsTab'; +import { InputFieldsTab } from '@app/entityV2/shared/tabs/Entity/InputFieldsTab'; +import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount'; +import { IncidentTab } from '@app/entityV2/shared/tabs/Incident/IncidentTab'; +import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { + SidebarTitleActionType, + getDashboardLastUpdatedMs, + getDataProduct, + isOutputPort, +} from '@app/entityV2/shared/utils'; +import { LOOKER_URN, MODE, MODE_URN } from '@app/ingest/source/builder/constants'; +import { MatchedFieldList } from '@app/searchV2/matches/MatchedFieldList'; +import { matchedInputFieldRenderer } from '@app/searchV2/matches/matchedInputFieldRenderer'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { GetChartQuery, useGetChartQuery, useUpdateChartMutation } from '@graphql/chart.generated'; +import { Chart, EntityType, LineageDirection, SearchResult } from '@types'; const PREVIEW_SUPPORTED_PLATFORMS = [LOOKER_URN, MODE_URN]; diff --git a/datahub-web-react/src/app/entityV2/chart/preview/ChartPreview.tsx b/datahub-web-react/src/app/entityV2/chart/preview/ChartPreview.tsx index 933fc50bb7..bbb54cc0c8 100644 --- a/datahub-web-react/src/app/entityV2/chart/preview/ChartPreview.tsx +++ b/datahub-web-react/src/app/entityV2/chart/preview/ChartPreview.tsx @@ -1,7 +1,17 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; import React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { IconStyleType } from '@app/entityV2/Entity'; +import { ChartStatsSummary as ChartStatsSummaryView } from '@app/entityV2/chart/shared/ChartStatsSummary'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { PopularityTier } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { DashboardLastUpdatedMs, summaryHasStats } from '@app/entityV2/shared/utils'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { AccessLevel, + BrowsePathV2, ChartStatsSummary, Container, DataProduct, @@ -14,15 +24,7 @@ import { Owner, ParentContainersResult, SearchInsight, - BrowsePathV2, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; -import { PopularityTier } from '../../shared/containers/profile/sidebar/shared/utils'; -import { summaryHasStats, DashboardLastUpdatedMs } from '../../shared/utils'; -import { ChartStatsSummary as ChartStatsSummaryView } from '../shared/ChartStatsSummary'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; +} from '@types'; export const ChartPreview = ({ urn, diff --git a/datahub-web-react/src/app/entityV2/chart/profile/stats/ChartStatsSummarySubHeader.tsx b/datahub-web-react/src/app/entityV2/chart/profile/stats/ChartStatsSummarySubHeader.tsx index 31326f8e0b..e7906ae7eb 100644 --- a/datahub-web-react/src/app/entityV2/chart/profile/stats/ChartStatsSummarySubHeader.tsx +++ b/datahub-web-react/src/app/entityV2/chart/profile/stats/ChartStatsSummarySubHeader.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { ChartStatsSummary as ChartStatsSummaryObj } from '../../../../../types.generated'; -import { useBaseEntity } from '../../../../entity/shared/EntityContext'; -import { GetChartQuery } from '../../../../../graphql/chart.generated'; -import { ChartStatsSummary } from '../../shared/ChartStatsSummary'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { ChartStatsSummary } from '@app/entityV2/chart/shared/ChartStatsSummary'; + +import { GetChartQuery } from '@graphql/chart.generated'; +import { ChartStatsSummary as ChartStatsSummaryObj } from '@types'; export const ChartStatsSummarySubHeader = () => { const result = useBaseEntity(); diff --git a/datahub-web-react/src/app/entityV2/chart/shared/ChartStatsSummary.tsx b/datahub-web-react/src/app/entityV2/chart/shared/ChartStatsSummary.tsx index 87e5d9a413..b79ad90dab 100644 --- a/datahub-web-react/src/app/entityV2/chart/shared/ChartStatsSummary.tsx +++ b/datahub-web-react/src/app/entityV2/chart/shared/ChartStatsSummary.tsx @@ -1,15 +1,16 @@ +import { ClockCircleOutlined, EyeOutlined, QuestionCircleOutlined, TeamOutlined } from '@ant-design/icons'; +import { Popover, Tooltip } from '@components'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { Popover, Tooltip } from '@components'; -import { ClockCircleOutlined, EyeOutlined, TeamOutlined, QuestionCircleOutlined } from '@ant-design/icons'; -import { formatNumber, formatNumberWithoutAbbreviation } from '../../../shared/formatNumber'; -import { ANTD_GRAY } from '../../shared/constants'; -import { toLocalDateTimeString, toRelativeTimeString } from '../../../shared/time/timeUtils'; -import { StatsSummary } from '../../shared/components/styled/StatsSummary'; -import { PercentileLabel } from '../../shared/stats/PercentileLabel'; -import { countFormatter, needsFormatting } from '../../../../utils/formatter'; -import ExpandingStat from '../../dataset/shared/ExpandingStat'; + +import ExpandingStat from '@app/entityV2/dataset/shared/ExpandingStat'; +import { StatsSummary } from '@app/entityV2/shared/components/styled/StatsSummary'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { PercentileLabel } from '@app/entityV2/shared/stats/PercentileLabel'; +import { formatNumber, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils'; +import { countFormatter, needsFormatting } from '@utils/formatter'; const StatText = styled.span` color: ${ANTD_GRAY[8]}; diff --git a/datahub-web-react/src/app/entityV2/chart/summary/ChartFieldsTable.tsx b/datahub-web-react/src/app/entityV2/chart/summary/ChartFieldsTable.tsx index e7e5971e3c..8d61a08205 100644 --- a/datahub-web-react/src/app/entityV2/chart/summary/ChartFieldsTable.tsx +++ b/datahub-web-react/src/app/entityV2/chart/summary/ChartFieldsTable.tsx @@ -1,11 +1,13 @@ -import React from 'react'; -import styled from 'styled-components'; -import { Link } from 'react-router-dom'; import { Table, Typography } from 'antd'; -import { EntityType, SchemaField } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { CompactFieldIconWithTooltip } from '../../../sharedV2/icons/CompactFieldIcon'; -import { REDESIGN_COLORS } from '../../shared/constants'; +import React from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { CompactFieldIconWithTooltip } from '@app/sharedV2/icons/CompactFieldIcon'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, SchemaField } from '@types'; const MAX_ROWS = 5; diff --git a/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryOverview.tsx b/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryOverview.tsx index bbd55e8f61..af0fa3c8eb 100644 --- a/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryOverview.tsx +++ b/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryOverview.tsx @@ -1,16 +1,18 @@ import React from 'react'; import styled from 'styled-components'; -import { GetChartQuery } from '../../../../graphql/chart.generated'; -import { Entity, EntityType } from '../../../../types.generated'; -import { useBaseEntity, useEntityData } from '../../../entity/shared/EntityContext'; -import Loading from '../../../shared/Loading'; -import SummaryEntityCard from '../../../sharedV2/cards/SummaryEntityCard'; -import { useEntityRegistryV2 } from '../../../useEntityRegistry'; -import { SubType } from '../../shared/components/subtypes'; -import { HorizontalList, SummaryColumns } from '../../shared/summary/ListComponents'; -import SummaryCreatedBySection from '../../shared/summary/SummaryCreatedBySection'; -import SummaryQuerySection from './SummaryQuerySection'; -import { MainSection, StyledTitle, SummaryHeader, VerticalDivider } from './styledComponents'; + +import { useBaseEntity, useEntityData } from '@app/entity/shared/EntityContext'; +import SummaryQuerySection from '@app/entityV2/chart/summary/SummaryQuerySection'; +import { MainSection, StyledTitle, SummaryHeader, VerticalDivider } from '@app/entityV2/chart/summary/styledComponents'; +import { SubType } from '@app/entityV2/shared/components/subtypes'; +import { HorizontalList, SummaryColumns } from '@app/entityV2/shared/summary/ListComponents'; +import SummaryCreatedBySection from '@app/entityV2/shared/summary/SummaryCreatedBySection'; +import Loading from '@app/shared/Loading'; +import SummaryEntityCard from '@app/sharedV2/cards/SummaryEntityCard'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { GetChartQuery } from '@graphql/chart.generated'; +import { Entity, EntityType } from '@types'; const Count = styled.div` padding: 1px 8px; diff --git a/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryTab.tsx b/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryTab.tsx index a5977ae2e4..c00d4d55ae 100644 --- a/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryTab.tsx +++ b/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryTab.tsx @@ -1,16 +1,17 @@ +import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Divider } from 'antd'; -import { SummaryTabWrapper } from '../../shared/summary/HeaderComponents'; -import TableauEmbed from './TableauEmbed'; -import ChartSummaryOverview from './ChartSummaryOverview'; -import { TABLEAU_URN, LOOKER_URN, MODE_URN } from '../../../ingest/source/builder/constants'; -import SummaryAboutSection from '../../shared/summary/SummaryAboutSection'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import { useGetTagFields } from './useGetTagFields'; -import { SummaryColumns } from '../../shared/summary/ListComponents'; -import FieldTableByTag from './FieldTableByTag'; -import EmbedPreview from './EmbedPreview'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import ChartSummaryOverview from '@app/entityV2/chart/summary/ChartSummaryOverview'; +import EmbedPreview from '@app/entityV2/chart/summary/EmbedPreview'; +import FieldTableByTag from '@app/entityV2/chart/summary/FieldTableByTag'; +import TableauEmbed from '@app/entityV2/chart/summary/TableauEmbed'; +import { useGetTagFields } from '@app/entityV2/chart/summary/useGetTagFields'; +import { SummaryTabWrapper } from '@app/entityV2/shared/summary/HeaderComponents'; +import { SummaryColumns } from '@app/entityV2/shared/summary/ListComponents'; +import SummaryAboutSection from '@app/entityV2/shared/summary/SummaryAboutSection'; +import { LOOKER_URN, MODE_URN, TABLEAU_URN } from '@app/ingest/source/builder/constants'; const StyledDivider = styled(Divider)` width: 100%; diff --git a/datahub-web-react/src/app/entityV2/chart/summary/EmbedPreview.tsx b/datahub-web-react/src/app/entityV2/chart/summary/EmbedPreview.tsx index ceacfd3779..4f014caad9 100644 --- a/datahub-web-react/src/app/entityV2/chart/summary/EmbedPreview.tsx +++ b/datahub-web-react/src/app/entityV2/chart/summary/EmbedPreview.tsx @@ -1,7 +1,8 @@ +import HeaderIcon from '@mui/icons-material/VisibilityOutlined'; import React from 'react'; import styled from 'styled-components'; -import HeaderIcon from '@mui/icons-material/VisibilityOutlined'; -import { SummaryTabHeaderTitle, SummaryTabHeaderWrapper } from '../../shared/summary/HeaderComponents'; + +import { SummaryTabHeaderTitle, SummaryTabHeaderWrapper } from '@app/entityV2/shared/summary/HeaderComponents'; const Wrapper = styled.div` height: fit-content; diff --git a/datahub-web-react/src/app/entityV2/chart/summary/FieldTableByTag.tsx b/datahub-web-react/src/app/entityV2/chart/summary/FieldTableByTag.tsx index bae4ef4031..92ef43f6ee 100644 --- a/datahub-web-react/src/app/entityV2/chart/summary/FieldTableByTag.tsx +++ b/datahub-web-react/src/app/entityV2/chart/summary/FieldTableByTag.tsx @@ -1,9 +1,11 @@ import React from 'react'; import styled from 'styled-components'; -import ChartFieldsTable from './ChartFieldsTable'; -import { SchemaField } from '../../../../types.generated'; -import { SummaryTabHeaderTitle } from '../../shared/summary/HeaderComponents'; -import { useEntityData } from '../../../entity/shared/EntityContext'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import ChartFieldsTable from '@app/entityV2/chart/summary/ChartFieldsTable'; +import { SummaryTabHeaderTitle } from '@app/entityV2/shared/summary/HeaderComponents'; + +import { SchemaField } from '@types'; const ColumnWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/chart/summary/SummaryQuerySection.tsx b/datahub-web-react/src/app/entityV2/chart/summary/SummaryQuerySection.tsx index ea0b14e86c..b4d79764a7 100644 --- a/datahub-web-react/src/app/entityV2/chart/summary/SummaryQuerySection.tsx +++ b/datahub-web-react/src/app/entityV2/chart/summary/SummaryQuerySection.tsx @@ -1,8 +1,9 @@ -import React, { useState } from 'react'; -import styled from 'styled-components/macro'; -import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; import { Button, Modal } from 'antd'; -import { REDESIGN_COLORS } from '../../shared/constants'; +import React, { useState } from 'react'; +import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; +import styled from 'styled-components/macro'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; const PreviewSyntax = styled(SyntaxHighlighter)` max-height: 68px; diff --git a/datahub-web-react/src/app/entityV2/chart/summary/TableauEmbed.tsx b/datahub-web-react/src/app/entityV2/chart/summary/TableauEmbed.tsx index d217dcdf95..586e23e0c4 100644 --- a/datahub-web-react/src/app/entityV2/chart/summary/TableauEmbed.tsx +++ b/datahub-web-react/src/app/entityV2/chart/summary/TableauEmbed.tsx @@ -1,7 +1,8 @@ +import HeaderIcon from '@mui/icons-material/VisibilityOutlined'; import React, { useEffect } from 'react'; import styled from 'styled-components'; -import HeaderIcon from '@mui/icons-material/VisibilityOutlined'; -import { SummaryTabHeaderTitle, SummaryTabHeaderWrapper } from '../../shared/summary/HeaderComponents'; + +import { SummaryTabHeaderTitle, SummaryTabHeaderWrapper } from '@app/entityV2/shared/summary/HeaderComponents'; const Wrapper = styled.div` height: fit-content; diff --git a/datahub-web-react/src/app/entityV2/chart/summary/styledComponents.ts b/datahub-web-react/src/app/entityV2/chart/summary/styledComponents.ts index 1ead96bbef..7343777c84 100644 --- a/datahub-web-react/src/app/entityV2/chart/summary/styledComponents.ts +++ b/datahub-web-react/src/app/entityV2/chart/summary/styledComponents.ts @@ -1,7 +1,8 @@ import { Typography } from 'antd'; import styled from 'styled-components'; -import { REDESIGN_COLORS } from '../../shared/constants'; -import { HeaderTitle } from '../../shared/summary/HeaderComponents'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { HeaderTitle } from '@app/entityV2/shared/summary/HeaderComponents'; export const MainSection = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/chart/summary/useGetTagFields.ts b/datahub-web-react/src/app/entityV2/chart/summary/useGetTagFields.ts index 8495351f37..5c9d3d6fec 100644 --- a/datahub-web-react/src/app/entityV2/chart/summary/useGetTagFields.ts +++ b/datahub-web-react/src/app/entityV2/chart/summary/useGetTagFields.ts @@ -1,6 +1,7 @@ -import { GetChartQuery } from '../../../../graphql/chart.generated'; -import { SchemaField } from '../../../../types.generated'; -import { useBaseEntity } from '../../../entity/shared/EntityContext'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; + +import { GetChartQuery } from '@graphql/chart.generated'; +import { SchemaField } from '@types'; export function useGetTagFields(tag: string): SchemaField[] | undefined { const chart = useBaseEntity()?.chart; diff --git a/datahub-web-react/src/app/entityV2/container/ContainerEntitiesTab.tsx b/datahub-web-react/src/app/entityV2/container/ContainerEntitiesTab.tsx index 0f760e3ccc..a596cebcfc 100644 --- a/datahub-web-react/src/app/entityV2/container/ContainerEntitiesTab.tsx +++ b/datahub-web-react/src/app/entityV2/container/ContainerEntitiesTab.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { useEntityData } from '../../entity/shared/EntityContext'; -import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection'; -import { UnionType } from '../../search/utils/constants'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { EmbeddedListSearchSection } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchSection'; +import { UnionType } from '@app/search/utils/constants'; export const ContainerEntitiesTab = () => { const { urn } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/container/ContainerEntity.tsx b/datahub-web-react/src/app/entityV2/container/ContainerEntity.tsx index a6e700fe1e..0cd01d6286 100644 --- a/datahub-web-react/src/app/entityV2/container/ContainerEntity.tsx +++ b/datahub-web-react/src/app/entityV2/container/ContainerEntity.tsx @@ -1,33 +1,35 @@ import { AppstoreOutlined, FileOutlined, FolderOutlined } from '@ant-design/icons'; import { ListBullets } from '@phosphor-icons/react'; import * as React from 'react'; -import { GetContainerQuery, useGetContainerQuery } from '../../../graphql/container.generated'; -import { Container, EntityType, SearchResult } from '../../../types.generated'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { SubType, TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import SidebarContentsSection from '../shared/containers/profile/sidebar/Container/SidebarContentsSection'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import EmbeddedProfile from '../shared/embed/EmbeddedProfile'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { SUMMARY_TAB_ICON } from '../shared/summary/HeaderComponents'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { getDataProduct, isOutputPort } from '../shared/utils'; -import { ContainerEntitiesTab } from './ContainerEntitiesTab'; -import ContainerSummaryTab from './ContainerSummaryTab'; -import { Preview } from './preview/Preview'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { ContainerEntitiesTab } from '@app/entityV2/container/ContainerEntitiesTab'; +import ContainerSummaryTab from '@app/entityV2/container/ContainerSummaryTab'; +import { Preview } from '@app/entityV2/container/preview/Preview'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { SubType, TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import SidebarContentsSection from '@app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsSection'; +import DataProductSection from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import EmbeddedProfile from '@app/entityV2/shared/embed/EmbeddedProfile'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { SUMMARY_TAB_ICON } from '@app/entityV2/shared/summary/HeaderComponents'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { getDataProduct, isOutputPort } from '@app/entityV2/shared/utils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { GetContainerQuery, useGetContainerQuery } from '@graphql/container.generated'; +import { Container, EntityType, SearchResult } from '@types'; const headerDropdownItems = new Set([EntityMenuItems.EXTERNAL_URL, EntityMenuItems.SHARE, EntityMenuItems.ANNOUNCE]); diff --git a/datahub-web-react/src/app/entityV2/container/ContainerSummaryTab.tsx b/datahub-web-react/src/app/entityV2/container/ContainerSummaryTab.tsx index 74c9049365..76d90aaeb2 100644 --- a/datahub-web-react/src/app/entityV2/container/ContainerSummaryTab.tsx +++ b/datahub-web-react/src/app/entityV2/container/ContainerSummaryTab.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { useEntityData } from '../../entity/shared/EntityContext'; -import { SubType } from '../shared/components/subtypes'; -import TableauWorkbookSummaryTab from './tableau/TableauWorkbookSummaryTab'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import TableauWorkbookSummaryTab from '@app/entityV2/container/tableau/TableauWorkbookSummaryTab'; +import { SubType } from '@app/entityV2/shared/components/subtypes'; export default function ContainerSummaryTab() { const { entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/container/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/container/preview/Preview.tsx index 7d6f6176e9..5b6d8da91a 100644 --- a/datahub-web-react/src/app/entityV2/container/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/container/preview/Preview.tsx @@ -1,25 +1,27 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; import React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import EntityCount from '@app/entityV2/shared/containers/profile/header/EntityCount'; +import ContainerIcon from '@app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { + BrowsePathV2, Container, + DataProduct, + Deprecation, + Domain, + EntityPath, EntityType, + GlobalTags, + GlossaryTerms, Owner, + ParentContainersResult, SearchInsight, SubTypes, - Domain, - ParentContainersResult, - GlobalTags, - Deprecation, - GlossaryTerms, - DataProduct, - EntityPath, - BrowsePathV2, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import ContainerIcon from '../../shared/containers/profile/header/PlatformContent/ContainerIcon'; -import EntityCount from '../../shared/containers/profile/header/EntityCount'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; +} from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entityV2/container/tableau/TableauDataSourcesSection.tsx b/datahub-web-react/src/app/entityV2/container/tableau/TableauDataSourcesSection.tsx index 601061faae..2afefa8feb 100644 --- a/datahub-web-react/src/app/entityV2/container/tableau/TableauDataSourcesSection.tsx +++ b/datahub-web-react/src/app/entityV2/container/tableau/TableauDataSourcesSection.tsx @@ -1,12 +1,14 @@ import React from 'react'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import { useGetSearchResultsForMultipleQuery } from '../../../../graphql/search.generated'; -import { EntityType, FilterOperator } from '../../../../types.generated'; -import { HorizontalList } from '../../shared/summary/ListComponents'; -import { HeaderTitle } from '../../shared/summary/HeaderComponents'; -import { getSubTypeIcon, SubType } from '../../shared/components/subtypes'; -import { CONTAINER_FILTER_NAME, TYPE_NAMES_FILTER_NAME } from '../../../searchV2/utils/constants'; -import SummaryEntityCard from '../../../sharedV2/cards/SummaryEntityCard'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { SubType, getSubTypeIcon } from '@app/entityV2/shared/components/subtypes'; +import { HeaderTitle } from '@app/entityV2/shared/summary/HeaderComponents'; +import { HorizontalList } from '@app/entityV2/shared/summary/ListComponents'; +import { CONTAINER_FILTER_NAME, TYPE_NAMES_FILTER_NAME } from '@app/searchV2/utils/constants'; +import SummaryEntityCard from '@app/sharedV2/cards/SummaryEntityCard'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { EntityType, FilterOperator } from '@types'; export default function TableauDataSourcesSection() { const { urn } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/container/tableau/TableauViewsSection.tsx b/datahub-web-react/src/app/entityV2/container/tableau/TableauViewsSection.tsx index d71b13c2f2..f796d12ce6 100644 --- a/datahub-web-react/src/app/entityV2/container/tableau/TableauViewsSection.tsx +++ b/datahub-web-react/src/app/entityV2/container/tableau/TableauViewsSection.tsx @@ -1,14 +1,17 @@ -import React from 'react'; import Icon from '@ant-design/icons'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import { useGetSearchResultsForMultipleQuery } from '../../../../graphql/search.generated'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { HorizontalList } from '../../shared/summary/ListComponents'; -import { HeaderTitle } from '../../shared/summary/HeaderComponents'; -import TableauViewIcon from '../../../../images/tableau-view.svg?react'; -import { CONTAINER_FILTER_NAME } from '../../../searchV2/utils/constants'; -import SummaryEntityCard from '../../../sharedV2/cards/SummaryEntityCard'; +import React from 'react'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { HeaderTitle } from '@app/entityV2/shared/summary/HeaderComponents'; +import { HorizontalList } from '@app/entityV2/shared/summary/ListComponents'; +import { CONTAINER_FILTER_NAME } from '@app/searchV2/utils/constants'; +import SummaryEntityCard from '@app/sharedV2/cards/SummaryEntityCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; + +import TableauViewIcon from '@images/tableau-view.svg?react'; const viewPattern = /.*tableau.com.*\/#(\/site\/[^/]*)?\/views\/(.*)/; diff --git a/datahub-web-react/src/app/entityV2/container/tableau/TableauWorkbookSummaryTab.tsx b/datahub-web-react/src/app/entityV2/container/tableau/TableauWorkbookSummaryTab.tsx index 4e0142c76a..ab5d19e389 100644 --- a/datahub-web-react/src/app/entityV2/container/tableau/TableauWorkbookSummaryTab.tsx +++ b/datahub-web-react/src/app/entityV2/container/tableau/TableauWorkbookSummaryTab.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import SummaryAboutSection from '../../shared/summary/SummaryAboutSection'; -import { SummaryTabWrapper } from '../../shared/summary/HeaderComponents'; -import TableauViewsSection from './TableauViewsSection'; -import TableauDataSourcesSection from './TableauDataSourcesSection'; + +import TableauDataSourcesSection from '@app/entityV2/container/tableau/TableauDataSourcesSection'; +import TableauViewsSection from '@app/entityV2/container/tableau/TableauViewsSection'; +import { SummaryTabWrapper } from '@app/entityV2/shared/summary/HeaderComponents'; +import SummaryAboutSection from '@app/entityV2/shared/summary/SummaryAboutSection'; export default function TableauWorkbookSummaryTab() { return ( diff --git a/datahub-web-react/src/app/entityV2/dashboard/DashboardEntity.tsx b/datahub-web-react/src/app/entityV2/dashboard/DashboardEntity.tsx index 9e7cb914cd..8fed6efc45 100644 --- a/datahub-web-react/src/app/entityV2/dashboard/DashboardEntity.tsx +++ b/datahub-web-react/src/app/entityV2/dashboard/DashboardEntity.tsx @@ -11,48 +11,51 @@ import { } from '@ant-design/icons'; import { ListBullets, TreeStructure } from '@phosphor-icons/react'; import * as React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { DashboardPreview } from '@app/entityV2/dashboard/preview/DashboardPreview'; +import { DashboardStatsSummarySubHeader } from '@app/entityV2/dashboard/profile/DashboardStatsSummarySubHeader'; +import DashboardSummaryTab from '@app/entityV2/dashboard/summary/DashboardSummaryTab'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import SidebarDashboardHeaderSection from '@app/entityV2/shared/containers/profile/sidebar/Dashboard/Header/SidebarDashboardHeaderSection'; +import DataProductSection from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import SidebarLineageSection from '@app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import EmbeddedProfile from '@app/entityV2/shared/embed/EmbeddedProfile'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { SUMMARY_TAB_ICON } from '@app/entityV2/shared/summary/HeaderComponents'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { EmbedTab } from '@app/entityV2/shared/tabs/Embed/EmbedTab'; +import { DashboardChartsTab } from '@app/entityV2/shared/tabs/Entity/DashboardChartsTab'; +import { DashboardDatasetsTab } from '@app/entityV2/shared/tabs/Entity/DashboardDatasetsTab'; +import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount'; +import { IncidentTab } from '@app/entityV2/shared/tabs/Incident/IncidentTab'; +import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; import { - GetDashboardQuery, - useGetDashboardQuery, - useUpdateDashboardMutation, -} from '../../../graphql/dashboard.generated'; -import { Dashboard, EntityType, LineageDirection, SearchResult } from '../../../types.generated'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { LOOKER_URN, MODE_URN } from '../../ingest/source/builder/constants'; -import { matchedInputFieldRenderer } from '../../search/matches/matchedInputFieldRenderer'; -import { MatchedFieldList } from '../../searchV2/matches/MatchedFieldList'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import SidebarDashboardHeaderSection from '../shared/containers/profile/sidebar/Dashboard/Header/SidebarDashboardHeaderSection'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import SidebarLineageSection from '../shared/containers/profile/sidebar/Lineage/SidebarLineageSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import EmbeddedProfile from '../shared/embed/EmbeddedProfile'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { SUMMARY_TAB_ICON } from '../shared/summary/HeaderComponents'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { EmbedTab } from '../shared/tabs/Embed/EmbedTab'; -import { DashboardChartsTab } from '../shared/tabs/Entity/DashboardChartsTab'; -import { DashboardDatasetsTab } from '../shared/tabs/Entity/DashboardDatasetsTab'; -import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount'; -import { IncidentTab } from '../shared/tabs/Incident/IncidentTab'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { SidebarTitleActionType, getDashboardLastUpdatedMs, getDataProduct, isOutputPort } from '../shared/utils'; -import { DashboardPreview } from './preview/DashboardPreview'; -import { DashboardStatsSummarySubHeader } from './profile/DashboardStatsSummarySubHeader'; -import DashboardSummaryTab from './summary/DashboardSummaryTab'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; + SidebarTitleActionType, + getDashboardLastUpdatedMs, + getDataProduct, + isOutputPort, +} from '@app/entityV2/shared/utils'; +import { LOOKER_URN, MODE_URN } from '@app/ingest/source/builder/constants'; +import { matchedInputFieldRenderer } from '@app/search/matches/matchedInputFieldRenderer'; +import { MatchedFieldList } from '@app/searchV2/matches/MatchedFieldList'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { GetDashboardQuery, useGetDashboardQuery, useUpdateDashboardMutation } from '@graphql/dashboard.generated'; +import { Dashboard, EntityType, LineageDirection, SearchResult } from '@types'; const PREVIEW_SUPPORTED_PLATFORMS = [LOOKER_URN, MODE_URN]; diff --git a/datahub-web-react/src/app/entityV2/dashboard/preview/DashboardPreview.tsx b/datahub-web-react/src/app/entityV2/dashboard/preview/DashboardPreview.tsx index c1800d38a1..56e296d3f6 100644 --- a/datahub-web-react/src/app/entityV2/dashboard/preview/DashboardPreview.tsx +++ b/datahub-web-react/src/app/entityV2/dashboard/preview/DashboardPreview.tsx @@ -1,7 +1,17 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; import React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { DashboardStatsSummary as DashboardStatsSummaryView } from '@app/entityV2/dashboard/shared/DashboardStatsSummary'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { PopularityTier } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { DashboardLastUpdatedMs, summaryHasStats } from '@app/entityV2/shared/utils'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { AccessLevel, + BrowsePathV2, Container, DashboardStatsSummary, DataProduct, @@ -14,15 +24,7 @@ import { Owner, ParentContainersResult, SearchInsight, - BrowsePathV2, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; -import { PopularityTier } from '../../shared/containers/profile/sidebar/shared/utils'; -import { summaryHasStats, DashboardLastUpdatedMs } from '../../shared/utils'; -import { DashboardStatsSummary as DashboardStatsSummaryView } from '../shared/DashboardStatsSummary'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; +} from '@types'; export const DashboardPreview = ({ urn, diff --git a/datahub-web-react/src/app/entityV2/dashboard/profile/DashboardStatsSummarySubHeader.tsx b/datahub-web-react/src/app/entityV2/dashboard/profile/DashboardStatsSummarySubHeader.tsx index ceaf5d9c97..bbaf0608c6 100644 --- a/datahub-web-react/src/app/entityV2/dashboard/profile/DashboardStatsSummarySubHeader.tsx +++ b/datahub-web-react/src/app/entityV2/dashboard/profile/DashboardStatsSummarySubHeader.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { DashboardStatsSummary as DashboardStatsSummaryObj } from '../../../../types.generated'; -import { useBaseEntity } from '../../../entity/shared/EntityContext'; -import { GetDashboardQuery } from '../../../../graphql/dashboard.generated'; -import { DashboardStatsSummary } from '../shared/DashboardStatsSummary'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { DashboardStatsSummary } from '@app/entityV2/dashboard/shared/DashboardStatsSummary'; + +import { GetDashboardQuery } from '@graphql/dashboard.generated'; +import { DashboardStatsSummary as DashboardStatsSummaryObj } from '@types'; export const DashboardStatsSummarySubHeader = () => { const result = useBaseEntity(); diff --git a/datahub-web-react/src/app/entityV2/dashboard/shared/DashboardStatsSummary.tsx b/datahub-web-react/src/app/entityV2/dashboard/shared/DashboardStatsSummary.tsx index 8e04f08860..e3b7c0b78b 100644 --- a/datahub-web-react/src/app/entityV2/dashboard/shared/DashboardStatsSummary.tsx +++ b/datahub-web-react/src/app/entityV2/dashboard/shared/DashboardStatsSummary.tsx @@ -1,15 +1,16 @@ +import { ClockCircleOutlined, EyeOutlined, QuestionCircleOutlined, TeamOutlined } from '@ant-design/icons'; +import { Popover, Tooltip } from '@components'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { Popover, Tooltip } from '@components'; -import { ClockCircleOutlined, EyeOutlined, TeamOutlined, QuestionCircleOutlined } from '@ant-design/icons'; -import { formatNumber, formatNumberWithoutAbbreviation } from '../../../shared/formatNumber'; -import { ANTD_GRAY } from '../../shared/constants'; -import { toLocalDateTimeString, toRelativeTimeString } from '../../../shared/time/timeUtils'; -import { StatsSummary } from '../../shared/components/styled/StatsSummary'; -import { PercentileLabel } from '../../shared/stats/PercentileLabel'; -import { countFormatter, needsFormatting } from '../../../../utils/formatter'; -import ExpandingStat from '../../dataset/shared/ExpandingStat'; + +import ExpandingStat from '@app/entityV2/dataset/shared/ExpandingStat'; +import { StatsSummary } from '@app/entityV2/shared/components/styled/StatsSummary'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { PercentileLabel } from '@app/entityV2/shared/stats/PercentileLabel'; +import { formatNumber, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils'; +import { countFormatter, needsFormatting } from '@utils/formatter'; const StatText = styled.span` color: ${ANTD_GRAY[8]}; diff --git a/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryOverview.tsx b/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryOverview.tsx index b4f8c74c30..1477d71c66 100644 --- a/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryOverview.tsx +++ b/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryOverview.tsx @@ -1,20 +1,21 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { GetDashboardQuery } from '../../../../graphql/dashboard.generated'; -import { Entity, EntityType } from '../../../../types.generated'; -import { useBaseEntity, useEntityData } from '../../../entity/shared/EntityContext'; -import { GenericEntityProperties } from '../../../entity/shared/types'; -import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip'; -import PlatformIcon from '../../../sharedV2/icons/PlatformIcon'; -import { useEntityRegistryV2 } from '../../../useEntityRegistry'; -import { MainSection, StyledTitle, SummaryHeader, VerticalDivider } from '../../chart/summary/styledComponents'; -import { REDESIGN_COLORS } from '../../shared/constants'; -import { SummaryColumns } from '../../shared/summary/ListComponents'; -import SummaryCreatedBySection from '../../shared/summary/SummaryCreatedBySection'; -import { useGetSearchResultsQuery } from '../../../../graphql/search.generated'; -import Loading from '../../../shared/Loading'; +import { useBaseEntity, useEntityData } from '@app/entity/shared/EntityContext'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { MainSection, StyledTitle, SummaryHeader, VerticalDivider } from '@app/entityV2/chart/summary/styledComponents'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SummaryColumns } from '@app/entityV2/shared/summary/ListComponents'; +import SummaryCreatedBySection from '@app/entityV2/shared/summary/SummaryCreatedBySection'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import Loading from '@app/shared/Loading'; +import PlatformIcon from '@app/sharedV2/icons/PlatformIcon'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { GetDashboardQuery } from '@graphql/dashboard.generated'; +import { useGetSearchResultsQuery } from '@graphql/search.generated'; +import { Entity, EntityType } from '@types'; const Count = styled.div` padding: 1px 8px; diff --git a/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryTab.tsx b/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryTab.tsx index b8474f5a08..c0f4cb144a 100644 --- a/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryTab.tsx +++ b/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryTab.tsx @@ -1,11 +1,12 @@ +import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Divider } from 'antd'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import { SummaryTabWrapper } from '../../shared/summary/HeaderComponents'; -import SummaryAboutSection from '../../shared/summary/SummaryAboutSection'; -import EmbedPreview from '../../chart/summary/EmbedPreview'; -import DashboardSummaryOverview from './DashboardSummaryOverview'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import EmbedPreview from '@app/entityV2/chart/summary/EmbedPreview'; +import DashboardSummaryOverview from '@app/entityV2/dashboard/summary/DashboardSummaryOverview'; +import { SummaryTabWrapper } from '@app/entityV2/shared/summary/HeaderComponents'; +import SummaryAboutSection from '@app/entityV2/shared/summary/SummaryAboutSection'; const StyledDivider = styled(Divider)` width: 100%; diff --git a/datahub-web-react/src/app/entityV2/dataContract/DataContractEntity.tsx b/datahub-web-react/src/app/entityV2/dataContract/DataContractEntity.tsx index af6450b8f5..b58f7442e5 100644 --- a/datahub-web-react/src/app/entityV2/dataContract/DataContractEntity.tsx +++ b/datahub-web-react/src/app/entityV2/dataContract/DataContractEntity.tsx @@ -1,9 +1,10 @@ import { FileOutlined } from '@ant-design/icons'; +import * as React from 'react'; + +import { Entity, IconStyleType } from '@app/entityV2/Entity'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; import { TYPE_ICON_CLASS_NAME } from '@src/app/shared/constants'; import { DataContract, EntityType } from '@src/types.generated'; -import * as React from 'react'; -import { Entity, IconStyleType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; /** * Definition of the DataHub DataFlow entity. diff --git a/datahub-web-react/src/app/entityV2/dataFlow/DataFlowEntity.tsx b/datahub-web-react/src/app/entityV2/dataFlow/DataFlowEntity.tsx index 6bb8e3e785..30477b3417 100644 --- a/datahub-web-react/src/app/entityV2/dataFlow/DataFlowEntity.tsx +++ b/datahub-web-react/src/app/entityV2/dataFlow/DataFlowEntity.tsx @@ -1,32 +1,34 @@ import { ShareAltOutlined } from '@ant-design/icons'; -import { ListBullets, FileText, Share, WarningCircle } from '@phosphor-icons/react'; +import { FileText, ListBullets, Share, WarningCircle } from '@phosphor-icons/react'; import * as React from 'react'; -import { useGetDataFlowQuery, useUpdateDataFlowMutation } from '../../../graphql/dataFlow.generated'; -import { DataFlow, EntityType, SearchResult } from '../../../types.generated'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { DataFlowJobsTab } from '../shared/tabs/Entity/DataFlowJobsTab'; -import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount'; -import { IncidentTab } from '../shared/tabs/Incident/IncidentTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { getDataProduct, isOutputPort } from '../shared/utils'; -import { Preview } from './preview/Preview'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { Preview } from '@app/entityV2/dataFlow/preview/Preview'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { DataFlowJobsTab } from '@app/entityV2/shared/tabs/Entity/DataFlowJobsTab'; +import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount'; +import { IncidentTab } from '@app/entityV2/shared/tabs/Incident/IncidentTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { getDataProduct, isOutputPort } from '@app/entityV2/shared/utils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { useGetDataFlowQuery, useUpdateDataFlowMutation } from '@graphql/dataFlow.generated'; +import { DataFlow, EntityType, SearchResult } from '@types'; const headerDropdownItems = new Set([ EntityMenuItems.EXTERNAL_URL, diff --git a/datahub-web-react/src/app/entityV2/dataFlow/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/dataFlow/preview/Preview.tsx index af1997bfae..2e9bb289d5 100644 --- a/datahub-web-react/src/app/entityV2/dataFlow/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/dataFlow/preview/Preview.tsx @@ -1,7 +1,14 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { DataProduct, Deprecation, @@ -12,12 +19,7 @@ import { Owner, ParentContainersResult, SearchInsight, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; -import { ANTD_GRAY } from '../../shared/constants'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; +} from '@types'; const StatText = styled(Typography.Text)` color: ${ANTD_GRAY[8]}; diff --git a/datahub-web-react/src/app/entityV2/dataJob/DataJobEntity.tsx b/datahub-web-react/src/app/entityV2/dataJob/DataJobEntity.tsx index d24650749c..2bb937275b 100644 --- a/datahub-web-react/src/app/entityV2/dataJob/DataJobEntity.tsx +++ b/datahub-web-react/src/app/entityV2/dataJob/DataJobEntity.tsx @@ -1,39 +1,41 @@ import { ConsoleSqlOutlined } from '@ant-design/icons'; -import { ListBullets, TreeStructure, FileText, Share, ArrowsClockwise, WarningCircle } from '@phosphor-icons/react'; +import { ArrowsClockwise, FileText, ListBullets, Share, TreeStructure, WarningCircle } from '@phosphor-icons/react'; import * as React from 'react'; -import { GetDataJobQuery, useGetDataJobQuery, useUpdateDataJobMutation } from '../../../graphql/dataJob.generated'; -import { DataJob, EntityType, SearchResult } from '../../../types.generated'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { EntityAndType } from '../../lineage/types'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { DataFlowEntity } from '../dataFlow/DataFlowEntity'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import SidebarLineageSection from '../shared/containers/profile/sidebar/Lineage/SidebarLineageSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import SidebarQueryOperationsSection from '../shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { SidebarDataJobTransformationLogicSection } from '../shared/containers/profile/sidebar/SidebarLogicSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { DataJobFlowTab } from '../shared/tabs/Entity/DataJobFlowTab'; -import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount'; -import { IncidentTab } from '../shared/tabs/Incident/IncidentTab'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { SidebarTitleActionType, getDataProduct, isOutputPort } from '../shared/utils'; -import { Preview } from './preview/Preview'; -import { RunsTab } from './tabs/RunsTab'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { DataFlowEntity } from '@app/entityV2/dataFlow/DataFlowEntity'; +import { Preview } from '@app/entityV2/dataJob/preview/Preview'; +import { RunsTab } from '@app/entityV2/dataJob/tabs/RunsTab'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import SidebarLineageSection from '@app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarQueryOperationsSection from '@app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; +import { SidebarDataJobTransformationLogicSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { DataJobFlowTab } from '@app/entityV2/shared/tabs/Entity/DataJobFlowTab'; +import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount'; +import { IncidentTab } from '@app/entityV2/shared/tabs/Incident/IncidentTab'; +import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { SidebarTitleActionType, getDataProduct, isOutputPort } from '@app/entityV2/shared/utils'; +import { EntityAndType } from '@app/lineage/types'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { GetDataJobQuery, useGetDataJobQuery, useUpdateDataJobMutation } from '@graphql/dataJob.generated'; +import { DataJob, EntityType, SearchResult } from '@types'; const getDataJobPlatformName = (data?: DataJob): string => { return ( @@ -283,14 +285,14 @@ export class DataJobEntity implements Entity { ({ entity: relationship.entity, type: relationship.entity.type, - } as EntityAndType), + }) as EntityAndType, ), // eslint-disable-next-line @typescript-eslint/dot-notation upstreamChildren: entity?.['upstream']?.relationships?.map( (relationship) => ({ entity: relationship.entity, type: relationship.entity.type, - } as EntityAndType), + }) as EntityAndType, ), platform: entity?.dataFlow?.platform, }; diff --git a/datahub-web-react/src/app/entityV2/dataJob/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/dataJob/preview/Preview.tsx index c848501671..4766b72e94 100644 --- a/datahub-web-react/src/app/entityV2/dataJob/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/dataJob/preview/Preview.tsx @@ -1,8 +1,15 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; +import { ClockCircleOutlined } from '@ant-design/icons'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { ClockCircleOutlined } from '@ant-design/icons'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { toRelativeTimeString } from '@app/shared/time/timeUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { BrowsePathV2, @@ -15,13 +22,7 @@ import { Owner, ParentContainersResult, SearchInsight, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; -import { ANTD_GRAY } from '../../shared/constants'; -import { toRelativeTimeString } from '../../../shared/time/timeUtils'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; +} from '@types'; const StatText = styled(Typography.Text)` color: ${ANTD_GRAY[8]}; diff --git a/datahub-web-react/src/app/entityV2/dataJob/tabs/RunsTab.tsx b/datahub-web-react/src/app/entityV2/dataJob/tabs/RunsTab.tsx index 4878fe9c3b..65d82f9c72 100644 --- a/datahub-web-react/src/app/entityV2/dataJob/tabs/RunsTab.tsx +++ b/datahub-web-react/src/app/entityV2/dataJob/tabs/RunsTab.tsx @@ -1,21 +1,23 @@ import { DeliveredProcedureOutlined } from '@ant-design/icons'; -import { Pagination, Table, Typography } from 'antd'; import { Tooltip } from '@components'; +import { Pagination, Table, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { useGetDataJobRunsQuery } from '../../../../graphql/dataJob.generated'; -import { DataProcessInstanceRunResultType, DataProcessRunStatus } from '../../../../types.generated'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; import { getExecutionRequestStatusDisplayColor, getExecutionRequestStatusDisplayText, getExecutionRequestStatusIcon, -} from '../../../ingest/source/utils'; -import { CompactEntityNameList } from '../../../recommendations/renderer/component/CompactEntityNameList'; -import { ANTD_GRAY } from '../../shared/constants'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import LoadingSvg from '../../../../images/datahub-logo-color-loading_pendulum.svg?react'; -import { scrollToTop } from '../../../shared/searchUtils'; +} from '@app/ingest/source/utils'; +import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList'; +import { scrollToTop } from '@app/shared/searchUtils'; + +import { useGetDataJobRunsQuery } from '@graphql/dataJob.generated'; +import { DataProcessInstanceRunResultType, DataProcessRunStatus } from '@types'; + +import LoadingSvg from '@images/datahub-logo-color-loading_pendulum.svg?react'; const ExternalUrlLink = styled.a` font-size: 16px; diff --git a/datahub-web-react/src/app/entityV2/dataPlatform/DataPlatformEntity.tsx b/datahub-web-react/src/app/entityV2/dataPlatform/DataPlatformEntity.tsx index f7c2256ca5..213210fc26 100644 --- a/datahub-web-react/src/app/entityV2/dataPlatform/DataPlatformEntity.tsx +++ b/datahub-web-react/src/app/entityV2/dataPlatform/DataPlatformEntity.tsx @@ -1,9 +1,11 @@ -import * as React from 'react'; import { DatabaseOutlined } from '@ant-design/icons'; -import { DataPlatform, EntityType, SearchResult } from '../../../types.generated'; -import { Entity, IconStyleType, PreviewType } from '../Entity'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; +import * as React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; + +import { DataPlatform, EntityType, SearchResult } from '@types'; const getDisplayName = (data?: DataPlatform): string => { return data?.properties?.displayName || data?.name || ''; diff --git a/datahub-web-react/src/app/entityV2/dataPlatformInstance/DataPlatformInstanceEntity.tsx b/datahub-web-react/src/app/entityV2/dataPlatformInstance/DataPlatformInstanceEntity.tsx index f76c94782e..c5cc1dee3c 100644 --- a/datahub-web-react/src/app/entityV2/dataPlatformInstance/DataPlatformInstanceEntity.tsx +++ b/datahub-web-react/src/app/entityV2/dataPlatformInstance/DataPlatformInstanceEntity.tsx @@ -1,8 +1,10 @@ import * as React from 'react'; -import { DataPlatformInstance, EntityType } from '../../../types.generated'; -import { Entity } from '../Entity'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity } from '@app/entityV2/Entity'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; + +import { DataPlatformInstance, EntityType } from '@types'; /** * Definition of the DataHub DataPlatformInstance entity. diff --git a/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx b/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx index b92038f75a..e4fa3fab49 100644 --- a/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx +++ b/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx @@ -1,20 +1,21 @@ -import DataProcessInstanceSummary from '@src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary'; +import { ArrowsClockwise } from 'phosphor-react'; +import React from 'react'; + import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider'; import { GenericEntityProperties } from '@app/entity/shared/types'; -import { Entity as GraphQLEntity } from '@types'; import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import Preview from '@app/entityV2/dataProcessInstance/preview/Preview'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; -import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; import { getDataProduct } from '@app/entityV2/shared/utils'; +import DataProcessInstanceSummary from '@src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary'; + import { GetDataProcessInstanceQuery, useGetDataProcessInstanceQuery } from '@graphql/dataProcessInstance.generated'; -import { ArrowsClockwise } from 'phosphor-react'; -import React from 'react'; -import { DataProcessInstance, EntityType, SearchResult } from '../../../types.generated'; -import Preview from './preview/Preview'; +import { DataProcessInstance, EntityType, Entity as GraphQLEntity, SearchResult } from '@types'; const getParentEntities = (data: DataProcessInstance): GraphQLEntity[] => { const parentEntity = data?.relationships?.relationships?.find( diff --git a/datahub-web-react/src/app/entityV2/dataProcessInstance/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/dataProcessInstance/preview/Preview.tsx index 4f95d13600..4b6992b29c 100644 --- a/datahub-web-react/src/app/entityV2/dataProcessInstance/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/dataProcessInstance/preview/Preview.tsx @@ -1,21 +1,23 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; -import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; import React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { IconStyleType } from '@app/entityV2/Entity'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { + Container, DataProduct, Deprecation, Domain, - Entity as GeneratedEntity, EntityPath, EntityType, + Entity as GeneratedEntity, GlobalTags, Health, Owner, SearchInsight, - Container, -} from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; +} from '@types'; export default function Preview({ urn, diff --git a/datahub-web-react/src/app/entityV2/dataProduct/AddOutputPortCard.tsx b/datahub-web-react/src/app/entityV2/dataProduct/AddOutputPortCard.tsx index e6e3af9022..d84ad7c7e3 100644 --- a/datahub-web-react/src/app/entityV2/dataProduct/AddOutputPortCard.tsx +++ b/datahub-web-react/src/app/entityV2/dataProduct/AddOutputPortCard.tsx @@ -1,8 +1,9 @@ import { PlusOutlined } from '@ant-design/icons'; import React from 'react'; import styled from 'styled-components'; -import { Card } from '../../sharedV2/cards/components'; -import { REDESIGN_COLORS } from '../shared/constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { Card } from '@app/sharedV2/cards/components'; const DataProductTitle = styled.div` font-size: 16px; diff --git a/datahub-web-react/src/app/entityV2/dataProduct/AssetsSections.tsx b/datahub-web-react/src/app/entityV2/dataProduct/AssetsSections.tsx index 8bbfdb6eda..cfa8c3267e 100644 --- a/datahub-web-react/src/app/entityV2/dataProduct/AssetsSections.tsx +++ b/datahub-web-react/src/app/entityV2/dataProduct/AssetsSections.tsx @@ -1,22 +1,24 @@ +import { AppstoreOutlined } from '@ant-design/icons'; import { Button } from 'antd'; import React from 'react'; import { useHistory } from 'react-router'; -import { AppstoreOutlined } from '@ant-design/icons'; import styled from 'styled-components'; -import { useListDataProductAssetsQuery } from '../../../graphql/search.generated'; -import { pluralize } from '../../shared/textUtil'; -import { EntityCountCard } from '../../sharedV2/cards/EntityCountCard'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import ContentSectionLoading from '../domain/summary/ContentSectionLoading'; -import { useEntityData } from '../../entity/shared/EntityContext'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import ContentSectionLoading from '@app/entityV2/domain/summary/ContentSectionLoading'; import { getContentsSummary, getDomainEntitiesFilterUrl, navigateToDomainEntities, -} from '../shared/containers/profile/sidebar/Domain/utils'; -import { SummaryTabHeaderTitle, SummaryTabHeaderWrapper } from '../shared/summary/HeaderComponents'; -import { HorizontalList } from '../shared/summary/ListComponents'; -import { getContentTypeIcon } from '../shared/summary/IconComponents'; +} from '@app/entityV2/shared/containers/profile/sidebar/Domain/utils'; +import { SummaryTabHeaderTitle, SummaryTabHeaderWrapper } from '@app/entityV2/shared/summary/HeaderComponents'; +import { getContentTypeIcon } from '@app/entityV2/shared/summary/IconComponents'; +import { HorizontalList } from '@app/entityV2/shared/summary/ListComponents'; +import { pluralize } from '@app/shared/textUtil'; +import { EntityCountCard } from '@app/sharedV2/cards/EntityCountCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListDataProductAssetsQuery } from '@graphql/search.generated'; const AssetsSectionWrapper = styled.div` flex: 1; diff --git a/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntitiesTab.tsx b/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntitiesTab.tsx index 2b7d32c0d0..bb2f7e185a 100644 --- a/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntitiesTab.tsx +++ b/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntitiesTab.tsx @@ -1,9 +1,10 @@ import React from 'react'; -import { useEntityData } from '../../entity/shared/EntityContext'; -import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection'; -import generateUseListDataProductAssets from './generateUseListDataProductAssets'; -import { SearchCardContext } from '../shared/SearchCardContext'; -import { generateUseListDataProductAssetsCount } from './generateUseListDataProductAssetsCount'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import generateUseListDataProductAssets from '@app/entityV2/dataProduct/generateUseListDataProductAssets'; +import { generateUseListDataProductAssetsCount } from '@app/entityV2/dataProduct/generateUseListDataProductAssetsCount'; +import { SearchCardContext } from '@app/entityV2/shared/SearchCardContext'; +import { EmbeddedListSearchSection } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchSection'; export function DataProductEntitiesTab() { const { urn } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntity.tsx b/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntity.tsx index aa820e7d29..58bdd543ae 100644 --- a/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntity.tsx +++ b/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntity.tsx @@ -7,32 +7,34 @@ import { } from '@ant-design/icons'; import { ListBullets } from '@phosphor-icons/react'; import * as React from 'react'; -import { useGetDataProductQuery } from '../../../graphql/dataProduct.generated'; -import { GetDatasetQuery } from '../../../graphql/dataset.generated'; -import { DataProduct, EntityType, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfileTab } from '../shared/constants'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarViewDefinitionSection } from '../shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityActionItem } from '../shared/entity/EntityActions'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { DataProductEntitiesTab } from './DataProductEntitiesTab'; -import { DataProductSummaryTab } from './DataProductSummaryTab'; -import { Preview } from './preview/Preview'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { DataProductEntitiesTab } from '@app/entityV2/dataProduct/DataProductEntitiesTab'; +import { DataProductSummaryTab } from '@app/entityV2/dataProduct/DataProductSummaryTab'; +import { Preview } from '@app/entityV2/dataProduct/preview/Preview'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfileTab } from '@app/entityV2/shared/constants'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import { SidebarViewDefinitionSection } from '@app/entityV2/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import { EntityActionItem } from '@app/entityV2/shared/entity/EntityActions'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; + +import { useGetDataProductQuery } from '@graphql/dataProduct.generated'; +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { DataProduct, EntityType, SearchResult } from '@types'; const headerDropdownItems = new Set([ EntityMenuItems.SHARE, diff --git a/datahub-web-react/src/app/entityV2/dataProduct/DataProductSummaryTab.tsx b/datahub-web-react/src/app/entityV2/dataProduct/DataProductSummaryTab.tsx index b35b8ce99c..b9d6eda04a 100644 --- a/datahub-web-react/src/app/entityV2/dataProduct/DataProductSummaryTab.tsx +++ b/datahub-web-react/src/app/entityV2/dataProduct/DataProductSummaryTab.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import { SummaryTabWrapper } from '../shared/summary/HeaderComponents'; -import SummaryAboutSection from '../shared/summary/SummaryAboutSection'; -import { AssetsSection } from './AssetsSections'; -import { OutputPortsSection } from './OutputPortsSection'; + +import { AssetsSection } from '@app/entityV2/dataProduct/AssetsSections'; +import { OutputPortsSection } from '@app/entityV2/dataProduct/OutputPortsSection'; +import { SummaryTabWrapper } from '@app/entityV2/shared/summary/HeaderComponents'; +import SummaryAboutSection from '@app/entityV2/shared/summary/SummaryAboutSection'; export const DataProductSummaryTab = () => { return ( diff --git a/datahub-web-react/src/app/entityV2/dataProduct/OutputPortsSection.tsx b/datahub-web-react/src/app/entityV2/dataProduct/OutputPortsSection.tsx index 99362ea4bd..f662172f57 100644 --- a/datahub-web-react/src/app/entityV2/dataProduct/OutputPortsSection.tsx +++ b/datahub-web-react/src/app/entityV2/dataProduct/OutputPortsSection.tsx @@ -1,19 +1,21 @@ -import React, { useEffect, useState } from 'react'; -import RefreshIcon from '@mui/icons-material/Refresh'; import OutputIcon from '@mui/icons-material/Output'; +import RefreshIcon from '@mui/icons-material/Refresh'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { useListDataProductAssetsLazyQuery, useListDataProductAssetsQuery } from '../../../graphql/search.generated'; -import { useEntityData } from '../../entity/shared/EntityContext'; -import { SummaryTabHeaderTitle } from '../shared/summary/HeaderComponents'; -import { HorizontalList } from '../shared/summary/ListComponents'; -import { SCREEN_WIDTH_BREAK_POINT } from './constants'; -import { Card } from '../../sharedV2/cards/components'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; // import AddOutputPortCard from './AddOutputPortCard'; -import { StyledHeaderWrapper } from './AssetsSections'; -import { SearchResult } from '../../../types.generated'; -import { ANTD_GRAY } from '../shared/constants'; -import { OUTPUT_PORTS_FIELD } from '../../search/utils/constants'; -import SummaryEntityCard from '../../sharedV2/cards/SummaryEntityCard'; +import { StyledHeaderWrapper } from '@app/entityV2/dataProduct/AssetsSections'; +import { SCREEN_WIDTH_BREAK_POINT } from '@app/entityV2/dataProduct/constants'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { SummaryTabHeaderTitle } from '@app/entityV2/shared/summary/HeaderComponents'; +import { HorizontalList } from '@app/entityV2/shared/summary/ListComponents'; +import { OUTPUT_PORTS_FIELD } from '@app/search/utils/constants'; +import SummaryEntityCard from '@app/sharedV2/cards/SummaryEntityCard'; +import { Card } from '@app/sharedV2/cards/components'; + +import { useListDataProductAssetsLazyQuery, useListDataProductAssetsQuery } from '@graphql/search.generated'; +import { SearchResult } from '@types'; const OutputPortsWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssets.ts b/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssets.ts index 9063c3de19..e54ec67afa 100644 --- a/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssets.ts +++ b/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssets.ts @@ -1,5 +1,6 @@ -import { useListDataProductAssetsQuery } from '../../../graphql/search.generated'; -import { GetSearchResultsParams } from '../shared/components/styled/search/types'; +import { GetSearchResultsParams } from '@app/entityV2/shared/components/styled/search/types'; + +import { useListDataProductAssetsQuery } from '@graphql/search.generated'; export default function generateUseListDataProductAssets({ urn }: { urn: string }) { return (params: GetSearchResultsParams) => { diff --git a/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssetsCount.ts b/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssetsCount.ts index 4790a2d437..c7bfb22604 100644 --- a/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssetsCount.ts +++ b/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssetsCount.ts @@ -1,5 +1,5 @@ -import { useListDataProductAssetsQuery } from '@src/graphql/search.generated'; import { GetSearchResultsParams } from '@src/app/entity/shared/components/styled/search/types'; +import { useListDataProductAssetsQuery } from '@src/graphql/search.generated'; export function generateUseListDataProductAssetsCount({ urn }: { urn: string }) { return function useListDataProductAssetsCount({ variables: { input } }: GetSearchResultsParams) { diff --git a/datahub-web-react/src/app/entityV2/dataProduct/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/dataProduct/preview/Preview.tsx index d29e4bb6ba..4d40c9f3c2 100644 --- a/datahub-web-react/src/app/entityV2/dataProduct/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/dataProduct/preview/Preview.tsx @@ -1,10 +1,12 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; import React from 'react'; -import { EntityType, Owner, GlobalTags, GlossaryTerms, Domain, EntityPath } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { EntityMenuActions, IconStyleType, PreviewType } from '../../Entity'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { EntityMenuActions, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Domain, EntityPath, EntityType, GlobalTags, GlossaryTerms, Owner } from '@types'; interface Props { urn: string; diff --git a/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx b/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx index 335bee01ef..eddcc2290e 100644 --- a/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx @@ -11,57 +11,65 @@ import { UnorderedListOutlined, WarningOutlined, } from '@ant-design/icons'; -import { DBT_URN } from '@app/ingest/source/builder/constants'; import ViewComfyOutlinedIcon from '@mui/icons-material/ViewComfyOutlined'; -import { GovernanceTab } from '@src/app/entity/shared/tabs/Dataset/Governance/GovernanceTab'; -import { ListBullets, TreeStructure, Columns } from '@phosphor-icons/react'; +import { Columns, ListBullets, TreeStructure } from '@phosphor-icons/react'; import * as React from 'react'; -import { GetDatasetQuery, useGetDatasetQuery, useUpdateDatasetMutation } from '../../../graphql/dataset.generated'; -import GovernMenuIcon from '../../../images/governMenuIcon.svg?react'; -import { Dataset, DatasetProperties, EntityType, FeatureFlagsConfig, SearchResult } from '../../../types.generated'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { MatchedFieldList } from '../../searchV2/matches/MatchedFieldList'; -import { matchedFieldPathsRenderer } from '../../searchV2/matches/matchedFieldPathsRenderer'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import { useAppConfig } from '../../useAppConfig'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { SubType, TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import SidebarDatasetHeaderSection from '../shared/containers/profile/sidebar/Dataset/Header/SidebarDatasetHeaderSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import SidebarLineageSection from '../shared/containers/profile/sidebar/Lineage/SidebarLineageSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import SidebarQueryOperationsSection from '../shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; -import { SidebarDatasetViewDefinitionSection } from '../shared/containers/profile/sidebar/SidebarLogicSection'; -import { SidebarSiblingsSection } from '../shared/containers/profile/sidebar/SidebarSiblingsSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import EmbeddedProfile from '../shared/embed/EmbeddedProfile'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import AccessManagement from '../shared/tabs/Dataset/AccessManagement/AccessManagement'; -import QueriesTab from '../shared/tabs/Dataset/Queries/QueriesTab'; -import { SchemaTab } from '../shared/tabs/Dataset/Schema/SchemaTab'; -import { AcrylValidationsTab } from '../shared/tabs/Dataset/Validations/AcrylValidationsTab'; -import ViewDefinitionTab from '../shared/tabs/Dataset/View/ViewDefinitionTab'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { EmbedTab } from '../shared/tabs/Embed/EmbedTab'; -import ColumnTabNameHeader from '../shared/tabs/Entity/ColumnTabNameHeader'; -import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount'; -import { IncidentTab } from '../shared/tabs/Incident/IncidentTab'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { SidebarTitleActionType, getDataProduct, getDatasetLastUpdatedMs, isOutputPort } from '../shared/utils'; -import { Preview } from './preview/Preview'; -import { OperationsTab } from './profile/OperationsTab'; -import { DatasetStatsSummarySubHeader } from './profile/stats/stats/DatasetStatsSummarySubHeader'; -import StatsTab from '../shared/tabs/Dataset/Stats/StatsTab'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { Preview } from '@app/entityV2/dataset/preview/Preview'; +import { OperationsTab } from '@app/entityV2/dataset/profile/OperationsTab'; +import { DatasetStatsSummarySubHeader } from '@app/entityV2/dataset/profile/stats/stats/DatasetStatsSummarySubHeader'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { SubType, TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import SidebarDatasetHeaderSection from '@app/entityV2/shared/containers/profile/sidebar/Dataset/Header/SidebarDatasetHeaderSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import SidebarLineageSection from '@app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarQueryOperationsSection from '@app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; +import { SidebarDatasetViewDefinitionSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection'; +import { SidebarSiblingsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSiblingsSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import EmbeddedProfile from '@app/entityV2/shared/embed/EmbeddedProfile'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import AccessManagement from '@app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagement'; +import QueriesTab from '@app/entityV2/shared/tabs/Dataset/Queries/QueriesTab'; +import { SchemaTab } from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaTab'; +import StatsTab from '@app/entityV2/shared/tabs/Dataset/Stats/StatsTab'; +import { AcrylValidationsTab } from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylValidationsTab'; +import ViewDefinitionTab from '@app/entityV2/shared/tabs/Dataset/View/ViewDefinitionTab'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { EmbedTab } from '@app/entityV2/shared/tabs/Embed/EmbedTab'; +import ColumnTabNameHeader from '@app/entityV2/shared/tabs/Entity/ColumnTabNameHeader'; +import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount'; +import { IncidentTab } from '@app/entityV2/shared/tabs/Incident/IncidentTab'; +import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { + SidebarTitleActionType, + getDataProduct, + getDatasetLastUpdatedMs, + isOutputPort, +} from '@app/entityV2/shared/utils'; +import { DBT_URN } from '@app/ingest/source/builder/constants'; +import { MatchedFieldList } from '@app/searchV2/matches/MatchedFieldList'; +import { matchedFieldPathsRenderer } from '@app/searchV2/matches/matchedFieldPathsRenderer'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useAppConfig } from '@app/useAppConfig'; +import { GovernanceTab } from '@src/app/entity/shared/tabs/Dataset/Governance/GovernanceTab'; + +import { GetDatasetQuery, useGetDatasetQuery, useUpdateDatasetMutation } from '@graphql/dataset.generated'; +import { Dataset, DatasetProperties, EntityType, FeatureFlagsConfig, SearchResult } from '@types'; + +import GovernMenuIcon from '@images/governMenuIcon.svg?react'; const SUBTYPES = { VIEW: 'view', diff --git a/datahub-web-react/src/app/entityV2/dataset/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/dataset/preview/Preview.tsx index 7d7b770e95..c676cf9828 100644 --- a/datahub-web-react/src/app/entityV2/dataset/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/preview/Preview.tsx @@ -1,6 +1,17 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; import React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { DatasetStatsSummary as DatasetStatsSummaryView } from '@app/entityV2/dataset/shared/DatasetStatsSummary'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { PopularityTier } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { DatasetLastUpdatedMs, summaryHasStats } from '@app/entityV2/shared/utils'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { + BrowsePathV2, Container, DataProduct, DatasetStatsSummary, @@ -16,16 +27,7 @@ import { Owner, ParentContainersResult, SearchInsight, - BrowsePathV2, -} from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; -import { ANTD_GRAY } from '../../shared/constants'; -import { PopularityTier } from '../../shared/containers/profile/sidebar/shared/utils'; -import { summaryHasStats, DatasetLastUpdatedMs } from '../../shared/utils'; -import { DatasetStatsSummary as DatasetStatsSummaryView } from '../shared/DatasetStatsSummary'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; +} from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/Lineage.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/Lineage.tsx index 419ce1c838..558f48b760 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/Lineage.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/Lineage.tsx @@ -2,10 +2,12 @@ import { Button, List, Space, Typography } from 'antd'; import React from 'react'; import { useHistory, useLocation } from 'react-router-dom'; import styled from 'styled-components'; -import { DownstreamEntityRelationships, EntityType, UpstreamEntityRelationships } from '../../../../types.generated'; -import { navigateToLineageUrl } from '../../../lineage/utils/navigateToLineageUrl'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { PreviewType } from '../../Entity'; + +import { PreviewType } from '@app/entityV2/Entity'; +import { navigateToLineageUrl } from '@app/lineage/utils/navigateToLineageUrl'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DownstreamEntityRelationships, EntityType, UpstreamEntityRelationships } from '@types'; export type Props = { upstreamLineage?: UpstreamEntityRelationships | null; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/OperationsTab.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/OperationsTab.tsx index 2a697b3fcb..946f6cb3b7 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/OperationsTab.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/OperationsTab.tsx @@ -1,28 +1,25 @@ import { DeliveredProcedureOutlined } from '@ant-design/icons'; -import { Pagination, Table, Typography } from 'antd'; import { Tooltip } from '@components'; +import { Pagination, Table, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { GetDatasetRunsQuery, useGetDatasetRunsQuery } from '../../../../graphql/dataset.generated'; -import { - DataProcessInstanceRunResultType, - DataProcessRunStatus, - EntityType, - RelationshipDirection, -} from '../../../../types.generated'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { notEmpty } from '@app/entityV2/shared/utils'; import { getExecutionRequestStatusDisplayColor, getExecutionRequestStatusDisplayText, getExecutionRequestStatusIcon, -} from '../../../ingest/source/utils'; -import { CompactEntityNameList } from '../../../recommendations/renderer/component/CompactEntityNameList'; -import { ANTD_GRAY } from '../../shared/constants'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import LoadingSvg from '../../../../images/datahub-logo-color-loading_pendulum.svg?react'; -import { scrollToTop } from '../../../shared/searchUtils'; -import { formatDuration } from '../../../shared/formatDuration'; -import { notEmpty } from '../../shared/utils'; +} from '@app/ingest/source/utils'; +import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList'; +import { formatDuration } from '@app/shared/formatDuration'; +import { scrollToTop } from '@app/shared/searchUtils'; + +import { GetDatasetRunsQuery, useGetDatasetRunsQuery } from '@graphql/dataset.generated'; +import { DataProcessInstanceRunResultType, DataProcessRunStatus, EntityType, RelationshipDirection } from '@types'; + +import LoadingSvg from '@images/datahub-logo-color-loading_pendulum.svg?react'; const ExternalUrlLink = styled.a` font-size: 16px; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/UsageFacepile.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/UsageFacepile.tsx index f2bdd4750e..bba44711ba 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/UsageFacepile.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/UsageFacepile.tsx @@ -1,9 +1,11 @@ -import React, { useMemo } from 'react'; import { Tooltip } from '@components'; -import { EntityType, UserUsageCounts } from '../../../../types.generated'; -import { SpacedAvatarGroup } from '../../../shared/avatar/SpaceAvatarGroup'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import ActorAvatar from '../../shared/ActorAvatar'; +import React, { useMemo } from 'react'; + +import ActorAvatar from '@app/entityV2/shared/ActorAvatar'; +import { SpacedAvatarGroup } from '@app/shared/avatar/SpaceAvatarGroup'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, UserUsageCounts } from '@types'; export type Props = { users?: (UserUsageCounts | null)[] | null; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Lineage.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Lineage.test.tsx index f7cca3addf..ce3bdd9d16 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Lineage.test.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Lineage.test.tsx @@ -1,11 +1,14 @@ -import React from 'react'; -import { render } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; +import { render } from '@testing-library/react'; +import React from 'react'; -import Lineage from '../Lineage'; -import { sampleDownstreamRelationship, sampleRelationship } from '../stories/lineageEntities'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { mocks } from '../../../../../Mocks'; +import Lineage from '@app/entityV2/dataset/profile/Lineage'; +import { + sampleDownstreamRelationship, + sampleRelationship, +} from '@app/entityV2/dataset/profile/stories/lineageEntities'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('Lineage', () => { it('renders', () => { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Properties.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Properties.test.tsx index 4787efcc08..178ede81ac 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Properties.test.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Properties.test.tsx @@ -1,10 +1,11 @@ -import React from 'react'; -import { render } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; -import { Properties } from '../../../shared/components/legacy/Properties'; -import { sampleProperties } from '../stories/properties'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { mocks } from '../../../../../Mocks'; +import { render } from '@testing-library/react'; +import React from 'react'; + +import { sampleProperties } from '@app/entityV2/dataset/profile/stories/properties'; +import { Properties } from '@app/entityV2/shared/components/legacy/Properties'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('Properties', () => { it('renders', () => { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Schema.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Schema.test.tsx index bc20887a1a..a44e1f8dc7 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Schema.test.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Schema.test.tsx @@ -1,20 +1,22 @@ import { MockedProvider } from '@apollo/client/testing'; import { fireEvent, render } from '@testing-library/react'; import React from 'react'; -import { mocks } from '../../../../../Mocks'; -import { EntityType, SchemaMetadata } from '../../../../../types.generated'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { EntityContext } from '../../../../entity/shared/EntityContext'; -import { SchemaTab } from '../../../shared/tabs/Dataset/Schema/SchemaTab'; -import { TabRenderType } from '../../../shared/types'; -import SchemaRow from '../schema/components/SchemaRow'; + +import { EntityContext } from '@app/entity/shared/EntityContext'; +import SchemaRow from '@app/entityV2/dataset/profile/schema/components/SchemaRow'; import { sampleSchema, sampleSchemaWithKeyValueFields, - sampleSchemaWithoutFields, sampleSchemaWithPkFk, sampleSchemaWithTags, -} from '../stories/sampleSchema'; + sampleSchemaWithoutFields, +} from '@app/entityV2/dataset/profile/stories/sampleSchema'; +import { SchemaTab } from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaTab'; +import { TabRenderType } from '@app/entityV2/shared/types'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { EntityType, SchemaMetadata } from '@types'; vi.mock('virtualizedtableforantd4', async () => { return { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/SchemaDescriptionField.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/SchemaDescriptionField.test.tsx index 4fc846409d..6c0819014f 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/SchemaDescriptionField.test.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/SchemaDescriptionField.test.tsx @@ -1,9 +1,10 @@ import { MockedProvider } from '@apollo/client/testing'; import { fireEvent, render, waitFor } from '@testing-library/react'; import React from 'react'; -import { mocks } from '../../../../../Mocks'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import SchemaDescriptionField from '../schema/components/SchemaDescriptionField'; + +import SchemaDescriptionField from '@app/entityV2/dataset/profile/schema/components/SchemaDescriptionField'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('SchemaDescriptionField', () => { it('renders editable description', async () => { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Stats.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Stats.test.tsx index d5682a629b..2071abc922 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Stats.test.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Stats.test.tsx @@ -1,10 +1,15 @@ -import React from 'react'; -import { render } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; -import SnapshotStatsView from '../stats/snapshot/SnapshotStatsView'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { completeSampleProfile, missingFieldStatsProfile, missingTableStatsProfile } from '../stories/stats'; -import { mocks } from '../../../../../Mocks'; +import { render } from '@testing-library/react'; +import React from 'react'; + +import SnapshotStatsView from '@app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView'; +import { + completeSampleProfile, + missingFieldStatsProfile, + missingTableStatsProfile, +} from '@app/entityV2/dataset/profile/stories/stats'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('SnapshotStatsView', () => { it('renders complete profile', () => { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPath.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPath.test.tsx index bb2c0121ef..0cf3aac8ee 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPath.test.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPath.test.tsx @@ -1,4 +1,4 @@ -import translateFieldPath from '../../schema/utils/translateFieldPath'; +import translateFieldPath from '@app/entityV2/dataset/profile/schema/utils/translateFieldPath'; describe('translateFieldPath', () => { it('translates qualified unions', () => { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx index 2ddfe7d19e..c53c909bad 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx @@ -1,4 +1,4 @@ -import translateFieldPathSegment from '../../schema/utils/translateFieldPathSegment'; +import translateFieldPathSegment from '@app/entityV2/dataset/profile/schema/utils/translateFieldPathSegment'; describe('translateFieldPathSegment', () => { it('translates unions', () => { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/utils.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/utils.test.tsx index 8d41161380..09e57ca8d9 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/utils.test.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/utils.test.tsx @@ -1,5 +1,6 @@ -import { SchemaFieldDataType } from '../../../../../../types.generated'; -import { filterKeyFieldPath } from '../../schema/utils/utils'; +import { filterKeyFieldPath } from '@app/entityV2/dataset/profile/schema/utils/utils'; + +import { SchemaFieldDataType } from '@types'; describe('utils', () => { describe('filterKeyFieldPath', () => { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/CustomPagination.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/CustomPagination.tsx index 8d270898a4..a9a98b7d50 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/CustomPagination.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/CustomPagination.tsx @@ -1,6 +1,6 @@ -import React, { useState } from 'react'; -import { Button, Menu, Dropdown, Typography } from 'antd'; import { LeftOutlined, RightOutlined } from '@ant-design/icons'; +import { Button, Dropdown, Menu, Typography } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; const CustomPaginationContainer = styled.div` diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/InteriorTitleContent.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/InteriorTitleContent.tsx index e7f469abfc..61cdca66ce 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/InteriorTitleContent.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/InteriorTitleContent.tsx @@ -2,16 +2,18 @@ import { Tooltip, Typography } from 'antd'; import React from 'react'; import Highlight from 'react-highlighter'; import styled from 'styled-components'; -import { DeprecationIcon } from '@src/app/entityV2/shared/components/styled/DeprecationIcon'; -import { SchemaMetadata, SubResourceType } from '../../../../../../types.generated'; -import { REDESIGN_COLORS } from '../../../../shared/constants'; + +import translateFieldPath from '@app/entityV2/dataset/profile/schema/utils/translateFieldPath'; +import { ExtendedSchemaFields } from '@app/entityV2/dataset/profile/schema/utils/types'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; import NullableLabel, { ForeignKeyLabel, PartitioningKeyLabel, PrimaryKeyLabel, -} from '../../../../shared/tabs/Dataset/Schema/components/ConstraintLabels'; -import translateFieldPath from '../utils/translateFieldPath'; -import { ExtendedSchemaFields } from '../utils/types'; +} from '@app/entityV2/shared/tabs/Dataset/Schema/components/ConstraintLabels'; +import { DeprecationIcon } from '@src/app/entityV2/shared/components/styled/DeprecationIcon'; + +import { SchemaMetadata, SubResourceType } from '@types'; const MAX_COMPACT_FIELD_PATH_LENGTH = 15; @@ -122,9 +124,7 @@ export const InteriorTitleContent = ({ (sourceField) => sourceField?.fieldPath?.trim() === fieldPath.trim(), ).length || 0) > 0, ) - .map((constraint) => ( - - ))} + .map((constraint) => )} )} diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaDescriptionField.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaDescriptionField.tsx index d9d6089465..22074a7ed0 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaDescriptionField.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaDescriptionField.tsx @@ -1,20 +1,21 @@ -import { Typography, message, Button } from 'antd'; import { EditOutlined } from '@ant-design/icons'; +import { FetchResult } from '@apollo/client'; +import { Button, Typography, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { FetchResult } from '@apollo/client'; +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import UpdateDescriptionModal from '@app/entityV2/shared/components/legacy/DescriptionModal'; +import { removeMarkdown } from '@app/entityV2/shared/components/styled/StripMarkdownText'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { Editor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; +import DocumentationPropagationDetails from '@app/sharedV2/propagation/DocumentationPropagationDetails'; import CompactMarkdownViewer from '@src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer'; -import { UpdateDatasetMutation } from '../../../../../../graphql/dataset.generated'; -import UpdateDescriptionModal from '../../../../shared/components/legacy/DescriptionModal'; -import { removeMarkdown } from '../../../../shared/components/styled/StripMarkdownText'; -import SchemaEditableContext from '../../../../../shared/SchemaEditableContext'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import analytics, { EventType, EntityActionType } from '../../../../../analytics'; -import { Editor } from '../../../../shared/tabs/Documentation/components/editor/Editor'; -import { REDESIGN_COLORS } from '../../../../shared/constants'; -import { StringMapEntry } from '../../../../../../types.generated'; -import DocumentationPropagationDetails from '../../../../../sharedV2/propagation/DocumentationPropagationDetails'; + +import { UpdateDatasetMutation } from '@graphql/dataset.generated'; +import { StringMapEntry } from '@types'; const EditIcon = styled(EditOutlined)` cursor: pointer; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaFilterSelectContent.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaFilterSelectContent.tsx index f0b7f8bbf3..eececdfd1b 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaFilterSelectContent.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaFilterSelectContent.tsx @@ -1,9 +1,10 @@ -import React, { useState } from 'react'; import { Checkbox } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { SchemaFilterType } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows'; import { Button } from '@src/alchemy-components'; -import { SchemaFilterType } from '../../../../shared/tabs/Dataset/Schema/utils/filterSchemaRows'; -import { ANTD_GRAY } from '../../../../shared/constants'; type Props = { schemaFilterTypes: SchemaFilterType[]; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaHeader.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaHeader.tsx index be6db2397f..ecddf961a9 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaHeader.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaHeader.tsx @@ -1,14 +1,16 @@ import { FileTextOutlined, TableOutlined } from '@ant-design/icons'; -import VersionSelector from '@app/entityV2/dataset/profile/schema/components/VersionSelector'; -import { Button as AntButton, Typography } from 'antd'; import { Button, Tooltip } from '@components'; +import { Button as AntButton, Typography } from 'antd'; import React, { useState } from 'react'; import { useDebounce } from 'react-use'; import styled from 'styled-components/macro'; -import { SemanticVersionStruct } from '../../../../../../types.generated'; -import TabToolbar from '../../../../shared/components/styled/TabToolbar'; -import { SchemaFilterType } from '../../../../shared/tabs/Dataset/Schema/utils/filterSchemaRows'; -import SchemaSearchInput from './SchemaSearchInput'; + +import SchemaSearchInput from '@app/entityV2/dataset/profile/schema/components/SchemaSearchInput'; +import VersionSelector from '@app/entityV2/dataset/profile/schema/components/VersionSelector'; +import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar'; +import { SchemaFilterType } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows'; + +import { SemanticVersionStruct } from '@types'; const StyledTabToolbar = styled(TabToolbar)` height: unset; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaRawView.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaRawView.tsx index 07235a4e32..a7d066e23e 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaRawView.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaRawView.tsx @@ -1,8 +1,10 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { Schema, SchemaMetadata } from '../../../../../../types.generated'; -import { diffJson, formatRawSchema, getRawSchema } from '../utils/utils'; + +import { diffJson, formatRawSchema, getRawSchema } from '@app/entityV2/dataset/profile/schema/utils/utils'; + +import { Schema, SchemaMetadata } from '@types'; type Props = { schemaDiff: { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaSearchInput.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaSearchInput.tsx index 5b7c440478..abaadb86db 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaSearchInput.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaSearchInput.tsx @@ -1,10 +1,11 @@ import { Button, Popover, SearchBar } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { pluralize } from '../../../../../shared/textUtil'; -import { REDESIGN_COLORS } from '../../../../shared/constants'; -import { SchemaFilterType } from '../../../../shared/tabs/Dataset/Schema/utils/filterSchemaRows'; -import SchemaFilterSelectContent from './SchemaFilterSelectContent'; + +import SchemaFilterSelectContent from '@app/entityV2/dataset/profile/schema/components/SchemaFilterSelectContent'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SchemaFilterType } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows'; +import { pluralize } from '@app/shared/textUtil'; const MatchLabelText = styled.span` font-size: 12px; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaVersionSummary.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaVersionSummary.tsx index b0f07a59e2..2a27a41a8c 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaVersionSummary.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaVersionSummary.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const SummaryContainer = styled.div` diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/StructuredPropValues.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/StructuredPropValues.tsx index 2eba542ae4..8019d0366c 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/StructuredPropValues.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/StructuredPropValues.tsx @@ -1,10 +1,11 @@ +import { Tooltip } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; + import StructuredPropertyValue from '@src/app/entityV2/shared/tabs/Properties/StructuredPropertyValue'; import { mapStructuredPropertyToPropertyRow } from '@src/app/entityV2/shared/tabs/Properties/useStructuredProperties'; import { useEntityRegistry } from '@src/app/useEntityRegistry'; import { SchemaFieldEntity, SearchResult, StdDataType } from '@src/types.generated'; -import { Tooltip } from 'antd'; -import React from 'react'; -import styled from 'styled-components'; const ValuesContainer = styled.span` max-width: 120px; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/TypeIcon.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/TypeIcon.tsx index 4117bea0c5..8324ce9030 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/TypeIcon.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/TypeIcon.tsx @@ -1,19 +1,21 @@ import { + CalendarOutlined, FieldBinaryOutlined, + FieldTimeOutlined, NumberOutlined, - UnorderedListOutlined, QuestionCircleOutlined, UnderlineOutlined, - CalendarOutlined, - FieldTimeOutlined, + UnorderedListOutlined, } from '@ant-design/icons'; -import { Typography } from 'antd'; import { Tooltip } from '@components'; +import { Typography } from 'antd'; import React, { FC } from 'react'; -import { VscSymbolString, VscFileBinary } from 'react-icons/vsc'; +import { VscFileBinary, VscSymbolString } from 'react-icons/vsc'; import styled from 'styled-components'; -import { capitalizeFirstLetter } from '../../../../../shared/textUtil'; -import { SchemaFieldDataType } from '../../../../../../types.generated'; + +import { capitalizeFirstLetter } from '@app/shared/textUtil'; + +import { SchemaFieldDataType } from '@types'; const TypeIconContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/VersionSelector.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/VersionSelector.tsx index 2a3b255e31..6e44c27f74 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/VersionSelector.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/VersionSelector.tsx @@ -1,14 +1,16 @@ import { CaretDownOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; +import { Select } from 'antd'; +import React, { useEffect, useMemo } from 'react'; +import { useHistory, useLocation } from 'react-router-dom'; +import styled from 'styled-components/macro'; + import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; import { toRelativeTimeString } from '@app/shared/time/timeUtils'; import PlatformIcon from '@app/sharedV2/icons/PlatformIcon'; import navigateToUrl from '@app/utils/navigateToUrl'; + import { DataPlatform, SemanticVersionStruct } from '@types'; -import { Select } from 'antd'; -import { Tooltip } from '@components'; -import React, { useEffect, useMemo } from 'react'; -import { useHistory, useLocation } from 'react-router-dom'; -import styled from 'styled-components/macro'; export const SEMANTIC_VERSION_PARAM = 'semantic_version'; export const SIBLING_VERSION_PARAM = 'secondary_version'; // Note: Currently unused diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTitleRenderer.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTitleRenderer.tsx index 86f9166faa..1b2dc3eb82 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTitleRenderer.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTitleRenderer.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import { SchemaMetadata } from '../../../../../../types.generated'; -import { InteriorTitleContent } from '../components/InteriorTitleContent'; -import { ExtendedSchemaFields } from './types'; + +import { InteriorTitleContent } from '@app/entityV2/dataset/profile/schema/components/InteriorTitleContent'; +import { ExtendedSchemaFields } from '@app/entityV2/dataset/profile/schema/utils/types'; + +import { SchemaMetadata } from '@types'; export default function useSchemaTitleRenderer( parentUrn: string, diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTypeRenderer.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTypeRenderer.tsx index ffc1b39072..3f76d7ae7a 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTypeRenderer.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTypeRenderer.tsx @@ -1,9 +1,10 @@ import { Popover } from '@components'; import React from 'react'; import styled from 'styled-components'; -import TypeLabel from '../../../../shared/tabs/Dataset/Schema/components/TypeLabel'; -import { ExtendedSchemaFields } from './types'; -import { REDESIGN_COLORS } from '../../../../shared/constants'; + +import { ExtendedSchemaFields } from '@app/entityV2/dataset/profile/schema/utils/types'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import TypeLabel from '@app/entityV2/shared/tabs/Dataset/Schema/components/TypeLabel'; const FieldTypeWrapper = styled.div` display: inline-flex; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPath.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPath.tsx index ccb532bc2d..bd396312d8 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPath.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPath.tsx @@ -1,5 +1,5 @@ -import { KEY_SCHEMA_PREFIX, VERSION_PREFIX } from './constants'; -import translateFieldPathSegment from './translateFieldPathSegment'; +import { KEY_SCHEMA_PREFIX, VERSION_PREFIX } from '@app/entityV2/dataset/profile/schema/utils/constants'; +import translateFieldPathSegment from '@app/entityV2/dataset/profile/schema/utils/translateFieldPathSegment'; export default function translateFieldPath(fieldPath: string) { // fields that are part of a key schema are prefixed with [key=true] diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPathSegment.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPathSegment.tsx index 7153a38a32..e105f66cda 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPathSegment.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPathSegment.tsx @@ -1,4 +1,4 @@ -import { ARRAY_TOKEN, UNION_TOKEN } from './constants'; +import { ARRAY_TOKEN, UNION_TOKEN } from '@app/entityV2/dataset/profile/schema/utils/constants'; export default function translateFieldPathSegment(fieldPathSegment, i, fieldPathParts) { // for each segment, convert its fieldPath representation into a human readable version diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/types.ts b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/types.ts index b71b21112d..0b43ef2f11 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/types.ts +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/types.ts @@ -1,4 +1,4 @@ -import { SchemaField, GlobalTags } from '../../../../../../types.generated'; +import { GlobalTags, SchemaField } from '@types'; export interface ExtendedSchemaFields extends SchemaField { children?: Array; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/utils.ts b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/utils.ts index f0ae72608e..0ffdae45bc 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/utils.ts +++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/utils.ts @@ -1,17 +1,18 @@ import { SorterResult } from 'antd/lib/table/interface'; import * as diff from 'diff'; +import { SchemaDiffSummary } from '@app/entityV2/dataset/profile/schema/components/SchemaVersionSummary'; +import { KEY_SCHEMA_PREFIX, UNION_TOKEN, VERSION_PREFIX } from '@app/entityV2/dataset/profile/schema/utils/constants'; +import { ExtendedSchemaFields } from '@app/entityV2/dataset/profile/schema/utils/types'; +import { convertTagsForUpdate } from '@app/shared/tags/utils/convertTagsForUpdate'; + import { EditableSchemaFieldInfo, EditableSchemaMetadata, EditableSchemaMetadataUpdate, PlatformSchema, SchemaField, -} from '../../../../../../types.generated'; -import { convertTagsForUpdate } from '../../../../../shared/tags/utils/convertTagsForUpdate'; -import { SchemaDiffSummary } from '../components/SchemaVersionSummary'; -import { KEY_SCHEMA_PREFIX, UNION_TOKEN, VERSION_PREFIX } from './constants'; -import { ExtendedSchemaFields } from './types'; +} from '@types'; export function convertEditableSchemaMeta( editableSchemaMeta?: Array, diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/Stats.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/Stats.tsx index f9f5dff5cc..1385f6df5a 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/Stats.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/Stats.tsx @@ -1,8 +1,10 @@ -import React, { useState } from 'react'; import { Radio } from 'antd'; -import { DatasetProfile } from '../../../../../types.generated'; -import LatestStatsView from './snapshot/LatestStatsView'; -import HistoricalStatsView from './historical/HistoricalStatsView'; +import React, { useState } from 'react'; + +import HistoricalStatsView from '@app/entityV2/dataset/profile/stats/historical/HistoricalStatsView'; +import LatestStatsView from '@app/entityV2/dataset/profile/stats/snapshot/LatestStatsView'; + +import { DatasetProfile } from '@types'; export type Props = { urn: string; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/StatsSection.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/StatsSection.tsx index c0a98e44f8..32244ee67c 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/StatsSection.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/StatsSection.tsx @@ -1,6 +1,6 @@ import { Divider, Row, Typography } from 'antd'; -import styled from 'styled-components'; import React from 'react'; +import styled from 'styled-components'; const Section = styled.div` padding-top: 24px; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/HistoricalStatsView.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/HistoricalStatsView.tsx index 2b98a4d8f6..421d9474d0 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/HistoricalStatsView.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/HistoricalStatsView.tsx @@ -1,21 +1,21 @@ +import { Affix, Row, Select, Typography } from 'antd'; import React, { ReactNode, useEffect, useState } from 'react'; import styled from 'styled-components'; -import { Affix, Row, Select, Typography } from 'antd'; -import { useGetDataProfilesLazyQuery } from '../../../../../../graphql/dataset.generated'; -import { DateInterval } from '../../../../../../types.generated'; -import { Message } from '../../../../../shared/Message'; -import { getFixedLookbackWindow } from '../../../../../shared/time/timeUtils'; - -import ProfilingRunsChart from './charts/ProfilingRunsChart'; -import StatsSection from '../StatsSection'; -import StatChart from './charts/StatChart'; +import StatsSection from '@app/entityV2/dataset/profile/stats/StatsSection'; +import ProfilingRunsChart from '@app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart'; +import StatChart from '@app/entityV2/dataset/profile/stats/historical/charts/StatChart'; import { computeAllFieldPaths, computeChartTickInterval, extractChartValuesFromFieldProfiles, extractChartValuesFromTableProfiles, -} from '../../../../shared/utils'; +} from '@app/entityV2/shared/utils'; +import { Message } from '@app/shared/Message'; +import { getFixedLookbackWindow } from '@app/shared/time/timeUtils'; + +import { useGetDataProfilesLazyQuery } from '@graphql/dataset.generated'; +import { DateInterval } from '@types'; const HeaderRow = styled(Row)` padding-top: 24px; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx index 36f2b5e379..4d1cbeeafe 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx @@ -1,8 +1,10 @@ import { Button, Col, Modal, Table, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { DatasetProfile } from '../../../../../../../types.generated'; -import DataProfileView from '../../snapshot/SnapshotStatsView'; + +import DataProfileView from '@app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView'; + +import { DatasetProfile } from '@types'; export const ChartTable = styled(Table)` margin: 12px; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/StatChart.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/StatChart.tsx index a6d2d2b4c8..3a8866ad62 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/StatChart.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/StatChart.tsx @@ -2,10 +2,11 @@ import { Col, Divider, Typography } from 'antd'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { DateInterval, DateRange } from '../../../../../../../types.generated'; -import { ChartCard } from '../../../../../../analyticsDashboard/components/ChartCard'; -import { ChartContainer } from '../../../../../../analyticsDashboard/components/ChartContainer'; -import { TimeSeriesChart } from '../../../../../../analyticsDashboard/components/TimeSeriesChart'; +import { ChartCard } from '@app/analyticsDashboard/components/ChartCard'; +import { ChartContainer } from '@app/analyticsDashboard/components/ChartContainer'; +import { TimeSeriesChart } from '@app/analyticsDashboard/components/TimeSeriesChart'; + +import { DateInterval, DateRange } from '@types'; const ChartTitle = styled(Typography.Title)` && { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/LatestStatsView.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/LatestStatsView.tsx index a94e6c4f6d..b253ce627f 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/LatestStatsView.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/LatestStatsView.tsx @@ -1,8 +1,10 @@ +import { Affix, Row, Typography } from 'antd'; import React, { ReactNode } from 'react'; import styled from 'styled-components'; -import { Affix, Row, Typography } from 'antd'; -import { DatasetProfile } from '../../../../../../types.generated'; -import DataProfileView from './SnapshotStatsView'; + +import DataProfileView from '@app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView'; + +import { DatasetProfile } from '@types'; const HeaderRow = styled(Row)` padding-top: 24px; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView.tsx index 73c37fc3ac..279f52e12a 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView.tsx @@ -1,11 +1,12 @@ import { Row, Table, Tag, Typography } from 'antd'; +import { ColumnType, ColumnsType } from 'antd/lib/table'; +import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { ColumnsType, ColumnType } from 'antd/lib/table'; -import React, { useMemo } from 'react'; -import { DatasetProfile } from '../../../../../../types.generated'; -import { Highlight } from '../../../../../analyticsDashboard/components/Highlight'; -import StatsSection from '../StatsSection'; +import { Highlight } from '@app/analyticsDashboard/components/Highlight'; +import StatsSection from '@app/entityV2/dataset/profile/stats/StatsSection'; + +import { DatasetProfile } from '@types'; const ColumnStatsTable = styled(Table)` margin-top: 24px; diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/stats/DatasetStatsSummarySubHeader.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/stats/DatasetStatsSummarySubHeader.tsx index 7337b4a4d7..eff00b354a 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/stats/DatasetStatsSummarySubHeader.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/stats/DatasetStatsSummarySubHeader.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated'; -import { DatasetStatsSummary as DatasetStatsSummaryObj, EntityType } from '../../../../../../types.generated'; -import { useBaseEntity } from '../../../../../entity/shared/EntityContext'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { DatasetStatsSummary } from '../../../shared/DatasetStatsSummary'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { DatasetStatsSummary } from '@app/entityV2/dataset/shared/DatasetStatsSummary'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { DatasetStatsSummary as DatasetStatsSummaryObj, EntityType } from '@types'; export const DatasetStatsSummarySubHeader = () => { const result = useBaseEntity(); diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stories/documentation.ts b/datahub-web-react/src/app/entityV2/dataset/profile/stories/documentation.ts index 3b62c3e6cf..345d33fadd 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/stories/documentation.ts +++ b/datahub-web-react/src/app/entityV2/dataset/profile/stories/documentation.ts @@ -1,4 +1,4 @@ -import { EntityType } from '../../../../../types.generated'; +import { EntityType } from '@types'; export const sampleDocs = [ { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stories/lineageEntities.ts b/datahub-web-react/src/app/entityV2/dataset/profile/stories/lineageEntities.ts index 15c04d9ebe..3583ca1a8e 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/stories/lineageEntities.ts +++ b/datahub-web-react/src/app/entityV2/dataset/profile/stories/lineageEntities.ts @@ -1,4 +1,4 @@ -import { EntityType, FabricType, PlatformNativeType } from '../../../../../types.generated'; +import { EntityType, FabricType, PlatformNativeType } from '@types'; export const sampleUpstreamEntities = [ { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stories/sampleSchema.ts b/datahub-web-react/src/app/entityV2/dataset/profile/stories/sampleSchema.ts index 2d7a226b94..9ce31ac046 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/stories/sampleSchema.ts +++ b/datahub-web-react/src/app/entityV2/dataset/profile/stories/sampleSchema.ts @@ -1,5 +1,6 @@ -import { dataset3 } from '../../../../../Mocks'; -import { EntityType, Schema, SchemaMetadata, SchemaField, SchemaFieldDataType } from '../../../../../types.generated'; +import { dataset3 } from '@src/Mocks'; + +import { EntityType, Schema, SchemaField, SchemaFieldDataType, SchemaMetadata } from '@types'; // Extending the schema type with an option for tags export type TaggedSchemaField = { diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stories/stats.ts b/datahub-web-react/src/app/entityV2/dataset/profile/stories/stats.ts index 035acd5668..a4afa38ec7 100644 --- a/datahub-web-react/src/app/entityV2/dataset/profile/stories/stats.ts +++ b/datahub-web-react/src/app/entityV2/dataset/profile/stories/stats.ts @@ -1,4 +1,4 @@ -import { DatasetProfile } from '../../../../../types.generated'; +import { DatasetProfile } from '@types'; export const completeSampleProfile: DatasetProfile = { rowCount: 1000, diff --git a/datahub-web-react/src/app/entityV2/dataset/shared/DatasetStatsSummary.tsx b/datahub-web-react/src/app/entityV2/dataset/shared/DatasetStatsSummary.tsx index c94a6279ac..49f16e83b4 100644 --- a/datahub-web-react/src/app/entityV2/dataset/shared/DatasetStatsSummary.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/shared/DatasetStatsSummary.tsx @@ -1,13 +1,14 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { countFormatter, needsFormatting } from '../../../../utils/formatter'; -import LastUpdated from '../../../shared/LastUpdated'; -import { formatNumber, formatNumberWithoutAbbreviation } from '../../../shared/formatNumber'; -import { StatsSummary } from '../../shared/components/styled/StatsSummary'; -import { ANTD_GRAY } from '../../shared/constants'; -import { PercentileLabel } from '../../shared/stats/PercentileLabel'; -import ExpandingStat from './ExpandingStat'; + +import ExpandingStat from '@app/entityV2/dataset/shared/ExpandingStat'; +import { StatsSummary } from '@app/entityV2/shared/components/styled/StatsSummary'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { PercentileLabel } from '@app/entityV2/shared/stats/PercentileLabel'; +import LastUpdated from '@app/shared/LastUpdated'; +import { formatNumber, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { countFormatter, needsFormatting } from '@utils/formatter'; const StatText = styled.span<{ color: string }>` color: ${(props) => props.color}; @@ -54,7 +55,7 @@ export const DatasetStatsSummary = ({ mode = 'normal', }: Props) => { const isTooltipMode = mode === 'tooltip-content'; - const displayedColor = isTooltipMode ? '' : color ?? ANTD_GRAY[7]; + const displayedColor = isTooltipMode ? '' : (color ?? ANTD_GRAY[7]); const statsViews = [ !!rowCount && ( diff --git a/datahub-web-react/src/app/entityV2/dataset/shared/FormattedBytesStat.tsx b/datahub-web-react/src/app/entityV2/dataset/shared/FormattedBytesStat.tsx index 5430f514ee..188fa2b21b 100644 --- a/datahub-web-react/src/app/entityV2/dataset/shared/FormattedBytesStat.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/shared/FormattedBytesStat.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Tooltip } from '@components'; -import { formatBytes, formatNumberWithoutAbbreviation } from '../../../shared/formatNumber'; +import React from 'react'; + +import { formatBytes, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; export const FormattedBytesStat = ({ bytes }: { bytes: number }) => { const formattedBytes = formatBytes(bytes); diff --git a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/CreateDataProductModal.tsx b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/CreateDataProductModal.tsx index d0e74f4e03..5d89a514c8 100644 --- a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/CreateDataProductModal.tsx +++ b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/CreateDataProductModal.tsx @@ -1,9 +1,11 @@ import { Button, Modal, message } from 'antd'; import React, { useState } from 'react'; -import DataProductBuilderForm from './DataProductBuilderForm'; -import { DataProductBuilderState } from './types'; -import { useCreateDataProductMutation } from '../../../../graphql/dataProduct.generated'; -import { DataProduct, Domain } from '../../../../types.generated'; + +import DataProductBuilderForm from '@app/entityV2/domain/DataProductsTab/DataProductBuilderForm'; +import { DataProductBuilderState } from '@app/entityV2/domain/DataProductsTab/types'; + +import { useCreateDataProductMutation } from '@graphql/dataProduct.generated'; +import { DataProduct, Domain } from '@types'; export const MODAL_WIDTH = '75vw'; diff --git a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductBuilderForm.tsx b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductBuilderForm.tsx index b5a27a6e1b..82ad7a6de8 100644 --- a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductBuilderForm.tsx +++ b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductBuilderForm.tsx @@ -1,9 +1,10 @@ import { Form, Input, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Editor as MarkdownEditor } from '../../shared/tabs/Documentation/components/editor/Editor'; -import { ANTD_GRAY } from '../../shared/constants'; -import { DataProductBuilderState } from './types'; + +import { DataProductBuilderState } from '@app/entityV2/domain/DataProductsTab/types'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { Editor as MarkdownEditor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; const StyledEditor = styled(MarkdownEditor)` border: 1px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductResult.tsx b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductResult.tsx index a959a97c9d..4026878203 100644 --- a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductResult.tsx +++ b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductResult.tsx @@ -1,12 +1,14 @@ -import { useEntityContext } from '@src/app/entity/shared/EntityContext'; import { Button } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { DataProduct, EntityType } from '../../../../types.generated'; -import { useEntityRegistryV2 } from '../../../useEntityRegistry'; -import { PreviewType } from '../../Entity'; -import EditDataProductModal from './EditDataProductModal'; -import { REDESIGN_COLORS } from '../../shared/constants'; + +import { PreviewType } from '@app/entityV2/Entity'; +import EditDataProductModal from '@app/entityV2/domain/DataProductsTab/EditDataProductModal'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; +import { useEntityContext } from '@src/app/entity/shared/EntityContext'; + +import { DataProduct, EntityType } from '@types'; const TransparentButton = styled(Button)` color: ${REDESIGN_COLORS.RED_ERROR}; diff --git a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductsTab.tsx b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductsTab.tsx index 5725f71621..fa2e40295f 100644 --- a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductsTab.tsx +++ b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductsTab.tsx @@ -1,21 +1,23 @@ -import { Button, Empty, Pagination } from 'antd'; import { LoadingOutlined, PlusOutlined } from '@ant-design/icons'; -import React, { useState } from 'react'; +import { Button, Empty, Pagination } from 'antd'; import * as QueryString from 'query-string'; +import React, { useState } from 'react'; import { useLocation } from 'react-router'; import styled from 'styled-components'; -import { useGetSearchResultsForMultipleQuery } from '../../../../graphql/search.generated'; -import { DataProduct, Domain, EntityType } from '../../../../types.generated'; -import TabToolbar from '../../shared/components/styled/TabToolbar'; -import { SearchBar } from '../../../search/SearchBar'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { scrollToTop } from '../../../shared/searchUtils'; -import { DomainsPaginationContainer } from '../../../domain/DomainsList'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../shared/constants'; -import { useEntityContext, useEntityData } from '../../../entity/shared/EntityContext'; -import { DOMAINS_FILTER_NAME } from '../../../search/utils/constants'; -import DataProductResult from './DataProductResult'; -import CreateDataProductModal from './CreateDataProductModal'; + +import { DomainsPaginationContainer } from '@app/domain/DomainsList'; +import { useEntityContext, useEntityData } from '@app/entity/shared/EntityContext'; +import CreateDataProductModal from '@app/entityV2/domain/DataProductsTab/CreateDataProductModal'; +import DataProductResult from '@app/entityV2/domain/DataProductsTab/DataProductResult'; +import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SearchBar } from '@app/search/SearchBar'; +import { DOMAINS_FILTER_NAME } from '@app/search/utils/constants'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { DataProduct, Domain, EntityType } from '@types'; const DataProductsPaginationWrapper = styled(DomainsPaginationContainer)` justify-content: center; diff --git a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/EditDataProductModal.tsx b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/EditDataProductModal.tsx index 67b3b2904b..28f3b5dec8 100644 --- a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/EditDataProductModal.tsx +++ b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/EditDataProductModal.tsx @@ -1,10 +1,12 @@ import { Button, Modal, message } from 'antd'; import React, { useState } from 'react'; -import DataProductBuilderForm from './DataProductBuilderForm'; -import { DataProductBuilderState } from './types'; -import { useUpdateDataProductMutation } from '../../../../graphql/dataProduct.generated'; -import { DataProduct } from '../../../../types.generated'; -import { MODAL_BODY_STYLE, MODAL_WIDTH } from './CreateDataProductModal'; + +import { MODAL_BODY_STYLE, MODAL_WIDTH } from '@app/entityV2/domain/DataProductsTab/CreateDataProductModal'; +import DataProductBuilderForm from '@app/entityV2/domain/DataProductsTab/DataProductBuilderForm'; +import { DataProductBuilderState } from '@app/entityV2/domain/DataProductsTab/types'; + +import { useUpdateDataProductMutation } from '@graphql/dataProduct.generated'; +import { DataProduct } from '@types'; type Props = { dataProduct: DataProduct; diff --git a/datahub-web-react/src/app/entityV2/domain/DomainEntitiesTab.tsx b/datahub-web-react/src/app/entityV2/domain/DomainEntitiesTab.tsx index 27894eaddf..d36dcf0935 100644 --- a/datahub-web-react/src/app/entityV2/domain/DomainEntitiesTab.tsx +++ b/datahub-web-react/src/app/entityV2/domain/DomainEntitiesTab.tsx @@ -1,9 +1,11 @@ -import { SearchCardContext } from '@app/entityV2/shared/SearchCardContext'; import React from 'react'; -import { useEntityData } from '../../entity/shared/EntityContext'; -import { EntityType } from '../../../types.generated'; -import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection'; -import { UnionType } from '../../search/utils/constants'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { SearchCardContext } from '@app/entityV2/shared/SearchCardContext'; +import { EmbeddedListSearchSection } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchSection'; +import { UnionType } from '@app/search/utils/constants'; + +import { EntityType } from '@types'; export const DomainEntitiesTab = () => { const { urn, entityType } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/domain/DomainEntity.tsx b/datahub-web-react/src/app/entityV2/domain/DomainEntity.tsx index c01e13f6bc..1d54e04f8f 100644 --- a/datahub-web-react/src/app/entityV2/domain/DomainEntity.tsx +++ b/datahub-web-react/src/app/entityV2/domain/DomainEntity.tsx @@ -1,30 +1,32 @@ import { AppstoreOutlined, FileDoneOutlined, FileOutlined, UnorderedListOutlined } from '@ant-design/icons'; import { ListBullets } from '@phosphor-icons/react'; import * as React from 'react'; -import { useGetDomainQuery } from '../../../graphql/domain.generated'; -import { Domain, EntityType, SearchResult } from '../../../types.generated'; -import DomainIcon from '../../domain/DomainIcon'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { EntityProfileTab } from '../shared/constants'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import SidebarEntitiesSection from '../shared/containers/profile/sidebar/Domain/SidebarEntitiesSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityActionItem } from '../shared/entity/EntityActions'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { SUMMARY_TAB_ICON } from '../shared/summary/HeaderComponents'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import DataProductsTab from './DataProductsTab/DataProductsTab'; -import { DomainEntitiesTab } from './DomainEntitiesTab'; -import { Preview } from './preview/Preview'; -import { DomainSummaryTab } from './summary/DomainSummaryTab'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; + +import DomainIcon from '@app/domain/DomainIcon'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import DataProductsTab from '@app/entityV2/domain/DataProductsTab/DataProductsTab'; +import { DomainEntitiesTab } from '@app/entityV2/domain/DomainEntitiesTab'; +import { Preview } from '@app/entityV2/domain/preview/Preview'; +import { DomainSummaryTab } from '@app/entityV2/domain/summary/DomainSummaryTab'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { EntityProfileTab } from '@app/entityV2/shared/constants'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import SidebarEntitiesSection from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import { EntityActionItem } from '@app/entityV2/shared/entity/EntityActions'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { SUMMARY_TAB_ICON } from '@app/entityV2/shared/summary/HeaderComponents'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; + +import { useGetDomainQuery } from '@graphql/domain.generated'; +import { Domain, EntityType, SearchResult } from '@types'; const headerDropdownItems = new Set([ EntityMenuItems.MOVE, diff --git a/datahub-web-react/src/app/entityV2/domain/preview/DomainEntitiesSnippet.tsx b/datahub-web-react/src/app/entityV2/domain/preview/DomainEntitiesSnippet.tsx index 6d36964004..301be93db9 100644 --- a/datahub-web-react/src/app/entityV2/domain/preview/DomainEntitiesSnippet.tsx +++ b/datahub-web-react/src/app/entityV2/domain/preview/DomainEntitiesSnippet.tsx @@ -2,10 +2,12 @@ import { DatabaseOutlined, FileDoneOutlined } from '@ant-design/icons'; import { VerticalDivider } from '@remirror/react'; import React from 'react'; import styled from 'styled-components'; -import { SearchResultFields_Domain_Fragment } from '../../../../graphql/search.generated'; -import { ANTD_GRAY_V2 } from '../../shared/constants'; -import DomainIcon from '../../../domain/DomainIcon'; -import { pluralize } from '../../../shared/textUtil'; + +import DomainIcon from '@app/domain/DomainIcon'; +import { ANTD_GRAY_V2 } from '@app/entityV2/shared/constants'; +import { pluralize } from '@app/shared/textUtil'; + +import { SearchResultFields_Domain_Fragment } from '@graphql/search.generated'; const Wrapper = styled.div` color: ${ANTD_GRAY_V2[8]}; diff --git a/datahub-web-react/src/app/entityV2/domain/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/domain/preview/Preview.tsx index a2189ea1c5..ed2b203b92 100644 --- a/datahub-web-react/src/app/entityV2/domain/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/domain/preview/Preview.tsx @@ -1,14 +1,16 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; import React from 'react'; -import { Domain, EntityType, Owner, SearchInsight } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import DomainEntitiesSnippet from './DomainEntitiesSnippet'; -import DomainIcon from '../../../domain/DomainIcon'; -import EntityCount from '../../shared/containers/profile/header/EntityCount'; -import { DomainColoredIcon } from '../../shared/links/DomainColoredIcon'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; -import { PreviewType } from '../../Entity'; + +import DomainIcon from '@app/domain/DomainIcon'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { PreviewType } from '@app/entityV2/Entity'; +import DomainEntitiesSnippet from '@app/entityV2/domain/preview/DomainEntitiesSnippet'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import EntityCount from '@app/entityV2/shared/containers/profile/header/EntityCount'; +import { DomainColoredIcon } from '@app/entityV2/shared/links/DomainColoredIcon'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Domain, EntityType, Owner, SearchInsight } from '@types'; export const Preview = ({ domain, diff --git a/datahub-web-react/src/app/entityV2/domain/summary/ContentSectionLoading.tsx b/datahub-web-react/src/app/entityV2/domain/summary/ContentSectionLoading.tsx index 63bfd2b0f6..dda8164968 100644 --- a/datahub-web-react/src/app/entityV2/domain/summary/ContentSectionLoading.tsx +++ b/datahub-web-react/src/app/entityV2/domain/summary/ContentSectionLoading.tsx @@ -1,7 +1,8 @@ -import * as React from 'react'; import { Skeleton, Space } from 'antd'; +import * as React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../shared/constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const TypeSkeleton = styled(Skeleton.Input)` && { diff --git a/datahub-web-react/src/app/entityV2/domain/summary/ContentsSection.tsx b/datahub-web-react/src/app/entityV2/domain/summary/ContentsSection.tsx index cfeac7f3c9..3e96bd290a 100644 --- a/datahub-web-react/src/app/entityV2/domain/summary/ContentsSection.tsx +++ b/datahub-web-react/src/app/entityV2/domain/summary/ContentsSection.tsx @@ -1,26 +1,28 @@ +import { AppstoreOutlined } from '@ant-design/icons'; import React, { useEffect } from 'react'; import { useHistory } from 'react-router'; import styled from 'styled-components'; -import { AppstoreOutlined } from '@ant-design/icons'; -import { useEntityContext, useEntityData } from '../../../entity/shared/EntityContext'; -import { useGetDomainEntitySummaryQuery } from '../../../../graphql/domain.generated'; + +import { useEntityContext, useEntityData } from '@app/entity/shared/EntityContext'; +import ContentSectionLoading from '@app/entityV2/domain/summary/ContentSectionLoading'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; import { getContentsSummary, getDomainEntitiesFilterUrl, navigateToDomainEntities, -} from '../../shared/containers/profile/sidebar/Domain/utils'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import ContentSectionLoading from './ContentSectionLoading'; -import { EntityCountCard } from '../../../sharedV2/cards/EntityCountCard'; -import { pluralize } from '../../../shared/textUtil'; +} from '@app/entityV2/shared/containers/profile/sidebar/Domain/utils'; import { SectionContainer, SummaryTabHeaderTitle, SummaryTabHeaderWrapper, -} from '../../shared/summary/HeaderComponents'; -import { getContentTypeIcon } from '../../shared/summary/IconComponents'; -import { ANTD_GRAY } from '../../shared/constants'; -import { Carousel } from '../../../sharedV2/carousel/Carousel'; +} from '@app/entityV2/shared/summary/HeaderComponents'; +import { getContentTypeIcon } from '@app/entityV2/shared/summary/IconComponents'; +import { pluralize } from '@app/shared/textUtil'; +import { EntityCountCard } from '@app/sharedV2/cards/EntityCountCard'; +import { Carousel } from '@app/sharedV2/carousel/Carousel'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetDomainEntitySummaryQuery } from '@graphql/domain.generated'; const ViewAllButton = styled.div` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/entityV2/domain/summary/DataProductsSection.tsx b/datahub-web-react/src/app/entityV2/domain/summary/DataProductsSection.tsx index 9fd75add7c..f60418d419 100644 --- a/datahub-web-react/src/app/entityV2/domain/summary/DataProductsSection.tsx +++ b/datahub-web-react/src/app/entityV2/domain/summary/DataProductsSection.tsx @@ -1,25 +1,27 @@ -import React from 'react'; -import styled from 'styled-components'; -import { useHistory } from 'react-router'; import AddRoundedIcon from '@mui/icons-material/AddRounded'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import ContentSectionLoading from './ContentSectionLoading'; -import { useGetSearchResultsForMultipleQuery } from '../../../../graphql/search.generated'; -import { DataProduct, EntityType } from '../../../../types.generated'; -import { DOMAINS_FILTER_NAME } from '../../../searchV2/utils/constants'; -import { DataProductMiniPreview } from '../../shared/links/DataProductMiniPreview'; +import React from 'react'; +import { useHistory } from 'react-router'; +import styled from 'styled-components'; + +import { IconStyleType } from '@app/entity/Entity'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import ContentSectionLoading from '@app/entityV2/domain/summary/ContentSectionLoading'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { navigateToDomainDataProducts } from '@app/entityV2/shared/containers/profile/sidebar/Domain/utils'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { DataProductMiniPreview } from '@app/entityV2/shared/links/DataProductMiniPreview'; import { SectionContainer, + SummaryHeaderButtonGroup, SummaryTabHeaderTitle, SummaryTabHeaderWrapper, - SummaryHeaderButtonGroup, -} from '../../shared/summary/HeaderComponents'; -import { navigateToDomainDataProducts } from '../../shared/containers/profile/sidebar/Domain/utils'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../../entity/Entity'; -import { ANTD_GRAY } from '../../shared/constants'; -import { Carousel } from '../../../sharedV2/carousel/Carousel'; -import SectionActionButton from '../../shared/containers/profile/sidebar/SectionActionButton'; +} from '@app/entityV2/shared/summary/HeaderComponents'; +import { DOMAINS_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { Carousel } from '@app/sharedV2/carousel/Carousel'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { DataProduct, EntityType } from '@types'; const ViewAllButton = styled.div` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/entityV2/domain/summary/DocumentationSection.tsx b/datahub-web-react/src/app/entityV2/domain/summary/DocumentationSection.tsx index 136f113d0e..7eb11f327b 100644 --- a/datahub-web-react/src/app/entityV2/domain/summary/DocumentationSection.tsx +++ b/datahub-web-react/src/app/entityV2/domain/summary/DocumentationSection.tsx @@ -2,13 +2,14 @@ import { EditOutlined, ExpandAltOutlined, FileOutlined } from '@ant-design/icons import { Divider, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; + +import { useEntityData, useRefetch, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { AddLinkModal } from '@app/entityV2/shared/components/styled/AddLinkModal'; +import { EmptyTab } from '@app/entityV2/shared/components/styled/EmptyTab'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { LinkList } from '@app/entityV2/shared/tabs/Documentation/components/LinkList'; +import { Editor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; import { Button } from '@src/alchemy-components'; -import { useEntityData, useRefetch, useRouteToTab } from '../../../entity/shared/EntityContext'; -import { AddLinkModal } from '../../shared/components/styled/AddLinkModal'; -import { EmptyTab } from '../../shared/components/styled/EmptyTab'; -import { ANTD_GRAY } from '../../shared/constants'; -import { LinkList } from '../../shared/tabs/Documentation/components/LinkList'; -import { Editor } from '../../shared/tabs/Documentation/components/editor/Editor'; const Header = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/domain/summary/DomainSummaryTab.tsx b/datahub-web-react/src/app/entityV2/domain/summary/DomainSummaryTab.tsx index 0a02d9fbad..6b9299bd70 100644 --- a/datahub-web-react/src/app/entityV2/domain/summary/DomainSummaryTab.tsx +++ b/datahub-web-react/src/app/entityV2/domain/summary/DomainSummaryTab.tsx @@ -1,9 +1,10 @@ import React from 'react'; -import { ContentsSection } from './ContentsSection'; -import { DataProductsSection } from './DataProductsSection'; -import SummaryAboutSection from '../../shared/summary/SummaryAboutSection'; -import { SummaryTabWrapper } from '../../shared/summary/HeaderComponents'; -import OwnersSection from './OwnersSection'; + +import { ContentsSection } from '@app/entityV2/domain/summary/ContentsSection'; +import { DataProductsSection } from '@app/entityV2/domain/summary/DataProductsSection'; +import OwnersSection from '@app/entityV2/domain/summary/OwnersSection'; +import { SummaryTabWrapper } from '@app/entityV2/shared/summary/HeaderComponents'; +import SummaryAboutSection from '@app/entityV2/shared/summary/SummaryAboutSection'; export const DomainSummaryTab = () => { return ( diff --git a/datahub-web-react/src/app/entityV2/domain/summary/OwnerDetail.tsx b/datahub-web-react/src/app/entityV2/domain/summary/OwnerDetail.tsx index 39eff2d667..f53f0930d1 100644 --- a/datahub-web-react/src/app/entityV2/domain/summary/OwnerDetail.tsx +++ b/datahub-web-react/src/app/entityV2/domain/summary/OwnerDetail.tsx @@ -1,10 +1,12 @@ +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; -import { useEntityRegistryV2 } from '../../../useEntityRegistry'; -import { EntityType, Owner } from '../../../../types.generated'; -import CustomAvatar from '../../../shared/avatar/CustomAvatar'; -import { REDESIGN_COLORS } from '../../shared/constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { EntityType, Owner } from '@types'; const Details = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/domain/summary/OwnersSection.tsx b/datahub-web-react/src/app/entityV2/domain/summary/OwnersSection.tsx index 0c80bd565e..86db2d4adb 100644 --- a/datahub-web-react/src/app/entityV2/domain/summary/OwnersSection.tsx +++ b/datahub-web-react/src/app/entityV2/domain/summary/OwnersSection.tsx @@ -1,13 +1,15 @@ +import { UserOutlined } from '@ant-design/icons'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { UserOutlined } from '@ant-design/icons'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import { Owner, OwnershipTypeEntity } from '../../../../types.generated'; -import { getOwnershipTypeName } from '../../shared/containers/profile/sidebar/Ownership/ownershipUtils'; -import { REDESIGN_COLORS } from '../../shared/constants'; -import OwnerDetail from './OwnerDetail'; -import { SummaryTabHeaderTitle } from '../../shared/summary/HeaderComponents'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import OwnerDetail from '@app/entityV2/domain/summary/OwnerDetail'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getOwnershipTypeName } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils'; +import { SummaryTabHeaderTitle } from '@app/entityV2/shared/summary/HeaderComponents'; + +import { Owner, OwnershipTypeEntity } from '@types'; const OwnershipTypeNameText = styled(Typography.Text)` font-weight: 500; diff --git a/datahub-web-react/src/app/entityV2/glossaryNode/ChildrenTab.tsx b/datahub-web-react/src/app/entityV2/glossaryNode/ChildrenTab.tsx index 2c25490832..b1b3933954 100644 --- a/datahub-web-react/src/app/entityV2/glossaryNode/ChildrenTab.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryNode/ChildrenTab.tsx @@ -1,11 +1,13 @@ import React from 'react'; -import { EntityType, GlossaryNode, GlossaryTerm } from '../../../types.generated'; -import EmptyGlossarySection from '../../glossaryV2/EmptyGlossarySection'; -import GlossaryEntitiesList from '../../glossaryV2/GlossaryEntitiesList'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { sortGlossaryTerms } from '../glossaryTerm/utils'; -import { useEntityData } from '../../entity/shared/EntityContext'; -import { sortGlossaryNodes } from './utils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { sortGlossaryNodes } from '@app/entityV2/glossaryNode/utils'; +import { sortGlossaryTerms } from '@app/entityV2/glossaryTerm/utils'; +import EmptyGlossarySection from '@app/glossaryV2/EmptyGlossarySection'; +import GlossaryEntitiesList from '@app/glossaryV2/GlossaryEntitiesList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, GlossaryNode, GlossaryTerm } from '@types'; function ChildrenTab() { const { entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/glossaryNode/GlossaryNodeEntity.tsx b/datahub-web-react/src/app/entityV2/glossaryNode/GlossaryNodeEntity.tsx index a4d7b415b0..51a7b34d59 100644 --- a/datahub-web-react/src/app/entityV2/glossaryNode/GlossaryNodeEntity.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryNode/GlossaryNodeEntity.tsx @@ -1,24 +1,26 @@ import { AppstoreOutlined, FileOutlined, UnorderedListOutlined } from '@ant-design/icons'; -import React from 'react'; import { BookmarksSimple } from '@phosphor-icons/react'; -import { useGetGlossaryNodeQuery } from '../../../graphql/glossaryNode.generated'; -import { EntityType, GlossaryNode, SearchResult } from '../../../types.generated'; -import { FetchedEntity } from '../../lineage/types'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityActionItem } from '../shared/entity/EntityActions'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import ChildrenTab from './ChildrenTab'; -import { Preview } from './preview/Preview'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; +import React from 'react'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import ChildrenTab from '@app/entityV2/glossaryNode/ChildrenTab'; +import { Preview } from '@app/entityV2/glossaryNode/preview/Preview'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import { EntityActionItem } from '@app/entityV2/shared/entity/EntityActions'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { FetchedEntity } from '@app/lineage/types'; + +import { useGetGlossaryNodeQuery } from '@graphql/glossaryNode.generated'; +import { EntityType, GlossaryNode, SearchResult } from '@types'; const headerDropdownItems = new Set([ EntityMenuItems.MOVE, diff --git a/datahub-web-react/src/app/entityV2/glossaryNode/_tests_/utils.test.ts b/datahub-web-react/src/app/entityV2/glossaryNode/_tests_/utils.test.ts index 1b10c95e4b..8fd29f0d14 100644 --- a/datahub-web-react/src/app/entityV2/glossaryNode/_tests_/utils.test.ts +++ b/datahub-web-react/src/app/entityV2/glossaryNode/_tests_/utils.test.ts @@ -1,6 +1,7 @@ import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider'; -import { EntityType } from '../../../../types.generated'; -import { sortGlossaryNodes } from '../utils'; +import { sortGlossaryNodes } from '@app/entityV2/glossaryNode/utils'; + +import { EntityType } from '@types'; describe('sortGlossaryNodes', () => { it('should correctly sort glossary nodes when both nodes are provided', () => { diff --git a/datahub-web-react/src/app/entityV2/glossaryNode/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/glossaryNode/preview/Preview.tsx index 392d56f4a8..39e946dc06 100644 --- a/datahub-web-react/src/app/entityV2/glossaryNode/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryNode/preview/Preview.tsx @@ -1,11 +1,13 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; -import React from 'react'; import { FolderOutlined } from '@ant-design/icons'; -import { EntityType, Owner, ParentNodesResult } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; -import { PreviewType } from '../../Entity'; +import React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { PreviewType } from '@app/entityV2/Entity'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, Owner, ParentNodesResult } from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entityV2/glossaryNode/utils.ts b/datahub-web-react/src/app/entityV2/glossaryNode/utils.ts index 2263f5a923..57a4d80817 100644 --- a/datahub-web-react/src/app/entityV2/glossaryNode/utils.ts +++ b/datahub-web-react/src/app/entityV2/glossaryNode/utils.ts @@ -1,5 +1,6 @@ -import { Entity, EntityType } from '../../../types.generated'; -import { EntityRegistry } from '../../../entityRegistryContext'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { Entity, EntityType } from '@types'; export function sortGlossaryNodes(entityRegistry: EntityRegistry, nodeA?: Entity | null, nodeB?: Entity | null) { const nodeAName = entityRegistry.getDisplayName(EntityType.GlossaryNode, nodeA) || ''; diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryRelatedAssetsTabHeader.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryRelatedAssetsTabHeader.tsx index 4f52dd15c0..5c09458b77 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryRelatedAssetsTabHeader.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryRelatedAssetsTabHeader.tsx @@ -1,9 +1,10 @@ +import React from 'react'; +import styled from 'styled-components'; + import { Pill } from '@src/alchemy-components'; import { useEntityData } from '@src/app/entity/shared/EntityContext'; import { formatNumber } from '@src/app/shared/formatNumber'; import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated'; -import React from 'react'; -import styled from 'styled-components'; const Styled = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryTermEntity.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryTermEntity.tsx index c73ef1790e..ca468142f5 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryTermEntity.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryTermEntity.tsx @@ -1,32 +1,34 @@ import { AppstoreOutlined, FileOutlined, LayoutOutlined, UnorderedListOutlined } from '@ant-design/icons'; -import * as React from 'react'; import { BookmarkSimple } from '@phosphor-icons/react'; -import { GetGlossaryTermQuery, useGetGlossaryTermQuery } from '../../../graphql/glossaryTerm.generated'; -import { EntityType, GlossaryTerm, SearchResult } from '../../../types.generated'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { FetchedEntity } from '../../lineage/types'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityActionItem } from '../shared/entity/EntityActions'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { SchemaTab } from '../shared/tabs/Dataset/Schema/SchemaTab'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import GlossaryRelatedAssetsTabHeader from './GlossaryRelatedAssetsTabHeader'; -import { Preview } from './preview/Preview'; -import GlossaryRelatedEntity from './profile/GlossaryRelatedEntity'; -import GlossayRelatedTerms from './profile/GlossaryRelatedTerms'; -import { RelatedTermTypes } from './profile/GlossaryRelatedTermsResult'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; +import * as React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import GlossaryRelatedAssetsTabHeader from '@app/entityV2/glossaryTerm/GlossaryRelatedAssetsTabHeader'; +import { Preview } from '@app/entityV2/glossaryTerm/preview/Preview'; +import GlossaryRelatedEntity from '@app/entityV2/glossaryTerm/profile/GlossaryRelatedEntity'; +import GlossayRelatedTerms from '@app/entityV2/glossaryTerm/profile/GlossaryRelatedTerms'; +import { RelatedTermTypes } from '@app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import { EntityActionItem } from '@app/entityV2/shared/entity/EntityActions'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { SchemaTab } from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaTab'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { FetchedEntity } from '@app/lineage/types'; + +import { GetGlossaryTermQuery, useGetGlossaryTermQuery } from '@graphql/glossaryTerm.generated'; +import { EntityType, GlossaryTerm, SearchResult } from '@types'; const headerDropdownItems = new Set([ EntityMenuItems.MOVE, diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/_tests_/utils.test.ts b/datahub-web-react/src/app/entityV2/glossaryTerm/_tests_/utils.test.ts index 446841344f..c34cb7e158 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/_tests_/utils.test.ts +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/_tests_/utils.test.ts @@ -1,6 +1,7 @@ import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider'; -import { EntityType } from '../../../../types.generated'; -import { getRelatedAssetsUrl, getRelatedEntitiesUrl, sortGlossaryTerms } from '../utils'; +import { getRelatedAssetsUrl, getRelatedEntitiesUrl, sortGlossaryTerms } from '@app/entityV2/glossaryTerm/utils'; + +import { EntityType } from '@types'; describe('sortGlossaryTerms', () => { it('should correctly sort glossary terms when both nodes are provided', () => { diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/preview/Preview.tsx index 5db9077977..db37b7552d 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/preview/Preview.tsx @@ -1,13 +1,15 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; -import React from 'react'; import { BookmarkSimple } from '@phosphor-icons/react'; -import { Deprecation, Domain, EntityType, Owner, ParentNodesResult } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; -import UrlButton from '../../shared/UrlButton'; -import { getRelatedAssetsUrl } from '../utils'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; +import React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { getRelatedAssetsUrl } from '@app/entityV2/glossaryTerm/utils'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import UrlButton from '@app/entityV2/shared/UrlButton'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Deprecation, Domain, EntityType, Owner, ParentNodesResult } from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/preview/__tests__/Preview.test.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/preview/__tests__/Preview.test.tsx index f65cbb8db7..9e3a6ca4f2 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/preview/__tests__/Preview.test.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/preview/__tests__/Preview.test.tsx @@ -1,10 +1,11 @@ import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import React from 'react'; -import { mocks } from '../../../../../Mocks'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import { Preview } from '../Preview'; -import { PreviewType } from '../../../Entity'; + +import { PreviewType } from '@app/entityV2/Entity'; +import { Preview } from '@app/entityV2/glossaryTerm/preview/Preview'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('Preview', () => { it('renders', () => { diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/AddRelatedTermsModal.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/AddRelatedTermsModal.tsx index 7986eb1907..d3ef302931 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/AddRelatedTermsModal.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/AddRelatedTermsModal.tsx @@ -1,17 +1,19 @@ -import { message, Button, Modal, Select, Tag } from 'antd'; +import { Button, Modal, Select, Tag, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { useAddRelatedTermsMutation } from '../../../../graphql/glossaryTerm.generated'; -import { useGetSearchResultsLazyQuery } from '../../../../graphql/search.generated'; -import { EntityType, SearchResult, TermRelationshipType } from '../../../../types.generated'; -import GlossaryBrowser from '../../../glossary/GlossaryBrowser/GlossaryBrowser'; -import ClickOutside from '../../../shared/ClickOutside'; -import { BrowserWrapper } from '../../../shared/tags/AddTagsTermsModal'; -import TermLabel from '../../../shared/TermLabel'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext'; -import ParentEntities from '../../../searchV2/filters/ParentEntities'; -import { getParentEntities } from '../../../searchV2/filters/utils'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import GlossaryBrowser from '@app/glossary/GlossaryBrowser/GlossaryBrowser'; +import ParentEntities from '@app/searchV2/filters/ParentEntities'; +import { getParentEntities } from '@app/searchV2/filters/utils'; +import ClickOutside from '@app/shared/ClickOutside'; +import TermLabel from '@app/shared/TermLabel'; +import { BrowserWrapper } from '@app/shared/tags/AddTagsTermsModal'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useAddRelatedTermsMutation } from '@graphql/glossaryTerm.generated'; +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { EntityType, SearchResult, TermRelationshipType } from '@types'; const StyledSelect = styled(Select)` width: 480px; diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedEntity.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedEntity.tsx index 99cb864f71..4af902d253 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedEntity.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedEntity.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; -import { UnionType } from '../../../search/utils/constants'; -import { EmbeddedListSearchSection } from '../../shared/components/styled/search/EmbeddedListSearchSection'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import { SearchCardContext } from '../../shared/SearchCardContext'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { SearchCardContext } from '@app/entityV2/shared/SearchCardContext'; +import { EmbeddedListSearchSection } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchSection'; +import { UnionType } from '@app/search/utils/constants'; export default function GlossaryRelatedEntity() { const { entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTerms.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTerms.tsx index 3538375ba1..db218e6ec5 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTerms.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTerms.tsx @@ -1,8 +1,11 @@ import { Menu } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components/macro'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import GlossaryRelatedTermsResult, { RelatedTermTypes } from './GlossaryRelatedTermsResult'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import GlossaryRelatedTermsResult, { + RelatedTermTypes, +} from '@app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult'; const DetailWrapper = styled.div` display: inline-flex; diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx index 9f2e136dd4..caf65eaf21 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx @@ -1,14 +1,16 @@ import { Typography } from 'antd'; import React, { useState } from 'react'; -import { Button } from '@src/alchemy-components'; import styled from 'styled-components/macro'; -import { TermRelationshipType } from '../../../../types.generated'; -import { Message } from '../../../shared/Message'; -import { EmptyTab } from '../../shared/components/styled/EmptyTab'; -import AddRelatedTermsModal from './AddRelatedTermsModal'; -import RelatedTerm from './RelatedTerm'; -import { CustomIcon } from '../../../sharedV2/icons/customIcons/CustomIcon'; -import addTerm from '../../../sharedV2/icons/customIcons/add-term.svg'; + +import AddRelatedTermsModal from '@app/entityV2/glossaryTerm/profile/AddRelatedTermsModal'; +import RelatedTerm from '@app/entityV2/glossaryTerm/profile/RelatedTerm'; +import { EmptyTab } from '@app/entityV2/shared/components/styled/EmptyTab'; +import { Message } from '@app/shared/Message'; +import { CustomIcon } from '@app/sharedV2/icons/customIcons/CustomIcon'; +import addTerm from '@app/sharedV2/icons/customIcons/add-term.svg'; +import { Button } from '@src/alchemy-components'; + +import { TermRelationshipType } from '@types'; export enum RelatedTermTypes { hasRelatedTerms = 'Contains', diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossarySidebarAboutSection.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossarySidebarAboutSection.tsx index cae3b2c5c2..7b9653f2ba 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossarySidebarAboutSection.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossarySidebarAboutSection.tsx @@ -1,9 +1,10 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import StripMarkdownText from '../../shared/components/styled/StripMarkdownText'; -import { SidebarHeader } from '../../shared/containers/profile/sidebar/SidebarHeader'; -import { useEntityData, useRouteToTab } from '../../../entity/shared/EntityContext'; + +import { useEntityData, useRouteToTab } from '@app/entity/shared/EntityContext'; +import StripMarkdownText from '@app/entityV2/shared/components/styled/StripMarkdownText'; +import { SidebarHeader } from '@app/entityV2/shared/containers/profile/sidebar/SidebarHeader'; const DescriptionTypography = styled(Typography.Paragraph)` max-width: 65ch; diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryTermHeader.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryTermHeader.tsx index fdf007d0c6..104ae35f35 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryTermHeader.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryTermHeader.tsx @@ -1,7 +1,8 @@ import { Divider, Space, Typography } from 'antd'; import React from 'react'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { AvatarsGroup } from '../../../shared/avatar'; + +import { AvatarsGroup } from '@app/shared/avatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; type Props = { definition: string; diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/RelatedTerm.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/RelatedTerm.tsx index 442fced452..a042e7414c 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/RelatedTerm.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/RelatedTerm.tsx @@ -1,13 +1,15 @@ -import React from 'react'; import { CloseOutlined } from '@ant-design/icons'; import { Button } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import { useGetGlossaryTermQuery } from '../../../../graphql/glossaryTerm.generated'; -import { EntityType, TermRelationshipType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { PreviewType } from '../../Entity'; -import useRemoveRelatedTerms from './useRemoveRelatedTerms'; -import { REDESIGN_COLORS } from '../../shared/constants'; + +import { PreviewType } from '@app/entityV2/Entity'; +import useRemoveRelatedTerms from '@app/entityV2/glossaryTerm/profile/useRemoveRelatedTerms'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetGlossaryTermQuery } from '@graphql/glossaryTerm.generated'; +import { EntityType, TermRelationshipType } from '@types'; const TransparentButton = styled(Button)` color: ${REDESIGN_COLORS.TITLE_PURPLE}; diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/SchemaView.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/SchemaView.tsx index 46484459ba..e004c9d1c5 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/SchemaView.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/SchemaView.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Empty, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; export type Props = { diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx index 1f791ddebe..31e398271a 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx @@ -1,9 +1,10 @@ +import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import React from 'react'; -import { MockedProvider } from '@apollo/client/testing'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import GlossaryRelatedTerms from '../GlossaryRelatedTerms'; -import { mocks } from '../../../../../Mocks'; + +import GlossaryRelatedTerms from '@app/entityV2/glossaryTerm/profile/GlossaryRelatedTerms'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('Glossary Related Terms', () => { it('renders and print hasRelatedTerms detail by default', async () => { diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx index 0dfc088143..afa30b19c9 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx @@ -1,9 +1,10 @@ import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import React from 'react'; -import { mocks } from '../../../../../Mocks'; -import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; -import GlossaryTermHeader from '../GlossaryTermHeader'; + +import GlossaryTermHeader from '@app/entityV2/glossaryTerm/profile/GlossaryTermHeader'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; const glossaryTermHeaderData = { definition: 'this is sample definition', diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/useRemoveRelatedTerms.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/useRemoveRelatedTerms.tsx index bfe5f6fbe0..6d425ef32b 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/useRemoveRelatedTerms.tsx +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/useRemoveRelatedTerms.tsx @@ -1,8 +1,10 @@ -import { message, Modal } from 'antd'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext'; -import { useRemoveRelatedTermsMutation } from '../../../../graphql/glossaryTerm.generated'; -import { TermRelationshipType } from '../../../../types.generated'; +import { Modal, message } from 'antd'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useRemoveRelatedTermsMutation } from '@graphql/glossaryTerm.generated'; +import { TermRelationshipType } from '@types'; function useRemoveRelatedTerms(termUrn: string, relationshipType: TermRelationshipType, displayName: string) { const { urn, entityType } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/utils.ts b/datahub-web-react/src/app/entityV2/glossaryTerm/utils.ts index f4973abe39..df5126a075 100644 --- a/datahub-web-react/src/app/entityV2/glossaryTerm/utils.ts +++ b/datahub-web-react/src/app/entityV2/glossaryTerm/utils.ts @@ -1,5 +1,6 @@ -import { Entity, EntityType } from '../../../types.generated'; -import { EntityRegistry } from '../../../entityRegistryContext'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { Entity, EntityType } from '@types'; export function sortGlossaryTerms(entityRegistry: EntityRegistry, nodeA?: Entity | null, nodeB?: Entity | null) { const nodeAName = entityRegistry.getDisplayName(EntityType.GlossaryTerm, nodeA) || ''; diff --git a/datahub-web-react/src/app/entityV2/group/AddGroupMembersModal.tsx b/datahub-web-react/src/app/entityV2/group/AddGroupMembersModal.tsx index 08d5065487..67faf7ad68 100644 --- a/datahub-web-react/src/app/entityV2/group/AddGroupMembersModal.tsx +++ b/datahub-web-react/src/app/entityV2/group/AddGroupMembersModal.tsx @@ -1,15 +1,17 @@ -import React, { useRef, useState } from 'react'; -import { message, Modal, Button, Select, Tag, Empty } from 'antd'; -import { getModalDomContainer } from '@src/utils/focus'; import { LoadingOutlined } from '@ant-design/icons'; +import { Button, Empty, Modal, Select, Tag, message } from 'antd'; +import React, { useRef, useState } from 'react'; import styled from 'styled-components'; -import { useAddGroupMembersMutation } from '../../../graphql/group.generated'; -import { CorpUser, Entity, EntityType } from '../../../types.generated'; -import { useGetSearchResultsLazyQuery } from '../../../graphql/search.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { useGetRecommendations } from '../../shared/recommendation'; -import { OwnerLabel } from '../../shared/OwnerLabel'; -import { ANTD_GRAY } from '../shared/constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { OwnerLabel } from '@app/shared/OwnerLabel'; +import { useGetRecommendations } from '@app/shared/recommendation'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { getModalDomContainer } from '@src/utils/focus'; + +import { useAddGroupMembersMutation } from '@graphql/group.generated'; +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { CorpUser, Entity, EntityType } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/entityV2/group/Group.tsx b/datahub-web-react/src/app/entityV2/group/Group.tsx index 5d08fdb62d..b5d8309cce 100644 --- a/datahub-web-react/src/app/entityV2/group/Group.tsx +++ b/datahub-web-react/src/app/entityV2/group/Group.tsx @@ -1,11 +1,13 @@ import { TeamOutlined } from '@ant-design/icons'; import * as React from 'react'; -import { CorpGroup, EntityType, SearchResult } from '../../../types.generated'; -import { Entity, IconStyleType, PreviewType } from '../Entity'; -import { Preview } from './preview/Preview'; -import GroupProfile from './GroupProfile'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; + +import { Entity, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import GroupProfile from '@app/entityV2/group/GroupProfile'; +import { Preview } from '@app/entityV2/group/preview/Preview'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; + +import { CorpGroup, EntityType, SearchResult } from '@types'; /** * Definition of the DataHub CorpGroup entity. diff --git a/datahub-web-react/src/app/entityV2/group/GroupAssets.tsx b/datahub-web-react/src/app/entityV2/group/GroupAssets.tsx index 64c29cc6a6..cc0653e1a8 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupAssets.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupAssets.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { UnionType } from '../../search/utils/constants'; -import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection'; + +import { EmbeddedListSearchSection } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchSection'; +import { UnionType } from '@app/search/utils/constants'; const GroupAssetsWrapper = styled.div` height: 100%; diff --git a/datahub-web-react/src/app/entityV2/group/GroupBasicInfoSection.tsx b/datahub-web-react/src/app/entityV2/group/GroupBasicInfoSection.tsx index ec9bdacea1..9caea429b4 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupBasicInfoSection.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupBasicInfoSection.tsx @@ -1,13 +1,14 @@ -import React from 'react'; import { SlackOutlined } from '@ant-design/icons'; +import React from 'react'; import styled from 'styled-components'; + import { + BasicDetailsContainer, + DraftsOutlinedIconStyle, EmptyValue, SocialDetails, - BasicDetailsContainer, SocialInfo, - DraftsOutlinedIconStyle, -} from '../shared/SidebarStyledComponents'; +} from '@app/entityV2/shared/SidebarStyledComponents'; const StyledBasicDetailsContainer = styled(BasicDetailsContainer)` padding: 10px; diff --git a/datahub-web-react/src/app/entityV2/group/GroupEditModal.tsx b/datahub-web-react/src/app/entityV2/group/GroupEditModal.tsx index f89a103f57..97b47d9b1d 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupEditModal.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupEditModal.tsx @@ -1,6 +1,7 @@ +import { Button, Form, Input, Modal, Typography, message } from 'antd'; import React, { useEffect, useState } from 'react'; -import { message, Button, Input, Modal, Typography, Form } from 'antd'; -import { useUpdateCorpGroupPropertiesMutation } from '../../../graphql/group.generated'; + +import { useUpdateCorpGroupPropertiesMutation } from '@graphql/group.generated'; type PropsData = { name: string | undefined; diff --git a/datahub-web-react/src/app/entityV2/group/GroupInfoHeaderSection.tsx b/datahub-web-react/src/app/entityV2/group/GroupInfoHeaderSection.tsx index 2c7f779f13..d5686f9396 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupInfoHeaderSection.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupInfoHeaderSection.tsx @@ -1,11 +1,13 @@ -import React from 'react'; import { LockOutlined } from '@ant-design/icons'; -import { Typography } from 'antd'; import { Tooltip } from '@components'; +import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { REDESIGN_COLORS } from '../shared/constants'; -import { MemberCount } from './GroupSidebar'; -import { EntityRelationshipsResult } from '../../../types.generated'; + +import { MemberCount } from '@app/entityV2/group/GroupSidebar'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; + +import { EntityRelationshipsResult } from '@types'; const GroupHeader = styled.div` position: relative; diff --git a/datahub-web-react/src/app/entityV2/group/GroupMemberLink.tsx b/datahub-web-react/src/app/entityV2/group/GroupMemberLink.tsx index ed34070e0b..30912cacdb 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupMemberLink.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupMemberLink.tsx @@ -1,11 +1,13 @@ -import React from 'react'; -import { Tag } from 'antd'; import { Tooltip } from '@components'; +import { Tag } from 'antd'; +import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { CustomAvatar } from '../../shared/avatar'; -import { CorpUser, EntityType } from '../../../types.generated'; -import EntityRegistry from '../../entity/EntityRegistry'; + +import EntityRegistry from '@app/entity/EntityRegistry'; +import { CustomAvatar } from '@app/shared/avatar'; + +import { CorpUser, EntityType } from '@types'; const MemberTag = styled(Tag)` padding: 2px; diff --git a/datahub-web-react/src/app/entityV2/group/GroupMembers.tsx b/datahub-web-react/src/app/entityV2/group/GroupMembers.tsx index 61ca97d0bd..17637b4c3f 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupMembers.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupMembers.tsx @@ -1,14 +1,16 @@ -import React, { useState } from 'react'; import { MoreOutlined, UserAddOutlined, UserDeleteOutlined } from '@ant-design/icons'; -import { Col, Dropdown, message, Modal, Pagination, Row, Empty, Button, Typography, MenuProps } from 'antd'; +import { Button, Col, Dropdown, Empty, MenuProps, Modal, Pagination, Row, Typography, message } from 'antd'; +import React, { useState } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { useGetAllGroupMembersQuery, useRemoveGroupMembersMutation } from '../../../graphql/group.generated'; -import { CorpUser, EntityType } from '../../../types.generated'; -import { CustomAvatar } from '../../shared/avatar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { AddGroupMembersModal } from './AddGroupMembersModal'; -import { scrollToTop } from '../../shared/searchUtils'; + +import { AddGroupMembersModal } from '@app/entityV2/group/AddGroupMembersModal'; +import { CustomAvatar } from '@app/shared/avatar'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetAllGroupMembersQuery, useRemoveGroupMembersMutation } from '@graphql/group.generated'; +import { CorpUser, EntityType } from '@types'; const ADD_MEMBER_STYLE = { backGround: '#ffffff', diff --git a/datahub-web-react/src/app/entityV2/group/GroupMembersSidebarSectionContent.tsx b/datahub-web-react/src/app/entityV2/group/GroupMembersSidebarSectionContent.tsx index 784063ad6c..c1eeb4ee97 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupMembersSidebarSectionContent.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupMembersSidebarSectionContent.tsx @@ -1,13 +1,15 @@ -import React, { useState } from 'react'; import { Typography } from 'antd'; -import { useRouteMatch } from 'react-router-dom'; +import React, { useState } from 'react'; import { useHistory } from 'react-router'; -import { CorpUser, EntityRelationshipsResult } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ShowMoreButton, TagsSection } from '../shared/SidebarStyledComponents'; -import { ShowMoreSection } from '../shared/sidebarSection/ShowMoreSection'; -import { GroupMemberLink } from './GroupMemberLink'; -import { TabType } from './types'; +import { useRouteMatch } from 'react-router-dom'; + +import { GroupMemberLink } from '@app/entityV2/group/GroupMemberLink'; +import { TabType } from '@app/entityV2/group/types'; +import { ShowMoreButton, TagsSection } from '@app/entityV2/shared/SidebarStyledComponents'; +import { ShowMoreSection } from '@app/entityV2/shared/sidebarSection/ShowMoreSection'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, EntityRelationshipsResult } from '@types'; type Props = { groupMemberRelationships: EntityRelationshipsResult; diff --git a/datahub-web-react/src/app/entityV2/group/GroupOwnerSidebarSectionContent.tsx b/datahub-web-react/src/app/entityV2/group/GroupOwnerSidebarSectionContent.tsx index 148e19d815..63a33247f4 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupOwnerSidebarSectionContent.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupOwnerSidebarSectionContent.tsx @@ -1,10 +1,12 @@ -import React, { useState } from 'react'; import { Typography } from 'antd'; -import { EntityType, Ownership } from '../../../types.generated'; -import { ExpandedOwner } from '../shared/components/styled/ExpandedOwner/ExpandedOwner'; -import { EditOwnersModal } from '../shared/containers/profile/sidebar/Ownership/EditOwnersModal'; -import { ShowMoreSection } from '../shared/sidebarSection/ShowMoreSection'; -import { TagsSection } from '../shared/SidebarStyledComponents'; +import React, { useState } from 'react'; + +import { TagsSection } from '@app/entityV2/shared/SidebarStyledComponents'; +import { ExpandedOwner } from '@app/entityV2/shared/components/styled/ExpandedOwner/ExpandedOwner'; +import { EditOwnersModal } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/EditOwnersModal'; +import { ShowMoreSection } from '@app/entityV2/shared/sidebarSection/ShowMoreSection'; + +import { EntityType, Ownership } from '@types'; type Props = { ownership: Ownership; diff --git a/datahub-web-react/src/app/entityV2/group/GroupProfile.tsx b/datahub-web-react/src/app/entityV2/group/GroupProfile.tsx index 199bd97d83..ab1f40d19f 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupProfile.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupProfile.tsx @@ -1,32 +1,37 @@ -import React, { useContext, useState } from 'react'; +import { BookOpen } from '@phosphor-icons/react'; import { Col } from 'antd'; +import React, { useContext, useState } from 'react'; import { matchPath } from 'react-router'; import { useLocation } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { BookOpen } from '@phosphor-icons/react'; + +import { EntityContext } from '@app/entity/shared/EntityContext'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { GroupAssets } from '@app/entityV2/group/GroupAssets'; +import GroupMembers from '@app/entityV2/group/GroupMembers'; +import GroupSidebar from '@app/entityV2/group/GroupSidebar'; +import { TabType } from '@app/entityV2/group/types'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { + StyledEntitySidebarContainer, + StyledSidebar, +} from '@app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar'; +import EntitySidebarSectionsTab from '@app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab'; +import { EntitySidebarTabs } from '@app/entityV2/shared/containers/profile/sidebar/EntitySidebarTabs'; +import SidebarCollapsibleHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarCollapsibleHeader'; +import NonExistentEntityPage from '@app/entityV2/shared/entity/NonExistentEntityPage'; +import CompactContext from '@app/shared/CompactContext'; +import { EntityHead } from '@app/shared/EntityHead'; +import { Message } from '@app/shared/Message'; +import { RoutedTabs } from '@app/shared/RoutedTabs'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; import colors from '@src/alchemy-components/theme/foundations/colors'; -import { PageRoutes } from '../../../conf/Global'; -import { useGetGroupQuery } from '../../../graphql/group.generated'; -import { OriginType, EntityRelationshipsResult, Ownership, EntityType } from '../../../types.generated'; -import { EntityContext } from '../../entity/shared/EntityContext'; -import { EntityHead } from '../../shared/EntityHead'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { Message } from '../../shared/Message'; -import GroupMembers from './GroupMembers'; -import { RoutedTabs } from '../../shared/RoutedTabs'; -import GroupSidebar from './GroupSidebar'; -import { GroupAssets } from './GroupAssets'; -import { ErrorSection } from '../../shared/error/ErrorSection'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import NonExistentEntityPage from '../shared/entity/NonExistentEntityPage'; -import CompactContext from '../../shared/CompactContext'; -import { StyledEntitySidebarContainer, StyledSidebar } from '../shared/containers/profile/sidebar/EntityProfileSidebar'; -import EntitySidebarSectionsTab from '../shared/containers/profile/sidebar/EntitySidebarSectionsTab'; -import EntitySidebarContext from '../../sharedV2/EntitySidebarContext'; -import SidebarCollapsibleHeader from '../shared/containers/profile/sidebar/SidebarCollapsibleHeader'; -import { EntitySidebarTabs } from '../shared/containers/profile/sidebar/EntitySidebarTabs'; -import { REDESIGN_COLORS } from '../shared/constants'; -import { TabType } from './types'; + +import { useGetGroupQuery } from '@graphql/group.generated'; +import { EntityRelationshipsResult, EntityType, OriginType, Ownership } from '@types'; const messageStyle = { marginTop: '10%' }; diff --git a/datahub-web-react/src/app/entityV2/group/GroupProfileInfoCard.tsx b/datahub-web-react/src/app/entityV2/group/GroupProfileInfoCard.tsx index 8255373db2..98cb8d36c6 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupProfileInfoCard.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupProfileInfoCard.tsx @@ -1,21 +1,23 @@ -import React, { useState } from 'react'; import { Col, message } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; -import SectionActionButton from '../shared/containers/profile/sidebar/SectionActionButton'; -import { REDESIGN_COLORS } from '../shared/constants'; -import CustomAvatar from '../../shared/avatar/CustomAvatar'; + +import { useUserContext } from '@app/context/useUserContext'; +import { GroupBasicInfoSection } from '@app/entityV2/group/GroupBasicInfoSection'; +import GroupEditModal from '@app/entityV2/group/GroupEditModal'; +import { GroupInfoHeaderSection } from '@app/entityV2/group/GroupInfoHeaderSection'; import { CustomAvatarContainer, EditProfileButtonContainer, - WhiteEditOutlinedIconStyle, GroupInfo, -} from '../shared/SidebarStyledComponents'; -import { EntityRelationshipsResult, Ownership } from '../../../types.generated'; -import GroupEditModal from './GroupEditModal'; -import { useUpdateNameMutation } from '../../../graphql/mutations.generated'; -import { GroupBasicInfoSection } from './GroupBasicInfoSection'; -import { GroupInfoHeaderSection } from './GroupInfoHeaderSection'; -import { useUserContext } from '../../context/useUserContext'; + WhiteEditOutlinedIconStyle, +} from '@app/entityV2/shared/SidebarStyledComponents'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; + +import { useUpdateNameMutation } from '@graphql/mutations.generated'; +import { EntityRelationshipsResult, Ownership } from '@types'; export type SidebarData = { photoUrl: string | undefined; diff --git a/datahub-web-react/src/app/entityV2/group/GroupSidebar.tsx b/datahub-web-react/src/app/entityV2/group/GroupSidebar.tsx index f1771b3544..249cd4a67a 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupSidebar.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupSidebar.tsx @@ -1,13 +1,15 @@ import { message } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { useUpdateCorpGroupPropertiesMutation } from '../../../graphql/group.generated'; -import { SideBar, Content } from '../shared/SidebarStyledComponents'; -import { AboutSidebarSection } from '../shared/sidebarSection/AboutSidebarSection'; -import { REDESIGN_COLORS } from '../shared/constants'; -import { GroupProfileInfoCard, SidebarData } from './GroupProfileInfoCard'; -import { GroupSidebarOwnersSection } from './GroupSidebarOwnersSection'; -import { GroupSidebarMembersSection } from './GroupSidebarMembersSection'; + +import { GroupProfileInfoCard, SidebarData } from '@app/entityV2/group/GroupProfileInfoCard'; +import { GroupSidebarMembersSection } from '@app/entityV2/group/GroupSidebarMembersSection'; +import { GroupSidebarOwnersSection } from '@app/entityV2/group/GroupSidebarOwnersSection'; +import { Content, SideBar } from '@app/entityV2/shared/SidebarStyledComponents'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { AboutSidebarSection } from '@app/entityV2/shared/sidebarSection/AboutSidebarSection'; + +import { useUpdateCorpGroupPropertiesMutation } from '@graphql/group.generated'; type Props = { sidebarData: SidebarData; diff --git a/datahub-web-react/src/app/entityV2/group/GroupSidebarMembersSection.tsx b/datahub-web-react/src/app/entityV2/group/GroupSidebarMembersSection.tsx index ace428784d..a2229edf1e 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupSidebarMembersSection.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupSidebarMembersSection.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import GroupMembersSideBarSectionContent from './GroupMembersSidebarSectionContent'; -import { SidebarSection } from '../shared/containers/profile/sidebar/SidebarSection'; -import { EntityRelationshipsResult } from '../../../types.generated'; + +import GroupMembersSideBarSectionContent from '@app/entityV2/group/GroupMembersSidebarSectionContent'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; + +import { EntityRelationshipsResult } from '@types'; type Props = { groupMemberRelationships: EntityRelationshipsResult; diff --git a/datahub-web-react/src/app/entityV2/group/GroupSidebarOwnersSection.tsx b/datahub-web-react/src/app/entityV2/group/GroupSidebarOwnersSection.tsx index 6e659be91f..65da8af6fe 100644 --- a/datahub-web-react/src/app/entityV2/group/GroupSidebarOwnersSection.tsx +++ b/datahub-web-react/src/app/entityV2/group/GroupSidebarOwnersSection.tsx @@ -1,9 +1,11 @@ -import React, { useState } from 'react'; import { PlusOutlined } from '@ant-design/icons'; -import GroupOwnerSidebarSectionContent from './GroupOwnerSidebarSectionContent'; -import SectionActionButton from '../shared/containers/profile/sidebar/SectionActionButton'; -import { SidebarSection } from '../shared/containers/profile/sidebar/SidebarSection'; -import { Ownership } from '../../../types.generated'; +import React, { useState } from 'react'; + +import GroupOwnerSidebarSectionContent from '@app/entityV2/group/GroupOwnerSidebarSectionContent'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; + +import { Ownership } from '@types'; type Props = { ownership: Ownership; diff --git a/datahub-web-react/src/app/entityV2/group/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/group/preview/Preview.tsx index b875bd4a55..1e36dc76b4 100644 --- a/datahub-web-react/src/app/entityV2/group/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/group/preview/Preview.tsx @@ -1,14 +1,15 @@ -import React from 'react'; import { Tag, Typography } from 'antd'; +import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../shared/constants'; -import { IconStyleType } from '../../Entity'; -import NoMarkdownViewer from '../../shared/components/styled/StripMarkdownText'; -import SearchTextHighlighter from '../../../searchV2/matches/SearchTextHighlighter'; +import { IconStyleType } from '@app/entityV2/Entity'; +import NoMarkdownViewer from '@app/entityV2/shared/components/styled/StripMarkdownText'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import SearchTextHighlighter from '@app/searchV2/matches/SearchTextHighlighter'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const PreviewContainer = styled.div` margin-bottom: 4px; diff --git a/datahub-web-react/src/app/entityV2/mlFeature/MLFeatureEntity.tsx b/datahub-web-react/src/app/entityV2/mlFeature/MLFeatureEntity.tsx index 10db43170d..96121dc50f 100644 --- a/datahub-web-react/src/app/entityV2/mlFeature/MLFeatureEntity.tsx +++ b/datahub-web-react/src/app/entityV2/mlFeature/MLFeatureEntity.tsx @@ -1,31 +1,33 @@ -import { ListBullets, TreeStructure, ChartScatter, WarningCircle, FileText, Infinity } from '@phosphor-icons/react'; -import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab'; -import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount'; +import { Infinity, ChartScatter, FileText, ListBullets, TreeStructure, WarningCircle } from '@phosphor-icons/react'; import * as React from 'react'; -import { useGetMlFeatureQuery } from '../../../graphql/mlFeature.generated'; -import { EntityType, MlFeature, SearchResult } from '../../../types.generated'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import { FeatureTableTab } from '../shared/tabs/ML/MlFeatureFeatureTableTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { SidebarTitleActionType, getDataProduct, isOutputPort } from '../shared/utils'; -import { Preview } from './preview/Preview'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; + +import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { Preview } from '@app/entityV2/mlFeature/preview/Preview'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount'; +import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; +import { FeatureTableTab } from '@app/entityV2/shared/tabs/ML/MlFeatureFeatureTableTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { SidebarTitleActionType, getDataProduct, isOutputPort } from '@app/entityV2/shared/utils'; + +import { useGetMlFeatureQuery } from '@graphql/mlFeature.generated'; +import { EntityType, MlFeature, SearchResult } from '@types'; const headerDropdownItems = new Set([ EntityMenuItems.UPDATE_DEPRECATION, diff --git a/datahub-web-react/src/app/entityV2/mlFeature/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/mlFeature/preview/Preview.tsx index f0753bebb4..52307a96dc 100644 --- a/datahub-web-react/src/app/entityV2/mlFeature/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/mlFeature/preview/Preview.tsx @@ -1,11 +1,13 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; import React from 'react'; -import { BrowsePathV2, DataPlatform, DataProduct, EntityPath, EntityType, Owner } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { BrowsePathV2, DataPlatform, DataProduct, EntityPath, EntityType, Owner } from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entityV2/mlFeatureTable/MLFeatureTableEntity.tsx b/datahub-web-react/src/app/entityV2/mlFeatureTable/MLFeatureTableEntity.tsx index 861e4d205d..4b3c67261e 100644 --- a/datahub-web-react/src/app/entityV2/mlFeatureTable/MLFeatureTableEntity.tsx +++ b/datahub-web-react/src/app/entityV2/mlFeatureTable/MLFeatureTableEntity.tsx @@ -1,30 +1,32 @@ -import { ChartScatter, ListBullets, FileText, Database, Table } from '@phosphor-icons/react'; +import { ChartScatter, Database, FileText, ListBullets, Table } from '@phosphor-icons/react'; import * as React from 'react'; -import { useGetMlFeatureTableQuery } from '../../../graphql/mlFeatureTable.generated'; -import { EntityType, MlFeatureTable, SearchResult } from '../../../types.generated'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { getDataProduct, isOutputPort } from '../shared/utils'; -import { Preview } from './preview/Preview'; -import MlFeatureTableFeatures from './profile/features/MlFeatureTableFeatures'; -import Sources from './profile/Sources'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { Preview } from '@app/entityV2/mlFeatureTable/preview/Preview'; +import Sources from '@app/entityV2/mlFeatureTable/profile/Sources'; +import MlFeatureTableFeatures from '@app/entityV2/mlFeatureTable/profile/features/MlFeatureTableFeatures'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { getDataProduct, isOutputPort } from '@app/entityV2/shared/utils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { useGetMlFeatureTableQuery } from '@graphql/mlFeatureTable.generated'; +import { EntityType, MlFeatureTable, SearchResult } from '@types'; const headerDropdownItems = new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.ANNOUNCE]); diff --git a/datahub-web-react/src/app/entityV2/mlFeatureTable/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/mlFeatureTable/preview/Preview.tsx index e72f781a89..d47340a32c 100644 --- a/datahub-web-react/src/app/entityV2/mlFeatureTable/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/mlFeatureTable/preview/Preview.tsx @@ -1,10 +1,12 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; import React from 'react'; -import { DataProduct, EntityPath, EntityType, Owner } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DataProduct, EntityPath, EntityType, Owner } from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/Sources.tsx b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/Sources.tsx index b1e386706d..c1d805d7ff 100644 --- a/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/Sources.tsx +++ b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/Sources.tsx @@ -1,12 +1,14 @@ import { List, Typography } from 'antd'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { GetMlFeatureTableQuery } from '../../../../graphql/mlFeatureTable.generated'; -import { Dataset, EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { PreviewType } from '../../Entity'; -import { useBaseEntity } from '../../../entity/shared/EntityContext'; -import { notEmpty } from '../../shared/utils'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { PreviewType } from '@app/entityV2/Entity'; +import { notEmpty } from '@app/entityV2/shared/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetMlFeatureTableQuery } from '@graphql/mlFeatureTable.generated'; +import { Dataset, EntityType } from '@types'; const ViewRawButtonContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx index 0d3896949a..5f4e2fee85 100644 --- a/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx +++ b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx @@ -1,24 +1,26 @@ import { - UnorderedListOutlined, - FieldStringOutlined, + AudioOutlined, ClockCircleOutlined, + FieldBinaryOutlined, + FieldStringOutlined, + FileImageOutlined, + LineChartOutlined, + NumberOutlined, + OrderedListOutlined, QuestionOutlined, StopOutlined, - OrderedListOutlined, - NumberOutlined, - AudioOutlined, + UnorderedListOutlined, VideoCameraOutlined, - FileImageOutlined, - FieldBinaryOutlined, - LineChartOutlined, } from '@ant-design/icons'; -import { Typography } from 'antd'; import { Tooltip } from '@components'; +import { Typography } from 'antd'; import React, { FC } from 'react'; import { VscFileBinary } from 'react-icons/vsc'; import styled from 'styled-components'; -import { capitalizeFirstLetter } from '../../../../shared/textUtil'; -import { MlFeatureDataType } from '../../../../../types.generated'; + +import { capitalizeFirstLetter } from '@app/shared/textUtil'; + +import { MlFeatureDataType } from '@types'; const TypeIconContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx index 1eb92daa89..cb0c29c10f 100644 --- a/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx +++ b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx @@ -1,10 +1,11 @@ import React from 'react'; -import { MlPrimaryKey, MlFeature } from '../../../../../types.generated'; -import { GetMlFeatureTableQuery } from '../../../../../graphql/mlFeatureTable.generated'; -import { useBaseEntity } from '../../../../entity/shared/EntityContext'; -import { notEmpty } from '../../../shared/utils'; -import TableOfMlFeatures from './TableOfMlFeatures'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import TableOfMlFeatures from '@app/entityV2/mlFeatureTable/profile/features/TableOfMlFeatures'; +import { notEmpty } from '@app/entityV2/shared/utils'; + +import { GetMlFeatureTableQuery } from '@graphql/mlFeatureTable.generated'; +import { MlFeature, MlPrimaryKey } from '@types'; export default function MlFeatureTableFeatures() { const baseEntity = useBaseEntity(); diff --git a/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/TableOfMlFeatures.tsx b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/TableOfMlFeatures.tsx index 24fcc62203..8aa4902c8f 100644 --- a/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/TableOfMlFeatures.tsx +++ b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/TableOfMlFeatures.tsx @@ -1,17 +1,18 @@ -import React, { useState } from 'react'; -import { Table, Typography } from 'antd'; import { CheckSquareOutlined } from '@ant-design/icons'; +import { Table, Typography } from 'antd'; import { AlignType } from 'rc-table/lib/interface'; -import styled from 'styled-components'; +import React, { useState } from 'react'; import { Link } from 'react-router-dom'; +import styled from 'styled-components'; -import MlFeatureDataTypeIcon from './MlFeatureDataTypeIcon'; -import { MlFeatureDataType, MlPrimaryKey, MlFeature } from '../../../../../types.generated'; -import { useRefetch } from '../../../../entity/shared/EntityContext'; -import TagTermGroup from '../../../../sharedV2/tags/TagTermGroup'; -import SchemaDescriptionField from '../../../dataset/profile/schema/components/SchemaDescriptionField'; -import { useUpdateDescriptionMutation } from '../../../../../graphql/mutations.generated'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; +import { useRefetch } from '@app/entity/shared/EntityContext'; +import SchemaDescriptionField from '@app/entityV2/dataset/profile/schema/components/SchemaDescriptionField'; +import MlFeatureDataTypeIcon from '@app/entityV2/mlFeatureTable/profile/features/MlFeatureDataTypeIcon'; +import TagTermGroup from '@app/sharedV2/tags/TagTermGroup'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useUpdateDescriptionMutation } from '@graphql/mutations.generated'; +import { MlFeature, MlFeatureDataType, MlPrimaryKey } from '@types'; const FeaturesContainer = styled.div` margin-bottom: 100px; diff --git a/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx b/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx index 3eab184d58..13e8605422 100644 --- a/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx +++ b/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx @@ -1,34 +1,36 @@ -import { ListBullets } from '@phosphor-icons/react'; import { CodeSandboxOutlined, PartitionOutlined, WarningOutlined } from '@ant-design/icons'; +import { ListBullets } from '@phosphor-icons/react'; +import * as React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { Preview } from '@app/entityV2/mlModel/preview/Preview'; +import MLModelGroupsTab from '@app/entityV2/mlModel/profile/MLModelGroupsTab'; +import MLModelSummary from '@app/entityV2/mlModel/profile/MLModelSummary'; +import MlModelFeaturesTab from '@app/entityV2/mlModel/profile/MlModelFeaturesTab'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount'; import { IncidentTab } from '@app/entityV2/shared/tabs/Incident/IncidentTab'; import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; -import * as React from 'react'; -import { useGetMlModelQuery } from '../../../graphql/mlModel.generated'; -import { EntityType, MlModel, SearchResult } from '../../../types.generated'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { isOutputPort } from '../shared/utils'; -import { Preview } from './preview/Preview'; -import MLModelGroupsTab from './profile/MLModelGroupsTab'; -import MLModelSummary from './profile/MLModelSummary'; -import MlModelFeaturesTab from './profile/MlModelFeaturesTab'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { isOutputPort } from '@app/entityV2/shared/utils'; + +import { useGetMlModelQuery } from '@graphql/mlModel.generated'; +import { EntityType, MlModel, SearchResult } from '@types'; const headerDropdownItems = new Set([ EntityMenuItems.SHARE, diff --git a/datahub-web-react/src/app/entityV2/mlModel/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/mlModel/preview/Preview.tsx index 801de4f709..608a718f06 100644 --- a/datahub-web-react/src/app/entityV2/mlModel/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/mlModel/preview/Preview.tsx @@ -1,12 +1,14 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; import React from 'react'; -import { EntityPath, EntityType, MlModel } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; -import { getDataProduct } from '../../shared/utils'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { getDataProduct } from '@app/entityV2/shared/utils'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityPath, EntityType, MlModel } from '@types'; export const Preview = ({ data, diff --git a/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelGroupsTab.tsx b/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelGroupsTab.tsx index 506a624da6..fda5a50ea4 100644 --- a/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelGroupsTab.tsx +++ b/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelGroupsTab.tsx @@ -1,13 +1,14 @@ -import React from 'react'; import { Space, Table, Typography } from 'antd'; -import Link from 'antd/lib/typography/Link'; import { ColumnsType } from 'antd/es/table'; +import Link from 'antd/lib/typography/Link'; +import React from 'react'; import styled from 'styled-components'; -import { EntityType, MlModelGroup } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useBaseEntity } from '../../../entity/shared/EntityContext'; -import { GetMlModelQuery } from '../../../../graphql/mlModel.generated'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetMlModelQuery } from '@graphql/mlModel.generated'; +import { EntityType, MlModelGroup } from '@types'; const TabContent = styled.div` padding: 16px; diff --git a/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelSummary.tsx b/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelSummary.tsx index 6956f02455..157e2b0180 100644 --- a/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelSummary.tsx +++ b/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelSummary.tsx @@ -1,16 +1,18 @@ +import { Pill } from '@components'; +import { Space, Table, Typography } from 'antd'; +import React from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components'; + import { useBaseEntity } from '@app/entity/shared/EntityContext'; import { InfoItem } from '@app/entityV2/shared/components/styled/InfoItem'; import { notEmpty } from '@app/entityV2/shared/utils'; +import { TimestampPopover } from '@app/sharedV2/TimestampPopover'; import { useEntityRegistry } from '@app/useEntityRegistry'; -import { Pill } from '@components'; +import { colors } from '@src/alchemy-components/theme'; + import { GetMlModelQuery } from '@graphql/mlModel.generated'; import { EntityType, MlHyperParam, MlMetric } from '@types'; -import React from 'react'; -import styled from 'styled-components'; -import { Space, Table, Typography } from 'antd'; -import { Link } from 'react-router-dom'; -import { colors } from '@src/alchemy-components/theme'; -import { TimestampPopover } from '../../../sharedV2/TimestampPopover'; const TabContent = styled.div` padding: 16px; diff --git a/datahub-web-react/src/app/entityV2/mlModel/profile/MlModelFeaturesTab.tsx b/datahub-web-react/src/app/entityV2/mlModel/profile/MlModelFeaturesTab.tsx index 0b0e9646f7..6095e49897 100644 --- a/datahub-web-react/src/app/entityV2/mlModel/profile/MlModelFeaturesTab.tsx +++ b/datahub-web-react/src/app/entityV2/mlModel/profile/MlModelFeaturesTab.tsx @@ -1,9 +1,10 @@ import React from 'react'; -import { MlPrimaryKey, MlFeature } from '../../../../types.generated'; -import { useBaseEntity } from '../../../entity/shared/EntityContext'; -import { GetMlModelQuery } from '../../../../graphql/mlModel.generated'; -import TableOfMlFeatures from '../../mlFeatureTable/profile/features/TableOfMlFeatures'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import TableOfMlFeatures from '@app/entityV2/mlFeatureTable/profile/features/TableOfMlFeatures'; + +import { GetMlModelQuery } from '@graphql/mlModel.generated'; +import { MlFeature, MlPrimaryKey } from '@types'; export default function MlModelFeaturesTab() { const entity = useBaseEntity() as GetMlModelQuery; diff --git a/datahub-web-react/src/app/entityV2/mlModelGroup/MLModelGroupEntity.tsx b/datahub-web-react/src/app/entityV2/mlModelGroup/MLModelGroupEntity.tsx index 8b3ac6fd77..66c6ae0cdd 100644 --- a/datahub-web-react/src/app/entityV2/mlModelGroup/MLModelGroupEntity.tsx +++ b/datahub-web-react/src/app/entityV2/mlModelGroup/MLModelGroupEntity.tsx @@ -1,29 +1,31 @@ import { CodeSandboxOutlined, PartitionOutlined, UnorderedListOutlined } from '@ant-design/icons'; -import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; import * as React from 'react'; -import { useGetMlModelGroupQuery } from '../../../graphql/mlModelGroup.generated'; -import { EntityType, MlModelGroup, SearchResult } from '../../../types.generated'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { isOutputPort } from '../shared/utils'; -import { Preview } from './preview/Preview'; -import ModelGroupModels from './profile/ModelGroupModels'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { Preview } from '@app/entityV2/mlModelGroup/preview/Preview'; +import ModelGroupModels from '@app/entityV2/mlModelGroup/profile/ModelGroupModels'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { isOutputPort } from '@app/entityV2/shared/utils'; + +import { useGetMlModelGroupQuery } from '@graphql/mlModelGroup.generated'; +import { EntityType, MlModelGroup, SearchResult } from '@types'; const headerDropdownItems = new Set([ EntityMenuItems.SHARE, diff --git a/datahub-web-react/src/app/entityV2/mlModelGroup/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/mlModelGroup/preview/Preview.tsx index 5d24f4749c..23f3ad62d7 100644 --- a/datahub-web-react/src/app/entityV2/mlModelGroup/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/mlModelGroup/preview/Preview.tsx @@ -1,12 +1,14 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; import React from 'react'; -import { EntityPath, EntityType, MlModelGroup } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { getDataProduct } from '../../shared/utils'; -import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions'; -import { PreviewType } from '../../Entity'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { PreviewType } from '@app/entityV2/Entity'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { getDataProduct } from '@app/entityV2/shared/utils'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityPath, EntityType, MlModelGroup } from '@types'; export const Preview = ({ data, diff --git a/datahub-web-react/src/app/entityV2/mlModelGroup/profile/ModelGroupModels.tsx b/datahub-web-react/src/app/entityV2/mlModelGroup/profile/ModelGroupModels.tsx index 31ef18d3ad..bd5eefc025 100644 --- a/datahub-web-react/src/app/entityV2/mlModelGroup/profile/ModelGroupModels.tsx +++ b/datahub-web-react/src/app/entityV2/mlModelGroup/profile/ModelGroupModels.tsx @@ -1,16 +1,18 @@ +import { Table, Typography } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; + import { useBaseEntity } from '@app/entity/shared/EntityContext'; import { EmptyTab } from '@app/entityV2/shared/components/styled/EmptyTab'; import { InfoItem } from '@app/entityV2/shared/components/styled/InfoItem'; import { notEmpty } from '@app/entityV2/shared/utils'; +import { TimestampPopover } from '@app/sharedV2/TimestampPopover'; import { useEntityRegistry } from '@app/useEntityRegistry'; +import { Pill } from '@src/alchemy-components/components/Pills'; +import { colors } from '@src/alchemy-components/theme'; + import { GetMlModelGroupQuery } from '@graphql/mlModelGroup.generated'; import { EntityType } from '@types'; -import { Typography, Table } from 'antd'; -import React from 'react'; -import styled from 'styled-components'; -import { colors } from '@src/alchemy-components/theme'; -import { Pill } from '@src/alchemy-components/components/Pills'; -import { TimestampPopover } from '../../../sharedV2/TimestampPopover'; const InfoItemContainer = styled.div<{ justifyContent }>` display: flex; diff --git a/datahub-web-react/src/app/entityV2/mlPrimaryKey/MLPrimaryKeyEntity.tsx b/datahub-web-react/src/app/entityV2/mlPrimaryKey/MLPrimaryKeyEntity.tsx index e6ae2100a0..2144f00403 100644 --- a/datahub-web-react/src/app/entityV2/mlPrimaryKey/MLPrimaryKeyEntity.tsx +++ b/datahub-web-react/src/app/entityV2/mlPrimaryKey/MLPrimaryKeyEntity.tsx @@ -1,27 +1,29 @@ import { DotChartOutlined, PartitionOutlined, UnorderedListOutlined } from '@ant-design/icons'; import * as React from 'react'; -import { useGetMlPrimaryKeyQuery } from '../../../graphql/mlPrimaryKey.generated'; -import { EntityType, MlPrimaryKey, SearchResult } from '../../../types.generated'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; -import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection'; -import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection'; -import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; -import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader'; -import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; -import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection'; -import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import { LineageTab } from '../shared/tabs/Lineage/LineageTab'; -import { FeatureTableTab } from '../shared/tabs/ML/MlPrimaryKeyFeatureTableTab'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; -import { SidebarTitleActionType, getDataProduct, isOutputPort } from '../shared/utils'; -import { Preview } from './preview/Preview'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { Preview } from '@app/entityV2/mlPrimaryKey/preview/Preview'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import DataProductSection from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection'; +import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; +import { FeatureTableTab } from '@app/entityV2/shared/tabs/ML/MlPrimaryKeyFeatureTableTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { SidebarTitleActionType, getDataProduct, isOutputPort } from '@app/entityV2/shared/utils'; + +import { useGetMlPrimaryKeyQuery } from '@graphql/mlPrimaryKey.generated'; +import { EntityType, MlPrimaryKey, SearchResult } from '@types'; /** * Definition of the DataHub MLPrimaryKey entity. diff --git a/datahub-web-react/src/app/entityV2/mlPrimaryKey/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/mlPrimaryKey/preview/Preview.tsx index 993d6b5177..017a4b79ae 100644 --- a/datahub-web-react/src/app/entityV2/mlPrimaryKey/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/mlPrimaryKey/preview/Preview.tsx @@ -1,10 +1,12 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; import React from 'react'; -import { DataPlatform, DataProduct, EntityPath, EntityType, Owner } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DataPlatform, DataProduct, EntityPath, EntityType, Owner } from '@types'; export const Preview = ({ urn, diff --git a/datahub-web-react/src/app/entityV2/ownership/ManageOwnership.tsx b/datahub-web-react/src/app/entityV2/ownership/ManageOwnership.tsx index a3304ab015..20c0054f09 100644 --- a/datahub-web-react/src/app/entityV2/ownership/ManageOwnership.tsx +++ b/datahub-web-react/src/app/entityV2/ownership/ManageOwnership.tsx @@ -1,7 +1,8 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Typography } from 'antd'; -import { OwnershipList } from './OwnershipList'; + +import { OwnershipList } from '@app/entityV2/ownership/OwnershipList'; const PageContainer = styled.div` padding-top: 20px; diff --git a/datahub-web-react/src/app/entityV2/ownership/OwnershipBuilderModal.tsx b/datahub-web-react/src/app/entityV2/ownership/OwnershipBuilderModal.tsx index 9837bdcc3d..9321794130 100644 --- a/datahub-web-react/src/app/entityV2/ownership/OwnershipBuilderModal.tsx +++ b/datahub-web-react/src/app/entityV2/ownership/OwnershipBuilderModal.tsx @@ -1,10 +1,12 @@ -import React, { useEffect, useState } from 'react'; import { Form, Input, Modal, Typography, message, notification } from 'antd'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components/macro'; + +import { OwnershipTypeBuilderState } from '@app/entityV2/ownership/table/types'; import { Button } from '@src/alchemy-components'; -import { useCreateOwnershipTypeMutation, useUpdateOwnershipTypeMutation } from '../../../graphql/ownership.generated'; -import { OwnershipTypeEntity } from '../../../types.generated'; -import { OwnershipTypeBuilderState } from './table/types'; + +import { useCreateOwnershipTypeMutation, useUpdateOwnershipTypeMutation } from '@graphql/ownership.generated'; +import { OwnershipTypeEntity } from '@types'; const NAME_INPUT_TEST_ID = 'ownership-type-name-input'; const DESCRIPTION_INPUT_TEST_ID = 'ownership-type-description-input'; diff --git a/datahub-web-react/src/app/entityV2/ownership/OwnershipList.tsx b/datahub-web-react/src/app/entityV2/ownership/OwnershipList.tsx index dee36cb4b3..bfa5c0686c 100644 --- a/datahub-web-react/src/app/entityV2/ownership/OwnershipList.tsx +++ b/datahub-web-react/src/app/entityV2/ownership/OwnershipList.tsx @@ -1,16 +1,18 @@ -import React, { useState } from 'react'; -import { Button, Pagination, message } from 'antd'; import { PlusOutlined } from '@ant-design/icons'; +import { Button, Pagination, message } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { useListOwnershipTypesQuery } from '../../../graphql/ownership.generated'; -import { Message } from '../../shared/Message'; -import { OwnershipBuilderModal } from './OwnershipBuilderModal'; -import TabToolbar from '../shared/components/styled/TabToolbar'; -import { OwnershipTable } from './table/OwnershipTable'; -import { OwnershipTypeEntity } from '../../../types.generated'; -import { SearchBar } from '../../search/SearchBar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { scrollToTop } from '../../shared/searchUtils'; + +import { OwnershipBuilderModal } from '@app/entityV2/ownership/OwnershipBuilderModal'; +import { OwnershipTable } from '@app/entityV2/ownership/table/OwnershipTable'; +import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListOwnershipTypesQuery } from '@graphql/ownership.generated'; +import { OwnershipTypeEntity } from '@types'; const PaginationContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/ownership/table/ActionsColumn.tsx b/datahub-web-react/src/app/entityV2/ownership/table/ActionsColumn.tsx index c8f988b09b..3161381169 100644 --- a/datahub-web-react/src/app/entityV2/ownership/table/ActionsColumn.tsx +++ b/datahub-web-react/src/app/entityV2/ownership/table/ActionsColumn.tsx @@ -1,9 +1,10 @@ -import React from 'react'; -import { Dropdown, MenuProps, Popconfirm, Typography, message, notification } from 'antd'; import { CopyOutlined, DeleteOutlined, EditOutlined, MoreOutlined } from '@ant-design/icons'; +import { Dropdown, MenuProps, Popconfirm, Typography, message, notification } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import { OwnershipTypeEntity } from '../../../../types.generated'; -import { useDeleteOwnershipTypeMutation } from '../../../../graphql/ownership.generated'; + +import { useDeleteOwnershipTypeMutation } from '@graphql/ownership.generated'; +import { OwnershipTypeEntity } from '@types'; const DROPDOWN_TEST_ID = 'ownership-table-dropdown'; const EDIT_OWNERSHIP_TYPE_TEST_ID = 'edit-ownership-type'; diff --git a/datahub-web-react/src/app/entityV2/ownership/table/DescriptionColumn.tsx b/datahub-web-react/src/app/entityV2/ownership/table/DescriptionColumn.tsx index 5db6a67196..05bd2abc21 100644 --- a/datahub-web-react/src/app/entityV2/ownership/table/DescriptionColumn.tsx +++ b/datahub-web-react/src/app/entityV2/ownership/table/DescriptionColumn.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import { OwnershipTypeEntity } from '../../../../types.generated'; + +import { OwnershipTypeEntity } from '@types'; const DescriptionText = styled(Typography.Text)` font-size: 12px; diff --git a/datahub-web-react/src/app/entityV2/ownership/table/NameColumn.tsx b/datahub-web-react/src/app/entityV2/ownership/table/NameColumn.tsx index 46100621ea..317e844947 100644 --- a/datahub-web-react/src/app/entityV2/ownership/table/NameColumn.tsx +++ b/datahub-web-react/src/app/entityV2/ownership/table/NameColumn.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import { OwnershipTypeEntity } from '../../../../types.generated'; + +import { OwnershipTypeEntity } from '@types'; const NameText = styled(Typography.Text)` font-size: 12px; diff --git a/datahub-web-react/src/app/entityV2/ownership/table/OwnershipTable.tsx b/datahub-web-react/src/app/entityV2/ownership/table/OwnershipTable.tsx index cc05c5e390..a24d07db57 100644 --- a/datahub-web-react/src/app/entityV2/ownership/table/OwnershipTable.tsx +++ b/datahub-web-react/src/app/entityV2/ownership/table/OwnershipTable.tsx @@ -1,10 +1,12 @@ -import React from 'react'; import { Empty } from 'antd'; -import { OwnershipTypeEntity } from '../../../../types.generated'; -import { StyledTable } from '../../shared/components/styled/StyledTable'; -import { NameColumn } from './NameColumn'; -import { DescriptionColumn } from './DescriptionColumn'; -import { ActionsColumn } from './ActionsColumn'; +import React from 'react'; + +import { ActionsColumn } from '@app/entityV2/ownership/table/ActionsColumn'; +import { DescriptionColumn } from '@app/entityV2/ownership/table/DescriptionColumn'; +import { NameColumn } from '@app/entityV2/ownership/table/NameColumn'; +import { StyledTable } from '@app/entityV2/shared/components/styled/StyledTable'; + +import { OwnershipTypeEntity } from '@types'; type Props = { ownershipTypes: OwnershipTypeEntity[]; diff --git a/datahub-web-react/src/app/entityV2/query/QueryEntity.tsx b/datahub-web-react/src/app/entityV2/query/QueryEntity.tsx index 3cef8976b9..ac2af08c16 100644 --- a/datahub-web-react/src/app/entityV2/query/QueryEntity.tsx +++ b/datahub-web-react/src/app/entityV2/query/QueryEntity.tsx @@ -1,18 +1,20 @@ -import * as React from 'react'; import { ConsoleSqlOutlined, FileOutlined } from '@ant-design/icons'; -import { DataPlatform, EntityType, QueryEntity as Query } from '../../../types.generated'; -import { Entity, IconStyleType } from '../Entity'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { EntityProfile } from '../shared/containers/profile/EntityProfile'; -import { useGetQueryQuery } from '../../../graphql/query.generated'; -import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab'; -import SidebarQueryUpdatedAtSection from '../shared/containers/profile/sidebar/Query/SidebarQueryUpdatedAtSection'; -import SidebarQueryDescriptionSection from '../shared/containers/profile/sidebar/Query/SidebarQueryDescriptionSection'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import SidebarQueryOperationsSection from '../shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection'; -import SidebarQueryDefinitionSection from '../shared/containers/profile/sidebar/Query/SidebarQueryDefinitionSection'; -import { SidebarQueryLogicSection } from '../shared/containers/profile/sidebar/SidebarLogicSection'; +import * as React from 'react'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, IconStyleType } from '@app/entityV2/Entity'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import SidebarQueryDefinitionSection from '@app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDefinitionSection'; +import SidebarQueryDescriptionSection from '@app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDescriptionSection'; +import SidebarQueryOperationsSection from '@app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection'; +import SidebarQueryUpdatedAtSection from '@app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryUpdatedAtSection'; +import { SidebarQueryLogicSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; + +import { useGetQueryQuery } from '@graphql/query.generated'; +import { DataPlatform, EntityType, QueryEntity as Query } from '@types'; /** * Definition of the DataHub DataPlatformInstance entity. diff --git a/datahub-web-react/src/app/entityV2/schemaField/SchemaFieldEntity.tsx b/datahub-web-react/src/app/entityV2/schemaField/SchemaFieldEntity.tsx index 8a0052b6b3..4ce192d51e 100644 --- a/datahub-web-react/src/app/entityV2/schemaField/SchemaFieldEntity.tsx +++ b/datahub-web-react/src/app/entityV2/schemaField/SchemaFieldEntity.tsx @@ -1,23 +1,24 @@ -import * as React from 'react'; -import TabFullsizedContext from '@src/app/shared/TabFullsizedContext'; -import { GenericEntityProperties } from '@app/entity/shared/types'; -import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider'; -import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; -import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; -import { FetchedEntity } from '@app/lineage/types'; -import { useGetSchemaFieldQuery } from '@graphql/schemaField.generated'; -import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; -import { downgradeV2FieldPath } from '@app/lineageV2/lineageUtils'; -import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils'; import { PartitionOutlined, PicCenterOutlined, UnorderedListOutlined } from '@ant-design/icons'; -import { EntityType, SchemaFieldEntity as SchemaField, SearchResult } from '@types'; +import * as React from 'react'; -import { Entity, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { Preview } from './preview/Preview'; -import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection'; -import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions'; -import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab'; +import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { Entity, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { Preview } from '@app/entityV2/schemaField/preview/Preview'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection'; +import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { FetchedEntity } from '@app/lineage/types'; +import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils'; +import { downgradeV2FieldPath } from '@app/lineageV2/lineageUtils'; +import TabFullsizedContext from '@src/app/shared/TabFullsizedContext'; + +import { useGetSchemaFieldQuery } from '@graphql/schemaField.generated'; +import { EntityType, SchemaFieldEntity as SchemaField, SearchResult } from '@types'; const headerDropdownItems = new Set([EntityMenuItems.SHARE, EntityMenuItems.ANNOUNCE]); diff --git a/datahub-web-react/src/app/entityV2/schemaField/__tests__/utils.test.ts b/datahub-web-react/src/app/entityV2/schemaField/__tests__/utils.test.ts index b61dbeb0f1..abeeba9251 100644 --- a/datahub-web-react/src/app/entityV2/schemaField/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/entityV2/schemaField/__tests__/utils.test.ts @@ -1,4 +1,8 @@ -import { getFieldPathFromSchemaFieldUrn, getSchemaFieldParentLink, getSourceUrnFromSchemaFieldUrn } from '../utils'; +import { + getFieldPathFromSchemaFieldUrn, + getSchemaFieldParentLink, + getSourceUrnFromSchemaFieldUrn, +} from '@app/entityV2/schemaField/utils'; describe('schema field utils', () => { const schemaFieldUrn = diff --git a/datahub-web-react/src/app/entityV2/schemaField/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/schemaField/preview/Preview.tsx index 70d00882a9..7ed0290eee 100644 --- a/datahub-web-react/src/app/entityV2/schemaField/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/schemaField/preview/Preview.tsx @@ -1,11 +1,13 @@ -import React from 'react'; import { PicCenterOutlined } from '@ant-design/icons'; +import React from 'react'; + +import { IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { GenericEntityProperties } from '@src/app/entity/shared/types'; import { capitalizeFirstLetterOnly } from '@src/app/shared/textUtil'; -import { EntityType, Owner } from '../../../../types.generated'; -import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../../Entity'; + +import { EntityType, Owner } from '@types'; export const Preview = ({ data, diff --git a/datahub-web-react/src/app/entityV2/shared/ActorAvatar.tsx b/datahub-web-react/src/app/entityV2/shared/ActorAvatar.tsx index c6041a9383..75545c5ee3 100644 --- a/datahub-web-react/src/app/entityV2/shared/ActorAvatar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/ActorAvatar.tsx @@ -1,12 +1,14 @@ -import { Avatar } from 'antd'; import { Tooltip } from '@components'; +import { Avatar } from 'antd'; import { TooltipPlacement } from 'antd/lib/tooltip'; import React from 'react'; import { useHistory } from 'react-router-dom'; import styled from 'styled-components'; + +import getAvatarColor from '@app/shared/avatar/getAvatarColor'; import { useIsEmbeddedProfile } from '@src/app/shared/useEmbeddedProfileLinkProps'; -import defaultAvatar from '../../../images/default_avatar.png'; -import getAvatarColor from '../../shared/avatar/getAvatarColor'; + +import defaultAvatar from '@images/default_avatar.png'; const AvatarStyled = styled(Avatar)<{ size?: number; $backgroundColor?: string }>` color: #fff; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal.tsx index 1f3f0e8b1c..6b4c5dcff8 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal.tsx @@ -1,22 +1,21 @@ +import { EditOutlined } from '@ant-design/icons'; +import { Collapse, Form, Input, Modal, Typography, message } from 'antd'; +import DOMPurify from 'dompurify'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { EditOutlined } from '@ant-design/icons'; -import { message, Input, Modal, Typography, Form, Collapse } from 'antd'; -import DOMPurify from 'dompurify'; + +import analytics, { EventType } from '@app/analytics'; +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import NodeParentSelect from '@app/entityV2/shared/EntityDropdown/NodeParentSelect'; +import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext'; +import DescriptionModal from '@app/entityV2/shared/components/legacy/DescriptionModal'; +import { getGlossaryRootToUpdate, updateGlossarySidebar } from '@app/glossary/utils'; +import { validateCustomUrnId } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { Button } from '@src/alchemy-components'; -import { - useCreateGlossaryTermMutation, - useCreateGlossaryNodeMutation, -} from '../../../../graphql/glossaryTerm.generated'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import NodeParentSelect from './NodeParentSelect'; -import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext'; -import analytics, { EventType } from '../../../analytics'; -import DescriptionModal from '../components/legacy/DescriptionModal'; -import { validateCustomUrnId } from '../../../shared/textUtil'; -import { useGlossaryEntityData } from '../GlossaryEntityContext'; -import { getGlossaryRootToUpdate, updateGlossarySidebar } from '../../../glossary/utils'; + +import { useCreateGlossaryNodeMutation, useCreateGlossaryTermMutation } from '@graphql/glossaryTerm.generated'; +import { EntityType } from '@types'; const StyledItem = styled(Form.Item)` margin-bottom: 0; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DeleteEntityMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DeleteEntityMenuAction.tsx index 86bccdfd30..1add843f4f 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DeleteEntityMenuAction.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DeleteEntityMenuAction.tsx @@ -1,15 +1,17 @@ -import React from 'react'; import { DeleteOutlined } from '@ant-design/icons'; import { Tooltip } from '@components'; +import React from 'react'; import { Redirect } from 'react-router'; -import { useUserContext } from '../../../context/useUserContext'; -import { isDeleteDisabled, shouldDisplayChildDeletionWarning } from './utils'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import useDeleteEntity from './useDeleteEntity'; -import { getEntityProfileDeleteRedirectPath } from '../../../shared/deleteUtils'; -import { EntityType } from '../../../../types.generated'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import { ActionMenuItem } from './styledComponents'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ActionMenuItem } from '@app/entityV2/shared/EntityDropdown/styledComponents'; +import useDeleteEntity from '@app/entityV2/shared/EntityDropdown/useDeleteEntity'; +import { isDeleteDisabled, shouldDisplayChildDeletionWarning } from '@app/entityV2/shared/EntityDropdown/utils'; +import { getEntityProfileDeleteRedirectPath } from '@app/shared/deleteUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; interface Props { options?: any; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DomainParentSelect.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DomainParentSelect.tsx index a6c7fa13e2..3238e6567a 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DomainParentSelect.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DomainParentSelect.tsx @@ -1,15 +1,17 @@ -import React, { MouseEvent } from 'react'; -import { Empty, Select } from 'antd'; import { CloseCircleFilled } from '@ant-design/icons'; +import { Empty, Select } from 'antd'; +import React, { MouseEvent } from 'react'; + +import DomainNavigator from '@app/domain/nestedDomains/domainNavigator/DomainNavigator'; +import domainAutocompleteOptions from '@app/domainV2/DomainAutocompleteOptions'; +import useParentSelector from '@app/entityV2/shared/EntityDropdown/useParentSelector'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import ClickOutside from '@app/shared/ClickOutside'; +import { BrowserWrapper } from '@app/shared/tags/AddTagsTermsModal'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { useDomainsContext } from '@src/app/domainV2/DomainsContext'; -import { Domain, EntityType } from '../../../../types.generated'; -import domainAutocompleteOptions from '../../../domainV2/DomainAutocompleteOptions'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import ClickOutside from '../../../shared/ClickOutside'; -import { BrowserWrapper } from '../../../shared/tags/AddTagsTermsModal'; -import { ANTD_GRAY } from '../constants'; -import useParentSelector from './useParentSelector'; -import DomainNavigator from '../../../domain/nestedDomains/domainNavigator/DomainNavigator'; + +import { Domain, EntityType } from '@types'; // filter out entity itself and its children export function filterResultsForMove(entity: Domain, entityUrn: string) { diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityDropdown.tsx index dda597bac4..753c2fa3e6 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityDropdown.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityDropdown.tsx @@ -9,40 +9,46 @@ import { ShareAltOutlined, WarningOutlined, } from '@ant-design/icons'; -import { EventType } from '@app/analytics'; -import analytics from '@app/analytics/analytics'; -import { useEntityContext } from '@app/entity/shared/EntityContext'; -import { DrawerType, GenericEntityProperties } from '@app/entity/shared/types'; import { Tooltip } from '@components'; import MoreVertOutlinedIcon from '@mui/icons-material/MoreVertOutlined'; import { Dropdown, Menu, message } from 'antd'; -import { GitCommit, Link as LinkIcon, LinkBreak } from 'phosphor-react'; +import { GitCommit, LinkBreak, Link as LinkIcon } from 'phosphor-react'; import React, { useState } from 'react'; import { Redirect, useHistory } from 'react-router'; import styled from 'styled-components'; -import { useUpdateDeprecationMutation } from '../../../../graphql/mutations.generated'; -import { EntityType } from '../../../../types.generated'; -import { useUserContext } from '../../../context/useUserContext'; -import { getEntityProfileDeleteRedirectPath } from '../../../shared/deleteUtils'; -import ShareButtonMenu from '../../../shared/share/v2/ShareButtonMenu'; -import { useAppConfig, useIsNestedDomainsEnabled } from '../../../useAppConfig'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import CreateEntityAnnouncementModal from '../announce/CreateEntityAnnouncementModal'; -import { MarkAsDeprecatedButtonContents } from '../components/styled/MarkAsDeprecatedButton'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../constants'; -import { getEntityPath } from '../containers/profile/utils'; -import { useIsSeparateSiblingsMode } from '../useIsSeparateSiblingsMode'; -import CreateGlossaryEntityModal from './CreateGlossaryEntityModal'; -import { EntityMenuItems } from './EntityMenuActions'; -import MoveDomainModal from './MoveDomainModal'; -import MoveGlossaryEntityModal from './MoveGlossaryEntityModal'; -import { UpdateDeprecationModal } from './UpdateDeprecationModal'; -import useDeleteEntity from './useDeleteEntity'; -import { isDeleteDisabled, isMoveDisabled, shouldDisplayChildDeletionWarning } from './utils'; -import LinkAssetVersionModal from './versioning/LinkAssetVersionModal'; -import UnlinkAssetVersionModal from './versioning/UnlinkAssetVersionModal'; -import { IncidentDetailDrawer } from '../tabs/Incident/AcrylComponents/IncidentDetailDrawer'; -import { IncidentAction } from '../tabs/Incident/constant'; + +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityContext } from '@app/entity/shared/EntityContext'; +import { DrawerType, GenericEntityProperties } from '@app/entity/shared/types'; +import CreateGlossaryEntityModal from '@app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import MoveDomainModal from '@app/entityV2/shared/EntityDropdown/MoveDomainModal'; +import MoveGlossaryEntityModal from '@app/entityV2/shared/EntityDropdown/MoveGlossaryEntityModal'; +import { UpdateDeprecationModal } from '@app/entityV2/shared/EntityDropdown/UpdateDeprecationModal'; +import useDeleteEntity from '@app/entityV2/shared/EntityDropdown/useDeleteEntity'; +import { + isDeleteDisabled, + isMoveDisabled, + shouldDisplayChildDeletionWarning, +} from '@app/entityV2/shared/EntityDropdown/utils'; +import LinkAssetVersionModal from '@app/entityV2/shared/EntityDropdown/versioning/LinkAssetVersionModal'; +import UnlinkAssetVersionModal from '@app/entityV2/shared/EntityDropdown/versioning/UnlinkAssetVersionModal'; +import CreateEntityAnnouncementModal from '@app/entityV2/shared/announce/CreateEntityAnnouncementModal'; +import { MarkAsDeprecatedButtonContents } from '@app/entityV2/shared/components/styled/MarkAsDeprecatedButton'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getEntityPath } from '@app/entityV2/shared/containers/profile/utils'; +import { IncidentDetailDrawer } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDetailDrawer'; +import { IncidentAction } from '@app/entityV2/shared/tabs/Incident/constant'; +import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; +import { getEntityProfileDeleteRedirectPath } from '@app/shared/deleteUtils'; +import ShareButtonMenu from '@app/shared/share/v2/ShareButtonMenu'; +import { useAppConfig, useIsNestedDomainsEnabled } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useUpdateDeprecationMutation } from '@graphql/mutations.generated'; +import { EntityType } from '@types'; const MenuItem = styled.div` font-size: 13px; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx index ec6a3186e0..6240d3420b 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx @@ -1,16 +1,17 @@ import { MoreOutlined } from '@ant-design/icons'; import React, { useContext } from 'react'; import styled from 'styled-components'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import DeleteEntityMenuItem from '@app/entityV2/shared/EntityDropdown/DeleteEntityMenuAction'; +import ExternalUrlMenuAction from '@app/entityV2/shared/EntityDropdown/ExternalUrlMenuAction'; +import MoreOptionsMenuAction from '@app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction'; +import MoveEntityMenuAction from '@app/entityV2/shared/EntityDropdown/MoveEntityMenuAction'; +import RaiseIncidentMenuAction from '@app/entityV2/shared/EntityDropdown/RaiseIncidentMenuAction'; +import UpdateDeprecationMenuAction from '@app/entityV2/shared/EntityDropdown/UpdateDeprecationMenuAction'; +import ShareMenuAction from '@app/shared/share/v2/ShareMenuAction'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; import { useAppConfig } from '@src/app/useAppConfig'; -import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext'; -import ShareMenuAction from '../../../shared/share/v2/ShareMenuAction'; -import EntitySidebarContext from '../../../sharedV2/EntitySidebarContext'; -import DeleteEntityMenuItem from './DeleteEntityMenuAction'; -import ExternalUrlMenuAction from './ExternalUrlMenuAction'; -import MoreOptionsMenuAction from './MoreOptionsMenuAction'; -import MoveEntityMenuAction from './MoveEntityMenuAction'; -import RaiseIncidentMenuAction from './RaiseIncidentMenuAction'; -import UpdateDeprecationMenuAction from './UpdateDeprecationMenuAction'; export enum EntityMenuItems { EXTERNAL_URL, diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/ExternalUrlMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/ExternalUrlMenuAction.tsx index e0841a61a6..776f7fc77c 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/ExternalUrlMenuAction.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/ExternalUrlMenuAction.tsx @@ -1,5 +1,6 @@ -import ViewInPlatform from '@app/entityV2/shared/externalUrl/ViewInPlatform'; import React from 'react'; + +import ViewInPlatform from '@app/entityV2/shared/externalUrl/ViewInPlatform'; import { useEntityData } from '@src/app/entity/shared/EntityContext'; export default function ExternalUrlMenuAction() { diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction.tsx index a9e40637a0..1237a90a79 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction.tsx @@ -1,10 +1,12 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; import React from 'react'; -import { ActionMenuItem } from './styledComponents'; -import { EntityMenuItems } from './EntityMenuActions'; -import EntityDropdown from './EntityDropdown'; -import { EntityType } from '../../../../types.generated'; -import { EntityMenuActions } from '../../Entity'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { EntityMenuActions } from '@app/entityV2/Entity'; +import EntityDropdown from '@app/entityV2/shared/EntityDropdown/EntityDropdown'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { ActionMenuItem } from '@app/entityV2/shared/EntityDropdown/styledComponents'; + +import { EntityType } from '@types'; interface Props { menuItems: Set; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveDomainModal.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveDomainModal.tsx index 80cda20e5a..c58a6dfa69 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveDomainModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveDomainModal.tsx @@ -1,15 +1,17 @@ +import { Form, Modal, Typography, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { message, Modal, Typography, Form } from 'antd'; + +import { useDomainsContext } from '@app/domainV2/DomainsContext'; +import { useRefetch } from '@app/entity/shared/EntityContext'; +import DomainParentSelect from '@app/entityV2/shared/EntityDropdown/DomainParentSelect'; +import { useHandleMoveDomainComplete } from '@app/entityV2/shared/EntityDropdown/useHandleMoveDomainComplete'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { Button } from '@src/alchemy-components'; import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; -import { useRefetch } from '../../../entity/shared/EntityContext'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useMoveDomainMutation } from '../../../../graphql/domain.generated'; -import DomainParentSelect from './DomainParentSelect'; -import { useHandleMoveDomainComplete } from './useHandleMoveDomainComplete'; -import { EntityType } from '../../../../types.generated'; -import { useDomainsContext } from '../../../domainV2/DomainsContext'; + +import { useMoveDomainMutation } from '@graphql/domain.generated'; +import { EntityType } from '@types'; const StyledItem = styled(Form.Item)` margin-bottom: 0; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveEntityMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveEntityMenuAction.tsx index ddc61fd676..ecf90a3421 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveEntityMenuAction.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveEntityMenuAction.tsx @@ -1,15 +1,17 @@ -import React, { useState } from 'react'; import { FolderOpenOutlined } from '@ant-design/icons'; import { Tooltip } from '@components'; -import { useUserContext } from '../../../context/useUserContext'; -import MoveGlossaryEntityModal from './MoveGlossaryEntityModal'; -import MoveDomainModal from './MoveDomainModal'; -import { useIsNestedDomainsEnabled } from '../../../useAppConfig'; -import { isMoveDisabled } from './utils'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { EntityType } from '../../../../types.generated'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import { ActionMenuItem } from './styledComponents'; +import React, { useState } from 'react'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import MoveDomainModal from '@app/entityV2/shared/EntityDropdown/MoveDomainModal'; +import MoveGlossaryEntityModal from '@app/entityV2/shared/EntityDropdown/MoveGlossaryEntityModal'; +import { ActionMenuItem } from '@app/entityV2/shared/EntityDropdown/styledComponents'; +import { isMoveDisabled } from '@app/entityV2/shared/EntityDropdown/utils'; +import { useIsNestedDomainsEnabled } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; export default function MoveEntityMenuAction() { const { entityData, entityType, urn } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveGlossaryEntityModal.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveGlossaryEntityModal.tsx index 7fbd004937..250c01ff66 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveGlossaryEntityModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveGlossaryEntityModal.tsx @@ -1,16 +1,18 @@ +import { Form, Modal, Typography, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { message, Modal, Typography, Form } from 'antd'; -import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; + +import { useRefetch } from '@app/entity/shared/EntityContext'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import NodeParentSelect from '@app/entityV2/shared/EntityDropdown/NodeParentSelect'; +import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext'; +import { getGlossaryRootToUpdate, getParentNodeToUpdate, updateGlossarySidebar } from '@app/glossary/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { Button } from '@src/alchemy-components'; -import { useRefetch } from '../../../entity/shared/EntityContext'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useUpdateParentNodeMutation } from '../../../../graphql/glossary.generated'; -import NodeParentSelect from './NodeParentSelect'; -import { useGlossaryEntityData } from '../GlossaryEntityContext'; -import { getGlossaryRootToUpdate, getParentNodeToUpdate, updateGlossarySidebar } from '../../../glossary/utils'; -import { GenericEntityProperties } from '../../../entity/shared/types'; -import { EntityType } from '../../../../types.generated'; +import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; + +import { useUpdateParentNodeMutation } from '@graphql/glossary.generated'; +import { EntityType } from '@types'; const StyledItem = styled(Form.Item)` margin-bottom: 0; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/NodeParentSelect.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/NodeParentSelect.tsx index 10d4de2abb..6a8fa65071 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/NodeParentSelect.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/NodeParentSelect.tsx @@ -1,12 +1,14 @@ -import React from 'react'; import { Select } from 'antd'; -import { EntityType, GlossaryNode } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import ClickOutside from '../../../shared/ClickOutside'; -import GlossaryBrowser from '../../../glossary/GlossaryBrowser/GlossaryBrowser'; -import { BrowserWrapper } from '../../../shared/tags/AddTagsTermsModal'; -import useParentSelector from './useParentSelector'; +import React from 'react'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import useParentSelector from '@app/entityV2/shared/EntityDropdown/useParentSelector'; +import GlossaryBrowser from '@app/glossary/GlossaryBrowser/GlossaryBrowser'; +import ClickOutside from '@app/shared/ClickOutside'; +import { BrowserWrapper } from '@app/shared/tags/AddTagsTermsModal'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, GlossaryNode } from '@types'; // filter out entity itself and its children export function filterResultsForMove(entity: GlossaryNode, entityUrn: string) { diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/RaiseIncidentMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/RaiseIncidentMenuAction.tsx index f78b57e178..801f7153af 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/RaiseIncidentMenuAction.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/RaiseIncidentMenuAction.tsx @@ -1,13 +1,14 @@ -import React, { useState } from 'react'; import { WarningOutlined } from '@ant-design/icons'; import { Tooltip } from '@components'; +import React, { useState } from 'react'; import { useHistory } from 'react-router'; -import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext'; -import { ActionMenuItem } from './styledComponents'; -import { AddIncidentModal } from '../tabs/Incident/components/AddIncidentModal'; -import { getEntityPath } from '../containers/profile/utils'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useIsSeparateSiblingsMode } from '../useIsSeparateSiblingsMode'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { ActionMenuItem } from '@app/entityV2/shared/EntityDropdown/styledComponents'; +import { getEntityPath } from '@app/entityV2/shared/containers/profile/utils'; +import { AddIncidentModal } from '@app/entityV2/shared/tabs/Incident/components/AddIncidentModal'; +import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; +import { useEntityRegistry } from '@app/useEntityRegistry'; export default function RaiseIncidentMenuAction() { const { urn, entityType } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationMenuAction.tsx index 5e8eb11bb8..7a313023e0 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationMenuAction.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationMenuAction.tsx @@ -1,12 +1,14 @@ -import React, { useState } from 'react'; import { ExclamationCircleOutlined } from '@ant-design/icons'; -import { message } from 'antd'; import { Tooltip } from '@components'; -import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext'; -import { ActionMenuItem } from './styledComponents'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { UpdateDeprecationModal } from './UpdateDeprecationModal'; -import { useUpdateDeprecationMutation } from '../../../../graphql/mutations.generated'; +import { message } from 'antd'; +import React, { useState } from 'react'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { UpdateDeprecationModal } from '@app/entityV2/shared/EntityDropdown/UpdateDeprecationModal'; +import { ActionMenuItem } from '@app/entityV2/shared/EntityDropdown/styledComponents'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useUpdateDeprecationMutation } from '@graphql/mutations.generated'; export default function UpdateDeprecationMenuAction() { const { urn, entityData, entityType } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationModal.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationModal.tsx index b360f360a3..bbb777d30e 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationModal.tsx @@ -1,21 +1,23 @@ -import { DatePicker, Form, message, Modal, Select, Skeleton } from 'antd'; +import { DatePicker, Form, Modal, Select, Skeleton, message } from 'antd'; import TextArea from 'antd/lib/input/TextArea'; import dayjs from 'dayjs'; import React from 'react'; -import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; + +import { EntityCapabilityType } from '@app/entityV2/Entity'; +import { downgradeV2FieldPath } from '@app/entityV2/dataset/profile/schema/utils/utils'; +import { SearchSelectModal } from '@app/entityV2/shared/components/styled/search/SearchSelectModal'; +import { useGetEntityWithSchema } from '@app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema'; +import { generateSchemaFieldUrn } from '@app/entityV2/shared/tabs/Lineage/utils'; +import { handleBatchError } from '@app/entityV2/shared/utils'; +import { EntityLink } from '@app/homeV2/reference/sections/EntityLink'; +import { getV1FieldPathFromSchemaFieldUrn } from '@app/lineageV2/lineageUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { Button } from '@src/alchemy-components'; -import { useGetEntitiesQuery } from '../../../../graphql/entity.generated'; -import { useBatchUpdateDeprecationMutation } from '../../../../graphql/mutations.generated'; -import { ResourceRefInput, SubResourceType } from '../../../../types.generated'; -import { EntityLink } from '../../../homeV2/reference/sections/EntityLink'; -import { getV1FieldPathFromSchemaFieldUrn } from '../../../lineageV2/lineageUtils'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { downgradeV2FieldPath } from '../../dataset/profile/schema/utils/utils'; -import { EntityCapabilityType } from '../../Entity'; -import { SearchSelectModal } from '../components/styled/search/SearchSelectModal'; -import { useGetEntityWithSchema } from '../tabs/Dataset/Schema/useGetEntitySchema'; -import { generateSchemaFieldUrn } from '../tabs/Lineage/utils'; -import { handleBatchError } from '../utils'; +import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; + +import { useGetEntitiesQuery } from '@graphql/entity.generated'; +import { useBatchUpdateDeprecationMutation } from '@graphql/mutations.generated'; +import { ResourceRefInput, SubResourceType } from '@types'; type Props = { urns: string[]; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx index 53959d0d77..944fc2432e 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx @@ -1,5 +1,5 @@ -import { glossaryNode1, glossaryNode2, glossaryNode3, glossaryNode4 } from '../../../../../Mocks'; -import { filterResultsForMove } from '../NodeParentSelect'; +import { filterResultsForMove } from '@app/entityV2/shared/EntityDropdown/NodeParentSelect'; +import { glossaryNode1, glossaryNode2, glossaryNode3, glossaryNode4 } from '@src/Mocks'; describe('filterResultsForMove', () => { it('should return true if the given node is different than given urn and the node is not a child of the given urn', () => { diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/index.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/index.tsx index 096bc612d1..c048ca17aa 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/index.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/index.tsx @@ -1,3 +1,3 @@ -import EntityMenuActions from './EntityMenuActions'; +import EntityMenuActions from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; export default EntityMenuActions; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/styledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/styledComponents.tsx index bac9c8b649..8338cb0d5e 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/styledComponents.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/styledComponents.tsx @@ -1,6 +1,7 @@ -import styled from 'styled-components'; import { Button } from 'antd'; -import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '../constants'; +import styled from 'styled-components'; + +import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '@app/entityV2/shared/constants'; const MenuItem = styled.div` font-size: 12px; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteEntity.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteEntity.tsx index 9518837eae..866dbbd8f1 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteEntity.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteEntity.tsx @@ -1,13 +1,15 @@ +import { Modal, message } from 'antd'; import { useState } from 'react'; -import { message, Modal } from 'antd'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { getDeleteEntityMutation } from '../../../shared/deleteUtils'; -import analytics, { EventType } from '../../../analytics'; -import { useGlossaryEntityData } from '../GlossaryEntityContext'; -import { getParentNodeToUpdate, updateGlossarySidebar } from '../../../glossaryV2/utils'; -import { useHandleDeleteDomain } from './useHandleDeleteDomain'; -import { removeTermFromGlossaryNode } from '../../../glossaryV2/cacheUtils'; + +import analytics, { EventType } from '@app/analytics'; +import { useHandleDeleteDomain } from '@app/entityV2/shared/EntityDropdown/useHandleDeleteDomain'; +import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext'; +import { removeTermFromGlossaryNode } from '@app/glossaryV2/cacheUtils'; +import { getParentNodeToUpdate, updateGlossarySidebar } from '@app/glossaryV2/utils'; +import { getDeleteEntityMutation } from '@app/shared/deleteUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; /** * Performs the flow for deleting an entity of a given type. diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteGlossaryEntity.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteGlossaryEntity.tsx index df48205852..8edca65fe0 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteGlossaryEntity.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteGlossaryEntity.tsx @@ -1,8 +1,10 @@ -import { message, Modal } from 'antd'; +import { Modal, message } from 'antd'; import { useState } from 'react'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useDeleteGlossaryEntityMutation } from '../../../../graphql/glossary.generated'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useDeleteGlossaryEntityMutation } from '@graphql/glossary.generated'; function useDeleteGlossaryEntity() { const [hasBeenDeleted, setHasBeenDeleted] = useState(false); diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleDeleteDomain.ts b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleDeleteDomain.ts index 0d3df7fe91..e2caf58223 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleDeleteDomain.ts +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleDeleteDomain.ts @@ -1,7 +1,8 @@ import { useApolloClient } from '@apollo/client'; -import { GenericEntityProperties } from '../../../entity/shared/types'; -import { removeFromListDomainsCache } from '../../../domain/utils'; -import { useDomainsContext } from '../../../domain/DomainsContext'; + +import { useDomainsContext } from '@app/domain/DomainsContext'; +import { removeFromListDomainsCache } from '@app/domain/utils'; +import { GenericEntityProperties } from '@app/entity/shared/types'; interface DeleteDomainProps { entityData: GenericEntityProperties; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleMoveDomainComplete.ts b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleMoveDomainComplete.ts index 60763ccfb6..a8ea93e892 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleMoveDomainComplete.ts +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleMoveDomainComplete.ts @@ -1,9 +1,11 @@ import { useApolloClient } from '@apollo/client'; -import { removeFromListDomainsCache, updateListDomainsCache } from '../../../domain/utils'; -import { Domain } from '../../../../types.generated'; -import analytics from '../../../analytics/analytics'; -import { EventType } from '../../../analytics'; -import { useDomainsContext } from '../../../domainV2/DomainsContext'; + +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import { removeFromListDomainsCache, updateListDomainsCache } from '@app/domain/utils'; +import { useDomainsContext } from '@app/domainV2/DomainsContext'; + +import { Domain } from '@types'; export function useHandleMoveDomainComplete() { const client = useApolloClient(); diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useParentSelector.ts b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useParentSelector.ts index 360ae7164e..071d082c37 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useParentSelector.ts +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useParentSelector.ts @@ -1,8 +1,10 @@ import { useEffect, useState } from 'react'; -import { useGetAutoCompleteResultsLazyQuery } from '../../../../graphql/search.generated'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { GenericEntityProperties } from '../../../entity/shared/types'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetAutoCompleteResultsLazyQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; interface Props { entityType: EntityType; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/utils.ts b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/utils.ts index 8d4eb7b0ec..5a7b435858 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/utils.ts +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/utils.ts @@ -1,5 +1,6 @@ -import { EntityType, PlatformPrivileges } from '../../../../types.generated'; -import { GenericEntityProperties } from '../../../entity/shared/types'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + +import { EntityType, PlatformPrivileges } from '@types'; export function isDeleteDisabled( entityType: EntityType, diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/LinkAssetVersionModal.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/LinkAssetVersionModal.tsx index 482c74f2a7..4eea863a63 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/LinkAssetVersionModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/LinkAssetVersionModal.tsx @@ -1,14 +1,17 @@ -import analytics, { EventType } from '@app/analytics'; -import { EntitySearchInputV2 } from '@app/entityV2/shared/EntitySearchInput/EntitySearchInputV2'; -import { useEntityRegistry } from '@app/useEntityRegistry'; import { Input, Modal } from '@components'; -import { Label } from '@components/components/Input/components'; -import { useLinkAssetVersionMutation } from '@graphql/versioning.generated'; -import { Entity, EntityType } from '@types'; import { Form, message } from 'antd'; import React, { useState } from 'react'; import { v4 as uuidv4 } from 'uuid'; +import { Label } from '@components/components/Input/components'; + +import analytics, { EventType } from '@app/analytics'; +import { EntitySearchInputV2 } from '@app/entityV2/shared/EntitySearchInput/EntitySearchInputV2'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useLinkAssetVersionMutation } from '@graphql/versioning.generated'; +import { Entity, EntityType } from '@types'; + const ENTITY_FIELD_NAME = 'entity'; const LABEL_FIELD_NAME = 'label'; const COMMENT_FIELD_NAME = 'comment'; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/UnlinkAssetVersionModal.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/UnlinkAssetVersionModal.tsx index e978df6530..59116b5884 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/UnlinkAssetVersionModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/UnlinkAssetVersionModal.tsx @@ -1,11 +1,13 @@ -import analytics, { EventType } from '@app/analytics'; -import { useEntityRegistry } from '@app/useEntityRegistry'; import { Modal } from '@components'; -import { useUnlinkAssetVersionMutation } from '@graphql/versioning.generated'; -import { EntityType } from '@types'; import { message } from 'antd'; import React from 'react'; +import analytics, { EventType } from '@app/analytics'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useUnlinkAssetVersionMutation } from '@graphql/versioning.generated'; +import { EntityType } from '@types'; + interface Props { urn: string; entityType: EntityType; diff --git a/datahub-web-react/src/app/entityV2/shared/EntityGroups.tsx b/datahub-web-react/src/app/entityV2/shared/EntityGroups.tsx index 980a551a68..944d7c498a 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntityGroups.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntityGroups.tsx @@ -1,9 +1,11 @@ import { Tag } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; -import { EntityType, EntityRelationship } from '../../../types.generated'; -import { EmptyValue, TagsSection, Tags, GroupsSeeMoreText } from './SidebarStyledComponents'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { EmptyValue, GroupsSeeMoreText, Tags, TagsSection } from '@app/entityV2/shared/SidebarStyledComponents'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityRelationship, EntityType } from '@types'; type Props = { readMore: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInput.tsx b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInput.tsx index 6a11427af6..bae355b5ba 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInput.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInput.tsx @@ -1,11 +1,13 @@ -import { Select, Tag } from 'antd'; import { Tooltip } from '@components'; +import { Select, Tag } from 'antd'; import React, { useEffect, useState } from 'react'; -import { useGetEntitiesLazyQuery } from '../../../../graphql/entity.generated'; -import { useGetSearchResultsForMultipleLazyQuery } from '../../../../graphql/search.generated'; -import { Entity, EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { EntitySearchInputResult } from './EntitySearchInputResult'; + +import { EntitySearchInputResult } from '@app/entityV2/shared/EntitySearchInput/EntitySearchInputResult'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetEntitiesLazyQuery } from '@graphql/entity.generated'; +import { useGetSearchResultsForMultipleLazyQuery } from '@graphql/search.generated'; +import { Entity, EntityType } from '@types'; type Props = { selectedUrns: string[]; diff --git a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResult.tsx b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResult.tsx index ca30a13061..d95864cded 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResult.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResult.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; + +import { IconStyleType } from '@app/entityV2/Entity'; +import { useEntityRegistry } from '@app/useEntityRegistry'; type Props = { entity: any; diff --git a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2.tsx b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2.tsx index 03534433ad..0e4eb6c9cc 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2.tsx @@ -1,12 +1,14 @@ +import { Text } from '@components'; +import { Skeleton } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; + import { getDisplayedEntityType } from '@app/entityV2/shared/containers/profile/header/utils'; import ContextPath from '@app/previewV2/ContextPath'; import useContentTruncation from '@app/shared/useContentTruncation'; -import { Skeleton } from 'antd'; -import React from 'react'; import { useEntityRegistry } from '@app/useEntityRegistry'; -import { Text } from '@components'; + import { Entity } from '@types'; -import styled from 'styled-components'; const Wrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputV2.tsx b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputV2.tsx index f22ef413fd..d5413b7acf 100644 --- a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputV2.tsx +++ b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputV2.tsx @@ -1,7 +1,9 @@ -import AutoCompleteSelect from '@src/alchemy-components/components/Select/AutoCompleteSelect'; -import EntitySearchInputResultV2 from '@app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2'; import React, { useState } from 'react'; import { useDebounce } from 'react-use'; + +import EntitySearchInputResultV2 from '@app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2'; +import AutoCompleteSelect from '@src/alchemy-components/components/Select/AutoCompleteSelect'; + import { useGetAutoCompleteMultipleResultsLazyQuery, useGetSearchResultsForMultipleQuery, diff --git a/datahub-web-react/src/app/entityV2/shared/FilterSelect.tsx b/datahub-web-react/src/app/entityV2/shared/FilterSelect.tsx index 86881cf41f..badffe25c4 100644 --- a/datahub-web-react/src/app/entityV2/shared/FilterSelect.tsx +++ b/datahub-web-react/src/app/entityV2/shared/FilterSelect.tsx @@ -1,7 +1,8 @@ -import React, { useMemo, useCallback } from 'react'; +import capitalize from 'lodash/capitalize'; +import React, { useCallback, useMemo } from 'react'; + import { NestedSelect } from '@src/alchemy-components/components/Select/Nested/NestedSelect'; import { NestedSelectOption } from '@src/alchemy-components/components/Select/Nested/types'; -import capitalize from 'lodash/capitalize'; interface FilterOption { name: string; diff --git a/datahub-web-react/src/app/entityV2/shared/GlossaryEntityContext.tsx b/datahub-web-react/src/app/entityV2/shared/GlossaryEntityContext.tsx index 1e7275f4de..b12a5e33b8 100644 --- a/datahub-web-react/src/app/entityV2/shared/GlossaryEntityContext.tsx +++ b/datahub-web-react/src/app/entityV2/shared/GlossaryEntityContext.tsx @@ -1,5 +1,6 @@ import React, { useContext } from 'react'; -import { GenericEntityProperties } from '../../entity/shared/types'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; export interface GlossaryEntityContextType { isInGlossaryContext: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/GroupBySelect.tsx b/datahub-web-react/src/app/entityV2/shared/GroupBySelect.tsx index c8cc2f2823..d6b5a92e44 100644 --- a/datahub-web-react/src/app/entityV2/shared/GroupBySelect.tsx +++ b/datahub-web-react/src/app/entityV2/shared/GroupBySelect.tsx @@ -1,4 +1,5 @@ import React from 'react'; + import { SimpleSelect } from '@src/alchemy-components'; type Option = { diff --git a/datahub-web-react/src/app/entityV2/shared/PreviewContext.tsx b/datahub-web-react/src/app/entityV2/shared/PreviewContext.tsx index ec54127687..f4b2bc34b1 100644 --- a/datahub-web-react/src/app/entityV2/shared/PreviewContext.tsx +++ b/datahub-web-react/src/app/entityV2/shared/PreviewContext.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { GenericEntityProperties } from '../../entity/shared/types'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; const PreviewContext = React.createContext(null); export default PreviewContext; diff --git a/datahub-web-react/src/app/entityV2/shared/SidebarStyledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/SidebarStyledComponents.tsx index 376b6823a2..aacc8d1aa0 100644 --- a/datahub-web-react/src/app/entityV2/shared/SidebarStyledComponents.tsx +++ b/datahub-web-react/src/app/entityV2/shared/SidebarStyledComponents.tsx @@ -1,8 +1,9 @@ -import styled from 'styled-components'; -import { Row } from 'antd'; import DraftsOutlinedIcon from '@mui/icons-material/DraftsOutlined'; import EditOutlinedIcon from '@mui/icons-material/EditOutlined'; -import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from './constants'; +import { Row } from 'antd'; +import styled from 'styled-components'; + +import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; /** * Styled Components- Users and Groups Side bar component diff --git a/datahub-web-react/src/app/entityV2/shared/TableLoadingSkeleton.tsx b/datahub-web-react/src/app/entityV2/shared/TableLoadingSkeleton.tsx index 6f2412aaef..f7ff9179b1 100644 --- a/datahub-web-react/src/app/entityV2/shared/TableLoadingSkeleton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/TableLoadingSkeleton.tsx @@ -1,7 +1,8 @@ +import { Skeleton } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Skeleton } from 'antd'; -import { ANTD_GRAY } from './constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const Header = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/entityV2/shared/UrlButton.tsx b/datahub-web-react/src/app/entityV2/shared/UrlButton.tsx index a6f6da4a60..17099c93e6 100644 --- a/datahub-web-react/src/app/entityV2/shared/UrlButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/UrlButton.tsx @@ -1,6 +1,6 @@ -import React, { ReactNode } from 'react'; import { ArrowRightOutlined } from '@ant-design/icons'; import { Button } from 'antd'; +import React, { ReactNode } from 'react'; import styled from 'styled-components/macro'; const UrlButtonContainer = styled.span` diff --git a/datahub-web-react/src/app/entityV2/shared/__tests__/DeprecationPill.test.tsx b/datahub-web-react/src/app/entityV2/shared/__tests__/DeprecationPill.test.tsx index 5d024fbb3c..321f5b8700 100644 --- a/datahub-web-react/src/app/entityV2/shared/__tests__/DeprecationPill.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/__tests__/DeprecationPill.test.tsx @@ -1,8 +1,9 @@ import { MockedProvider } from '@apollo/client/testing'; -import { EntityType, SubResourceType } from '@src/types.generated'; import { fireEvent, render, screen, waitFor } from '@testing-library/react'; import React from 'react'; -import { DeprecationIcon } from '../components/styled/DeprecationIcon'; + +import { DeprecationIcon } from '@app/entityV2/shared/components/styled/DeprecationIcon'; +import { EntityType, SubResourceType } from '@src/types.generated'; describe('DeprecationPill', () => { const defaultProps = { diff --git a/datahub-web-react/src/app/entityV2/shared/__tests__/utils.test.ts b/datahub-web-react/src/app/entityV2/shared/__tests__/utils.test.ts index 913244d7f3..b89055b963 100644 --- a/datahub-web-react/src/app/entityV2/shared/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/entityV2/shared/__tests__/utils.test.ts @@ -1,27 +1,23 @@ -import { DataProduct, DatasetStatsSummary, EntityType } from '../../../../types.generated'; import { - dictToQueryStringParams, - getNumberWithOrdinal, - encodeComma, decodeComma, - notEmpty, - truncate, - singularizeCollectionName, + dictToQueryStringParams, + encodeComma, getDataProduct, - isOutputPort, - getPlatformName, - isListSubset, - urlEncodeUrn, - handleBatchError, getFineGrainedLineageWithSiblings, + getNumberWithOrdinal, + getPlatformName, + handleBatchError, + isListSubset, + isOutputPort, + notEmpty, + singularizeCollectionName, summaryHasStats, -} from '../utils'; -import { - mockEntityRelationShipResult, - mockFineGrainedLineages1, - mockRecord, - mockSearchResult, -} from '../../../../Mocks'; + truncate, + urlEncodeUrn, +} from '@app/entityV2/shared/utils'; +import { mockEntityRelationShipResult, mockFineGrainedLineages1, mockRecord, mockSearchResult } from '@src/Mocks'; + +import { DataProduct, DatasetStatsSummary, EntityType } from '@types'; describe('entity V2 utils test ->', () => { describe('dictToQueryStringParams ->', () => { diff --git a/datahub-web-react/src/app/entityV2/shared/announce/CreateEntityAnnouncementModal.tsx b/datahub-web-react/src/app/entityV2/shared/announce/CreateEntityAnnouncementModal.tsx index 47e119e11b..50e26ccc33 100644 --- a/datahub-web-react/src/app/entityV2/shared/announce/CreateEntityAnnouncementModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/announce/CreateEntityAnnouncementModal.tsx @@ -1,20 +1,22 @@ -import React, { useEffect, useState } from 'react'; import { Form, Input, Modal, Typography, message } from 'antd'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { Button, colors } from '@src/alchemy-components'; -import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; -import { useCreatePostMutation, useUpdatePostMutation } from '../../../../graphql/mutations.generated'; -import { MediaType, PostContentType, PostType, SubResourceType } from '../../../../types.generated'; -import { PostEntry } from '../../../settings/posts/PostsListColumns'; + +import { Editor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; +import { PostEntry } from '@app/settings/posts/PostsListColumns'; import { CREATE_POST_BUTTON_ID, LINK_FIELD_NAME, LOCATION_FIELD_NAME, TYPE_FIELD_NAME, -} from '../../../settings/posts/constants'; -import handleGraphQLError from '../../../shared/handleGraphQLError'; -import { useEnterKeyListener } from '../../../shared/useEnterKeyListener'; -import { Editor } from '../tabs/Documentation/components/editor/Editor'; +} from '@app/settings/posts/constants'; +import handleGraphQLError from '@app/shared/handleGraphQLError'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { Button, colors } from '@src/alchemy-components'; +import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; + +import { useCreatePostMutation, useUpdatePostMutation } from '@graphql/mutations.generated'; +import { MediaType, PostContentType, PostType, SubResourceType } from '@types'; const SubFormItem = styled(Form.Item)` margin-bottom: 24px; diff --git a/datahub-web-react/src/app/entityV2/shared/components/legacy/DescriptionModal.tsx b/datahub-web-react/src/app/entityV2/shared/components/legacy/DescriptionModal.tsx index 0b8cde0f1c..491c7c433c 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/legacy/DescriptionModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/legacy/DescriptionModal.tsx @@ -1,8 +1,9 @@ -import { Typography, Modal, Button, Form } from 'antd'; +import { Button, Form, Modal, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Editor } from '../../tabs/Documentation/components/editor/Editor'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { Editor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; const FormLabel = styled(Typography.Text)` font-size: 10px; diff --git a/datahub-web-react/src/app/entityV2/shared/components/legacy/Properties.tsx b/datahub-web-react/src/app/entityV2/shared/components/legacy/Properties.tsx index 7b0de67195..075c458e0a 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/legacy/Properties.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/legacy/Properties.tsx @@ -1,7 +1,8 @@ import { Space, Table, Typography } from 'antd'; -import React from 'react'; import { ColumnsType } from 'antd/es/table'; -import { StringMapEntry } from '../../../../../types.generated'; +import React from 'react'; + +import { StringMapEntry } from '@types'; export type Props = { properties: StringMapEntry[]; diff --git a/datahub-web-react/src/app/entityV2/shared/components/search/InlineListSearch.tsx b/datahub-web-react/src/app/entityV2/shared/components/search/InlineListSearch.tsx index c5e04ca4e9..1a849bf9d6 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/search/InlineListSearch.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/search/InlineListSearch.tsx @@ -1,6 +1,7 @@ import React from 'react'; + +import { MatchLabelText, SearchContainer, StyledInput } from '@app/entityV2/shared/components/search/styledComponents'; import { pluralize } from '@src/app/shared/textUtil'; -import { MatchLabelText, SearchContainer, StyledInput } from './styledComponents'; interface InlineListSearchProps { searchText: string; diff --git a/datahub-web-react/src/app/entityV2/shared/components/search/styledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/components/search/styledComponents.tsx index 2b98459d67..2e30a909f6 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/search/styledComponents.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/search/styledComponents.tsx @@ -1,6 +1,7 @@ import styled from 'styled-components'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; import { Input } from '@src/alchemy-components'; -import { REDESIGN_COLORS } from '../../constants'; export const StyledInput = styled(Input)` width: auto; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/AddLinkModal.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/AddLinkModal.tsx index ec9cbea608..88240d53b6 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/AddLinkModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/AddLinkModal.tsx @@ -1,12 +1,14 @@ -import React, { useState } from 'react'; -import { Button as AntButton, message, Modal, Form, Input } from 'antd'; import { PlusOutlined } from '@ant-design/icons'; +import { Button as AntButton, Form, Input, Modal, message } from 'antd'; +import React, { useState } from 'react'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData, useMutationUrn } from '@app/entity/shared/EntityContext'; import { Button } from '@src/alchemy-components'; import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; -import { useEntityData, useMutationUrn } from '../../../../entity/shared/EntityContext'; -import { useAddLinkMutation } from '../../../../../graphql/mutations.generated'; -import analytics, { EventType, EntityActionType } from '../../../../analytics'; -import { useUserContext } from '../../../../context/useUserContext'; + +import { useAddLinkMutation } from '@graphql/mutations.generated'; type AddLinkProps = { buttonProps?: Record; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/DeprecationIcon.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/DeprecationIcon.tsx index 9915fd6aae..920b356191 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/DeprecationIcon.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/DeprecationIcon.tsx @@ -1,19 +1,22 @@ +import { Tooltip, colors } from '@components'; +import { Divider, Modal, Typography, message } from 'antd'; +import { TooltipPlacement } from 'antd/es/tooltip'; +import moment from 'moment'; import React from 'react'; import styled from 'styled-components'; -import { colors, Tooltip } from '@components'; -import { Divider, Modal, Typography, message } from 'antd'; -import moment from 'moment'; -import { TooltipPlacement } from 'antd/es/tooltip'; + +import MarkAsDeprecatedButton from '@app/entityV2/shared/components/styled/MarkAsDeprecatedButton'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { EntityLink } from '@app/homeV2/reference/sections/EntityLink'; +import { getV1FieldPathFromSchemaFieldUrn } from '@app/lineageV2/lineageUtils'; +import { toLocalDateString } from '@app/shared/time/timeUtils'; import { Tooltip2 } from '@src/alchemy-components/components/Tooltip2'; import CompactMarkdownViewer from '@src/app/entity/shared/tabs/Documentation/components/CompactMarkdownViewer'; -import DeprecatedIcon from '../../../../../images/deprecated-status.svg?react'; -import { useBatchUpdateDeprecationMutation } from '../../../../../graphql/mutations.generated'; -import { Deprecation, SubResourceType } from '../../../../../types.generated'; -import { EntityLink } from '../../../../homeV2/reference/sections/EntityLink'; -import { getV1FieldPathFromSchemaFieldUrn } from '../../../../lineageV2/lineageUtils'; -import { toLocalDateString } from '../../../../shared/time/timeUtils'; -import { REDESIGN_COLORS } from '../../constants'; -import MarkAsDeprecatedButton from './MarkAsDeprecatedButton'; + +import { useBatchUpdateDeprecationMutation } from '@graphql/mutations.generated'; +import { Deprecation, SubResourceType } from '@types'; + +import DeprecatedIcon from '@images/deprecated-status.svg?react'; const DeprecatedContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/EmptyTab.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/EmptyTab.tsx index 679ba215a3..d2550c29c1 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/EmptyTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/EmptyTab.tsx @@ -1,8 +1,10 @@ +import { Empty, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Empty, Typography } from 'antd'; -import { EMPTY_MESSAGES } from '../../constants'; -import NoDocs from '../../../../../images/no-docs.svg'; + +import { EMPTY_MESSAGES } from '@app/entityV2/shared/constants'; + +import NoDocs from '@images/no-docs.svg'; const StyledEmpty = styled(Empty)<{ $hideImage?: boolean }>` padding: 40px; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActor.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActor.tsx index 8dbf5da7d2..993efcf90a 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActor.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActor.tsx @@ -1,11 +1,13 @@ -import { Tag } from 'antd'; import { Popover } from '@components'; +import { Tag } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { CorpGroup, CorpUser, EntityType } from '../../../../../types.generated'; -import { CustomAvatar } from '../../../../shared/avatar'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; + +import { CustomAvatar } from '@app/shared/avatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpGroup, CorpUser, EntityType } from '@types'; type Props = { actor: CorpUser | CorpGroup; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActorGroup.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActorGroup.tsx index 3afdfdf344..23c6f52fd8 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActorGroup.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActorGroup.tsx @@ -1,9 +1,11 @@ -import { Typography } from 'antd'; import { Popover } from '@components'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { CorpGroup, CorpUser } from '../../../../../types.generated'; -import { ExpandedActor } from './ExpandedActor'; + +import { ExpandedActor } from '@app/entityV2/shared/components/styled/ExpandedActor'; + +import { CorpGroup, CorpUser } from '@types'; const PopoverActors = styled.div` max-width: 600px; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx index f0fa26b9de..b5065cee61 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx @@ -1,15 +1,17 @@ -import { message, Modal, Tag } from 'antd'; +import { Modal, Tag, message } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import OwnerContent from '@app/entityV2/shared/components/styled/ExpandedOwner/OwnerContent'; +import { getNameFromType } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils'; +import { useEmbeddedProfileLinkProps } from '@app/shared/useEmbeddedProfileLinkProps'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { StyledLink } from '@src/app/previewV2/EntityHeader'; -import { useRemoveOwnerMutation } from '../../../../../../graphql/mutations.generated'; -import { EntityType, Owner } from '../../../../../../types.generated'; -import { getNameFromType } from '../../../containers/profile/sidebar/Ownership/ownershipUtils'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import analytics, { EventType, EntityActionType } from '../../../../../analytics'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import OwnerContent from './OwnerContent'; -import { useEmbeddedProfileLinkProps } from '../../../../../shared/useEmbeddedProfileLinkProps'; + +import { useRemoveOwnerMutation } from '@graphql/mutations.generated'; +import { EntityType, Owner } from '@types'; const OwnerTag = styled(Tag)` padding: 1px; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/OwnerContent.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/OwnerContent.tsx index 74003374b0..da92169506 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/OwnerContent.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/OwnerContent.tsx @@ -1,12 +1,17 @@ -import React from 'react'; -import { Typography } from 'antd'; import { Popover } from '@components'; +import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import { Owner } from '../../../../../../types.generated'; -import { CustomAvatar } from '../../../../../shared/avatar'; -import { getDescriptionFromType, getNameFromType } from '../../../containers/profile/sidebar/Ownership/ownershipUtils'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { REDESIGN_COLORS } from '../../../constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { + getDescriptionFromType, + getNameFromType, +} from '@app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils'; +import { CustomAvatar } from '@app/shared/avatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Owner } from '@types'; const TextWrapper = styled.span<{ fontSize?: number }>` ${(props) => props.fontSize && `font-size: ${props.fontSize}px;`} diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/InfoItem.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/InfoItem.tsx index 472b1c35f4..2f8a2b89a1 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/InfoItem.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/InfoItem.tsx @@ -1,7 +1,8 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const HeaderInfoItem = styled.div<{ onClick?: () => void; width?: string }>` display: inline-block; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton.tsx index 491ef922ff..8bbbe80ef4 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton.tsx @@ -1,7 +1,9 @@ import React from 'react'; import styled from 'styled-components'; + import { Button } from '@src/alchemy-components'; -import DeprecatedIcon from '../../../../../images/deprecated-status.svg?react'; + +import DeprecatedIcon from '@images/deprecated-status.svg?react'; const StyledButton = styled(Button)` padding: 4px; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/SeeMore.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/SeeMore.tsx index 289e39b66d..fa7b726c63 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/SeeMore.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/SeeMore.tsx @@ -1,6 +1,7 @@ import { Button } from 'antd'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; export const SeeMore = styled(Button)` margin-top: -20px; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StatsSummary.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StatsSummary.tsx index afeee7b506..e354088d32 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/StatsSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/StatsSummary.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; type Props = { stats: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledMDEditor.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledMDEditor.tsx index 6ff965cd4c..d0453ec853 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledMDEditor.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledMDEditor.tsx @@ -1,6 +1,7 @@ import MDEditor from '@uiw/react-md-editor'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; export default styled(MDEditor)` height: calc(100% - 46px) !important; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTable.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTable.tsx index 30378f69ed..5ea962bcdd 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTable.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTable.tsx @@ -1,6 +1,7 @@ import { Table } from 'antd'; import styled from 'styled-components'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../constants'; + +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; export const StyledTable = styled(Table)` overflow: inherit; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTag.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTag.tsx index 539e17bc70..3bff765329 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTag.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTag.tsx @@ -1,7 +1,8 @@ import { Tag } from 'antd'; -import styled, { css } from 'styled-components'; import ColorHash from 'color-hash'; -import { REDESIGN_COLORS } from '../../constants'; +import styled, { css } from 'styled-components'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; export const generateColor = new ColorHash({ saturation: 0.9, diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/TabToolbar.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/TabToolbar.tsx index c1cd5af4af..ded14a8d81 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/TabToolbar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/TabToolbar.tsx @@ -1,5 +1,6 @@ import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; export default styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/DownloadAsCsvModal.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/DownloadAsCsvModal.tsx index fab97d7377..7ec9f4f6e1 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/DownloadAsCsvModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/DownloadAsCsvModal.tsx @@ -1,14 +1,19 @@ +import { LoadingOutlined } from '@ant-design/icons'; +import { Button, Input, Modal, Spin, notification } from 'antd'; import React, { useState } from 'react'; import { useLocation } from 'react-router'; -import { Button, Input, Modal, Spin, notification } from 'antd'; -import { LoadingOutlined } from '@ant-design/icons'; -import { AndFilterInput } from '../../../../../../types.generated'; -import { getSearchCsvDownloadHeader, transformResultsToCsvRow } from './downloadAsCsvUtil'; -import { downloadRowsAsCsv } from '../../../../../search/utils/csvUtils'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import analytics, { EventType } from '../../../../../analytics'; -import { DownloadSearchResultsInput, DownloadSearchResults } from '../../../../../search/utils/types'; + +import analytics, { EventType } from '@app/analytics'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { + getSearchCsvDownloadHeader, + transformResultsToCsvRow, +} from '@app/entityV2/shared/components/styled/search/downloadAsCsvUtil'; +import { downloadRowsAsCsv } from '@app/search/utils/csvUtils'; +import { DownloadSearchResults, DownloadSearchResultsInput } from '@app/search/utils/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { AndFilterInput } from '@types'; type Props = { downloadSearchResults: (input: DownloadSearchResultsInput) => Promise; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearch.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearch.tsx index b8d47ba4d4..36234ccf76 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearch.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearch.tsx @@ -1,13 +1,35 @@ import { ApolloError } from '@apollo/client'; -import { combineOrFilters } from '@src/app/searchV2/utils/filterUtils'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { SearchCfg } from '../../../../../../conf'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityContext } from '@app/entity/shared/EntityContext'; +import { EntityAndType } from '@app/entity/shared/types'; +import EmbeddedListSearchHeader from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchHeader'; +import { EmbeddedListSearchResults } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchResults'; +import { EntityActionProps } from '@app/entityV2/shared/components/styled/search/EntitySearchResults'; import { - useGetSearchCountQuery, - useGetSearchResultsForMultipleQuery, -} from '../../../../../../graphql/search.generated'; -import { useGetViewQuery } from '../../../../../../graphql/view.generated'; + FilterSet, + GetSearchResultsParams, + SearchResultsInterface, +} from '@app/entityV2/shared/components/styled/search/types'; +import { isListSubset } from '@app/entityV2/shared/utils'; +import { DEGREE_FILTER_NAME, UnionType } from '@app/search/utils/constants'; +import { mergeFilterSets } from '@app/search/utils/filterUtils'; +import { generateOrFilters } from '@app/search/utils/generateOrFilters'; +import { + DownloadSearchResults, + DownloadSearchResultsInput, + DownloadSearchResultsParams, +} from '@app/search/utils/types'; +import { useDownloadScrollAcrossEntitiesSearchResults } from '@app/search/utils/useDownloadScrollAcrossEntitiesSearchResults'; +import { Message } from '@app/shared/Message'; +import { combineOrFilters } from '@src/app/searchV2/utils/filterUtils'; +import { SearchCfg } from '@src/conf'; + +import { useGetSearchCountQuery, useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { useGetViewQuery } from '@graphql/view.generated'; import { AndFilterInput, EntityType, @@ -16,26 +38,7 @@ import { SearchAcrossEntitiesInput, SearchFlags, SortCriterion, -} from '../../../../../../types.generated'; -import analytics, { EventType } from '../../../../../analytics'; -import { useUserContext } from '../../../../../context/useUserContext'; -import { useEntityContext } from '../../../../../entity/shared/EntityContext'; -import { EntityAndType } from '../../../../../entity/shared/types'; -import { DEGREE_FILTER_NAME, UnionType } from '../../../../../search/utils/constants'; -import { mergeFilterSets } from '../../../../../search/utils/filterUtils'; -import { generateOrFilters } from '../../../../../search/utils/generateOrFilters'; -import { - DownloadSearchResults, - DownloadSearchResultsInput, - DownloadSearchResultsParams, -} from '../../../../../search/utils/types'; -import { useDownloadScrollAcrossEntitiesSearchResults } from '../../../../../search/utils/useDownloadScrollAcrossEntitiesSearchResults'; -import { Message } from '../../../../../shared/Message'; -import { isListSubset } from '../../../utils'; -import EmbeddedListSearchHeader from './EmbeddedListSearchHeader'; -import { EmbeddedListSearchResults } from './EmbeddedListSearchResults'; -import { EntityActionProps } from './EntitySearchResults'; -import { FilterSet, GetSearchResultsParams, SearchResultsInterface } from './types'; +} from '@types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchEmbed.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchEmbed.tsx index 7e9e8e7aea..b7724fce64 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchEmbed.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchEmbed.tsx @@ -1,16 +1,22 @@ -import React, { useState } from 'react'; import { ApolloError } from '@apollo/client'; -import useSortInput from '@src/app/searchV2/sorting/useSortInput'; -import { useSelectedSortOption } from '@src/app/search/context/SearchContext'; -import { FacetFilterInput } from '../../../../../../types.generated'; -import { FilterSet, GetSearchResultsParams, SearchResultsInterface } from './types'; -import { EmbeddedListSearch } from './EmbeddedListSearch'; -import { UnionType } from '../../../../../search/utils/constants'; +import React, { useState } from 'react'; + +import { EmbeddedListSearch } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearch'; +import { + FilterSet, + GetSearchResultsParams, + SearchResultsInterface, +} from '@app/entityV2/shared/components/styled/search/types'; +import { UnionType } from '@app/search/utils/constants'; import { DownloadSearchResults, DownloadSearchResultsInput, DownloadSearchResultsParams, -} from '../../../../../search/utils/types'; +} from '@app/search/utils/types'; +import { useSelectedSortOption } from '@src/app/search/context/SearchContext'; +import useSortInput from '@src/app/searchV2/sorting/useSortInput'; + +import { FacetFilterInput } from '@types'; type Props = { emptySearchQuery?: string | null; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchHeader.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchHeader.tsx index d83e0a6c24..f2fa1c3c29 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchHeader.tsx @@ -1,17 +1,19 @@ -import React from 'react'; -import { Button, Typography } from 'antd'; import { FilterOutlined } from '@ant-design/icons'; +import { Button, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import SearchSortSelect from '@src/app/searchV2/sorting/SearchSortSelect'; + +import { EntityAndType } from '@app/entity/shared/types'; +import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar'; +import { SearchSelectBar } from '@app/entityV2/shared/components/styled/search/SearchSelectBar'; +import { SearchBar } from '@app/search/SearchBar'; +import { DownloadSearchResults, DownloadSearchResultsInput } from '@app/search/utils/types'; +import SearchMenuItems from '@app/sharedV2/search/SearchMenuItems'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { useSearchContext } from '@src/app/search/context/SearchContext'; -import TabToolbar from '../TabToolbar'; -import { SearchBar } from '../../../../../search/SearchBar'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { AndFilterInput } from '../../../../../../types.generated'; -import { SearchSelectBar } from './SearchSelectBar'; -import { EntityAndType } from '../../../../../entity/shared/types'; -import { DownloadSearchResultsInput, DownloadSearchResults } from '../../../../../search/utils/types'; -import SearchMenuItems from '../../../../../sharedV2/search/SearchMenuItems'; +import SearchSortSelect from '@src/app/searchV2/sorting/SearchSortSelect'; + +import { AndFilterInput } from '@types'; const HeaderContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchModal.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchModal.tsx index 6fbf8a2a90..5bbc20d5cc 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchModal.tsx @@ -1,18 +1,14 @@ -import React, { useState } from 'react'; import { Modal } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; + +import { EmbeddedListSearch } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearch'; +import { EntityActionProps } from '@app/entityV2/shared/components/styled/search/EntitySearchResults'; +import { FilterSet } from '@app/entityV2/shared/components/styled/search/types'; +import { UnionType } from '@app/search/utils/constants'; import { Button } from '@src/alchemy-components'; -import { - AndFilterInput, - EntityType, - FacetFilterInput, - SearchFlags, - SortCriterion, -} from '../../../../../../types.generated'; -import { EmbeddedListSearch } from './EmbeddedListSearch'; -import { UnionType } from '../../../../../search/utils/constants'; -import { FilterSet } from './types'; -import { EntityActionProps } from './EntitySearchResults'; + +import { AndFilterInput, EntityType, FacetFilterInput, SearchFlags, SortCriterion } from '@types'; const SearchContainer = styled.div<{ height?: string }>` height: ${(props) => props.height || '500px'}; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchResults.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchResults.tsx index c82b04bc1f..40ab7fa16e 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchResults.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchResults.tsx @@ -3,21 +3,21 @@ import LanguageIcon from '@mui/icons-material/Language'; import { Pagination, Spin, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { SearchCfg } from '../../../../../../conf'; + +import { EntityAndType } from '@app/entity/shared/types'; import { - DataHubView, - FacetFilterInput, - FacetMetadata, - SearchResults as SearchResultType, -} from '../../../../../../types.generated'; -import { EntityAndType } from '../../../../../entity/shared/types'; -import { SearchFiltersSection } from '../../../../../search/SearchFiltersSection'; -import { UnionType } from '../../../../../search/utils/constants'; -import { combineSiblingsInSearchResults } from '../../../../../searchV2/utils/combineSiblingsInSearchResults'; -import { useIsShowSeparateSiblingsEnabled } from '../../../../../useAppConfig'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../constants'; -import { EntityActionProps, EntitySearchResults } from './EntitySearchResults'; -import MatchingViewsLabel from './MatchingViewsLabel'; + EntityActionProps, + EntitySearchResults, +} from '@app/entityV2/shared/components/styled/search/EntitySearchResults'; +import MatchingViewsLabel from '@app/entityV2/shared/components/styled/search/MatchingViewsLabel'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SearchFiltersSection } from '@app/search/SearchFiltersSection'; +import { UnionType } from '@app/search/utils/constants'; +import { combineSiblingsInSearchResults } from '@app/searchV2/utils/combineSiblingsInSearchResults'; +import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig'; +import { SearchCfg } from '@src/conf'; + +import { DataHubView, FacetFilterInput, FacetMetadata, SearchResults as SearchResultType } from '@types'; const SearchBody = styled.div` height: 100%; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchSection.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchSection.tsx index e2307d8b3c..b8e998454e 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchSection.tsx @@ -1,22 +1,28 @@ -import React from 'react'; -import * as QueryString from 'query-string'; -import { useHistory, useLocation } from 'react-router'; import { ApolloError } from '@apollo/client'; -import useSortInput from '@src/app/searchV2/sorting/useSortInput'; -import { useSelectedSortOption } from '@src/app/search/context/SearchContext'; -import { FacetFilterInput } from '../../../../../../types.generated'; -import useFilters from '../../../../../search/utils/useFilters'; -import { navigateToEntitySearchUrl } from './navigateToEntitySearchUrl'; -import { FilterSet, GetSearchResultsParams, SearchResultsInterface } from './types'; -import { useEntityQueryParams } from '../../../containers/profile/utils'; -import { EmbeddedListSearch } from './EmbeddedListSearch'; -import { EMBEDDED_LIST_SEARCH_ENTITY_TYPES, UnionType } from '../../../../../search/utils/constants'; +import * as QueryString from 'query-string'; +import React from 'react'; +import { useHistory, useLocation } from 'react-router'; + +import { EmbeddedListSearch } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearch'; +import { navigateToEntitySearchUrl } from '@app/entityV2/shared/components/styled/search/navigateToEntitySearchUrl'; +import { + FilterSet, + GetSearchResultsParams, + SearchResultsInterface, +} from '@app/entityV2/shared/components/styled/search/types'; +import { useEntityQueryParams } from '@app/entityV2/shared/containers/profile/utils'; +import { decodeComma } from '@app/entityV2/shared/utils'; +import { EMBEDDED_LIST_SEARCH_ENTITY_TYPES, UnionType } from '@app/search/utils/constants'; import { DownloadSearchResults, DownloadSearchResultsInput, DownloadSearchResultsParams, -} from '../../../../../search/utils/types'; -import { decodeComma } from '../../../utils'; +} from '@app/search/utils/types'; +import useFilters from '@app/search/utils/useFilters'; +import { useSelectedSortOption } from '@src/app/search/context/SearchContext'; +import useSortInput from '@src/app/searchV2/sorting/useSortInput'; + +import { FacetFilterInput } from '@types'; const FILTER = 'filter'; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EntitySearchResults.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EntitySearchResults.tsx index c974e21412..dd94b4014f 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EntitySearchResults.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EntitySearchResults.tsx @@ -1,13 +1,15 @@ import { Checkbox, Empty, List } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Entity, EntityPath, EntityType, SearchResult } from '../../../../../../types.generated'; -import { useSearchContext } from '../../../../../search/context/SearchContext'; -import { MATCHES_CONTAINER_HEIGHT } from '../../../../../searchV2/SearchResultList'; -import { MatchContextContainer } from '../../../../../searchV2/matches/MatchContextContainer'; -import { PreviewSection } from '../../../../../shared/MatchesContext'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { useInitializeColumnLineageCards } from './useInitializeColumnLineageCards'; + +import { useInitializeColumnLineageCards } from '@app/entityV2/shared/components/styled/search/useInitializeColumnLineageCards'; +import { useSearchContext } from '@app/search/context/SearchContext'; +import { MATCHES_CONTAINER_HEIGHT } from '@app/searchV2/SearchResultList'; +import { MatchContextContainer } from '@app/searchV2/matches/MatchContextContainer'; +import { PreviewSection } from '@app/shared/MatchesContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, EntityPath, EntityType, SearchResult } from '@types'; export const StyledList = styled(List)` height: 100%; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/MatchingViewsLabel.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/MatchingViewsLabel.tsx index 9628a369a8..954f1133fb 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/MatchingViewsLabel.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/MatchingViewsLabel.tsx @@ -1,8 +1,10 @@ -import React from 'react'; import { Button, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; -import { DataHubView } from '../../../../../../types.generated'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; + +import { DataHubView } from '@types'; const StyledMatchingViewsLabel = styled.div` color: ${ANTD_GRAY[8]}; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelect.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelect.tsx index 0f54be2cc1..71e1150cfd 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelect.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelect.tsx @@ -1,23 +1,24 @@ import { FilterOutlined } from '@ant-design/icons'; -import { Button, message, Typography } from 'antd'; +import { Button, Typography, message } from 'antd'; import React, { useState } from 'react'; import { useDebounce } from 'react-use'; import styled from 'styled-components'; +import { EntityAndType } from '@app/entity/shared/types'; +import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar'; +import { EmbeddedListSearchResults } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchResults'; +import { SearchSelectBar } from '@app/entityV2/shared/components/styled/search/SearchSelectBar'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { isListSubset } from '@app/entityV2/shared/utils'; +import { SearchBar } from '@app/search/SearchBar'; +import { ENTITY_FILTER_NAME, UnionType } from '@app/search/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import SearchSortSelect from '@src/app/searchV2/sorting/SearchSortSelect'; import useSortInput from '@src/app/searchV2/sorting/useSortInput'; -import { SearchCfg } from '../../../../../../conf'; -import { useGetSearchResultsForMultipleQuery } from '../../../../../../graphql/search.generated'; -import { Entity, EntityType, FacetFilterInput, FilterOperator } from '../../../../../../types.generated'; -import { EntityAndType } from '../../../../../entity/shared/types'; -import { SearchBar } from '../../../../../search/SearchBar'; -import { ENTITY_FILTER_NAME, UnionType } from '../../../../../search/utils/constants'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../../constants'; -import { isListSubset } from '../../../utils'; -import TabToolbar from '../TabToolbar'; -import { EmbeddedListSearchResults } from './EmbeddedListSearchResults'; -import { SearchSelectBar } from './SearchSelectBar'; +import { SearchCfg } from '@src/conf'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { Entity, EntityType, FacetFilterInput, FilterOperator } from '@types'; const Container = styled.span` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectActions.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectActions.tsx index 6f0f34346f..3eb7bdfdd0 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectActions.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectActions.tsx @@ -1,16 +1,18 @@ import React from 'react'; -import OwnersDropdown from './action/OwnersDropdown'; -import GlossaryTermDropdown from './action/GlossaryTermsDropdown'; -import TagsDropdown from './action/TagsDropdown'; -import DomainDropdown from './action/DomainsDropdown'; -import DeprecationDropdown from './action/DeprecationDropdown'; -import DeleteDropdown from './action/DeleteDropdown'; -import DataProductsDropdown from './action/DataProductsDropdown'; -import { EntityType } from '../../../../../../types.generated'; -import { EntityCapabilityType } from '../../../../Entity'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { EntityAndType } from '../../../../../entity/shared/types'; -import { SelectActionGroups } from './types'; + +import { EntityAndType } from '@app/entity/shared/types'; +import { EntityCapabilityType } from '@app/entityV2/Entity'; +import DataProductsDropdown from '@app/entityV2/shared/components/styled/search/action/DataProductsDropdown'; +import DeleteDropdown from '@app/entityV2/shared/components/styled/search/action/DeleteDropdown'; +import DeprecationDropdown from '@app/entityV2/shared/components/styled/search/action/DeprecationDropdown'; +import DomainDropdown from '@app/entityV2/shared/components/styled/search/action/DomainsDropdown'; +import GlossaryTermDropdown from '@app/entityV2/shared/components/styled/search/action/GlossaryTermsDropdown'; +import OwnersDropdown from '@app/entityV2/shared/components/styled/search/action/OwnersDropdown'; +import TagsDropdown from '@app/entityV2/shared/components/styled/search/action/TagsDropdown'; +import { SelectActionGroups } from '@app/entityV2/shared/components/styled/search/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; /** * The set of action groups that are visible by default. diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectBar.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectBar.tsx index 0401dc0a7a..3faed75b41 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectBar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectBar.tsx @@ -1,9 +1,10 @@ import { Button, Checkbox, Modal, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; + +import { EntityAndType } from '@app/entity/shared/types'; +import { SearchSelectActions } from '@app/entityV2/shared/components/styled/search/SearchSelectActions'; import { useEntityFormContext } from '@src/app/entity/shared/entityForm/EntityFormContext'; -import { EntityAndType } from '../../../../../entity/shared/types'; -import { SearchSelectActions } from './SearchSelectActions'; const CheckboxContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectModal.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectModal.tsx index 730765e2c1..52cbd7c4bf 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectModal.tsx @@ -1,10 +1,12 @@ -import React, { useState } from 'react'; import { Button, Modal } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; -import { EntityType } from '../../../../../../types.generated'; -import ClickOutside from '../../../../../shared/ClickOutside'; -import { EntityAndType } from '../../../../../entity/shared/types'; -import { SearchSelect } from './SearchSelect'; + +import { EntityAndType } from '@app/entity/shared/types'; +import { SearchSelect } from '@app/entityV2/shared/components/styled/search/SearchSelect'; +import ClickOutside from '@app/shared/ClickOutside'; + +import { EntityType } from '@types'; const StyledModal = styled(Modal)` top: 30px; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectUrnInput.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectUrnInput.tsx index 23f9ac206c..bc181746f8 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectUrnInput.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectUrnInput.tsx @@ -1,3 +1,7 @@ +import { Skeleton } from 'antd'; +import React, { useEffect, useMemo, useState } from 'react'; +import styled from 'styled-components'; + import { Icon } from '@src/alchemy-components'; import { EntityAndType } from '@src/app/entity/shared/types'; import { extractTypeFromUrn } from '@src/app/entity/shared/utils'; @@ -5,9 +9,6 @@ import { SearchSelect } from '@src/app/entityV2/shared/components/styled/search/ import { useHydratedEntityMap } from '@src/app/entityV2/shared/tabs/Properties/useHydratedEntityMap'; import { EntityLink } from '@src/app/homeV2/reference/sections/EntityLink'; import { EntityType } from '@src/types.generated'; -import { Skeleton } from 'antd'; -import React, { useEffect, useMemo, useState } from 'react'; -import styled from 'styled-components'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/ActionDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/ActionDropdown.tsx index 2ab7dac445..5b826f8059 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/ActionDropdown.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/ActionDropdown.tsx @@ -1,10 +1,11 @@ -import React from 'react'; -import { Button, Dropdown, Menu } from 'antd'; -import { Tooltip } from '@components'; import { CaretDownOutlined } from '@ant-design/icons'; -import styled from 'styled-components'; +import { Tooltip } from '@components'; +import { Button, Dropdown, Menu } from 'antd'; import MenuItem from 'antd/lib/menu/MenuItem'; -import { ANTD_GRAY } from '../../../../constants'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const DownArrow = styled(CaretDownOutlined)` && { diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DataProductsDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DataProductsDropdown.tsx index 08dab767fa..9adbd24126 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DataProductsDropdown.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DataProductsDropdown.tsx @@ -1,9 +1,11 @@ -import { message, Modal } from 'antd'; +import { Modal, message } from 'antd'; import React, { useState } from 'react'; -import ActionDropdown from './ActionDropdown'; -import { handleBatchError } from '../../../../utils'; -import { useBatchSetDataProductMutation } from '../../../../../../../graphql/dataProduct.generated'; -import SetDataProductModal from '../../../../containers/profile/sidebar/DataProduct/SetDataProductModal'; + +import ActionDropdown from '@app/entityV2/shared/components/styled/search/action/ActionDropdown'; +import SetDataProductModal from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/SetDataProductModal'; +import { handleBatchError } from '@app/entityV2/shared/utils'; + +import { useBatchSetDataProductMutation } from '@graphql/dataProduct.generated'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeleteDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeleteDropdown.tsx index c79d43a21e..d076dca6cc 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeleteDropdown.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeleteDropdown.tsx @@ -1,8 +1,10 @@ -import { message, Modal } from 'antd'; +import { Modal, message } from 'antd'; import React from 'react'; -import { useBatchUpdateSoftDeletedMutation } from '../../../../../../../graphql/mutations.generated'; -import ActionDropdown from './ActionDropdown'; -import { handleBatchError } from '../../../../utils'; + +import ActionDropdown from '@app/entityV2/shared/components/styled/search/action/ActionDropdown'; +import { handleBatchError } from '@app/entityV2/shared/utils'; + +import { useBatchUpdateSoftDeletedMutation } from '@graphql/mutations.generated'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeprecationDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeprecationDropdown.tsx index 981a1a8a0d..4f93cab1c5 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeprecationDropdown.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeprecationDropdown.tsx @@ -1,9 +1,11 @@ -import { message, Modal } from 'antd'; +import { Modal, message } from 'antd'; import React, { useState } from 'react'; -import { useBatchUpdateDeprecationMutation } from '../../../../../../../graphql/mutations.generated'; -import { UpdateDeprecationModal } from '../../../../EntityDropdown/UpdateDeprecationModal'; -import ActionDropdown from './ActionDropdown'; -import { handleBatchError } from '../../../../utils'; + +import { UpdateDeprecationModal } from '@app/entityV2/shared/EntityDropdown/UpdateDeprecationModal'; +import ActionDropdown from '@app/entityV2/shared/components/styled/search/action/ActionDropdown'; +import { handleBatchError } from '@app/entityV2/shared/utils'; + +import { useBatchUpdateDeprecationMutation } from '@graphql/mutations.generated'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DomainsDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DomainsDropdown.tsx index ad9c58c67d..bd68136b25 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DomainsDropdown.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DomainsDropdown.tsx @@ -1,9 +1,11 @@ -import { message, Modal } from 'antd'; +import { Modal, message } from 'antd'; import React, { useState } from 'react'; -import { useBatchSetDomainMutation } from '../../../../../../../graphql/mutations.generated'; -import { SetDomainModal } from '../../../../containers/profile/sidebar/Domain/SetDomainModal'; -import ActionDropdown from './ActionDropdown'; -import { handleBatchError } from '../../../../utils'; + +import ActionDropdown from '@app/entityV2/shared/components/styled/search/action/ActionDropdown'; +import { SetDomainModal } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SetDomainModal'; +import { handleBatchError } from '@app/entityV2/shared/utils'; + +import { useBatchSetDomainMutation } from '@graphql/mutations.generated'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/GlossaryTermsDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/GlossaryTermsDropdown.tsx index 9083567d0f..b4e553074e 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/GlossaryTermsDropdown.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/GlossaryTermsDropdown.tsx @@ -1,7 +1,9 @@ import React, { useState } from 'react'; -import { EntityType } from '../../../../../../../types.generated'; -import EditTagTermsModal, { OperationType } from '../../../../../../shared/tags/AddTagsTermsModal'; -import ActionDropdown from './ActionDropdown'; + +import ActionDropdown from '@app/entityV2/shared/components/styled/search/action/ActionDropdown'; +import EditTagTermsModal, { OperationType } from '@app/shared/tags/AddTagsTermsModal'; + +import { EntityType } from '@types'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/OwnersDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/OwnersDropdown.tsx index 5482d287ad..459f098f55 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/OwnersDropdown.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/OwnersDropdown.tsx @@ -1,6 +1,10 @@ import React, { useState } from 'react'; -import { EditOwnersModal, OperationType } from '../../../../containers/profile/sidebar/Ownership/EditOwnersModal'; -import ActionDropdown from './ActionDropdown'; + +import ActionDropdown from '@app/entityV2/shared/components/styled/search/action/ActionDropdown'; +import { + EditOwnersModal, + OperationType, +} from '@app/entityV2/shared/containers/profile/sidebar/Ownership/EditOwnersModal'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/TagsDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/TagsDropdown.tsx index 94dcd4d245..129af8a473 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/TagsDropdown.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/TagsDropdown.tsx @@ -1,7 +1,9 @@ import React, { useState } from 'react'; -import { EntityType } from '../../../../../../../types.generated'; -import EditTagTermsModal, { OperationType } from '../../../../../../shared/tags/AddTagsTermsModal'; -import ActionDropdown from './ActionDropdown'; + +import ActionDropdown from '@app/entityV2/shared/components/styled/search/action/ActionDropdown'; +import EditTagTermsModal, { OperationType } from '@app/shared/tags/AddTagsTermsModal'; + +import { EntityType } from '@types'; type Props = { urns: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/downloadAsCsvUtil.ts b/datahub-web-react/src/app/entityV2/shared/components/styled/search/downloadAsCsvUtil.ts index 8d0dc5d5de..755f7fbe4c 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/downloadAsCsvUtil.ts +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/downloadAsCsvUtil.ts @@ -1,8 +1,9 @@ -import { CorpGroup, CorpUser, EntityType } from '../../../../../../types.generated'; -import { capitalizeFirstLetterOnly } from '../../../../../shared/textUtil'; -import { EntityRegistry } from '../../../../../../entityRegistryContext'; -import { GenericEntityProperties } from '../../../../../entity/shared/types'; -import { SearchResultInterface } from './types'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { SearchResultInterface } from '@app/entityV2/shared/components/styled/search/types'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { CorpGroup, CorpUser, EntityType } from '@types'; const searchCsvDownloadHeader = [ 'urn', diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/navigateToEntitySearchUrl.ts b/datahub-web-react/src/app/entityV2/shared/components/styled/search/navigateToEntitySearchUrl.ts index 44459e590b..132ed49f23 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/navigateToEntitySearchUrl.ts +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/navigateToEntitySearchUrl.ts @@ -1,8 +1,10 @@ -import { RouteComponentProps } from 'react-router'; import * as QueryString from 'query-string'; -import { EntityType, FacetFilterInput } from '../../../../../../types.generated'; -import filtersToQueryStringParams from '../../../../../search/utils/filtersToQueryStringParams'; -import { UnionType } from '../../../../../search/utils/constants'; +import { RouteComponentProps } from 'react-router'; + +import { UnionType } from '@app/search/utils/constants'; +import filtersToQueryStringParams from '@app/search/utils/filtersToQueryStringParams'; + +import { EntityType, FacetFilterInput } from '@types'; export const navigateToEntitySearchUrl = ({ baseUrl, diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/tests/SearchSelectUrnInput.test.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/tests/SearchSelectUrnInput.test.tsx index bc6cab2b13..ff7c857494 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/tests/SearchSelectUrnInput.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/tests/SearchSelectUrnInput.test.tsx @@ -1,10 +1,12 @@ import { MockedProvider } from '@apollo/client/testing'; import { act, fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { EntityType } from '../../../../../../../types.generated'; -import TestPageContainer from '../../../../../../../utils/test-utils/TestPageContainer'; -import { EntityAndType } from '../../../../../../entity/shared/types'; -import { SearchSelectUrnInput } from '../SearchSelectUrnInput'; + +import { EntityAndType } from '@app/entity/shared/types'; +import { SearchSelectUrnInput } from '@app/entityV2/shared/components/styled/search/SearchSelectUrnInput'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { EntityType } from '@types'; // Mock the useHydratedEntityMap hook vi.mock('@src/app/entityV2/shared/tabs/Properties/useHydratedEntityMap', () => ({ diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/types.ts b/datahub-web-react/src/app/entityV2/shared/components/styled/search/types.ts index 5509bb8d66..cfa997c96c 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/types.ts +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/types.ts @@ -1,3 +1,5 @@ +import { UnionType } from '@app/search/utils/constants'; + import { Entity, FacetFilterInput, @@ -7,8 +9,7 @@ import { Scalars, SearchAcrossEntitiesInput, SearchInsight, -} from '../../../../../../types.generated'; -import { UnionType } from '../../../../../search/utils/constants'; +} from '@types'; export type GetSearchResultsParams = { variables: { diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeColumnLineageCards.ts b/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeColumnLineageCards.ts index 777fffc163..629b41735c 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeColumnLineageCards.ts +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeColumnLineageCards.ts @@ -1,7 +1,9 @@ import { useContext, useEffect, useState } from 'react'; -import { LineageTabContext } from '../../../tabs/Lineage/LineageTabContext'; -import { PreviewSection } from '../../../../../shared/MatchesContext'; -import { EntityType, SearchResult } from '../../../../../../types.generated'; + +import { LineageTabContext } from '@app/entityV2/shared/tabs/Lineage/LineageTabContext'; +import { PreviewSection } from '@app/shared/MatchesContext'; + +import { EntityType, SearchResult } from '@types'; export const useInitializeColumnLineageCards = ( searchResults: SearchResult[], diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeSearchResultCards.ts b/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeSearchResultCards.ts index acaa61dc31..84161e3b64 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeSearchResultCards.ts +++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeSearchResultCards.ts @@ -1,7 +1,9 @@ import { useEffect, useState } from 'react'; -import { PreviewSection } from '../../../../../shared/MatchesContext'; -import { SearchResult } from '../../../../../../types.generated'; -import { getMatchedFieldsForList } from '../../../../../search/context/SearchResultContext'; + +import { getMatchedFieldsForList } from '@app/search/context/SearchResultContext'; +import { PreviewSection } from '@app/shared/MatchesContext'; + +import { SearchResult } from '@types'; export const useInitializeSearchResultCards = ( searchResults: SearchResult[], diff --git a/datahub-web-react/src/app/entityV2/shared/components/subtypes.tsx b/datahub-web-react/src/app/entityV2/shared/components/subtypes.tsx index dffe59727f..35c1319650 100644 --- a/datahub-web-react/src/app/entityV2/shared/components/subtypes.tsx +++ b/datahub-web-react/src/app/entityV2/shared/components/subtypes.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import Icon, { ApartmentOutlined, DatabaseOutlined, @@ -7,10 +6,12 @@ import Icon, { LineChartOutlined, } from '@ant-design/icons'; import ViewComfyOutlinedIcon from '@mui/icons-material/ViewComfyOutlined'; -import TableauWorkbookLogo from '../../../../images/tableau-workbook.svg?react'; -import TableauEmbeddedDataSourceLogo from '../../../../images/tableau-embedded-data-source.svg?react'; -import TableauPublishedDataSourceLogo from '../../../../images/tableau-published-data-source.svg?react'; -import VertexAIPipelineTaskLogo from '../../../../images/vertexai-pipeline-task.svg?react'; +import React from 'react'; + +import TableauEmbeddedDataSourceLogo from '@images/tableau-embedded-data-source.svg?react'; +import TableauPublishedDataSourceLogo from '@images/tableau-published-data-source.svg?react'; +import TableauWorkbookLogo from '@images/tableau-workbook.svg?react'; +import VertexAIPipelineTaskLogo from '@images/vertexai-pipeline-task.svg?react'; export enum SubType { Database = 'Database', diff --git a/datahub-web-react/src/app/entityV2/shared/constants.ts b/datahub-web-react/src/app/entityV2/shared/constants.ts index 4e5bfe3d23..36b463f09c 100644 --- a/datahub-web-react/src/app/entityV2/shared/constants.ts +++ b/datahub-web-react/src/app/entityV2/shared/constants.ts @@ -1,4 +1,4 @@ -import { EntityType } from '../../../types.generated'; +import { EntityType } from '@types'; // TODO(Gabe): integrate this w/ the theme export const REDESIGN_COLORS = { diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/EntityProfile.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/EntityProfile.tsx index 9fec70c809..0b9ba211f7 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/EntityProfile.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/EntityProfile.tsx @@ -1,57 +1,64 @@ -import VersionsDrawer from '@app/entityV2/shared/versioning/VersionsDrawer'; -import LineageGraph from '@app/lineageV2/LineageGraph'; -import React, { useCallback, useContext, useState } from 'react'; -import { Alert } from 'antd'; import { MutationHookOptions, MutationTuple, QueryHookOptions, QueryResult } from '@apollo/client/react/types/types'; -import useEntityState from '@src/app/entity/shared/useEntityState'; -import styled from 'styled-components/macro'; +import { Alert } from 'antd'; +import React, { useCallback, useContext, useState } from 'react'; import { useHistory, useLocation } from 'react-router'; import { matchPath } from 'react-router-dom'; -import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; +import styled from 'styled-components/macro'; -import { EntityType, Exact } from '../../../../../types.generated'; -import { useLineageV2 } from '../../../../lineageV2/useLineageV2'; -import { - getEntityPath, - getFinalSidebarTabs, - getOnboardingStepIdsForEntityType, - useRoutedTab, - useUpdateGlossaryEntityDataOnChange, - defaultTabDisplayConfig, -} from './utils'; -import { EntityHeader } from './header/EntityHeader'; -import { EntityTabs } from './header/EntityTabs'; -import useIsLineageMode from '../../../../lineage/utils/useIsLineageMode'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import LineageExplorer from '../../../../lineage/LineageExplorer'; -import CompactContext from '../../../../shared/CompactContext'; -import DynamicTab from '../../tabs/Entity/weaklyTypedAspects/DynamicTab'; -import analytics, { EventType } from '../../../../analytics'; -import { EntityMenuItems } from '../../EntityDropdown/EntityMenuActions'; -import { useIsSeparateSiblingsMode } from '../../useIsSeparateSiblingsMode'; -import { EntityActionItem } from '../../entity/EntityActions'; -import { ErrorSection } from '../../../../shared/error/ErrorSection'; -import { EntityHead } from '../../../../shared/EntityHead'; -import { OnboardingTour } from '../../../../onboarding/OnboardingTour'; -import useGetDataForProfile from './useGetDataForProfile'; -import NonExistentEntityPage from '../../entity/NonExistentEntityPage'; -import { - LINEAGE_GRAPH_INTRO_ID, - LINEAGE_GRAPH_TIME_FILTER_ID, -} from '../../../../onboarding/config/LineageGraphOnboardingConfig'; -import EntityProfileSidebar from './sidebar/EntityProfileSidebar'; -import { PageRoutes } from '../../../../../conf/Global'; -import EntitySidebarContext from '../../../../sharedV2/EntitySidebarContext'; -import TabFullsizeContext from '../../../../shared/TabFullsizedContext'; -import { useUpdateDomainEntityDataOnChange as useUpdateDomainEntityDataOnChangeV2 } from '../../../../domainV2/utils'; -import { EntityContext } from '../../../../entity/shared/EntityContext'; +import analytics, { EventType } from '@app/analytics'; +import { useUpdateDomainEntityDataOnChange as useUpdateDomainEntityDataOnChangeV2 } from '@app/domainV2/utils'; +import { EntityContext } from '@app/entity/shared/EntityContext'; import { DrawerType, EntitySubHeaderSection, GenericEntityProperties, GenericEntityUpdate, -} from '../../../../entity/shared/types'; -import { EntitySidebarSection, EntitySidebarTab, EntityTab, TabContextType, TabRenderType } from '../../types'; +} from '@app/entity/shared/types'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { EntityHeader } from '@app/entityV2/shared/containers/profile/header/EntityHeader'; +import { EntityTabs } from '@app/entityV2/shared/containers/profile/header/EntityTabs'; +import EntityProfileSidebar from '@app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar'; +import useGetDataForProfile from '@app/entityV2/shared/containers/profile/useGetDataForProfile'; +import { + defaultTabDisplayConfig, + getEntityPath, + getFinalSidebarTabs, + getOnboardingStepIdsForEntityType, + useRoutedTab, + useUpdateGlossaryEntityDataOnChange, +} from '@app/entityV2/shared/containers/profile/utils'; +import { EntityActionItem } from '@app/entityV2/shared/entity/EntityActions'; +import NonExistentEntityPage from '@app/entityV2/shared/entity/NonExistentEntityPage'; +import DynamicTab from '@app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTab'; +import { + EntitySidebarSection, + EntitySidebarTab, + EntityTab, + TabContextType, + TabRenderType, +} from '@app/entityV2/shared/types'; +import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; +import VersionsDrawer from '@app/entityV2/shared/versioning/VersionsDrawer'; +import LineageExplorer from '@app/lineage/LineageExplorer'; +import useIsLineageMode from '@app/lineage/utils/useIsLineageMode'; +import LineageGraph from '@app/lineageV2/LineageGraph'; +import { useLineageV2 } from '@app/lineageV2/useLineageV2'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; +import { + LINEAGE_GRAPH_INTRO_ID, + LINEAGE_GRAPH_TIME_FILTER_ID, +} from '@app/onboarding/config/LineageGraphOnboardingConfig'; +import CompactContext from '@app/shared/CompactContext'; +import { EntityHead } from '@app/shared/EntityHead'; +import TabFullsizeContext from '@app/shared/TabFullsizedContext'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; +import useEntityState from '@src/app/entity/shared/useEntityState'; +import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; + +import { EntityType, Exact } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityHeader.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityHeader.test.tsx index db347d4f1c..251aed0bdf 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityHeader.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityHeader.test.tsx @@ -1,6 +1,7 @@ -import { platformPrivileges } from '../../../../../../Mocks'; -import { EntityType } from '../../../../../../types.generated'; -import { getCanEditName } from '../header/EntityHeader'; +import { getCanEditName } from '@app/entityV2/shared/containers/profile/header/EntityHeader'; +import { platformPrivileges } from '@src/Mocks'; + +import { EntityType } from '@types'; describe('getCanEditName', () => { const entityDataWithManagePrivileges = { privileges: { canManageEntity: true } }; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityProfile.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityProfile.test.tsx index 14d712db49..407e2a7008 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityProfile.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityProfile.test.tsx @@ -1,25 +1,23 @@ import { MockedProvider } from '@apollo/client/testing'; import { fireEvent, render, waitFor } from '@testing-library/react'; import React from 'react'; -import { mocks } from '../../../../../../Mocks'; -import { - GetDatasetQuery, - useGetDatasetQuery, - useUpdateDatasetMutation, -} from '../../../../../../graphql/dataset.generated'; -import { EntityType } from '../../../../../../types.generated'; -import TestPageContainer from '../../../../../../utils/test-utils/TestPageContainer'; -import QueriesTab from '../../../tabs/Dataset/Queries/QueriesTab'; -import { SchemaTab } from '../../../tabs/Dataset/Schema/SchemaTab'; -import StatsTab from '../../../tabs/Dataset/Stats/StatsTab'; -import { DocumentationTab } from '../../../tabs/Documentation/DocumentationTab'; -import { LineageTab } from '../../../tabs/Lineage/LineageTab'; -import { PropertiesTab } from '../../../tabs/Properties/PropertiesTab'; -import { EntityProfile } from '../EntityProfile'; -import { SidebarAboutSection } from '../sidebar/AboutSection/SidebarAboutSection'; -import { SidebarStatsSection } from '../sidebar/Dataset/StatsSidebarSection'; -import { SidebarOwnerSection } from '../sidebar/Ownership/sidebar/SidebarOwnerSection'; -import { SidebarTagsSection } from '../sidebar/SidebarTagsSection'; + +import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile'; +import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection'; +import { SidebarStatsSection } from '@app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection'; +import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection'; +import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection'; +import QueriesTab from '@app/entityV2/shared/tabs/Dataset/Queries/QueriesTab'; +import { SchemaTab } from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaTab'; +import StatsTab from '@app/entityV2/shared/tabs/Dataset/Stats/StatsTab'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { GetDatasetQuery, useGetDatasetQuery, useUpdateDatasetMutation } from '@graphql/dataset.generated'; +import { EntityType } from '@types'; describe('EntityProfile', () => { it('renders dataset page', async () => { diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/PlatformContent.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/PlatformContent.test.tsx index 8e6d54e062..a3ba0838b5 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/PlatformContent.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/PlatformContent.test.tsx @@ -1,9 +1,13 @@ -import React from 'react'; import { render, screen } from '@testing-library/react'; +import React from 'react'; import { BrowserRouter } from 'react-router-dom'; -import PlatformContentView, { getParentContainerNames } from '../header/PlatformContent/PlatformContentView'; -import { EntityType } from '../../../../../../types.generated'; -import { container1, container2 } from '../../../../../../Mocks'; + +import PlatformContentView, { + getParentContainerNames, +} from '@app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView'; +import { container1, container2 } from '@src/Mocks'; + +import { EntityType } from '@types'; vi.mock('../../../../../useEntityRegistry', () => ({ useEntityRegistry: () => ({ diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx index e6deb9a28a..e0ffecfdc1 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx @@ -1,36 +1,31 @@ -import { getContextPath } from '@app/entityV2/shared/containers/profile/header/getContextPath'; -import VersioningBadge from '@app/entityV2/shared/versioning/VersioningBadge'; import { Divider } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { - Container, - DataPlatform, - DisplayProperties, - Domain, - EntityType, - Post, -} from '../../../../../../types.generated'; -import { EntitySubHeaderSection, GenericEntityProperties } from '../../../../../entity/shared/types'; -import ContextPath from '../../../../../previewV2/ContextPath'; -import HealthIcon from '../../../../../previewV2/HealthIcon'; -import NotesIcon from '../../../../../previewV2/NotesIcon'; -import useContentTruncation from '../../../../../shared/useContentTruncation'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { IconStyleType } from '../../../../Entity'; -import EntityMenuActions, { EntityMenuItems } from '../../../EntityDropdown/EntityMenuActions'; -import { DeprecationIcon } from '../../../components/styled/DeprecationIcon'; -import EntityActions, { EntityActionItem } from '../../../entity/EntityActions'; -import { DomainColoredIcon } from '../../../links/DomainColoredIcon'; -import { EntityBackButton } from '../sidebar/EntityBackButton'; -import EntityTitleLoadingSection from './EntityHeaderLoadingSection'; -import EntityName from './EntityName'; -import { GlossaryPreviewCardDecoration } from './GlossaryPreviewCardDecoration'; -import IconColorPicker from './IconPicker/IconColorPicker'; -import ContainerIcon from './PlatformContent/ContainerIcon'; -import PlatformHeaderIcons from './PlatformContent/PlatformHeaderIcons'; -import StructuredPropertyBadge from './StructuredPropertyBadge'; -import { getDisplayedEntityType, getEntityPlatforms } from './utils'; + +import { EntitySubHeaderSection, GenericEntityProperties } from '@app/entity/shared/types'; +import { IconStyleType } from '@app/entityV2/Entity'; +import EntityMenuActions, { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { DeprecationIcon } from '@app/entityV2/shared/components/styled/DeprecationIcon'; +import EntityTitleLoadingSection from '@app/entityV2/shared/containers/profile/header/EntityHeaderLoadingSection'; +import EntityName from '@app/entityV2/shared/containers/profile/header/EntityName'; +import { GlossaryPreviewCardDecoration } from '@app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration'; +import IconColorPicker from '@app/entityV2/shared/containers/profile/header/IconPicker/IconColorPicker'; +import ContainerIcon from '@app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon'; +import PlatformHeaderIcons from '@app/entityV2/shared/containers/profile/header/PlatformContent/PlatformHeaderIcons'; +import StructuredPropertyBadge from '@app/entityV2/shared/containers/profile/header/StructuredPropertyBadge'; +import { getContextPath } from '@app/entityV2/shared/containers/profile/header/getContextPath'; +import { getDisplayedEntityType, getEntityPlatforms } from '@app/entityV2/shared/containers/profile/header/utils'; +import { EntityBackButton } from '@app/entityV2/shared/containers/profile/sidebar/EntityBackButton'; +import EntityActions, { EntityActionItem } from '@app/entityV2/shared/entity/EntityActions'; +import { DomainColoredIcon } from '@app/entityV2/shared/links/DomainColoredIcon'; +import VersioningBadge from '@app/entityV2/shared/versioning/VersioningBadge'; +import ContextPath from '@app/previewV2/ContextPath'; +import HealthIcon from '@app/previewV2/HealthIcon'; +import NotesIcon from '@app/previewV2/NotesIcon'; +import useContentTruncation from '@app/shared/useContentTruncation'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Container, DataPlatform, DisplayProperties, Domain, EntityType, Post } from '@types'; export const TitleWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityCount.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityCount.tsx index d48bdf4144..451cbf0592 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityCount.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityCount.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; export const EntityCountText = styled(Typography.Text)` display: inline-block; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeader.tsx index 60ce8c859d..8bb0792f64 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeader.tsx @@ -1,13 +1,15 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { EntityMenuItems } from '../../../EntityDropdown/EntityMenuActions'; -import { DisplayProperties, EntityType, PlatformPrivileges } from '../../../../../../types.generated'; -import { EntityActionItem } from '../../../entity/EntityActions'; -import { useUserContext } from '../../../../../context/useUserContext'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { DefaultEntityHeader } from './DefaultEntityHeader'; -import { useEntityData, useRefetch } from '../../../../../entity/shared/EntityContext'; -import { EntitySubHeaderSection, GenericEntityProperties } from '../../../../../entity/shared/types'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { EntitySubHeaderSection, GenericEntityProperties } from '@app/entity/shared/types'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { DefaultEntityHeader } from '@app/entityV2/shared/containers/profile/header/DefaultEntityHeader'; +import { EntityActionItem } from '@app/entityV2/shared/entity/EntityActions'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DisplayProperties, EntityType, PlatformPrivileges } from '@types'; const Container = styled.div``; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeaderLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeaderLoadingSection.tsx index 419f01b775..a57f79966f 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeaderLoadingSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeaderLoadingSection.tsx @@ -1,7 +1,8 @@ -import * as React from 'react'; import { Skeleton, Space } from 'antd'; +import * as React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const Wrapper = styled(Space)` min-height: 50px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthPopover.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthPopover.tsx index 7f8c592a87..a302032262 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthPopover.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthPopover.tsx @@ -1,15 +1,13 @@ -import { Divider } from 'antd'; import { Popover } from '@components'; +import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Health } from '../../../../../../types.generated'; -import { - HealthSummaryIconType, - getHealthSummaryIcon, - getHealthSummaryMessage, -} from '../../../../../shared/health/healthUtils'; -import { ANTD_GRAY } from '../../../constants'; -import { EntityHealthStatus } from './EntityHealthStatus'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { EntityHealthStatus } from '@app/entityV2/shared/containers/profile/header/EntityHealthStatus'; +import { HealthSummaryIconType, getHealthSummaryIcon, getHealthSummaryMessage } from '@app/shared/health/healthUtils'; + +import { Health } from '@types'; const Header = styled.span` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthStatus.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthStatus.tsx index 27c85b8516..8c500caba4 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthStatus.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthStatus.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import styled from 'styled-components'; import { Link } from 'react-router-dom'; -import { getHealthTypeName, getHealthRedirectPath } from '../../../../../shared/health/healthUtils'; -import { HealthStatusType } from '../../../../../../types.generated'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../constants'; +import styled from 'styled-components'; + +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getHealthRedirectPath, getHealthTypeName } from '@app/shared/health/healthUtils'; + +import { HealthStatusType } from '@types'; const StatusContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityName.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityName.tsx index 20ae6a0dac..aa93d6b6c5 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityName.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityName.tsx @@ -1,16 +1,18 @@ -import { message, Typography } from 'antd'; -import React, { useState, useEffect } from 'react'; +import { Typography, message } from 'antd'; +import React, { useEffect, useState } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components/macro'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getParentNodeToUpdate, updateGlossarySidebar } from '@app/glossary/utils'; +import CompactContext from '@app/shared/CompactContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { useEmbeddedProfileLinkProps } from '@src/app/shared/useEmbeddedProfileLinkProps'; -import { useUpdateNameMutation } from '../../../../../../graphql/mutations.generated'; -import { getParentNodeToUpdate, updateGlossarySidebar } from '../../../../../glossary/utils'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { useEntityData, useRefetch } from '../../../../../entity/shared/EntityContext'; -import { useGlossaryEntityData } from '../../../GlossaryEntityContext'; -import { REDESIGN_COLORS } from '../../../constants'; -import CompactContext from '../../../../../shared/CompactContext'; -import { EntityType } from '../../../../../../types.generated'; + +import { useUpdateNameMutation } from '@graphql/mutations.generated'; +import { EntityType } from '@types'; const EntityTitle = styled(Typography.Text)<{ $showEntityLink?: boolean }>` font-weight: 700; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityPlatformLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityPlatformLoadingSection.tsx index 1bd176e0e2..8a8aae53be 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityPlatformLoadingSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityPlatformLoadingSection.tsx @@ -1,7 +1,8 @@ -import * as React from 'react'; import { Skeleton, Space } from 'antd'; +import * as React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const ContextSkeleton = styled(Skeleton.Input)` && { diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityTabs.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityTabs.tsx index 19f4678e1c..67aed3ef7d 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityTabs.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityTabs.tsx @@ -2,8 +2,8 @@ import { Tabs } from 'antd'; import React, { useEffect } from 'react'; import styled from 'styled-components/macro'; -import { useBaseEntity, useEntityData, useRouteToTab } from '../../../../../entity/shared/EntityContext'; -import { EntityTab } from '../../../types'; +import { useBaseEntity, useEntityData, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { EntityTab } from '@app/entityV2/shared/types'; type Props = { tabs: EntityTab[]; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration.tsx index 4b705c94a2..5645dc7a63 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration.tsx @@ -1,8 +1,10 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { DisplayProperties } from '../../../../../../types.generated'; -import { generateColorFromPalette } from '../../../../../glossaryV2/colorUtils'; -import { GenericEntityProperties } from '../../../../../entity/shared/types'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { generateColorFromPalette } from '@app/glossaryV2/colorUtils'; + +import { DisplayProperties } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/IconPicker/IconColorPicker.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/IconPicker/IconColorPicker.tsx index 574b012241..c944619d6f 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/IconPicker/IconColorPicker.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/IconPicker/IconColorPicker.tsx @@ -2,10 +2,11 @@ import { Input, Modal } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { useUpdateDisplayPropertiesMutation } from '../../../../../../../graphql/mutations.generated'; -import { IconLibrary } from '../../../../../../../types.generated'; -import { useEntityData, useRefetch } from '../../../../../../entity/shared/EntityContext'; -import { ChatIconPicker } from './IconPicker'; +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { ChatIconPicker } from '@app/entityV2/shared/containers/profile/header/IconPicker/IconPicker'; + +import { useUpdateDisplayPropertiesMutation } from '@graphql/mutations.generated'; +import { IconLibrary } from '@types'; type IconColorPickerProps = { name: string; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon.tsx index 0a8a11949c..cf44c2b3dc 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon.tsx @@ -1,10 +1,12 @@ import { FolderOpenOutlined } from '@ant-design/icons'; -import { GenericEntityProperties } from '@app/entity/shared/types'; import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import styled from 'styled-components'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { TYPE_ICON_CLASS_NAME, getSubTypeIcon } from '@app/entityV2/shared/components/subtypes'; + import { Container } from '@types'; -import { getSubTypeIcon, TYPE_ICON_CLASS_NAME } from '../../../../components/subtypes'; const IconWrapper = styled.span` line-height: 0; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink.tsx index 0d8aff80ca..a53c2deafd 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink.tsx @@ -1,12 +1,14 @@ -import React from 'react'; -import styled from 'styled-components'; -import { Link } from 'react-router-dom'; import { Maybe } from 'graphql/jsutils/Maybe'; -import { Container, EntityType } from '../../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import ContainerIcon from './ContainerIcon'; -import { ANTD_GRAY } from '../../../../constants'; -import { useEmbeddedProfileLinkProps } from '../../../../../../shared/useEmbeddedProfileLinkProps'; +import React from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import ContainerIcon from '@app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon'; +import { useEmbeddedProfileLinkProps } from '@app/shared/useEmbeddedProfileLinkProps'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Container, EntityType } from '@types'; const ContainerText = styled.span` font-size: 14px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx index e4656cf31a..0ff9d4f1c0 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx @@ -1,12 +1,14 @@ import { FolderOutlined, RightOutlined } from '@ant-design/icons'; -import { Typography } from 'antd'; import { Tooltip } from '@components'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { EntityType, GlossaryNode } from '../../../../../../../types.generated'; -import useContentTruncation from '../../../../../../shared/useContentTruncation'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import useContentTruncation from '@app/shared/useContentTruncation'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, GlossaryNode } from '@types'; export const StyledRightOutlined = styled(RightOutlined)` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesViewForSearchRedesign.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesViewForSearchRedesign.tsx index 50b3d2ab95..56b0414b6e 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesViewForSearchRedesign.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesViewForSearchRedesign.tsx @@ -1,12 +1,14 @@ import { FolderOutlined, RightOutlined } from '@ant-design/icons'; -import { Typography } from 'antd'; import { Tooltip } from '@components'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { EntityType, GlossaryNode } from '../../../../../../../types.generated'; -import useContentTruncation from '../../../../../../shared/useContentTruncation'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import useContentTruncation from '@app/shared/useContentTruncation'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, GlossaryNode } from '@types'; export const StyledRightOutlined = styled(RightOutlined)` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx index 815441c458..f48c63caa7 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx @@ -1,14 +1,16 @@ import React from 'react'; -import { Container, EntityType } from '../../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { IconStyleType } from '../../../../../Entity'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { capitalizeFirstLetterOnly } from '../../../../../../shared/textUtil'; -import { getPlatformName } from '../../../../utils'; -import ContainerIcon from './ContainerIcon'; -import PlatformContentView from './PlatformContentView'; -import useContentTruncation from '../../../../../../shared/useContentTruncation'; -import { getDisplayedEntityType } from '../utils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { IconStyleType } from '@app/entityV2/Entity'; +import ContainerIcon from '@app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon'; +import PlatformContentView from '@app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView'; +import { getDisplayedEntityType } from '@app/entityV2/shared/containers/profile/header/utils'; +import { getPlatformName } from '@app/entityV2/shared/utils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import useContentTruncation from '@app/shared/useContentTruncation'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Container, EntityType } from '@types'; function PlatformContentContainer() { const { entityType, entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx index 38d4b7016c..d804b6d7d7 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx @@ -1,12 +1,18 @@ +import { Image, Typography } from 'antd'; +import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import styled from 'styled-components'; -import { Typography, Image } from 'antd'; + +import ContainerLink from '@app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink'; +import { + Ellipsis, + ParentNodesWrapper as ParentContainersWrapper, + StyledTooltip, +} from '@app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView'; +import ParentEntities from '@app/search/filters/ParentEntities'; import { useIsShowSeparateSiblingsEnabled } from '@src/app/useAppConfig'; -import { Maybe } from 'graphql/jsutils/Maybe'; -import { Container, Entity } from '../../../../../../../types.generated'; -import ContainerLink from './ContainerLink'; -import { ParentNodesWrapper as ParentContainersWrapper, Ellipsis, StyledTooltip } from './ParentNodesView'; -import ParentEntities from '../../../../../../search/filters/ParentEntities'; + +import { Container, Entity } from '@types'; const LogoIcon = styled.span` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformHeaderIcons.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformHeaderIcons.tsx index c041e8f37c..d930e6cb6c 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformHeaderIcons.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformHeaderIcons.tsx @@ -1,8 +1,10 @@ import React from 'react'; import styled, { CSSObject } from 'styled-components'; -import { DataPlatform } from '../../../../../../../types.generated'; -import StackPlatformImages from './StackPlatformImages'; -import PlatformIcon from '../../../../../../sharedV2/icons/PlatformIcon'; + +import StackPlatformImages from '@app/entityV2/shared/containers/profile/header/PlatformContent/StackPlatformImages'; +import PlatformIcon from '@app/sharedV2/icons/PlatformIcon'; + +import { DataPlatform } from '@types'; const LogoIcon = styled.span` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/StackPlatformImages.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/StackPlatformImages.tsx index eff1f8c0f1..6b95d78eaa 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/StackPlatformImages.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/StackPlatformImages.tsx @@ -1,7 +1,9 @@ import React from 'react'; import styled, { CSSObject } from 'styled-components'; -import PlatformIcon from '../../../../../../sharedV2/icons/PlatformIcon'; -import { DataPlatform } from '../../../../../../../types.generated'; + +import PlatformIcon from '@app/sharedV2/icons/PlatformIcon'; + +import { DataPlatform } from '@types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/index.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/index.ts index e41f35d7b4..c555022251 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/index.ts +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/index.ts @@ -1,3 +1,3 @@ -import PlatformContentContainer from './PlatformContentContainer'; +import PlatformContentContainer from '@app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer'; export default PlatformContentContainer; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx index ad0eeb7660..493188002d 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx @@ -1,11 +1,12 @@ -import { colors, Pill, Text, Tooltip } from '@src/alchemy-components'; +import React from 'react'; +import styled from 'styled-components'; + +import { filterForAssetBadge } from '@app/entityV2/shared/containers/profile/header/utils'; +import { mapStructuredPropertyToPropertyRow } from '@app/entityV2/shared/tabs/Properties/useStructuredProperties'; +import { Pill, Text, Tooltip, colors } from '@src/alchemy-components'; import { getStructuredPropertyValue } from '@src/app/entity/shared/utils'; import { getDisplayName } from '@src/app/govern/structuredProperties/utils'; import { StructuredProperties } from '@src/types.generated'; -import React from 'react'; -import styled from 'styled-components'; -import { mapStructuredPropertyToPropertyRow } from '../../../tabs/Properties/useStructuredProperties'; -import { filterForAssetBadge } from './utils'; export const MAX_PROP_BADGE_WIDTH = 150; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/getContextPath.test.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/getContextPath.test.ts index c3045d61f7..bb74f299fa 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/getContextPath.test.ts +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/getContextPath.test.ts @@ -1,7 +1,8 @@ import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getContextPath } from '@app/entityV2/shared/containers/profile/header/getContextPath'; import { dataPlatform } from '@src/Mocks'; + import { EntityType } from '@types'; -import { getContextPath } from './getContextPath'; const PARENT_CONTAINERS: GenericEntityProperties['parentContainers'] = { containers: [ diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/getContextPath.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/getContextPath.ts index ac7f5493ef..e1d6b57abc 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/getContextPath.ts +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/getContextPath.ts @@ -1,4 +1,5 @@ import { GenericEntityProperties } from '@app/entity/shared/types'; + import { Entity } from '@types'; type GetContextPathInput = Pick< diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/utils.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/utils.ts index 052e0d53ed..8a646f92e7 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/utils.ts +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/utils.ts @@ -1,7 +1,8 @@ -import { EntityType, StructuredPropertiesEntry } from '../../../../../../types.generated'; -import { capitalizeFirstLetterOnly } from '../../../../../shared/textUtil'; -import { EntityRegistry } from '../../../../../../entityRegistryContext'; -import { GenericEntityProperties } from '../../../../../entity/shared/types'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { EntityType, StructuredPropertiesEntry } from '@types'; export function getDisplayedEntityType( entityData: GenericEntityProperties | null, diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx index 82ae35a266..5e69364f2b 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components/macro'; -import CompactMarkdownViewer from '../../../../tabs/Documentation/components/CompactMarkdownViewer'; -import { REDESIGN_COLORS } from '../../../../constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import CompactMarkdownViewer from '@app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer'; const ContentWrapper = styled.div` font-size: 12px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx index bf085a525a..97d8cf479f 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx @@ -1,9 +1,10 @@ +import { PlusOutlined } from '@ant-design/icons'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { PlusOutlined } from '@ant-design/icons'; -import { useRouteToTab } from '../../../../../../entity/shared/EntityContext'; -import { EMPTY_MESSAGES } from '../../../../constants'; + +import { useRouteToTab } from '@app/entity/shared/EntityContext'; +import { EMPTY_MESSAGES } from '@app/entityV2/shared/constants'; const EmptyContentWrapper = styled.div` font-size: 12px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx index b55d4bf952..a861c2de9f 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import LinkButton from '../LinkButton'; -import { useEntityData, useRefetch } from '../../../../../../entity/shared/EntityContext'; -import { AddLinkModal } from '../../../../components/styled/AddLinkModal'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { AddLinkModal } from '@app/entityV2/shared/components/styled/AddLinkModal'; +import LinkButton from '@app/entityV2/shared/containers/profile/sidebar/LinkButton'; const AddLinksWrapper = styled.div` margin-left: -15px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx index 1a418c246f..855c6b5c3b 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx @@ -1,20 +1,21 @@ -import React from 'react'; import AddRoundedIcon from '@mui/icons-material/AddRounded'; import EditOutlinedIcon from '@mui/icons-material/EditOutlined'; -import { getAssetDescriptionDetails } from '@src/app/entityV2/shared/tabs/Documentation/utils'; -import { useIsEmbeddedProfile } from '@src/app/shared/useEmbeddedProfileLinkProps'; -import useIsLineageMode from '@src/app/lineage/utils/useIsLineageMode'; +import React from 'react'; + +import { useEntityData, useMutationUrn, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { EMPTY_MESSAGES } from '@app/entityV2/shared/constants'; +import DescriptionSection from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/DescriptionSection'; +import LinksSection from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/LinksSection'; +import SourceRefSection from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SourceRefSection'; +import EmptySectionText from '@app/entityV2/shared/containers/profile/sidebar/EmptySectionText'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { getEntityPath } from '@app/entityV2/shared/containers/profile/utils'; import { useIsSeparateSiblingsMode } from '@src/app/entity/shared/siblingUtils'; +import { getAssetDescriptionDetails } from '@src/app/entityV2/shared/tabs/Documentation/utils'; +import useIsLineageMode from '@src/app/lineage/utils/useIsLineageMode'; +import { useIsEmbeddedProfile } from '@src/app/shared/useEmbeddedProfileLinkProps'; import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import DescriptionSection from './DescriptionSection'; -import LinksSection from './LinksSection'; -import SourceRefSection from './SourceRefSection'; -import { SidebarSection } from '../SidebarSection'; -import { EMPTY_MESSAGES } from '../../../../constants'; -import SectionActionButton from '../SectionActionButton'; -import EmptySectionText from '../EmptySectionText'; -import { useEntityData, useMutationUrn, useRouteToTab } from '../../../../../../entity/shared/EntityContext'; -import { getEntityPath } from '../../utils'; const LINE_LIMIT = 5; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx index 9a2a73721b..812f92f84d 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx @@ -1,9 +1,10 @@ import { LinkOutlined } from '@ant-design/icons'; import { Typography } from 'antd'; import React from 'react'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { StyledLink } from '../LinkButton'; -import { SidebarSection } from '../SidebarSection'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { StyledLink } from '@app/entityV2/shared/containers/profile/sidebar/LinkButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; export default function SourceRefSection() { const { entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/SidebarChartHeaderSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/SidebarChartHeaderSection.tsx index cc75ec5ab7..8c36665371 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/SidebarChartHeaderSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/SidebarChartHeaderSection.tsx @@ -1,13 +1,14 @@ +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; -import { useEntityData } from '../../../../../../../entity/shared/EntityContext'; -import { SidebarHeaderSectionColumns } from '../../SidebarHeaderSectionColumns'; -import SidebarTopUsersHeaderSection from '../../shared/SidebarTopUsersHeaderSection'; -import { getChartPopularityTier, userExists } from '../../shared/utils'; -import { REDESIGN_COLORS } from '../../../../../constants'; -import { formatNumber, formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber'; -import { getPopularityColumn, SidebarStatsColumn } from '../../../utils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SidebarHeaderSectionColumns } from '@app/entityV2/shared/containers/profile/sidebar/SidebarHeaderSectionColumns'; +import SidebarTopUsersHeaderSection from '@app/entityV2/shared/containers/profile/sidebar/shared/SidebarTopUsersHeaderSection'; +import { getChartPopularityTier, userExists } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { SidebarStatsColumn, getPopularityColumn } from '@app/entityV2/shared/containers/profile/utils'; +import { formatNumber, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; const StatContent = styled.div` color: ${REDESIGN_COLORS.FOUNDATION_BLUE_4}; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/utils.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/utils.ts index 59f514e85d..bb00fa3251 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/utils.ts +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/utils.ts @@ -1,4 +1,4 @@ -import { ChartProperties } from '../../../../../../../../types.generated'; +import { ChartProperties } from '@types'; // This util is used for Charts and Dashboards who get last updated differently than others export function getLastUpdatedMs( diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx index 2b5cf7456b..15af098bb9 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx @@ -1,11 +1,13 @@ -import { Button, Form, Modal, Select, Tag } from 'antd'; import { Tooltip } from '@components'; +import { Button, Form, Modal, Select, Tag } from 'antd'; import React, { ReactNode, useRef, useState } from 'react'; import styled from 'styled-components/macro'; -import { useGetSearchResultsLazyQuery } from '../../../../../../../graphql/search.generated'; -import { Container, Entity, EntityType } from '../../../../../../../types.generated'; -import { useEnterKeyListener } from '../../../../../../shared/useEnterKeyListener'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; + +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { Container, Entity, EntityType } from '@types'; type Props = { onCloseModal: () => void; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsLoadingSection.tsx index e246ac44c8..665f024550 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsLoadingSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsLoadingSection.tsx @@ -1,6 +1,6 @@ -import React from 'react'; -import { Spin } from 'antd'; import { LoadingOutlined } from '@ant-design/icons'; +import { Spin } from 'antd'; +import React from 'react'; const SidebarContentsLoadingSection = () => { return } />; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsSection.tsx index d07316c216..7df93b2ff7 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsSection.tsx @@ -1,14 +1,20 @@ import React from 'react'; -import styled from 'styled-components/macro'; import { useHistory } from 'react-router'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { SidebarSection } from '../SidebarSection'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { getContentsSummary, getContentsSummaryText, navigateToContainerContents } from './utils'; -import { useGetContainerEntitySummaryQuery } from '../../../../../../../graphql/container.generated'; -import SidebarContentsLoadingSection from './SidebarContentsLoadingSection'; -import EmptySectionText from '../EmptySectionText'; -import { REDESIGN_COLORS } from '../../../../constants'; +import styled from 'styled-components/macro'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import SidebarContentsLoadingSection from '@app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsLoadingSection'; +import { + getContentsSummary, + getContentsSummaryText, + navigateToContainerContents, +} from '@app/entityV2/shared/containers/profile/sidebar/Container/utils'; +import EmptySectionText from '@app/entityV2/shared/containers/profile/sidebar/EmptySectionText'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetContainerEntitySummaryQuery } from '@graphql/container.generated'; const Section = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/utils.tsx index 619ce6aacd..29b11988eb 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/utils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/utils.tsx @@ -1,9 +1,11 @@ import React from 'react'; import styled from 'styled-components'; -import { AggregationMetadata, EntityType, FacetMetadata, SearchResults } from '../../../../../../../types.generated'; -import { pluralize } from '../../../../../../shared/textUtil'; -import { EntityRegistry } from '../../../../../../../entityRegistryContext'; -import { ANTD_GRAY } from '../../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { pluralize } from '@app/shared/textUtil'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { AggregationMetadata, EntityType, FacetMetadata, SearchResults } from '@types'; const UNIT_SEPARATOR = '␞'; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dashboard/Header/SidebarDashboardHeaderSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dashboard/Header/SidebarDashboardHeaderSection.tsx index 4f320a068d..52aad89135 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dashboard/Header/SidebarDashboardHeaderSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dashboard/Header/SidebarDashboardHeaderSection.tsx @@ -1,13 +1,14 @@ +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; -import { useEntityData } from '../../../../../../../entity/shared/EntityContext'; -import { SidebarHeaderSectionColumns } from '../../SidebarHeaderSectionColumns'; -import SidebarTopUsersHeaderSection from '../../shared/SidebarTopUsersHeaderSection'; -import { getDashboardPopularityTier, userExists } from '../../shared/utils'; -import { REDESIGN_COLORS } from '../../../../../constants'; -import { formatNumber, formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber'; -import { getPopularityColumn, SidebarStatsColumn } from '../../../utils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SidebarHeaderSectionColumns } from '@app/entityV2/shared/containers/profile/sidebar/SidebarHeaderSectionColumns'; +import SidebarTopUsersHeaderSection from '@app/entityV2/shared/containers/profile/sidebar/shared/SidebarTopUsersHeaderSection'; +import { getDashboardPopularityTier, userExists } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { SidebarStatsColumn, getPopularityColumn } from '@app/entityV2/shared/containers/profile/utils'; +import { formatNumber, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; const StatContent = styled.div` color: ${REDESIGN_COLORS.FOUNDATION_BLUE_4}; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx index aa867d59df..d450edab06 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx @@ -1,17 +1,19 @@ -import React, { useEffect, useState } from 'react'; -import styled from 'styled-components'; import AddRoundedIcon from '@mui/icons-material/AddRounded'; import EditOutlinedIcon from '@mui/icons-material/EditOutlined'; import { Modal, message } from 'antd'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { EMPTY_MESSAGES } from '../../../../constants'; -import SetDataProductModal from './SetDataProductModal'; -import { DataProductLink } from '../../../../../../sharedV2/tags/DataProductLink'; -import { useBatchSetDataProductMutation } from '../../../../../../../graphql/dataProduct.generated'; -import { DataProduct } from '../../../../../../../types.generated'; -import { SidebarSection } from '../SidebarSection'; -import SectionActionButton from '../SectionActionButton'; -import EmptySectionText from '../EmptySectionText'; +import React, { useEffect, useState } from 'react'; +import styled from 'styled-components'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { EMPTY_MESSAGES } from '@app/entityV2/shared/constants'; +import SetDataProductModal from '@app/entityV2/shared/containers/profile/sidebar/DataProduct/SetDataProductModal'; +import EmptySectionText from '@app/entityV2/shared/containers/profile/sidebar/EmptySectionText'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { DataProductLink } from '@app/sharedV2/tags/DataProductLink'; + +import { useBatchSetDataProductMutation } from '@graphql/dataProduct.generated'; +import { DataProduct } from '@types'; const Content = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx index b0813285e9..4b210cfce0 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx @@ -1,21 +1,23 @@ import { LoadingOutlined } from '@ant-design/icons'; -import Modal from 'antd/lib/modal/Modal'; import { Empty, Select, message } from 'antd'; -import { getModalDomContainer } from '@src/utils/focus'; -import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; +import Modal from 'antd/lib/modal/Modal'; import { debounce } from 'lodash'; import React, { useMemo, useRef, useState } from 'react'; import styled from 'styled-components'; -import { useGetRecommendations } from '@src/app/shared/recommendation'; -import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; + +import { IconStyleType } from '@app/entityV2/Entity'; +import { handleBatchError } from '@app/entityV2/shared/utils'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { Button } from '@src/alchemy-components'; -import { useGetAutoCompleteMultipleResultsLazyQuery } from '../../../../../../../graphql/search.generated'; -import { DataProduct, Entity, EntityType } from '../../../../../../../types.generated'; -import { useEnterKeyListener } from '../../../../../../shared/useEnterKeyListener'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { IconStyleType } from '../../../../../Entity'; -import { useBatchSetDataProductMutation } from '../../../../../../../graphql/dataProduct.generated'; -import { handleBatchError } from '../../../../utils'; +import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; +import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; +import { useGetRecommendations } from '@src/app/shared/recommendation'; +import { getModalDomContainer } from '@src/utils/focus'; + +import { useBatchSetDataProductMutation } from '@graphql/dataProduct.generated'; +import { useGetAutoCompleteMultipleResultsLazyQuery } from '@graphql/search.generated'; +import { DataProduct, Entity, EntityType } from '@types'; const OptionWrapper = styled.div` padding: 2px 0; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/Header/SidebarDatasetHeaderSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/Header/SidebarDatasetHeaderSection.tsx index 06ba4be0fd..e867a8c86f 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/Header/SidebarDatasetHeaderSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/Header/SidebarDatasetHeaderSection.tsx @@ -2,14 +2,18 @@ import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { useEntityData } from '../../../../../../../entity/shared/EntityContext'; -import CompactContext from '../../../../../../../shared/CompactContext'; -import { formatBytes, formatNumber, formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber'; -import { REDESIGN_COLORS } from '../../../../../constants'; -import { getPopularityColumn, SidebarStatsColumn } from '../../../utils'; -import SidebarTopUsersHeaderSection from '../../shared/SidebarTopUsersHeaderSection'; -import { getDatasetPopularityTier, isValuePresent, userExists } from '../../shared/utils'; -import { SidebarHeaderSectionColumns } from '../../SidebarHeaderSectionColumns'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SidebarHeaderSectionColumns } from '@app/entityV2/shared/containers/profile/sidebar/SidebarHeaderSectionColumns'; +import SidebarTopUsersHeaderSection from '@app/entityV2/shared/containers/profile/sidebar/shared/SidebarTopUsersHeaderSection'; +import { + getDatasetPopularityTier, + isValuePresent, + userExists, +} from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { SidebarStatsColumn, getPopularityColumn } from '@app/entityV2/shared/containers/profile/utils'; +import CompactContext from '@app/shared/CompactContext'; +import { formatBytes, formatNumber, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; const StatContent = styled.div` color: ${REDESIGN_COLORS.FOUNDATION_BLUE_4}; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx index 9eadf1a8a1..af2564d642 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx @@ -1,14 +1,16 @@ import { Button, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { GetDatasetQuery } from '../../../../../../../graphql/dataset.generated'; -import { Operation, UsageQueryResult } from '../../../../../../../types.generated'; -import { useBaseEntity, useRouteToTab } from '../../../../../../entity/shared/EntityContext'; -import { formatNumberWithoutAbbreviation } from '../../../../../../shared/formatNumber'; -import UsageFacepile from '../../../../../dataset/profile/UsageFacepile'; -import { InfoItem } from '../../../../components/styled/InfoItem'; -import { ANTD_GRAY } from '../../../../constants'; -import { SidebarHeader } from '../SidebarHeader'; + +import { useBaseEntity, useRouteToTab } from '@app/entity/shared/EntityContext'; +import UsageFacepile from '@app/entityV2/dataset/profile/UsageFacepile'; +import { InfoItem } from '@app/entityV2/shared/components/styled/InfoItem'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { SidebarHeader } from '@app/entityV2/shared/containers/profile/sidebar/SidebarHeader'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { Operation, UsageQueryResult } from '@types'; const HeaderInfoBody = styled(Typography.Text)` font-size: 16px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx index 11e7f3f722..a7fd3bbb54 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx @@ -1,11 +1,13 @@ +import { Button, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Button, Typography } from 'antd'; -import { GetDatasetQuery } from '../../../../../../../../graphql/dataset.generated'; -import { InfoItem } from '../../../../../components/styled/InfoItem'; -import { ANTD_GRAY } from '../../../../../constants'; -import { useBaseEntity, useRouteToTab } from '../../../../../../../entity/shared/EntityContext'; -import { SidebarSection } from '../../SidebarSection'; + +import { useBaseEntity, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { InfoItem } from '@app/entityV2/shared/components/styled/InfoItem'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; const HeaderInfoBody = styled(Typography.Text)` font-size: 16px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx index a27fe3441e..fbcad86236 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx @@ -1,19 +1,21 @@ +import { Empty, Form, Modal, Select, message } from 'antd'; import React, { useRef, useState } from 'react'; -import { Form, message, Modal, Select, Empty } from 'antd'; -import { getModalDomContainer } from '@src/utils/focus'; + +import DomainNavigator from '@app/domain/nestedDomains/domainNavigator/DomainNavigator'; +import domainAutocompleteOptions from '@app/domainV2/DomainAutocompleteOptions'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { handleBatchError } from '@app/entityV2/shared/utils'; +import ClickOutside from '@app/shared/ClickOutside'; +import { BrowserWrapper } from '@app/shared/tags/AddTagsTermsModal'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { Button } from '@src/alchemy-components'; import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; -import { useGetAutoCompleteResultsLazyQuery } from '../../../../../../../graphql/search.generated'; -import { Domain, Entity, EntityType } from '../../../../../../../types.generated'; -import { useBatchSetDomainMutation } from '../../../../../../../graphql/mutations.generated'; -import domainAutocompleteOptions from '../../../../../../domainV2/DomainAutocompleteOptions'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { useEnterKeyListener } from '../../../../../../shared/useEnterKeyListener'; -import { handleBatchError } from '../../../../utils'; -import { BrowserWrapper } from '../../../../../../shared/tags/AddTagsTermsModal'; -import DomainNavigator from '../../../../../../domain/nestedDomains/domainNavigator/DomainNavigator'; -import ClickOutside from '../../../../../../shared/ClickOutside'; -import { ANTD_GRAY } from '../../../../constants'; +import { getModalDomContainer } from '@src/utils/focus'; + +import { useBatchSetDomainMutation } from '@graphql/mutations.generated'; +import { useGetAutoCompleteResultsLazyQuery } from '@graphql/search.generated'; +import { Domain, Entity, EntityType } from '@types'; type Props = { urns: string[]; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDataProductsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDataProductsSection.tsx index 0a01619533..43bf91432b 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDataProductsSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDataProductsSection.tsx @@ -1,13 +1,14 @@ import React from 'react'; -import styled from 'styled-components/macro'; import { useHistory } from 'react-router'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { SidebarSection } from '../SidebarSection'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { navigateToDomainDataProducts } from './utils'; -import { pluralize } from '../../../../../../shared/textUtil'; -import EmptySectionText from '../EmptySectionText'; -import { REDESIGN_COLORS } from '../../../../constants'; +import styled from 'styled-components/macro'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { navigateToDomainDataProducts } from '@app/entityV2/shared/containers/profile/sidebar/Domain/utils'; +import EmptySectionText from '@app/entityV2/shared/containers/profile/sidebar/EmptySectionText'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { pluralize } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const Section = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx index 0ed70ac130..9e9e411167 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx @@ -1,17 +1,19 @@ -import React, { useState } from 'react'; -import styled from 'styled-components'; -import { Modal, message } from 'antd'; import AddRoundedIcon from '@mui/icons-material/AddRounded'; import EditOutlinedIcon from '@mui/icons-material/EditOutlined'; -import { EMPTY_MESSAGES } from '../../../../constants'; -import { useEntityData, useMutationUrn, useRefetch } from '../../../../../../entity/shared/EntityContext'; -import { SetDomainModal } from './SetDomainModal'; -import { useUnsetDomainMutation } from '../../../../../../../graphql/mutations.generated'; -import { DomainLink } from '../../../../../../sharedV2/tags/DomainLink'; -import { ENTITY_PROFILE_DOMAINS_ID } from '../../../../../../onboarding/config/EntityProfileOnboardingConfig'; -import { SidebarSection } from '../SidebarSection'; -import SectionActionButton from '../SectionActionButton'; -import EmptySectionText from '../EmptySectionText'; +import { Modal, message } from 'antd'; +import React, { useState } from 'react'; +import styled from 'styled-components'; + +import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import { EMPTY_MESSAGES } from '@app/entityV2/shared/constants'; +import { SetDomainModal } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SetDomainModal'; +import EmptySectionText from '@app/entityV2/shared/containers/profile/sidebar/EmptySectionText'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { ENTITY_PROFILE_DOMAINS_ID } from '@app/onboarding/config/EntityProfileOnboardingConfig'; +import { DomainLink } from '@app/sharedV2/tags/DomainLink'; + +import { useUnsetDomainMutation } from '@graphql/mutations.generated'; const Content = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesLoadingSection.tsx index df1e94b02e..08dbe86350 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesLoadingSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesLoadingSection.tsx @@ -1,7 +1,8 @@ -import React from 'react'; -import { Spin } from 'antd'; import { LoadingOutlined } from '@ant-design/icons'; -import { ANTD_GRAY } from '../../../../constants'; +import { Spin } from 'antd'; +import React from 'react'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const SidebarEntitiesLoadingSection = () => { return } />; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesSection.tsx index 1cce433701..4b52901b7e 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesSection.tsx @@ -1,14 +1,20 @@ import React, { useEffect } from 'react'; -import styled from 'styled-components/macro'; import { useHistory } from 'react-router'; -import { useEntityContext, useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { SidebarSection } from '../SidebarSection'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { getContentsSummary, getContentsSummaryText, navigateToDomainEntities } from './utils'; -import { useGetDomainEntitySummaryQuery } from '../../../../../../../graphql/domain.generated'; -import SidebarEntitiesLoadingSection from './SidebarEntitiesLoadingSection'; -import EmptySectionText from '../EmptySectionText'; -import { REDESIGN_COLORS } from '../../../../constants'; +import styled from 'styled-components/macro'; + +import { useEntityContext, useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import SidebarEntitiesLoadingSection from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesLoadingSection'; +import { + getContentsSummary, + getContentsSummaryText, + navigateToDomainEntities, +} from '@app/entityV2/shared/containers/profile/sidebar/Domain/utils'; +import EmptySectionText from '@app/entityV2/shared/containers/profile/sidebar/EmptySectionText'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetDomainEntitySummaryQuery } from '@graphql/domain.generated'; const Section = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/utils.tsx index b29dac6135..8f1fea31cc 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/utils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/utils.tsx @@ -1,11 +1,13 @@ +import * as QueryString from 'query-string'; import React from 'react'; import styled from 'styled-components'; -import * as QueryString from 'query-string'; -import { AggregationMetadata, EntityType, FacetMetadata, SearchResults } from '../../../../../../../types.generated'; -import filtersToQueryStringParams from '../../../../../../search/utils/filtersToQueryStringParams'; -import { pluralize } from '../../../../../../shared/textUtil'; -import { EntityRegistry } from '../../../../../../../entityRegistryContext'; -import { ANTD_GRAY } from '../../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import filtersToQueryStringParams from '@app/search/utils/filtersToQueryStringParams'; +import { pluralize } from '@app/shared/textUtil'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { AggregationMetadata, EntityType, FacetMetadata, SearchResults } from '@types'; const UNIT_SEPARATOR = '␞'; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EmptySectionText.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EmptySectionText.tsx index fb8bdfed8d..dc9a9d92bf 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EmptySectionText.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EmptySectionText.tsx @@ -1,7 +1,8 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { REDESIGN_COLORS } from '../../../constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; const EmptyContentMessage = styled(Typography.Text)` font-size: 12px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityBackButton.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityBackButton.tsx index 92ae03ca5f..bdd5a01613 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityBackButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityBackButton.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { useHistory } from 'react-router'; -import { BackButton } from '../../../../../sharedV2/buttons/BackButton'; + +import { BackButton } from '@app/sharedV2/buttons/BackButton'; export const EntityBackButton = () => { const history = useHistory(); diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx index ca28767a61..a4dbce6eb9 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx @@ -1,13 +1,15 @@ import Link from 'antd/lib/typography/Link'; import React from 'react'; import styled from 'styled-components'; -import PlatformContent from '../../header/PlatformContent'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { StyledDivider } from '../FormInfo/components'; -import { DatasetStatsSummarySubHeader } from '../../../../../dataset/profile/stats/stats/DatasetStatsSummarySubHeader'; -import LinkOut from '../../../../../../../images/link-out.svg?react'; -import FormInfo from '../FormInfo/FormInfo'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { DatasetStatsSummarySubHeader } from '@app/entityV2/dataset/profile/stats/stats/DatasetStatsSummarySubHeader'; +import PlatformContent from '@app/entityV2/shared/containers/profile/header/PlatformContent'; +import FormInfo from '@app/entityV2/shared/containers/profile/sidebar/FormInfo/FormInfo'; +import { StyledDivider } from '@app/entityV2/shared/containers/profile/sidebar/FormInfo/components'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import LinkOut from '@images/link-out.svg?react'; const EntityName = styled.div` font-size: 16px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar.tsx index 17563ae049..f10e7281c3 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar.tsx @@ -1,12 +1,13 @@ /* eslint-disable prefer-template */ import React, { useContext, useState } from 'react'; import styled from 'styled-components'; + +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { EntitySidebarTabs } from '@app/entityV2/shared/containers/profile/sidebar/EntitySidebarTabs'; +import SidebarCollapsibleHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarCollapsibleHeader'; +import { EntitySidebarTab, TabContextType, TabRenderType } from '@app/entityV2/shared/types'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import EntitySidebarContext from '../../../../../sharedV2/EntitySidebarContext'; -import { EntitySidebarTab, TabContextType, TabRenderType } from '../../../types'; -import { EntitySidebarTabs } from './EntitySidebarTabs'; -import { EntityMenuItems } from '../../../EntityDropdown/EntityMenuActions'; -import SidebarCollapsibleHeader from './SidebarCollapsibleHeader'; export const StyledEntitySidebarContainer = styled.div<{ isCollapsed: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebarSearchHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebarSearchHeader.tsx index 4de4b889a5..5b3cdc8aa2 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebarSearchHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebarSearchHeader.tsx @@ -1,12 +1,13 @@ import { Button } from 'antd'; import React, { useContext } from 'react'; import styled from 'styled-components'; -import EntitySidebarContext from '../../../../../sharedV2/EntitySidebarContext'; -import SidebarBackArrow from '../../../../../../images/sidebarBackArrow.svg?react'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { SEARCH_COLORS } from '../../../constants'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import SidebarBackArrow from '@images/sidebarBackArrow.svg?react'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebar.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebar.tsx index 39acada71b..33eaaafce0 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebar.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { useBaseEntity, useEntityData } from '../../../../../entity/shared/EntityContext'; -import { EntitySidebarSection, TabContextType, TabRenderType } from '../../../types'; -import { ENTITY_PROFILE_V2_SIDEBAR_ID } from '../../../../../onboarding/config/EntityProfileOnboardingConfig'; + +import { useBaseEntity, useEntityData } from '@app/entity/shared/EntityContext'; +import { EntitySidebarSection, TabContextType, TabRenderType } from '@app/entityV2/shared/types'; +import { ENTITY_PROFILE_V2_SIDEBAR_ID } from '@app/onboarding/config/EntityProfileOnboardingConfig'; const Container = styled.div` padding: 0px 18px 18px 18px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab.tsx index dedf0f0624..f6e11ce9cd 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import { EntitySidebarSections } from './EntitySidebar'; -import { EntitySidebarSection, TabContextType, TabRenderType } from '../../../types'; -import SidebarFormInfoWrapper from './FormInfo/SidebarFormInfoWrapper'; + +import { EntitySidebarSections } from '@app/entityV2/shared/containers/profile/sidebar/EntitySidebar'; +import SidebarFormInfoWrapper from '@app/entityV2/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper'; +import { EntitySidebarSection, TabContextType, TabRenderType } from '@app/entityV2/shared/types'; const DEFAULT_SIDEBAR_SECTION = { visible: (_, _1) => true, diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarTabs.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarTabs.tsx index f5129cbec3..8a0dd0edd5 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarTabs.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarTabs.tsx @@ -1,11 +1,12 @@ +import { Tooltip } from '@components'; +import { ArrowLineLeft, ArrowLineRight } from '@phosphor-icons/react'; +import { Tabs } from 'antd'; import React, { useContext } from 'react'; import styled from 'styled-components/macro'; -import { Tabs } from 'antd'; -import { ArrowLineLeft, ArrowLineRight } from '@phosphor-icons/react'; -import { Tooltip } from '@components'; -import { EntitySidebarTab } from '../../../types'; -import { useBaseEntity, useEntityData } from '../../../../../entity/shared/EntityContext'; -import EntitySidebarContext from '../../../../../sharedV2/EntitySidebarContext'; + +import { useBaseEntity, useEntityData } from '@app/entity/shared/EntityContext'; +import { EntitySidebarTab } from '@app/entityV2/shared/types'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; type Props = { tabs: EntitySidebarTab[]; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ExploreLineageAction.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ExploreLineageAction.tsx index 4b5b1117d8..4b793efbe9 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ExploreLineageAction.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ExploreLineageAction.tsx @@ -1,12 +1,13 @@ +import { Tooltip } from '@components'; import React, { useContext } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { Tooltip } from '@components'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getEntityPath } from '@app/entityV2/shared/containers/profile/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import CompactContext from '@src/app/shared/CompactContext'; -import { REDESIGN_COLORS } from '../../../constants'; -import { getEntityPath } from '../utils'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; const ActionButton = styled(Link)` height: 22px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/CompletedView.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/CompletedView.tsx index 313d660879..67a30e80b9 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/CompletedView.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/CompletedView.tsx @@ -1,5 +1,7 @@ import React, { useState } from 'react'; -import { Button } from '@src/alchemy-components'; + +import OptionalPromptsRemaining from '@app/entity/shared/containers/profile/sidebar/FormInfo/OptionalPromptsRemaining'; +import VerificationAuditStamp from '@app/entity/shared/containers/profile/sidebar/FormInfo/VerificationAuditStamp'; import { CTAWrapper, Content, @@ -10,10 +12,10 @@ import { StyledReadOutlined, Title, TitleWrapper, -} from './components'; -import OptionalPromptsRemaining from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/OptionalPromptsRemaining'; -import VerificationAuditStamp from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/VerificationAuditStamp'; -import ShieldCheck from '../../../../../../../images/shield-check.svg'; +} from '@app/entityV2/shared/containers/profile/sidebar/FormInfo/components'; +import { Button } from '@src/alchemy-components'; + +import ShieldCheck from '@images/shield-check.svg'; interface Props { showVerificationStyles: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/FormInfo.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/FormInfo.tsx index 5a09d5c10b..66f350dc9f 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/FormInfo.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/FormInfo.tsx @@ -1,13 +1,14 @@ import React from 'react'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import useGetPromptInfo from '@app/entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo'; +import useIsUserAssigned from '@app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned'; import { isVerificationComplete, shouldShowVerificationInfo, -} from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/utils'; -import CompletedView from './CompletedView'; -import IncompleteView from './IncompleteView'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import useGetPromptInfo from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo'; -import useIsUserAssigned from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned'; +} from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; +import CompletedView from '@app/entityV2/shared/containers/profile/sidebar/FormInfo/CompletedView'; +import IncompleteView from '@app/entityV2/shared/containers/profile/sidebar/FormInfo/IncompleteView'; interface Props { formUrn?: string; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/IncompleteView.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/IncompleteView.tsx index 06a0dc7968..8f99d85e24 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/IncompleteView.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/IncompleteView.tsx @@ -1,7 +1,8 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import { Button } from '@src/alchemy-components'; -import ShieldExclamation from '../../../../../../../images/shield-exclamation.svg'; + +import OptionalPromptsRemaining from '@app/entity/shared/containers/profile/sidebar/FormInfo/OptionalPromptsRemaining'; +import RequiredPromptsRemaining from '@app/entity/shared/containers/profile/sidebar/FormInfo/RequiredPromptsRemaining'; import { CTAWrapper, Content, @@ -12,9 +13,10 @@ import { StyledReadOutlined, Title, TitleWrapper, -} from './components'; -import OptionalPromptsRemaining from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/OptionalPromptsRemaining'; -import RequiredPromptsRemaining from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/RequiredPromptsRemaining'; +} from '@app/entityV2/shared/containers/profile/sidebar/FormInfo/components'; +import { Button } from '@src/alchemy-components'; + +import ShieldExclamation from '@images/shield-exclamation.svg'; const Text = styled.div` text-wrap: wrap; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx index 3095fdbffc..d631576cb4 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx @@ -1,11 +1,12 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import EntityFormModal from '../../../../entityForm/EntityFormModal'; -import FormInfo from './FormInfo'; -import analytics, { DocRequestCTASource, EventType } from '../../../../../../analytics'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { getFormAssociations } from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/utils'; -import FormSelectionModal from '../../../../../../entity/shared/entityForm/FormSelectionModal/FormSelectionModal'; + +import analytics, { DocRequestCTASource, EventType } from '@app/analytics'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { getFormAssociations } from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils'; +import FormSelectionModal from '@app/entity/shared/entityForm/FormSelectionModal/FormSelectionModal'; +import FormInfo from '@app/entityV2/shared/containers/profile/sidebar/FormInfo/FormInfo'; +import EntityFormModal from '@app/entityV2/shared/entityForm/EntityFormModal'; const FormInfoWrapper = styled.div` padding: 12px 0px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/components.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/components.ts index 0033f01ecc..7985c2ac5d 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/components.ts +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/components.ts @@ -1,6 +1,6 @@ import { ReadFilled, ReadOutlined } from '@ant-design/icons'; -import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined'; import Icon from '@ant-design/icons/lib/components/Icon'; +import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined'; import { Divider } from 'antd'; import styled from 'styled-components'; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/HeaderAndTabs.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/HeaderAndTabs.tsx index ac9ae7b1ab..e1fa4129c2 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/HeaderAndTabs.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/HeaderAndTabs.tsx @@ -1,4 +1,4 @@ -import React, { useState, useCallback } from 'react'; +import React, { useCallback, useState } from 'react'; import styled from 'styled-components'; let isResizing = false; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LastIngested.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LastIngested.tsx index 591f0f7047..07a6c439e4 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LastIngested.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LastIngested.tsx @@ -1,16 +1,17 @@ import { green, orange, red } from '@ant-design/colors'; -import { Image } from 'antd'; +import { QuestionCircleOutlined } from '@ant-design/icons'; import { Popover } from '@components'; -import styled from 'styled-components/macro'; +import { Image } from 'antd'; import moment from 'moment-timezone'; import React from 'react'; -import { QuestionCircleOutlined } from '@ant-design/icons'; -import { toLocalDateTimeString, toRelativeTimeString } from '../../../../../shared/time/timeUtils'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../constants'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { getPlatformName } from '../../../utils'; -import { getDisplayedEntityType } from '../header/utils'; +import styled from 'styled-components/macro'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getDisplayedEntityType } from '@app/entityV2/shared/containers/profile/header/utils'; +import { getPlatformName } from '@app/entityV2/shared/utils'; +import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const StyledDot = styled.div<{ color: string }>` border: 1px solid ${ANTD_GRAY[5]}; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageLoadingSection.tsx index ceca535c44..31cdbb294f 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageLoadingSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageLoadingSection.tsx @@ -1,7 +1,8 @@ -import React from 'react'; -import { Spin } from 'antd'; import { LoadingOutlined } from '@ant-design/icons'; -import { ANTD_GRAY } from '../../../../constants'; +import { Spin } from 'antd'; +import React from 'react'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const SidebarLineageLoadingSection = () => { return } />; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageSection.tsx index efbb97e600..5e34705200 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageSection.tsx @@ -1,20 +1,26 @@ -import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; -import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams'; +import { ArrowDownOutlined, ArrowUpOutlined, PartitionOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { Tooltip } from '@components'; -import { ArrowDownOutlined, ArrowUpOutlined, PartitionOutlined } from '@ant-design/icons'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import SidebarLineageLoadingSection from '@app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageLoadingSection'; +import { + getDirectDownstreamSummary, + getDirectUpstreamSummary, + getRelatedEntitySummary, +} from '@app/entityV2/shared/containers/profile/sidebar/Lineage/utils'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; +import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams'; +import { useEmbeddedProfileLinkProps } from '@app/shared/useEmbeddedProfileLinkProps'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import UpstreamHealth from '@src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth'; -import { useGetSearchAcrossLineageCountsQuery } from '../../../../../../../graphql/lineage.generated'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { SidebarSection } from '../SidebarSection'; -import { getDirectDownstreamSummary, getDirectUpstreamSummary, getRelatedEntitySummary } from './utils'; -import SidebarLineageLoadingSection from './SidebarLineageLoadingSection'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../../constants'; -import SectionActionButton from '../SectionActionButton'; -import { useEmbeddedProfileLinkProps } from '../../../../../../shared/useEmbeddedProfileLinkProps'; + +import { useGetSearchAcrossLineageCountsQuery } from '@graphql/lineage.generated'; const Section = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/utils.tsx index dc6df4b148..f13b0878e0 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/utils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/utils.tsx @@ -1,13 +1,10 @@ import React from 'react'; import styled from 'styled-components'; -import { - AggregationMetadata, - EntityType, - FacetMetadata, - SearchAcrossLineageResults, -} from '../../../../../../../types.generated'; -import { EntityRegistry } from '../../../../../../../entityRegistryContext'; -import { pluralize } from '../../../../../../shared/textUtil'; + +import { pluralize } from '@app/shared/textUtil'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { AggregationMetadata, EntityType, FacetMetadata, SearchAcrossLineageResults } from '@types'; const UNIT_SEPARATOR = '␞'; @@ -113,7 +110,9 @@ export const getRelatedEntitySummary = ( {type.count}{' '} {pluralize( type.count, - type.isEntityType ? entityRegistry.getEntityName(type.type as EntityType) ?? '' : type.type, + type.isEntityType + ? (entityRegistry.getEntityName(type.type as EntityType) ?? '') + : type.type, ).toLocaleLowerCase()} {idx < summary.types.length - 1 && <>, } diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LinkButton.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LinkButton.tsx index c3896baeda..65f47712f4 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LinkButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LinkButton.tsx @@ -2,7 +2,8 @@ import { LinkOutlined } from '@ant-design/icons'; import { Button } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { InstitutionalMemoryMetadata } from '../../../../../../types.generated'; + +import { InstitutionalMemoryMetadata } from '@types'; export const StyledLink = styled(Button)` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx index 44febc52a4..430826809a 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx @@ -1,24 +1,23 @@ -import React, { ReactNode, useEffect, useMemo, useRef, useState } from 'react'; -import { Empty, Form, message, Modal, Select, Tag, Typography } from 'antd'; -import styled from 'styled-components/macro'; -import { getModalDomContainer } from '@src/utils/focus'; -import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; import { LoadingOutlined } from '@ant-design/icons'; +import { Empty, Form, Modal, Select, Tag, Typography, message } from 'antd'; +import React, { ReactNode, useEffect, useMemo, useRef, useState } from 'react'; +import styled from 'styled-components/macro'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import OwnershipTypesSelect from '@app/entityV2/shared/containers/profile/sidebar/Ownership/OwnershipTypesSelect'; +import { handleBatchError } from '@app/entityV2/shared/utils'; +import { OwnerLabel } from '@app/shared/OwnerLabel'; +import { useGetRecommendations } from '@app/shared/recommendation'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { Button } from '@src/alchemy-components'; +import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; -import { CorpUser, Entity, EntityType, OwnerEntityType } from '../../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import analytics, { EventType, EntityActionType } from '../../../../../../analytics'; -import { - useBatchAddOwnersMutation, - useBatchRemoveOwnersMutation, -} from '../../../../../../../graphql/mutations.generated'; -import { useGetAutoCompleteResultsLazyQuery } from '../../../../../../../graphql/search.generated'; -import { useGetRecommendations } from '../../../../../../shared/recommendation'; -import { OwnerLabel } from '../../../../../../shared/OwnerLabel'; -import { handleBatchError } from '../../../../utils'; -import { useListOwnershipTypesQuery } from '../../../../../../../graphql/ownership.generated'; -import OwnershipTypesSelect from './OwnershipTypesSelect'; +import { getModalDomContainer } from '@src/utils/focus'; + +import { useBatchAddOwnersMutation, useBatchRemoveOwnersMutation } from '@graphql/mutations.generated'; +import { useListOwnershipTypesQuery } from '@graphql/ownership.generated'; +import { useGetAutoCompleteResultsLazyQuery } from '@graphql/search.generated'; +import { CorpUser, Entity, EntityType, OwnerEntityType } from '@types'; const SelectInput = styled(Select)` width: 480px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx index 9ff7ed8f29..c0c1ed4f16 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx @@ -1,8 +1,9 @@ import { AutoComplete, Form } from 'antd'; import { FormInstance } from 'antd/es/form/Form'; import React, { useState } from 'react'; -import { useGetAutoCompleteResultsLazyQuery } from '../../../../../../../graphql/search.generated'; -import { EntityType } from '../../../../../../../types.generated'; + +import { useGetAutoCompleteResultsLazyQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; const OWNER_SEARCH_PLACEHOLDER = 'Search an LDAP'; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/OwnershipTypesSelect.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/OwnershipTypesSelect.tsx index dede9b4beb..63c2cd7f16 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/OwnershipTypesSelect.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/OwnershipTypesSelect.tsx @@ -1,8 +1,9 @@ -import { OwnershipTypeEntity } from '@src/types.generated'; import { Select, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; +import { OwnershipTypeEntity } from '@src/types.generated'; + const StyledSelect = styled(Select)` .ant-select-selection-placeholder { font-size: 12px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts index a5f5c9b382..77eb6e37cf 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts @@ -1,5 +1,6 @@ -import { OwnershipType, OwnershipTypeEntity } from '../../../../../../../types.generated'; -import { forcePluralize } from '../../../../../../shared/textUtil'; +import { forcePluralize } from '@app/shared/textUtil'; + +import { OwnershipType, OwnershipTypeEntity } from '@types'; /** * A mapping from OwnershipType to it's display name & description. In the future, diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx index 840be2c1df..79fb88e120 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx @@ -1,11 +1,13 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Typography } from 'antd'; -import { Owner, OwnershipTypeEntity } from '../../../../../../../../types.generated'; -import { ExpandedOwner } from '../../../../../components/styled/ExpandedOwner/ExpandedOwner'; -import { useMutationUrn, useRefetch } from '../../../../../../../entity/shared/EntityContext'; -import { getOwnershipTypeName } from '../ownershipUtils'; -import { REDESIGN_COLORS } from '../../../../../constants'; + +import { useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import { ExpandedOwner } from '@app/entityV2/shared/components/styled/ExpandedOwner/ExpandedOwner'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getOwnershipTypeName } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils'; + +import { Owner, OwnershipTypeEntity } from '@types'; const OwnershipTypeContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx index 637eed21ad..6e7dae0fa4 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx @@ -1,17 +1,19 @@ +import AddRoundedIcon from '@mui/icons-material/AddRounded'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import AddRoundedIcon from '@mui/icons-material/AddRounded'; + +import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; // import { ExpandedOwner } from '../../../../../components/styled/ExpandedOwner/ExpandedOwner'; -import { EMPTY_MESSAGES } from '../../../../../constants'; -import { Owner, OwnershipType, OwnershipTypeEntity } from '../../../../../../../../types.generated'; -import { useEntityData, useMutationUrn, useRefetch } from '../../../../../../../entity/shared/EntityContext'; -import { EditOwnersModal } from '../EditOwnersModal'; -import { ENTITY_PROFILE_OWNERS_ID } from '../../../../../../../onboarding/config/EntityProfileOnboardingConfig'; -import { OwnershipTypeSection } from './OwnershipTypeSection'; -import { getOwnershipTypeName } from '../ownershipUtils'; -import { SidebarSection } from '../../SidebarSection'; -import SectionActionButton from '../../SectionActionButton'; -import EmptySectionText from '../../EmptySectionText'; +import { EMPTY_MESSAGES } from '@app/entityV2/shared/constants'; +import EmptySectionText from '@app/entityV2/shared/containers/profile/sidebar/EmptySectionText'; +import { EditOwnersModal } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/EditOwnersModal'; +import { getOwnershipTypeName } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils'; +import { OwnershipTypeSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { ENTITY_PROFILE_OWNERS_ID } from '@app/onboarding/config/EntityProfileOnboardingConfig'; + +import { Owner, OwnershipType, OwnershipTypeEntity } from '@types'; const Content = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx index 80e5c53df2..f5e2a5241a 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx @@ -1,10 +1,12 @@ -import { Button, Form, Modal, Select, Tag } from 'antd'; import { Tooltip } from '@components'; +import { Button, Form, Modal, Select, Tag } from 'antd'; import React, { ReactNode, useRef, useState } from 'react'; import styled from 'styled-components/macro'; -import { useGetSearchResultsLazyQuery } from '../../../../../../../graphql/search.generated'; -import { DataPlatform, Entity, EntityType } from '../../../../../../../types.generated'; -import { useEnterKeyListener } from '../../../../../../shared/useEnterKeyListener'; + +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; + +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { DataPlatform, Entity, EntityType } from '@types'; type Props = { onCloseModal: () => void; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ProfileSidebarResizer.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ProfileSidebarResizer.tsx index 3a05ad9991..82eb245ff4 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ProfileSidebarResizer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ProfileSidebarResizer.tsx @@ -1,7 +1,8 @@ -import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; import React from 'react'; import styled from 'styled-components'; +import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; + type Props = { setSidePanelWidth: (width: number) => void; initialSize: number; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryCreatedAtSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryCreatedAtSection.tsx index a5a5ce725e..7a691599fc 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryCreatedAtSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryCreatedAtSection.tsx @@ -1,10 +1,12 @@ import React from 'react'; + // import styled from 'styled-components/macro'; -import { useBaseEntity } from '../../../../../../entity/shared/EntityContext'; -import { SidebarSection } from '../SidebarSection'; -import { QueryEntity } from '../../../../../../../types.generated'; -import { toRelativeTimeString } from '../../../../../../shared/time/timeUtils'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { toRelativeTimeString } from '@app/shared/time/timeUtils'; + +import { QueryEntity } from '@types'; export default function SidebarQueryUpdatedAtSection() { const baseEntity = useBaseEntity<{ entity: QueryEntity }>(); diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDefinitionSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDefinitionSection.tsx index 10cf3206f4..77faed826b 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDefinitionSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDefinitionSection.tsx @@ -1,11 +1,13 @@ import React from 'react'; import styled from 'styled-components'; -import { useBaseEntity } from '../../../../../../entity/shared/EntityContext'; -import { QueryEntity } from '../../../../../../../types.generated'; -import { SidebarSection } from '../SidebarSection'; -import PlatformIcon from '../../../../../../sharedV2/icons/PlatformIcon'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { REDESIGN_COLORS } from '../../../../constants'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import PlatformIcon from '@app/sharedV2/icons/PlatformIcon'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { QueryEntity } from '@types'; const DefinitionLink = styled.a` align-items: center; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDescriptionSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDescriptionSection.tsx index 3ba32cc0f4..a44e243b73 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDescriptionSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDescriptionSection.tsx @@ -1,10 +1,11 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { useBaseEntity } from '../../../../../../entity/shared/EntityContext'; -import { SidebarSection } from '../SidebarSection'; -import { QueryEntity } from '../../../../../../../types.generated'; -import { REDESIGN_COLORS } from '../../../../constants'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; + +import { QueryEntity } from '@types'; const ContentWrapper = styled.div` font-size: 12px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection.tsx index a619a9ab81..a0e5a00be3 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection.tsx @@ -1,9 +1,10 @@ import React, { useContext } from 'react'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; import styled from 'styled-components'; -import EntitySidebarContext, { FineGrainedOperation } from '../../../../../../sharedV2/EntitySidebarContext'; -import { REDESIGN_COLORS } from '../../../../constants'; -import { SidebarSection } from '../SidebarSection'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import EntitySidebarContext, { FineGrainedOperation } from '@app/sharedV2/EntitySidebarContext'; export default function SidebarQueryOperationsSection() { const { fineGrainedOperations } = useContext(EntitySidebarContext); diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryUpdatedAtSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryUpdatedAtSection.tsx index 9937b2274b..70722250d9 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryUpdatedAtSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryUpdatedAtSection.tsx @@ -1,10 +1,12 @@ import React from 'react'; + // import styled from 'styled-components/macro'; -import { useBaseEntity } from '../../../../../../entity/shared/EntityContext'; -import { SidebarSection } from '../SidebarSection'; -import { QueryEntity } from '../../../../../../../types.generated'; -import { toRelativeTimeString } from '../../../../../../shared/time/timeUtils'; +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { toRelativeTimeString } from '@app/shared/time/timeUtils'; + +import { QueryEntity } from '@types'; export default function SidebarQueryUpdatedAtSection() { const baseEntity = useBaseEntity<{ entity: QueryEntity }>(); diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx index db233598f3..697eaaf7f1 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx @@ -1,14 +1,12 @@ import React from 'react'; import styled from 'styled-components'; -import { useListRecommendationsQuery } from '../../../../../../../graphql/recommendations.generated'; -import { - EntityType, - ScenarioType, - RecommendationModule as RecommendationModuleType, -} from '../../../../../../../types.generated'; -import { RecommendationModule } from '../../../../../../recommendations/RecommendationModule'; -import { RecommendationDisplayType } from '../../../../../../recommendations/types'; -import { SidebarHeader } from '../SidebarHeader'; + +import { SidebarHeader } from '@app/entityV2/shared/containers/profile/sidebar/SidebarHeader'; +import { RecommendationModule } from '@app/recommendations/RecommendationModule'; +import { RecommendationDisplayType } from '@app/recommendations/types'; + +import { useListRecommendationsQuery } from '@graphql/recommendations.generated'; +import { EntityType, RecommendationModule as RecommendationModuleType, ScenarioType } from '@types'; const RecommendationsContainer = styled.div``; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx index c79a386749..20b5510658 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import { useUserContext } from '../../../../../../context/useUserContext'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { SidebarEntityRecommendations } from './SidebarEntityRecommendations'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { SidebarEntityRecommendations } from '@app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations'; const RecommendationsContainer = styled.div``; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SectionActionButton.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SectionActionButton.tsx index 4c6f050d7c..1f41ec85da 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SectionActionButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SectionActionButton.tsx @@ -1,7 +1,8 @@ +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; -import { REDESIGN_COLORS } from '../../../constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; export const ActionButton = styled.div<{ privilege: boolean }>` color: ${(props) => diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapseIcon.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapseIcon.tsx index b83ba3f6e4..2efd009000 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapseIcon.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapseIcon.tsx @@ -1,9 +1,10 @@ import { Tooltip } from '@components'; +import { ArrowLeft, ArrowRight } from '@phosphor-icons/react'; import React, { useContext } from 'react'; import styled from 'styled-components'; -import { ArrowLeft, ArrowRight } from '@phosphor-icons/react'; -import EntitySidebarContext from '../../../../../sharedV2/EntitySidebarContext'; -import { REDESIGN_COLORS, SEARCH_COLORS } from '../../../constants'; + +import { REDESIGN_COLORS, SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapsibleHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapsibleHeader.tsx index 04a723b5f8..02f69bab0f 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapsibleHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapsibleHeader.tsx @@ -1,14 +1,15 @@ -import ViewInPlatform from '@app/entityV2/shared/externalUrl/ViewInPlatform'; +import { colors } from '@components'; +import { Typography } from 'antd'; import React, { useContext } from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { colors } from '@components'; -import EntitySidebarContext from '../../../../../sharedV2/EntitySidebarContext'; -import { EntitySidebarTab } from '../../../types'; -import { TitleAction } from './TitleAction'; -import MoreOptionsMenuAction from '../../../EntityDropdown/MoreOptionsMenuAction'; -import { EntityMenuItems } from '../../../EntityDropdown/EntityMenuActions'; -import { useEntityData, useRefetch } from '../../../../../entity/shared/EntityContext'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import MoreOptionsMenuAction from '@app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction'; +import { TitleAction } from '@app/entityV2/shared/containers/profile/sidebar/TitleAction'; +import ViewInPlatform from '@app/entityV2/shared/externalUrl/ViewInPlatform'; +import { EntitySidebarTab } from '@app/entityV2/shared/types'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; const Controls = styled.div<{ isCollapsed: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCompactSchemaSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCompactSchemaSection.tsx index 0154bcdd11..2e8e423b3a 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCompactSchemaSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCompactSchemaSection.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import { ENTITY_PROFILE_SCHEMA_ID } from '../../../../../onboarding/config/EntityProfileOnboardingConfig'; -import { SidebarSection } from './SidebarSection'; -import { TabRenderType } from '../../../types'; -import { SchemaTab } from '../../../tabs/Dataset/Schema/SchemaTab'; + +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { SchemaTab } from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaTab'; +import { TabRenderType } from '@app/entityV2/shared/types'; +import { ENTITY_PROFILE_SCHEMA_ID } from '@app/onboarding/config/EntityProfileOnboardingConfig'; export const SidebarCompactSchemaSection = () => { return ( diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader.tsx index 1a078c532d..25332c1318 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader.tsx @@ -1,22 +1,24 @@ -import VersioningBadge from '@app/entityV2/shared/versioning/VersioningBadge'; import React from 'react'; import styled from 'styled-components'; -import { useEntityData, useRefetch } from '../../../../../entity/shared/EntityContext'; -import { Container, DataPlatform, EntityType, Post, Entity } from '../../../../../../types.generated'; -import ContextPath from '../../../../../previewV2/ContextPath'; -import HealthIcon from '../../../../../previewV2/HealthIcon'; -import NotesIcon from '../../../../../previewV2/NotesIcon'; -import useContentTruncation from '../../../../../shared/useContentTruncation'; -import HorizontalScroller from '../../../../../sharedV2/carousel/HorizontalScroller'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { IconStyleType } from '../../../../Entity'; -import EntityTitleLoadingSection from '../header/EntityHeaderLoadingSection'; -import EntityName from '../header/EntityName'; -import ContainerIcon from '../header/PlatformContent/ContainerIcon'; -import PlatformHeaderIcons from '../header/PlatformContent/PlatformHeaderIcons'; -import StructuredPropertyBadge from '../header/StructuredPropertyBadge'; -import { getDisplayedEntityType } from '../header/utils'; -import { DeprecationIcon } from '../../../components/styled/DeprecationIcon'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { IconStyleType } from '@app/entityV2/Entity'; +import { DeprecationIcon } from '@app/entityV2/shared/components/styled/DeprecationIcon'; +import EntityTitleLoadingSection from '@app/entityV2/shared/containers/profile/header/EntityHeaderLoadingSection'; +import EntityName from '@app/entityV2/shared/containers/profile/header/EntityName'; +import ContainerIcon from '@app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon'; +import PlatformHeaderIcons from '@app/entityV2/shared/containers/profile/header/PlatformContent/PlatformHeaderIcons'; +import StructuredPropertyBadge from '@app/entityV2/shared/containers/profile/header/StructuredPropertyBadge'; +import { getDisplayedEntityType } from '@app/entityV2/shared/containers/profile/header/utils'; +import VersioningBadge from '@app/entityV2/shared/versioning/VersioningBadge'; +import ContextPath from '@app/previewV2/ContextPath'; +import HealthIcon from '@app/previewV2/HealthIcon'; +import NotesIcon from '@app/previewV2/NotesIcon'; +import useContentTruncation from '@app/shared/useContentTruncation'; +import HorizontalScroller from '@app/sharedV2/carousel/HorizontalScroller'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Container, DataPlatform, Entity, EntityType, Post } from '@types'; const TitleContainer = styled(HorizontalScroller)` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection.tsx index 3de7f199a8..3339d9fdd6 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection.tsx @@ -1,15 +1,17 @@ +import AddRoundedIcon from '@mui/icons-material/AddRounded'; import React, { useState } from 'react'; import styled from 'styled-components'; -import AddRoundedIcon from '@mui/icons-material/AddRounded'; -import TagTermGroup from '../../../../../sharedV2/tags/TagTermGroup'; -import { useEntityData, useMutationUrn, useRefetch } from '../../../../../entity/shared/EntityContext'; -import { ENTITY_PROFILE_GLOSSARY_TERMS_ID } from '../../../../../onboarding/config/EntityProfileOnboardingConfig'; -import { SidebarSection } from './SidebarSection'; -import { EntityType } from '../../../../../../types.generated'; -import EmptySectionText from './EmptySectionText'; -import { EMPTY_MESSAGES } from '../../../constants'; -import SectionActionButton from './SectionActionButton'; -import AddTagTerm from '../../../../../sharedV2/tags/AddTagTerm'; + +import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import { EMPTY_MESSAGES } from '@app/entityV2/shared/constants'; +import EmptySectionText from '@app/entityV2/shared/containers/profile/sidebar/EmptySectionText'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { ENTITY_PROFILE_GLOSSARY_TERMS_ID } from '@app/onboarding/config/EntityProfileOnboardingConfig'; +import AddTagTerm from '@app/sharedV2/tags/AddTagTerm'; +import TagTermGroup from '@app/sharedV2/tags/TagTermGroup'; + +import { EntityType } from '@types'; const Content = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeader.tsx index 0ee3fcb90e..1cbe038307 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeader.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const HeaderContainer = styled.div` diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeaderSectionColumns.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeaderSectionColumns.tsx index d6619c0848..1e8e225e87 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeaderSectionColumns.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeaderSectionColumns.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import HorizontalScroller from '../../../../../sharedV2/carousel/HorizontalScroller'; -import { REDESIGN_COLORS } from '../../../constants'; -import { SidebarStatsColumn } from '../utils'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SidebarStatsColumn } from '@app/entityV2/shared/containers/profile/utils'; +import HorizontalScroller from '@app/sharedV2/carousel/HorizontalScroller'; const ColumnsContainer = styled(HorizontalScroller)` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection.tsx index 88286493b4..6a37418238 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection.tsx @@ -1,19 +1,21 @@ -import CopyQuery from '@src/app/entity/shared/tabs/Dataset/Queries/CopyQuery'; -import { useIsEmbeddedProfile } from '@src/app/shared/useEmbeddedProfileLinkProps'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; import { Modal } from 'antd'; -import { GetDataJobQuery } from '@src/graphql/dataJob.generated'; import React, { useContext, useMemo, useState } from 'react'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; import styled from 'styled-components/macro'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { ViewTab } from '@app/entityV2/shared/tabs/Dataset/View/ViewDefinitionTab'; +import { DBT_URN } from '@app/ingest/source/builder/constants'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; import { Button } from '@src/alchemy-components'; -import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated'; -import { EntityType, QueryEntity } from '../../../../../../types.generated'; -import { useBaseEntity } from '../../../../../entity/shared/EntityContext'; -import { DBT_URN } from '../../../../../ingest/source/builder/constants'; -import EntitySidebarContext from '../../../../../sharedV2/EntitySidebarContext'; -import { ViewTab } from '../../../tabs/Dataset/View/ViewDefinitionTab'; -import { SidebarSection } from './SidebarSection'; +import CopyQuery from '@src/app/entity/shared/tabs/Dataset/Queries/CopyQuery'; +import { useIsEmbeddedProfile } from '@src/app/shared/useEmbeddedProfileLinkProps'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { GetDataJobQuery } from '@src/graphql/dataJob.generated'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { EntityType, QueryEntity } from '@types'; const PreviewSyntax = styled(SyntaxHighlighter)` max-width: 100%; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSection.tsx index 2023121543..00726b84a8 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSection.tsx @@ -3,8 +3,8 @@ import { Collapse, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { REDESIGN_COLORS } from '../../../constants'; -import { CountStyle } from '../../../SidebarStyledComponents'; +import { CountStyle } from '@app/entityV2/shared/SidebarStyledComponents'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; const Container = styled.div` margin-left: 7px; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx index 9838c17006..661d266fa5 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx @@ -1,16 +1,18 @@ -import { useIsShowSeparateSiblingsEnabled } from '@src/app/useAppConfig'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated'; -import { Dataset, Entity } from '../../../../../../types.generated'; -import { useDataNotCombinedWithSiblings, useEntityData } from '../../../../../entity/shared/EntityContext'; -import { stripSiblingsFromEntity } from '../../../../../entity/shared/siblingUtils'; -import { CompactEntityNameList } from '../../../../../recommendations/renderer/component/CompactEntityNameList'; -import { UnionType } from '../../../../../searchV2/utils/constants'; -import { EmbeddedListSearchModal } from '../../../components/styled/search/EmbeddedListSearchModal'; -import { REDESIGN_COLORS } from '../../../constants'; -import { SEPARATE_SIBLINGS_URL_PARAM, useIsSeparateSiblingsMode } from '../../../useIsSeparateSiblingsMode'; -import { SidebarSection } from './SidebarSection'; + +import { useDataNotCombinedWithSiblings, useEntityData } from '@app/entity/shared/EntityContext'; +import { stripSiblingsFromEntity } from '@app/entity/shared/siblingUtils'; +import { EmbeddedListSearchModal } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchModal'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { SEPARATE_SIBLINGS_URL_PARAM, useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; +import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList'; +import { UnionType } from '@app/searchV2/utils/constants'; +import { useIsShowSeparateSiblingsEnabled } from '@src/app/useAppConfig'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { Dataset, Entity } from '@types'; const EntityListContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection.tsx index 164362cba7..64e4db7f20 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection.tsx @@ -1,15 +1,17 @@ +import AddRoundedIcon from '@mui/icons-material/AddRounded'; import React, { useState } from 'react'; import styled from 'styled-components'; -import AddRoundedIcon from '@mui/icons-material/AddRounded'; -import TagTermGroup from '../../../../../sharedV2/tags/TagTermGroup'; -import { useEntityData, useMutationUrn, useRefetch } from '../../../../../entity/shared/EntityContext'; -import { ENTITY_PROFILE_TAGS_ID } from '../../../../../onboarding/config/EntityProfileOnboardingConfig'; -import { SidebarSection } from './SidebarSection'; -import { EntityType } from '../../../../../../types.generated'; -import SectionActionButton from './SectionActionButton'; -import AddTagTerm from '../../../../../sharedV2/tags/AddTagTerm'; -import EmptySectionText from './EmptySectionText'; -import { EMPTY_MESSAGES } from '../../../constants'; + +import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import { EMPTY_MESSAGES } from '@app/entityV2/shared/constants'; +import EmptySectionText from '@app/entityV2/shared/containers/profile/sidebar/EmptySectionText'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { ENTITY_PROFILE_TAGS_ID } from '@app/onboarding/config/EntityProfileOnboardingConfig'; +import AddTagTerm from '@app/sharedV2/tags/AddTagTerm'; +import TagTermGroup from '@app/sharedV2/tags/TagTermGroup'; + +import { EntityType } from '@types'; const Content = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/TitleAction.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/TitleAction.tsx index 970735a0a1..b35dd222b4 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/TitleAction.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/TitleAction.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { SidebarTitleActionType } from '../../../utils'; -import { ExploreLineageAction } from './ExploreLineageAction'; + +import { ExploreLineageAction } from '@app/entityV2/shared/containers/profile/sidebar/ExploreLineageAction'; +import { SidebarTitleActionType } from '@app/entityV2/shared/utils'; interface Props { actionType: SidebarTitleActionType; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx index 8608e40d84..a1106886d5 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx @@ -1,6 +1,7 @@ import { green, orange, red } from '@ant-design/colors'; import moment from 'moment-timezone'; -import { getLastIngestedColor } from '../LastIngested'; + +import { getLastIngestedColor } from '@app/entityV2/shared/containers/profile/sidebar/LastIngested'; describe('getLastIngestedColor', () => { it('should return green if the last ingested date is the present moment', () => { diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/SidebarLogicSection.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/SidebarLogicSection.test.tsx index c41aeebca9..05b1f8815c 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/SidebarLogicSection.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/SidebarLogicSection.test.tsx @@ -1,12 +1,17 @@ import { MockedProvider } from '@apollo/client/testing'; import { fireEvent, render } from '@testing-library/react'; import React from 'react'; -import { dataset3, mocks } from '../../../../../../../Mocks'; -import { EntityType } from '../../../../../../../types.generated'; -import TestPageContainer from '../../../../../../../utils/test-utils/TestPageContainer'; -import { EntityContext } from '../../../../../../entity/shared/EntityContext'; -import { getDataForEntityType } from '../../utils'; -import { SidebarDatasetViewDefinitionSection, SidebarQueryLogicSection } from '../SidebarLogicSection'; + +import { EntityContext } from '@app/entity/shared/EntityContext'; +import { + SidebarDatasetViewDefinitionSection, + SidebarQueryLogicSection, +} from '@app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import { dataset3, mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { EntityType } from '@types'; const datasetWithViewProperties = { ...dataset3, diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/EntityProperty.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/EntityProperty.tsx index f0e42b4b9a..0233fb793c 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/EntityProperty.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/EntityProperty.tsx @@ -1,8 +1,9 @@ -import { EntityLink } from '@src/app/homeV2/reference/sections/EntityLink'; -import { Entity } from '@src/types.generated'; import React from 'react'; import styled from 'styled-components'; -import { LabelText } from './styledComponents'; + +import { LabelText } from '@app/entityV2/shared/containers/profile/sidebar/shared/styledComponents'; +import { EntityLink } from '@src/app/homeV2/reference/sections/EntityLink'; +import { Entity } from '@src/types.generated'; const PropertyContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarPopularityHeaderSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarPopularityHeaderSection.tsx index a9d654c901..afa9f111bd 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarPopularityHeaderSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarPopularityHeaderSection.tsx @@ -1,18 +1,20 @@ -import React from 'react'; +import { ConsoleSqlOutlined, EyeOutlined, ToolOutlined, UserOutlined } from '@ant-design/icons'; import { Popover } from '@components'; +import React from 'react'; import styled from 'styled-components'; -import { ConsoleSqlOutlined, UserOutlined, ToolOutlined, EyeOutlined } from '@ant-design/icons'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; import { getBarsStatusFromPopularityTier, getChartPopularityTier, getDashboardPopularityTier, getDatasetPopularityTier, isValuePresent, -} from './utils'; -import { REDESIGN_COLORS } from '../../../../constants'; -import { PopularityBars } from '../../../../tabs/Dataset/Schema/components/SchemaFieldDrawer/PopularityBars'; -import { EntityType } from '../../../../../../../types.generated'; +} from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { PopularityBars } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/PopularityBars'; + +import { EntityType } from '@types'; const Wrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarTopUsersHeaderSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarTopUsersHeaderSection.tsx index 2ddd86fb48..d5d0ff2e85 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarTopUsersHeaderSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarTopUsersHeaderSection.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import TopUsersFacepile from './TopUsersFacepile'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import TopUsersFacepile from '@app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile'; const SidebarTopUsersHeaderSection = () => { const { entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/StatusSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/StatusSection.tsx index ab67001177..be8f6ca9c1 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/StatusSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/StatusSection.tsx @@ -2,16 +2,18 @@ import { KeyboardArrowDown, KeyboardArrowRight } from '@mui/icons-material'; import { Collapse, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { EntityType } from '../../../../../../../types.generated'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { REDESIGN_COLORS } from '../../../../constants'; -import { getPlatformName } from '../../../../utils'; -import { SidebarSection } from '../SidebarSection'; -import EntityProperty from './EntityProperty'; -import SyncedOrShared from './SyncedOrShared'; -import TimeProperty from './TimeProperty'; -import { ActionType } from './utils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import EntityProperty from '@app/entityV2/shared/containers/profile/sidebar/shared/EntityProperty'; +import SyncedOrShared from '@app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrShared'; +import TimeProperty from '@app/entityV2/shared/containers/profile/sidebar/shared/TimeProperty'; +import { ActionType } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { getPlatformName } from '@app/entityV2/shared/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const SyncedAssetContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrShared.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrShared.tsx index a46c579d2a..0eff67bc02 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrShared.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrShared.tsx @@ -1,15 +1,21 @@ -import React from 'react'; -import styled from 'styled-components'; +import { Tooltip } from '@components'; import SwapHorizOutlinedIcon from '@mui/icons-material/SwapHorizOutlined'; import { Typography } from 'antd'; -import { Tooltip } from '@components'; -import { REDESIGN_COLORS } from '../../../../constants'; -import { toLocalDateString, toRelativeTimeString } from '../../../../../../shared/time/timeUtils'; -import PlatformIcon from '../../../../../../sharedV2/icons/PlatformIcon'; -import { ContentText, LabelText, RelativeTime } from './styledComponents'; -import { DataPlatform, Maybe } from '../../../../../../../types.generated'; -import { ActionType, getRelativeTimeColor } from './utils'; -import SyncedOrSharedTooltip from './SyncedOrSharedTooltip'; +import React from 'react'; +import styled from 'styled-components'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import SyncedOrSharedTooltip from '@app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrSharedTooltip'; +import { + ContentText, + LabelText, + RelativeTime, +} from '@app/entityV2/shared/containers/profile/sidebar/shared/styledComponents'; +import { ActionType, getRelativeTimeColor } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { toLocalDateString, toRelativeTimeString } from '@app/shared/time/timeUtils'; +import PlatformIcon from '@app/sharedV2/icons/PlatformIcon'; + +import { DataPlatform, Maybe } from '@types'; const DetailsContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrSharedTooltip.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrSharedTooltip.tsx index 397a8b931d..533099b6e1 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrSharedTooltip.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrSharedTooltip.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ActionType } from './utils'; -import { REDESIGN_COLORS } from '../../../../constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { ActionType } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; const HeaderText = styled(Typography.Text)` color: ${REDESIGN_COLORS.LIGHT_TEXT_DARK_BACKGROUND}; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TimeProperty.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TimeProperty.tsx index e5cd46dd97..0317bc7959 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TimeProperty.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TimeProperty.tsx @@ -1,10 +1,11 @@ -import React from 'react'; import { Tooltip } from '@components'; import moment from 'moment'; +import React from 'react'; import styled from 'styled-components'; -import { LabelText } from './styledComponents'; -import { REDESIGN_COLORS } from '../../../../constants'; -import { toLocalDateString, toRelativeTimeString } from '../../../../../../shared/time/timeUtils'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { LabelText } from '@app/entityV2/shared/containers/profile/sidebar/shared/styledComponents'; +import { toLocalDateString, toRelativeTimeString } from '@app/shared/time/timeUtils'; const PropertyContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile.tsx index a1709bb965..c6695554c6 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile.tsx @@ -1,10 +1,12 @@ -import React from 'react'; -import { Avatar } from 'antd'; import { Tooltip } from '@components'; -import { CorpUser, EntityType } from '../../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import ActorAvatar from '../../../../ActorAvatar'; -import { userExists } from './utils'; +import { Avatar } from 'antd'; +import React from 'react'; + +import ActorAvatar from '@app/entityV2/shared/ActorAvatar'; +import { userExists } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, EntityType } from '@types'; export type Props = { users: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIcon.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIcon.tsx index b572af2ff0..67653f4b23 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIcon.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIcon.tsx @@ -1,7 +1,8 @@ import { Group } from '@visx/group'; import React from 'react'; -import { PopularityTier } from '../utils'; -import PopularityIconBar from './PopularityIconBar'; + +import PopularityIconBar from '@app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar'; +import { PopularityTier } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; type Props = { tier: PopularityTier; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar.tsx index 4051328775..99eb5fa97e 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar.tsx @@ -1,6 +1,7 @@ import { Bar } from '@visx/shape'; import React from 'react'; -import { ANTD_GRAY } from '../../../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const ACTIVE_COLOR = '#3F54D1'; const INACTIVE_COLOR = ANTD_GRAY[5]; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/styledComponents.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/styledComponents.ts index 4c7caa34fe..9ac394234d 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/styledComponents.ts +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/styledComponents.ts @@ -1,6 +1,7 @@ -import styled from 'styled-components'; import { Typography } from 'antd'; -import { REDESIGN_COLORS } from '../../../../constants'; +import styled from 'styled-components'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; export const RelativeTime = styled.div<{ relativeTimeColor: string }>` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx index d34a1f7c6e..dcd8d73470 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx @@ -1,6 +1,8 @@ import moment from 'moment'; -import { REDESIGN_COLORS } from '../../../../constants'; -import { CorpUser } from '../../../../../../../types.generated'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; + +import { CorpUser } from '@types'; /** * A tier of popularity for the dataset. diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/tagRenderer.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/tagRenderer.tsx index b188d96f81..ed8dd44d15 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/tagRenderer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/tagRenderer.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Tag } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const StyleTag = styled(Tag)` diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/useGetDataForProfile.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/useGetDataForProfile.ts index 7429c4103e..c8bbb5af50 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/useGetDataForProfile.ts +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/useGetDataForProfile.ts @@ -1,10 +1,12 @@ -import { useAppConfig } from '@src/app/useAppConfig'; import { QueryHookOptions, QueryResult } from '@apollo/client'; -import { getDataForEntityType } from './utils'; -import { useIsSeparateSiblingsMode } from '../../useIsSeparateSiblingsMode'; -import { GenericEntityProperties } from '../../../../entity/shared/types'; -import { EntityType, Exact } from '../../../../../types.generated'; -import { combineEntityDataWithSiblings } from '../../../../entity/shared/siblingUtils'; + +import { combineEntityDataWithSiblings } from '@app/entity/shared/siblingUtils'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; +import { useAppConfig } from '@src/app/useAppConfig'; + +import { EntityType, Exact } from '@types'; interface Props { urn: string; diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/utils.tsx index e0fd413001..21bc7904cf 100644 --- a/datahub-web-react/src/app/entityV2/shared/containers/profile/utils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/utils.tsx @@ -1,12 +1,21 @@ -import React, { useEffect } from 'react'; -import { useLocation } from 'react-router'; import { BookOpen } from '@phosphor-icons/react'; import { isEqual } from 'lodash'; import queryString from 'query-string'; +import React, { useEffect } from 'react'; +import { useLocation } from 'react-router'; -import { EntityRegistry } from '../../../../../entityRegistryContext'; -import { EntityType, FeatureFlagsConfig } from '../../../../../types.generated'; -import useIsLineageMode from '../../../../lineage/utils/useIsLineageMode'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext'; +import { GLOSSARY_ENTITY_TYPES } from '@app/entityV2/shared/constants'; +import EntitySidebarSectionsTab from '@app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab'; +import SidebarPopularityHeaderSection from '@app/entityV2/shared/containers/profile/sidebar/shared/SidebarPopularityHeaderSection'; +import { + PopularityTier, + getBarsStatusFromPopularityTier, +} from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { EntitySidebarSection, EntitySidebarTab, EntityTab } from '@app/entityV2/shared/types'; +import { SEPARATE_SIBLINGS_URL_PARAM, useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; +import useIsLineageMode from '@app/lineage/utils/useIsLineageMode'; import { ENTITY_PROFILE_DOMAINS_ID, ENTITY_PROFILE_GLOSSARY_TERMS_ID, @@ -15,29 +24,24 @@ import { ENTITY_PROFILE_PROPERTIES_ID, ENTITY_PROFILE_TAGS_ID, ENTITY_PROFILE_V2_SIDEBAR_ID, -} from '../../../../onboarding/config/EntityProfileOnboardingConfig'; +} from '@app/onboarding/config/EntityProfileOnboardingConfig'; import { ENTITY_PROFILE_V2_COLUMNS_ID, ENTITY_PROFILE_V2_CONTENTS_ID, ENTITY_PROFILE_V2_DOCUMENTATION_ID, ENTITY_PROFILE_V2_INCIDENTS_ID, - ENTITY_SIDEBAR_V2_PROPERTIES_ID, ENTITY_PROFILE_V2_QUERIES_ID, ENTITY_PROFILE_V2_VALIDATION_ID, - ENTITY_SIDEBAR_V2_LINEAGE_TAB_ID, - ENTITY_SIDEBAR_V2_COLUMNS_TAB_ID, ENTITY_SIDEBAR_V2_ABOUT_TAB_ID, -} from '../../../../onboarding/configV2/EntityProfileOnboardingConfig'; -import usePrevious from '../../../../shared/usePrevious'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { GLOSSARY_ENTITY_TYPES } from '../../constants'; -import { useGlossaryEntityData } from '../../GlossaryEntityContext'; -import { SEPARATE_SIBLINGS_URL_PARAM, useIsSeparateSiblingsMode } from '../../useIsSeparateSiblingsMode'; -import { EntitySidebarSection, EntitySidebarTab, EntityTab } from '../../types'; -import { GenericEntityProperties } from '../../../../entity/shared/types'; -import EntitySidebarSectionsTab from './sidebar/EntitySidebarSectionsTab'; -import SidebarPopularityHeaderSection from './sidebar/shared/SidebarPopularityHeaderSection'; -import { PopularityTier, getBarsStatusFromPopularityTier } from './sidebar/shared/utils'; + ENTITY_SIDEBAR_V2_COLUMNS_TAB_ID, + ENTITY_SIDEBAR_V2_LINEAGE_TAB_ID, + ENTITY_SIDEBAR_V2_PROPERTIES_ID, +} from '@app/onboarding/configV2/EntityProfileOnboardingConfig'; +import usePrevious from '@app/shared/usePrevious'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { EntityType, FeatureFlagsConfig } from '@types'; /** * The structure of our path will be diff --git a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHeader.tsx b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHeader.tsx index d5c916fabf..b08b798f6d 100644 --- a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHeader.tsx @@ -1,17 +1,18 @@ +import { ArrowRightOutlined } from '@ant-design/icons'; import { Image, Typography } from 'antd'; +import Link from 'antd/lib/typography/Link'; import React from 'react'; import styled, { useTheme } from 'styled-components/macro'; -import Link from 'antd/lib/typography/Link'; -import { ArrowRightOutlined } from '@ant-design/icons'; -import { DEFAULT_APP_CONFIG } from '../../../../appConfigContext'; -import { useAppConfig } from '../../../useAppConfig'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { IconStyleType } from '../../Entity'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import { getDisplayedEntityType } from '../containers/profile/header/utils'; -import { ANTD_GRAY } from '../constants'; -import analytics from '../../../analytics/analytics'; -import { EventType } from '../../../analytics'; + +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { IconStyleType } from '@app/entityV2/Entity'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { getDisplayedEntityType } from '@app/entityV2/shared/containers/profile/header/utils'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { DEFAULT_APP_CONFIG } from '@src/appConfigContext'; const HeaderWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHealthIcon.tsx b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHealthIcon.tsx index 52eaac311d..b4e3b2c009 100644 --- a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHealthIcon.tsx +++ b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHealthIcon.tsx @@ -1,14 +1,16 @@ import { orange } from '@ant-design/colors'; import { WarningFilled } from '@ant-design/icons'; -import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams'; import React from 'react'; import { useParams } from 'react-router'; import styled from 'styled-components'; -import { useSearchAcrossLineageQuery } from '../../../../graphql/search.generated'; -import { HAS_ACTIVE_INCIDENTS_FILTER_NAME, HAS_FAILING_ASSERTIONS_FILTER_NAME } from '../../../search/utils/constants'; -import { useAppConfig } from '../../../useAppConfig'; -import { decodeUrn } from '../utils'; -import { generateQueryVariables } from './UpstreamHealth/utils'; + +import { generateQueryVariables } from '@app/entityV2/shared/embed/UpstreamHealth/utils'; +import { decodeUrn } from '@app/entityV2/shared/utils'; +import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams'; +import { HAS_ACTIVE_INCIDENTS_FILTER_NAME, HAS_FAILING_ASSERTIONS_FILTER_NAME } from '@app/search/utils/constants'; +import { useAppConfig } from '@app/useAppConfig'; + +import { useSearchAcrossLineageQuery } from '@graphql/search.generated'; // Do not update unless you update the reference to this ID in our Chrome extension code const ICON_ID = 'embedded-datahub-health-icon'; diff --git a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedProfile.tsx b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedProfile.tsx index 8a876beb58..5ac8050098 100644 --- a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedProfile.tsx +++ b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedProfile.tsx @@ -1,17 +1,19 @@ import { LoadingOutlined } from '@ant-design/icons'; import { QueryHookOptions, QueryResult } from '@apollo/client'; -import EntitySidebarContext, { entitySidebarContextDefaults } from '@app/sharedV2/EntitySidebarContext'; import React from 'react'; import styled from 'styled-components'; -import { EntityType, Exact } from '../../../../types.generated'; -import useGetDataForProfile from '../containers/profile/useGetDataForProfile'; -import { EntityContext } from '../../../entity/shared/EntityContext'; -import { GenericEntityProperties } from '../../../entity/shared/types'; -import { TabContextType } from '../types'; -import NonExistentEntityPage from '../entity/NonExistentEntityPage'; -import { useEntityRegistryV2 } from '../../../useEntityRegistry'; -import EntityProfileSidebar from '../containers/profile/sidebar/EntityProfileSidebar'; -import { getFinalSidebarTabs } from '../containers/profile/utils'; + +import { EntityContext } from '@app/entity/shared/EntityContext'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import EntityProfileSidebar from '@app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar'; +import useGetDataForProfile from '@app/entityV2/shared/containers/profile/useGetDataForProfile'; +import { getFinalSidebarTabs } from '@app/entityV2/shared/containers/profile/utils'; +import NonExistentEntityPage from '@app/entityV2/shared/entity/NonExistentEntityPage'; +import { TabContextType } from '@app/entityV2/shared/types'; +import EntitySidebarContext, { entitySidebarContextDefaults } from '@app/sharedV2/EntitySidebarContext'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { EntityType, Exact } from '@types'; const LoadingWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents.tsx index 180fd2c65f..191fdae207 100644 --- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents.tsx +++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents.tsx @@ -1,9 +1,16 @@ import { LoadingOutlined } from '@ant-design/icons'; import React from 'react'; -import { Dataset } from '../../../../../types.generated'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { FailingDataWrapper, FailingSectionWrapper, LoadingWrapper, LoadMoreButton } from './FailingAssertions'; -import FailingEntity from './FailingEntity'; + +import { + FailingDataWrapper, + FailingSectionWrapper, + LoadMoreButton, + LoadingWrapper, +} from '@app/entityV2/shared/embed/UpstreamHealth/FailingAssertions'; +import FailingEntity from '@app/entityV2/shared/embed/UpstreamHealth/FailingEntity'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Dataset } from '@types'; interface Props { datasetsWithActiveIncidents: Dataset[]; diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingAssertions.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingAssertions.tsx index 75edb370f7..01331b780d 100644 --- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingAssertions.tsx +++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingAssertions.tsx @@ -2,10 +2,12 @@ import { LoadingOutlined } from '@ant-design/icons'; import { Button } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Dataset } from '../../../../../types.generated'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import FailingEntity from './FailingEntity'; -import { getNumAssertionsFailing } from './utils'; + +import FailingEntity from '@app/entityV2/shared/embed/UpstreamHealth/FailingEntity'; +import { getNumAssertionsFailing } from '@app/entityV2/shared/embed/UpstreamHealth/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Dataset } from '@types'; export const FailingSectionWrapper = styled.div` margin: 8px 0 0 34px; diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingEntity.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingEntity.tsx index 4498dd7596..9615ad90be 100644 --- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingEntity.tsx +++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingEntity.tsx @@ -3,7 +3,8 @@ import Icon from '@ant-design/icons/lib/components/Icon'; import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import ExternalLink from '../../../../../images/link-out.svg?react'; + +import ExternalLink from '@images/link-out.svg?react'; const DatasetWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingInputs.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingInputs.tsx index 38f920be60..fed026c125 100644 --- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingInputs.tsx +++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingInputs.tsx @@ -1,15 +1,17 @@ import { orange } from '@ant-design/colors'; import { DownOutlined, WarningFilled } from '@ant-design/icons'; +import { Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { Dataset } from '../../../../../types.generated'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../constants'; -import { getDisplayedEntityType } from '../../containers/profile/header/utils'; -import { useEntityData } from '../../../../entity/shared/EntityContext'; -import ActiveIncidents from './ActiveIncidents'; -import FailingAssertions from './FailingAssertions'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { getDisplayedEntityType } from '@app/entityV2/shared/containers/profile/header/utils'; +import ActiveIncidents from '@app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents'; +import FailingAssertions from '@app/entityV2/shared/embed/UpstreamHealth/FailingAssertions'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Dataset } from '@types'; const FailingEntityTitle = styled(Typography.Text)` font-size: 16px; diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamEntitiesList.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamEntitiesList.tsx index ceb94d255e..aa684150a1 100644 --- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamEntitiesList.tsx +++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamEntitiesList.tsx @@ -1,9 +1,10 @@ +import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Divider } from 'antd'; -import { EntityLinkList } from '@src/app/homeV2/reference/sections/EntityLinkList'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; import { GenericEntityProperties } from '@src/app/entity/shared/types'; -import { ANTD_GRAY } from '../../constants'; +import { EntityLinkList } from '@src/app/homeV2/reference/sections/EntityLinkList'; type Props = { directEntities: GenericEntityProperties[]; diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx index fae4f42e02..7b097461df 100644 --- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx +++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx @@ -1,23 +1,25 @@ -import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams'; +import { ErrorRounded } from '@mui/icons-material'; import { Divider } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { ErrorRounded } from '@mui/icons-material'; -import { isDeprecated, isUnhealthy } from '@src/app/shared/health/healthUtils'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import { GenericEntityProperties } from '@src/app/entity/shared/types'; -import { useSearchAcrossLineageQuery } from '../../../../../graphql/search.generated'; -import { FilterOperator, LineageDirection } from '../../../../../types.generated'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { CTAWrapper, StyledArrow } from '@app/entityV2/shared/containers/profile/sidebar/FormInfo/components'; +import UpstreamEntitiesList from '@app/entityV2/shared/embed/UpstreamHealth/UpstreamEntitiesList'; +import { DATASET_COUNT } from '@app/entityV2/shared/embed/UpstreamHealth/utils'; +import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams'; import { HAS_ACTIVE_INCIDENTS_FILTER_NAME, HAS_FAILING_ASSERTIONS_FILTER_NAME, IS_DEPRECATED_FILTER_NAME, -} from '../../../../search/utils/constants'; -import { useAppConfig } from '../../../../useAppConfig'; -import { useEntityData } from '../../../../entity/shared/EntityContext'; -import { DATASET_COUNT } from './utils'; -import UpstreamEntitiesList from './UpstreamEntitiesList'; -import { CTAWrapper, StyledArrow } from '../../containers/profile/sidebar/FormInfo/components'; +} from '@app/search/utils/constants'; +import { useAppConfig } from '@app/useAppConfig'; +import { GenericEntityProperties } from '@src/app/entity/shared/types'; +import { isDeprecated, isUnhealthy } from '@src/app/shared/health/healthUtils'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; + +import { useSearchAcrossLineageQuery } from '@graphql/search.generated'; +import { FilterOperator, LineageDirection } from '@types'; export const StyledDivider = styled(Divider)` margin: 16px 0; diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/__tests__/utils.test.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/__tests__/utils.test.tsx index 1f371f5142..01f2c7deb8 100644 --- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/__tests__/utils.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/__tests__/utils.test.tsx @@ -1,6 +1,7 @@ -import { dataset1, dataset2, dataset3 } from '../../../../../../Mocks'; -import { Dataset } from '../../../../../../types.generated'; -import * as utils from '../utils'; +import * as utils from '@app/entityV2/shared/embed/UpstreamHealth/utils'; +import { dataset1, dataset2, dataset3 } from '@src/Mocks'; + +import { Dataset } from '@types'; // has 1 passing and 1 failing assertion const dataset1WithAssertions = { diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/utils.ts b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/utils.ts index 93ae46d507..99d6946378 100644 --- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/utils.ts +++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/utils.ts @@ -1,4 +1,4 @@ -import { Dataset, EntityType, FilterOperator, LineageDirection } from '../../../../../types.generated'; +import { Dataset, EntityType, FilterOperator, LineageDirection } from '@types'; export function getNumAssertionsFailing(dataset: Dataset) { let numFailing = 0; diff --git a/datahub-web-react/src/app/entityV2/shared/entity/EntityActions.tsx b/datahub-web-react/src/app/entityV2/shared/entity/EntityActions.tsx index b3a538a076..94987cfa24 100644 --- a/datahub-web-react/src/app/entityV2/shared/entity/EntityActions.tsx +++ b/datahub-web-react/src/app/entityV2/shared/entity/EntityActions.tsx @@ -1,17 +1,19 @@ -import React, { useState } from 'react'; -import { message } from 'antd'; -import { Button, Tooltip } from '@components'; -import styled from 'styled-components/macro'; import { LinkOutlined, PlusOutlined } from '@ant-design/icons'; -import { SearchSelectModal } from '../components/styled/search/SearchSelectModal'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { EntityCapabilityType } from '../../Entity'; -import { useBatchAddTermsMutation, useBatchSetDomainMutation } from '../../../../graphql/mutations.generated'; -import { handleBatchError } from '../utils'; -import { useBatchSetDataProductMutation } from '../../../../graphql/dataProduct.generated'; -import { useEntityContext, useEntityData } from '../../../entity/shared/EntityContext'; -import CreateGlossaryEntityModal from '../EntityDropdown/CreateGlossaryEntityModal'; -import { EntityType } from '../../../../types.generated'; +import { Button, Tooltip } from '@components'; +import { message } from 'antd'; +import React, { useState } from 'react'; +import styled from 'styled-components/macro'; + +import { useEntityContext, useEntityData } from '@app/entity/shared/EntityContext'; +import { EntityCapabilityType } from '@app/entityV2/Entity'; +import CreateGlossaryEntityModal from '@app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal'; +import { SearchSelectModal } from '@app/entityV2/shared/components/styled/search/SearchSelectModal'; +import { handleBatchError } from '@app/entityV2/shared/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useBatchSetDataProductMutation } from '@graphql/dataProduct.generated'; +import { useBatchAddTermsMutation, useBatchSetDomainMutation } from '@graphql/mutations.generated'; +import { EntityType } from '@types'; export enum EntityActionItem { /** diff --git a/datahub-web-react/src/app/entityV2/shared/entityForm/EntityForm.tsx b/datahub-web-react/src/app/entityV2/shared/entityForm/EntityForm.tsx index 97637b6c4a..4a744bd5b6 100644 --- a/datahub-web-react/src/app/entityV2/shared/entityForm/EntityForm.tsx +++ b/datahub-web-react/src/app/entityV2/shared/entityForm/EntityForm.tsx @@ -1,4 +1,5 @@ import React from 'react'; + import { FormView, useEntityFormContext } from '@src/app/entity/shared/entityForm/EntityFormContext'; import FormByEntity from '@src/app/entity/shared/entityForm/FormByEntity'; diff --git a/datahub-web-react/src/app/entityV2/shared/entityForm/EntityFormModal.tsx b/datahub-web-react/src/app/entityV2/shared/entityForm/EntityFormModal.tsx index 760a8ddc7a..9233b8b971 100644 --- a/datahub-web-react/src/app/entityV2/shared/entityForm/EntityFormModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/entityForm/EntityFormModal.tsx @@ -1,10 +1,11 @@ import { CloseOutlined } from '@ant-design/icons'; +import { Modal } from 'antd'; import React from 'react'; +import styled from 'styled-components'; + +import EntityForm from '@app/entityV2/shared/entityForm/EntityForm'; import EntityFormContextProvider from '@src/app/entity/shared/entityForm/EntityFormContextProvider'; import FormPageHeader from '@src/app/entity/shared/entityForm/FormHeader/FormPageHeader'; -import { Modal } from 'antd'; -import styled from 'styled-components'; -import EntityForm from './EntityForm'; const StyledModal = styled(Modal)` &&& .ant-modal-content { diff --git a/datahub-web-react/src/app/entityV2/shared/externalUrl/ViewInPlatform.tsx b/datahub-web-react/src/app/entityV2/shared/externalUrl/ViewInPlatform.tsx index a02f7e21de..f2251b23b6 100644 --- a/datahub-web-react/src/app/entityV2/shared/externalUrl/ViewInPlatform.tsx +++ b/datahub-web-react/src/app/entityV2/shared/externalUrl/ViewInPlatform.tsx @@ -1,13 +1,14 @@ +import LaunchIcon from '@mui/icons-material/Launch'; +import React from 'react'; +import styled from 'styled-components'; + import { EntityActionType, EventType } from '@app/analytics'; import analytics from '@app/analytics/analytics'; import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getSiblings } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; -import LaunchIcon from '@mui/icons-material/Launch'; +import { getExternalUrlDisplayName } from '@app/entityV2/shared/utils'; import { GenericEntityProperties } from '@src/app/entity/shared/types'; -import React from 'react'; -import styled from 'styled-components'; -import { getSiblings } from '../tabs/Dataset/Validations/acrylUtils'; -import { getExternalUrlDisplayName } from '../utils'; const Link = styled.a` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreview.tsx b/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreview.tsx index e4430d731d..fea7d0b12e 100644 --- a/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreview.tsx +++ b/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreview.tsx @@ -2,11 +2,12 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { DataProduct, EntityType } from '../../../../types.generated'; -import EntityCount from '../containers/profile/header/EntityCount'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip'; -import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../../../entity/shared/constants'; +import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '@app/entity/shared/constants'; +import EntityCount from '@app/entityV2/shared/containers/profile/header/EntityCount'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DataProduct, EntityType } from '@types'; const DomainInfoContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreviewAddDataProduct.tsx b/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreviewAddDataProduct.tsx index be67044f0b..0aeb2eda02 100644 --- a/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreviewAddDataProduct.tsx +++ b/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreviewAddDataProduct.tsx @@ -1,7 +1,8 @@ +import { PlusOutlined } from '@ant-design/icons'; import React from 'react'; import styled from 'styled-components'; -import { PlusOutlined } from '@ant-design/icons'; -import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../../../entity/shared/constants'; + +import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '@app/entity/shared/constants'; const DomainInfoContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/links/DomainColoredIcon.tsx b/datahub-web-react/src/app/entityV2/shared/links/DomainColoredIcon.tsx index 3170c5b8f6..4b0b2a7195 100644 --- a/datahub-web-react/src/app/entityV2/shared/links/DomainColoredIcon.tsx +++ b/datahub-web-react/src/app/entityV2/shared/links/DomainColoredIcon.tsx @@ -1,10 +1,12 @@ import * as Muicon from '@mui/icons-material'; import React from 'react'; import styled from 'styled-components'; + +import { generateColor } from '@app/entityV2/shared/components/styled/StyledTag'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; import { hexToRgba } from '@app/sharedV2/colors/colorUtils'; -import { Domain } from '../../../../types.generated'; -import { generateColor } from '../components/styled/StyledTag'; -import { REDESIGN_COLORS } from '../constants'; + +import { Domain } from '@types'; const DomainIconContainer = styled.div<{ color: string; size: number }>` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/links/DomainMiniPreview.tsx b/datahub-web-react/src/app/entityV2/shared/links/DomainMiniPreview.tsx index 831e3cccc0..35ba23bc89 100644 --- a/datahub-web-react/src/app/entityV2/shared/links/DomainMiniPreview.tsx +++ b/datahub-web-react/src/app/entityV2/shared/links/DomainMiniPreview.tsx @@ -2,12 +2,13 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { Domain, EntityType } from '../../../../types.generated'; -import { DomainColoredIcon } from './DomainColoredIcon'; -import EntityCount from '../containers/profile/header/EntityCount'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import EntityCount from '@app/entityV2/shared/containers/profile/header/EntityCount'; +import { DomainColoredIcon } from '@app/entityV2/shared/links/DomainColoredIcon'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Domain, EntityType } from '@types'; const DomainLinkContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/links/GlossaryTermMiniPreview.tsx b/datahub-web-react/src/app/entityV2/shared/links/GlossaryTermMiniPreview.tsx index 814b975fed..eaad092217 100644 --- a/datahub-web-react/src/app/entityV2/shared/links/GlossaryTermMiniPreview.tsx +++ b/datahub-web-react/src/app/entityV2/shared/links/GlossaryTermMiniPreview.tsx @@ -1,12 +1,13 @@ +import * as Muicon from '@mui/icons-material'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import * as Muicon from '@mui/icons-material'; -import { EntityType, GlossaryTerm } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip'; -import { generateColorFromPalette } from '../../../glossaryV2/colorUtils'; +import { generateColorFromPalette } from '@app/glossaryV2/colorUtils'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, GlossaryTerm } from '@types'; const GlossaryTermMiniPreviewContainer = styled.div<{ color: string }>` display: inline-flex; diff --git a/datahub-web-react/src/app/entityV2/shared/notes/NotesSection.tsx b/datahub-web-react/src/app/entityV2/shared/notes/NotesSection.tsx index 310e9a5d16..1d6d1990d9 100644 --- a/datahub-web-react/src/app/entityV2/shared/notes/NotesSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/notes/NotesSection.tsx @@ -1,4 +1,3 @@ -import SchemaEditableContext from '@app/shared/SchemaEditableContext'; import AddRoundedIcon from '@mui/icons-material/AddRounded'; import DeleteOutlineOutlinedIcon from '@mui/icons-material/DeleteOutlineOutlined'; import EditOutlinedIcon from '@mui/icons-material/EditOutlined'; @@ -6,15 +5,18 @@ import { Modal } from 'antd'; import moment from 'moment'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { useDeletePostMutation } from '../../../../graphql/post.generated'; -import { Post } from '../../../../types.generated'; -import CustomAvatar from '../../../shared/avatar/CustomAvatar'; -import { COLORS } from '../../../sharedV2/colors'; -import CreateEntityAnnouncementModal from '../announce/CreateEntityAnnouncementModal'; -import CompactMarkdownViewer from '../tabs/Documentation/components/CompactMarkdownViewer'; -import EmptySectionText from '../containers/profile/sidebar/EmptySectionText'; -import SectionActionButton from '../containers/profile/sidebar/SectionActionButton'; -import { SidebarSection } from '../containers/profile/sidebar/SidebarSection'; + +import CreateEntityAnnouncementModal from '@app/entityV2/shared/announce/CreateEntityAnnouncementModal'; +import EmptySectionText from '@app/entityV2/shared/containers/profile/sidebar/EmptySectionText'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import CompactMarkdownViewer from '@app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; +import { COLORS } from '@app/sharedV2/colors'; + +import { useDeletePostMutation } from '@graphql/post.generated'; +import { Post } from '@types'; const ContentWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/sidebarSection/AboutSidebarSection.tsx b/datahub-web-react/src/app/entityV2/shared/sidebarSection/AboutSidebarSection.tsx index a090276d9c..7dd2295e4d 100644 --- a/datahub-web-react/src/app/entityV2/shared/sidebarSection/AboutSidebarSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/sidebarSection/AboutSidebarSection.tsx @@ -1,11 +1,12 @@ -import React, { useEffect, useState } from 'react'; +import CheckOutlinedIcon from '@mui/icons-material/CheckOutlined'; +import EditOutlinedIcon from '@mui/icons-material/EditOutlined'; import TextArea from 'antd/lib/input/TextArea'; import Paragraph from 'antd/lib/typography/Paragraph'; -import EditOutlinedIcon from '@mui/icons-material/EditOutlined'; -import CheckOutlinedIcon from '@mui/icons-material/CheckOutlined'; -import SectionActionButton from '../containers/profile/sidebar/SectionActionButton'; -import { SidebarSection } from '../containers/profile/sidebar/SidebarSection'; -import { AboutSection, AboutSectionText, EmptyValue } from '../SidebarStyledComponents'; +import React, { useEffect, useState } from 'react'; + +import { AboutSection, AboutSectionText, EmptyValue } from '@app/entityV2/shared/SidebarStyledComponents'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; type Props = { aboutText: string; diff --git a/datahub-web-react/src/app/entityV2/shared/sidebarSection/ShowMoreSection.tsx b/datahub-web-react/src/app/entityV2/shared/sidebarSection/ShowMoreSection.tsx index 06f6ddb362..b005bf7902 100644 --- a/datahub-web-react/src/app/entityV2/shared/sidebarSection/ShowMoreSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/sidebarSection/ShowMoreSection.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { ShowMoreButton } from '../SidebarStyledComponents'; + +import { ShowMoreButton } from '@app/entityV2/shared/SidebarStyledComponents'; type Props = { totalCount: number; diff --git a/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarNotesSection.tsx b/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarNotesSection.tsx index 28d8e46ea9..5d8a8c818e 100644 --- a/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarNotesSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarNotesSection.tsx @@ -1,8 +1,10 @@ import moment from 'moment/moment'; import React from 'react'; -import { Post } from '../../../../types.generated'; -import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext'; -import NotesSection from '../notes/NotesSection'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import NotesSection from '@app/entityV2/shared/notes/NotesSection'; + +import { Post } from '@types'; export default function SidebarNotesSection() { const { urn, entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarStructuredProperties.tsx b/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarStructuredProperties.tsx index 86bb8464e5..99e6c8c484 100644 --- a/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarStructuredProperties.tsx +++ b/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarStructuredProperties.tsx @@ -1,5 +1,15 @@ import AddRoundedIcon from '@mui/icons-material/AddRounded'; import EditOutlinedIcon from '@mui/icons-material/EditOutlined'; +import React, { useState } from 'react'; + +import { EMPTY_MESSAGES } from '@app/entityV2/shared/constants'; +import EmptySectionText from '@app/entityV2/shared/containers/profile/sidebar/EmptySectionText'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { StyledDivider } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import StructuredPropertyValue from '@app/entityV2/shared/tabs/Properties/StructuredPropertyValue'; +import { PropertyRow } from '@app/entityV2/shared/tabs/Properties/types'; +import { useHydratedEntityMap } from '@app/entityV2/shared/tabs/Properties/useHydratedEntityMap'; import { useUserContext } from '@src/app/context/useUserContext'; import { useEntityData } from '@src/app/entity/shared/EntityContext'; import EditStructuredPropertyModal from '@src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal'; @@ -23,15 +33,6 @@ import { StdDataType, StructuredPropertyEntity, } from '@src/types.generated'; -import React, { useState } from 'react'; -import { EMPTY_MESSAGES } from '../constants'; -import EmptySectionText from '../containers/profile/sidebar/EmptySectionText'; -import SectionActionButton from '../containers/profile/sidebar/SectionActionButton'; -import { SidebarSection } from '../containers/profile/sidebar/SidebarSection'; -import { StyledDivider } from '../tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; -import StructuredPropertyValue from '../tabs/Properties/StructuredPropertyValue'; -import { PropertyRow } from '../tabs/Properties/types'; -import { useHydratedEntityMap } from '../tabs/Properties/useHydratedEntityMap'; interface FieldProperties { isSchemaSidebar?: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserGroupSidebarSection.tsx b/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserGroupSidebarSection.tsx index 96a732949a..5c7f291d8c 100644 --- a/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserGroupSidebarSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserGroupSidebarSection.tsx @@ -1,10 +1,12 @@ import React, { useState } from 'react'; -import { SidebarSection } from '../containers/profile/sidebar/SidebarSection'; -import { GroupsSection } from '../SidebarStyledComponents'; -import { EntityLink } from '../../../homeV2/reference/sections/EntityLink'; -import { ANTD_GRAY, ANTD_GRAY_V2 } from '../constants'; -import { EntityRelationship } from '../../../../types.generated'; -import { ShowMoreSection } from './ShowMoreSection'; + +import { GroupsSection } from '@app/entityV2/shared/SidebarStyledComponents'; +import { ANTD_GRAY, ANTD_GRAY_V2 } from '@app/entityV2/shared/constants'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { ShowMoreSection } from '@app/entityV2/shared/sidebarSection/ShowMoreSection'; +import { EntityLink } from '@app/homeV2/reference/sections/EntityLink'; + +import { EntityRelationship } from '@types'; const DEFAULT_MAX_ENTITIES_TO_SHOW = 4; diff --git a/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserOwnershipSideBarSection.tsx b/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserOwnershipSideBarSection.tsx index b5b42b774e..4dce92b41c 100644 --- a/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserOwnershipSideBarSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserOwnershipSideBarSection.tsx @@ -1,10 +1,12 @@ -import React, { useState } from 'react'; import { Col } from 'antd'; -import { OwnershipContainer, ShowMoreText } from '../SidebarStyledComponents'; -import { SidebarSection } from '../containers/profile/sidebar/SidebarSection'; -import { EntityLink } from '../../../homeV2/reference/sections/EntityLink'; -import { SearchResults } from '../../../../types.generated'; -import { ShowMoreSection } from './ShowMoreSection'; +import React, { useState } from 'react'; + +import { OwnershipContainer, ShowMoreText } from '@app/entityV2/shared/SidebarStyledComponents'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { ShowMoreSection } from '@app/entityV2/shared/sidebarSection/ShowMoreSection'; +import { EntityLink } from '@app/homeV2/reference/sections/EntityLink'; + +import { SearchResults } from '@types'; const DEFAULT_MAX_ENTITIES_TO_SHOW = 4; diff --git a/datahub-web-react/src/app/entityV2/shared/stats/PercentileLabel.tsx b/datahub-web-react/src/app/entityV2/shared/stats/PercentileLabel.tsx index 3effde42e6..078ba512bd 100644 --- a/datahub-web-react/src/app/entityV2/shared/stats/PercentileLabel.tsx +++ b/datahub-web-react/src/app/entityV2/shared/stats/PercentileLabel.tsx @@ -1,8 +1,9 @@ +import { Popover } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Popover } from '@components'; -import { percentileToColor, percentileToLabel } from './statsUtils'; -import { ANTD_GRAY } from '../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { percentileToColor, percentileToLabel } from '@app/entityV2/shared/stats/statsUtils'; const Description = styled.div` color: white; diff --git a/datahub-web-react/src/app/entityV2/shared/stats/__tests__/statsUtils.test.tsx b/datahub-web-react/src/app/entityV2/shared/stats/__tests__/statsUtils.test.tsx index 83609859b8..2f9d253d5f 100644 --- a/datahub-web-react/src/app/entityV2/shared/stats/__tests__/statsUtils.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/stats/__tests__/statsUtils.test.tsx @@ -1,5 +1,5 @@ -import { ANTD_GRAY } from '../../constants'; -import { percentileToColor, percentileToLabel } from '../statsUtils'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { percentileToColor, percentileToLabel } from '@app/entityV2/shared/stats/statsUtils'; describe('percentileToLabel', () => { it('should return "Low" when percentile is <= 30', () => { diff --git a/datahub-web-react/src/app/entityV2/shared/stats/statsUtils.ts b/datahub-web-react/src/app/entityV2/shared/stats/statsUtils.ts index cff00a5b63..f922767b93 100644 --- a/datahub-web-react/src/app/entityV2/shared/stats/statsUtils.ts +++ b/datahub-web-react/src/app/entityV2/shared/stats/statsUtils.ts @@ -1,4 +1,4 @@ -import { ANTD_GRAY } from '../constants'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; /** * Normalizes a percentile integer to a 3-tier diff --git a/datahub-web-react/src/app/entityV2/shared/summary/HeaderComponents.tsx b/datahub-web-react/src/app/entityV2/shared/summary/HeaderComponents.tsx index d8a718e185..d0d916b1dd 100644 --- a/datahub-web-react/src/app/entityV2/shared/summary/HeaderComponents.tsx +++ b/datahub-web-react/src/app/entityV2/shared/summary/HeaderComponents.tsx @@ -1,7 +1,8 @@ +import { BookOpen } from '@phosphor-icons/react'; import React from 'react'; import styled from 'styled-components'; -import { BookOpen } from '@phosphor-icons/react'; -import { REDESIGN_COLORS } from '../constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; export const SUMMARY_TAB_ICON = BookOpen; diff --git a/datahub-web-react/src/app/entityV2/shared/summary/IconComponents.tsx b/datahub-web-react/src/app/entityV2/shared/summary/IconComponents.tsx index a4a4b6979d..00921bf4e3 100644 --- a/datahub-web-react/src/app/entityV2/shared/summary/IconComponents.tsx +++ b/datahub-web-react/src/app/entityV2/shared/summary/IconComponents.tsx @@ -1,10 +1,12 @@ import React from 'react'; import styled from 'styled-components'; -import { EntityType } from '../../../../types.generated'; -import { TYPE_ICON_CLASS_NAME } from '../components/subtypes'; -import getTypeIcon from '../../../sharedV2/icons/getTypeIcon'; -import { LINEAGE_COLORS } from '../constants'; -import { EntityRegistry } from '../../../../entityRegistryContext'; + +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { LINEAGE_COLORS } from '@app/entityV2/shared/constants'; +import getTypeIcon from '@app/sharedV2/icons/getTypeIcon'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { EntityType } from '@types'; const IconWrapper = styled.span` line-height: 0; diff --git a/datahub-web-react/src/app/entityV2/shared/summary/SummaryAboutSection.tsx b/datahub-web-react/src/app/entityV2/shared/summary/SummaryAboutSection.tsx index 1434cf110c..04cdfc99ed 100644 --- a/datahub-web-react/src/app/entityV2/shared/summary/SummaryAboutSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/summary/SummaryAboutSection.tsx @@ -1,13 +1,14 @@ +import { EditOutlined, FileOutlined } from '@ant-design/icons'; import React, { useCallback, useState } from 'react'; import styled from 'styled-components'; -import { EditOutlined, FileOutlined } from '@ant-design/icons'; + +import { useEntityData, useRefetch, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { AddLinkModal } from '@app/entityV2/shared/components/styled/AddLinkModal'; +import { EmptyTab } from '@app/entityV2/shared/components/styled/EmptyTab'; +import { SectionContainer, SummaryTabHeaderTitle } from '@app/entityV2/shared/summary/HeaderComponents'; +import { LinkList } from '@app/entityV2/shared/tabs/Documentation/components/LinkList'; +import { Editor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; import { Button } from '@src/alchemy-components'; -import { useEntityData, useRefetch, useRouteToTab } from '../../../entity/shared/EntityContext'; -import { Editor } from '../tabs/Documentation/components/editor/Editor'; -import { EmptyTab } from '../components/styled/EmptyTab'; -import { AddLinkModal } from '../components/styled/AddLinkModal'; -import { LinkList } from '../tabs/Documentation/components/LinkList'; -import { SectionContainer, SummaryTabHeaderTitle } from './HeaderComponents'; const UNEXPANDED_HEIGHT = 2000; diff --git a/datahub-web-react/src/app/entityV2/shared/summary/SummaryCreatedBySection.tsx b/datahub-web-react/src/app/entityV2/shared/summary/SummaryCreatedBySection.tsx index 3354049b41..45e165cb6e 100644 --- a/datahub-web-react/src/app/entityV2/shared/summary/SummaryCreatedBySection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/summary/SummaryCreatedBySection.tsx @@ -1,10 +1,12 @@ import React from 'react'; import styled from 'styled-components'; -import { HeaderTitle } from './HeaderComponents'; -import { CorpGroup, CorpUser, EntityType } from '../../../../types.generated'; -import { useEntityRegistryV2 } from '../../../useEntityRegistry'; -import { REDESIGN_COLORS } from '../constants'; -import CustomAvatar from '../../../shared/avatar/CustomAvatar'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { HeaderTitle } from '@app/entityV2/shared/summary/HeaderComponents'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { CorpGroup, CorpUser, EntityType } from '@types'; const StyledTitle = styled(HeaderTitle)` margin-bottom: 12px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagement.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagement.tsx index 3c256a43d3..b2ba579bbf 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagement.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagement.tsx @@ -1,11 +1,13 @@ +import { Button, Table } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Button, Table } from 'antd'; -import { useBaseEntity } from '../../../../../entity/shared/EntityContext'; -import { GetDatasetQuery, useGetExternalRolesQuery } from '../../../../../../graphql/dataset.generated'; -import { useGetMeQuery } from '../../../../../../graphql/me.generated'; -import { handleAccessRoles } from './utils'; -import AccessManagerDescription from './AccessManagerDescription'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import AccessManagerDescription from '@app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription'; +import { handleAccessRoles } from '@app/entityV2/shared/tabs/Dataset/AccessManagement/utils'; + +import { GetDatasetQuery, useGetExternalRolesQuery } from '@graphql/dataset.generated'; +import { useGetMeQuery } from '@graphql/me.generated'; const StyledTable = styled(Table)` overflow: inherit; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx index c87a499e34..06b55b67c6 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx @@ -1,6 +1,6 @@ +import { Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; export type Props = { description: any; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts index 037447a65c..9cece7cefc 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts @@ -1,6 +1,7 @@ -import { GetExternalRolesQuery } from '../../../../../../../graphql/dataset.generated'; -import { GetMeQuery } from '../../../../../../../graphql/me.generated'; -import { handleAccessRoles } from '../utils'; +import { handleAccessRoles } from '@app/entityV2/shared/tabs/Dataset/AccessManagement/utils'; + +import { GetExternalRolesQuery } from '@graphql/dataset.generated'; +import { GetMeQuery } from '@graphql/me.generated'; describe('handleAccessRoles', () => { it('should properly map the externalroles and loggedin user', () => { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResults.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResults.tsx index fd1ce5fadc..7b4fc7fd27 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResults.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResults.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import { TestResult } from '../../../../../../types.generated'; -import { TestResultsList } from './TestResultsList'; -import { TestResultsSummary } from './TestResultsSummary'; + +import { TestResultsList } from '@app/entityV2/shared/tabs/Dataset/Governance/TestResultsList'; +import { TestResultsSummary } from '@app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary'; + +import { TestResult } from '@types'; type Props = { passing: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsList.tsx index cc0b02bfcc..841f7681b1 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsList.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsList.tsx @@ -1,11 +1,13 @@ import { CopyOutlined, StopOutlined } from '@ant-design/icons'; -import { Divider, Empty, Tag, Typography } from 'antd'; import { Button, Tooltip } from '@components'; -import styled from 'styled-components'; +import { Divider, Empty, Tag, Typography } from 'antd'; import React from 'react'; -import { TestResult } from '../../../../../../types.generated'; -import { StyledTable } from '../../../components/styled/StyledTable'; -import { getResultColor, getResultIcon, getResultText } from './testUtils'; +import styled from 'styled-components'; + +import { StyledTable } from '@app/entityV2/shared/components/styled/StyledTable'; +import { getResultColor, getResultIcon, getResultText } from '@app/entityV2/shared/tabs/Dataset/Governance/testUtils'; + +import { TestResult } from '@types'; const ResultContainer = styled.div` display: flex; 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 68466746df..8eb6013d45 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 @@ -1,9 +1,10 @@ import { CheckCircleFilled, CloseCircleFilled, StopOutlined } from '@ant-design/icons'; -import { Typography } from 'antd'; import { Tooltip } from '@components'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const SummaryHeader = styled.div` width: 100%; 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 8a0ef59c81..0da8da7327 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,7 @@ -import React from 'react'; import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons'; -import { TestResultType } from '../../../../../../types.generated'; +import React from 'react'; + +import { TestResultType } from '@types'; /** * Returns the display text assoociated with an Test Result Type diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/AddButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/AddButton.tsx index a1156bec7e..cdbc6b9fd4 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/AddButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/AddButton.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { PlusOutlined } from '@ant-design/icons'; import { Button, Tooltip } from '@components'; -import { ADD_UNAUTHORIZED_MESSAGE } from './utils/constants'; +import React from 'react'; + +import { ADD_UNAUTHORIZED_MESSAGE } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/constants'; interface Props { buttonLabel?: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/CopyQuery.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/CopyQuery.tsx index 578bb8de0b..890d3b0278 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/CopyQuery.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/CopyQuery.tsx @@ -1,7 +1,7 @@ -import React, { useState } from 'react'; import { CheckOutlined, CopyOutlined } from '@ant-design/icons'; -import { Button } from 'antd'; import { Tooltip } from '@components'; +import { Button } from 'antd'; +import React, { useState } from 'react'; export type Props = { query: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/EmptyQueriesSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/EmptyQueriesSection.tsx index fef562b96c..4921443ad5 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/EmptyQueriesSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/EmptyQueriesSection.tsx @@ -1,12 +1,14 @@ -import React from 'react'; -import { Empty, Typography } from 'antd'; -import { Popover } from '@components'; -import styled from 'styled-components'; import { InfoCircleOutlined } from '@ant-design/icons'; +import { Popover } from '@components'; +import { Empty, Typography } from 'antd'; import { TooltipPlacement } from 'antd/es/tooltip'; -import NoDocs from '../../../../../../images/no-docs.svg'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../constants'; -import AddButton from './AddButton'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import AddButton from '@app/entityV2/shared/tabs/Dataset/Queries/AddButton'; + +import NoDocs from '@images/no-docs.svg'; const StyledEmpty = styled(Empty)` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection.tsx index 4623c00cfb..29282c2bbb 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection.tsx @@ -1,19 +1,20 @@ -import React, { useState } from 'react'; -import { Typography, Table, TablePaginationConfig } from 'antd'; -import { Popover } from '@components'; -import { TooltipPlacement } from 'antd/es/tooltip'; import { InfoCircleOutlined } from '@ant-design/icons'; +import { Popover } from '@components'; +import { Table, TablePaginationConfig, Typography } from 'antd'; +import { TooltipPlacement } from 'antd/es/tooltip'; +import React, { useState } from 'react'; import styled from 'styled-components'; + +import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import AddButton from '@app/entityV2/shared/tabs/Dataset/Queries/AddButton'; +import QueryFilters from '@app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/QueryFilters'; +import { QueriesTabSection, Query } from '@app/entityV2/shared/tabs/Dataset/Queries/types'; +import useQueryTableColumns from '@app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns'; +import { DEFAULT_PAGE_SIZE } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/constants'; +import Loading from '@app/shared/Loading'; +import usePagination, { Pagination } from '@app/sharedV2/pagination/usePagination'; +import { Sorting } from '@app/sharedV2/sorting/useSorting'; import { FacetFilterInput } from '@src/types.generated'; -import { QueriesTabSection, Query } from './types'; -import { DEFAULT_PAGE_SIZE } from './utils/constants'; -import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../../../constants'; -import useQueryTableColumns from './useQueryTableColumns'; -import Loading from '../../../../../shared/Loading'; -import usePagination, { Pagination } from '../../../../../sharedV2/pagination/usePagination'; -import { Sorting } from '../../../../../sharedV2/sorting/useSorting'; -import AddButton from './AddButton'; -import QueryFilters from './QueryFilters/QueryFilters'; const SectionWrapper = styled.div<{ $borderRadiusBottom?: boolean }>` background-color: white; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesTab.tsx index ace18d0673..fe4d82f71f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesTab.tsx @@ -1,20 +1,26 @@ -import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; -import styled from 'styled-components/macro'; import React, { useEffect, useState } from 'react'; -import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated'; -import { useBaseEntity } from '../../../../../entity/shared/EntityContext'; -import QueryBuilderModal from './QueryBuilderModal'; -import { addQueryToListQueriesCache, removeQueryFromListQueriesCache, updateListQueriesCache } from './cacheUtils'; -import QueriesListSection from './QueriesListSection'; -import useDownstreamQueries from './useDownstreamQueries'; -import { QueriesTabSection } from './types'; -import { useHighlightedQueries } from './useHighlightedQueries'; -import { usePopularQueries } from './usePopularQueries'; -import { useRecentQueries } from './useRecentQueries'; -import Loading from '../../../../../shared/Loading'; -import { useIsSeparateSiblingsMode } from '../../../../../entity/shared/siblingUtils'; -import usePrevious from '../../../../../shared/usePrevious'; -import EmptyQueriesSection from './EmptyQueriesSection'; +import styled from 'styled-components/macro'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import EmptyQueriesSection from '@app/entityV2/shared/tabs/Dataset/Queries/EmptyQueriesSection'; +import QueriesListSection from '@app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection'; +import QueryBuilderModal from '@app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderModal'; +import { + addQueryToListQueriesCache, + removeQueryFromListQueriesCache, + updateListQueriesCache, +} from '@app/entityV2/shared/tabs/Dataset/Queries/cacheUtils'; +import { QueriesTabSection } from '@app/entityV2/shared/tabs/Dataset/Queries/types'; +import useDownstreamQueries from '@app/entityV2/shared/tabs/Dataset/Queries/useDownstreamQueries'; +import { useHighlightedQueries } from '@app/entityV2/shared/tabs/Dataset/Queries/useHighlightedQueries'; +import { usePopularQueries } from '@app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries'; +import { useRecentQueries } from '@app/entityV2/shared/tabs/Dataset/Queries/useRecentQueries'; +import Loading from '@app/shared/Loading'; +import usePrevious from '@app/shared/usePrevious'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; const Content = styled.div<{ $backgroundColor: string }>` height: 100%; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/Query.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/Query.tsx index 40c0819c9c..700588554f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/Query.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/Query.tsx @@ -1,7 +1,8 @@ import React, { useState } from 'react'; -import QueryModal from './QueryModal'; -import QueryBuilderModal from './QueryBuilderModal'; -import QueryCard from './QueryCard'; + +import QueryBuilderModal from '@app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderModal'; +import QueryCard from '@app/entityV2/shared/tabs/Dataset/Queries/QueryCard'; +import QueryModal from '@app/entityV2/shared/tabs/Dataset/Queries/QueryModal'; export type Props = { urn?: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx index d44fb3a7cc..dabf9b5c6d 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx @@ -1,10 +1,11 @@ -import React from 'react'; import Editor from '@monaco-editor/react'; -import styled from 'styled-components'; import { Form, Input, Typography } from 'antd'; -import { ANTD_GRAY } from '../../../constants'; -import { QueryBuilderState } from './types'; -import { Editor as MarkdownEditor } from '../../Documentation/components/editor/Editor'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { QueryBuilderState } from '@app/entityV2/shared/tabs/Dataset/Queries/types'; +import { Editor as MarkdownEditor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; const EditorWrapper = styled.div` border: 1px solid ${ANTD_GRAY[5]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx index 370ad59527..ed920db6fd 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx @@ -1,14 +1,16 @@ +import { Modal, Typography, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { message, Modal, Typography } from 'antd'; + +import analytics, { EventType } from '@app/analytics'; +import QueryBuilderForm from '@app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderForm'; +import { QueryBuilderState } from '@app/entityV2/shared/tabs/Dataset/Queries/types'; +import ClickOutside from '@app/shared/ClickOutside'; import { Button } from '@src/alchemy-components'; import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; -import { useCreateQueryMutation, useUpdateQueryMutation } from '../../../../../../graphql/query.generated'; -import { QueryLanguage } from '../../../../../../types.generated'; -import { QueryBuilderState } from './types'; -import ClickOutside from '../../../../../shared/ClickOutside'; -import QueryBuilderForm from './QueryBuilderForm'; -import analytics, { EventType } from '../../../../../analytics'; + +import { useCreateQueryMutation, useUpdateQueryMutation } from '@graphql/query.generated'; +import { QueryLanguage } from '@types'; const StyledModal = styled(Modal)` top: 4vh; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCard.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCard.tsx index 4f8444016b..89b4fcb258 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCard.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCard.tsx @@ -1,9 +1,10 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; -import QueryCardHeader from './QueryCardHeader'; -import QueryCardQuery from './QueryCardQuery'; -import QueryCardDetails from './QueryCardDetails'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import QueryCardDetails from '@app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails'; +import QueryCardHeader from '@app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader'; +import QueryCardQuery from '@app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery'; const Card = styled.div<{ isCompact?: boolean }>` border: 1px solid ${ANTD_GRAY[5]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails.tsx index 90a7a9ba40..cca46cc1ff 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails.tsx @@ -1,11 +1,12 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { ANTD_GRAY } from '../../../constants'; -import { toLocalDateString } from '../../../../../shared/time/timeUtils'; -import NoMarkdownViewer from '../../../components/styled/StripMarkdownText'; -import QueryCardDetailsMenu from './QueryCardDetailsMenu'; -import QueryCardEditButton from './QueryCardEditButton'; + +import NoMarkdownViewer from '@app/entityV2/shared/components/styled/StripMarkdownText'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import QueryCardDetailsMenu from '@app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu'; +import QueryCardEditButton from '@app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton'; +import { toLocalDateString } from '@app/shared/time/timeUtils'; const Title = styled(Typography.Title)<{ secondary?: boolean }>` && { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx index d17f0d12b3..8ca40ca149 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx @@ -1,8 +1,9 @@ +import { DeleteOutlined, MoreOutlined } from '@ant-design/icons'; +import { Dropdown, Menu, Modal, message } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { DeleteOutlined, MoreOutlined } from '@ant-design/icons'; -import { Dropdown, Menu, message, Modal } from 'antd'; -import { useDeleteQueryMutation } from '../../../../../../graphql/query.generated'; + +import { useDeleteQueryMutation } from '@graphql/query.generated'; const StyledMoreOutlined = styled(MoreOutlined)` font-size: 14px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx index d0ebf23a40..79451ec9eb 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx @@ -1,7 +1,7 @@ -import React from 'react'; -import styled from 'styled-components'; import { EditOutlined } from '@ant-design/icons'; import { Button } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; const EditQueryActionButton = styled(Button)` && { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader.tsx index d605830b70..dd0ddb6edf 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader.tsx @@ -1,8 +1,9 @@ -import React from 'react'; -import styled from 'styled-components'; import { ExpandOutlined } from '@ant-design/icons'; import { Button } from 'antd'; -import CopyQuery from './CopyQuery'; +import React from 'react'; +import styled from 'styled-components'; + +import CopyQuery from '@app/entityV2/shared/tabs/Dataset/Queries/CopyQuery'; const Header = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery.tsx index 14da5cf9d9..e681e2fa4c 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; -import { StyledSyntaxHighlighter } from '../../../StyledSyntaxHighlighter'; + +import { StyledSyntaxHighlighter } from '@app/entityV2/shared/StyledSyntaxHighlighter'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const Statement = styled.div<{ fullHeight?: boolean; isCompact?: boolean }>` background-color: ${ANTD_GRAY[2]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/QueryFilters.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/QueryFilters.tsx index 539dc0af30..d4e4e09abf 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/QueryFilters.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/QueryFilters.tsx @@ -1,13 +1,15 @@ import React from 'react'; import styled from 'styled-components'; -import { FilterPredicate } from '../../../../../../searchV2/filters/types'; -import { convertToAvailableFilterPredictes } from '../../../../../../searchV2/filters/utils'; -import { FacetFilterInput } from '../../../../../../../types.generated'; -import SearchFilter from '../../../../../../searchV2/filters/SearchFilter'; -import SelectedSearchFilters from '../../../../../../searchV2/filters/SelectedSearchFilters'; -import { UnionType } from '../../../../../../searchV2/utils/constants'; -import { ANTD_GRAY_V2, REDESIGN_COLORS } from '../../../../constants'; -import useColumnsFilter from './useColumnsFilter'; + +import { ANTD_GRAY_V2, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import useColumnsFilter from '@app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useColumnsFilter'; +import SearchFilter from '@app/searchV2/filters/SearchFilter'; +import SelectedSearchFilters from '@app/searchV2/filters/SelectedSearchFilters'; +import { FilterPredicate } from '@app/searchV2/filters/types'; +import { convertToAvailableFilterPredictes } from '@app/searchV2/filters/utils'; +import { UnionType } from '@app/searchV2/utils/constants'; + +import { FacetFilterInput } from '@types'; const ColumnsFilterWrapper = styled.div` align-items: flex-end; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useColumnsFilter.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useColumnsFilter.ts index 015d71d42c..e0e0f24850 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useColumnsFilter.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useColumnsFilter.ts @@ -1,10 +1,12 @@ import { useEffect, useMemo } from 'react'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { getAndFilters } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries'; +import { getV1FieldPathFromSchemaFieldUrn } from '@app/lineageV2/lineageUtils'; import { getSourceUrnFromSchemaFieldUrn } from '@src/app/entityV2/schemaField/utils'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { EntityType, FacetFilterInput, QuerySource } from '../../../../../../../types.generated'; -import { useAggregateAcrossEntitiesQuery } from '../../../../../../../graphql/search.generated'; -import { getV1FieldPathFromSchemaFieldUrn } from '../../../../../../lineageV2/lineageUtils'; -import { getAndFilters } from '../utils/filterQueries'; + +import { useAggregateAcrossEntitiesQuery } from '@graphql/search.generated'; +import { EntityType, FacetFilterInput, QuerySource } from '@types'; interface Props { selectedColumnsFilter: FacetFilterInput; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryModal.tsx index 92fa3724fe..1fff2562cc 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryModal.tsx @@ -1,12 +1,13 @@ -import React from 'react'; import { Modal, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; + +import { StyledSyntaxHighlighter } from '@app/entityV2/shared/StyledSyntaxHighlighter'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import CopyQuery from '@app/entityV2/shared/tabs/Dataset/Queries/CopyQuery'; +import { Editor as MarkdownEditor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; import { Button } from '@src/alchemy-components'; import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; -import CopyQuery from './CopyQuery'; -import { ANTD_GRAY } from '../../../constants'; -import { Editor as MarkdownEditor } from '../../Documentation/components/editor/Editor'; -import { StyledSyntaxHighlighter } from '../../../StyledSyntaxHighlighter'; const StyledModal = styled(Modal)` top: 4vh; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/cacheUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/cacheUtils.ts index 01e11342d7..7c25dac5f4 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/cacheUtils.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/cacheUtils.ts @@ -1,6 +1,7 @@ -import { ListQueriesDocument, ListQueriesQuery } from '../../../../../../graphql/query.generated'; -import { QueryEntity, QuerySource } from '../../../../../../types.generated'; -import { getQueryEntitiesFilter } from './utils/filterQueries'; +import { getQueryEntitiesFilter } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries'; + +import { ListQueriesDocument, ListQueriesQuery } from '@graphql/query.generated'; +import { QueryEntity, QuerySource } from '@types'; export const removeQueryFromListQueriesCache = (urn, client, page, pageSize, datasetUrn, siblingUrn) => { const entityFilter = getQueryEntitiesFilter(datasetUrn, siblingUrn); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/queryColumns.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/queryColumns.tsx index e527c08c71..d40d9a8455 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/queryColumns.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/queryColumns.tsx @@ -3,14 +3,16 @@ import EditOutlinedIcon from '@mui/icons-material/EditOutlined'; import { Modal, Typography, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; + +import ActorAvatar from '@app/entityV2/shared/ActorAvatar'; +import { ActionButton } from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import QueryBuilderModal from '@app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderModal'; +import { Query } from '@app/entityV2/shared/tabs/Dataset/Queries/types'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; import MarkdownViewer from '@src/app/entity/shared/components/legacy/MarkdownViewer'; -import { useDeleteQueryMutation } from '../../../../../../graphql/query.generated'; -import { CorpUser, EntityType } from '../../../../../../types.generated'; -import { useEntityRegistryV2 } from '../../../../../useEntityRegistry'; -import ActorAvatar from '../../../ActorAvatar'; -import { ActionButton } from '../../../containers/profile/sidebar/SectionActionButton'; -import QueryBuilderModal from './QueryBuilderModal'; -import { Query } from './types'; + +import { useDeleteQueryMutation } from '@graphql/query.generated'; +import { CorpUser, EntityType } from '@types'; /* * Description Column diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/types.ts index 35d826e0f2..056c5c66bd 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/types.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/types.ts @@ -1,4 +1,4 @@ -import { CorpUser, Entity, SchemaFieldEntity } from '../../../../../../types.generated'; +import { CorpUser, Entity, SchemaFieldEntity } from '@types'; export type QueryBuilderState = { urn?: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useDownstreamQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useDownstreamQueries.ts index 0348f5fc79..f9652797b2 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useDownstreamQueries.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useDownstreamQueries.ts @@ -1,15 +1,17 @@ -import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams'; import { useEffect, useState } from 'react'; -import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated'; -import { useSearchAcrossLineageForQueriesQuery } from '../../../../../../graphql/query.generated'; -import { Entity, EntityType, LineageDirection, QueryEntity } from '../../../../../../types.generated'; -import { useBaseEntity } from '../../../../../entity/shared/EntityContext'; -import { DBT_URN } from '../../../../../ingest/source/builder/constants'; -import { LINEAGE_FILTER_PAGINATION, isQuery } from '../../../../../lineageV2/common'; -import { DEGREE_FILTER_NAME } from '../../../../../search/utils/constants'; -import { MAX_QUERIES_COUNT } from './utils/constants'; -import { filterQueries } from './utils/filterQueries'; -import { mapQuery } from './utils/mapQuery'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { MAX_QUERIES_COUNT } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/constants'; +import { filterQueries } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries'; +import { mapQuery } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/mapQuery'; +import { DBT_URN } from '@app/ingest/source/builder/constants'; +import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams'; +import { LINEAGE_FILTER_PAGINATION, isQuery } from '@app/lineageV2/common'; +import { DEGREE_FILTER_NAME } from '@app/search/utils/constants'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { useSearchAcrossLineageForQueriesQuery } from '@graphql/query.generated'; +import { Entity, EntityType, LineageDirection, QueryEntity } from '@types'; export default function useDownstreamQueries(filterText: string) { const baseEntity = useBaseEntity(); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useHighlightedQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useHighlightedQueries.ts index 8d7eddfa4b..7bfbbae96f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useHighlightedQueries.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useHighlightedQueries.ts @@ -1,10 +1,11 @@ -import { useListQueriesQuery } from '../../../../../../graphql/query.generated'; -import { QueryEntity, QuerySource } from '../../../../../../types.generated'; -import usePagination from '../../../../../sharedV2/pagination/usePagination'; -import useSorting from '../../../../../sharedV2/sorting/useSorting'; -import { DEFAULT_PAGE_SIZE } from './utils/constants'; -import { filterQueries, getQueryEntitiesFilter } from './utils/filterQueries'; -import { mapQuery } from './utils/mapQuery'; +import { DEFAULT_PAGE_SIZE } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/constants'; +import { filterQueries, getQueryEntitiesFilter } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries'; +import { mapQuery } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/mapQuery'; +import usePagination from '@app/sharedV2/pagination/usePagination'; +import useSorting from '@app/sharedV2/sorting/useSorting'; + +import { useListQueriesQuery } from '@graphql/query.generated'; +import { QueryEntity, QuerySource } from '@types'; interface Props { entityUrn?: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries.ts index a13ad4495d..0c3365277f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries.ts @@ -1,12 +1,18 @@ import { useState } from 'react'; -import { useListQueriesQuery } from '../../../../../../graphql/query.generated'; -import { FacetFilterInput, QueryEntity, QuerySource } from '../../../../../../types.generated'; -import { filterQueries, getAndFilters, getQueryEntitiesFilter } from './utils/filterQueries'; -import usePagination from '../../../../../sharedV2/pagination/usePagination'; -import { DEFAULT_PAGE_SIZE } from './utils/constants'; -import { mapQuery } from './utils/mapQuery'; -import useSorting from '../../../../../sharedV2/sorting/useSorting'; -import { useQueryParamValue } from '../../../useQueryParamValue'; + +import { DEFAULT_PAGE_SIZE } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/constants'; +import { + filterQueries, + getAndFilters, + getQueryEntitiesFilter, +} from '@app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries'; +import { mapQuery } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/mapQuery'; +import { useQueryParamValue } from '@app/entityV2/shared/useQueryParamValue'; +import usePagination from '@app/sharedV2/pagination/usePagination'; +import useSorting from '@app/sharedV2/sorting/useSorting'; + +import { useListQueriesQuery } from '@graphql/query.generated'; +import { FacetFilterInput, QueryEntity, QuerySource } from '@types'; interface Props { entityUrn?: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns.tsx index 3ec1170267..3f2939684e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns.tsx @@ -1,14 +1,21 @@ import moment from 'moment'; import React from 'react'; import styled from 'styled-components'; -import { Query } from './types'; -import QueryComponent from './Query'; -import { EditDeleteColumn, QueryCreatedBy, QueryDescription, ColumnsColumn } from './queryColumns'; -import { CorpUser, Entity } from '../../../../../../types.generated'; -import { EntityLink } from '../../../../../homeV2/reference/sections/EntityLink'; -import { useEntityRegistryV2 } from '../../../../../useEntityRegistry'; -import { Sorting } from '../../../../../sharedV2/sorting/useSorting'; -import TopUsersFacepile from '../../../containers/profile/sidebar/shared/TopUsersFacepile'; + +import TopUsersFacepile from '@app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile'; +import QueryComponent from '@app/entityV2/shared/tabs/Dataset/Queries/Query'; +import { + ColumnsColumn, + EditDeleteColumn, + QueryCreatedBy, + QueryDescription, +} from '@app/entityV2/shared/tabs/Dataset/Queries/queryColumns'; +import { Query } from '@app/entityV2/shared/tabs/Dataset/Queries/types'; +import { EntityLink } from '@app/homeV2/reference/sections/EntityLink'; +import { Sorting } from '@app/sharedV2/sorting/useSorting'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { CorpUser, Entity } from '@types'; const UsersWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useRecentQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useRecentQueries.ts index 5a8f8cf229..cf207f9dcb 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useRecentQueries.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useRecentQueries.ts @@ -1,9 +1,10 @@ -import { useGetRecentQueriesQuery } from '../../../../../../graphql/dataset.generated'; +import { MAX_QUERIES_COUNT } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/constants'; +import { filterQueries } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries'; +import getTopNQueries from '@app/entityV2/shared/tabs/Dataset/Queries/utils/getTopNQueries'; // import { useAppConfig } from '../../../../../useAppConfig'; -import { useIsSeparateSiblingsMode } from '../../../useIsSeparateSiblingsMode'; -import { MAX_QUERIES_COUNT } from './utils/constants'; -import { filterQueries } from './utils/filterQueries'; -import getTopNQueries from './utils/getTopNQueries'; +import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; + +import { useGetRecentQueriesQuery } from '@graphql/dataset.generated'; interface Props { entityUrn?: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries.ts index 2ca5498b70..7ef279f7ba 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries.ts @@ -1,5 +1,6 @@ -import { FacetFilterInput } from '../../../../../../../types.generated'; -import { Query } from '../types'; +import { Query } from '@app/entityV2/shared/tabs/Dataset/Queries/types'; + +import { FacetFilterInput } from '@types'; /** * Filter queries by a search string. Compares name, description, and query statement. diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts index db3c11e28d..3cda40bc6d 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts @@ -1,4 +1,4 @@ -import { UsageAggregation, Maybe } from '../../../../../../../types.generated'; +import { Maybe, UsageAggregation } from '@types'; type RecentQuery = { query: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/mapQuery.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/mapQuery.ts index 053305e1c5..0c53c45397 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/mapQuery.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/mapQuery.ts @@ -1,6 +1,7 @@ +import { Query } from '@app/entityV2/shared/tabs/Dataset/Queries/types'; import { getSourceUrnFromSchemaFieldUrn } from '@src/app/entityV2/schemaField/utils'; -import { Entity, QueryEntity, SchemaFieldEntity } from '../../../../../../../types.generated'; -import { Query } from '../types'; + +import { Entity, QueryEntity, SchemaFieldEntity } from '@types'; interface Props { queryEntity: QueryEntity; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable.tsx index 1a61488979..308449b4c9 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable.tsx @@ -1,29 +1,24 @@ -import React, { useMemo, useState } from 'react'; -import { ColumnsType } from 'antd/es/table'; import { Button, Table } from 'antd'; -import styled from 'styled-components'; -import { useDebounce } from 'react-use'; - +import { ColumnsType } from 'antd/es/table'; import { FixedType } from 'rc-table/lib/interface'; +import React, { useMemo, useState } from 'react'; +import { useDebounce } from 'react-use'; +import styled from 'styled-components'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import useSchemaTitleRenderer from '@app/entityV2/dataset/profile/schema/utils/schemaTitleRenderer'; +import { ExtendedSchemaFields } from '@app/entityV2/dataset/profile/schema/utils/types'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import ExpandIcon from '@app/entityV2/shared/tabs/Dataset/Schema/components/ExpandIcon'; +import SchemaFieldDrawer from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer'; +import useKeyboardControls from '@app/entityV2/shared/tabs/Dataset/Schema/useKeyboardControls'; +import useDescriptionRenderer from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer'; +import useExtractFieldDescriptionInfo from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldDescriptionInfo'; +import useUsageStatsRenderer from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import translateFieldPath from '@src/app/entityV2/dataset/profile/schema/utils/translateFieldPath'; -import { - EditableSchemaMetadata, - EntityType, - SchemaField, - SchemaMetadata, - UsageQueryResult, -} from '../../../../../../types.generated'; -import useSchemaTitleRenderer from '../../../../dataset/profile/schema/utils/schemaTitleRenderer'; -import { ExtendedSchemaFields } from '../../../../dataset/profile/schema/utils/types'; -import useDescriptionRenderer from './utils/useDescriptionRenderer'; -import useUsageStatsRenderer from './utils/useUsageStatsRenderer'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { REDESIGN_COLORS } from '../../../constants'; -import ExpandIcon from './components/ExpandIcon'; -import SchemaFieldDrawer from './components/SchemaFieldDrawer/SchemaFieldDrawer'; -import useKeyboardControls from './useKeyboardControls'; -import useExtractFieldDescriptionInfo from './utils/useExtractFieldDescriptionInfo'; + +import { EditableSchemaMetadata, EntityType, SchemaField, SchemaMetadata, UsageQueryResult } from '@types'; export type Props = { rows: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaContext.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaContext.tsx index f891438679..3fcc72f379 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaContext.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaContext.tsx @@ -1,5 +1,6 @@ import React, { useContext } from 'react'; -import { SchemaContextType } from '../../../../../entity/shared/types'; + +import { SchemaContextType } from '@app/entity/shared/types'; const SchemaContext = React.createContext({ refetch: () => Promise.resolve({}), diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTab.tsx index 1f5e69f5ba..7d90602c73 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTab.tsx @@ -1,32 +1,36 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { SEMANTIC_VERSION_PARAM } from '@app/entityV2/dataset/profile/schema/components/VersionSelector'; -import useSchemaVersioning from '@app/entityV2/shared/tabs/Dataset/Schema/useSchemaVersioning'; -import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; import { Empty } from 'antd'; import React, { useEffect, useMemo, useState } from 'react'; import { useLocation } from 'react-router'; import styled from 'styled-components'; -import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated'; -import { useBaseEntity, useEntityData } from '../../../../../entity/shared/EntityContext'; -import SchemaEditableContext from '../../../../../shared/SchemaEditableContext'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import SchemaHeader from '../../../../dataset/profile/schema/components/SchemaHeader'; -import SchemaRawView from '../../../../dataset/profile/schema/components/SchemaRawView'; -import { KEY_SCHEMA_PREFIX } from '../../../../dataset/profile/schema/utils/constants'; -import { groupByFieldPath } from '../../../../dataset/profile/schema/utils/utils'; -import { ANTD_GRAY } from '../../../constants'; -import { TabRenderType } from '../../../types'; -import CompactSchemaTable from './CompactSchemaTable'; -import HistorySidebar from './history/HistorySidebar'; -import SchemaContext from './SchemaContext'; -import SchemaTable from './SchemaTable'; -import { useGetEntityWithSchema } from './useGetEntitySchema'; -import { filterSchemaRows, SchemaFilterType } from './utils/filterSchemaRows'; -import getExpandedDrawerFieldPath from './utils/getExpandedDrawerFieldPath'; -import getSchemaFilterTypesFromUrl from './utils/getSchemaFilterTypesFromUrl'; -import { getMatchedTextFromQueryString, getSchemaFilterFromQueryString } from './utils/queryStringUtils'; -import useUpdateSchemaFilterQueryString from './utils/updateSchemaFilterQueryString'; +import { useBaseEntity, useEntityData } from '@app/entity/shared/EntityContext'; +import SchemaHeader from '@app/entityV2/dataset/profile/schema/components/SchemaHeader'; +import SchemaRawView from '@app/entityV2/dataset/profile/schema/components/SchemaRawView'; +import { SEMANTIC_VERSION_PARAM } from '@app/entityV2/dataset/profile/schema/components/VersionSelector'; +import { KEY_SCHEMA_PREFIX } from '@app/entityV2/dataset/profile/schema/utils/constants'; +import { groupByFieldPath } from '@app/entityV2/dataset/profile/schema/utils/utils'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import CompactSchemaTable from '@app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable'; +import SchemaContext from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaContext'; +import SchemaTable from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaTable'; +import HistorySidebar from '@app/entityV2/shared/tabs/Dataset/Schema/history/HistorySidebar'; +import { useGetEntityWithSchema } from '@app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema'; +import useSchemaVersioning from '@app/entityV2/shared/tabs/Dataset/Schema/useSchemaVersioning'; +import { SchemaFilterType, filterSchemaRows } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows'; +import getExpandedDrawerFieldPath from '@app/entityV2/shared/tabs/Dataset/Schema/utils/getExpandedDrawerFieldPath'; +import getSchemaFilterTypesFromUrl from '@app/entityV2/shared/tabs/Dataset/Schema/utils/getSchemaFilterTypesFromUrl'; +import { + getMatchedTextFromQueryString, + getSchemaFilterFromQueryString, +} from '@app/entityV2/shared/tabs/Dataset/Schema/utils/queryStringUtils'; +import useUpdateSchemaFilterQueryString from '@app/entityV2/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString'; +import { TabRenderType } from '@app/entityV2/shared/types'; +import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; const NoSchema = styled(Empty)` color: ${ANTD_GRAY[6]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTable.tsx index 50d69536bc..e4043d90ef 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTable.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTable.tsx @@ -1,38 +1,35 @@ import { ColumnsType } from 'antd/es/table'; -import type { FixedType } from 'rc-table/lib/interface'; import { SorterResult } from 'antd/lib/table/interface'; import ResizeObserver from 'rc-resize-observer'; +import type { FixedType } from 'rc-table/lib/interface'; import React, { useEffect, useMemo, useRef, useState } from 'react'; +import { useDebounce } from 'react-use'; import styled from 'styled-components'; import { useVT } from 'virtualizedtableforantd4'; -import { useDebounce } from 'react-use'; -import { useEntityData } from '@src/app/entity/shared/EntityContext'; + +import SchemaRow from '@app/entityV2/dataset/profile/schema/components/SchemaRow'; +import useSchemaTitleRenderer from '@app/entityV2/dataset/profile/schema/utils/schemaTitleRenderer'; +import useSchemaTypeRenderer from '@app/entityV2/dataset/profile/schema/utils/schemaTypeRenderer'; +import translateFieldPath from '@app/entityV2/dataset/profile/schema/utils/translateFieldPath'; +import { ExtendedSchemaFields } from '@app/entityV2/dataset/profile/schema/utils/types'; +import { findIndexOfFieldPathExcludingCollapsedFields } from '@app/entityV2/dataset/profile/schema/utils/utils'; +import { StyledTable } from '@app/entityV2/shared/components/styled/StyledTable'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import ExpandIcon from '@app/entityV2/shared/tabs/Dataset/Schema/components/ExpandIcon'; +import SchemaFieldDrawer from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer'; +import useKeyboardControls from '@app/entityV2/shared/tabs/Dataset/Schema/useKeyboardControls'; +import useDescriptionRenderer from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer'; +import useExtractFieldDescriptionInfo from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldDescriptionInfo'; +import useExtractFieldGlossaryTermsInfo from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldGlossaryTermsInfo'; +import useExtractFieldTagsInfo from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldTagsInfo'; +import { useGetStructuredPropColumns } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useGetStructuredPropColumns'; +import { useGetTableColumnProperties } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useGetTableColumnProperties'; +import useTagsAndTermsRenderer from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer'; +import useUsageStatsRenderer from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer'; import { colors } from '@src/alchemy-components'; -import { - EditableSchemaMetadata, - SchemaField, - SchemaMetadata, - UsageQueryResult, -} from '../../../../../../types.generated'; -import SchemaRow from '../../../../dataset/profile/schema/components/SchemaRow'; -import useSchemaTitleRenderer from '../../../../dataset/profile/schema/utils/schemaTitleRenderer'; -import useSchemaTypeRenderer from '../../../../dataset/profile/schema/utils/schemaTypeRenderer'; -import translateFieldPath from '../../../../dataset/profile/schema/utils/translateFieldPath'; -import { ExtendedSchemaFields } from '../../../../dataset/profile/schema/utils/types'; -import { StyledTable } from '../../../components/styled/StyledTable'; -import { REDESIGN_COLORS } from '../../../constants'; -import ExpandIcon from './components/ExpandIcon'; -import SchemaFieldDrawer from './components/SchemaFieldDrawer/SchemaFieldDrawer'; -import useDescriptionRenderer from './utils/useDescriptionRenderer'; -import useTagsAndTermsRenderer from './utils/useTagsAndTermsRenderer'; -import useUsageStatsRenderer from './utils/useUsageStatsRenderer'; -import useKeyboardControls from './useKeyboardControls'; -import { findIndexOfFieldPathExcludingCollapsedFields } from '../../../../dataset/profile/schema/utils/utils'; -import useExtractFieldGlossaryTermsInfo from './utils/useExtractFieldGlossaryTermsInfo'; -import useExtractFieldTagsInfo from './utils/useExtractFieldTagsInfo'; -import useExtractFieldDescriptionInfo from './utils/useExtractFieldDescriptionInfo'; -import { useGetTableColumnProperties } from './utils/useGetTableColumnProperties'; -import { useGetStructuredPropColumns } from './utils/useGetStructuredPropColumns'; +import { useEntityData } from '@src/app/entity/shared/EntityContext'; + +import { EditableSchemaMetadata, SchemaField, SchemaMetadata, UsageQueryResult } from '@types'; const TableContainer = styled.div<{ isSearchActive: boolean; hasRowWithDepth: boolean }>` overflow: inherit; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts index 407a265813..42fb23e815 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts @@ -1,7 +1,8 @@ -import { glossaryTerm1, sampleTag } from '../../../../../../../Mocks'; -import { SchemaField } from '../../../../../../../types.generated'; -import { getTestEntityRegistry } from '../../../../../../../utils/test-utils/TestPageContainer'; -import { filterSchemaRows, SchemaFilterType } from '../utils/filterSchemaRows'; +import { SchemaFilterType, filterSchemaRows } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows'; +import { glossaryTerm1, sampleTag } from '@src/Mocks'; +import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer'; + +import { SchemaField } from '@types'; describe('filterSchemaRows', () => { const testEntityRegistry = getTestEntityRegistry(); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ConstraintLabels.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ConstraintLabels.tsx index 08ae83cb6b..9051172793 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ConstraintLabels.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ConstraintLabels.tsx @@ -1,7 +1,8 @@ +import { blue, green } from '@ant-design/colors'; import React from 'react'; import styled from 'styled-components'; -import { blue, green } from '@ant-design/colors'; -import { ANTD_GRAY } from '../../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const Pill = styled.div` background-color: ${ANTD_GRAY[1]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx index 59d908b8f8..7e6a57c6fc 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx @@ -1,10 +1,12 @@ import { DownOutlined, RightOutlined } from '@ant-design/icons'; -import { Typography } from 'antd'; import { Tooltip } from '@components'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import RowIcon from '../../../../../../../images/row-icon.svg?react'; -import { REDESIGN_COLORS, SEARCH_COLORS } from '../../../../constants'; + +import { REDESIGN_COLORS, SEARCH_COLORS } from '@app/entityV2/shared/constants'; + +import RowIcon from '@images/row-icon.svg?react'; const Prefix = styled.div<{ padding: number }>` position: absolute; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn.tsx index f6682bf0f4..5ac4d96992 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn.tsx @@ -1,12 +1,14 @@ +import { CopyOutlined } from '@ant-design/icons'; +import { Dropdown, Menu } from 'antd'; import React from 'react'; import { VscGraphLeft } from 'react-icons/vsc'; -import { CopyOutlined } from '@ant-design/icons'; import styled from 'styled-components/macro'; -import { Dropdown, Menu } from 'antd'; -import { MenuIcon } from '../../../../EntityDropdown/EntityMenuActions'; -import { useEntityData, useRouteToTab } from '../../../../../../entity/shared/EntityContext'; -import { SchemaField } from '../../../../../../../types.generated'; -import { generateSchemaFieldUrn } from '../../../Lineage/utils'; + +import { useEntityData, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { MenuIcon } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import { generateSchemaFieldUrn } from '@app/entityV2/shared/tabs/Lineage/utils'; + +import { SchemaField } from '@types'; export const ImpactAnalysisIcon = styled(VscGraphLeft)` transform: scaleX(-1); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/NestedRowIcon.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/NestedRowIcon.tsx index eb172ce917..c9d1e3f804 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/NestedRowIcon.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/NestedRowIcon.tsx @@ -1,8 +1,10 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { REDESIGN_COLORS } from '../../../../constants'; -import RowIcon from '../../../../../../../images/row-icon.svg?react'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; + +import RowIcon from '@images/row-icon.svg?react'; const RowIconContainer = styled.div` position: relative; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/AboutFieldTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/AboutFieldTab.tsx index 28cb6bbba2..0fa8db6353 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/AboutFieldTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/AboutFieldTab.tsx @@ -1,24 +1,20 @@ -import SidebarStructuredProperties from '@src/app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; import moment from 'moment'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { - DatasetFieldProfile, - EditableSchemaMetadata, - Post, - SchemaField, - UsageQueryResult, -} from '../../../../../../../../types.generated'; -import { useMutationUrn } from '../../../../../../../entity/shared/EntityContext'; -import { pathMatchesExact } from '../../../../../../dataset/profile/schema/utils/utils'; -import NotesSection from '../../../../../notes/NotesSection'; -import FieldDescription from './FieldDescription'; -import { FieldDetails } from './FieldDetails'; -import FieldTags from './FieldTags'; -import FieldTerms from './FieldTerms'; -import SampleValuesSection from './SampleValuesSection'; -import StatsSection from './StatsSection'; -import { StyledDivider } from './components'; + +import { useMutationUrn } from '@app/entity/shared/EntityContext'; +import { pathMatchesExact } from '@app/entityV2/dataset/profile/schema/utils/utils'; +import NotesSection from '@app/entityV2/shared/notes/NotesSection'; +import FieldDescription from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription'; +import { FieldDetails } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDetails'; +import FieldTags from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags'; +import FieldTerms from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms'; +import SampleValuesSection from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SampleValuesSection'; +import StatsSection from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSection'; +import { StyledDivider } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import SidebarStructuredProperties from '@src/app/entityV2/shared/sidebarSection/SidebarStructuredProperties'; + +import { DatasetFieldProfile, EditableSchemaMetadata, Post, SchemaField, UsageQueryResult } from '@types'; const MetadataSections = styled.div` padding: 16px 12px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerFooter.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerFooter.tsx index 714cd633ed..8f00ebecca 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerFooter.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerFooter.tsx @@ -1,10 +1,11 @@ +import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'; +import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp'; import React from 'react'; import styled from 'styled-components'; -import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp'; -import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'; -import { pluralize } from '../../../../../../../shared/textUtil'; -import { REDESIGN_COLORS } from '../../../../../constants'; -import { ExtendedSchemaFields } from '../../../../../../dataset/profile/schema/utils/types'; + +import { ExtendedSchemaFields } from '@app/entityV2/dataset/profile/schema/utils/types'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { pluralize } from '@app/shared/textUtil'; const HeaderWrapper = styled.div` position: absolute; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx index a7b9f65d7e..7ca53ed057 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx @@ -3,21 +3,23 @@ import EditOutlinedIcon from '@mui/icons-material/EditOutlined'; import { message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { useUpdateDescriptionMutation } from '../../../../../../../../graphql/mutations.generated'; -import { EditableSchemaFieldInfo, SchemaField, SubResourceType } from '../../../../../../../../types.generated'; -import analytics, { EntityActionType, EventType } from '../../../../../../../analytics'; -import SchemaEditableContext from '../../../../../../../shared/SchemaEditableContext'; -import { useEntityData, useMutationUrn, useRefetch } from '../../../../../../../entity/shared/EntityContext'; -import UpdateDescriptionModal from '../../../../../components/legacy/DescriptionModal'; -import { REDESIGN_COLORS } from '../../../../../constants'; -import DescriptionSection from '../../../../../containers/profile/sidebar/AboutSection/DescriptionSection'; -import SectionActionButton from '../../../../../containers/profile/sidebar/SectionActionButton'; -import { SidebarSection } from '../../../../../containers/profile/sidebar/SidebarSection'; -import { useSchemaRefetch } from '../../SchemaContext'; -import { StyledDivider } from './components'; -import { sanitizeRichText } from '../../../../Documentation/components/editor/utils'; -import { getFieldDescriptionDetails } from '../../utils/getFieldDescriptionDetails'; -import DocumentationPropagationDetails from '../../../../../../../sharedV2/propagation/DocumentationPropagationDetails'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import UpdateDescriptionModal from '@app/entityV2/shared/components/legacy/DescriptionModal'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import DescriptionSection from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/DescriptionSection'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { useSchemaRefetch } from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaContext'; +import { StyledDivider } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import { getFieldDescriptionDetails } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails'; +import { sanitizeRichText } from '@app/entityV2/shared/tabs/Documentation/components/editor/utils'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; +import DocumentationPropagationDetails from '@app/sharedV2/propagation/DocumentationPropagationDetails'; + +import { useUpdateDescriptionMutation } from '@graphql/mutations.generated'; +import { EditableSchemaFieldInfo, SchemaField, SubResourceType } from '@types'; const AddNewDescription = styled.div` margin: 0px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDetails.tsx index 2a7a16619b..ba9ac4a232 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDetails.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDetails.tsx @@ -1,15 +1,17 @@ -import SchemaEditableContext from '@app/shared/SchemaEditableContext'; -import MarkAsDeprecatedButton from '@src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton'; import { Button, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Deprecation, SubResourceType, UsageQueryResult } from '../../../../../../../../types.generated'; -import { useMutationUrn } from '../../../../../../../entity/shared/EntityContext'; -import { UpdateDeprecationModal } from '../../../../../EntityDropdown/UpdateDeprecationModal'; -import CreateEntityAnnouncementModal from '../../../../../announce/CreateEntityAnnouncementModal'; -import { DeprecationIcon } from '../../../../../components/styled/DeprecationIcon'; -import { REDESIGN_COLORS } from '../../../../../constants'; -import { FieldPopularity } from './FieldPopularity'; + +import { useMutationUrn } from '@app/entity/shared/EntityContext'; +import { UpdateDeprecationModal } from '@app/entityV2/shared/EntityDropdown/UpdateDeprecationModal'; +import CreateEntityAnnouncementModal from '@app/entityV2/shared/announce/CreateEntityAnnouncementModal'; +import { DeprecationIcon } from '@app/entityV2/shared/components/styled/DeprecationIcon'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { FieldPopularity } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPopularity'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; +import MarkAsDeprecatedButton from '@src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton'; + +import { Deprecation, SubResourceType, UsageQueryResult } from '@types'; const FieldDetailsWrapper = styled.div` padding: 16px 12px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx index c4c202c0c2..c44d1246f1 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx @@ -1,17 +1,22 @@ import { CloseOutlined } from '@ant-design/icons'; -import { useAppConfig } from '@app/useAppConfig'; import { Divider } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; + +import translateFieldPath from '@app/entityV2/dataset/profile/schema/utils/translateFieldPath'; +import NullableLabel, { + PartitioningKeyLabel, + PrimaryKeyLabel, +} from '@app/entityV2/shared/tabs/Dataset/Schema/components/ConstraintLabels'; +import MenuColumn from '@app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn'; +import FieldPath from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPath'; +import TypeLabel from '@app/entityV2/shared/tabs/Dataset/Schema/components/TypeLabel'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import colors from '@src/alchemy-components/theme/foundations/colors'; -import { SchemaField } from '../../../../../../../../types.generated'; -import translateFieldPath from '../../../../../../dataset/profile/schema/utils/translateFieldPath'; -import NullableLabel, { PartitioningKeyLabel, PrimaryKeyLabel } from '../ConstraintLabels'; -import MenuColumn from '../MenuColumn'; -import TypeLabel from '../TypeLabel'; -import FieldPath from './FieldPath'; -import { useEntityRegistry } from '../../../../../../../useEntityRegistry'; + +import { SchemaField } from '@types'; const FieldHeaderWrapper = styled.div` padding: 16px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPath.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPath.tsx index 19cb47d001..62cd73aa46 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPath.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPath.tsx @@ -1,10 +1,12 @@ import { EnterOutlined } from '@ant-design/icons'; -import { Divider, Typography } from 'antd'; import { Popover } from '@components'; +import { Divider, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import RowIcon from '../../../../../../../../images/row-icon.svg?react'; -import { REDESIGN_COLORS } from '../../../../../constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; + +import RowIcon from '@images/row-icon.svg?react'; const FieldPathWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPopularity.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPopularity.tsx index 659cb55794..58bf929a78 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPopularity.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPopularity.tsx @@ -1,9 +1,11 @@ -import React, { useMemo } from 'react'; import { Tooltip } from '@components'; -import { UsageQueryResult } from '../../../../../../../../types.generated'; -import { pathMatchesNewPath } from '../../../../../../dataset/profile/schema/utils/utils'; -import { PopularityBars } from './PopularityBars'; -import { formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber'; +import React, { useMemo } from 'react'; + +import { pathMatchesNewPath } from '@app/entityV2/dataset/profile/schema/utils/utils'; +import { PopularityBars } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/PopularityBars'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; + +import { UsageQueryResult } from '@types'; type FieldPopularityProps = { isFieldSelected: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx index f92120ae5d..8fddf864bb 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { EditableSchemaMetadata, GlobalTags, SchemaField } from '../../../../../../../../types.generated'; -import SchemaEditableContext from '../../../../../../../shared/SchemaEditableContext'; -import { SidebarSection } from '../../../../../containers/profile/sidebar/SidebarSection'; -import useTagsAndTermsRenderer from '../../utils/useTagsAndTermsRenderer'; -import { StyledDivider } from './components'; + +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { StyledDivider } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import useTagsAndTermsRenderer from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; + +import { EditableSchemaMetadata, GlobalTags, SchemaField } from '@types'; interface Props { expandedField: SchemaField; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx index 7f1885810e..81c7210fd0 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { EditableSchemaMetadata, GlobalTags, SchemaField } from '../../../../../../../../types.generated'; -import SchemaEditableContext from '../../../../../../../shared/SchemaEditableContext'; -import { SidebarSection } from '../../../../../containers/profile/sidebar/SidebarSection'; -import useTagsAndTermsRenderer from '../../utils/useTagsAndTermsRenderer'; -import { StyledDivider } from './components'; + +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { StyledDivider } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import useTagsAndTermsRenderer from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; + +import { EditableSchemaMetadata, GlobalTags, SchemaField } from '@types'; interface Props { expandedField: SchemaField; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTitle.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTitle.tsx index 886c1d5bc9..c1c55f766e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTitle.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTitle.tsx @@ -1,7 +1,8 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { REDESIGN_COLORS } from '../../../../../constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; const FieldName = styled(Typography.Text)` color: ${REDESIGN_COLORS.WHITE_WIRE}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx index 9becd81289..32ae7e2f4e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx @@ -1,13 +1,15 @@ import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { GetDatasetQuery } from '../../../../../../../../graphql/dataset.generated'; -import { useBaseEntity } from '../../../../../../../entity/shared/EntityContext'; -import { ANTD_GRAY_V2 } from '../../../../../constants'; -import { SectionHeader } from './components'; -import { pathMatchesNewPath } from '../../../../../../dataset/profile/schema/utils/utils'; -import { UsageBar } from '../../utils/useUsageStatsRenderer'; -import { SchemaField } from '../../../../../../../../types.generated'; -import { formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { pathMatchesNewPath } from '@app/entityV2/dataset/profile/schema/utils/utils'; +import { ANTD_GRAY_V2 } from '@app/entityV2/shared/constants'; +import { SectionHeader } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import { UsageBar } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { SchemaField } from '@types'; const USAGE_BAR_MAX_WIDTH = 100; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SampleValuesSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SampleValuesSection.tsx index a5517b5fd6..accd682db4 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SampleValuesSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SampleValuesSection.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { DatasetFieldProfile } from '../../../../../../../../types.generated'; -import { SidebarSection } from '../../../../../containers/profile/sidebar/SidebarSection'; -import SampleValueTag from '../../../Stats/snapshot/SampleValueTag'; -import { StyledDivider } from './components'; + +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import { StyledDivider } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; +import SampleValueTag from '@app/entityV2/shared/tabs/Dataset/Stats/snapshot/SampleValueTag'; + +import { DatasetFieldProfile } from '@types'; interface Props { fieldProfile: DatasetFieldProfile | undefined; @@ -19,9 +21,7 @@ export default function SampleValuesSection({ fieldProfile }: Props) { content={fieldProfile.sampleValues ?.filter((value) => value !== undefined) .slice(0, 3) - .map((value) => ( - - ))} + .map((value) => )} /> diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx index b24c86e447..c231f5baf8 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx @@ -1,29 +1,28 @@ import { CodeOutlined, ReadOutlined, UnorderedListOutlined } from '@ant-design/icons'; -import { generateSchemaFieldUrn } from '@app/entityV2/shared/tabs/Lineage/utils'; -import { useGetEntitiesNotesQuery } from '@graphql/relationships.generated'; import QueryStatsOutlinedIcon from '@mui/icons-material/QueryStatsOutlined'; -import { TabRenderType } from '@src/app/entityV2/shared/types'; import { Drawer, Typography } from 'antd'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import styled from 'styled-components'; -import { GetDatasetQuery, useGetDataProfilesLazyQuery } from '../../../../../../../../graphql/dataset.generated'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { ExtendedSchemaFields } from '@app/entityV2/dataset/profile/schema/utils/types'; +import { AboutFieldTab } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/AboutFieldTab'; +import DrawerFooter from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerFooter'; +import FieldHeader from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader'; import { - EditableSchemaMetadata, - Post, - SchemaField, - TimeWindow, - UsageQueryResult, -} from '../../../../../../../../types.generated'; -import { useBaseEntity } from '../../../../../../../entity/shared/EntityContext'; -import { ExtendedSchemaFields } from '../../../../../../dataset/profile/schema/utils/types'; -import { PropertiesTab } from '../../../../Properties/PropertiesTab'; -import { SchemaTimelineSection } from '../../../Timeline/SchemaTimelineSection'; -import { AboutFieldTab } from './AboutFieldTab'; -import DrawerFooter from './DrawerFooter'; -import FieldHeader from './FieldHeader'; -import { SchemaFieldDrawerTabs, TABS_WIDTH } from './SchemaFieldDrawerTabs'; -import SchemaFieldQueriesSidebarTab from './SchemaFieldQueriesSidebarTab'; -import StatsSidebarView from './StatsSidebarView'; + SchemaFieldDrawerTabs, + TABS_WIDTH, +} from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawerTabs'; +import SchemaFieldQueriesSidebarTab from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab'; +import StatsSidebarView from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarView'; +import { SchemaTimelineSection } from '@app/entityV2/shared/tabs/Dataset/Timeline/SchemaTimelineSection'; +import { generateSchemaFieldUrn } from '@app/entityV2/shared/tabs/Lineage/utils'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { TabRenderType } from '@src/app/entityV2/shared/types'; + +import { GetDatasetQuery, useGetDataProfilesLazyQuery } from '@graphql/dataset.generated'; +import { useGetEntitiesNotesQuery } from '@graphql/relationships.generated'; +import { EditableSchemaMetadata, Post, SchemaField, TimeWindow, UsageQueryResult } from '@types'; const StyledDrawer = styled(Drawer)` &&& .ant-drawer-body { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawerTabs.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawerTabs.tsx index db0b0d19ab..050b801f54 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawerTabs.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawerTabs.tsx @@ -1,8 +1,9 @@ +import { Tooltip } from '@components'; +import { Tabs } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Tabs } from 'antd'; -import { Tooltip } from '@components'; -import { EntitySidebarTab } from '../../../../../types'; + +import { EntitySidebarTab } from '@app/entityV2/shared/types'; export const TABS_WIDTH = 56; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab.tsx index ba860a616f..bc28fee8c4 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab.tsx @@ -1,18 +1,21 @@ -import { useIsSeparateSiblingsMode } from '@src/app/entity/shared/siblingUtils'; import Icon from '@ant-design/icons'; import { Button, Typography } from 'antd'; import moment from 'moment'; import React, { useEffect } from 'react'; import styled from 'styled-components'; -import NoStatsAvailble from '../../../../../../../../images/no-stats-available.svg?react'; -import { useBaseEntity, useRouteToTab } from '../../../../../../../entity/shared/EntityContext'; -import { ANTD_GRAY } from '../../../../../constants'; -import Query from '../../../Queries/Query'; -import { QueryCreatedBy } from '../../../Queries/queryColumns'; -import { usePopularQueries } from '../../../Queries/usePopularQueries'; -import { GetDatasetQuery } from '../../../../../../../../graphql/dataset.generated'; -import Loading from '../../../../../../../shared/Loading'; -import { generateSchemaFieldUrn } from '../../../../Lineage/utils'; + +import { useBaseEntity, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import Query from '@app/entityV2/shared/tabs/Dataset/Queries/Query'; +import { QueryCreatedBy } from '@app/entityV2/shared/tabs/Dataset/Queries/queryColumns'; +import { usePopularQueries } from '@app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries'; +import { generateSchemaFieldUrn } from '@app/entityV2/shared/tabs/Lineage/utils'; +import Loading from '@app/shared/Loading'; +import { useIsSeparateSiblingsMode } from '@src/app/entity/shared/siblingUtils'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; + +import NoStatsAvailble from '@images/no-stats-available.svg?react'; interface Props { properties: { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSection.tsx index 494ec7bfa5..d761849b78 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSection.tsx @@ -1,10 +1,12 @@ import React from 'react'; import styled from 'styled-components'; -import { DatasetFieldProfile } from '../../../../../../../../types.generated'; -import { REDESIGN_COLORS } from '../../../../../constants'; -import { SidebarSection } from '../../../../../containers/profile/sidebar/SidebarSection'; -import StatsSummaryRow from './StatsSummaryRow'; -import { StyledDivider } from './components'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection'; +import StatsSummaryRow from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSummaryRow'; +import { StyledDivider } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components'; + +import { DatasetFieldProfile } from '@types'; const ViewAll = styled.div` color: ${REDESIGN_COLORS.DARK_GREY}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarColumnTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarColumnTab.tsx index 23c779d7ff..7d13484946 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarColumnTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarColumnTab.tsx @@ -1,13 +1,16 @@ +import Icon from '@ant-design/icons/lib/components/Icon'; import React from 'react'; import styled from 'styled-components'; -import Icon from '@ant-design/icons/lib/components/Icon'; -import StatChart, { ChartCard } from '../../../Stats/historical/charts/StatChart'; -import { getFixedLookbackWindow } from '../../../../../../../shared/time/timeUtils'; -import { LookbackWindow } from '../../../Stats/lookbackWindows'; -import { DatasetFieldProfile, SchemaField } from '../../../../../../../../types.generated'; -import NoStatsAvailble from '../../../../../../../../images/no-stats-available.svg?react'; -import { REDESIGN_COLORS } from '../../../../../constants'; -import { computeChartTickInterval, extractChartValuesFromFieldProfiles } from '../../../../../utils'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import StatChart, { ChartCard } from '@app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart'; +import { LookbackWindow } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; +import { computeChartTickInterval, extractChartValuesFromFieldProfiles } from '@app/entityV2/shared/utils'; +import { getFixedLookbackWindow } from '@app/shared/time/timeUtils'; + +import { DatasetFieldProfile, SchemaField } from '@types'; + +import NoStatsAvailble from '@images/no-stats-available.svg?react'; const CHART_WIDTH = 460; const CHART_HEIGHT = 170; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarContent.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarContent.tsx index 0a2ca72be6..76d5f8ff9f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarContent.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarContent.tsx @@ -2,15 +2,18 @@ import Icon from '@ant-design/icons/lib/components/Icon'; import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import NoStatsAvailble from '../../../../../../../../images/no-stats-available.svg?react'; -import TrendingDownIcon from '../../../../../../../../images/trending-down-icon.svg?react'; -import TrendingUpIcon from '../../../../../../../../images/trending-up-icon.svg?react'; -import { DatasetFieldProfile, SchemaField } from '../../../../../../../../types.generated'; -import { REDESIGN_COLORS } from '../../../../../constants'; -import SampleValueTag from '../../../Stats/snapshot/SampleValueTag'; -import { decimalToPercentStr } from '../../utils/statsUtil'; -import { extractChartValuesFromFieldProfiles } from '../../../../../utils'; -import { formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { decimalToPercentStr } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/statsUtil'; +import SampleValueTag from '@app/entityV2/shared/tabs/Dataset/Stats/snapshot/SampleValueTag'; +import { extractChartValuesFromFieldProfiles } from '@app/entityV2/shared/utils'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; + +import { DatasetFieldProfile, SchemaField } from '@types'; + +import NoStatsAvailble from '@images/no-stats-available.svg?react'; +import TrendingDownIcon from '@images/trending-down-icon.svg?react'; +import TrendingUpIcon from '@images/trending-up-icon.svg?react'; const maxLabelWidth = 150; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarHeader.tsx index f38166a668..99730ce75d 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarHeader.tsx @@ -1,9 +1,10 @@ -import React from 'react'; import { ClockCircleOutlined, LineChartOutlined } from '@ant-design/icons'; +import React from 'react'; import styled from 'styled-components'; -import LookbackWindowSelect from '../../../Stats/historical/LookbackWindowSelect'; -import { LookbackWindow } from '../../../Stats/lookbackWindows'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../../../constants'; + +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import LookbackWindowSelect from '@app/entityV2/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect'; +import { LookbackWindow } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; export enum StatsViewType { LATEST, @@ -32,7 +33,9 @@ const StatsTabViewSwitch = styled.div<{ isActive: boolean }>` width: 180px; align-items: center; gap: 5px; - transition: background 0.3s ease, color 0.3s ease; + transition: + background 0.3s ease, + color 0.3s ease; `; const SwitchWrapper = styled.div` diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarView.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarView.tsx index a7b1a04884..b1d60adcc6 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarView.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarView.tsx @@ -1,16 +1,16 @@ +import { LoadingOutlined } from '@ant-design/icons'; import React, { useCallback, useEffect, useState } from 'react'; import styled from 'styled-components'; -import { LoadingOutlined } from '@ant-design/icons'; -import { DatasetFieldProfile, DatasetProfile, SchemaField } from '../../../../../../../../types.generated'; -import StatsSidebarHeader, { StatsViewType } from './StatsSidebarHeader'; -import { StatsSidebarContent } from './StatsSidebarContent'; -import StatsSidebarColumnTab from './StatsSidebarColumnTab'; -import { LOOKBACK_WINDOWS, LookbackWindow } from '../../../Stats/lookbackWindows'; -import { - getFixedLookbackWindow, - toLocalDateString, - toLocalTimeString, -} from '../../../../../../../shared/time/timeUtils'; + +import StatsSidebarColumnTab from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarColumnTab'; +import { StatsSidebarContent } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarContent'; +import StatsSidebarHeader, { + StatsViewType, +} from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarHeader'; +import { LOOKBACK_WINDOWS, LookbackWindow } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; +import { getFixedLookbackWindow, toLocalDateString, toLocalTimeString } from '@app/shared/time/timeUtils'; + +import { DatasetFieldProfile, DatasetProfile, SchemaField } from '@types'; export interface StatsProps { properties: { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSummaryRow.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSummaryRow.tsx index cf54cb7864..fb39db1c23 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSummaryRow.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSummaryRow.tsx @@ -1,8 +1,10 @@ import React from 'react'; import styled from 'styled-components'; -import { DatasetFieldProfile } from '../../../../../../../../types.generated'; -import { pluralize } from '../../../../../../../shared/textUtil'; -import TrendDetail from './TrendDetail'; + +import TrendDetail from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/TrendDetail'; +import { pluralize } from '@app/shared/textUtil'; + +import { DatasetFieldProfile } from '@types'; const StatsSummaryRowContent = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/TrendDetail.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/TrendDetail.tsx index aaf314faa3..69a29b9101 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/TrendDetail.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/TrendDetail.tsx @@ -1,10 +1,11 @@ +import { Tooltip } from '@components'; +import { Typography } from 'antd'; +import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { Tooltip } from '@components'; -import { Maybe } from 'graphql/jsutils/Maybe'; -import { decimalToPercentStr } from '../../utils/statsUtil'; -import { REDESIGN_COLORS } from '../../../../../constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { decimalToPercentStr } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/statsUtil'; interface TrendDetailProps { tooltipTitle: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts index 5592fd5e80..89117b24c2 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts @@ -1,6 +1,7 @@ import { Divider } from 'antd'; import styled from 'styled-components'; -import { REDESIGN_COLORS } from '../../../../../constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; export const SectionHeader = styled.div` margin-bottom: 8px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/TypeLabel.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/TypeLabel.tsx index f0694e60e4..505462c597 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/TypeLabel.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/TypeLabel.tsx @@ -1,11 +1,12 @@ -import React from 'react'; import { Tooltip } from '@components'; +import React from 'react'; import styled from 'styled-components'; -import { capitalizeFirstLetter } from '../../../../../../shared/textUtil'; -import { SchemaFieldDataType } from '../../../../../../../types.generated'; -import { ColumnTypeIcon } from '../../../../../../sharedV2/utils'; -import { truncate } from '../../../../utils'; +import { truncate } from '@app/entityV2/shared/utils'; +import { capitalizeFirstLetter } from '@app/shared/textUtil'; +import { ColumnTypeIcon } from '@app/sharedV2/utils'; + +import { SchemaFieldDataType } from '@types'; const Wrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeEvent.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeEvent.tsx index bc3b01fcd6..42759dc7d9 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeEvent.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeEvent.tsx @@ -1,9 +1,11 @@ -import { processDocumentationString } from '@src/app/lineageV2/lineageUtils'; import React from 'react'; import styled from 'styled-components'; -import { ChangeEvent } from '../../../../../../../types.generated'; -import { REDESIGN_COLORS } from '../../../../constants'; -import { getDocumentationString } from './changeEventToString'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getDocumentationString } from '@app/entityV2/shared/tabs/Dataset/Schema/history/changeEventToString'; +import { processDocumentationString } from '@src/app/lineageV2/lineageUtils'; + +import { ChangeEvent } from '@types'; const ChangeEventCircle = styled.div` display: inline-block; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeTransactionView.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeTransactionView.tsx index 61940aaa7c..98bae883fd 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeTransactionView.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeTransactionView.tsx @@ -1,10 +1,12 @@ -import PlatformIcon from '@app/sharedV2/icons/PlatformIcon'; import React from 'react'; import styled from 'styled-components'; -import { ChangeTransaction, DataPlatform } from '../../../../../../../types.generated'; -import { formatTimestamp } from './historyUtils'; -import ChangeEventComponent from './ChangeEvent'; -import { REDESIGN_COLORS } from '../../../../constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import ChangeEventComponent from '@app/entityV2/shared/tabs/Dataset/Schema/history/ChangeEvent'; +import { formatTimestamp } from '@app/entityV2/shared/tabs/Dataset/Schema/history/historyUtils'; +import PlatformIcon from '@app/sharedV2/icons/PlatformIcon'; + +import { ChangeTransaction, DataPlatform } from '@types'; const TitleText = styled.span` color: ${REDESIGN_COLORS.TEXT_HEADING}; @@ -106,11 +108,7 @@ export default function ChangeTransactionView({ transaction, platform, semanticV {semanticVersion && {`(${semanticVersion})`}} -
- {transaction?.changes?.map((change) => ( - - ))} -
+
{transaction?.changes?.map((change) => )}
); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/HistorySidebar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/HistorySidebar.tsx index d111b29c2e..92a8a2d580 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/HistorySidebar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/HistorySidebar.tsx @@ -1,14 +1,16 @@ -import { useGetSiblingPlatforms } from '@app/entity/shared/siblingUtils'; -import ChangeTransactionView, { - ChangeTransactionEntry, -} from '@app/entityV2/shared/tabs/Dataset/Schema/history/ChangeTransactionView'; import CloseOutlinedIcon from '@mui/icons-material/CloseOutlined'; import { Drawer } from 'antd'; import React from 'react'; import styled from 'styled-components'; + +import { useGetSiblingPlatforms } from '@app/entity/shared/siblingUtils'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import ChangeTransactionView, { + ChangeTransactionEntry, +} from '@app/entityV2/shared/tabs/Dataset/Schema/history/ChangeTransactionView'; + import { useGetTimelineQuery } from '@graphql/timeline.generated'; import { ChangeCategoryType, ChangeTransaction, DataPlatform, SemanticVersionStruct } from '@types'; -import { REDESIGN_COLORS } from '../../../../constants'; const StyledDrawer = styled(Drawer)` &&& .ant-drawer-body { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/__tests__/changeEventToString.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/__tests__/changeEventToString.test.ts index 1a2c525974..3d2693d547 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/__tests__/changeEventToString.test.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/__tests__/changeEventToString.test.ts @@ -1,5 +1,5 @@ +import { getDocumentationString } from '@app/entityV2/shared/tabs/Dataset/Schema/history/changeEventToString'; import { ChangeCategoryType, ChangeEvent, ChangeOperationType } from '@src/types.generated'; -import { getDocumentationString } from '../changeEventToString'; describe('getDocumentationString', () => { describe('Technical Schema Changes', () => { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema.tsx index 7b98e11e32..67be78aad5 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema.tsx @@ -1,9 +1,11 @@ import { cloneDeep } from 'lodash'; -import { EntityType } from '../../../../../../types.generated'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import { useGetDatasetSchemaQuery } from '../../../../../../graphql/dataset.generated'; -import { combineEntityDataWithSiblings } from '../../../../../entity/shared/siblingUtils'; -import { useIsSeparateSiblingsMode } from '../../../useIsSeparateSiblingsMode'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { combineEntityDataWithSiblings } from '@app/entity/shared/siblingUtils'; +import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; + +import { useGetDatasetSchemaQuery } from '@graphql/dataset.generated'; +import { EntityType } from '@types'; // Whether to dynamically load the schema from the backend. const shouldLoadSchema = (entityType, entityData) => { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useKeyboardControls.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useKeyboardControls.ts index abd9aad2b0..228ee99ced 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useKeyboardControls.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useKeyboardControls.ts @@ -1,5 +1,6 @@ import { useCallback, useEffect, useMemo } from 'react'; -import { ExtendedSchemaFields } from '../../../../dataset/profile/schema/utils/types'; + +import { ExtendedSchemaFields } from '@app/entityV2/dataset/profile/schema/utils/types'; export default function useKeyboardControls( rows: ExtendedSchemaFields[], diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useSchemaVersioning.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useSchemaVersioning.tsx index 4a7c951933..60f465a36e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useSchemaVersioning.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useSchemaVersioning.tsx @@ -1,11 +1,13 @@ -import navigateToUrl from '@app/utils/navigateToUrl'; -import { useGetSchemaVersionListQuery } from '@graphql/schemaBlame.generated'; -import { useGetVersionedDatasetQuery } from '@graphql/versionedDataset.generated'; -import { EditableSchemaMetadata, Schema, SemanticVersionStruct } from '@types'; import * as QueryString from 'query-string'; import { useEffect } from 'react'; import { useHistory, useLocation } from 'react-router-dom'; +import navigateToUrl from '@app/utils/navigateToUrl'; + +import { useGetSchemaVersionListQuery } from '@graphql/schemaBlame.generated'; +import { useGetVersionedDatasetQuery } from '@graphql/versionedDataset.generated'; +import { EditableSchemaMetadata, Schema, SemanticVersionStruct } from '@types'; + interface Args { datasetUrn?: string; urlParam: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractDescriptionInfo.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractDescriptionInfo.test.ts index b448325119..c46a77df15 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractDescriptionInfo.test.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractDescriptionInfo.test.ts @@ -1,6 +1,7 @@ -import { EditableSchemaMetadata, SchemaField, SchemaFieldDataType } from '@src/types.generated'; import { renderHook } from '@testing-library/react-hooks'; -import useExtractFieldDescriptionInfo from '../useExtractFieldDescriptionInfo'; + +import useExtractFieldDescriptionInfo from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldDescriptionInfo'; +import { EditableSchemaMetadata, SchemaField, SchemaFieldDataType } from '@src/types.generated'; describe('useExtractDescriptionInfo', () => { const emptyEditableSchemaMetadata: EditableSchemaMetadata = { editableSchemaFieldInfo: [] }; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldGlossaryTermsInfo.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldGlossaryTermsInfo.test.ts index 41d5b710d3..269a59512a 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldGlossaryTermsInfo.test.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldGlossaryTermsInfo.test.ts @@ -1,3 +1,6 @@ +import { renderHook } from '@testing-library/react-hooks'; + +import useExtractFieldGlossaryTermsInfo from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldGlossaryTermsInfo'; import { EditableSchemaMetadata, EntityType, @@ -5,8 +8,6 @@ import { SchemaField, SchemaFieldDataType, } from '@src/types.generated'; -import { renderHook } from '@testing-library/react-hooks'; -import useExtractFieldGlossaryTermsInfo from '../useExtractFieldGlossaryTermsInfo'; describe('useExtractFieldGlossaryTermsInfo', () => { const testGlossaryTerm: GlossaryTerm = { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldTagsInfo.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldTagsInfo.test.ts index 4700fb48e3..e89966cfdf 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldTagsInfo.test.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldTagsInfo.test.ts @@ -1,6 +1,7 @@ -import { EditableSchemaMetadata, EntityType, SchemaField, SchemaFieldDataType, Tag } from '@src/types.generated'; import { renderHook } from '@testing-library/react-hooks'; -import useExtractFieldTagsInfo from '../useExtractFieldTagsInfo'; + +import useExtractFieldTagsInfo from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldTagsInfo'; +import { EditableSchemaMetadata, EntityType, SchemaField, SchemaFieldDataType, Tag } from '@src/types.generated'; describe('useExtractFieldTagsInfo', () => { const testTag: Tag = { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts index c42c130520..e25185c6a0 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts @@ -1,5 +1,6 @@ -import { EntityRegistry } from '../../../../../../../entityRegistryContext'; -import { EntityType, SchemaField } from '../../../../../../../types.generated'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { EntityType, SchemaField } from '@types'; export enum SchemaFilterType { FieldPath = 'Field Path', diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts index a98ee62a08..49a85c9b51 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts @@ -1,4 +1,4 @@ -import { EditableSchemaFieldInfo, SchemaFieldEntity } from '../../../../../../../types.generated'; +import { EditableSchemaFieldInfo, SchemaFieldEntity } from '@types'; interface Props { schemaFieldEntity?: SchemaFieldEntity | null; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getSchemaFilterTypesFromUrl.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getSchemaFilterTypesFromUrl.ts index bfefae1f04..0a6f770372 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getSchemaFilterTypesFromUrl.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getSchemaFilterTypesFromUrl.ts @@ -1,5 +1,6 @@ import * as QueryString from 'query-string'; -import { SchemaFilterType } from './filterSchemaRows'; + +import { SchemaFilterType } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows'; export default function getSchemaFilterTypesFromUrl(location: any): SchemaFilterType[] { const params = QueryString.parse(location.search, { arrayFormat: 'comma' }); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts index 531a3bc791..37897a98d3 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts @@ -1,7 +1,8 @@ import * as QueryString from 'query-string'; import { useHistory, useLocation } from 'react-router'; import { useDebounce } from 'react-use'; -import { SchemaFilterType } from './filterSchemaRows'; + +import { SchemaFilterType } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows'; export default function useUpdateSchemaFilterQueryString( filterText: string, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx index 8ff4e56206..fc4398238d 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx @@ -1,14 +1,15 @@ import React, { useState } from 'react'; -import { EditableSchemaMetadata, SchemaField, SubResourceType } from '../../../../../../../types.generated'; -import DescriptionField from '../../../../../dataset/profile/schema/components/SchemaDescriptionField'; -import { pathMatchesExact } from '../../../../../dataset/profile/schema/utils/utils'; -import { useUpdateDescriptionMutation } from '../../../../../../../graphql/mutations.generated'; -import { useMutationUrn, useRefetch } from '../../../../../../entity/shared/EntityContext'; -import { useSchemaRefetch } from '../SchemaContext'; -import { sanitizeRichText } from '../../../Documentation/components/editor/utils'; -import CompactMarkdownViewer from '../../../Documentation/components/CompactMarkdownViewer'; -import useExtractFieldDescriptionInfo from './useExtractFieldDescriptionInfo'; +import { useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import DescriptionField from '@app/entityV2/dataset/profile/schema/components/SchemaDescriptionField'; +import { pathMatchesExact } from '@app/entityV2/dataset/profile/schema/utils/utils'; +import { useSchemaRefetch } from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaContext'; +import useExtractFieldDescriptionInfo from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldDescriptionInfo'; +import CompactMarkdownViewer from '@app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer'; +import { sanitizeRichText } from '@app/entityV2/shared/tabs/Documentation/components/editor/utils'; + +import { useUpdateDescriptionMutation } from '@graphql/mutations.generated'; +import { EditableSchemaMetadata, SchemaField, SubResourceType } from '@types'; export default function useDescriptionRenderer( editableSchemaMetadata: EditableSchemaMetadata | null | undefined, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldDescriptionInfo.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldDescriptionInfo.ts index e2b3e6145d..3ff5c046e8 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldDescriptionInfo.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldDescriptionInfo.ts @@ -1,7 +1,7 @@ +import { getFieldDescriptionDetails } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails'; +import { sanitizeRichText } from '@app/entityV2/shared/tabs/Documentation/components/editor/utils'; import { pathMatchesExact } from '@src/app/entityV2/dataset/profile/schema/utils/utils'; import { EditableSchemaMetadata, SchemaField } from '@src/types.generated'; -import { getFieldDescriptionDetails } from './getFieldDescriptionDetails'; -import { sanitizeRichText } from '../../../Documentation/components/editor/utils'; export default function useExtractFieldDescriptionInfo( editableSchemaMetadata: EditableSchemaMetadata | null | undefined, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useGetStructuredPropColumns.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useGetStructuredPropColumns.tsx index 3861e5d4e9..c664e8d871 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useGetStructuredPropColumns.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useGetStructuredPropColumns.tsx @@ -1,7 +1,8 @@ +import React, { useMemo } from 'react'; + import StructuredPropValues from '@src/app/entityV2/dataset/profile/schema/components/StructuredPropValues'; import { getDisplayName } from '@src/app/govern/structuredProperties/utils'; import { SearchResult, StructuredPropertyEntity } from '@src/types.generated'; -import React, { useMemo } from 'react'; export const useGetStructuredPropColumns = (properties: SearchResult[] | undefined) => { const columns = useMemo(() => { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx index 300f2627ee..04c26da216 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx @@ -1,10 +1,12 @@ import React from 'react'; -import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '../../../../../../../types.generated'; -import { useMutationUrn, useRefetch } from '../../../../../../entity/shared/EntityContext'; -import TagTermGroup from '../../../../../../sharedV2/tags/TagTermGroup'; -import { useSchemaRefetch } from '../SchemaContext'; -import useExtractFieldGlossaryTermsInfo from './useExtractFieldGlossaryTermsInfo'; -import useExtractFieldTagsInfo from './useExtractFieldTagsInfo'; + +import { useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import { useSchemaRefetch } from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaContext'; +import useExtractFieldGlossaryTermsInfo from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldGlossaryTermsInfo'; +import useExtractFieldTagsInfo from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldTagsInfo'; +import TagTermGroup from '@app/sharedV2/tags/TagTermGroup'; + +import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '@types'; export default function useTagsAndTermsRenderer( editableSchemaMetadata: EditableSchemaMetadata | null | undefined, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx index a4db5e60bf..3a3ab7a62d 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '../../../../../../../types.generated'; -import TagTermGroup from '../../../../../../sharedV2/tags/TagTermGroup'; -import { pathMatchesExact } from '../../../../../dataset/profile/schema/utils/utils'; -import { useEntityData, useRefetch } from '../../../../../../entity/shared/EntityContext'; + +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { pathMatchesExact } from '@app/entityV2/dataset/profile/schema/utils/utils'; +import TagTermGroup from '@app/sharedV2/tags/TagTermGroup'; + +import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '@types'; export default function useTagsAndTermsRendererFeatureTable( editableSchemaMetadata: EditableSchemaMetadata | null | undefined, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx index c8f0cc71a4..d260ff2401 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx @@ -1,13 +1,15 @@ import { geekblue } from '@ant-design/colors'; -import QueryStatsOutlinedIcon from '@mui/icons-material/QueryStatsOutlined'; -import { useBaseEntity } from '@src/app/entity/shared/EntityContext'; import { Tooltip } from '@components'; +import QueryStatsOutlinedIcon from '@mui/icons-material/QueryStatsOutlined'; import React from 'react'; import styled from 'styled-components'; -import { UsageQueryResult } from '../../../../../../../types.generated'; + +import { FieldPopularity } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPopularity'; +import { useBaseEntity } from '@src/app/entity/shared/EntityContext'; + // import { ReactComponent as LineageDisabledIcon } from '../../../../../../../images/lineage-disabled-icon.svg'; -import { GetDatasetQuery } from '../../../../../../../graphql/dataset.generated'; -import { FieldPopularity } from '../components/SchemaFieldDrawer/FieldPopularity'; +import { GetDatasetQuery } from '@graphql/dataset.generated'; +import { UsageQueryResult } from '@types'; export const UsageBar = styled.div<{ width: number }>` width: ${(props) => props.width}px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsHeader.tsx index 5d4dd3083b..db2c2f0866 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsHeader.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import { Button, Typography } from 'antd'; import { ClockCircleOutlined, LineChartOutlined } from '@ant-design/icons'; - +import { Button, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ViewType } from './viewType'; -import TabToolbar from '../../../components/styled/TabToolbar'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../constants'; -import { LookbackWindow } from './lookbackWindows'; -import LookbackWindowSelect from './historical/LookbackWindowSelect'; + +import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import LookbackWindowSelect from '@app/entityV2/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect'; +import { LookbackWindow } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; +import { ViewType } from '@app/entityV2/shared/tabs/Dataset/Stats/viewType'; const StatsHeaderContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsSection.tsx index c0a98e44f8..32244ee67c 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsSection.tsx @@ -1,6 +1,6 @@ import { Divider, Row, Typography } from 'antd'; -import styled from 'styled-components'; import React from 'react'; +import styled from 'styled-components'; const Section = styled.div` padding-top: 24px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTab.tsx index 0761ff12a8..885dfcdddc 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTab.tsx @@ -1,15 +1,17 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import { GetDatasetQuery, useGetLastMonthUsageAggregationsQuery } from '../../../../../../graphql/dataset.generated'; -import { Operation, UsageQueryResult } from '../../../../../../types.generated'; -import { useBaseEntity } from '../../../../../entity/shared/EntityContext'; -import { toLocalDateString, toLocalDateTimeString, toLocalTimeString } from '../../../../../shared/time/timeUtils'; -import StatsHeader from './StatsHeader'; -import HistoricalStats from './historical/HistoricalStats'; -import { LOOKBACK_WINDOWS } from './lookbackWindows'; -import ColumnStats from './snapshot/ColumnStats'; -import TableStats from './snapshot/TableStats'; -import { ViewType } from './viewType'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import StatsHeader from '@app/entityV2/shared/tabs/Dataset/Stats/StatsHeader'; +import HistoricalStats from '@app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats'; +import { LOOKBACK_WINDOWS } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; +import ColumnStats from '@app/entityV2/shared/tabs/Dataset/Stats/snapshot/ColumnStats'; +import TableStats from '@app/entityV2/shared/tabs/Dataset/Stats/snapshot/TableStats'; +import { ViewType } from '@app/entityV2/shared/tabs/Dataset/Stats/viewType'; +import { toLocalDateString, toLocalDateTimeString, toLocalTimeString } from '@app/shared/time/timeUtils'; + +import { GetDatasetQuery, useGetLastMonthUsageAggregationsQuery } from '@graphql/dataset.generated'; +import { Operation, UsageQueryResult } from '@types'; const SectionWrapper = styled.div` overflow-y: auto; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx index f8711e4700..32eee24009 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx @@ -1,22 +1,24 @@ import { Divider, Typography } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { useGetDataProfilesLazyQuery } from '../../../../../../../graphql/dataset.generated'; -import { Message } from '../../../../../../shared/Message'; -import { formatBytes } from '../../../../../../shared/formatNumber'; -import { getFixedLookbackWindow } from '../../../../../../shared/time/timeUtils'; -import { ANTD_GRAY } from '../../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { FULL_TABLE_PARTITION_KEYS } from '@app/entityV2/shared/tabs/Dataset/Stats/constants'; +import ProfilingRunsChart from '@app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart'; +import StatChart from '@app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart'; +import PrefixedSelect from '@app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect'; +import { LookbackWindow } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; import { computeAllFieldPaths, computeChartTickInterval, extractChartValuesFromFieldProfiles, extractChartValuesFromTableProfiles, -} from '../../../../utils'; -import { FULL_TABLE_PARTITION_KEYS } from '../constants'; -import { LookbackWindow } from '../lookbackWindows'; -import ProfilingRunsChart from './charts/ProfilingRunsChart'; -import StatChart from './charts/StatChart'; -import PrefixedSelect from './shared/PrefixedSelect'; +} from '@app/entityV2/shared/utils'; +import { Message } from '@app/shared/Message'; +import { formatBytes } from '@app/shared/formatNumber'; +import { getFixedLookbackWindow } from '@app/shared/time/timeUtils'; + +import { useGetDataProfilesLazyQuery } from '@graphql/dataset.generated'; // TODO: Reuse stat sections. const StatSection = styled.div` diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx index 65925c1bde..0132946d4c 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { SelectValue } from 'antd/lib/select'; -import { LookbackWindow, LOOKBACK_WINDOWS } from '../lookbackWindows'; -import PrefixedSelect from './shared/PrefixedSelect'; +import React from 'react'; + +import PrefixedSelect from '@app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect'; +import { LOOKBACK_WINDOWS, LookbackWindow } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; type Props = { lookbackWindow: LookbackWindow; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx index 6608afd961..45ce5add43 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx @@ -1,11 +1,13 @@ import { Button, Modal, Table, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { DatasetProfile } from '../../../../../../../../types.generated'; -import { formatBytes, formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber'; -import { FULL_TABLE_PARTITION_KEYS } from '../../constants'; -import ColumnStats from '../../snapshot/ColumnStats'; -import TableStats from '../../snapshot/TableStats'; + +import { FULL_TABLE_PARTITION_KEYS } from '@app/entityV2/shared/tabs/Dataset/Stats/constants'; +import ColumnStats from '@app/entityV2/shared/tabs/Dataset/Stats/snapshot/ColumnStats'; +import TableStats from '@app/entityV2/shared/tabs/Dataset/Stats/snapshot/TableStats'; +import { formatBytes, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; + +import { DatasetProfile } from '@types'; export const ChartTable = styled(Table)` margin-top: 16px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx index a38c1ff540..e6f8b1381b 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx @@ -1,10 +1,12 @@ import { Card, Typography } from 'antd'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { DateInterval, DateRange } from '../../../../../../../../types.generated'; -import { ChartContainer } from '../../../../../../../analyticsDashboard/components/ChartContainer'; -import { TimeSeriesChart } from '../../../../../../../analyticsDashboard/components/TimeSeriesChart'; -import { ANTD_GRAY } from '../../../../../constants'; + +import { ChartContainer } from '@app/analyticsDashboard/components/ChartContainer'; +import { TimeSeriesChart } from '@app/analyticsDashboard/components/TimeSeriesChart'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; + +import { DateInterval, DateRange } from '@types'; const ChartTitle = styled(Typography.Text)` && { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx index 51b4797dd4..655be6ae05 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Select, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; type Props = { prefixText: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows.ts index 764722d6bf..464a747358 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows.ts @@ -1,4 +1,4 @@ -import { DateInterval } from '../../../../../../types.generated'; +import { DateInterval } from '@types'; /** * Change this to add or modify the lookback windows that are selectable via the UI. diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx index 7a43dc7644..8f649a4973 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx @@ -1,12 +1,14 @@ -import { downgradeV2FieldPath } from '@src/app/entityV2/dataset/profile/schema/utils/utils'; import { Typography } from 'antd'; -import { ColumnsType, ColumnType } from 'antd/lib/table'; +import { ColumnType, ColumnsType } from 'antd/lib/table'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { DatasetFieldProfile, Maybe, PartitionSpec, PartitionType } from '../../../../../../../types.generated'; -import { StyledTable } from '../../../../components/styled/StyledTable'; -import { ANTD_GRAY } from '../../../../constants'; -import SampleValueTag from './SampleValueTag'; + +import { StyledTable } from '@app/entityV2/shared/components/styled/StyledTable'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import SampleValueTag from '@app/entityV2/shared/tabs/Dataset/Stats/snapshot/SampleValueTag'; +import { downgradeV2FieldPath } from '@src/app/entityV2/dataset/profile/schema/utils/utils'; + +import { DatasetFieldProfile, Maybe, PartitionSpec, PartitionType } from '@types'; type Props = { columnStats: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx index e9e58bd979..21d1673ba1 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx @@ -1,6 +1,6 @@ -import React, { useState } from 'react'; -import { Tag } from 'antd'; import { Tooltip } from '@components'; +import { Tag } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; const StyledTag = styled(Tag)` diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx index b672fe274c..5c7dd3b508 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx @@ -1,13 +1,15 @@ -import { Typography } from 'antd'; import { Tooltip } from '@components'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { CorpUser, Maybe, PartitionSpec, PartitionType, UserUsageCounts } from '../../../../../../../types.generated'; -import { countFormatter } from '../../../../../../../utils/formatter/index'; -import { formatNumberWithoutAbbreviation } from '../../../../../../shared/formatNumber'; -import { ExpandedActorGroup } from '../../../../components/styled/ExpandedActorGroup'; -import { InfoItem } from '../../../../components/styled/InfoItem'; -import { ANTD_GRAY } from '../../../../constants'; + +import { ExpandedActorGroup } from '@app/entityV2/shared/components/styled/ExpandedActorGroup'; +import { InfoItem } from '@app/entityV2/shared/components/styled/InfoItem'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { countFormatter } from '@utils/formatter/index'; + +import { CorpUser, Maybe, PartitionSpec, PartitionType, UserUsageCounts } from '@types'; type Props = { rowCount?: number; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Timeline/SchemaTimelineSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Timeline/SchemaTimelineSection.tsx index 863917d396..c7b353329f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Timeline/SchemaTimelineSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Timeline/SchemaTimelineSection.tsx @@ -1,13 +1,16 @@ -import React from 'react'; -import styled from 'styled-components'; import { Typography } from 'antd'; +import React from 'react'; import { VerticalTimeline, VerticalTimelineElement } from 'react-vertical-timeline-component'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import { useGetTimelineQuery } from '../../../../../../graphql/timeline.generated'; -import { ChangeCategoryType } from '../../../../../../types.generated'; import 'react-vertical-timeline-component/style.min.css'; -import { REDESIGN_COLORS } from '../../../constants'; -import TimelineIcon from '../../../../../../images/timeline-icon.svg?react'; +import styled from 'styled-components'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; + +import { useGetTimelineQuery } from '@graphql/timeline.generated'; +import { ChangeCategoryType } from '@types'; + +import TimelineIcon from '@images/timeline-icon.svg?react'; const TimeLine = styled(VerticalTimeline)` svg { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetails.tsx index 13e4c9dd93..52da589feb 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetails.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetails.tsx @@ -1,8 +1,10 @@ import React from 'react'; import styled from 'styled-components'; -import { CronSchedule } from '../../../../../../types.generated'; -import { AcrylAssertionDetailsHeader } from './AcrylAssertionDetailsHeader'; -import { AcrylAssertionResultsChart } from './AcrylAssertionResultsChart'; + +import { AcrylAssertionDetailsHeader } from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader'; +import { AcrylAssertionResultsChart } from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart'; + +import { CronSchedule } from '@types'; const Container = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader.tsx index 95d1d3dd97..87be3a8dee 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader.tsx @@ -1,13 +1,15 @@ +import { ClockCircleOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; +import { Divider, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Divider, Typography } from 'antd'; -import { Tooltip } from '@components'; -import { ClockCircleOutlined } from '@ant-design/icons'; -import { CronSchedule } from '../../../../../../types.generated'; -import { getLocaleTimezone } from '../../../../../shared/time/timeUtils'; -import { ANTD_GRAY } from '../../../constants'; -import { getCronAsText } from './acrylUtils'; -import { TruncatedTextWithTooltip } from '../../../../../shared/TruncatedTextWithTooltip'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { getCronAsText } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; +import { TruncatedTextWithTooltip } from '@app/shared/TruncatedTextWithTooltip'; +import { getLocaleTimezone } from '@app/shared/time/timeUtils'; + +import { CronSchedule } from '@types'; const TimeLabel = styled.div` max-width: 280px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart.tsx index b422778914..5c57e2159e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart.tsx @@ -1,10 +1,12 @@ import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { useGetAssertionRunsLazyQuery } from '../../../../../../graphql/assertion.generated'; -import { getFixedLookbackWindow } from '../../../../../shared/time/timeUtils'; -import { LOOKBACK_WINDOWS } from '../Stats/lookbackWindows'; -import { AcrylAssertionResultsChartHeader } from './AcrylAssertionResultsChartHeader'; -import { AcrylAssertionResultsChartTimeline } from './AcrylAssertionResultsChartTimeline'; + +import { LOOKBACK_WINDOWS } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; +import { AcrylAssertionResultsChartHeader } from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader'; +import { AcrylAssertionResultsChartTimeline } from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline'; +import { getFixedLookbackWindow } from '@app/shared/time/timeUtils'; + +import { useGetAssertionRunsLazyQuery } from '@graphql/assertion.generated'; const RESULT_CHART_WIDTH_PX = 800; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader.tsx index 19c8f2b61e..a09cd8a8a8 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader.tsx @@ -1,13 +1,15 @@ -import React from 'react'; -import styled from 'styled-components'; import { Typography } from 'antd'; import { SelectValue } from 'antd/lib/select'; -import { AssertionResultType, AssertionRunEventsResult } from '../../../../../../types.generated'; -import { formatNumber } from '../../../../../shared/formatNumber'; -import PrefixedSelect from '../Stats/historical/shared/PrefixedSelect'; -import { LookbackWindow, LOOKBACK_WINDOWS } from '../Stats/lookbackWindows'; -import { getResultColor } from './assertionUtils'; -import { TimeRange } from './AssertionResultTimeline'; +import React from 'react'; +import styled from 'styled-components'; + +import PrefixedSelect from '@app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect'; +import { LOOKBACK_WINDOWS, LookbackWindow } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; +import { TimeRange } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline'; +import { getResultColor } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; +import { formatNumber } from '@app/shared/formatNumber'; + +import { AssertionResultType, AssertionRunEventsResult } from '@types'; const Header = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline.tsx index e1522fe653..66bace47cf 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline.tsx @@ -1,20 +1,23 @@ +import { ArrowRightOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { Tooltip } from '@components'; -import { ArrowRightOutlined } from '@ant-design/icons'; + import { - AssertionResultType, - AssertionRunEventsResult, - AssertionRunStatus, - DataPlatform, - EntityType, -} from '../../../../../../types.generated'; -import { getResultErrorMessage, getResultIcon, getResultText } from './assertionUtils'; -import { AssertionResultTimeline, TimeRange } from './AssertionResultTimeline'; -import { DatasetAssertionResultDetails } from './DatasetAssertionResultDetails'; -import { LinkWrapper } from '../../../../../shared/LinkWrapper'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; + AssertionResultTimeline, + TimeRange, +} from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline'; +import { DatasetAssertionResultDetails } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails'; +import { + getResultErrorMessage, + getResultIcon, + getResultText, +} from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; +import { LinkWrapper } from '@app/shared/LinkWrapper'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { AssertionResultType, AssertionRunEventsResult, AssertionRunStatus, DataPlatform, EntityType } from '@types'; const RESULT_CHART_WIDTH_PX = 800; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsList.tsx index 02beb913f3..6e36aeeb2b 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsList.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsList.tsx @@ -1,6 +1,8 @@ import React from 'react'; -import { Assertion, DataContract } from '../../../../../../types.generated'; -import { AcrylAssertionsTable } from './AcrylAssertionsTable'; + +import { AcrylAssertionsTable } from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTable'; + +import { Assertion, DataContract } from '@types'; type Props = { assertions: Array; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTable.tsx index c4f07b97ca..a3cad831c8 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTable.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTable.tsx @@ -1,13 +1,18 @@ +import { Checkbox, Empty, Table, TableProps } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Checkbox, Empty, Table, TableProps } from 'antd'; -import { Assertion, AssertionRunStatus, DataContract } from '../../../../../../types.generated'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import { ActionsColumn, DetailsColumn } from './AcrylAssertionsTableColumns'; -import { AssertionProfileDrawer } from './assertion/profile/AssertionProfileDrawer'; -import { ANTD_GRAY } from '../../../constants'; -import { useOpenAssertionDetailModal } from './assertion/builder/hooks'; -import { getEntityUrnForAssertion, getSiblingWithUrn } from './acrylUtils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { + ActionsColumn, + DetailsColumn, +} from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTableColumns'; +import { getEntityUrnForAssertion, getSiblingWithUrn } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; +import { useOpenAssertionDetailModal } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks'; +import { AssertionProfileDrawer } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileDrawer'; + +import { Assertion, AssertionRunStatus, DataContract } from '@types'; type StyledTableProps = { showSelect?: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTableColumns.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTableColumns.tsx index 75f39b570b..e73c954ce5 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTableColumns.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTableColumns.tsx @@ -1,18 +1,20 @@ -import React from 'react'; -import styled from 'styled-components'; -import { Tooltip } from '@components'; import { AuditOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; +import React from 'react'; import { Link } from 'react-router-dom'; -import { Assertion, EntityType, DataContract, AssertionRunEvent } from '../../../../../../types.generated'; -import { REDESIGN_COLORS } from '../../../constants'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { isAssertionPartOfContract } from './contract/utils'; -import { AssertionDescription } from './assertion/profile/summary/AssertionDescription'; -import { AssertionResultDot } from './assertion/profile/shared/AssertionResultDot'; -import { AssertionResultPopover } from './assertion/profile/shared/result/AssertionResultPopover'; -import { ResultStatusType } from './assertion/profile/summary/shared/resultMessageUtils'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import { AssertionListItemActions } from './assertion/profile/actions/AssertionListItemActions'; +import styled from 'styled-components'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { AssertionListItemActions } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/AssertionListItemActions'; +import { AssertionResultDot } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/AssertionResultDot'; +import { AssertionResultPopover } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopover'; +import { AssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionDescription'; +import { ResultStatusType } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils'; +import { isAssertionPartOfContract } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Assertion, AssertionRunEvent, DataContract, EntityType } from '@types'; const DetailsContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylValidationsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylValidationsTab.tsx index 6f722453fc..a26b5a1a43 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylValidationsTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylValidationsTab.tsx @@ -1,15 +1,16 @@ -import React, { useEffect } from 'react'; import { Tooltip } from '@components'; +import React, { useEffect } from 'react'; import { useHistory, useLocation } from 'react-router'; import styled from 'styled-components'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import { useGetValidationsTab } from './useGetValidationsTab'; -import { REDESIGN_COLORS } from '../../../constants'; -import { useAppConfig } from '../../../../../useAppConfig'; -import { DataContractTab } from './contract/DataContractTab'; -import { SEPARATE_SIBLINGS_URL_PARAM, useIsSeparateSiblingsMode } from '../../../useIsSeparateSiblingsMode'; -import { AcrylAssertionList } from './AssertionList/AcrylAssertionList'; -import { AcrylAssertionSummaryTab } from './AssertionList/Summary/AcrylAssertionSummaryTab'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { AcrylAssertionList } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionList'; +import { AcrylAssertionSummaryTab } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryTab'; +import { DataContractTab } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractTab'; +import { useGetValidationsTab } from '@app/entityV2/shared/tabs/Dataset/Validations/useGetValidationsTab'; +import { SEPARATE_SIBLINGS_URL_PARAM, useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; +import { useAppConfig } from '@app/useAppConfig'; const TabTitle = styled.span` margin-left: 4px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionGroupHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionGroupHeader.tsx index 89dcaf6d80..81b4ef8462 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionGroupHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionGroupHeader.tsx @@ -1,8 +1,9 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { getAssertionGroupSummaryIcon } from './acrylUtils'; -import { AssertionGroup } from './acrylTypes'; + +import { AssertionGroup } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylTypes'; +import { getAssertionGroupSummaryIcon } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcryAssertionTypeSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcryAssertionTypeSelect.tsx index fc14cf5eec..9f387c7fd7 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcryAssertionTypeSelect.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcryAssertionTypeSelect.tsx @@ -1,6 +1,7 @@ -import { SimpleSelect } from '@src/alchemy-components'; import React from 'react'; +import { SimpleSelect } from '@src/alchemy-components'; + type Option = { label: string; value: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionList.tsx index 0f42bfe5cf..4bb0691a1e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionList.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionList.tsx @@ -1,19 +1,23 @@ -import { TableLoadingSkeleton } from '@app/entityV2/shared/TableLoadingSkeleton'; -import React, { useEffect, useState } from 'react'; import { Empty } from 'antd'; +import React, { useEffect, useState } from 'react'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { combineEntityDataWithSiblings } from '@app/entity/shared/siblingUtils'; +import { TableLoadingSkeleton } from '@app/entityV2/shared/TableLoadingSkeleton'; +import { AcrylAssertionListFilters } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListFilters'; +import { AcrylAssertionListTable } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListTable'; +import { AssertionListTitleContainer } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionListTitleContainer'; +import { + ASSERTION_DEFAULT_FILTERS, + ASSERTION_DEFAULT_RAW_DATA, +} from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant'; +import { AssertionListFilter, AssertionTable } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types'; +import { getFilteredTransformedAssertionData } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils'; +import { tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; +import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; import { useGetDatasetContractQuery } from '@src/graphql/contract.generated'; -import { Assertion, DataContract } from '@src/types.generated'; import { useGetDatasetAssertionsWithRunEventsQuery } from '@src/graphql/dataset.generated'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { useIsSeparateSiblingsMode } from '../../../../useIsSeparateSiblingsMode'; -import { tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery } from '../acrylUtils'; -import { combineEntityDataWithSiblings } from '../../../../../../entity/shared/siblingUtils'; -import { getFilteredTransformedAssertionData } from './utils'; -import { AssertionTable, AssertionListFilter } from './types'; -import { AssertionListTitleContainer } from './AssertionListTitleContainer'; -import { AcrylAssertionListFilters } from './AcrylAssertionListFilters'; -import { AcrylAssertionListTable } from './AcrylAssertionListTable'; -import { ASSERTION_DEFAULT_FILTERS, ASSERTION_DEFAULT_RAW_DATA } from './constant'; +import { Assertion, DataContract } from '@src/types.generated'; /** * Component used for rendering the Assertions Sub Tab on the Validations Tab diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListConstants.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListConstants.tsx index 582b717fd5..f8f85e4b25 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListConstants.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListConstants.tsx @@ -1,8 +1,9 @@ +import { CheckOutlined, CloseOutlined, InfoCircleOutlined } from '@ant-design/icons'; import React from 'react'; import styled from 'styled-components'; -import { CheckOutlined, CloseOutlined, InfoCircleOutlined } from '@ant-design/icons'; + +import { NO_RUNNING_STATE } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant'; import { AssertionResultType } from '@src/types.generated'; -import { NO_RUNNING_STATE } from './constant'; const StyledCardTitle = styled.div<{ background: string; color: string }>` background: ${({ background }) => background}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListFilters.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListFilters.tsx index 905f5573ce..082e9e2dd6 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListFilters.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListFilters.tsx @@ -1,12 +1,17 @@ import React, { useMemo, useState } from 'react'; import styled from 'styled-components'; + +import { AcrylAssertionRecommendedFilters } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionRecommendedFilters'; +import { + ASSERTION_DEFAULT_FILTERS, + ASSERTION_FILTER_TYPES, + ASSERTION_GROUP_BY_FILTER_OPTIONS, +} from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant'; +import { useSetFilterFromURLParams } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks'; +import { AssertionListFilter, AssertionTable } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types'; import { FilterSelect } from '@src/app/entityV2/shared/FilterSelect'; import { GroupBySelect } from '@src/app/entityV2/shared/GroupBySelect'; import { InlineListSearch } from '@src/app/entityV2/shared/components/search/InlineListSearch'; -import { AcrylAssertionRecommendedFilters } from './AcrylAssertionRecommendedFilters'; -import { AssertionListFilter, AssertionTable } from './types'; -import { ASSERTION_GROUP_BY_FILTER_OPTIONS, ASSERTION_DEFAULT_FILTERS, ASSERTION_FILTER_TYPES } from './constant'; -import { useSetFilterFromURLParams } from './hooks'; interface FilterItem { name: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListStatusDot.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListStatusDot.tsx index 3686b9936f..26d06fcf28 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListStatusDot.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListStatusDot.tsx @@ -1,7 +1,8 @@ -import { AssertionResultType, AssertionRunEvent } from '@src/types.generated'; import React from 'react'; import styled from 'styled-components'; +import { AssertionResultType, AssertionRunEvent } from '@src/types.generated'; + const StyledAssertionResultDotContainer = styled.div` display: flex; `; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListTable.tsx index 058a047076..f827905a73 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListTable.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListTable.tsx @@ -1,16 +1,16 @@ import React, { useEffect, useState } from 'react'; -import { DataContract } from '@src/types.generated'; -import { useEntityData } from '@src/app/entity/shared/EntityContext'; + +import { StyledTableContainer } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/StyledComponents'; +import { useAssertionsTableColumns } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks'; +import { AssertionListFilter, AssertionTable } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types'; +import { getEntityUrnForAssertion, getSiblingWithUrn } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; +import { useOpenAssertionDetailModal } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks'; +import { AssertionProfileDrawer } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileDrawer'; import { Table } from '@src/alchemy-components'; import { SortingState } from '@src/alchemy-components/components/Table/types'; +import { useEntityData } from '@src/app/entity/shared/EntityContext'; import { useGetExpandedTableGroupsFromEntityUrnInUrl } from '@src/app/entityV2/shared/hooks'; - -import { AssertionProfileDrawer } from '../assertion/profile/AssertionProfileDrawer'; -import { getEntityUrnForAssertion, getSiblingWithUrn } from '../acrylUtils'; -import { useOpenAssertionDetailModal } from '../assertion/builder/hooks'; -import { AssertionTable, AssertionListFilter } from './types'; -import { useAssertionsTableColumns } from './hooks'; -import { StyledTableContainer } from './StyledComponents'; +import { DataContract } from '@src/types.generated'; type Props = { assertionData: AssertionTable; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionRecommendedFilters.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionRecommendedFilters.tsx index 196d9adfac..ae316afc88 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionRecommendedFilters.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionRecommendedFilters.tsx @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; + import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants'; interface FilterItem { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionGroupHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionGroupHeader.tsx index 68cc99c810..bc6a6f750a 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionGroupHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionGroupHeader.tsx @@ -1,7 +1,8 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { AssertionGroup } from '../acrylTypes'; + +import { AssertionGroup } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylTypes'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionListTitleContainer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionListTitleContainer.tsx index a0da51a616..05d1790163 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionListTitleContainer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionListTitleContainer.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const AssertionTitleContainer = styled.div` diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionName.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionName.tsx index 3a2b858140..54bf5ded2b 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionName.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionName.tsx @@ -1,18 +1,19 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; + +import AcrylAssertionListStatusDot from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListStatusDot'; +import { DataContractBadge } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/DataContractBadge'; +import { AssertionListTableRow } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types'; +import { AssertionPlatformAvatar } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionPlatformAvatar'; +import { AssertionResultPopover } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopover'; +import { ResultStatusType } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils'; +import { useBuildAssertionDescriptionLabels } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils'; +import { isAssertionPartOfContract } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/utils'; import { useEntityData } from '@src/app/entity/shared/EntityContext'; -import { EntityType, DataContract } from '@src/types.generated'; import { UNKNOWN_DATA_PLATFORM } from '@src/app/entityV2/shared/constants'; -import { AssertionResultPopover } from '../assertion/profile/shared/result/AssertionResultPopover'; -import { ResultStatusType } from '../assertion/profile/summary/shared/resultMessageUtils'; -import { AssertionPlatformAvatar } from '../AssertionPlatformAvatar'; -import { isAssertionPartOfContract } from '../contract/utils'; -import { useBuildAssertionDescriptionLabels } from '../assertion/profile/summary/utils'; -import { DataContractBadge } from './DataContractBadge'; -import { AssertionListTableRow } from './types'; -import AcrylAssertionListStatusDot from './AcrylAssertionListStatusDot'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { DataContract, EntityType } from '@src/types.generated'; const StyledAssertionNameContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/DataContractBadge.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/DataContractBadge.tsx index 474c96c8ff..9f3d204eb0 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/DataContractBadge.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/DataContractBadge.tsx @@ -1,6 +1,6 @@ -import React from 'react'; import { AuditOutlined } from '@ant-design/icons'; -import { colors, Tooltip } from '@components'; +import { Tooltip, colors } from '@components'; +import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/GroupByTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/GroupByTable.tsx index 4c4634aa66..05a7774f6a 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/GroupByTable.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/GroupByTable.tsx @@ -1,7 +1,8 @@ -import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; import React from 'react'; import styled from 'styled-components'; -import { AssertionListTableRow } from './types'; + +import { AssertionListTableRow } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types'; +import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; const GroupContainer = styled.div` background: #fafafa; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/StyledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/StyledComponents.tsx index fbc6922d8a..fee7afaa05 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/StyledComponents.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/StyledComponents.tsx @@ -1,6 +1,7 @@ -import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; import styled from 'styled-components'; +import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; + export const StyledTableContainer = styled.div` table tr.acryl-selected-table-row { background-color: ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryCard.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryCard.tsx index 31dfcfea54..2b60b74108 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryCard.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryCard.tsx @@ -1,19 +1,26 @@ import React from 'react'; import { useHistory } from 'react-router-dom'; import styled from 'styled-components'; -import { AssertionType, EntityType } from '@src/types.generated'; + +import { ASSERTION_SUMMARY_CARD_HEADER_BY_STATUS } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListConstants'; +import { + AcrylAssertionProgressBar, + AssertionProgressSummary, +} from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionProgressBar'; +import { AcrylAssertionSummarySection } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummarySection'; +import { + ASSERTION_SUMMARY_CARD_STATUSES, + NO_RUNNING_STATE, +} from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant'; +import { buildAssertionUrlSearch } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils'; +import { AssertionGroup } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylTypes'; +import { getAssertionGroupName } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; +import { ASSERTION_TYPE_TO_ICON_MAP } from '@app/entityV2/shared/tabs/Dataset/Validations/shared/constant'; +import { Button } from '@src/alchemy-components'; +import { useEntityData } from '@src/app/entity/shared/EntityContext'; import { ANTD_GRAY } from '@src/app/entityV2/shared/constants'; import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import { useEntityData } from '@src/app/entity/shared/EntityContext'; -import { Button } from '@src/alchemy-components'; -import { AssertionGroup } from '../../acrylTypes'; -import { getAssertionGroupName } from '../../acrylUtils'; -import { AcrylAssertionProgressBar, AssertionProgressSummary } from '../AcrylAssertionProgressBar'; -import { ASSERTION_SUMMARY_CARD_HEADER_BY_STATUS } from '../AcrylAssertionListConstants'; -import { AcrylAssertionSummarySection } from './AcrylAssertionSummarySection'; -import { ASSERTION_TYPE_TO_ICON_MAP } from '../../shared/constant'; -import { ASSERTION_SUMMARY_CARD_STATUSES, NO_RUNNING_STATE } from '../constant'; -import { buildAssertionUrlSearch } from '../utils'; +import { AssertionType, EntityType } from '@src/types.generated'; const StyledCard = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummarySection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummarySection.tsx index ff5914ed50..d7303148bf 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummarySection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummarySection.tsx @@ -1,14 +1,15 @@ +import { Tooltip } from '@components'; import React from 'react'; import { Link } from 'react-router-dom'; -import { Tooltip } from '@components'; import styled from 'styled-components'; -import { EntityType } from '@src/types.generated'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; + +import { ASSERTION_SUMMARY_CARD_HEADER_BY_STATUS } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListConstants'; +import { buildAssertionUrlSearch } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils'; +import { AssertionGroup } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylTypes'; import { useEntityData } from '@src/app/entity/shared/EntityContext'; import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants'; -import { AssertionGroup } from '../../acrylTypes'; -import { ASSERTION_SUMMARY_CARD_HEADER_BY_STATUS } from '../AcrylAssertionListConstants'; -import { buildAssertionUrlSearch } from '../utils'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { EntityType } from '@src/types.generated'; const StyledSummaryLabel = styled.div<{ background: string; color: string }>` background: ${({ background }) => background}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryTab.tsx index 00bde38b76..2ae7b0acfe 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryTab.tsx @@ -1,15 +1,19 @@ +import { Empty } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { Empty } from 'antd'; + +import { AcrylAssertionSummaryCard } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryCard'; +import { AcrylAssertionsSummaryTabLoading } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionsSummaryLoading'; +import { getAssertionGroupsByDisplayOrder } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils'; +import { AssertionGroup } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylTypes'; +import { + createAssertionGroups, + tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery, +} from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; import { useEntityData } from '@src/app/entity/shared/EntityContext'; import { combineEntityDataWithSiblings, useIsSeparateSiblingsMode } from '@src/app/entity/shared/siblingUtils'; import { useGetDatasetAssertionsWithRunEventsQuery } from '@src/graphql/dataset.generated'; import { Assertion } from '@src/types.generated'; -import { createAssertionGroups, tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery } from '../../acrylUtils'; -import { AcrylAssertionSummaryCard } from './AcrylAssertionSummaryCard'; -import { AssertionGroup } from '../../acrylTypes'; -import { getAssertionGroupsByDisplayOrder } from '../utils'; -import { AcrylAssertionsSummaryTabLoading } from './AcrylAssertionsSummaryLoading'; const AcrylAssertionSummaryContainer = styled.div` display: grid; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionsSummaryLoading.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionsSummaryLoading.tsx index 8adefd4c3d..b636298d45 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionsSummaryLoading.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionsSummaryLoading.tsx @@ -1,6 +1,6 @@ +import { Card } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Card } from 'antd'; const Body = styled.div` display: grid; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Tags/AcrylAssertionTagColumn.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Tags/AcrylAssertionTagColumn.tsx index 74ebe61265..97a157941c 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Tags/AcrylAssertionTagColumn.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Tags/AcrylAssertionTagColumn.tsx @@ -1,16 +1,17 @@ +import { message } from 'antd'; +import { Plus } from 'phosphor-react'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { message } from 'antd'; -import Tag from '@src/app/sharedV2/tags/tag/Tag'; -import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants'; -import { Plus } from 'phosphor-react'; -import { useGetRecommendations } from '@src/app/shared/recommendation'; -import { handleBatchError } from '@src/app/entityV2/shared/utils'; -import { useBatchAddTagsMutation, useBatchRemoveTagsMutation } from '@src/graphql/mutations.generated'; -import { EntityType, Entity, TagAssociation, Tag as TagType } from '@src/types.generated'; -import { getColor } from '@src/alchemy-components/theme/utils'; + import { SelectItemPopover } from '@src/alchemy-components/components/SelectItemsPopover'; import DataHubTooltip from '@src/alchemy-components/components/Tooltip/Tooltip'; +import { getColor } from '@src/alchemy-components/theme/utils'; +import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants'; +import { handleBatchError } from '@src/app/entityV2/shared/utils'; +import { useGetRecommendations } from '@src/app/shared/recommendation'; +import Tag from '@src/app/sharedV2/tags/tag/Tag'; +import { useBatchAddTagsMutation, useBatchRemoveTagsMutation } from '@src/graphql/mutations.generated'; +import { Entity, EntityType, TagAssociation, Tag as TagType } from '@src/types.generated'; const StyledTagContainer = styled.div` display: flex; @@ -100,14 +101,16 @@ export const AcrylAssertionTagColumn: React.FC = ( open={popoverVisible ? false : undefined} title={ setPopoverVisible(true)}> - {record?.tags?.slice(1, MAX_TAGS_FOR_HOVER).map((tag) => ( - - ))} + {record?.tags + ?.slice(1, MAX_TAGS_FOR_HOVER) + .map((tag) => ( + + ))} {(record?.tags?.length ?? 0) > MAX_TAGS_FOR_HOVER ? ( + {record.tags.length - MAX_TAGS_FOR_HOVER} more ) : null} diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant.ts index c8992a5061..c8812129eb 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant.ts @@ -1,5 +1,5 @@ +import { AssertionTable } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types'; import { AssertionSourceType } from '@src/types.generated'; -import { AssertionTable } from './types'; export const ASSERTION_DEFAULT_FILTERS = { sortBy: '', diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks.tsx index c539dde389..88dcf890e6 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks.tsx @@ -1,16 +1,17 @@ -import React, { Dispatch, SetStateAction, useEffect, useMemo, useRef, useState } from 'react'; import { Typography } from 'antd'; +import React, { Dispatch, SetStateAction, useEffect, useMemo, useRef, useState } from 'react'; +import { useHistory, useLocation } from 'react-router'; import styled from 'styled-components'; + +import { ActionsColumn } from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTableColumns'; +import { AssertionName } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionName'; +import { AcrylAssertionTagColumn } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Tags/AcrylAssertionTagColumn'; +import { AssertionListFilter } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types'; +import { getAssertionGroupName } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; +import { getQueryParams } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants'; import { getTimeFromNow } from '@src/app/shared/time/timeUtils'; import { AssertionResultType, AssertionType } from '@src/types.generated'; -import { useHistory, useLocation } from 'react-router'; -import { AssertionName } from './AssertionName'; -import { getAssertionGroupName } from '../acrylUtils'; -import { ActionsColumn } from '../AcrylAssertionsTableColumns'; -import { AssertionListFilter } from './types'; -import { getQueryParams } from '../assertionUtils'; -import { AcrylAssertionTagColumn } from './Tags/AcrylAssertionTagColumn'; const CategoryType = styled.div` font-family: Mulish; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types.ts index 9dd9125558..8b11bd39a7 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types.ts @@ -1,3 +1,4 @@ +import { AssertionGroup } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylTypes'; import { Assertion, AssertionResultType, @@ -10,7 +11,6 @@ import { EntityType, TagAssociation, } from '@src/types.generated'; -import { AssertionGroup } from '../acrylTypes'; export type EntityStagedForAssertion = { urn: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils.tsx index 0dff4b555b..6240573b1a 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils.tsx @@ -1,7 +1,35 @@ -import React from 'react'; -import Fuse from 'fuse.js'; -import styled from 'styled-components'; import { Typography } from 'antd'; +import Fuse from 'fuse.js'; +import React from 'react'; +import styled from 'styled-components'; + +import { AssertionGroupHeader } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionGroupHeader'; +import { + ASSERTION_DEFAULT_RAW_DATA, + ASSERTION_SOURCES, +} from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant'; +import { + AssertionBuilderSiblingOptions, + AssertionColumnGroup, + AssertionFilterOptions, + AssertionListFilter, + AssertionListTableRow, + AssertionRecommendedFilter, + AssertionStatusGroup, + AssertionTable, + AssertionWithDescription, +} from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types'; +import { + ASSERTION_INFO, + createAssertionGroups, + getAssertionGroupName, + getAssertionType, +} from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; +import { isExternalAssertion } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/isExternalAssertion'; +import { getPlainTextDescriptionFromAssertion } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils'; +import { AssertionGroup } from '@src/app/entity/shared/tabs/Dataset/Validations/acrylTypes'; +import { GenericEntityProperties } from '@src/app/entity/shared/types'; +import { getPlatformName } from '@src/app/entityV2/shared/utils'; import { Assertion, AssertionInfo, @@ -11,28 +39,9 @@ import { AssertionSourceType, AssertionType, AuditStamp, - TagAssociation, EntityType, + TagAssociation, } from '@src/types.generated'; -import { AssertionGroup } from '@src/app/entity/shared/tabs/Dataset/Validations/acrylTypes'; -import { GenericEntityProperties } from '@src/app/entity/shared/types'; -import { getPlatformName } from '@src/app/entityV2/shared/utils'; -import { ASSERTION_INFO, createAssertionGroups, getAssertionGroupName, getAssertionType } from '../acrylUtils'; -import { isExternalAssertion } from '../assertion/profile/shared/isExternalAssertion'; -import { AssertionGroupHeader } from './AssertionGroupHeader'; -import { - AssertionStatusGroup, - AssertionTable, - AssertionListFilter, - AssertionListTableRow, - AssertionFilterOptions, - AssertionRecommendedFilter, - AssertionWithDescription, - AssertionColumnGroup, - AssertionBuilderSiblingOptions, -} from './types'; -import { ASSERTION_DEFAULT_RAW_DATA, ASSERTION_SOURCES } from './constant'; -import { getPlainTextDescriptionFromAssertion } from '../assertion/profile/summary/utils'; const ASSERTION_TYPE_NAME_MAP = { VOLUME: 'Volume', diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu.tsx index 888f41d9d5..e526176c0b 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Menu } from 'antd'; -import CopyUrnMenuItem from '../../../../../shared/share/items/CopyUrnMenuItem'; +import React from 'react'; + +import CopyUrnMenuItem from '@app/shared/share/items/CopyUrnMenuItem'; interface AssertionMenuProps { urn: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionPlatformAvatar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionPlatformAvatar.tsx index 92bed8a5a1..e63e80e47a 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionPlatformAvatar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionPlatformAvatar.tsx @@ -1,10 +1,12 @@ +import { Tooltip } from '@components'; +import { Image, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography, Image } from 'antd'; -import { Tooltip } from '@components'; -import { DataPlatform, EntityType } from '../../../../../../types.generated'; -import { LinkWrapper } from '../../../../../shared/LinkWrapper'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; + +import { LinkWrapper } from '@app/shared/LinkWrapper'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DataPlatform, EntityType } from '@types'; const PlatformContainer = styled.div<{ noRightMargin?: boolean }>` margin-right: ${(props) => (props.noRightMargin ? '0px' : '8px')}; 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 5197075d97..7c79625535 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 @@ -1,13 +1,15 @@ -import React, { useMemo } from 'react'; import { Popover } from '@components'; -import { Bar } from '@visx/shape'; -import { Group } from '@visx/group'; import { AxisBottom } from '@visx/axis'; +import { Group } from '@visx/group'; import { scaleUtc } from '@visx/scale'; +import { Bar } from '@visx/shape'; import { Maybe } from 'graphql/jsutils/Maybe'; -import { ANTD_GRAY } from '../../../constants'; -import { LinkWrapper } from '../../../../../shared/LinkWrapper'; -import { AssertionResultType } from '../../../../../../types.generated'; +import React, { useMemo } from 'react'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { LinkWrapper } from '@app/shared/LinkWrapper'; + +import { AssertionResultType } from '@types'; export type AssertionResult = { type: AssertionResultType; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/Assertions.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/Assertions.tsx index 3a3b15ec45..a96c426c15 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/Assertions.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/Assertions.tsx @@ -1,12 +1,14 @@ import React, { useState } from 'react'; -import { useGetDatasetAssertionsQuery } from '../../../../../../graphql/dataset.generated'; -import { Assertion, AssertionResultType } from '../../../../../../types.generated'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import { combineEntityDataWithSiblings } from '../../../../../entity/shared/siblingUtils'; -import { DatasetAssertionsList } from './DatasetAssertionsList'; -import { DatasetAssertionsSummary } from './DatasetAssertionsSummary'; -import { sortAssertions } from './assertionUtils'; -import { useIsSeparateSiblingsMode } from '../../../useIsSeparateSiblingsMode'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { combineEntityDataWithSiblings } from '@app/entity/shared/siblingUtils'; +import { DatasetAssertionsList } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList'; +import { DatasetAssertionsSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary'; +import { sortAssertions } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; +import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; + +import { useGetDatasetAssertionsQuery } from '@graphql/dataset.generated'; +import { Assertion, AssertionResultType } from '@types'; /** * Returns a status summary for the assertions associated with a Dataset. 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 4dd8a90121..c90b207862 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 @@ -1,10 +1,11 @@ -import React, { useMemo } from 'react'; import { Popover } from '@components'; -import { Bar } from '@visx/shape'; -import { Group } from '@visx/group'; import { AxisBottom } from '@visx/axis'; +import { Group } from '@visx/group'; import { scaleUtc } from '@visx/scale'; -import { ANTD_GRAY } from '../../../constants'; +import { Bar } from '@visx/shape'; +import React, { useMemo } from 'react'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; export type BooleanResult = { isSuccess: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx index 7d9d95805d..a2a8a90327 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx @@ -1,7 +1,13 @@ -import { Typography, Button } from 'antd'; import { Popover } from '@components'; +import { Button, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; + +import { DatasetAssertionLogicModal } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal'; +import { toReadableLocalDateTimeString } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/utils'; +import { getFormattedParameterValue } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; +import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils'; + import { AssertionRunEvent, AssertionStdAggregation, @@ -10,11 +16,7 @@ import { DatasetAssertionInfo, DatasetAssertionScope, SchemaFieldRef, -} from '../../../../../../types.generated'; -import { decodeSchemaField } from '../../../../../lineage/utils/columnLineageUtils'; -import { getFormattedParameterValue } from './assertionUtils'; -import { DatasetAssertionLogicModal } from './DatasetAssertionLogicModal'; -import { toReadableLocalDateTimeString } from './assertion/profile/shared/utils'; +} from '@types'; const ViewLogicButton = styled(Button)` padding: 0px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx index b382c2f6f5..a47696623f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx @@ -1,21 +1,28 @@ -import { Typography } from 'antd'; +import { ArrowRightOutlined } from '@ant-design/icons'; import { Tooltip } from '@components'; +import { Typography } from 'antd'; import { SelectValue } from 'antd/lib/select'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { ArrowRightOutlined } from '@ant-design/icons'; -import { useGetAssertionRunsLazyQuery } from '../../../../../../graphql/assertion.generated'; -import { AssertionResultType, AssertionRunStatus, EntityType } from '../../../../../../types.generated'; -import { formatNumber } from '../../../../../shared/formatNumber'; -import { getFixedLookbackWindow, getLocaleTimezone } from '../../../../../shared/time/timeUtils'; -import { ANTD_GRAY } from '../../../constants'; -import PrefixedSelect from '../Stats/historical/shared/PrefixedSelect'; -import { LOOKBACK_WINDOWS } from '../Stats/lookbackWindows'; -import { getResultColor, getResultErrorMessage, getResultIcon, getResultText } from './assertionUtils'; -import { DatasetAssertionResultDetails } from './DatasetAssertionResultDetails'; -import { LinkWrapper } from '../../../../../shared/LinkWrapper'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { BooleanDataPoint, BooleanTimeline } from './BooleanTimeline'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import PrefixedSelect from '@app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect'; +import { LOOKBACK_WINDOWS } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; +import { BooleanDataPoint, BooleanTimeline } from '@app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline'; +import { DatasetAssertionResultDetails } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails'; +import { + getResultColor, + getResultErrorMessage, + getResultIcon, + getResultText, +} from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; +import { LinkWrapper } from '@app/shared/LinkWrapper'; +import { formatNumber } from '@app/shared/formatNumber'; +import { getFixedLookbackWindow, getLocaleTimezone } from '@app/shared/time/timeUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetAssertionRunsLazyQuery } from '@graphql/assertion.generated'; +import { AssertionResultType, AssertionRunStatus, EntityType } from '@types'; const RESULT_CHART_WIDTH_PX = 800; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx index 549a10ecd2..68d71d0b68 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx @@ -1,6 +1,7 @@ -import { Modal, Button } from 'antd'; +import { Button, Modal } from 'antd'; import React from 'react'; -import Query from '../Queries/Query'; + +import Query from '@app/entityV2/shared/tabs/Dataset/Queries/Query'; export type AssertionsSummary = { totalAssertions: number; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx index 424c89994d..1edde5647f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx @@ -1,6 +1,7 @@ import { Typography } from 'antd'; import React from 'react'; -import { AssertionResult } from '../../../../../../types.generated'; + +import { AssertionResult } from '@types'; type Props = { result: AssertionResult; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx index a67ad227ea..305562eaf8 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx @@ -1,16 +1,22 @@ -import { Button, Dropdown, Empty, Image, message, Modal, Tag, Typography } from 'antd'; +import { DeleteOutlined, DownOutlined, MoreOutlined, RightOutlined, StopOutlined } from '@ant-design/icons'; import { Tooltip } from '@components'; +import { Button, Dropdown, Empty, Image, Modal, Tag, Typography, message } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { DeleteOutlined, DownOutlined, MoreOutlined, RightOutlined, StopOutlined } from '@ant-design/icons'; -import { DatasetAssertionDescription } from './DatasetAssertionDescription'; -import { StyledTable } from '../../../components/styled/StyledTable'; -import { DatasetAssertionDetails } from './DatasetAssertionDetails'; -import { Assertion, AssertionRunStatus } from '../../../../../../types.generated'; -import { getResultColor, getResultIcon, getResultText } from './assertionUtils'; -import { useDeleteAssertionMutation } from '../../../../../../graphql/assertion.generated'; -import { capitalizeFirstLetterOnly } from '../../../../../shared/textUtil'; -import AssertionMenu from './AssertionMenu'; + +import { StyledTable } from '@app/entityV2/shared/components/styled/StyledTable'; +import AssertionMenu from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu'; +import { DatasetAssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDescription'; +import { DatasetAssertionDetails } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails'; +import { + getResultColor, + getResultIcon, + getResultText, +} from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; + +import { useDeleteAssertionMutation } from '@graphql/assertion.generated'; +import { Assertion, AssertionRunStatus } from '@types'; const ResultContainer = styled.div` display: flex; 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 3aef7bfbd6..9da493a974 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 @@ -1,9 +1,10 @@ import { CheckCircleFilled, CloseCircleFilled, ExclamationCircleFilled, StopOutlined } from '@ant-design/icons'; -import { Typography } from 'antd'; import { Tooltip } from '@components'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const SummaryHeader = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx index 3e5eec4d5d..8f1b42f7e8 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx @@ -1,15 +1,17 @@ -import React from 'react'; import { Typography } from 'antd'; -import styled from 'styled-components'; import { Maybe } from 'graphql/jsutils/Maybe'; -import { FieldAssertionInfo } from '../../../../../../types.generated'; +import React from 'react'; +import styled from 'styled-components'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; import { getFieldDescription, getFieldOperatorDescription, getFieldParametersDescription, getFieldTransformDescription, -} from './fieldDescriptionUtils'; -import { REDESIGN_COLORS } from '../../../constants'; +} from '@app/entityV2/shared/tabs/Dataset/Validations/fieldDescriptionUtils'; + +import { FieldAssertionInfo } from '@types'; type Props = { assertionInfo: FieldAssertionInfo; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription.tsx index 29d18f4618..8b5bf83725 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription.tsx @@ -1,14 +1,15 @@ import { Typography } from 'antd'; -import React from 'react'; import cronstrue from 'cronstrue'; import { Maybe } from 'graphql/jsutils/Maybe'; +import React from 'react'; + import { CronSchedule, FixedIntervalSchedule, FreshnessAssertionInfo, FreshnessAssertionScheduleType, FreshnessAssertionType, -} from '../../../../../../types.generated'; +} from '@types'; type Props = { assertionInfo: FreshnessAssertionInfo; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaAssertionDescription.tsx index a93d0edaf4..f4e1f7c47d 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaAssertionDescription.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaAssertionDescription.tsx @@ -1,7 +1,9 @@ -import React, { useState } from 'react'; import { Typography } from 'antd'; -import { SchemaSummaryModal } from './SchemaSummaryModal'; -import { SchemaAssertionInfo, SchemaAssertionCompatibility } from '../../../../../../types.generated'; +import React, { useState } from 'react'; + +import { SchemaSummaryModal } from '@app/entityV2/shared/tabs/Dataset/Validations/SchemaSummaryModal'; + +import { SchemaAssertionCompatibility, SchemaAssertionInfo } from '@types'; type Props = { assertionInfo: SchemaAssertionInfo; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummary.tsx index 063660bcef..3546c140a9 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummary.tsx @@ -1,9 +1,11 @@ -import React from 'react'; -import styled from 'styled-components'; import { MoreOutlined } from '@ant-design/icons'; import { Table } from 'antd'; -import { SchemaMetadata } from '../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../constants'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; + +import { SchemaMetadata } from '@types'; const TitleText = styled.div` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummaryModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummaryModal.tsx index 67cff70360..a43e5fa56d 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummaryModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummaryModal.tsx @@ -1,7 +1,9 @@ -import React from 'react'; import { Button, Modal } from 'antd'; -import { SchemaSummary } from './SchemaSummary'; -import { SchemaMetadata } from '../../../../../../types.generated'; +import React from 'react'; + +import { SchemaSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/SchemaSummary'; + +import { SchemaMetadata } from '@types'; const modalStyle = { top: 40, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx index 047f7c7db2..4eb652aa90 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { AssertionInfo } from '../../../../../../types.generated'; +import React from 'react'; + +import { AssertionInfo } from '@types'; type Props = { assertionInfo: AssertionInfo; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/ValidationsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/ValidationsTab.tsx index 203cfc8052..2357964323 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/ValidationsTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/ValidationsTab.tsx @@ -1,14 +1,15 @@ -import React, { useEffect } from 'react'; +import { FileDoneOutlined, FileProtectOutlined } from '@ant-design/icons'; import { Button } from 'antd'; +import React, { useEffect } from 'react'; import { useHistory, useLocation } from 'react-router'; import styled from 'styled-components'; -import { FileDoneOutlined, FileProtectOutlined } from '@ant-design/icons'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import { Assertions } from './Assertions'; -import TabToolbar from '../../../components/styled/TabToolbar'; -import { useGetValidationsTab } from './useGetValidationsTab'; -import { ANTD_GRAY } from '../../../constants'; -import { TestResults } from '../Governance/TestResults'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { TestResults } from '@app/entityV2/shared/tabs/Dataset/Governance/TestResults'; +import { Assertions } from '@app/entityV2/shared/tabs/Dataset/Validations/Assertions'; +import { useGetValidationsTab } from '@app/entityV2/shared/tabs/Dataset/Validations/useGetValidationsTab'; const TabTitle = styled.span` margin-left: 4px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx index 26634c459d..19b84cd9f5 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx @@ -1,10 +1,6 @@ -import React from 'react'; import { Typography } from 'antd'; -import { - IncrementingSegmentRowCountChange, - RowCountChange, - VolumeAssertionInfo, -} from '../../../../../../types.generated'; +import React from 'react'; + import { getIsRowCountChange, getOperatorDescription, @@ -12,7 +8,9 @@ import { getValueChangeTypeDescription, getVolumeTypeDescription, getVolumeTypeInfo, -} from './utils'; +} from '@app/entityV2/shared/tabs/Dataset/Validations/utils'; + +import { IncrementingSegmentRowCountChange, RowCountChange, VolumeAssertionInfo } from '@types'; type Props = { assertionInfo: VolumeAssertionInfo; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts index 1f71fd0ef6..aaf1f1de72 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts @@ -1,4 +1,4 @@ -import { useGetValidationsTab } from '../useGetValidationsTab'; +import { useGetValidationsTab } from '@app/entityV2/shared/tabs/Dataset/Validations/useGetValidationsTab'; describe('useGetValidationsTab', () => { it('should correctly extract valid tab', () => { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylTypes.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylTypes.tsx index 8a70a3d87c..abb91d7de1 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylTypes.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylTypes.tsx @@ -1,4 +1,4 @@ -import { Assertion, AssertionType } from '../../../../../../types.generated'; +import { Assertion, AssertionType } from '@types'; export type AssertionStatusSummary = { passing: number; 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 0b4d8e2afc..0e54568be4 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 @@ -1,23 +1,19 @@ -import React from 'react'; -import styled from 'styled-components'; -import * as moment from 'moment-timezone'; +import { ApiOutlined, CheckOutlined, CloseOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; import * as cronParser from 'cron-parser'; import cronstrue from 'cronstrue'; -import { CheckOutlined, CloseOutlined, ApiOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; +import * as moment from 'moment-timezone'; +import React from 'react'; +import styled from 'styled-components'; + +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'; +import { toProperTitleCase } from '@app/entityV2/shared/utils'; +import { lowerFirstLetter } from '@app/shared/textUtil'; import { ASSERTION_TYPE_TO_ICON_MAP } from '@src/app/entityV2/shared/tabs/Dataset/Validations/shared/constant'; import { GetDatasetAssertionsWithRunEventsQuery } from '@src/graphql/dataset.generated'; -import { - Assertion, - AssertionResultType, - AssertionType, - CronSchedule, - EntityType, -} from '../../../../../../types.generated'; -import { sortAssertions } from './assertionUtils'; -import { AssertionGroup, AssertionStatusSummary } from './acrylTypes'; -import { lowerFirstLetter } from '../../../../../shared/textUtil'; -import { GenericEntityProperties } from '../../../../../entity/shared/types'; -import { toProperTitleCase } from '../../../utils'; + +import { Assertion, AssertionResultType, AssertionType, CronSchedule, EntityType } from '@types'; export const SUCCESS_COLOR_HEX = '#52C41A'; export const FAILURE_COLOR_HEX = '#F5222D'; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/details/PrimaryButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/details/PrimaryButton.tsx index b5ad837b91..bc251f0275 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/details/PrimaryButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/details/PrimaryButton.tsx @@ -1,7 +1,6 @@ -import React from 'react'; - -import styled from 'styled-components'; import { Button, Tooltip } from '@components'; +import React from 'react'; +import styled from 'styled-components'; const Icon = styled.div` margin-right: 8px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks.ts index a178b81fd0..5f6553c692 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks.ts @@ -1,7 +1,8 @@ -import { useEffect, useState } from 'react'; -import { useLocation, useHistory } from 'react-router'; import { message } from 'antd'; -import { getQueryParams } from '../../assertionUtils'; +import { useEffect, useState } from 'react'; +import { useHistory, useLocation } from 'react-router'; + +import { getQueryParams } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; export const useAssertionURNCopyLink = (urn: string) => { const onCopyLink = () => { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfile.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfile.tsx index 948668af29..b93efa21be 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfile.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfile.tsx @@ -1,12 +1,13 @@ import React from 'react'; +import { AssertionProfileFooter } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileFooter'; +import { AssertionProfileHeader } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeader'; +import { AssertionProfileHeaderLoading } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeaderLoading'; +import { AssertionTabs } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionTabs'; +import { AssertionSummaryTab } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryTab'; import { useGetAssertionWithRunEventsQuery } from '@src/graphql/assertion.generated'; -import { AssertionSummaryTab } from './summary/AssertionSummaryTab'; -import { Assertion, DataContract } from '../../../../../../../../types.generated'; -import { AssertionProfileHeader } from './AssertionProfileHeader'; -import { AssertionTabs } from './AssertionTabs'; -import { AssertionProfileFooter } from './AssertionProfileFooter'; -import { AssertionProfileHeaderLoading } from './AssertionProfileHeaderLoading'; + +import { Assertion, DataContract } from '@types'; enum TabType { Summary = 'Summary', diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileDrawer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileDrawer.tsx index 399e41c30d..16fd2c8da6 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileDrawer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileDrawer.tsx @@ -1,9 +1,9 @@ +import { Drawer } from 'antd'; import React from 'react'; -import { Drawer } from 'antd'; +import { AssertionProfile } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfile'; -import { AssertionProfile } from './AssertionProfile'; -import { DataContract } from '../../../../../../../../types.generated'; +import { DataContract } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileFooter.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileFooter.tsx index cbbbd4fed6..62c1a79e7d 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileFooter.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileFooter.tsx @@ -1,9 +1,8 @@ -import React from 'react'; - -import styled from 'styled-components'; import { BellTwoTone } from '@ant-design/icons'; +import React from 'react'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../constants'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeader.tsx index da28800147..0dd88585b1 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeader.tsx @@ -1,13 +1,13 @@ import React from 'react'; - import styled from 'styled-components'; + +import { Actions } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/Actions'; +import { CloseButton } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/CloseButton'; +import { AssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionDescription'; +import { AssertionResultPill } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/AssertionResultPill'; import { AssertionType } from '@src/types.generated'; -import { Assertion, AssertionResult, DataContract } from '../../../../../../../../types.generated'; -import { AssertionDescription } from './summary/AssertionDescription'; -import { AssertionResultPill } from './summary/shared/AssertionResultPill'; -import { Actions } from './actions/Actions'; -import { CloseButton } from './shared/CloseButton'; +import { Assertion, AssertionResult, DataContract } from '@types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeaderLoading.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeaderLoading.tsx index 177c5a5b8c..7f98faabc4 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeaderLoading.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeaderLoading.tsx @@ -1,6 +1,5 @@ -import React from 'react'; - import { Skeleton } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const Container = styled.div` diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionTabs.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionTabs.tsx index 80026ac601..0616efcf28 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionTabs.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionTabs.tsx @@ -1,10 +1,9 @@ -import React, { useState } from 'react'; - -import styled from 'styled-components'; -import { Divider } from 'antd'; import { Tooltip } from '@components'; +import { Divider } from 'antd'; +import React, { useState } from 'react'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../constants'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const Tabs = styled.div` margin: 12px 24px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ActionItem.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ActionItem.tsx index 0a23a2a84c..15acb8135a 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ActionItem.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ActionItem.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Tooltip } from '@components'; import { TooltipPlacement } from 'antd/es/tooltip'; +import React from 'react'; import styled from 'styled-components'; + import { ActionMenuItem } from '@src/app/entityV2/shared/EntityDropdown/styledComponents'; const StyledActionButtonContainer = styled.div` diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/Actions.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/Actions.tsx index 2111987743..70d593ac96 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/Actions.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/Actions.tsx @@ -1,13 +1,13 @@ import React from 'react'; - import styled from 'styled-components'; -import { Assertion, DataContract } from '../../../../../../../../../types.generated'; -import { ContractAction } from './ContractAction'; -import { CopyLinkAction } from './CopyLinkAction'; -import { CopyUrnAction } from './CopyUrnAction'; -import { ExternalUrlAction } from './ExternalUrlAction'; -import { useIsOnSiblingsView } from '../../../../../../useIsSeparateSiblingsMode'; +import { ContractAction } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ContractAction'; +import { CopyLinkAction } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyLinkAction'; +import { CopyUrnAction } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyUrnAction'; +import { ExternalUrlAction } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ExternalUrlAction'; +import { useIsOnSiblingsView } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; + +import { Assertion, DataContract } from '@types'; const ActionList = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/AssertionListItemActions.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/AssertionListItemActions.tsx index ba51f41ee8..9fe2a50a71 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/AssertionListItemActions.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/AssertionListItemActions.tsx @@ -1,14 +1,16 @@ +import { Dropdown, Menu } from 'antd'; +import { DotsThreeVertical } from 'phosphor-react'; import React from 'react'; import styled from 'styled-components'; -import { Dropdown, Menu } from 'antd'; + +import { ContractAction } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ContractAction'; +import { CopyLinkAction } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyLinkAction'; +import { CopyUrnAction } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyUrnAction'; +import { ExternalUrlAction } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ExternalUrlAction'; +import { useIsOnSiblingsView } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; import { Button, colors } from '@src/alchemy-components'; -import { DotsThreeVertical } from 'phosphor-react'; -import { Assertion, AssertionRunStatus, DataContract } from '../../../../../../../../../types.generated'; -import { ContractAction } from './ContractAction'; -import { CopyLinkAction } from './CopyLinkAction'; -import { CopyUrnAction } from './CopyUrnAction'; -import { ExternalUrlAction } from './ExternalUrlAction'; -import { useIsOnSiblingsView } from '../../../../../../useIsSeparateSiblingsMode'; + +import { Assertion, AssertionRunStatus, DataContract } from '@types'; const ActionList = styled.div<{ $shouldRightAlign?: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ContractAction.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ContractAction.tsx index 7c6f24f8d9..26175312e6 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ContractAction.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ContractAction.tsx @@ -1,19 +1,22 @@ -import React from 'react'; - -import styled from 'styled-components'; import { MinusOutlined, PlusOutlined } from '@ant-design/icons'; import { message } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; -import { ActionItem } from './ActionItem'; -import { Assertion, DataContract } from '../../../../../../../../../types.generated'; -import { useUpsertDataContractMutation } from '../../../../../../../../../graphql/contract.generated'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ActionItem } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ActionItem'; +import { useIsContractsEnabled } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/useIsContractsEnabled'; import { buildAddAssertionToContractMutationVariables, buildRemoveAssertionFromContractMutationVariables, -} from '../../../contract/builder/utils'; -import { getDataContractCategoryFromAssertion, isAssertionPartOfContract } from '../../../contract/utils'; -import { useEntityData } from '../../../../../../../../entity/shared/EntityContext'; -import { useIsContractsEnabled } from './useIsContractsEnabled'; +} from '@app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils'; +import { + getDataContractCategoryFromAssertion, + isAssertionPartOfContract, +} from '@app/entityV2/shared/tabs/Dataset/Validations/contract/utils'; + +import { useUpsertDataContractMutation } from '@graphql/contract.generated'; +import { Assertion, DataContract } from '@types'; const StyledMinusOutlined = styled(MinusOutlined)` && { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyLinkAction.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyLinkAction.tsx index 9570855e11..febf5e01d7 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyLinkAction.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyLinkAction.tsx @@ -1,11 +1,11 @@ -import React from 'react'; - -import styled from 'styled-components'; import { LinkOutlined } from '@ant-design/icons'; +import React from 'react'; +import styled from 'styled-components'; -import { ActionItem } from './ActionItem'; -import { Assertion } from '../../../../../../../../../types.generated'; -import { useAssertionURNCopyLink } from '../../builder/hooks'; +import { useAssertionURNCopyLink } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks'; +import { ActionItem } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ActionItem'; + +import { Assertion } from '@types'; const StyledLinkOutlined = styled(LinkOutlined)` && { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyUrnAction.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyUrnAction.tsx index 11df2f365d..305a330edb 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyUrnAction.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyUrnAction.tsx @@ -1,10 +1,10 @@ -import React, { useState } from 'react'; - -import styled from 'styled-components'; import { CheckOutlined, CopyOutlined } from '@ant-design/icons'; +import React, { useState } from 'react'; +import styled from 'styled-components'; -import { ActionItem } from './ActionItem'; -import { Assertion } from '../../../../../../../../../types.generated'; +import { ActionItem } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ActionItem'; + +import { Assertion } from '@types'; const StyledCheckOutlined = styled(CheckOutlined)` && { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ExternalUrlAction.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ExternalUrlAction.tsx index 82a6cd2ab3..fe0e00c88a 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ExternalUrlAction.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ExternalUrlAction.tsx @@ -1,10 +1,11 @@ -import React from 'react'; - -import styled from 'styled-components'; import { LaunchOutlined } from '@mui/icons-material'; -import analytics, { EntityActionType, EventType } from '../../../../../../../../analytics'; -import { ActionItem } from './ActionItem'; -import { Assertion, AssertionRunStatus, EntityType } from '../../../../../../../../../types.generated'; +import React from 'react'; +import styled from 'styled-components'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { ActionItem } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ActionItem'; + +import { Assertion, AssertionRunStatus, EntityType } from '@types'; const StyledLaunchOutlined = styled(LaunchOutlined)` && { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/useIsContractsEnabled.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/useIsContractsEnabled.tsx index e04dcdc322..8615b46dd3 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/useIsContractsEnabled.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/useIsContractsEnabled.tsx @@ -1,4 +1,4 @@ -import { useAppConfig } from '../../../../../../../../useAppConfig'; +import { useAppConfig } from '@app/useAppConfig'; export const useIsContractsEnabled = () => { const appConfig = useAppConfig(); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/AssertionResultDot.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/AssertionResultDot.tsx index 95030aab24..b296a3000c 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/AssertionResultDot.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/AssertionResultDot.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import { AssertionResultType, AssertionRunEvent } from '../../../../../../../../../types.generated'; -import { getResultDotIcon } from '../../../assertionUtils'; +import { getResultDotIcon } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; + +import { AssertionResultType, AssertionRunEvent } from '@types'; const StyledAssertionResultDotContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/CloseButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/CloseButton.tsx index ce7616404a..7b28965ea0 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/CloseButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/CloseButton.tsx @@ -1,7 +1,6 @@ -import React from 'react'; - import { ArrowRightOutlined } from '@ant-design/icons'; import { Button } from 'antd'; +import React from 'react'; type Props = { close: () => void; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/isExternalAssertion.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/isExternalAssertion.tsx index 001d397ca5..9787962a3a 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/isExternalAssertion.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/isExternalAssertion.tsx @@ -1,4 +1,4 @@ -import { AssertionSourceType, AssertionType } from '../../../../../../../../../types.generated'; +import { AssertionSourceType, AssertionType } from '@types'; /** * Returns true if the assertion is definitely an external assertion, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopover.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopover.tsx index a9f86ec0bb..dea5fe1b48 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopover.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopover.tsx @@ -1,11 +1,11 @@ -import React from 'react'; - import { Popover } from '@components'; import { TooltipPlacement } from 'antd/lib/tooltip'; +import React from 'react'; -import { Assertion, AssertionRunEvent } from '../../../../../../../../../../types.generated'; -import { AssertionResultPopoverContent } from './AssertionResultPopoverContent'; -import { ResultStatusType } from '../../summary/shared/resultMessageUtils'; +import { AssertionResultPopoverContent } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopoverContent'; +import { ResultStatusType } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils'; + +import { Assertion, AssertionRunEvent } from '@types'; type Props = { assertion: Assertion; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopoverContent.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopoverContent.tsx index ba4ce49ff9..cd90a4b474 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopoverContent.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopoverContent.tsx @@ -1,22 +1,22 @@ -import React from 'react'; - -import styled from 'styled-components'; -import { Divider, Typography } from 'antd'; import { ClockCircleOutlined } from '@ant-design/icons'; +import { Divider, Typography } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; -import { Assertion, AssertionResultType, AssertionRunEvent } from '../../../../../../../../../../types.generated'; -import { AssertionResultPill } from '../../summary/shared/AssertionResultPill'; -import { PrimaryButton } from '../../../builder/details/PrimaryButton'; -import { isExternalAssertion } from '../isExternalAssertion'; -import { ProviderSummarySection } from '../../summary/schedule/ProviderSummarySection'; -import { ANTD_GRAY } from '../../../../../../../constants'; -import { toReadableLocalDateTimeString } from '../utils'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { PrimaryButton } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/details/PrimaryButton'; +import { isExternalAssertion } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/isExternalAssertion'; +import { toReadableLocalDateTimeString } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/utils'; +import { ProviderSummarySection } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/ProviderSummarySection'; +import { AssertionResultPill } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/AssertionResultPill'; import { ResultStatusType, getDetailedErrorMessage, getFormattedExpectedResultText, getFormattedReasonText, -} from '../../summary/shared/resultMessageUtils'; +} from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils'; + +import { Assertion, AssertionResultType, AssertionRunEvent } from '@types'; const HeaderRow = styled.div` display: flex; @@ -139,7 +139,8 @@ export const AssertionResultPopoverContent = ({ {(timestamp && ( <> - Ran {toReadableLocalDateTimeString(run?.timestampMillis)}{' '} + Ran{' '} + {toReadableLocalDateTimeString(run?.timestampMillis)}{' '} )) || <>No results yet} diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionDescription.tsx index 581870c6ef..3db96bc68e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionDescription.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionDescription.tsx @@ -1,8 +1,9 @@ +import { Typography } from 'antd'; import React from 'react'; -import { Typography } from 'antd'; -import { Assertion } from '../../../../../../../../../types.generated'; -import { useBuildAssertionDescriptionLabels } from './utils'; +import { useBuildAssertionDescriptionLabels } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils'; + +import { Assertion } from '@types'; type Props = { assertion: Assertion; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryContent.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryContent.tsx index 69aba2285b..b72effb743 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryContent.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryContent.tsx @@ -1,12 +1,12 @@ +import { Divider } from 'antd'; import React from 'react'; -import { Divider } from 'antd'; +import { AssertionSummarySection } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummarySection'; +import { AssertionResultsTable } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTable'; +import { AssertionResultsTimeline } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimeline'; +import { AssertionScheduleSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummary'; -import { Assertion } from '../../../../../../../../../types.generated'; -import { AssertionSummarySection } from './AssertionSummarySection'; -import { AssertionResultsTimeline } from './result/timeline/AssertionResultsTimeline'; -import { AssertionResultsTable } from './result/table/AssertionResultsTable'; -import { AssertionScheduleSummary } from './schedule/AssertionScheduleSummary'; +import { Assertion } from '@types'; type Props = { assertion: Assertion; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryLoading.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryLoading.tsx index c2e635282a..3820a3aabf 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryLoading.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryLoading.tsx @@ -1,6 +1,5 @@ -import React from 'react'; - import { Skeleton } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const Container = styled.div` diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummarySection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummarySection.tsx index fb31752acc..5a92c584b8 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummarySection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummarySection.tsx @@ -1,7 +1,7 @@ import React from 'react'; - import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const Title = styled.div` padding: 0; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryTab.tsx index f5669f1f80..f753cc0702 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryTab.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import { Assertion } from '../../../../../../../../../types.generated'; -import { AssertionSummaryLoading } from './AssertionSummaryLoading'; -import { AssertionSummaryContent } from './AssertionSummaryContent'; +import { AssertionSummaryContent } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryContent'; +import { AssertionSummaryLoading } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryLoading'; + +import { Assertion } from '@types'; type Props = { loading: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/NoResultsSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/NoResultsSummary.tsx index 837b1a9a67..1a535ae7ae 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/NoResultsSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/NoResultsSummary.tsx @@ -1,7 +1,7 @@ import React from 'react'; - import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const SecondaryText = styled.div` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsLoadingItems.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsLoadingItems.tsx index 5cc0a472c1..1c521beac0 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsLoadingItems.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsLoadingItems.tsx @@ -1,12 +1,12 @@ -import React from 'react'; - -import styled from 'styled-components'; import { Skeleton, Timeline } from 'antd'; +import React from 'react'; import { range } from 'remirror'; +import styled from 'styled-components'; -import { AssertionResultType } from '../../../../../../../../../../../types.generated'; -import { getResultDotIcon } from '../../../../../assertionUtils'; -import { ANTD_GRAY } from '../../../../../../../../constants'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { getResultDotIcon } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; + +import { AssertionResultType } from '@types'; const ItemSkeleton = styled(Skeleton.Input)` && { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTable.tsx index 31c84f3a18..cd10774bb8 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTable.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTable.tsx @@ -1,16 +1,16 @@ -import React, { useState } from 'react'; - -import styled from 'styled-components'; import { Timeline } from 'antd'; +import React, { useState } from 'react'; +import styled from 'styled-components'; -import { Assertion, AssertionResultType, AssertionRunEvent } from '../../../../../../../../../../../types.generated'; -import { useGetAssertionRunsQuery } from '../../../../../../../../../../../graphql/assertion.generated'; -import { ANTD_GRAY } from '../../../../../../../../constants'; -import { getResultColor } from '../../../../../assertionUtils'; -import { AssertionResultsTableItem } from './AssertionResultsTableItem'; -import { AssertionResultsLoadingItems } from './AssertionResultsLoadingItems'; -import { NoResultsSummary } from '../../NoResultsSummary'; -import { AssertionResultDot } from '../../../shared/AssertionResultDot'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { AssertionResultDot } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/AssertionResultDot'; +import { NoResultsSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/NoResultsSummary'; +import { AssertionResultsLoadingItems } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsLoadingItems'; +import { AssertionResultsTableItem } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTableItem'; +import { getResultColor } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; + +import { useGetAssertionRunsQuery } from '@graphql/assertion.generated'; +import { Assertion, AssertionResultType, AssertionRunEvent } from '@types'; const Container = styled.div` margin-top: 20px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTableItem.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTableItem.tsx index 02dc6d6f9e..26a6e66491 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTableItem.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTableItem.tsx @@ -1,16 +1,20 @@ -import React from 'react'; - -import styled from 'styled-components'; import { Tooltip } from '@components'; +import React from 'react'; +import styled from 'styled-components'; -import { Assertion, AssertionRunEvent } from '../../../../../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../../../../../constants'; -import { toLocalDateTimeString, toRelativeTimeString } from '../../../../../../../../../../shared/time/timeUtils'; -import { getFormattedTimeString } from '../timeline/utils'; -import { ResultStatusType, getFormattedReasonText, getFormattedResultText } from '../../shared/resultMessageUtils'; -import { getResultColor } from '../../../../../assertionUtils'; -import { AssertionResultPopover } from '../../../shared/result/AssertionResultPopover'; -import { applyOpacityToHexColor } from '../../../../../../../../../../shared/styleUtils'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { AssertionResultPopover } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopover'; +import { getFormattedTimeString } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils'; +import { + ResultStatusType, + getFormattedReasonText, + getFormattedResultText, +} from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils'; +import { getResultColor } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; +import { applyOpacityToHexColor } from '@app/shared/styleUtils'; +import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils'; + +import { Assertion, AssertionRunEvent } from '@types'; const Container = styled.div<{ highlightColor?: string }>` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimeline.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimeline.tsx index 78a915a67d..21ba131f21 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimeline.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimeline.tsx @@ -1,16 +1,16 @@ import React, { useEffect, useState } from 'react'; - import styled from 'styled-components'; -import { useGetAssertionRunsLazyQuery } from '../../../../../../../../../../../graphql/assertion.generated'; -import { getFixedLookbackWindow } from '../../../../../../../../../../shared/time/timeUtils'; -import { LOOKBACK_WINDOWS } from '../../../../../../Stats/lookbackWindows'; -import { TimeSelect } from './TimeSelect'; -import { AssertionResultsTimelineViz } from './AssertionResultsTimelineViz'; -import { Assertion, AssertionType } from '../../../../../../../../../../../types.generated'; -import { calculateInitialLookbackWindowFromRunEvents } from './utils'; -import { AssertionTimelineSkeleton } from './AssertionTimelineSkeleton'; -import { Message } from '../../../../../../../../../../shared/Message'; +import { LOOKBACK_WINDOWS } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; +import { AssertionResultsTimelineViz } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimelineViz'; +import { AssertionTimelineSkeleton } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionTimelineSkeleton'; +import { TimeSelect } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/TimeSelect'; +import { calculateInitialLookbackWindowFromRunEvents } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils'; +import { Message } from '@app/shared/Message'; +import { getFixedLookbackWindow } from '@app/shared/time/timeUtils'; + +import { useGetAssertionRunsLazyQuery } from '@graphql/assertion.generated'; +import { Assertion, AssertionType } from '@types'; const RESULT_CHART_WIDTH_PX = 560; const VIZ_CONTAINER_HEIGHT = 240; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimelineViz.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimelineViz.tsx index 4521d3fa7d..b2e21392f1 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimelineViz.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimelineViz.tsx @@ -1,17 +1,17 @@ -import React from 'react'; - -import styled from 'styled-components'; import { Typography } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { StatusOverTimeAssertionResultChart } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/StatusOverTimeAssertionResultChart'; import { - Assertion, - AssertionRunEventsResult, - AssertionRunStatus, -} from '../../../../../../../../../../../types.generated'; -import { AssertionResultChartData, TimeRange } from './charts/types'; -import { getAssertionResultChartData } from './transformers'; -import { StatusOverTimeAssertionResultChart } from './charts/StatusOverTimeAssertionResultChart'; -import { ANTD_GRAY } from '../../../../../../../../constants'; -import { getTimeRangeDisplay } from './utils'; + AssertionResultChartData, + TimeRange, +} from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types'; +import { getAssertionResultChartData } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers'; +import { getTimeRangeDisplay } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils'; + +import { Assertion, AssertionRunEventsResult, AssertionRunStatus } from '@types'; const VIZ_CONTAINER_TITLE_HEIGHT = 36; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionTimelineSkeleton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionTimelineSkeleton.tsx index de1b43a8cc..0780fdbdc8 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionTimelineSkeleton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionTimelineSkeleton.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Col, Row, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../../../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const SKELETON_MARGIN_BOTTOM_PX = 12; const Body = styled.div` diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/TimeSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/TimeSelect.tsx index 96c099232f..56cc991682 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/TimeSelect.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/TimeSelect.tsx @@ -1,10 +1,9 @@ -import React from 'react'; - -import styled from 'styled-components'; import { SelectValue } from 'antd/lib/select'; +import React from 'react'; +import styled from 'styled-components'; -import { LookbackWindow, LOOKBACK_WINDOWS } from '../../../../../../Stats/lookbackWindows'; -import { SelectablePill } from '../../shared/SelectablePill'; +import { LOOKBACK_WINDOWS, LookbackWindow } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; +import { SelectablePill } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/SelectablePill'; const TimeWindowPills = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/StatusOverTimeAssertionResultChart.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/StatusOverTimeAssertionResultChart.tsx index d2cfe94ed3..8bf53723a7 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/StatusOverTimeAssertionResultChart.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/StatusOverTimeAssertionResultChart.tsx @@ -1,19 +1,26 @@ +import { Popover } from '@components'; +import { AxisBottom } from '@visx/axis'; +import { GlyphCircle } from '@visx/glyph'; +import { GridColumns } from '@visx/grid'; +import { Group } from '@visx/group'; +import { scaleUtc } from '@visx/scale'; +import { LinePath } from '@visx/shape'; import React, { useMemo } from 'react'; -import { Popover } from '@components'; -import { Group } from '@visx/group'; -import { AxisBottom } from '@visx/axis'; -import { scaleUtc } from '@visx/scale'; -import { GlyphCircle } from '@visx/glyph'; -import { LinePath } from '@visx/shape'; -import { GridColumns } from '@visx/grid'; - -import { ANTD_GRAY } from '../../../../../../../../../constants'; -import { LinkWrapper } from '../../../../../../../../../../../shared/LinkWrapper'; -import { ACCENT_COLOR_HEX, generateTimeScaleTickValues, getCustomTimeScaleTickValue, getFillColor } from './utils'; -import { AssertionResultChartData, TimeRange } from './types'; -import { AssertionResultPopoverContent } from '../../../../shared/result/AssertionResultPopoverContent'; -import { getTimeRangeDisplay } from '../utils'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { AssertionResultPopoverContent } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopoverContent'; +import { + AssertionResultChartData, + TimeRange, +} from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types'; +import { + ACCENT_COLOR_HEX, + generateTimeScaleTickValues, + getCustomTimeScaleTickValue, + getFillColor, +} from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils'; +import { getTimeRangeDisplay } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils'; +import { LinkWrapper } from '@app/shared/LinkWrapper'; type Props = { data: AssertionResultChartData; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types.ts index b7afc8b866..62814249ba 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types.ts @@ -1,5 +1,6 @@ import { Maybe } from 'graphql/jsutils/Maybe'; -import { Assertion, AssertionResultType, AssertionRunEvent } from '../../../../../../../../../../../../types.generated'; + +import { Assertion, AssertionResultType, AssertionRunEvent } from '@types'; export type AssertionResult = { type: AssertionResultType; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils.ts index e0b828349d..639d733096 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils.ts @@ -1,12 +1,11 @@ import _ from 'lodash'; import { - AssertionInfo, - AssertionResultType, - AssertionType, - Maybe, -} from '../../../../../../../../../../../../types.generated'; -import { AssertionChartType, AssertionDataPoint } from './types'; + AssertionChartType, + AssertionDataPoint, +} from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types'; + +import { AssertionInfo, AssertionResultType, AssertionType, Maybe } from '@types'; export const ACCENT_COLOR_HEX = '#222222'; export const EXTRA_HIGHLIGHT_COLOR_HEX = '#4050E7'; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers.ts index 8e353c97f6..f0ded49629 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers.ts @@ -1,4 +1,12 @@ import { Maybe } from 'graphql/jsutils/Maybe'; + +import { + AssertionDataPoint, + AssertionResultChartData, +} from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types'; +import { tryGetPrimaryMetricValueFromAssertionRunEvent } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils'; +import { getFieldMetricTypeReadableLabel } from '@app/entityV2/shared/tabs/Dataset/Validations/fieldDescriptionUtils'; + import { Assertion, AssertionInfo, @@ -6,10 +14,7 @@ import { AssertionType, FieldAssertionInfo, FieldAssertionType, -} from '../../../../../../../../../../../types.generated'; -import { AssertionDataPoint, AssertionResultChartData } from './charts/types'; -import { getFieldMetricTypeReadableLabel } from '../../../../../fieldDescriptionUtils'; -import { tryGetPrimaryMetricValueFromAssertionRunEvent } from '../../shared/resultExtractionUtils'; +} from '@types'; /** * Gets the Y value that we should be plotting on the graph from the assertion run event diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils.ts index 9abfe4af50..1c8471f56e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils.ts @@ -1,5 +1,6 @@ -import { AssertionRunEventDetailsFragment } from '../../../../../../../../../../../graphql/assertion.generated'; -import { LOOKBACK_WINDOWS, LookbackWindow } from '../../../../../../Stats/lookbackWindows'; +import { LOOKBACK_WINDOWS, LookbackWindow } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows'; + +import { AssertionRunEventDetailsFragment } from '@graphql/assertion.generated'; const ONE_HOUR_IN_MS = 60 * 60 * 1000; // Milliseconds in one hour const ONE_DAY_IN_MS = 24 * ONE_HOUR_IN_MS; // Milliseconds in one day diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummary.tsx index c2695f1714..2602766776 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummary.tsx @@ -1,14 +1,14 @@ -import React from 'react'; - -import styled from 'styled-components'; import { ClockCircleOutlined, StopOutlined } from '@ant-design/icons'; +import React from 'react'; +import styled from 'styled-components'; -import { Assertion, CronSchedule } from '../../../../../../../../../../types.generated'; -import { getLocaleTimezone } from '../../../../../../../../../shared/time/timeUtils'; -import { getCronAsText } from '../../../../acrylUtils'; -import { AssertionScheduleSummarySection } from './AssertionScheduleSummarySection'; -import { isExternalAssertion } from '../../shared/isExternalAssertion'; -import { ProviderSummarySection } from './ProviderSummarySection'; +import { getCronAsText } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; +import { isExternalAssertion } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/isExternalAssertion'; +import { AssertionScheduleSummarySection } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummarySection'; +import { ProviderSummarySection } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/ProviderSummarySection'; +import { getLocaleTimezone } from '@app/shared/time/timeUtils'; + +import { Assertion, CronSchedule } from '@types'; const Container = styled.div` margin-top: 20px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummarySection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummarySection.tsx index 2383e25bb1..8e5004d210 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummarySection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummarySection.tsx @@ -1,11 +1,10 @@ -import React from 'react'; - -import styled from 'styled-components'; -import { Divider } from 'antd'; import { Tooltip } from '@components'; +import { Divider } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../../../constants'; -import { TruncatedTextWithTooltip } from '../../../../../../../../../shared/TruncatedTextWithTooltip'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { TruncatedTextWithTooltip } from '@app/shared/TruncatedTextWithTooltip'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/ProviderSummarySection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/ProviderSummarySection.tsx index 5266a5ab1f..1dbabeeaed 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/ProviderSummarySection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/ProviderSummarySection.tsx @@ -1,11 +1,11 @@ -import React from 'react'; - -import styled from 'styled-components'; import { ApiOutlined } from '@ant-design/icons'; +import React from 'react'; +import styled from 'styled-components'; -import { AssertionPlatformAvatar } from '../../../../AssertionPlatformAvatar'; -import { AssertionScheduleSummarySection } from './AssertionScheduleSummarySection'; -import { Assertion } from '../../../../../../../../../../types.generated'; +import { AssertionPlatformAvatar } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionPlatformAvatar'; +import { AssertionScheduleSummarySection } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummarySection'; + +import { Assertion } from '@types'; const StyledApiOutlined = styled(ApiOutlined)` margin-right: 8px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/AssertionResultPill.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/AssertionResultPill.tsx index ad19c5a614..f2542e2878 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/AssertionResultPill.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/AssertionResultPill.tsx @@ -1,12 +1,15 @@ import React from 'react'; - import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../../../constants'; -import { AssertionResult } from '../../../../../../../../../../types.generated'; -import { getResultColor } from '../../../../assertionUtils'; -import { ResultStatusType, getResultStatusText } from './resultMessageUtils'; -import { applyOpacityToHexColor } from '../../../../../../../../../shared/styleUtils'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { + ResultStatusType, + getResultStatusText, +} from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils'; +import { getResultColor } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; +import { applyOpacityToHexColor } from '@app/shared/styleUtils'; + +import { AssertionResult } from '@types'; const Pill = styled.div<{ color: string; highlightColor: string }>` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage.tsx index 299a1716ed..d95b5c7505 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage.tsx @@ -1,10 +1,10 @@ import React from 'react'; - import styled from 'styled-components'; -import { AssertionRunEvent } from '../../../../../../../../../../types.generated'; -import { getDetailedErrorMessage } from './resultMessageUtils'; -import { ANTD_GRAY } from '../../../../../../../constants'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { getDetailedErrorMessage } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils'; + +import { AssertionRunEvent } from '@types'; const Container = styled.div` padding: 4px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessageTooltip.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessageTooltip.tsx index 1c090d0796..bc150f1b38 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessageTooltip.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessageTooltip.tsx @@ -1,13 +1,13 @@ -import React from 'react'; - -import styled from 'styled-components'; -import { Popover } from '@components'; import { InfoCircleOutlined } from '@ant-design/icons'; +import { Popover } from '@components'; import { TooltipPlacement } from 'antd/lib/tooltip'; +import React from 'react'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../../../constants'; -import { AssertionRunEvent } from '../../../../../../../../../../types.generated'; -import { DetailedErrorMessage } from './DetailedErrorMessage'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { DetailedErrorMessage } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage'; + +import { AssertionRunEvent } from '@types'; const StyledInfoCircleOutlined = styled(InfoCircleOutlined)` margin-left: 8px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/SelectablePill.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/SelectablePill.tsx index cfeb3fc6c1..da069d36b7 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/SelectablePill.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/SelectablePill.tsx @@ -1,9 +1,8 @@ -import React from 'react'; - -import styled from 'styled-components'; import { Tooltip } from '@components'; +import React from 'react'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../../../constants'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const Pill = styled.div<{ selected: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/assertionUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/assertionUtils.ts index 85ade1ac73..4d92f119be 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/assertionUtils.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/assertionUtils.ts @@ -1,4 +1,4 @@ -import { Assertion, AssertionSourceType, AssertionType } from '../../../../../../../../../../types.generated'; +import { Assertion, AssertionSourceType, AssertionType } from '@types'; export enum AssertionEditabilityScopeType { FULL = 'FULL', diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants.ts index a1f478936f..b8884a7e6e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants.ts @@ -1,4 +1,4 @@ -import { AssertionStdOperator } from '../../../../../../../../../../types.generated'; +import { AssertionStdOperator } from '@types'; // We hard code this here because there's no set schema NativeResults on the AssertionResult document // - it's a generic map. diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils.ts index bcca217bd2..93b2933234 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils.ts @@ -1,4 +1,8 @@ import { Maybe } from 'graphql/jsutils/Maybe'; + +import { ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants'; +import { parseJsonArrayOrDefault, parseMaybeStringAsFloatOrDefault } from '@app/shared/numberUtil'; + import { AssertionResult, AssertionResultType, @@ -15,12 +19,7 @@ import { RowCountTotal, SqlAssertionInfo, StringMapEntry, -} from '../../../../../../../../../../types.generated'; -import { ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE } from './constants'; -import { - parseJsonArrayOrDefault, - parseMaybeStringAsFloatOrDefault, -} from '../../../../../../../../../shared/numberUtil'; +} from '@types'; /** * Calculates expected value of an assertion given previous value and change modifier details diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils.ts index 646f4fa191..121d96d406 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils.ts @@ -1,11 +1,6 @@ -import { - Assertion, - AssertionResult, - AssertionResultType, - AssertionRunEvent, - AssertionType, -} from '../../../../../../../../../../types.generated'; -import { getResultErrorMessage } from '../../../../assertionUtils'; +import { getResultErrorMessage } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; + +import { Assertion, AssertionResult, AssertionResultType, AssertionRunEvent, AssertionType } from '@types'; export const getFormattedResultText = (result?: AssertionResultType) => { if (result === undefined) { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils.tsx index 90820d534f..2267d4f765 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils.tsx @@ -1,8 +1,37 @@ +import { Tooltip } from '@components'; +import { Typography } from 'antd'; +import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; -import { Typography } from 'antd'; -import { Tooltip } from '@components'; -import { Maybe } from 'graphql/jsutils/Maybe'; +import { ANTD_GRAY_V2 } from '@app/entityV2/shared/constants'; +import { DatasetAssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDescription'; +import { FieldAssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/FieldAssertionDescription'; +import { + FreshnessAssertionDescription, + createCronText, + createFixedIntervalText, + createSinceTheLastCheckText, +} from '@app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription'; +import { SchemaAssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/SchemaAssertionDescription'; +import { SqlAssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/SqlAssertionDescription'; +import { VolumeAssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/VolumeAssertionDescription'; +import { getFormattedParameterValue } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; +import { + getFieldDescription, + getFieldOperatorDescription, + getFieldParametersDescription, + getFieldTransformDescription, +} from '@app/entityV2/shared/tabs/Dataset/Validations/fieldDescriptionUtils'; +import { + getIsRowCountChange, + getOperatorDescription, + getParameterDescription, + getValueChangeTypeDescription, + getVolumeTypeDescription, + getVolumeTypeInfo, +} from '@app/entityV2/shared/tabs/Dataset/Validations/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { decodeSchemaField } from '@src/app/lineage/utils/columnLineageUtils'; import { AssertionInfo, AssertionStdAggregation, @@ -24,36 +53,8 @@ import { SchemaFieldRef, VolumeAssertionInfo, } from '@src/types.generated'; -import { decodeSchemaField } from '@src/app/lineage/utils/columnLineageUtils'; -import { DatasetAssertionDescription } from '../../../DatasetAssertionDescription'; -import { - createCronText, - createFixedIntervalText, - createSinceTheLastCheckText, - FreshnessAssertionDescription, -} from '../../../FreshnessAssertionDescription'; -import { VolumeAssertionDescription } from '../../../VolumeAssertionDescription'; -import { SqlAssertionDescription } from '../../../SqlAssertionDescription'; -import { FieldAssertionDescription } from '../../../FieldAssertionDescription'; -import { SchemaAssertionDescription } from '../../../SchemaAssertionDescription'; -import { useEntityRegistry } from '../../../../../../../../useEntityRegistry'; -import { useGetUserQuery } from '../../../../../../../../../graphql/user.generated'; -import { ANTD_GRAY_V2 } from '../../../../../../constants'; -import { getFormattedParameterValue } from '../../../assertionUtils'; -import { - getIsRowCountChange, - getOperatorDescription, - getParameterDescription, - getValueChangeTypeDescription, - getVolumeTypeDescription, - getVolumeTypeInfo, -} from '../../../utils'; -import { - getFieldDescription, - getFieldOperatorDescription, - getFieldParametersDescription, - getFieldTransformDescription, -} from '../../../fieldDescriptionUtils'; + +import { useGetUserQuery } from '@graphql/user.generated'; /** * It refers the {@link getOperatorText} utility function to get plain text from html description. 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 d7f1683f98..b29cbba9d3 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 @@ -1,6 +1,10 @@ -import React from 'react'; -import QueryString from 'query-string'; import { CheckCircleOutlined, CloseCircleOutlined, ExclamationCircleOutlined, StopOutlined } from '@ant-design/icons'; +import QueryString from 'query-string'; +import React from 'react'; + +// TODO +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; + import { AssertionResult, AssertionResultErrorType, @@ -8,15 +12,16 @@ import { AssertionStdParameter, AssertionStdParameterType, DatasetAssertionInfo, - StringMapEntry, Maybe, -} from '../../../../../../types.generated'; -import AssertionSuccessIcon from '../../../../../../images/assertion_v2_success_dot.svg?react'; -import AssertionFailureIcon from '../../../../../../images/assertion_v2_failure_dot.svg?react'; -import AssertionErrorIcon from '../../../../../../images/assertion_error_dot.svg?react'; -import AssertionInitIcon from '../../../../../../images/assertion_init_dot.svg?react'; // TODO -import AssertionNoResultsIcon from '../../../../../../images/assertion_no_results_dot.svg?react'; // TODO -import { ANTD_GRAY } from '../../../constants'; + StringMapEntry, +} from '@types'; + +import AssertionErrorIcon from '@images/assertion_error_dot.svg?react'; +import AssertionInitIcon from '@images/assertion_init_dot.svg?react'; +// TODO +import AssertionNoResultsIcon from '@images/assertion_no_results_dot.svg?react'; +import AssertionFailureIcon from '@images/assertion_v2_failure_dot.svg?react'; +import AssertionSuccessIcon from '@images/assertion_v2_success_dot.svg?react'; /** * Utility methods diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/ContractStructuredPropertiesSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/ContractStructuredPropertiesSummary.tsx index 03cec33fca..878127a5e9 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/ContractStructuredPropertiesSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/ContractStructuredPropertiesSummary.tsx @@ -1,10 +1,12 @@ -import { EntityContext } from '@src/app/entity/shared/EntityContext'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; import React from 'react'; import styled from 'styled-components'; -import { DataContract, EntityType } from '../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../constants'; -import { PropertiesTab } from '../../../Properties/PropertiesTab'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab'; +import { EntityContext } from '@src/app/entity/shared/EntityContext'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; + +import { DataContract, EntityType } from '@types'; const TitleText = styled.div` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx index 9122823f4b..5838592bd0 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx @@ -1,14 +1,16 @@ +import { StopOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; -import { StopOutlined } from '@ant-design/icons'; -import { Assertion, AssertionResultType } from '../../../../../../../types.generated'; + import { StyledCheckOutlined, StyledClockCircleOutlined, StyledCloseOutlined, StyledExclamationOutlined, -} from '../shared/styledComponents'; +} from '@app/entityV2/shared/tabs/Dataset/Validations/shared/styledComponents'; + +import { Assertion, AssertionResultType } from '@types'; const StatusContainer = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx index ec7e1f0be1..91fe4c28c3 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx @@ -1,12 +1,18 @@ -import React from 'react'; -import styled from 'styled-components'; +import { Tooltip } from '@components'; import EditIcon from '@mui/icons-material/Edit'; import { Button, Typography } from 'antd'; -import { Tooltip } from '@components'; -import { DataContractState } from '../../../../../../../types.generated'; -import { AssertionStatusSummary } from '../acrylTypes'; -import { getContractSummaryIcon, getContractSummaryTitle, getContractSummaryMessage } from './utils'; -import { ANTD_GRAY } from '../../../../constants'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { AssertionStatusSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylTypes'; +import { + getContractSummaryIcon, + getContractSummaryMessage, + getContractSummaryTitle, +} from '@app/entityV2/shared/tabs/Dataset/Validations/contract/utils'; + +import { DataContractState } from '@types'; const SummaryHeader = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx index 29e4155314..d587767bed 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx @@ -1,11 +1,17 @@ -import React from 'react'; -import styled from 'styled-components'; import { ArrowRightOutlined } from '@ant-design/icons'; import { Button } from 'antd'; -import { Assertion } from '../../../../../../../types.generated'; -import { StyledCheckOutlined, StyledCloseOutlined, StyledExclamationOutlined } from '../shared/styledComponents'; -import { getAssertionsSummary } from '../acrylUtils'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../../constants'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getAssertionsSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; +import { + StyledCheckOutlined, + StyledCloseOutlined, + StyledExclamationOutlined, +} from '@app/entityV2/shared/tabs/Dataset/Validations/shared/styledComponents'; + +import { Assertion } from '@types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx index 8ae2e436e1..3323daaa5b 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx @@ -1,16 +1,18 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import { useGetDatasetContractQuery } from '../../../../../../../graphql/contract.generated'; -import { DataContract, DataContractState } from '../../../../../../../types.generated'; -import { useEntityData } from '../../../../../../entity/shared/EntityContext'; -import { DataContractEmptyState } from '../../../../../../entity/shared/tabs/Dataset/Validations/contract/DataContractEmptyState'; -import { getAssertionsSummary } from '../acrylUtils'; -import { ContractStructuredPropertiesSummary } from './ContractStructuredPropertiesSummary'; -import { DataContractSummary } from './DataContractSummary'; -import { DataQualityContractSummary } from './DataQualityContractSummary'; -import { FreshnessContractSummary } from './FreshnessContractSummary'; -import { SchemaContractSummary } from './SchemaContractSummary'; -import { DataContractBuilderModal } from './builder/DataContractBuilderModal'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { DataContractEmptyState } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractEmptyState'; +import { getAssertionsSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; +import { ContractStructuredPropertiesSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/ContractStructuredPropertiesSummary'; +import { DataContractSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummary'; +import { DataQualityContractSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary'; +import { FreshnessContractSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary'; +import { SchemaContractSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/SchemaContractSummary'; +import { DataContractBuilderModal } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal'; + +import { useGetDatasetContractQuery } from '@graphql/contract.generated'; +import { DataContract, DataContractState } from '@types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx index 6862ef1f3c..5243f22d64 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx @@ -1,14 +1,16 @@ import { Table } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Assertion, DataQualityContract, DatasetAssertionInfo } from '../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../constants'; -import { DatasetAssertionDescription } from '../DatasetAssertionDescription'; -import { FieldAssertionDescription } from '../FieldAssertionDescription'; -import { SqlAssertionDescription } from '../SqlAssertionDescription'; -import { VolumeAssertionDescription } from '../VolumeAssertionDescription'; -import { DataContractAssertionStatus } from './DataContractAssertionStatus'; -import { DataContractSummaryFooter } from './DataContractSummaryFooter'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { DatasetAssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDescription'; +import { FieldAssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/FieldAssertionDescription'; +import { SqlAssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/SqlAssertionDescription'; +import { VolumeAssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/VolumeAssertionDescription'; +import { DataContractAssertionStatus } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus'; +import { DataContractSummaryFooter } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter'; + +import { Assertion, DataQualityContract, DatasetAssertionInfo } from '@types'; const TitleText = styled.div` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx index 38035a24eb..ca30dd6f4b 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx @@ -2,10 +2,12 @@ import { ClockCircleOutlined } from '@ant-design/icons'; import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { FreshnessContract } from '../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../constants'; -import { DataContractSummaryFooter } from './DataContractSummaryFooter'; -import { FreshnessScheduleSummary } from './FreshnessScheduleSummary'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { DataContractSummaryFooter } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter'; +import { FreshnessScheduleSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary'; + +import { FreshnessContract } from '@types'; const Container = styled.div` padding: 28px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx index e46a08694c..80a844e7cf 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx @@ -1,11 +1,9 @@ -import React from 'react'; import cronstrue from 'cronstrue'; -import { - FreshnessAssertionSchedule, - FreshnessAssertionScheduleType, - CronSchedule, -} from '../../../../../../../types.generated'; -import { capitalizeFirstLetter } from '../../../../../../shared/textUtil'; +import React from 'react'; + +import { capitalizeFirstLetter } from '@app/shared/textUtil'; + +import { CronSchedule, FreshnessAssertionSchedule, FreshnessAssertionScheduleType } from '@types'; type Props = { definition: FreshnessAssertionSchedule; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx index 3494c58ca4..8424328783 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx @@ -1,9 +1,11 @@ import { Table } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { SchemaContract } from '../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../constants'; -import { DataContractSummaryFooter } from './DataContractSummaryFooter'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { DataContractSummaryFooter } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter'; + +import { SchemaContract } from '@types'; const TitleText = styled.div` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx index fc19288c25..896c52d1a5 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx @@ -1,9 +1,11 @@ import React from 'react'; import styled from 'styled-components'; -import { Assertion } from '../../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../../constants'; -import { AcrylDatasetAssertionsList } from '../../AcrylAssertionsList'; -import { DataContractCategoryType } from './types'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { AcrylDatasetAssertionsList } from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsList'; +import { DataContractCategoryType } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/builder/types'; + +import { Assertion } from '@types'; const Category = styled.div` padding: 20px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx index ff9e7f7f24..e2dc810bbb 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx @@ -1,16 +1,25 @@ -import React, { useState } from 'react'; -import { message, Button } from 'antd'; -import styled from 'styled-components'; +import { Button, message } from 'antd'; import lodash from 'lodash'; +import React, { useState } from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { + createAssertionGroups, + tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery, +} from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; +import { DataContractAssertionGroupSelect } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect'; +import { + DEFAULT_BUILDER_STATE, + DataContractBuilderState, + DataContractCategoryType, +} from '@app/entityV2/shared/tabs/Dataset/Validations/contract/builder/types'; +import { buildUpsertDataContractMutationVariables } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils'; +import { DATA_QUALITY_ASSERTION_TYPES } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/utils'; import { useGetDatasetAssertionsWithRunEventsQuery } from '@src/graphql/dataset.generated'; -import { DataContract, AssertionType, Assertion } from '../../../../../../../../types.generated'; -import { DataContractBuilderState, DataContractCategoryType, DEFAULT_BUILDER_STATE } from './types'; -import { buildUpsertDataContractMutationVariables } from './utils'; -import { useUpsertDataContractMutation } from '../../../../../../../../graphql/contract.generated'; -import { createAssertionGroups, tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery } from '../../acrylUtils'; -import { DataContractAssertionGroupSelect } from './DataContractAssertionGroupSelect'; -import { ANTD_GRAY } from '../../../../../constants'; -import { DATA_QUALITY_ASSERTION_TYPES } from '../utils'; + +import { useUpsertDataContractMutation } from '@graphql/contract.generated'; +import { Assertion, AssertionType, DataContract } from '@types'; const AssertionsSection = styled.div` border: 0.5px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx index 75a8fe0410..94c6e1aea7 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx @@ -1,9 +1,11 @@ -import React from 'react'; import { Modal, Typography } from 'antd'; -import { DataContract } from '../../../../../../../../types.generated'; -import ClickOutside from '../../../../../../../shared/ClickOutside'; -import { DataContractBuilderState } from './types'; -import { DataContractBuilder } from './DataContractBuilder'; +import React from 'react'; + +import { DataContractBuilder } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder'; +import { DataContractBuilderState } from '@app/entityV2/shared/tabs/Dataset/Validations/contract/builder/types'; +import ClickOutside from '@app/shared/ClickOutside'; + +import { DataContract } from '@types'; const modalStyle = {}; const modalBodyStyle = { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils.ts index 7eeb526d2b..7f0277bd32 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils.ts @@ -1,5 +1,9 @@ -import { DataContract } from '../../../../../../../../types.generated'; -import { DataContractBuilderState, DataContractCategoryType } from './types'; +import { + DataContractBuilderState, + DataContractCategoryType, +} from '@app/entityV2/shared/tabs/Dataset/Validations/contract/builder/types'; + +import { DataContract } from '@types'; /** * Creates a builder state instance from a Data Contract object. 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 fa8941a182..46457a0bfc 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 @@ -1,4 +1,3 @@ -import React from 'react'; import { CheckOutlined, ClockCircleOutlined, @@ -6,11 +5,18 @@ import { ExclamationCircleFilled, StopOutlined, } from '@ant-design/icons'; -import { Assertion, AssertionType, DataContract, DataContractState } from '../../../../../../../types.generated'; -import { ANTD_GRAY } from '../../../../constants'; -import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX, WARNING_COLOR_HEX } from '../acrylUtils'; -import { DataContractCategoryType } from './builder/types'; -import { AssertionStatusSummary } from '../acrylTypes'; +import React from 'react'; + +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'; export const getContractSummaryIcon = (state: DataContractState, summary: AssertionStatusSummary) => { if (state === DataContractState.Pending) { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts index 4fb783407b..881fc0ae94 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts @@ -1,3 +1,7 @@ +import { GET_ASSERTION_OPERATOR_TO_DESCRIPTION_MAP } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { parseMaybeStringAsFloatOrDefault } from '@app/shared/numberUtil'; + import { AssertionStdOperator, AssertionStdParameters, @@ -5,10 +9,7 @@ import { FieldAssertionType, FieldMetricType, FieldTransformType, -} from '../../../../../../types.generated'; -import { formatNumberWithoutAbbreviation } from '../../../../../shared/formatNumber'; -import { parseMaybeStringAsFloatOrDefault } from '../../../../../shared/numberUtil'; -import { GET_ASSERTION_OPERATOR_TO_DESCRIPTION_MAP } from './assertion/profile/summary/shared/constants'; +} from '@types'; const SUPPORTED_OPERATORS_FOR_FIELD_DESCRIPTION = [ AssertionStdOperator.EqualTo, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/constant.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/constant.tsx index 1158d88081..e122cc5659 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/constant.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/constant.tsx @@ -1,6 +1,7 @@ +import { Clock, Database, Dresser, GitFork, Hammer } from '@phosphor-icons/react'; import React from 'react'; + import { AssertionType } from '@src/types.generated'; -import { Clock, Database, GitFork, Hammer, Dresser } from '@phosphor-icons/react'; export const ASSERTION_TYPE_TO_ICON_MAP: Record = { [AssertionType.Freshness]: , 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 a43e8ad841..44f29ec1aa 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,7 +1,12 @@ -import styled from 'styled-components'; import { CheckOutlined, ClockCircleOutlined, CloseOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; -import { ANTD_GRAY } from '../../../../constants'; -import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX, WARNING_COLOR_HEX } from '../acrylUtils'; +import styled from 'styled-components'; + +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}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/utils.tsx index efb519c583..683ba69cfe 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/utils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/utils.tsx @@ -1,12 +1,13 @@ +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { parseMaybeStringAsFloatOrDefault } from '@app/shared/numberUtil'; + import { AssertionStdOperator, AssertionStdParameters, AssertionValueChangeType, VolumeAssertionInfo, VolumeAssertionType, -} from '../../../../../../types.generated'; -import { formatNumberWithoutAbbreviation } from '../../../../../shared/formatNumber'; -import { parseMaybeStringAsFloatOrDefault } from '../../../../../shared/numberUtil'; +} from '@types'; export const getIsRowCountChange = (type: VolumeAssertionType) => { return [VolumeAssertionType.RowCountChange, VolumeAssertionType.IncrementingSegmentRowCountChange].includes(type); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/View/ViewDefinitionTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/View/ViewDefinitionTab.tsx index 5ffef29d11..2d4ecbd8d4 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/View/ViewDefinitionTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/View/ViewDefinitionTab.tsx @@ -1,14 +1,16 @@ import { Radio, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated'; -import { ANTD_GRAY } from '../../../constants'; -import { useBaseEntity } from '../../../../../entity/shared/EntityContext'; -import { InfoItem } from '../../../components/styled/InfoItem'; -import { StyledSyntaxHighlighter } from '../../../StyledSyntaxHighlighter'; -import { DBT_URN } from '../../../../../ingest/source/builder/constants'; -import CopyQuery from '../Queries/CopyQuery'; -import { ViewHeader } from '../../../containers/profile/sidebar/SidebarLogicSection'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { StyledSyntaxHighlighter } from '@app/entityV2/shared/StyledSyntaxHighlighter'; +import { InfoItem } from '@app/entityV2/shared/components/styled/InfoItem'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { ViewHeader } from '@app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection'; +import CopyQuery from '@app/entityV2/shared/tabs/Dataset/Queries/CopyQuery'; +import { DBT_URN } from '@app/ingest/source/builder/constants'; + +import { GetDatasetQuery } from '@graphql/dataset.generated'; const InfoSection = styled.div` border-bottom: 1px solid ${ANTD_GRAY[4.5]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/DocumentationTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/DocumentationTab.tsx index 735b702cdc..111e7a6577 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/DocumentationTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/DocumentationTab.tsx @@ -1,24 +1,22 @@ -import queryString from 'query-string'; -import React, { useEffect } from 'react'; -import { Button } from '@src/alchemy-components'; -import { useLocation } from 'react-router-dom'; - import { EditOutlined, ExpandAltOutlined, PlusOutlined } from '@ant-design/icons'; import { Button as AntButton, Divider, Typography } from 'antd'; +import queryString from 'query-string'; +import React, { useEffect } from 'react'; +import { useLocation } from 'react-router-dom'; import styled from 'styled-components'; -import { AddLinkModal } from '../../components/styled/AddLinkModal'; -import { EmptyTab } from '../../components/styled/EmptyTab'; -import TabToolbar from '../../components/styled/TabToolbar'; -import { DescriptionEditor } from './components/DescriptionEditor'; -import { LinkList } from './components/LinkList'; - -import { useEntityData, useRefetch, useRouteToTab } from '../../../../entity/shared/EntityContext'; -import { REDESIGN_COLORS } from '../../constants'; -import { EDITED_DESCRIPTIONS_CACHE_NAME } from '../../utils'; -import { DescriptionPreviewModal } from './components/DescriptionPreviewModal'; -import { Editor } from './components/editor/Editor'; -import { getAssetDescriptionDetails } from './utils'; +import { useEntityData, useRefetch, useRouteToTab } from '@app/entity/shared/EntityContext'; +import { AddLinkModal } from '@app/entityV2/shared/components/styled/AddLinkModal'; +import { EmptyTab } from '@app/entityV2/shared/components/styled/EmptyTab'; +import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { DescriptionEditor } from '@app/entityV2/shared/tabs/Documentation/components/DescriptionEditor'; +import { DescriptionPreviewModal } from '@app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewModal'; +import { LinkList } from '@app/entityV2/shared/tabs/Documentation/components/LinkList'; +import { Editor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; +import { getAssetDescriptionDetails } from '@app/entityV2/shared/tabs/Documentation/utils'; +import { EDITED_DESCRIPTIONS_CACHE_NAME } from '@app/entityV2/shared/utils'; +import { Button } from '@src/alchemy-components'; const DocumentationContainer = styled.div` margin: 0 32px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx index cdc9b56d30..13b1909ceb 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx @@ -2,11 +2,13 @@ import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import DOMPurify from 'dompurify'; import React from 'react'; -import { mocks } from '../../../../../../Mocks'; -import { EntityType } from '../../../../../../types.generated'; -import TestPageContainer from '../../../../../../utils/test-utils/TestPageContainer'; -import { EntityContext } from '../../../../../entity/shared/EntityContext'; -import { DocumentationTab } from '../DocumentationTab'; + +import { EntityContext } from '@app/entity/shared/EntityContext'; +import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { EntityType } from '@types'; describe('SchemaDescriptionField', () => { it('renders original description', async () => { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx index 0877779d8b..dbbe428a5d 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx @@ -1,4 +1,4 @@ -import { htmlToMarkdown } from '../../../../components/editor/extensions/htmlToMarkdown'; +import { htmlToMarkdown } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown'; const cases = [ ['strike', 'Lorem ipsum', '~Lorem ipsum~'], diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx index 5e2e9034a9..f93956f6dc 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx @@ -1,4 +1,4 @@ -import { markdownToHtml } from '../../../../components/editor/extensions/markdownToHtml'; +import { markdownToHtml } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/markdownToHtml'; const cases = [ [ diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx index bce77b0da2..929ef752df 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx @@ -1,7 +1,8 @@ import React, { useCallback, useEffect, useState } from 'react'; import styled from 'styled-components'; + +import { Editor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; import { Button } from '@src/alchemy-components'; -import { Editor } from './editor/Editor'; const LINE_HEIGHT = 1.5; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditor.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditor.tsx index 9749da1da2..514d665ad2 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditor.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditor.tsx @@ -1,15 +1,17 @@ +import { Modal, message } from 'antd'; import React, { useEffect, useRef, useState } from 'react'; -import { message, Modal } from 'antd'; import styled from 'styled-components/macro'; -import { useUpdateDescriptionMutation } from '../../../../../../graphql/mutations.generated'; -import analytics, { EntityActionType, EventType } from '../../../../../analytics'; -import { useEntityData, useEntityUpdate, useMutationUrn, useRefetch } from '../../../../../entity/shared/EntityContext'; -import { GenericEntityUpdate } from '../../../../../entity/shared/types'; -import { EDITED_DESCRIPTIONS_CACHE_NAME } from '../../../utils'; -import { DescriptionEditorToolbar } from './DescriptionEditorToolbar'; -import { Editor } from './editor/Editor'; -import SourceDescription from './SourceDescription'; -import { getAssetDescriptionDetails } from '../utils'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useEntityData, useEntityUpdate, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext'; +import { GenericEntityUpdate } from '@app/entity/shared/types'; +import { DescriptionEditorToolbar } from '@app/entityV2/shared/tabs/Documentation/components/DescriptionEditorToolbar'; +import SourceDescription from '@app/entityV2/shared/tabs/Documentation/components/SourceDescription'; +import { Editor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; +import { getAssetDescriptionDetails } from '@app/entityV2/shared/tabs/Documentation/utils'; +import { EDITED_DESCRIPTIONS_CACHE_NAME } from '@app/entityV2/shared/utils'; + +import { useUpdateDescriptionMutation } from '@graphql/mutations.generated'; const EditorContainer = styled.div` flex: 1; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx index 1a98f04b91..76d9617a31 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx @@ -1,7 +1,8 @@ -import styled from 'styled-components'; import React from 'react'; +import styled from 'styled-components'; + +import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar'; import { Button } from '@src/alchemy-components'; -import TabToolbar from '../../../components/styled/TabToolbar'; const StyledTabToolbar = styled(TabToolbar)` justify-content: flex-end !important; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreview.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreview.tsx index 90f887976e..3379533ef1 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreview.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreview.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { Editor } from './editor/Editor'; -import { DescriptionPreviewToolbar } from './DescriptionPreviewToolbar'; + +import { DescriptionPreviewToolbar } from '@app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewToolbar'; +import { Editor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; const EditorContainer = styled.div` overflow: auto; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx index bf346e24d0..ce1ad0b5bd 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx @@ -1,9 +1,10 @@ -import React from 'react'; import { Modal } from 'antd'; -import ClickOutside from '../../../../../shared/ClickOutside'; -import { DescriptionEditor } from './DescriptionEditor'; -import { DescriptionPreview } from './DescriptionPreview'; -import { useRouteToTab } from '../../../../../entity/shared/EntityContext'; +import React from 'react'; + +import { useRouteToTab } from '@app/entity/shared/EntityContext'; +import { DescriptionEditor } from '@app/entityV2/shared/tabs/Documentation/components/DescriptionEditor'; +import { DescriptionPreview } from '@app/entityV2/shared/tabs/Documentation/components/DescriptionPreview'; +import ClickOutside from '@app/shared/ClickOutside'; const modalStyle = { top: '5%', diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx index 590322190e..ecef6c489f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { EditOutlined } from '@ant-design/icons'; import { Button } from 'antd'; -import TabToolbar from '../../../components/styled/TabToolbar'; +import React from 'react'; + +import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar'; type DescriptionPreviewToolbarProps = { onEdit: () => void; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx index ce54fe711d..8b11f02c9e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx @@ -1,5 +1,5 @@ +import { Button, Modal } from 'antd'; import React from 'react'; -import { Modal, Button } from 'antd'; type Props = { cancelModalVisible?: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/LinkList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/LinkList.tsx index a4cbc9b385..a89f6ed9c1 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/LinkList.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/LinkList.tsx @@ -1,14 +1,16 @@ +import { DeleteOutlined, LinkOutlined } from '@ant-design/icons'; +import { Button, List, Typography, message } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { message, Button, List, Typography } from 'antd'; -import { LinkOutlined, DeleteOutlined } from '@ant-design/icons'; -import { InstitutionalMemoryMetadata } from '../../../../../../types.generated'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../../constants'; -import { formatDateString } from '../../../containers/profile/utils'; -import { useRemoveLinkMutation } from '../../../../../../graphql/mutations.generated'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { formatDateString } from '@app/entityV2/shared/containers/profile/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useRemoveLinkMutation } from '@graphql/mutations.generated'; +import { InstitutionalMemoryMetadata } from '@types'; const LinkListItem = styled(List.Item)` border-radius: 5px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/SourceDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/SourceDescription.tsx index 45608d6b8a..6689afe539 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/SourceDescription.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/SourceDescription.tsx @@ -1,9 +1,10 @@ import React from 'react'; import styled from 'styled-components'; -import { useEntityData } from '../../../../../entity/shared/EntityContext'; -import { ANTD_GRAY } from '../../../constants'; -import DescriptionSection from '../../../containers/profile/sidebar/AboutSection/DescriptionSection'; -import { getPlatformName } from '../../../utils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import DescriptionSection from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/DescriptionSection'; +import { getPlatformName } from '@app/entityV2/shared/utils'; const LINE_LIMIT = 10; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/Editor.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/Editor.tsx index 6f96205b8a..abdc94b465 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/Editor.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/Editor.tsx @@ -1,5 +1,7 @@ -import React, { forwardRef, useEffect, useImperativeHandle } from 'react'; +import { EditorComponent, Remirror, TableComponents, ThemeProvider, useRemirror } from '@remirror/react'; import DOMPurify from 'dompurify'; +import React, { forwardRef, useEffect, useImperativeHandle } from 'react'; +import { useMount } from 'react-use'; import { BlockquoteExtension, BoldExtension, @@ -21,18 +23,17 @@ import { TableExtension, UnderlineExtension, } from 'remirror/extensions'; -import { EditorComponent, Remirror, useRemirror, ThemeProvider, TableComponents } from '@remirror/react'; -import { useMount } from 'react-use'; -import { EditorContainer, EditorTheme } from './EditorTheme'; -import { htmlToMarkdown } from './extensions/htmlToMarkdown'; -import { markdownToHtml } from './extensions/markdownToHtml'; -import { CodeBlockToolbar } from './toolbar/CodeBlockToolbar'; -import { FloatingToolbar } from './toolbar/FloatingToolbar'; -import { Toolbar } from './toolbar/Toolbar'; -import { OnChangeMarkdown } from './OnChangeMarkdown'; -import { TableCellMenu } from './toolbar/TableCellMenu'; -import { DataHubMentionsExtension } from './extensions/mentions/DataHubMentionsExtension'; -import { MentionsComponent } from './extensions/mentions/MentionsComponent'; + +import { EditorContainer, EditorTheme } from '@app/entityV2/shared/tabs/Documentation/components/editor/EditorTheme'; +import { OnChangeMarkdown } from '@app/entityV2/shared/tabs/Documentation/components/editor/OnChangeMarkdown'; +import { htmlToMarkdown } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown'; +import { markdownToHtml } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/markdownToHtml'; +import { DataHubMentionsExtension } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension'; +import { MentionsComponent } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent'; +import { CodeBlockToolbar } from '@app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar'; +import { FloatingToolbar } from '@app/entityV2/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar'; +import { TableCellMenu } from '@app/entityV2/shared/tabs/Documentation/components/editor/toolbar/TableCellMenu'; +import { Toolbar } from '@app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Toolbar'; type EditorProps = { readOnly?: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/EditorTheme.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/EditorTheme.tsx index d3e23b0993..58ee3d424f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/EditorTheme.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/EditorTheme.tsx @@ -1,7 +1,3 @@ -import { defaultRemirrorTheme } from '@remirror/theme'; -import type { RemirrorThemeType } from '@remirror/theme'; -import styled from 'styled-components'; - import { extensionBlockquoteStyledCss, extensionCalloutStyledCss, @@ -15,8 +11,11 @@ import { extensionPositionerStyledCss, extensionTablesStyledCss, } from '@remirror/styles/styled-components'; +import { defaultRemirrorTheme } from '@remirror/theme'; +import type { RemirrorThemeType } from '@remirror/theme'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../constants'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; export const EditorTheme: RemirrorThemeType = { ...defaultRemirrorTheme, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx index b6a090f892..f1e1759f49 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx @@ -1,6 +1,6 @@ -import { useCallback } from 'react'; -import { useExtensionEvent, useHelpers } from '@remirror/react'; import { DocChangedExtension } from '@remirror/core'; +import { useExtensionEvent, useHelpers } from '@remirror/react'; +import { useCallback } from 'react'; export interface OnChangeMarkdownProps { onChange: (md: string) => void; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx index 08be95192d..2ff36138b9 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { render } from '@testing-library/react'; -import { Editor } from '../Editor'; +import React from 'react'; + +import { Editor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; // setupTests mocks Editor for all tests. We want to use the actual editor for this test module vi.mock('../Editor', async () => vi.importActual('../Editor')); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown.tsx index 45a9e85882..652ca501d1 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown.tsx @@ -1,7 +1,8 @@ +import { ErrorConstant, defaultImport, invariant, isElementDomNode } from '@remirror/core'; import _TurndownService from 'turndown'; import { gfm } from 'turndown-plugin-gfm'; -import { defaultImport, ErrorConstant, invariant, isElementDomNode } from '@remirror/core'; -import { DATAHUB_MENTION_ATTRS } from './mentions/DataHubMentionsExtension'; + +import { DATAHUB_MENTION_ATTRS } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension'; const TurndownService = defaultImport(_TurndownService); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/markdownToHtml.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/markdownToHtml.tsx index 07efa16a98..bfb412c7f9 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/markdownToHtml.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/markdownToHtml.tsx @@ -1,5 +1,6 @@ import { marked } from 'marked'; -import { DATAHUB_MENTION_ATTRS } from './mentions/DataHubMentionsExtension'; + +import { DATAHUB_MENTION_ATTRS } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension'; marked.use({ renderer: { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension.tsx index ed7881b340..c0fd4a16ee 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension.tsx @@ -1,19 +1,17 @@ /* eslint-disable class-methods-use-this */ -import React, { ComponentType } from 'react'; -import type { Plugin } from 'prosemirror-state'; import { ApplySchemaAttributes, CommandFunction, - extension, ExtensionTag, FromToProps, Handler, - isElementDomNode, NodeExtension, NodeExtensionSpec, NodeSpecOverride, - omitExtraAttributes, ProsemirrorAttributes, + extension, + isElementDomNode, + omitExtraAttributes, } from '@remirror/core'; import { NodeViewComponentProps } from '@remirror/react'; import autocomplete, { @@ -21,7 +19,10 @@ import autocomplete, { AutocompleteAction, pluginKey as acPluginKey, } from 'prosemirror-autocomplete'; -import { MentionsNodeView } from './MentionsNodeView'; +import type { Plugin } from 'prosemirror-state'; +import React, { ComponentType } from 'react'; + +import { MentionsNodeView } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView'; export const DATAHUB_MENTION_ATTRS = { urn: 'data-datahub-mention-urn', diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent.tsx index e503dd6010..01d4f754a9 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent.tsx @@ -1,14 +1,16 @@ -import React, { useEffect, useState } from 'react'; -import { useDebounce } from 'react-use'; +import { LoadingOutlined } from '@ant-design/icons'; import { FloatingWrapper } from '@remirror/react'; import { Empty, Spin } from 'antd'; -import styled from 'styled-components'; -import { LoadingOutlined } from '@ant-design/icons'; +import React, { useEffect, useState } from 'react'; +import { useDebounce } from 'react-use'; import { Positioner, selectionPositioner } from 'remirror/extensions'; -import { useGetAutoCompleteMultipleResultsLazyQuery } from '../../../../../../../../../graphql/search.generated'; -import { MentionsDropdown } from './MentionsDropdown'; -import { useDataHubMentions } from './useDataHubMentions'; -import { useUserContext } from '../../../../../../../../context/useUserContext'; +import styled from 'styled-components'; + +import { useUserContext } from '@app/context/useUserContext'; +import { MentionsDropdown } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown'; +import { useDataHubMentions } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions'; + +import { useGetAutoCompleteMultipleResultsLazyQuery } from '@graphql/search.generated'; const Container = styled.div` position: relative; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown.tsx index f4720f5e80..c54cddec83 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown.tsx @@ -1,13 +1,15 @@ -import React, { useCallback, useMemo, useState } from 'react'; -import { Typography } from 'antd'; -import styled from 'styled-components'; -import { useDebounce } from 'react-use'; import { useCommands } from '@remirror/react'; -import { AutoCompleteResultForEntity, Entity, EntityType } from '../../../../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../../../../../constants'; -import { useDataHubMentions } from './useDataHubMentions'; -import AutoCompleteItem from '../../../../../../../../search/autoComplete/AutoCompleteItem'; +import { Typography } from 'antd'; +import React, { useCallback, useMemo, useState } from 'react'; +import { useDebounce } from 'react-use'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { useDataHubMentions } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions'; +import AutoCompleteItem from '@app/search/autoComplete/AutoCompleteItem'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { AutoCompleteResultForEntity, Entity, EntityType } from '@types'; const HeaderItem = styled(Typography.Text)` display: block; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView.tsx index e811cfeb09..98c762d3ab 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView.tsx @@ -1,14 +1,15 @@ -import React from 'react'; -import { Typography } from 'antd'; import { Tooltip } from '@components'; +import { NodeViewComponentProps } from '@remirror/react'; +import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { NodeViewComponentProps } from '@remirror/react'; -import { HoverEntityTooltip } from '../../../../../../../../recommendations/renderer/component/HoverEntityTooltip'; -import { useGetEntityMentionNodeQuery } from '../../../../../../../../../graphql/search.generated'; -import { useEntityRegistry } from '../../../../../../../../useEntityRegistry'; -import { IconStyleType } from '../../../../../../../Entity'; -import { ANTD_GRAY } from '../../../../../../constants'; +import { IconStyleType } from '@app/entityV2/Entity'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetEntityMentionNodeQuery } from '@graphql/search.generated'; const { Text } = Typography; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions.ts index 8a4fd37b5e..066d109657 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions.ts @@ -1,7 +1,8 @@ -import { useCallback, useEffect, useState } from 'react'; import { useRemirrorContext } from '@remirror/react'; import { ActionKind, AutocompleteAction, FromTo } from 'prosemirror-autocomplete'; -import { DataHubMentionsExtension } from './DataHubMentionsExtension'; +import { useCallback, useEffect, useState } from 'react'; + +import { DataHubMentionsExtension } from '@app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension'; type State = { active: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx index 0037677962..332c9134ae 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx @@ -1,8 +1,9 @@ -import React, { useState } from 'react'; -import { Form, Input, Modal, Typography } from 'antd'; import { PictureOutlined } from '@ant-design/icons'; import { useCommands } from '@remirror/react'; -import { CommandButton } from './CommandButton'; +import { Form, Input, Modal, Typography } from 'antd'; +import React, { useState } from 'react'; + +import { CommandButton } from '@app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CommandButton'; export const AddImageButton = () => { const [isModalVisible, setModalVisible] = useState(false); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx index 4693ebbcb5..75dafeab10 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx @@ -1,9 +1,9 @@ -import React, { useState } from 'react'; import { LinkOutlined } from '@ant-design/icons'; import { useActive } from '@remirror/react'; +import React, { useState } from 'react'; -import { CommandButton } from './CommandButton'; -import { LinkModal } from './LinkModal'; +import { CommandButton } from '@app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CommandButton'; +import { LinkModal } from '@app/entityV2/shared/tabs/Documentation/components/editor/toolbar/LinkModal'; export const AddLinkButton = () => { const [isModalVisible, setModalVisible] = useState(false); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx index 1aa7b0e514..c060f738ef 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx @@ -1,11 +1,12 @@ -import React from 'react'; -import styled from 'styled-components'; -import { Select } from 'antd'; import { findParentNodeOfType, isElementDomNode } from '@remirror/core'; -import { defaultAbsolutePosition, hasStateChanged, isPositionVisible, Positioner } from 'remirror/extensions'; import { FloatingWrapper, useAttrs, useCommands } from '@remirror/react'; +import { Select } from 'antd'; +import React from 'react'; import { listLanguages } from 'refractor'; -import { ToolbarContainer } from './FloatingToolbar'; +import { Positioner, defaultAbsolutePosition, hasStateChanged, isPositionVisible } from 'remirror/extensions'; +import styled from 'styled-components'; + +import { ToolbarContainer } from '@app/entityV2/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar'; const StyledSelect = styled(Select)` min-width: 120px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx index caa382327a..3a1f78ca4e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx @@ -1,8 +1,8 @@ -import React, { MouseEventHandler, useCallback } from 'react'; -import { Button, ButtonProps } from 'antd'; import { Tooltip } from '@components'; import { capitalCase } from '@remirror/core'; import { useHelpers } from '@remirror/react'; +import { Button, ButtonProps } from 'antd'; +import React, { MouseEventHandler, useCallback } from 'react'; export interface CommandButtonProps extends Omit { active?: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx index 24e87853b5..7f38332ee5 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx @@ -1,6 +1,3 @@ -import React, { useMemo, useState } from 'react'; -import styled from 'styled-components'; -import { Typography } from 'antd'; import { BoldOutlined, DisconnectOutlined, @@ -10,12 +7,15 @@ import { UnderlineOutlined, } from '@ant-design/icons'; import { FloatingWrapper, useActive, useAttrs, useCommands } from '@remirror/react'; +import { Typography } from 'antd'; +import React, { useMemo, useState } from 'react'; import { createMarkPositioner } from 'remirror/extensions'; +import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../../constants'; -import { CommandButton } from './CommandButton'; -import { LinkModal } from './LinkModal'; -import { CodeIcon } from './Icons'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { CommandButton } from '@app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CommandButton'; +import { CodeIcon } from '@app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Icons'; +import { LinkModal } from '@app/entityV2/shared/tabs/Documentation/components/editor/toolbar/LinkModal'; const { Text } = Typography; @@ -25,7 +25,10 @@ export const ToolbarContainer = styled.span` padding: 2px; background-color: ${ANTD_GRAY[1]}; border-radius: 4px; - box-shadow: 0 3px 6px -4px #0000001f, 0 6px 16px #00000014, 0 9px 28px 8px #0000000d; + box-shadow: + 0 3px 6px -4px #0000001f, + 0 6px 16px #00000014, + 0 9px 28px 8px #0000000d; overflow: hidden; z-index: 300; `; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/HeadingMenu.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/HeadingMenu.tsx index 0c24aadfd1..e62668ed64 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/HeadingMenu.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/HeadingMenu.tsx @@ -1,7 +1,7 @@ -import React, { MouseEventHandler, useCallback } from 'react'; -import { Select } from 'antd'; -import styled from 'styled-components'; import { useActive, useCommands } from '@remirror/react'; +import { Select } from 'antd'; +import React, { MouseEventHandler, useCallback } from 'react'; +import styled from 'styled-components'; const { Option } = Select; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Icons.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Icons.tsx index b7954fd7b6..2f967abaf9 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Icons.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Icons.tsx @@ -1,6 +1,6 @@ -import React from 'react'; import Icon from '@ant-design/icons'; import { CustomIconComponentProps } from '@ant-design/icons/lib/components/Icon'; +import React from 'react'; export const CodeIcon = (props: Partial) => ( { const entity = useBaseEntity() as any; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/ColumnTabNameHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/ColumnTabNameHeader.tsx index 52c477c76b..c59dd16bae 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/ColumnTabNameHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/ColumnTabNameHeader.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { useGetEntityWithSchema } from '../Dataset/Schema/useGetEntitySchema'; -import TabNameWithCount from './TabNameWithCount'; + +import { useGetEntityWithSchema } from '@app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema'; +import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount'; const ColumnTabNameHeader = () => { const { entityWithSchema, loading } = useGetEntityWithSchema(); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardChartsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardChartsTab.tsx index 6b34602e0a..6dc072b291 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardChartsTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardChartsTab.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import { useBaseEntity } from '../../../../entity/shared/EntityContext'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from './components/EntityList'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { EntityList } from '@app/entityV2/shared/tabs/Entity/components/EntityList'; + +import { EntityType } from '@types'; export const DashboardChartsTab = () => { const entity = useBaseEntity() as any; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardDatasetsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardDatasetsTab.tsx index 9880f235ed..1f6529e836 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardDatasetsTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardDatasetsTab.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { useBaseEntity } from '../../../../entity/shared/EntityContext'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from './components/EntityList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { EntityList } from '@app/entityV2/shared/tabs/Entity/components/EntityList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; export const DashboardDatasetsTab = () => { const entity = useBaseEntity() as any; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataFlowJobsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataFlowJobsTab.tsx index cccf8e1449..7c79f87661 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataFlowJobsTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataFlowJobsTab.tsx @@ -1,9 +1,11 @@ import React, { useState } from 'react'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from './components/EntityList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { useGetDataFlowChildJobsQuery } from '../../../../../graphql/dataFlow.generated'; -import { SearchCfg } from '../../../../../conf'; + +import { EntityList } from '@app/entityV2/shared/tabs/Entity/components/EntityList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { SearchCfg } from '@src/conf'; + +import { useGetDataFlowChildJobsQuery } from '@graphql/dataFlow.generated'; +import { EntityType } from '@types'; interface Props { properties?: { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataJobFlowTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataJobFlowTab.tsx index 8169dd869a..9131a6a545 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataJobFlowTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataJobFlowTab.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { useBaseEntity } from '../../../../entity/shared/EntityContext'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from './components/EntityList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { EntityList } from '@app/entityV2/shared/tabs/Entity/components/EntityList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; export const DataJobFlowTab = () => { const entity = useBaseEntity() as any; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/InputFieldsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/InputFieldsTab.tsx index a90326b334..7ecde7a4cb 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/InputFieldsTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/InputFieldsTab.tsx @@ -1,14 +1,16 @@ import { Empty } from 'antd'; import React, { useMemo, useState } from 'react'; -import styled from 'styled-components'; import { useLocation } from 'react-router'; -import { SchemaField } from '../../../../../types.generated'; -import SchemaEditableContext from '../../../../shared/SchemaEditableContext'; -import { groupByFieldPath } from '../../../dataset/profile/schema/utils/utils'; -import { useEntityData } from '../../../../entity/shared/EntityContext'; -import { ANTD_GRAY } from '../../constants'; -import SchemaTable from '../Dataset/Schema/SchemaTable'; -import getExpandedDrawerFieldPath from '../Dataset/Schema/utils/getExpandedDrawerFieldPath'; +import styled from 'styled-components'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { groupByFieldPath } from '@app/entityV2/dataset/profile/schema/utils/utils'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import SchemaTable from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaTable'; +import getExpandedDrawerFieldPath from '@app/entityV2/shared/tabs/Dataset/Schema/utils/getExpandedDrawerFieldPath'; +import SchemaEditableContext from '@app/shared/SchemaEditableContext'; + +import { SchemaField } from '@types'; const NoSchema = styled(Empty)` color: ${ANTD_GRAY[6]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/TabNameWithCount.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/TabNameWithCount.tsx index 1476d90000..e54b0bbb63 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/TabNameWithCount.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/TabNameWithCount.tsx @@ -1,8 +1,9 @@ -import { Pill } from '@src/alchemy-components'; -import { formatNumber } from '@src/app/shared/formatNumber'; import React from 'react'; import styled from 'styled-components'; +import { Pill } from '@src/alchemy-components'; +import { formatNumber } from '@src/app/shared/formatNumber'; + const Container = styled.div` display: flex; align-items: center; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx index 8cf54b51fd..85c1131b99 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx @@ -1,12 +1,14 @@ import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import React from 'react'; -import { dataJob1, mocks } from '../../../../../../Mocks'; -import { EntityType } from '../../../../../../types.generated'; -import TestPageContainer from '../../../../../../utils/test-utils/TestPageContainer'; -import { getDataForEntityType } from '../../../containers/profile/utils'; -import { EntityContext } from '../../../../../entity/shared/EntityContext'; -import { DataJobFlowTab } from '../DataJobFlowTab'; + +import { EntityContext } from '@app/entity/shared/EntityContext'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import { DataJobFlowTab } from '@app/entityV2/shared/tabs/Entity/DataJobFlowTab'; +import { dataJob1, mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { EntityType } from '@types'; describe('DataJobFlowTab', () => { it('renders fields', async () => { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/components/EntityList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/components/EntityList.tsx index 9e07e928be..f5ced2ef2e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/components/EntityList.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/components/EntityList.tsx @@ -1,11 +1,13 @@ -import React from 'react'; import { List, Pagination, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { PreviewType } from '../../../../Entity'; -import { EntityType } from '../../../../../../types.generated'; -import { SearchCfg } from '../../../../../../conf'; -import { Message } from '../../../../../shared/Message'; + +import { PreviewType } from '@app/entityV2/Entity'; +import { Message } from '@app/shared/Message'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { SearchCfg } from '@src/conf'; + +import { EntityType } from '@types'; const ScrollWrapper = styled.div` overflow: auto; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx index aea879d723..9c2332a6e6 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx @@ -1,10 +1,10 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { StyledTable } from '../../../components/styled/StyledTable'; -import { ANTD_GRAY } from '../../../constants'; -import TableValueElement from './TableValueElement'; +import { StyledTable } from '@app/entityV2/shared/components/styled/StyledTable'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import TableValueElement from '@app/entityV2/shared/tabs/Entity/weaklyTypedAspects/TableValueElement'; type Props = { payload: string | undefined | null; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx index 4af9b559a5..0583a8036a 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx @@ -1,12 +1,13 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; -import DynamicTabularTab from './DynamicTabularTab'; -import DynamicPropertiesTab from './DynamicPropertiesTab'; -import { AspectRenderSpec } from '../../../../../../types.generated'; -import { StyledSyntaxHighlighter } from '../../../StyledSyntaxHighlighter'; +import { StyledSyntaxHighlighter } from '@app/entityV2/shared/StyledSyntaxHighlighter'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import DynamicPropertiesTab from '@app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab'; +import DynamicTabularTab from '@app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab'; + +import { AspectRenderSpec } from '@types'; type Props = { payload: string | undefined | null; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx index ea30dcc0b4..9d86754124 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { StyledTable } from '../../../components/styled/StyledTable'; -import TableValueElement from './TableValueElement'; + +import { StyledTable } from '@app/entityV2/shared/components/styled/StyledTable'; +import TableValueElement from '@app/entityV2/shared/tabs/Entity/weaklyTypedAspects/TableValueElement'; type Props = { payload: string | undefined | null; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivityAvatar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivityAvatar.tsx index d85ee9c12c..d32c664360 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivityAvatar.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivityAvatar.tsx @@ -1,10 +1,11 @@ import React from 'react'; import { Link } from 'react-router-dom'; + +import useGetUserName from '@app/entityV2/shared/tabs/Incident/hooks'; import { Avatar } from '@src/alchemy-components'; -import { CorpUser } from '@src/types.generated'; import { HoverEntityTooltip } from '@src/app/recommendations/renderer/component/HoverEntityTooltip'; import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; -import useGetUserName from '../hooks'; +import { CorpUser } from '@src/types.generated'; type TimelineDotProps = { user?: CorpUser; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivityContent.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivityContent.tsx index d6bbece429..533a3d7651 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivityContent.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivityContent.tsx @@ -1,11 +1,16 @@ import React from 'react'; import { Link } from 'react-router-dom'; -import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; -import { colors, Text } from '@src/alchemy-components'; + +import { + ActivityStatusText, + Content, + ContentRow, +} from '@app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents'; +import useGetUserName from '@app/entityV2/shared/tabs/Incident/hooks'; +import { TimelineContentDetails } from '@app/entityV2/shared/tabs/Incident/types'; +import { Text, colors } from '@src/alchemy-components'; import { getTimeFromNow } from '@src/app/shared/time/timeUtils'; -import { ActivityStatusText, Content, ContentRow } from './styledComponents'; -import { TimelineContentDetails } from '../types'; -import useGetUserName from '../hooks'; +import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; type TimelineContentProps = { incidentActivities: TimelineContentDetails; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivitySection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivitySection.tsx index 8680e02e5d..b8b2592ca2 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivitySection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivitySection.tsx @@ -1,11 +1,15 @@ import React from 'react'; -import { Timeline } from '@src/alchemy-components'; -import IncidentActivityContent from './IncidentActivityContent'; -import { ActivityLabelSection, ActivitySection, TimelineWrapper } from './styledComponents'; -import { TimelineContentDetails } from '../types'; -import IncidentActivityAvatar from './IncidentActivityAvatar'; -import TimelineSkeleton from '../../../TimelineSkeleton'; +import TimelineSkeleton from '@app/entityV2/shared/TimelineSkeleton'; +import IncidentActivityAvatar from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivityAvatar'; +import IncidentActivityContent from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivityContent'; +import { + ActivityLabelSection, + ActivitySection, + TimelineWrapper, +} from '@app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents'; +import { TimelineContentDetails } from '@app/entityV2/shared/tabs/Incident/types'; +import { Timeline } from '@src/alchemy-components'; type IncidentActivitySectionProps = { loading: boolean; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentAssigneeSelector.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentAssigneeSelector.tsx index c5f8aea38d..16a81b1ee0 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentAssigneeSelector.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentAssigneeSelector.tsx @@ -1,16 +1,17 @@ -import React, { useEffect, useMemo, useState } from 'react'; import { LoadingOutlined } from '@ant-design/icons'; -import { Entity, EntityType } from '@src/types.generated'; import _ from 'lodash'; +import React, { useEffect, useMemo, useState } from 'react'; + +import { LoadingWrapper } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents'; +import { IncidentTableRow } from '@app/entityV2/shared/tabs/Incident/types'; +import { getAssigneeWithURN } from '@app/entityV2/shared/tabs/Incident/utils'; import { Avatar, SimpleSelect } from '@src/alchemy-components'; import { NestedSelectOption } from '@src/alchemy-components/components/Select/Nested/types'; import { useGetRecommendations } from '@src/app/shared/recommendation'; -import { useGetAutoCompleteResultsLazyQuery } from '@src/graphql/search.generated'; -import { useGetEntitiesLazyQuery } from '@src/graphql/entity.generated'; import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; -import { getAssigneeWithURN } from '../utils'; -import { LoadingWrapper } from './styledComponents'; -import { IncidentTableRow } from '../types'; +import { useGetEntitiesLazyQuery } from '@src/graphql/entity.generated'; +import { useGetAutoCompleteResultsLazyQuery } from '@src/graphql/search.generated'; +import { Entity, EntityType } from '@src/types.generated'; interface AssigneeSelectorProps { data?: IncidentTableRow; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDetailDrawer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDetailDrawer.tsx index 38e9587b9d..e9ec609001 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDetailDrawer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDetailDrawer.tsx @@ -1,13 +1,13 @@ +import { Drawer, Modal } from 'antd'; import React, { useState } from 'react'; -import { Drawer, Modal } from 'antd'; +import { IncidentDrawerHeader } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDrawerHeader'; +import { IncidentEditor } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentEditor'; +import { IncidentView } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentView'; +import { IncidentAction } from '@app/entityV2/shared/tabs/Incident/constant'; +import { EntityStagedForIncident, IncidentTableRow } from '@app/entityV2/shared/tabs/Incident/types'; import ClickOutside from '@src/app/shared/ClickOutside'; import { EntityPrivileges, Incident } from '@src/types.generated'; -import { IncidentDrawerHeader } from './IncidentDrawerHeader'; -import { IncidentView } from './IncidentView'; -import { IncidentEditor } from './IncidentEditor'; -import { EntityStagedForIncident, IncidentTableRow } from '../types'; -import { IncidentAction } from '../constant'; const modalBodyStyle = { padding: 0, fontFamily: 'Mulish, sans-serif' }; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDrawerHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDrawerHeader.tsx index 1bbb3d324e..6003bf6e5c 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDrawerHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDrawerHeader.tsx @@ -1,19 +1,20 @@ import React from 'react'; -import { Button } from '@src/alchemy-components'; -import { Tooltip2 } from '@src/alchemy-components/components/Tooltip2'; -import PlatformIcon from '@src/app/sharedV2/icons/PlatformIcon'; -import { capitalizeFirstLetter } from '@src/app/shared/textUtil'; -import { DataPlatform, EntityPrivileges } from '@src/types.generated'; -import { useIncidentURNCopyLink } from '../hooks'; -import { IncidentAction, noPermissionsMessage } from '../constant'; -import { IncidentTableRow } from '../types'; + import { ForPlatformWrapper, StyledHeader, StyledHeaderActions, StyledHeaderTitleContainer, StyledTitle, -} from './styledComponents'; +} from '@app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents'; +import { IncidentAction, noPermissionsMessage } from '@app/entityV2/shared/tabs/Incident/constant'; +import { useIncidentURNCopyLink } from '@app/entityV2/shared/tabs/Incident/hooks'; +import { IncidentTableRow } from '@app/entityV2/shared/tabs/Incident/types'; +import { Button } from '@src/alchemy-components'; +import { Tooltip2 } from '@src/alchemy-components/components/Tooltip2'; +import { capitalizeFirstLetter } from '@src/app/shared/textUtil'; +import PlatformIcon from '@src/app/sharedV2/icons/PlatformIcon'; +import { DataPlatform, EntityPrivileges } from '@src/types.generated'; type IncidentDrawerHeaderProps = { mode: IncidentAction; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentEditor.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentEditor.tsx index c9849ff29a..98780eb8a5 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentEditor.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentEditor.tsx @@ -1,12 +1,20 @@ -import React, { useEffect, useState, useRef } from 'react'; -import { IncidentStage, IncidentState, IncidentType } from '@src/types.generated'; -import { Input } from '@src/alchemy-components'; -import colors from '@src/alchemy-components/theme/foundations/colors'; -import { Editor } from '@src/alchemy-components/components/Editor/Editor'; -import { useUserContext } from '@src/app/context/useUserContext'; import { Form } from 'antd'; +import React, { useEffect, useRef, useState } from 'react'; import styled from 'styled-components'; +import { IncidentAssigneeSelector } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentAssigneeSelector'; +import { IncidentLinkedAssetsList } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentLinkedAssetsList'; +import { IncidentSelectField } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentSelectedField'; +import { useIncidentHandler } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/hooks/useIncidentHandler'; +import { + IncidentFooter, + InputFormItem, + SaveButton, + SelectFormItem, + StyledForm, + StyledFormElements, + StyledSpinner, +} from '@app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents'; import { INCIDENT_CATEGORIES, INCIDENT_OPTION_LABEL_MAPPING, @@ -14,22 +22,14 @@ import { INCIDENT_STAGES, INCIDENT_STATES, IncidentAction, -} from '../constant'; -import { getAssigneeWithURN, getLinkedAssetsData, validateForm } from '../utils'; -import { - IncidentFooter, - SelectFormItem, - SaveButton, - StyledForm, - StyledFormElements, - InputFormItem, - StyledSpinner, -} from './styledComponents'; -import { IncidentEditorProps } from '../types'; -import { IncidentLinkedAssetsList } from './IncidentLinkedAssetsList'; -import { IncidentSelectField } from './IncidentSelectedField'; -import { IncidentAssigneeSelector } from './IncidentAssigneeSelector'; -import { useIncidentHandler } from './hooks/useIncidentHandler'; +} from '@app/entityV2/shared/tabs/Incident/constant'; +import { IncidentEditorProps } from '@app/entityV2/shared/tabs/Incident/types'; +import { getAssigneeWithURN, getLinkedAssetsData, validateForm } from '@app/entityV2/shared/tabs/Incident/utils'; +import { Input } from '@src/alchemy-components'; +import { Editor } from '@src/alchemy-components/components/Editor/Editor'; +import colors from '@src/alchemy-components/theme/foundations/colors'; +import { useUserContext } from '@src/app/context/useUserContext'; +import { IncidentStage, IncidentState, IncidentType } from '@src/types.generated'; const HalfWidthInput = styled(Input)` width: 50%; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentLinkedAssetsList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentLinkedAssetsList.tsx index 4f2c8bd7d4..8a12f8bf05 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentLinkedAssetsList.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentLinkedAssetsList.tsx @@ -1,16 +1,21 @@ -import React, { useEffect, useState } from 'react'; import { LoadingOutlined } from '@ant-design/icons'; -import { Button, Pill } from '@src/alchemy-components'; import { Plus } from 'phosphor-react'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { useGetEntitiesLazyQuery } from '@src/graphql/entity.generated'; + +import { SearchSelectModal } from '@app/entityV2/shared/components/styled/search/SearchSelectModal'; +import { + AssetWrapper, + LinkedAssets, + LoadingWrapper, +} from '@app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents'; +import { IncidentAction } from '@app/entityV2/shared/tabs/Incident/constant'; +import { LinkedAssetsContainer } from '@app/entityV2/shared/tabs/Incident/styledComponents'; +import { IncidentLinkedAssetsListProps } from '@app/entityV2/shared/tabs/Incident/types'; +import { Button, Pill } from '@src/alchemy-components'; import { EntityCapabilityType } from '@src/app/entityV2/Entity'; import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; -import { IncidentLinkedAssetsListProps } from '../types'; -import { AssetWrapper, LinkedAssets, LoadingWrapper } from './styledComponents'; -import { LinkedAssetsContainer } from '../styledComponents'; -import { SearchSelectModal } from '../../../components/styled/search/SearchSelectModal'; -import { IncidentAction } from '../constant'; +import { useGetEntitiesLazyQuery } from '@src/graphql/entity.generated'; const RESOURCE_URN_FIELD_NAME = 'resourceUrns'; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentSelectedField.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentSelectedField.tsx index f8d0f82fa2..a6d75a5e71 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentSelectedField.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentSelectedField.tsx @@ -1,18 +1,18 @@ +import { Check, Warning } from '@phosphor-icons/react'; +import { FormInstance } from 'antd/es/form/Form'; import React from 'react'; -import { NestedSelectOption } from '@src/alchemy-components/components/Select/Nested/types'; + +import { SelectFormItem, SelectWrapper } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents'; +import { INCIDENT_OPTION_LABEL_MAPPING } from '@app/entityV2/shared/tabs/Incident/constant'; +import { IncidentConstant } from '@app/entityV2/shared/tabs/Incident/types'; +import { SimpleSelect, colors } from '@src/alchemy-components'; +import { IconLabel } from '@src/alchemy-components/components/IconLabel'; +import { IconType } from '@src/alchemy-components/components/IconLabel/types'; import { IncidentPriorityLabel } from '@src/alchemy-components/components/IncidentPriorityLabel'; import { IncidentStagePill } from '@src/alchemy-components/components/IncidentStagePill'; -import { colors, SimpleSelect } from '@src/alchemy-components'; -import { IncidentState } from '@src/types.generated'; -import { Check, Warning } from '@phosphor-icons/react'; -import { IconLabel } from '@src/alchemy-components/components/IconLabel'; import { getCapitalizeWord } from '@src/alchemy-components/components/IncidentStagePill/utils'; -import { IconType } from '@src/alchemy-components/components/IconLabel/types'; -import { FormInstance } from 'antd/es/form/Form'; - -import { INCIDENT_OPTION_LABEL_MAPPING } from '../constant'; -import { SelectFormItem, SelectWrapper } from './styledComponents'; -import { IncidentConstant } from '../types'; +import { NestedSelectOption } from '@src/alchemy-components/components/Select/Nested/types'; +import { IncidentState } from '@src/types.generated'; const IncidentStates = { [IncidentState.Active]: { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentView.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentView.tsx index 988b6aeb5b..fdd91fbc75 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentView.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentView.tsx @@ -1,26 +1,15 @@ +import { Check, Warning } from '@phosphor-icons/react'; import React, { useEffect, useState } from 'react'; import { useHistory } from 'react-router'; import styled from 'styled-components'; -import { IncidentStagePill } from '@src/alchemy-components/components/IncidentStagePill'; -import { getCapitalizeWord } from '@src/alchemy-components/components/IncidentStagePill/utils'; -import { EntityLinkList } from '@src/app/homeV2/reference/sections/EntityLinkList'; -import { IncidentPriorityLabel } from '@src/alchemy-components/components/IncidentPriorityLabel'; -import { Avatar } from '@src/alchemy-components'; + +import { getPlainTextDescriptionFromAssertion } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils'; +import CompactMarkdownViewer from '@app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer'; +import { IncidentActivitySection } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentActivitySection'; import { - Assertion, - AssertionInfo, - CorpUser, - EntityType, - IncidentSourceType, - IncidentState, - IncidentType, -} from '@src/types.generated'; -import { Check, Warning } from '@phosphor-icons/react'; -import { IconLabel } from '@src/alchemy-components/components/IconLabel'; -import { IconType } from '@src/alchemy-components/components/IconLabel/types'; -import colors from '@src/alchemy-components/theme/foundations/colors'; -import { useGetEntitiesLazyQuery } from '@src/graphql/entity.generated'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; + DEFAULT_MAX_ENTITIES_TO_SHOW, + INCIDENT_STATE_TO_ACTIVITY, +} from '@app/entityV2/shared/tabs/Incident/AcrylComponents/constant'; import { CategoryText, Container, @@ -32,14 +21,29 @@ import { ListContainer, ListItemContainer, Text, -} from './styledComponents'; -import CompactMarkdownViewer from '../../Documentation/components/CompactMarkdownViewer'; -import { getAssigneeNamesWithAvatarUrl } from '../utils'; -import { IncidentTableRow } from '../types'; -import { getPlainTextDescriptionFromAssertion } from '../../Dataset/Validations/assertion/profile/summary/utils'; -import { INCIDENT_STATE_TO_ACTIVITY, DEFAULT_MAX_ENTITIES_TO_SHOW } from './constant'; -import { IncidentActivitySection } from './IncidentActivitySection'; -import { getOnOpenAssertionLink } from '../hooks'; +} from '@app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents'; +import { getOnOpenAssertionLink } from '@app/entityV2/shared/tabs/Incident/hooks'; +import { IncidentTableRow } from '@app/entityV2/shared/tabs/Incident/types'; +import { getAssigneeNamesWithAvatarUrl } from '@app/entityV2/shared/tabs/Incident/utils'; +import { Avatar } from '@src/alchemy-components'; +import { IconLabel } from '@src/alchemy-components/components/IconLabel'; +import { IconType } from '@src/alchemy-components/components/IconLabel/types'; +import { IncidentPriorityLabel } from '@src/alchemy-components/components/IncidentPriorityLabel'; +import { IncidentStagePill } from '@src/alchemy-components/components/IncidentStagePill'; +import { getCapitalizeWord } from '@src/alchemy-components/components/IncidentStagePill/utils'; +import colors from '@src/alchemy-components/theme/foundations/colors'; +import { EntityLinkList } from '@src/app/homeV2/reference/sections/EntityLinkList'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { useGetEntitiesLazyQuery } from '@src/graphql/entity.generated'; +import { + Assertion, + AssertionInfo, + CorpUser, + EntityType, + IncidentSourceType, + IncidentState, + IncidentType, +} from '@src/types.generated'; const ThinDivider = styled(Divider)` margin: 12px 0px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/hooks/useIncidentHandler.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/hooks/useIncidentHandler.ts index 1d89fdd62d..1c4122a2c2 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/hooks/useIncidentHandler.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/hooks/useIncidentHandler.ts @@ -1,13 +1,14 @@ +import { useApolloClient } from '@apollo/client'; +import { Form, message } from 'antd'; +import _ from 'lodash'; import { useState } from 'react'; + +import { IncidentAction } from '@app/entityV2/shared/tabs/Incident/constant'; +import { PAGE_SIZE, updateActiveIncidentInCache } from '@app/entityV2/shared/tabs/Incident/incidentUtils'; +import analytics, { EntityActionType, EventType } from '@src/app/analytics'; +import handleGraphQLError from '@src/app/shared/handleGraphQLError'; import { useRaiseIncidentMutation, useUpdateIncidentMutation } from '@src/graphql/mutations.generated'; import { EntityType, IncidentSourceType, IncidentState } from '@src/types.generated'; -import analytics, { EntityActionType, EventType } from '@src/app/analytics'; -import _ from 'lodash'; -import { Form, message } from 'antd'; -import { useApolloClient } from '@apollo/client'; -import handleGraphQLError from '@src/app/shared/handleGraphQLError'; -import { IncidentAction } from '../../constant'; -import { PAGE_SIZE, updateActiveIncidentInCache } from '../../incidentUtils'; export const getCacheIncident = ({ values, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents.tsx index f5c173a053..cfe3392e22 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents.tsx @@ -1,7 +1,8 @@ import { Form, Table } from 'antd'; import styled, { keyframes } from 'styled-components'; -import { ANTD_GRAY, REDESIGN_COLORS } from '@src/app/entityV2/shared/constants'; + import { Button, colors } from '@src/alchemy-components'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@src/app/entityV2/shared/constants'; export const IncidentListStyledTable = styled(Table)` max-width: none; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/CreateIncidentButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/CreateIncidentButton.tsx index 717e83305f..cd228d8027 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/CreateIncidentButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/CreateIncidentButton.tsx @@ -1,15 +1,14 @@ -import React from 'react'; -import { Dropdown, message } from 'antd'; - -import { Tooltip } from '@src/alchemy-components'; import { PlusOutlined } from '@ant-design/icons'; -import { useIsSeparateSiblingsMode } from '@src/app/entity/shared/siblingUtils'; -import { useEntityData } from '@src/app/entity/shared/EntityContext'; -import PlatformIcon from '@src/app/sharedV2/icons/PlatformIcon'; +import { Dropdown, message } from 'antd'; +import React from 'react'; -import { useSiblingOptionsForIncidentBuilder } from './utils'; -import { CreateIncidentButtonProps, EntityStagedForIncident } from './types'; -import { CreateButton, SiblingSelectionDropdownLink } from './styledComponents'; +import { CreateButton, SiblingSelectionDropdownLink } from '@app/entityV2/shared/tabs/Incident/styledComponents'; +import { CreateIncidentButtonProps, EntityStagedForIncident } from '@app/entityV2/shared/tabs/Incident/types'; +import { useSiblingOptionsForIncidentBuilder } from '@app/entityV2/shared/tabs/Incident/utils'; +import { Tooltip } from '@src/alchemy-components'; +import { useEntityData } from '@src/app/entity/shared/EntityContext'; +import { useIsSeparateSiblingsMode } from '@src/app/entity/shared/siblingUtils'; +import PlatformIcon from '@src/app/sharedV2/icons/PlatformIcon'; export const CreateIncidentButton = ({ privileges, setShowIncidentBuilder, setEntity }: CreateIncidentButtonProps) => { const { entityData, urn: entityUrn, entityType: dataEntityType } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentAssigneeAvatarStack.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentAssigneeAvatarStack.tsx index 80afede054..870e4e68aa 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentAssigneeAvatarStack.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentAssigneeAvatarStack.tsx @@ -1,7 +1,8 @@ import React from 'react'; + +import { MAX_VISIBLE_ASSIGNEE } from '@app/entityV2/shared/tabs/Incident/constant'; +import { AssigneeAvatarStackContainer } from '@app/entityV2/shared/tabs/Incident/styledComponents'; import { AvatarStack } from '@src/alchemy-components/components/AvatarStack/AvatarStack'; -import { MAX_VISIBLE_ASSIGNEE } from './constant'; -import { AssigneeAvatarStackContainer } from './styledComponents'; export const IncidentAssigneeAvatarStack = ({ assignees }: { assignees: any[] }) => { return ( diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentFilterContainer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentFilterContainer.tsx index dec815a34b..8deeb917a7 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentFilterContainer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentFilterContainer.tsx @@ -1,10 +1,18 @@ import React, { useMemo } from 'react'; -import { IncidentTable } from './types'; -import { INCIDENT_DEFAULT_FILTERS, INCIDENT_GROUP_BY_FILTER_OPTIONS } from './constant'; -import { FiltersContainer, SearchFilterContainer, StyledFilterContainer } from './styledComponents'; -import { GroupBySelect } from '../../GroupBySelect'; -import { InlineListSearch } from '../../components/search/InlineListSearch'; -import { FilterSelect } from '../../FilterSelect'; + +import { FilterSelect } from '@app/entityV2/shared/FilterSelect'; +import { GroupBySelect } from '@app/entityV2/shared/GroupBySelect'; +import { InlineListSearch } from '@app/entityV2/shared/components/search/InlineListSearch'; +import { + INCIDENT_DEFAULT_FILTERS, + INCIDENT_GROUP_BY_FILTER_OPTIONS, +} from '@app/entityV2/shared/tabs/Incident/constant'; +import { + FiltersContainer, + SearchFilterContainer, + StyledFilterContainer, +} from '@app/entityV2/shared/tabs/Incident/styledComponents'; +import { IncidentTable } from '@app/entityV2/shared/tabs/Incident/types'; interface FilterItem { name: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentList.tsx index 971c407461..f13cd81681 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentList.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentList.tsx @@ -1,21 +1,22 @@ -import React, { useEffect, useState } from 'react'; import { Empty } from 'antd'; +import React, { useEffect, useState } from 'react'; -import { useGetEntityIncidentsQuery } from '../../../../../graphql/incident.generated'; -import { useEntityData, useRefetch } from '../../../../entity/shared/EntityContext'; -import { PAGE_SIZE } from './incidentUtils'; -import { EntityPrivileges, Incident } from '../../../../../types.generated'; -import { combineEntityDataWithSiblings } from '../../../../entity/shared/siblingUtils'; -import { useIsSeparateSiblingsMode } from '../../useIsSeparateSiblingsMode'; -import { IncidentTitleContainer } from './IncidentTitleContainer'; -import { EntityStagedForIncident, IncidentListFilter, IncidentTable } from './types'; -import { INCIDENT_DEFAULT_FILTERS, IncidentAction } from './constant'; -import { IncidentFilterContainer } from './IncidentFilterContainer'; -import { IncidentListTable } from './IncidentListTable'; -import { getFilteredTransformedIncidentData } from './utils'; -import { IncidentDetailDrawer } from './AcrylComponents/IncidentDetailDrawer'; -import { IncidentListLoading } from './IncidentListLoading'; -import { getQueryParams } from '../Dataset/Validations/assertionUtils'; +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import { combineEntityDataWithSiblings } from '@app/entity/shared/siblingUtils'; +import { getQueryParams } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; +import { IncidentDetailDrawer } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDetailDrawer'; +import { IncidentFilterContainer } from '@app/entityV2/shared/tabs/Incident/IncidentFilterContainer'; +import { IncidentListLoading } from '@app/entityV2/shared/tabs/Incident/IncidentListLoading'; +import { IncidentListTable } from '@app/entityV2/shared/tabs/Incident/IncidentListTable'; +import { IncidentTitleContainer } from '@app/entityV2/shared/tabs/Incident/IncidentTitleContainer'; +import { INCIDENT_DEFAULT_FILTERS, IncidentAction } from '@app/entityV2/shared/tabs/Incident/constant'; +import { PAGE_SIZE } from '@app/entityV2/shared/tabs/Incident/incidentUtils'; +import { EntityStagedForIncident, IncidentListFilter, IncidentTable } from '@app/entityV2/shared/tabs/Incident/types'; +import { getFilteredTransformedIncidentData } from '@app/entityV2/shared/tabs/Incident/utils'; +import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode'; + +import { useGetEntityIncidentsQuery } from '@graphql/incident.generated'; +import { EntityPrivileges, Incident } from '@types'; export const IncidentList = () => { const { urn } = useEntityData(); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentListLoading.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentListLoading.tsx index 626f30fafd..07caf2bc4c 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentListLoading.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentListLoading.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { TableLoadingSkeleton } from '../../TableLoadingSkeleton'; +import { TableLoadingSkeleton } from '@app/entityV2/shared/TableLoadingSkeleton'; export const IncidentListLoading = () => { return ; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentListTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentListTable.tsx index 7fa7b66731..e59bb349ec 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentListTable.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentListTable.tsx @@ -1,16 +1,17 @@ import React, { useEffect, useState } from 'react'; -import { useEntityData } from '@src/app/entity/shared/EntityContext'; + +import { useGetExpandedTableGroupsFromEntityUrnInUrl } from '@app/entityV2/shared/hooks'; +import { getSiblingWithUrn } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils'; +import { IncidentDetailDrawer } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDetailDrawer'; +import { IncidentAction } from '@app/entityV2/shared/tabs/Incident/constant'; +import { useIncidentsTableColumns, useOpenIncidentDetailModal } from '@app/entityV2/shared/tabs/Incident/hooks'; +import { StyledTableContainer } from '@app/entityV2/shared/tabs/Incident/styledComponents'; +import { IncidentListFilter, IncidentTable } from '@app/entityV2/shared/tabs/Incident/types'; +import { getSortedIncidents } from '@app/entityV2/shared/tabs/Incident/utils'; import { Table } from '@src/alchemy-components'; import { SortingState } from '@src/alchemy-components/components/Table/types'; +import { useEntityData } from '@src/app/entity/shared/EntityContext'; import { EntityPrivileges } from '@src/types.generated'; -import { IncidentDetailDrawer } from './AcrylComponents/IncidentDetailDrawer'; -import { IncidentListFilter, IncidentTable } from './types'; -import { useIncidentsTableColumns, useOpenIncidentDetailModal } from './hooks'; -import { getSiblingWithUrn } from '../Dataset/Validations/acrylUtils'; -import { StyledTableContainer } from './styledComponents'; -import { IncidentAction } from './constant'; -import { getSortedIncidents } from './utils'; -import { useGetExpandedTableGroupsFromEntityUrnInUrl } from '../../hooks'; type Props = { incidentData: IncidentTable; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentResolutionPopup.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentResolutionPopup.tsx index 222eddf6b5..a32d0a22c7 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentResolutionPopup.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentResolutionPopup.tsx @@ -1,21 +1,21 @@ -import React from 'react'; -import { Modal, Form, Input, message } from 'antd'; -import { IncidentStage, IncidentState } from '@src/types.generated'; -import { Button, colors } from '@src/alchemy-components'; -import { useUpdateIncidentStatusMutation } from '@src/graphql/mutations.generated'; import { useApolloClient } from '@apollo/client'; -import { useUserContext } from '@src/app/context/useUserContext'; +import { Form, Input, Modal, message } from 'antd'; +import React from 'react'; -import handleGraphQLError from '@src/app/shared/handleGraphQLError'; +import { IncidentSelectField } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentSelectedField'; +import { getCacheIncident } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/hooks/useIncidentHandler'; +import { INCIDENT_OPTION_LABEL_MAPPING, INCIDENT_RESOLUTION_STAGES } from '@app/entityV2/shared/tabs/Incident/constant'; +import { PAGE_SIZE, updateActiveIncidentInCache } from '@app/entityV2/shared/tabs/Incident/incidentUtils'; +import { FormItem, ModalHeading, ModalTitleContainer } from '@app/entityV2/shared/tabs/Incident/styledComponents'; +import { IncidentTableRow } from '@app/entityV2/shared/tabs/Incident/types'; +import { Button, colors } from '@src/alchemy-components'; import analytics, { EntityActionType, EventType } from '@src/app/analytics'; +import { useUserContext } from '@src/app/context/useUserContext'; import { useEntityData } from '@src/app/entity/shared/EntityContext'; import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; -import { IncidentTableRow } from './types'; -import { IncidentSelectField } from './AcrylComponents/IncidentSelectedField'; -import { INCIDENT_OPTION_LABEL_MAPPING, INCIDENT_RESOLUTION_STAGES } from './constant'; -import { FormItem, ModalHeading, ModalTitleContainer } from './styledComponents'; -import { getCacheIncident } from './AcrylComponents/hooks/useIncidentHandler'; -import { PAGE_SIZE, updateActiveIncidentInCache } from './incidentUtils'; +import handleGraphQLError from '@src/app/shared/handleGraphQLError'; +import { useUpdateIncidentStatusMutation } from '@src/graphql/mutations.generated'; +import { IncidentStage, IncidentState } from '@src/types.generated'; type IncidentResolutionPopupProps = { incident: IncidentTableRow; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentResolveButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentResolveButton.tsx index a9bcdc865c..531bade7ce 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentResolveButton.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentResolveButton.tsx @@ -1,19 +1,19 @@ -import React, { useEffect, useState } from 'react'; -import { Tooltip } from 'antd'; -import { CorpUser, EntityPrivileges, IncidentState } from '@src/types.generated'; -import { Button, colors, Pill, Popover } from '@src/alchemy-components'; -import { useGetEntitiesLazyQuery } from '@src/graphql/entity.generated'; -import { Check } from '@phosphor-icons/react'; import { LoadingOutlined } from '@ant-design/icons'; -import { useUserContext } from '@src/app/context/useUserContext'; +import { Check } from '@phosphor-icons/react'; +import { Tooltip } from 'antd'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { ResolverNameContainer } from './styledComponents'; -import { IncidentTableRow } from './types'; -import { IncidentResolutionPopup } from './IncidentResolutionPopup'; -import { LoadingWrapper } from './AcrylComponents/styledComponents'; -import { ResolvedSection } from './ResolvedSection'; -import { noPermissionsMessage } from './constant'; +import { LoadingWrapper } from '@app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents'; +import { IncidentResolutionPopup } from '@app/entityV2/shared/tabs/Incident/IncidentResolutionPopup'; +import { ResolvedSection } from '@app/entityV2/shared/tabs/Incident/ResolvedSection'; +import { noPermissionsMessage } from '@app/entityV2/shared/tabs/Incident/constant'; +import { ResolverNameContainer } from '@app/entityV2/shared/tabs/Incident/styledComponents'; +import { IncidentTableRow } from '@app/entityV2/shared/tabs/Incident/types'; +import { Button, Pill, Popover, colors } from '@src/alchemy-components'; +import { useUserContext } from '@src/app/context/useUserContext'; +import { useGetEntitiesLazyQuery } from '@src/graphql/entity.generated'; +import { CorpUser, EntityPrivileges, IncidentState } from '@src/types.generated'; const ME = 'Me'; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentTab.tsx index fd726e7471..c8eca7640f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentTab.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { IncidentList } from './IncidentList'; +import { IncidentList } from '@app/entityV2/shared/tabs/Incident/IncidentList'; export const IncidentTab = () => { return ; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentTitleContainer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentTitleContainer.tsx index 5c961ae3b0..b9e54c4702 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentTitleContainer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentTitleContainer.tsx @@ -1,10 +1,11 @@ -import React, { Dispatch, SetStateAction } from 'react'; import { Typography } from 'antd'; +import React, { Dispatch, SetStateAction } from 'react'; import styled from 'styled-components'; -import { EntityPrivileges } from '@src/types.generated'; + +import { CreateIncidentButton } from '@app/entityV2/shared/tabs/Incident/CreateIncidentButton'; +import { EntityStagedForIncident } from '@app/entityV2/shared/tabs/Incident/types'; import { colors } from '@src/alchemy-components'; -import { EntityStagedForIncident } from './types'; -import { CreateIncidentButton } from './CreateIncidentButton'; +import { EntityPrivileges } from '@src/types.generated'; const TitleContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/ResolvedSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/ResolvedSection.tsx index d700102799..ec1ab16e4f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/ResolvedSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/ResolvedSection.tsx @@ -1,8 +1,5 @@ import React from 'react'; -import { Avatar } from '@src/alchemy-components'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; import { useHistory } from 'react-router'; -import { EntityType } from '@src/types.generated'; import { ResolverDetails, @@ -11,8 +8,11 @@ import { ResolverSubTitle, ResolverSubTitleContainer, ResolverTitleContainer, -} from './styledComponents'; -import { getFormattedDateForResolver } from './utils'; +} from '@app/entityV2/shared/tabs/Incident/styledComponents'; +import { getFormattedDateForResolver } from '@app/entityV2/shared/tabs/Incident/utils'; +import { Avatar } from '@src/alchemy-components'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { EntityType } from '@src/types.generated'; type ResolvedSectionProps = { resolverUrn: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/__tests__/utils.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/__tests__/utils.test.tsx index 8a9932a647..70a17a7bbf 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/__tests__/utils.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/__tests__/utils.test.tsx @@ -1,19 +1,20 @@ import { format } from 'date-fns'; + +import { IncidentListFilter } from '@app/entityV2/shared/tabs/Incident/types'; +import { + getAssigneeNamesWithAvatarUrl, + getAssigneeWithURN, + getExistingIncidents, + getFilteredTransformedIncidentData, + getFormattedDateForResolver, + getLinkedAssetsCount, + getLinkedAssetsData, + getSortedIncidents, + useSiblingOptionsForIncidentBuilder, + validateForm, +} from '@app/entityV2/shared/tabs/Incident/utils'; import { SortingState } from '@src/alchemy-components/components/Table/types'; import { EntityType } from '@src/types.generated'; -import { - getFilteredTransformedIncidentData, - getLinkedAssetsCount, - getAssigneeWithURN, - getAssigneeNamesWithAvatarUrl, - getLinkedAssetsData, - getFormattedDateForResolver, - validateForm, - getSortedIncidents, - getExistingIncidents, - useSiblingOptionsForIncidentBuilder, -} from '../utils'; -import { IncidentListFilter } from '../types'; describe('Utility Functions', () => { test('getFilteredTransformedIncidentData should filter and transform incident data', () => { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/AddIncidentModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/AddIncidentModal.tsx index aad6e7687d..86b496d783 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/AddIncidentModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/AddIncidentModal.tsx @@ -1,15 +1,21 @@ -import React, { useState } from 'react'; -import { message, Modal, Button, Form, Input, Typography, Select } from 'antd'; import { useApolloClient } from '@apollo/client'; +import { Button, Form, Input, Modal, Select, Typography, message } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; -import { Editor } from '@src/app/entity/shared/tabs/Documentation/components/editor/Editor'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { + INCIDENT_DISPLAY_TYPES, + PAGE_SIZE, + updateActiveIncidentInCache, +} from '@app/entityV2/shared/tabs/Incident/incidentUtils'; +import handleGraphQLError from '@app/shared/handleGraphQLError'; import { ANTD_GRAY } from '@src/app/entity/shared/constants'; -import analytics, { EventType, EntityActionType } from '../../../../../analytics'; -import { EntityType, IncidentSourceType, IncidentState, IncidentType } from '../../../../../../types.generated'; -import { INCIDENT_DISPLAY_TYPES, PAGE_SIZE, updateActiveIncidentInCache } from '../incidentUtils'; -import { useRaiseIncidentMutation } from '../../../../../../graphql/mutations.generated'; -import handleGraphQLError from '../../../../../shared/handleGraphQLError'; -import { useUserContext } from '../../../../../context/useUserContext'; +import { Editor } from '@src/app/entity/shared/tabs/Documentation/components/editor/Editor'; + +import { useRaiseIncidentMutation } from '@graphql/mutations.generated'; +import { EntityType, IncidentSourceType, IncidentState, IncidentType } from '@types'; const StyledEditor = styled(Editor)` border: 1px solid ${ANTD_GRAY[4.5]}; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentListItem.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentListItem.tsx index 661adb0527..caa714736c 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentListItem.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentListItem.tsx @@ -1,20 +1,26 @@ -import React, { useState } from 'react'; -import styled from 'styled-components'; -import { Button, Dropdown, List, Menu, message, Tag, Typography } from 'antd'; -import { Tooltip, Popover } from '@components'; import { CheckCircleFilled, CheckOutlined, MoreOutlined, WarningFilled } from '@ant-design/icons'; +import { Popover, Tooltip } from '@components'; +import { Button, Dropdown, List, Menu, Tag, Typography, message } from 'antd'; +import React, { useState } from 'react'; import { Link } from 'react-router-dom'; -import { EntityType, IncidentState, IncidentType } from '../../../../../../types.generated'; -import { FAILURE_COLOR_HEX, getNameFromType, SUCCESS_COLOR_HEX } from '../incidentUtils'; -import { useGetUserQuery } from '../../../../../../graphql/user.generated'; -import { useEntityRegistry } from '../../../../../useEntityRegistry'; -import { toLocalDateTimeString, toRelativeTimeString } from '../../../../../shared/time/timeUtils'; -import { useEntityData, useRefetch } from '../../../../../entity/shared/EntityContext'; -import analytics, { EntityActionType, EventType } from '../../../../../analytics'; -import { useUpdateIncidentStatusMutation } from '../../../../../../graphql/mutations.generated'; -import { ResolveIncidentModal } from './ResolveIncidentModal'; -import handleGraphQLError from '../../../../../shared/handleGraphQLError'; -import CompactMarkdownViewer from '../../Documentation/components/CompactMarkdownViewer'; +import styled from 'styled-components'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext'; +import CompactMarkdownViewer from '@app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer'; +import { ResolveIncidentModal } from '@app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal'; +import { + FAILURE_COLOR_HEX, + SUCCESS_COLOR_HEX, + getNameFromType, +} from '@app/entityV2/shared/tabs/Incident/incidentUtils'; +import handleGraphQLError from '@app/shared/handleGraphQLError'; +import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useUpdateIncidentStatusMutation } from '@graphql/mutations.generated'; +import { useGetUserQuery } from '@graphql/user.generated'; +import { EntityType, IncidentState, IncidentType } from '@types'; type Props = { incident: any; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentSummary.tsx index deea514aa6..ea8e0fa479 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentSummary.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentSummary.tsx @@ -1,9 +1,10 @@ -import React from 'react'; -import { CheckCircleFilled, WarningFilled, StopOutlined } from '@ant-design/icons'; +import { CheckCircleFilled, StopOutlined, WarningFilled } from '@ant-design/icons'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../constants'; -import { SUCCESS_COLOR_HEX, FAILURE_COLOR_HEX } from '../incidentUtils'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@app/entityV2/shared/tabs/Incident/incidentUtils'; const SummaryHeader = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentsLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentsLoadingSection.tsx index fd5d31ac9e..e0d51502ed 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentsLoadingSection.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentsLoadingSection.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Divider, Skeleton } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const Container = styled.div` diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal.tsx index b915ef0a76..36da4d1458 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal.tsx @@ -1,6 +1,7 @@ +import { Button, Form, Input, Modal } from 'antd'; import React from 'react'; -import { Modal, Button, Form, Input } from 'antd'; -import { IncidentState } from '../../../../../../types.generated'; + +import { IncidentState } from '@types'; const { TextArea } = Input; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/hooks.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/hooks.tsx index 1802c13101..d7e701df9e 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/hooks.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/hooks.tsx @@ -1,19 +1,19 @@ -import React, { useCallback, useEffect, useMemo } from 'react'; import { message } from 'antd'; +import React, { useCallback, useEffect, useMemo } from 'react'; import { useHistory, useLocation } from 'react-router'; -import { getTimeFromNow } from '@src/app/shared/time/timeUtils'; -import { IncidentStagePill } from '@src/alchemy-components/components/IncidentStagePill'; +import { getQueryParams } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils'; +import { IncidentAssigneeAvatarStack } from '@app/entityV2/shared/tabs/Incident/IncidentAssigneeAvatarStack'; +import { IncidentResolveButton } from '@app/entityV2/shared/tabs/Incident/IncidentResolveButton'; +import { CategoryType } from '@app/entityV2/shared/tabs/Incident/styledComponents'; +import { getAssigneeNamesWithAvatarUrl, getLinkedAssetsCount } from '@app/entityV2/shared/tabs/Incident/utils'; import { IncidentPriorityLabel } from '@src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel'; +import { IncidentStagePill } from '@src/alchemy-components/components/IncidentStagePill'; import { getCapitalizeWord } from '@src/alchemy-components/components/IncidentStagePill/utils'; import { AlignmentOptions } from '@src/alchemy-components/theme/config'; +import { getTimeFromNow } from '@src/app/shared/time/timeUtils'; import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; import { CorpUser, EntityPrivileges, IncidentType } from '@src/types.generated'; -import { getQueryParams } from '../Dataset/Validations/assertionUtils'; -import { getAssigneeNamesWithAvatarUrl, getLinkedAssetsCount } from './utils'; -import { IncidentResolveButton } from './IncidentResolveButton'; -import { IncidentAssigneeAvatarStack } from './IncidentAssigneeAvatarStack'; -import { CategoryType } from './styledComponents'; export const useIncidentsTableColumns = (refetch: () => void, privileges?: EntityPrivileges) => { return useMemo(() => { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/incidentUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/incidentUtils.ts index edab034be5..5f0b903990 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/incidentUtils.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/incidentUtils.ts @@ -1,7 +1,7 @@ -import { GetEntityIncidentsDocument } from '../../../../../graphql/incident.generated'; +import { getExistingIncidents } from '@app/entityV2/shared/tabs/Incident/utils'; -import { IncidentType, IncidentState, Incident } from '../../../../../types.generated'; -import { getExistingIncidents } from './utils'; +import { GetEntityIncidentsDocument } from '@graphql/incident.generated'; +import { Incident, IncidentState, IncidentType } from '@types'; export const PAGE_SIZE = 100; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/types.ts index f44fad18a2..710ff20214 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/types.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/types.ts @@ -1,4 +1,7 @@ import { Dispatch, SetStateAction } from 'react'; + +import { IncidentAction } from '@app/entityV2/shared/tabs/Incident/constant'; +import { BaseItemType } from '@src/alchemy-components/components/Timeline/types'; import { AuditStamp, CorpUser, @@ -13,8 +16,6 @@ import { IncidentType, OwnerType, } from '@src/types.generated'; -import { BaseItemType } from '@src/alchemy-components/components/Timeline/types'; -import { IncidentAction } from './constant'; export type IncidentListFilter = { sortBy: string; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/utils.tsx index 1b3f1e1ccc..f23ae0346c 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/utils.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/utils.tsx @@ -1,17 +1,20 @@ -import React from 'react'; -import { - EntityType, - Incident, - IncidentPriority, - IncidentStage, - IncidentState, - IncidentType, -} from '@src/types.generated'; -import Fuse from 'fuse.js'; import { format } from 'date-fns'; -import { getCapitalizeWord } from '@src/alchemy-components/components/IncidentStagePill/utils'; -import { SortingState } from '@src/alchemy-components/components/Table/types'; -import { GenericEntityProperties } from '@src/app/entity/shared/types'; +import Fuse from 'fuse.js'; +import React from 'react'; + +import { + INCIDENT_PRIORITY, + INCIDENT_PRIORITY_NAME_MAP, + INCIDENT_STAGES_TYPES, + INCIDENT_STAGE_NAME_MAP, + INCIDENT_STATES_TYPES, + INCIDENT_STATE_NAME_MAP, + INCIDENT_TYPES, + INCIDENT_TYPE_NAME_MAP, + PRIORITY_ORDER, + STAGE_ORDER, + STATE_ORDER, +} from '@app/entityV2/shared/tabs/Incident/constant'; import { IncidentBuilderSiblingOptions, IncidentFilterOptions, @@ -21,21 +24,19 @@ import { IncidentRecommendedFilter, IncidentTable, IncidentTableRow, -} from './types'; +} from '@app/entityV2/shared/tabs/Incident/types'; +import { getPlatformName } from '@app/entityV2/shared/utils'; +import { getCapitalizeWord } from '@src/alchemy-components/components/IncidentStagePill/utils'; +import { SortingState } from '@src/alchemy-components/components/Table/types'; +import { GenericEntityProperties } from '@src/app/entity/shared/types'; import { - INCIDENT_PRIORITY, - INCIDENT_PRIORITY_NAME_MAP, - INCIDENT_STAGE_NAME_MAP, - INCIDENT_STAGES_TYPES, - INCIDENT_STATE_NAME_MAP, - INCIDENT_STATES_TYPES, - INCIDENT_TYPE_NAME_MAP, - INCIDENT_TYPES, - PRIORITY_ORDER, - STAGE_ORDER, - STATE_ORDER, -} from './constant'; -import { getPlatformName } from '../../utils'; + EntityType, + Incident, + IncidentPriority, + IncidentStage, + IncidentState, + IncidentType, +} from '@src/types.generated'; // Fuse.js setup for search functionality const fuse = new Fuse([], { @@ -70,7 +71,7 @@ const mapIncidentData = (incidents: Incident[]): IncidentTableRow[] => { source: incident?.source, lastUpdated: incident?.status?.lastUpdated, message: incident?.status?.message, - } as IncidentTableRow), + }) as IncidentTableRow, ); }; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ColumnLineageSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ColumnLineageSelect.tsx index 6bac1cf71c..43698a2a0d 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ColumnLineageSelect.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ColumnLineageSelect.tsx @@ -1,15 +1,16 @@ -import * as React from 'react'; -import { Button, Select } from 'antd'; -import { Tooltip } from '@components'; -import { CaretDownOutlined } from '@ant-design/icons'; -import styled from 'styled-components/macro'; import { blue } from '@ant-design/colors'; +import { CaretDownOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; +import { Button, Select } from 'antd'; +import * as React from 'react'; import { useHistory, useLocation } from 'react-router'; -import { ImpactAnalysisIcon } from '../Dataset/Schema/components/MenuColumn'; -import updateQueryParams from '../../../../shared/updateQueryParams'; -import { downgradeV2FieldPath } from '../../../dataset/profile/schema/utils/utils'; -import { useEntityData } from '../../../../entity/shared/EntityContext'; -import { useGetEntityWithSchema } from '../Dataset/Schema/useGetEntitySchema'; +import styled from 'styled-components/macro'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { downgradeV2FieldPath } from '@app/entityV2/dataset/profile/schema/utils/utils'; +import { ImpactAnalysisIcon } from '@app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn'; +import { useGetEntityWithSchema } from '@app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema'; +import updateQueryParams from '@app/shared/updateQueryParams'; const StyledSelect = styled(Select)` margin-right: 5px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/CompactLineageTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/CompactLineageTab.tsx index f4c444608d..7d07ee17a9 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/CompactLineageTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/CompactLineageTab.tsx @@ -1,16 +1,18 @@ import { ArrowDownOutlined, ArrowUpOutlined } from '@ant-design/icons'; -import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; -import { Button, Divider } from 'antd'; import { Icon, Tooltip } from '@components'; +import { Button, Divider } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components/macro'; -import { LineageDirection } from '../../../../../types.generated'; -import { UnionType } from '../../../../search/utils/constants'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { useEntityData } from '../../../../entity/shared/EntityContext'; -import { ANTD_GRAY, SEARCH_COLORS } from '../../constants'; -import { ImpactAnalysis } from './ImpactAnalysis'; -import { LineageTabContext } from './LineageTabContext'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import { ANTD_GRAY, SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { ImpactAnalysis } from '@app/entityV2/shared/tabs/Lineage/ImpactAnalysis'; +import { LineageTabContext } from '@app/entityV2/shared/tabs/Lineage/LineageTabContext'; +import { UnionType } from '@app/search/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { LineageDirection } from '@types'; // Unfortunately, we have to artificially bound the height. // Accounts for search bar, controls header, and padding. diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ImpactAnalysis.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ImpactAnalysis.tsx index c91b50509c..674434a997 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ImpactAnalysis.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ImpactAnalysis.tsx @@ -1,12 +1,14 @@ import React from 'react'; -import { FacetFilterInput, LineageDirection } from '../../../../../types.generated'; + +import { EmbeddedListSearchEmbed } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchEmbed'; +import { EmbeddedListSearchSection } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchSection'; +import { FilterSet } from '@app/entityV2/shared/components/styled/search/types'; +import generateUseDownloadScrollAcrossLineageSearchResultsHook from '@app/entityV2/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook'; import generateUseSearchResultsViaRelationshipHook, { generateUseSearchResultsCountViaRelationshipHook, -} from './generateUseSearchResultsViaRelationshipHook'; -import { EmbeddedListSearchSection } from '../../components/styled/search/EmbeddedListSearchSection'; -import { EmbeddedListSearchEmbed } from '../../components/styled/search/EmbeddedListSearchEmbed'; -import generateUseDownloadScrollAcrossLineageSearchResultsHook from './generateUseDownloadScrollAcrossLineageSearchResultsHook'; -import { FilterSet } from '../../components/styled/search/types'; +} from '@app/entityV2/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook'; + +import { FacetFilterInput, LineageDirection } from '@types'; type Props = { type?: 'default' | 'compact'; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageColumnView.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageColumnView.tsx index e456c8a476..d14f52e889 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageColumnView.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageColumnView.tsx @@ -7,28 +7,30 @@ import { ReloadOutlined, SubnodeOutlined, } from '@ant-design/icons'; -import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; import { Tooltip } from '@components'; -import { GenericEntityProperties } from '@src/app/entity/shared/types'; -import ManageLineageMenuForImpactAnalysis from '@src/app/entityV2/shared/tabs/Lineage/ManageLineageMenuFromImpactAnalysis'; -import { Direction } from '@src/app/lineage/types'; import { Button, Select, Typography } from 'antd'; import * as QueryString from 'query-string'; import React, { useMemo, useState } from 'react'; import { useLocation } from 'react-router'; import styled from 'styled-components/macro'; -import { EntityType, LineageDirection } from '../../../../../types.generated'; -import { useEntityData } from '../../../../entity/shared/EntityContext'; -import { useGetLineageTimeParams } from '../../../../lineage/utils/useGetLineageTimeParams'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { downgradeV2FieldPath } from '../../../dataset/profile/schema/utils/utils'; -import TabToolbar from '../../components/styled/TabToolbar'; -import { ANTD_GRAY } from '../../constants'; -import ColumnsLineageSelect from './ColumnLineageSelect'; -import { ImpactAnalysis } from './ImpactAnalysis'; -import { LineageTabContext } from './LineageTabContext'; -import LineageTabTimeSelector from './LineageTabTimeSelector'; -import { generateSchemaFieldUrn } from './utils'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import { downgradeV2FieldPath } from '@app/entityV2/dataset/profile/schema/utils/utils'; +import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import ColumnsLineageSelect from '@app/entityV2/shared/tabs/Lineage/ColumnLineageSelect'; +import { ImpactAnalysis } from '@app/entityV2/shared/tabs/Lineage/ImpactAnalysis'; +import { LineageTabContext } from '@app/entityV2/shared/tabs/Lineage/LineageTabContext'; +import LineageTabTimeSelector from '@app/entityV2/shared/tabs/Lineage/LineageTabTimeSelector'; +import { generateSchemaFieldUrn } from '@app/entityV2/shared/tabs/Lineage/utils'; +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { GenericEntityProperties } from '@src/app/entity/shared/types'; +import ManageLineageMenuForImpactAnalysis from '@src/app/entityV2/shared/tabs/Lineage/ManageLineageMenuFromImpactAnalysis'; +import { Direction } from '@src/app/lineage/types'; + +import { EntityType, LineageDirection } from '@types'; const StyledTabToolbar = styled(TabToolbar)` justify-content: space-between; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTab.tsx index 291c8abbff..eb405df1ba 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTab.tsx @@ -1,16 +1,18 @@ -import LineageGraph from '@app/lineageV2/LineageGraph'; import { colors } from '@components'; import React, { useContext } from 'react'; import styled from 'styled-components'; -import { LineageDirection } from '../../../../../types.generated'; -import { useEntityData } from '../../../../entity/shared/EntityContext'; -import LineageExplorer from '../../../../lineage/LineageExplorer'; -import { useLineageV2 } from '../../../../lineageV2/useLineageV2'; -import TabFullsizedContext from '../../../../shared/TabFullsizedContext'; -import { TabRenderType } from '../../types'; -import { CompactLineageTab } from './CompactLineageTab'; -import { useLineageViewState } from './hooks'; -import { LineageColumnView } from './LineageColumnView'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { CompactLineageTab } from '@app/entityV2/shared/tabs/Lineage/CompactLineageTab'; +import { LineageColumnView } from '@app/entityV2/shared/tabs/Lineage/LineageColumnView'; +import { useLineageViewState } from '@app/entityV2/shared/tabs/Lineage/hooks'; +import { TabRenderType } from '@app/entityV2/shared/types'; +import LineageExplorer from '@app/lineage/LineageExplorer'; +import LineageGraph from '@app/lineageV2/LineageGraph'; +import { useLineageV2 } from '@app/lineageV2/useLineageV2'; +import TabFullsizedContext from '@app/shared/TabFullsizedContext'; + +import { LineageDirection } from '@types'; const LINEAGE_SWITCH_WIDTH = 90; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabContext.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabContext.tsx index 4ef3728ebb..13f402e6cc 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabContext.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabContext.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { LineageDirection } from '../../../../../types.generated'; + +import { LineageDirection } from '@types'; export const LineageTabContext = React.createContext({ isColumnLevelLineage: false, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabTimeSelector.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabTimeSelector.tsx index 10121d3b7d..0bd5a1ceaf 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabTimeSelector.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabTimeSelector.tsx @@ -1,10 +1,11 @@ import React, { useCallback } from 'react'; import { useHistory, useLocation } from 'react-router'; -import analytics, { EventType } from '../../../../analytics'; -import LineageTimeSelector, { Datetime } from '../../../../lineageV2/LineageTimeSelector'; -import { getTimeFromNow } from '../../../../shared/time/timeUtils'; -import updateQueryParams from '../../../../shared/updateQueryParams'; -import { useGetLineageTimeParams } from '../../../../lineage/utils/useGetLineageTimeParams'; + +import analytics, { EventType } from '@app/analytics'; +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; +import LineageTimeSelector, { Datetime } from '@app/lineageV2/LineageTimeSelector'; +import { getTimeFromNow } from '@app/shared/time/timeUtils'; +import updateQueryParams from '@app/shared/updateQueryParams'; export default function LineageTabTimeSelector() { const history = useHistory(); diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTable.tsx index a31b24b3a0..3ec0a297e5 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTable.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTable.tsx @@ -1,12 +1,13 @@ -import React from 'react'; import { List } from 'antd'; -import styled from 'styled-components'; +import React from 'react'; import VisiblitySensor from 'react-visibility-sensor'; +import styled from 'styled-components'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { PreviewType } from '../../../Entity'; -import { Entity } from '../../../../../types.generated'; -import { ANTD_GRAY } from '../../constants'; +import { PreviewType } from '@app/entityV2/Entity'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity } from '@types'; const LineageList = styled(List)` padding-left: 40px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ManageLineageMenuFromImpactAnalysis.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ManageLineageMenuFromImpactAnalysis.tsx index 4eea645207..7d46fa5296 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ManageLineageMenuFromImpactAnalysis.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ManageLineageMenuFromImpactAnalysis.tsx @@ -1,12 +1,14 @@ import { ArrowDownOutlined, ArrowUpOutlined, MoreOutlined } from '@ant-design/icons'; import { Popover, Tooltip } from '@components'; -import { Direction } from '@src/app/lineage/types'; import { Dropdown } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { EntityType } from '../../../../../types.generated'; -import { ENTITY_TYPES_WITH_MANUAL_LINEAGE } from '../../../../entity/shared/constants'; -import { MenuItemStyle } from '../../../../entity/view/menu/item/styledComponent'; + +import { ENTITY_TYPES_WITH_MANUAL_LINEAGE } from '@app/entity/shared/constants'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; +import { Direction } from '@src/app/lineage/types'; + +import { EntityType } from '@types'; const DROPDOWN_Z_INDEX = 100; const POPOVER_Z_INDEX = 101; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts index 73cfd5fa70..1f00c56f35 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts @@ -1,10 +1,11 @@ -import { useGetDownloadScrollAcrossLineageResultsQuery } from '../../../../../graphql/scroll.generated'; -import { LineageDirection } from '../../../../../types.generated'; import { DownloadSearchResults, DownloadSearchResultsInput, DownloadSearchResultsParams, -} from '../../../../search/utils/types'; +} from '@app/search/utils/types'; + +import { useGetDownloadScrollAcrossLineageResultsQuery } from '@graphql/scroll.generated'; +import { LineageDirection } from '@types'; /** * Generates a hook which can be used to download Scroll Across Lineage Results to CSV inside the diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts index aaef958ebd..af9f0585ef 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts @@ -1,7 +1,9 @@ import React, { useEffect } from 'react'; -import { useSearchAcrossLineageCountQuery, useSearchAcrossLineageQuery } from '../../../../../graphql/search.generated'; -import { LineageDirection } from '../../../../../types.generated'; -import { GetSearchResultsParams } from '../../components/styled/search/types'; + +import { GetSearchResultsParams } from '@app/entityV2/shared/components/styled/search/types'; + +import { useSearchAcrossLineageCountQuery, useSearchAcrossLineageQuery } from '@graphql/search.generated'; +import { LineageDirection } from '@types'; const filtersExist = (filters, orFilters) => { return filters?.length || orFilters?.length; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/hooks.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/hooks.ts index 44cd51f001..6e2d581a89 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/hooks.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/hooks.ts @@ -1,7 +1,8 @@ -import { Direction } from '@src/app/lineage/types'; import { useCallback, useState } from 'react'; import { useHistory, useLocation } from 'react-router-dom'; +import { Direction } from '@src/app/lineage/types'; + const IS_VISUALIZE_VIEW_DEFAULT = true; export function useLineageViewState() { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlFeatureFeatureTableTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlFeatureFeatureTableTab.tsx index e600c53572..94e1b465be 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlFeatureFeatureTableTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlFeatureFeatureTableTab.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { useBaseEntity } from '../../../../entity/shared/EntityContext'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from '../Entity/components/EntityList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { GetMlFeatureQuery } from '../../../../../graphql/mlFeature.generated'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { EntityList } from '@app/entityV2/shared/tabs/Entity/components/EntityList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetMlFeatureQuery } from '@graphql/mlFeature.generated'; +import { EntityType } from '@types'; export const FeatureTableTab = () => { const entity = useBaseEntity() as GetMlFeatureQuery; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx index a275482950..15ae4482cc 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { useBaseEntity } from '../../../../entity/shared/EntityContext'; -import { EntityType } from '../../../../../types.generated'; -import { EntityList } from '../Entity/components/EntityList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { GetMlPrimaryKeyQuery } from '../../../../../graphql/mlPrimaryKey.generated'; + +import { useBaseEntity } from '@app/entity/shared/EntityContext'; +import { EntityList } from '@app/entityV2/shared/tabs/Entity/components/EntityList'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetMlPrimaryKeyQuery } from '@graphql/mlPrimaryKey.generated'; +import { EntityType } from '@types'; export const FeatureTableTab = () => { const entity = useBaseEntity() as GetMlPrimaryKeyQuery; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/CardinalityLabel.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/CardinalityLabel.tsx index 03cc595cb6..be820c8d90 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/CardinalityLabel.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/CardinalityLabel.tsx @@ -1,9 +1,11 @@ import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { PropertyCardinality, StructuredPropertyEntity } from '../../../../../types.generated'; -import { PropertyTypeBadge } from '../../../../entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel'; -import { getStructuredPropertyValue } from '../../../../entity/shared/utils'; + +import { PropertyTypeBadge } from '@app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel'; +import { getStructuredPropertyValue } from '@app/entity/shared/utils'; + +import { PropertyCardinality, StructuredPropertyEntity } from '@types'; const Header = styled.div` font-size: 10px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/NameColumn.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/NameColumn.tsx index bd8b2275ef..4c386edd69 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/NameColumn.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/NameColumn.tsx @@ -1,10 +1,11 @@ -import { Typography } from 'antd'; import { Tooltip } from '@components'; +import { Typography } from 'antd'; import React from 'react'; -import styled from 'styled-components'; import Highlight from 'react-highlighter'; -import { PropertyRow } from './types'; -import StructuredPropertyTooltip from './StructuredPropertyTooltip'; +import styled from 'styled-components'; + +import StructuredPropertyTooltip from '@app/entityV2/shared/tabs/Properties/StructuredPropertyTooltip'; +import { PropertyRow } from '@app/entityV2/shared/tabs/Properties/types'; const ParentNameText = styled(Typography.Text)` color: #373d44; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/PropertiesTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/PropertiesTab.tsx index 871a7068bd..3de5eebdc2 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/PropertiesTab.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/PropertiesTab.tsx @@ -1,23 +1,24 @@ -import { EditColumn } from '@src/app/entity/shared/tabs/Properties/Edit/EditColumn'; -import { Maybe, StructuredProperties } from '@src/types.generated'; import { Empty, Table } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { useEntityData } from '../../../../entity/shared/EntityContext'; -import TabHeader from '../../../../entity/shared/tabs/Properties/TabHeader'; -import { PropertyRow } from '../../../../entity/shared/tabs/Properties/types'; -import useUpdateExpandedRowsFromFilter from '../../../../entity/shared/tabs/Properties/useUpdateExpandedRowsFromFilter'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import TabHeader from '@app/entity/shared/tabs/Properties/TabHeader'; +import { PropertyRow } from '@app/entity/shared/tabs/Properties/types'; +import useUpdateExpandedRowsFromFilter from '@app/entity/shared/tabs/Properties/useUpdateExpandedRowsFromFilter'; import { getFilteredCustomProperties, mapCustomPropertiesToPropertyRows, -} from '../../../../entity/shared/tabs/Properties/utils'; -import { useEntityRegistryV2 } from '../../../../useEntityRegistry'; -import { TabRenderType } from '../../types'; -import ExpandIcon from '../Dataset/Schema/components/ExpandIcon'; -import NameColumn from './NameColumn'; -import ValuesColumn from './ValuesColumn'; -import { useHydratedEntityMap } from './useHydratedEntityMap'; -import useStructuredProperties from './useStructuredProperties'; +} from '@app/entity/shared/tabs/Properties/utils'; +import ExpandIcon from '@app/entityV2/shared/tabs/Dataset/Schema/components/ExpandIcon'; +import NameColumn from '@app/entityV2/shared/tabs/Properties/NameColumn'; +import ValuesColumn from '@app/entityV2/shared/tabs/Properties/ValuesColumn'; +import { useHydratedEntityMap } from '@app/entityV2/shared/tabs/Properties/useHydratedEntityMap'; +import useStructuredProperties from '@app/entityV2/shared/tabs/Properties/useStructuredProperties'; +import { TabRenderType } from '@app/entityV2/shared/types'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; +import { EditColumn } from '@src/app/entity/shared/tabs/Properties/Edit/EditColumn'; +import { Maybe, StructuredProperties } from '@src/types.generated'; const StyledTable = styled(Table)` &&& .ant-table-cell-with-append { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyTooltip.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyTooltip.tsx index 8b2ad392bb..60ac126b31 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyTooltip.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyTooltip.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import CardinalityLabel from './CardinalityLabel'; -import { PropertyRow } from './types'; -import PropertyTypeLabel from '../../../../entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel'; + +import PropertyTypeLabel from '@app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel'; +import CardinalityLabel from '@app/entityV2/shared/tabs/Properties/CardinalityLabel'; +import { PropertyRow } from '@app/entityV2/shared/tabs/Properties/types'; const ContentWrapper = styled.div` font-size: 12px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyValue.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyValue.tsx index 8a4cfdd3df..537fdcaedc 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyValue.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyValue.tsx @@ -1,17 +1,19 @@ import Icon from '@ant-design/icons/lib/components/Icon'; -import { getSchemaFieldParentLink } from '@src/app/entityV2/schemaField/utils'; -import { CompactEntityNameComponent } from '@src/app/recommendations/renderer/component/CompactEntityNameComponent'; -import { Entity, EntityType } from '@src/types.generated'; import { Typography } from 'antd'; import React from 'react'; import Highlight from 'react-highlighter'; import styled from 'styled-components'; -import ExternalLink from '../../../../../images/link-out.svg?react'; -import EntityIcon from '../../../../entity/shared/components/styled/EntityIcon'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../constants'; -import CompactMarkdownViewer from '../Documentation/components/CompactMarkdownViewer'; -import { ValueColumnData } from './types'; + +import EntityIcon from '@app/entity/shared/components/styled/EntityIcon'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import CompactMarkdownViewer from '@app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer'; +import { ValueColumnData } from '@app/entityV2/shared/tabs/Properties/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { getSchemaFieldParentLink } from '@src/app/entityV2/schemaField/utils'; +import { CompactEntityNameComponent } from '@src/app/recommendations/renderer/component/CompactEntityNameComponent'; +import { Entity, EntityType } from '@src/types.generated'; + +import ExternalLink from '@images/link-out.svg?react'; const ValueText = styled(Typography.Text)<{ size: number }>` font-family: 'Manrope'; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/TabHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/TabHeader.tsx index 4ce1fbd457..3a6b909f01 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/TabHeader.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/TabHeader.tsx @@ -2,7 +2,8 @@ import { Icon } from '@components'; import { Input } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const StyledInput = styled(Input)` border-radius: 70px; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/ValuesColumn.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/ValuesColumn.tsx index d431a67a45..1cfa8733bf 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/ValuesColumn.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/ValuesColumn.tsx @@ -1,10 +1,12 @@ -import { Entity } from '@src/types.generated'; import React from 'react'; import styled from 'styled-components'; -import { StdDataType } from '../../../../../types.generated'; -import { TabRenderType } from '../../types'; -import StructuredPropertyValue from './StructuredPropertyValue'; -import { PropertyRow } from './types'; + +import StructuredPropertyValue from '@app/entityV2/shared/tabs/Properties/StructuredPropertyValue'; +import { PropertyRow } from '@app/entityV2/shared/tabs/Properties/types'; +import { TabRenderType } from '@app/entityV2/shared/types'; +import { Entity } from '@src/types.generated'; + +import { StdDataType } from '@types'; interface Props { propertyRow: PropertyRow; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts index ff7c6e51a0..1ea9bf0eb1 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts @@ -1,4 +1,4 @@ -import { identifyAndAddParentRows } from '../useStructuredProperties'; +import { identifyAndAddParentRows } from '@app/entityV2/shared/tabs/Properties/useStructuredProperties'; describe('identifyAndAddParentRows', () => { it('should not return parent rows when there are none', () => { diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/utils.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/utils.test.ts index 04c817f2f4..6061cedb6f 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/utils.test.ts @@ -1,6 +1,6 @@ import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider'; -import { PropertyRow } from '../types'; -import { filterStructuredProperties } from '../utils'; +import { PropertyRow } from '@app/entityV2/shared/tabs/Properties/types'; +import { filterStructuredProperties } from '@app/entityV2/shared/tabs/Properties/utils'; describe('filterSchemaRows', () => { const rows = [ diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/types.ts index b93ba886d5..e328d19765 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/types.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/types.ts @@ -1,4 +1,4 @@ -import { DataTypeEntity, Entity, StructuredPropertyEntity } from '../../../../../types.generated'; +import { DataTypeEntity, Entity, StructuredPropertyEntity } from '@types'; export interface ValueColumnData { value: string | number | null; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useHydratedEntityMap.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useHydratedEntityMap.ts index b055631144..80ad5714be 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useHydratedEntityMap.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useHydratedEntityMap.ts @@ -1,6 +1,7 @@ +import { useMemo } from 'react'; + import { useGetEntities } from '@src/app/sharedV2/useGetEntities'; import { Entity } from '@src/types.generated'; -import { useMemo } from 'react'; export function useHydratedEntityMap(urns?: (string | undefined | null)[]) { // Get unique URNs diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useStructuredProperties.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useStructuredProperties.tsx index ac53c71a2f..c422e3af09 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useStructuredProperties.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useStructuredProperties.tsx @@ -1,11 +1,12 @@ -import { PropertyValue, StructuredPropertiesEntry } from '../../../../../types.generated'; -import { useEntityData } from '../../../../entity/shared/EntityContext'; -import { GenericEntityProperties } from '../../../../entity/shared/types'; -import { getStructuredPropertyValue } from '../../../../entity/shared/utils'; -import EntityRegistry from '../../../EntityRegistry'; -import { useGetEntityWithSchema } from '../Dataset/Schema/useGetEntitySchema'; -import { PropertyRow } from './types'; -import { filterStructuredProperties } from './utils'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { getStructuredPropertyValue } from '@app/entity/shared/utils'; +import EntityRegistry from '@app/entityV2/EntityRegistry'; +import { useGetEntityWithSchema } from '@app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema'; +import { PropertyRow } from '@app/entityV2/shared/tabs/Properties/types'; +import { filterStructuredProperties } from '@app/entityV2/shared/tabs/Properties/utils'; + +import { PropertyValue, StructuredPropertiesEntry } from '@types'; const typeNameToType = { StringValue: { type: 'string', nativeDataType: 'text' }, diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts index 0dbe762c53..9dcd33e368 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts @@ -1,6 +1,7 @@ -import { useEffect } from 'react'; import { isEqual } from 'lodash'; -import usePrevious from '../../../../shared/usePrevious'; +import { useEffect } from 'react'; + +import usePrevious from '@app/shared/usePrevious'; interface Props { expandedRowsFromFilter: Set; diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/utils.ts index 1730585500..02c1cbe2d7 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/utils.ts +++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/utils.ts @@ -1,7 +1,8 @@ -import { CustomPropertiesEntry } from '../../../../../types.generated'; -import EntityRegistry from '../../../EntityRegistry'; -import { GenericEntityProperties } from '../../../../entity/shared/types'; -import { PropertyRow, ValueColumnData } from './types'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import EntityRegistry from '@app/entityV2/EntityRegistry'; +import { PropertyRow, ValueColumnData } from '@app/entityV2/shared/tabs/Properties/types'; + +import { CustomPropertiesEntry } from '@types'; export function mapCustomPropertiesToPropertyRows(customProperties: CustomPropertiesEntry[]) { return (customProperties?.map((customProp) => ({ diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/__tests__/utils.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/__tests__/utils.test.tsx index 2d406f53e5..f116755999 100644 --- a/datahub-web-react/src/app/entityV2/shared/tabs/__tests__/utils.test.tsx +++ b/datahub-web-react/src/app/entityV2/shared/tabs/__tests__/utils.test.tsx @@ -13,7 +13,7 @@ import { summaryHasStats, truncate, urlEncodeUrn, -} from '../../utils'; +} from '@app/entityV2/shared/utils'; describe('dictToQueryStringParams', () => { it('should convert dictionary to query string', () => { diff --git a/datahub-web-react/src/app/entityV2/shared/useIsSeparateSiblingsMode.ts b/datahub-web-react/src/app/entityV2/shared/useIsSeparateSiblingsMode.ts index 4c54c3f8db..90a9dd9aae 100644 --- a/datahub-web-react/src/app/entityV2/shared/useIsSeparateSiblingsMode.ts +++ b/datahub-web-react/src/app/entityV2/shared/useIsSeparateSiblingsMode.ts @@ -1,9 +1,10 @@ import * as QueryString from 'query-string'; import { useContext } from 'react'; import { useLocation } from 'react-router-dom'; -import { useIsShowSeparateSiblingsEnabled } from '@src/app/useAppConfig'; + +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; import { useEntityData } from '@src/app/entity/shared/EntityContext'; -import EntitySidebarContext from '../../sharedV2/EntitySidebarContext'; +import { useIsShowSeparateSiblingsEnabled } from '@src/app/useAppConfig'; // used to determine whether sibling entities should be shown merged or not export const SEPARATE_SIBLINGS_URL_PARAM = 'separate_siblings'; diff --git a/datahub-web-react/src/app/entityV2/shared/utils.ts b/datahub-web-react/src/app/entityV2/shared/utils.ts index 62a8ef1934..d9c35f79b7 100644 --- a/datahub-web-react/src/app/entityV2/shared/utils.ts +++ b/datahub-web-react/src/app/entityV2/shared/utils.ts @@ -1,26 +1,27 @@ import { Maybe } from 'graphql/jsutils/Maybe'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { TITLE_CASE_EXCEPTION_WORDS } from '@app/entityV2/shared/constants'; +import { OUTPUT_PORTS_FIELD } from '@app/search/utils/constants'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { TimeWindowSize } from '@app/shared/time/timeUtils'; + import { + ChartProperties, ChartStatsSummary, DashboardStatsSummary, DataProduct, + Dataset, DatasetProfile, + DatasetProperties, DatasetStatsSummary, DateInterval, Entity, EntityRelationshipsResult, EntityType, - SearchResult, - DatasetProperties, - ChartProperties, Operation, - Dataset, -} from '../../../types.generated'; - -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import { OUTPUT_PORTS_FIELD } from '../../search/utils/constants'; -import { TimeWindowSize } from '../../shared/time/timeUtils'; -import { TITLE_CASE_EXCEPTION_WORDS } from './constants'; + SearchResult, +} from '@types'; export function dictToQueryStringParams(params: Record) { return Object.keys(params) diff --git a/datahub-web-react/src/app/entityV2/shared/versioning/VersioningBadge.tsx b/datahub-web-react/src/app/entityV2/shared/versioning/VersioningBadge.tsx index fc3c66f097..cce5090196 100644 --- a/datahub-web-react/src/app/entityV2/shared/versioning/VersioningBadge.tsx +++ b/datahub-web-react/src/app/entityV2/shared/versioning/VersioningBadge.tsx @@ -1,9 +1,12 @@ -import { VersionPill } from '@app/entityV2/shared/versioning/common'; -import VersionsPreview from '@app/entityV2/shared/versioning/VersionsPreview'; import { Popover } from '@components'; -import { PillStyleProps } from '@components/components/Pills/types'; import { Space } from 'antd'; import React from 'react'; + +import { PillStyleProps } from '@components/components/Pills/types'; + +import VersionsPreview from '@app/entityV2/shared/versioning/VersionsPreview'; +import { VersionPill } from '@app/entityV2/shared/versioning/common'; + import { VersionProperties } from '@types'; interface Props { diff --git a/datahub-web-react/src/app/entityV2/shared/versioning/VersionsDrawer.tsx b/datahub-web-react/src/app/entityV2/shared/versioning/VersionsDrawer.tsx index fdcecefee8..7a109477c5 100644 --- a/datahub-web-react/src/app/entityV2/shared/versioning/VersionsDrawer.tsx +++ b/datahub-web-react/src/app/entityV2/shared/versioning/VersionsDrawer.tsx @@ -1,13 +1,5 @@ import { CloseOutlined } from '@ant-design/icons'; -import { useEntityContext } from '@app/entity/shared/EntityContext'; -import { VersionPill } from '@app/entityV2/shared/versioning/common'; -import { SimpleCopyLinkMenuItem } from '@app/shared/share/v2/items/CopyLinkMenuItem'; -import { useEntityRegistry } from '@app/useEntityRegistry'; -import { colors, Icon, Input, Table, Text } from '@components'; -import { Tooltip2 } from '@components/components/Tooltip2'; -import { useSearchAcrossVersionsQuery } from '@graphql/versioning.generated'; -import LinkOut from '@images/link-out.svg?react'; -import { FilterOperator } from '@types'; +import { Icon, Input, Table, Text, colors } from '@components'; import { Drawer, Dropdown, Pagination, Typography } from 'antd'; import { ItemType } from 'antd/es/menu/hooks/useItems'; import moment from 'moment'; @@ -16,6 +8,18 @@ import { Link } from 'react-router-dom'; import { useDebounce } from 'react-use'; import styled from 'styled-components'; +import { Tooltip2 } from '@components/components/Tooltip2'; + +import { useEntityContext } from '@app/entity/shared/EntityContext'; +import { VersionPill } from '@app/entityV2/shared/versioning/common'; +import { SimpleCopyLinkMenuItem } from '@app/shared/share/v2/items/CopyLinkMenuItem'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useSearchAcrossVersionsQuery } from '@graphql/versioning.generated'; +import { FilterOperator } from '@types'; + +import LinkOut from '@images/link-out.svg?react'; + const PAGE_SIZE = 10; const COLUMNS = [ diff --git a/datahub-web-react/src/app/entityV2/shared/versioning/VersionsPreview.tsx b/datahub-web-react/src/app/entityV2/shared/versioning/VersionsPreview.tsx index afd0638df6..1199aaba29 100644 --- a/datahub-web-react/src/app/entityV2/shared/versioning/VersionsPreview.tsx +++ b/datahub-web-react/src/app/entityV2/shared/versioning/VersionsPreview.tsx @@ -1,13 +1,15 @@ +import { Pill, Text, colors } from '@components'; +import React from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components'; + import analytics, { EventType } from '@app/analytics'; import { useEntityContext, useEntityData } from '@app/entity/shared/EntityContext'; import { DrawerType } from '@app/entity/shared/types'; import { VersionPill } from '@app/entityV2/shared/versioning/common'; import { useEntityRegistry } from '@app/useEntityRegistry'; -import { colors, Pill, Text } from '@components'; + import { Entity, VersionSet } from '@types'; -import React from 'react'; -import { Link } from 'react-router-dom'; -import styled from 'styled-components'; const Wrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/shared/versioning/common.tsx b/datahub-web-react/src/app/entityV2/shared/versioning/common.tsx index 379dc3a58d..380bd55ea1 100644 --- a/datahub-web-react/src/app/entityV2/shared/versioning/common.tsx +++ b/datahub-web-react/src/app/entityV2/shared/versioning/common.tsx @@ -1,8 +1,9 @@ import { Pill } from '@components'; -import { PillProps } from '@components/components/Pills/types'; import React from 'react'; import styled from 'styled-components'; +import { PillProps } from '@components/components/Pills/types'; + const StyledPill = styled(Pill)` font-weight: 600; line-height: 1.4; diff --git a/datahub-web-react/src/app/entityV2/structuredProperty/StructuredPropertyEntity.tsx b/datahub-web-react/src/app/entityV2/structuredProperty/StructuredPropertyEntity.tsx index ec181981bc..adccf052d1 100644 --- a/datahub-web-react/src/app/entityV2/structuredProperty/StructuredPropertyEntity.tsx +++ b/datahub-web-react/src/app/entityV2/structuredProperty/StructuredPropertyEntity.tsx @@ -1,12 +1,14 @@ -import TableIcon from '@src/images/table-icon.svg?react'; import * as React from 'react'; import styled from 'styled-components'; -import { EntityType, SearchResult, StructuredPropertyEntity as StructuredProperty } from '../../../types.generated'; -import DefaultPreviewCard from '../../previewV2/DefaultPreviewCard'; -import { Entity, IconStyleType, PreviewType } from '../Entity'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { urlEncodeUrn } from '../shared/utils'; + +import { Entity, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import { urlEncodeUrn } from '@app/entityV2/shared/utils'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; +import TableIcon from '@src/images/table-icon.svg?react'; + +import { EntityType, SearchResult, StructuredPropertyEntity as StructuredProperty } from '@types'; const PreviewPropIcon = styled(TableIcon)` font-size: 20px; diff --git a/datahub-web-react/src/app/entityV2/tag/CompactTagProfile.tsx b/datahub-web-react/src/app/entityV2/tag/CompactTagProfile.tsx index 482e2e1fc8..fb9eec3503 100644 --- a/datahub-web-react/src/app/entityV2/tag/CompactTagProfile.tsx +++ b/datahub-web-react/src/app/entityV2/tag/CompactTagProfile.tsx @@ -1,17 +1,19 @@ -import React, { useContext, useState } from 'react'; - -import { matchPath, useLocation } from 'react-router'; import { BookOpen } from '@phosphor-icons/react'; +import React, { useContext, useState } from 'react'; +import { matchPath, useLocation } from 'react-router'; import styled from 'styled-components'; -import { PageRoutes } from '../../../conf/Global'; -import EntitySidebarContext from '../../sharedV2/EntitySidebarContext'; -import TagStyleEntity from '../../shared/TagStyleEntity'; -import { StyledEntitySidebarContainer, StyledSidebar } from '../shared/containers/profile/sidebar/EntityProfileSidebar'; -import { EntitySidebarTab } from '../shared/types'; -import EntitySidebarSectionsTab from '../shared/containers/profile/sidebar/EntitySidebarSectionsTab'; -import { EntitySidebarTabs } from '../shared/containers/profile/sidebar/EntitySidebarTabs'; -import { defaultTabDisplayConfig } from '../shared/containers/profile/utils'; +import { + StyledEntitySidebarContainer, + StyledSidebar, +} from '@app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar'; +import EntitySidebarSectionsTab from '@app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab'; +import { EntitySidebarTabs } from '@app/entityV2/shared/containers/profile/sidebar/EntitySidebarTabs'; +import { defaultTabDisplayConfig } from '@app/entityV2/shared/containers/profile/utils'; +import { EntitySidebarTab } from '@app/entityV2/shared/types'; +import TagStyleEntity from '@app/shared/TagStyleEntity'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; +import { PageRoutes } from '@conf/Global'; const CompactEntityWrapper = styled.div<{ $isClosed: boolean }>` ${(props) => !props.$isClosed && 'padding: 16px;'} diff --git a/datahub-web-react/src/app/entityV2/tag/Tag.tsx b/datahub-web-react/src/app/entityV2/tag/Tag.tsx index e57c5ddc8b..e57138e241 100644 --- a/datahub-web-react/src/app/entityV2/tag/Tag.tsx +++ b/datahub-web-react/src/app/entityV2/tag/Tag.tsx @@ -1,13 +1,15 @@ -import { TagOutlined, TagFilled } from '@ant-design/icons'; +import { TagFilled, TagOutlined } from '@ant-design/icons'; import * as React from 'react'; import styled from 'styled-components'; -import { Tag, EntityType, SearchResult } from '../../../types.generated'; -import DefaultPreviewCard from '../../previewV2/DefaultPreviewCard'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { urlEncodeUrn } from '../shared/utils'; -import TagProfile from './TagProfile'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import { urlEncodeUrn } from '@app/entityV2/shared/utils'; +import TagProfile from '@app/entityV2/tag/TagProfile'; +import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard'; + +import { EntityType, SearchResult, Tag } from '@types'; const PreviewTagIcon = styled(TagOutlined)` font-size: 20px; diff --git a/datahub-web-react/src/app/entityV2/tag/TagProfile.tsx b/datahub-web-react/src/app/entityV2/tag/TagProfile.tsx index ece0532e8e..661aa3c966 100644 --- a/datahub-web-react/src/app/entityV2/tag/TagProfile.tsx +++ b/datahub-web-react/src/app/entityV2/tag/TagProfile.tsx @@ -1,10 +1,12 @@ import React, { useContext } from 'react'; import styled from 'styled-components'; -import { Message } from '../../shared/Message'; -import TagStyleEntity from '../../shared/TagStyleEntity'; -import { useGetTagQuery } from '../../../graphql/tag.generated'; -import CompactContext from '../../shared/CompactContext'; -import CompactTagProfile from './CompactTagProfile'; + +import CompactTagProfile from '@app/entityV2/tag/CompactTagProfile'; +import CompactContext from '@app/shared/CompactContext'; +import { Message } from '@app/shared/Message'; +import TagStyleEntity from '@app/shared/TagStyleEntity'; + +import { useGetTagQuery } from '@graphql/tag.generated'; const PageContainer = styled.div` padding: 32px 100px; diff --git a/datahub-web-react/src/app/entityV2/tag/__tests__/TagProfile.test.tsx b/datahub-web-react/src/app/entityV2/tag/__tests__/TagProfile.test.tsx index 238af61bba..9127a6e102 100644 --- a/datahub-web-react/src/app/entityV2/tag/__tests__/TagProfile.test.tsx +++ b/datahub-web-react/src/app/entityV2/tag/__tests__/TagProfile.test.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import { render, waitFor } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; +import { render, waitFor } from '@testing-library/react'; +import React from 'react'; import { Route } from 'react-router'; -import TagProfile from '../TagProfile'; -import TestPageContainer from '../../../../utils/test-utils/TestPageContainer'; -import { mocks } from '../../../../Mocks'; +import TagProfile from '@app/entityV2/tag/TagProfile'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('TagProfile', () => { it('renders tag details', async () => { diff --git a/datahub-web-react/src/app/entityV2/user/User.tsx b/datahub-web-react/src/app/entityV2/user/User.tsx index b1265d2875..dbafb6314e 100644 --- a/datahub-web-react/src/app/entityV2/user/User.tsx +++ b/datahub-web-react/src/app/entityV2/user/User.tsx @@ -1,11 +1,13 @@ import { UserOutlined } from '@ant-design/icons'; import * as React from 'react'; -import { CorpUser, EntityType, SearchResult } from '../../../types.generated'; -import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity'; -import { getDataForEntityType } from '../shared/containers/profile/utils'; -import { Preview } from './preview/Preview'; -import UserProfile from './UserProfile'; -import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes'; + +import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes'; +import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils'; +import UserProfile from '@app/entityV2/user/UserProfile'; +import { Preview } from '@app/entityV2/user/preview/Preview'; + +import { CorpUser, EntityType, SearchResult } from '@types'; /** * Definition of the DataHub Dataset entity. diff --git a/datahub-web-react/src/app/entityV2/user/UserAssets.tsx b/datahub-web-react/src/app/entityV2/user/UserAssets.tsx index 478fd0a841..57e8ec0317 100644 --- a/datahub-web-react/src/app/entityV2/user/UserAssets.tsx +++ b/datahub-web-react/src/app/entityV2/user/UserAssets.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import { UnionType } from '../../search/utils/constants'; -import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection'; -import useGetUserGroupUrns from './useGetUserGroupUrns'; + +import { EmbeddedListSearchSection } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchSection'; +import useGetUserGroupUrns from '@app/entityV2/user/useGetUserGroupUrns'; +import { UnionType } from '@app/search/utils/constants'; const UserAssetsWrapper = styled.div` height: 100%; diff --git a/datahub-web-react/src/app/entityV2/user/UserBasicInfoContainer.tsx b/datahub-web-react/src/app/entityV2/user/UserBasicInfoContainer.tsx index e987265b90..1933c7119f 100644 --- a/datahub-web-react/src/app/entityV2/user/UserBasicInfoContainer.tsx +++ b/datahub-web-react/src/app/entityV2/user/UserBasicInfoContainer.tsx @@ -1,20 +1,21 @@ -import React from 'react'; -import { Divider } from 'antd'; -import { Tooltip } from '@components'; import { PhoneOutlined, SlackOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; +import { Divider } from 'antd'; +import React from 'react'; + import { - EmptyValue, - SocialDetails, - Name, - TitleRole, - RoleName, + BasicDetails, BasicDetailsContainer, DraftsOutlinedIconStyle, - BasicDetails, + EmptyValue, + Name, NameTitleContainer, + RoleName, + SocialDetails, SocialInfo, -} from '../shared/SidebarStyledComponents'; -import { REDESIGN_COLORS } from '../shared/constants'; + TitleRole, +} from '@app/entityV2/shared/SidebarStyledComponents'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; type Props = { name: string | undefined; diff --git a/datahub-web-react/src/app/entityV2/user/UserEditProfileModal.tsx b/datahub-web-react/src/app/entityV2/user/UserEditProfileModal.tsx index 9b960f87de..ca6042c348 100644 --- a/datahub-web-react/src/app/entityV2/user/UserEditProfileModal.tsx +++ b/datahub-web-react/src/app/entityV2/user/UserEditProfileModal.tsx @@ -1,10 +1,12 @@ import { MoreOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; +import { Button, Form, Input, Modal, Typography, message } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { message, Button, Input, Modal, Typography, Form } from 'antd'; -import { Tooltip } from '@components'; -import { useUpdateCorpUserPropertiesMutation } from '../../../graphql/user.generated'; -import { useAppConfig } from '../../useAppConfig'; + +import { useAppConfig } from '@app/useAppConfig'; + +import { useUpdateCorpUserPropertiesMutation } from '@graphql/user.generated'; const StyledInput = styled(Input)` margin-bottom: 20px; diff --git a/datahub-web-react/src/app/entityV2/user/UserGroups.tsx b/datahub-web-react/src/app/entityV2/user/UserGroups.tsx index 94b9528e8b..f5bf9308ce 100644 --- a/datahub-web-react/src/app/entityV2/user/UserGroups.tsx +++ b/datahub-web-react/src/app/entityV2/user/UserGroups.tsx @@ -1,12 +1,14 @@ -import { Col, Pagination, Row } from 'antd'; import { Tooltip } from '@components'; +import { Col, Pagination, Row } from 'antd'; import React, { useState } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { useGetUserGroupsLazyQuery } from '../../../graphql/user.generated'; -import { CorpGroup, EntityRelationship, EntityType } from '../../../types.generated'; -import { scrollToTop } from '../../shared/searchUtils'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetUserGroupsLazyQuery } from '@graphql/user.generated'; +import { CorpGroup, EntityRelationship, EntityType } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/entityV2/user/UserHeader.tsx b/datahub-web-react/src/app/entityV2/user/UserHeader.tsx index 06d88fcf14..11637464c1 100644 --- a/datahub-web-react/src/app/entityV2/user/UserHeader.tsx +++ b/datahub-web-react/src/app/entityV2/user/UserHeader.tsx @@ -1,8 +1,9 @@ // import { UserOutlined } from '@ant-design/icons'; -import styled from 'styled-components'; +import { Badge, Divider, Space, Typography } from 'antd'; import React from 'react'; -import { Space, Badge, Typography, Divider } from 'antd'; -import CustomAvatar from '../../shared/avatar/CustomAvatar'; +import styled from 'styled-components'; + +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; type Props = { profileSrc?: string | null; diff --git a/datahub-web-react/src/app/entityV2/user/UserProfile.tsx b/datahub-web-react/src/app/entityV2/user/UserProfile.tsx index 568e3bdffa..5291804d6d 100644 --- a/datahub-web-react/src/app/entityV2/user/UserProfile.tsx +++ b/datahub-web-react/src/app/entityV2/user/UserProfile.tsx @@ -1,30 +1,35 @@ +import { BookOpen } from '@phosphor-icons/react'; import { Col } from 'antd'; import React, { useContext, useState } from 'react'; -import { BookOpen } from '@phosphor-icons/react'; -import colors from '@src/alchemy-components/theme/foundations/colors'; import { matchPath } from 'react-router'; import { useLocation } from 'react-router-dom'; import styled from 'styled-components'; + +import { EntityContext } from '@app/entity/shared/EntityContext'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { + StyledEntitySidebarContainer, + StyledSidebar, +} from '@app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar'; +import EntitySidebarSectionsTab from '@app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab'; +import { EntitySidebarTabs } from '@app/entityV2/shared/containers/profile/sidebar/EntitySidebarTabs'; +import SidebarCollapsibleHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarCollapsibleHeader'; +import { UserAssets } from '@app/entityV2/user/UserAssets'; +import UserGroups from '@app/entityV2/user/UserGroups'; +import UserSideBar from '@app/entityV2/user/UserSidebar'; +import useGetUserGroupUrns from '@app/entityV2/user/useGetUserGroupUrns'; +import CompactContext from '@app/shared/CompactContext'; +import { EntityHead } from '@app/shared/EntityHead'; +import { RoutedTabs } from '@app/shared/RoutedTabs'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; +import colors from '@src/alchemy-components/theme/foundations/colors'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { PageRoutes } from '../../../conf/Global'; -import { useGetUserOwnedAssetsQuery, useGetUserQuery } from '../../../graphql/user.generated'; -import { EntityRelationship, EntityType } from '../../../types.generated'; -import { EntityContext } from '../../entity/shared/EntityContext'; -import { EntityHead } from '../../shared/EntityHead'; -import { GenericEntityProperties } from '../../entity/shared/types'; -import UserGroups from './UserGroups'; -import { RoutedTabs } from '../../shared/RoutedTabs'; -import { UserAssets } from './UserAssets'; -import UserSideBar from './UserSidebar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ErrorSection } from '../../shared/error/ErrorSection'; -import { StyledEntitySidebarContainer, StyledSidebar } from '../shared/containers/profile/sidebar/EntityProfileSidebar'; -import CompactContext from '../../shared/CompactContext'; -import { EntitySidebarTabs } from '../shared/containers/profile/sidebar/EntitySidebarTabs'; -import EntitySidebarSectionsTab from '../shared/containers/profile/sidebar/EntitySidebarSectionsTab'; -import EntitySidebarContext from '../../sharedV2/EntitySidebarContext'; -import SidebarCollapsibleHeader from '../shared/containers/profile/sidebar/SidebarCollapsibleHeader'; -import useGetUserGroupUrns from './useGetUserGroupUrns'; + +import { useGetUserOwnedAssetsQuery, useGetUserQuery } from '@graphql/user.generated'; +import { EntityRelationship, EntityType } from '@types'; export interface Props { urn: string; diff --git a/datahub-web-react/src/app/entityV2/user/UserProfileInfoCard.tsx b/datahub-web-react/src/app/entityV2/user/UserProfileInfoCard.tsx index 5b66fbbb62..aeeb79ddc8 100644 --- a/datahub-web-react/src/app/entityV2/user/UserProfileInfoCard.tsx +++ b/datahub-web-react/src/app/entityV2/user/UserProfileInfoCard.tsx @@ -1,18 +1,19 @@ -import React, { useState } from 'react'; import { Col } from 'antd'; -import { EntityRelationship, SearchResults } from '../../../types.generated'; -import SectionActionButton from '../shared/containers/profile/sidebar/SectionActionButton'; -import UserEditProfileModal from './UserEditProfileModal'; -import CustomAvatar from '../../shared/avatar/CustomAvatar'; +import React, { useState } from 'react'; import { CustomAvatarContainer, - GradientContainer, EditProfileButtonContainer, - WhiteEditOutlinedIconStyle, + GradientContainer, UserInfo, -} from '../shared/SidebarStyledComponents'; -import { UserBasicInfoContainer } from './UserBasicInfoContainer'; + WhiteEditOutlinedIconStyle, +} from '@app/entityV2/shared/SidebarStyledComponents'; +import SectionActionButton from '@app/entityV2/shared/containers/profile/sidebar/SectionActionButton'; +import { UserBasicInfoContainer } from '@app/entityV2/user/UserBasicInfoContainer'; +import UserEditProfileModal from '@app/entityV2/user/UserEditProfileModal'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; + +import { EntityRelationship, SearchResults } from '@types'; const AVATAR_STYLE = { marginRight: '0px', diff --git a/datahub-web-react/src/app/entityV2/user/UserSidebar.tsx b/datahub-web-react/src/app/entityV2/user/UserSidebar.tsx index b92c4cdbeb..74a5271b4a 100644 --- a/datahub-web-react/src/app/entityV2/user/UserSidebar.tsx +++ b/datahub-web-react/src/app/entityV2/user/UserSidebar.tsx @@ -1,13 +1,15 @@ import { message } from 'antd'; import React from 'react'; -import { useUpdateCorpUserPropertiesMutation } from '../../../graphql/user.generated'; -import { DataHubRole } from '../../../types.generated'; -import { SideBar, Content } from '../shared/SidebarStyledComponents'; -import { useUserContext } from '../../context/useUserContext'; -import { UserOwnershipSidebarSection } from '../shared/sidebarSection/UserOwnershipSideBarSection'; -import { AboutSidebarSection } from '../shared/sidebarSection/AboutSidebarSection'; -import { UserGroupSideBarSection } from '../shared/sidebarSection/UserGroupSidebarSection'; -import { SidebarData, UserProfileInfoCard } from './UserProfileInfoCard'; + +import { useUserContext } from '@app/context/useUserContext'; +import { Content, SideBar } from '@app/entityV2/shared/SidebarStyledComponents'; +import { AboutSidebarSection } from '@app/entityV2/shared/sidebarSection/AboutSidebarSection'; +import { UserGroupSideBarSection } from '@app/entityV2/shared/sidebarSection/UserGroupSidebarSection'; +import { UserOwnershipSidebarSection } from '@app/entityV2/shared/sidebarSection/UserOwnershipSideBarSection'; +import { SidebarData, UserProfileInfoCard } from '@app/entityV2/user/UserProfileInfoCard'; + +import { useUpdateCorpUserPropertiesMutation } from '@graphql/user.generated'; +import { DataHubRole } from '@types'; type Props = { sidebarData: SidebarData; diff --git a/datahub-web-react/src/app/entityV2/user/__tests__/UserHeader.test.tsx b/datahub-web-react/src/app/entityV2/user/__tests__/UserHeader.test.tsx index c225d2c8ed..4e9f6c098f 100644 --- a/datahub-web-react/src/app/entityV2/user/__tests__/UserHeader.test.tsx +++ b/datahub-web-react/src/app/entityV2/user/__tests__/UserHeader.test.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { render } from '@testing-library/react'; -import UserHeader from '../UserHeader'; +import React from 'react'; + +import UserHeader from '@app/entityV2/user/UserHeader'; describe('UserHeader', () => { it('renders name, title, skills, teams and email', () => { diff --git a/datahub-web-react/src/app/entityV2/user/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/user/preview/Preview.tsx index 47d7b30d35..9c608c9af8 100644 --- a/datahub-web-react/src/app/entityV2/user/preview/Preview.tsx +++ b/datahub-web-react/src/app/entityV2/user/preview/Preview.tsx @@ -1,12 +1,14 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../shared/constants'; -import { IconStyleType } from '../../Entity'; -import SearchTextHighlighter from '../../../searchV2/matches/SearchTextHighlighter'; + +import { IconStyleType } from '@app/entityV2/Entity'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import SearchTextHighlighter from '@app/searchV2/matches/SearchTextHighlighter'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const PreviewContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/view/ManageViews.tsx b/datahub-web-react/src/app/entityV2/view/ManageViews.tsx index f32c479e00..1633a8ddb8 100644 --- a/datahub-web-react/src/app/entityV2/view/ManageViews.tsx +++ b/datahub-web-react/src/app/entityV2/view/ManageViews.tsx @@ -1,7 +1,8 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { ViewsList } from './ViewsList'; + +import { ViewsList } from '@app/entityV2/view/ViewsList'; const PageContainer = styled.div` padding-top: 20px; diff --git a/datahub-web-react/src/app/entityV2/view/ViewTypeLabel.tsx b/datahub-web-react/src/app/entityV2/view/ViewTypeLabel.tsx index d3c3c414f0..bb3d34ca8d 100644 --- a/datahub-web-react/src/app/entityV2/view/ViewTypeLabel.tsx +++ b/datahub-web-react/src/app/entityV2/view/ViewTypeLabel.tsx @@ -1,8 +1,9 @@ +import { GlobalOutlined, LockOutlined } from '@ant-design/icons'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { GlobalOutlined, LockOutlined } from '@ant-design/icons'; -import { DataHubViewType } from '../../../types.generated'; + +import { DataHubViewType } from '@types'; const StyledLockOutlined = styled(LockOutlined)<{ color }>` color: ${(props) => props.color}; diff --git a/datahub-web-react/src/app/entityV2/view/ViewsList.tsx b/datahub-web-react/src/app/entityV2/view/ViewsList.tsx index 2487783fff..1d02cb9cf3 100644 --- a/datahub-web-react/src/app/entityV2/view/ViewsList.tsx +++ b/datahub-web-react/src/app/entityV2/view/ViewsList.tsx @@ -1,19 +1,21 @@ -import React, { useEffect, useState } from 'react'; -import styled from 'styled-components'; -import { useLocation } from 'react-router'; -import { Button, message, Pagination } from 'antd'; import { PlusOutlined } from '@ant-design/icons'; +import { Button, Pagination, message } from 'antd'; import * as QueryString from 'query-string'; -import { useListMyViewsQuery } from '../../../graphql/view.generated'; -import { SearchBar } from '../../search/SearchBar'; -import TabToolbar from '../shared/components/styled/TabToolbar'; -import { Message } from '../../shared/Message'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { scrollToTop } from '../../shared/searchUtils'; -import { ViewsTable } from './ViewsTable'; -import { DEFAULT_LIST_VIEWS_PAGE_SIZE, searchViews } from './utils'; -import { ViewBuilder } from './builder/ViewBuilder'; -import { ViewBuilderMode } from './builder/types'; +import React, { useEffect, useState } from 'react'; +import { useLocation } from 'react-router'; +import styled from 'styled-components'; + +import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar'; +import { ViewsTable } from '@app/entityV2/view/ViewsTable'; +import { ViewBuilder } from '@app/entityV2/view/builder/ViewBuilder'; +import { ViewBuilderMode } from '@app/entityV2/view/builder/types'; +import { DEFAULT_LIST_VIEWS_PAGE_SIZE, searchViews } from '@app/entityV2/view/utils'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListMyViewsQuery } from '@graphql/view.generated'; const PaginationContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/view/ViewsTable.tsx b/datahub-web-react/src/app/entityV2/view/ViewsTable.tsx index 97d1fe18fe..2ab7042e83 100644 --- a/datahub-web-react/src/app/entityV2/view/ViewsTable.tsx +++ b/datahub-web-react/src/app/entityV2/view/ViewsTable.tsx @@ -1,8 +1,15 @@ -import React from 'react'; import { Empty } from 'antd'; -import { StyledTable } from '../shared/components/styled/StyledTable'; -import { ActionsColumn, DescriptionColumn, NameColumn, ViewTypeColumn } from './select/ViewsTableColumns'; -import { DataHubView } from '../../../types.generated'; +import React from 'react'; + +import { StyledTable } from '@app/entityV2/shared/components/styled/StyledTable'; +import { + ActionsColumn, + DescriptionColumn, + NameColumn, + ViewTypeColumn, +} from '@app/entityV2/view/select/ViewsTableColumns'; + +import { DataHubView } from '@types'; type ViewsTableProps = { views: DataHubView[]; diff --git a/datahub-web-react/src/app/entityV2/view/__tests__/utils.test.ts b/datahub-web-react/src/app/entityV2/view/__tests__/utils.test.ts index 6885e23fdf..84451b7524 100644 --- a/datahub-web-react/src/app/entityV2/view/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/entityV2/view/__tests__/utils.test.ts @@ -1,6 +1,7 @@ -import { searchViewsMock, viewBuilderStateMock } from '../../../../Mocks'; -import { EntityType } from '../../../../types.generated'; -import { convertStateToUpdateInput, convertStateToView, searchViews } from '../utils'; +import { convertStateToUpdateInput, convertStateToView, searchViews } from '@app/entityV2/view/utils'; +import { searchViewsMock, viewBuilderStateMock } from '@src/Mocks'; + +import { EntityType } from '@types'; describe('Entity V2 views utils tests ->', () => { it('should convert an instance of the View builder state into the input required to create or update a view in GraphQL', () => { diff --git a/datahub-web-react/src/app/entityV2/view/builder/ViewBuilder.tsx b/datahub-web-react/src/app/entityV2/view/builder/ViewBuilder.tsx index a51a632db4..0cb79f1d7b 100644 --- a/datahub-web-react/src/app/entityV2/view/builder/ViewBuilder.tsx +++ b/datahub-web-react/src/app/entityV2/view/builder/ViewBuilder.tsx @@ -1,16 +1,18 @@ -import React from 'react'; -import { message } from 'antd'; import { useApolloClient } from '@apollo/client'; -import { useCreateViewMutation, useUpdateViewMutation } from '../../../../graphql/view.generated'; -import { ViewBuilderState } from '../types'; -import { ViewBuilderModal } from './ViewBuilderModal'; -import { updateViewSelectCache, updateListMyViewsCache } from '../cacheUtils'; -import { convertStateToUpdateInput, DEFAULT_LIST_VIEWS_PAGE_SIZE } from '../utils'; -import { useUserContext } from '../../../context/useUserContext'; -import { ViewBuilderMode } from './types'; -import analytics, { EventType } from '../../../analytics'; -import { DataHubView } from '../../../../types.generated'; -import { useSearchVersion } from '../../../search/useSearchAndBrowseVersion'; +import { message } from 'antd'; +import React from 'react'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { ViewBuilderModal } from '@app/entityV2/view/builder/ViewBuilderModal'; +import { ViewBuilderMode } from '@app/entityV2/view/builder/types'; +import { updateListMyViewsCache, updateViewSelectCache } from '@app/entityV2/view/cacheUtils'; +import { ViewBuilderState } from '@app/entityV2/view/types'; +import { DEFAULT_LIST_VIEWS_PAGE_SIZE, convertStateToUpdateInput } from '@app/entityV2/view/utils'; +import { useSearchVersion } from '@app/search/useSearchAndBrowseVersion'; + +import { useCreateViewMutation, useUpdateViewMutation } from '@graphql/view.generated'; +import { DataHubView } from '@types'; type Props = { mode: ViewBuilderMode; diff --git a/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderForm.tsx b/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderForm.tsx index 4c28615b86..664e187863 100644 --- a/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderForm.tsx +++ b/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderForm.tsx @@ -1,13 +1,15 @@ +import { Form, Input, Select, Typography } from 'antd'; import React, { useEffect } from 'react'; import styled from 'styled-components'; -import { Form, Input, Select, Typography } from 'antd'; -import { ViewBuilderState } from '../types'; -import { DataHubViewType } from '../../../../types.generated'; -import { ViewTypeLabel } from '../ViewTypeLabel'; -import { ViewDefinitionBuilder } from './ViewDefinitionBuilder'; -import { ANTD_GRAY } from '../../shared/constants'; -import { useUserContext } from '../../../context/useUserContext'; -import { ViewBuilderMode } from './types'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { ViewTypeLabel } from '@app/entityV2/view/ViewTypeLabel'; +import { ViewDefinitionBuilder } from '@app/entityV2/view/builder/ViewDefinitionBuilder'; +import { ViewBuilderMode } from '@app/entityV2/view/builder/types'; +import { ViewBuilderState } from '@app/entityV2/view/types'; + +import { DataHubViewType } from '@types'; const StyledFormItem = styled(Form.Item)` margin-bottom: 8px; diff --git a/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderModal.tsx b/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderModal.tsx index 6e2c040195..9cf5a6be08 100644 --- a/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderModal.tsx +++ b/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderModal.tsx @@ -1,11 +1,12 @@ +import { Modal, Typography } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { Modal, Typography } from 'antd'; + +import { ViewBuilderForm } from '@app/entityV2/view/builder/ViewBuilderForm'; +import { ViewBuilderMode } from '@app/entityV2/view/builder/types'; +import { DEFAULT_BUILDER_STATE, ViewBuilderState } from '@app/entityV2/view/types'; +import ClickOutside from '@app/shared/ClickOutside'; import { Button } from '@src/alchemy-components'; -import { DEFAULT_BUILDER_STATE, ViewBuilderState } from '../types'; -import { ViewBuilderForm } from './ViewBuilderForm'; -import ClickOutside from '../../../shared/ClickOutside'; -import { ViewBuilderMode } from './types'; const modalWidth = 700; const modalStyle = { top: 40 }; diff --git a/datahub-web-react/src/app/entityV2/view/builder/ViewDefinitionBuilder.tsx b/datahub-web-react/src/app/entityV2/view/builder/ViewDefinitionBuilder.tsx index 93057aa568..2629ee7c77 100644 --- a/datahub-web-react/src/app/entityV2/view/builder/ViewDefinitionBuilder.tsx +++ b/datahub-web-react/src/app/entityV2/view/builder/ViewDefinitionBuilder.tsx @@ -1,17 +1,19 @@ import React from 'react'; import styled from 'styled-components'; -import { LogicalOperator } from '../../../../types.generated'; -import { ENTITY_FILTER_NAME } from '../../../search/utils/constants'; -import { ANTD_GRAY } from '../../shared/constants'; -import { ViewBuilderState } from '../types'; -import { ViewBuilderMode } from './types'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { ViewBuilderMode } from '@app/entityV2/view/builder/types'; +import { fromUnionType, toUnionType } from '@app/entityV2/view/builder/utils'; +import { ViewBuilderState } from '@app/entityV2/view/types'; +import { ENTITY_FILTER_NAME } from '@app/search/utils/constants'; // eslint-disable-next-line import/no-cycle -import SearchFiltersBuilder from '../../../searchV2/filters/SearchFiltersBuilder'; -import { FilterPredicate } from '../../../searchV2/filters/types'; -import { convertToSelectedFilterPredictes } from '../../../searchV2/filters/utils'; -import { convertFrontendToBackendOperatorType } from '../../../searchV2/filters/operator/operator'; -import { VIEW_BUILDER_FIELDS } from '../../../searchV2/filters/field/fields'; -import { fromUnionType, toUnionType } from './utils'; +import SearchFiltersBuilder from '@app/searchV2/filters/SearchFiltersBuilder'; +import { VIEW_BUILDER_FIELDS } from '@app/searchV2/filters/field/fields'; +import { convertFrontendToBackendOperatorType } from '@app/searchV2/filters/operator/operator'; +import { FilterPredicate } from '@app/searchV2/filters/types'; +import { convertToSelectedFilterPredictes } from '@app/searchV2/filters/utils'; + +import { LogicalOperator } from '@types'; const Container = styled.div` border-radius: 4px; diff --git a/datahub-web-react/src/app/entityV2/view/builder/__tests__/utils.test.ts b/datahub-web-react/src/app/entityV2/view/builder/__tests__/utils.test.ts index ee1c17a8ff..8a5ccd3d64 100644 --- a/datahub-web-react/src/app/entityV2/view/builder/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/entityV2/view/builder/__tests__/utils.test.ts @@ -1,9 +1,5 @@ -import { - ENTITY_FILTER_NAME, - ENTITY_SUB_TYPE_FILTER_NAME, - TYPE_NAMES_FILTER_NAME, -} from '../../../../search/utils/constants'; -import { convertNestedSubTypeFilter } from '../utils'; +import { convertNestedSubTypeFilter } from '@app/entityV2/view/builder/utils'; +import { ENTITY_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, TYPE_NAMES_FILTER_NAME } from '@app/search/utils/constants'; describe('view builder utils', () => { it('should convert the nested subtypes filter properly along with other filters', () => { diff --git a/datahub-web-react/src/app/entityV2/view/builder/utils.ts b/datahub-web-react/src/app/entityV2/view/builder/utils.ts index 6f84dcef2d..131d9bc815 100644 --- a/datahub-web-react/src/app/entityV2/view/builder/utils.ts +++ b/datahub-web-react/src/app/entityV2/view/builder/utils.ts @@ -1,18 +1,12 @@ -import { - DataHubViewType, - Entity, - EntityType, - FacetFilter, - FacetFilterInput, - LogicalOperator, -} from '../../../../types.generated'; import { ENTITY_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, - UnionType, FILTER_DELIMITER, TYPE_NAMES_FILTER_NAME, -} from '../../../search/utils/constants'; + UnionType, +} from '@app/search/utils/constants'; + +import { DataHubViewType, Entity, EntityType, FacetFilter, FacetFilterInput, LogicalOperator } from '@types'; /** * Extract the special "Entity Type" filter values from a list diff --git a/datahub-web-react/src/app/entityV2/view/cacheUtils.ts b/datahub-web-react/src/app/entityV2/view/cacheUtils.ts index c8f6d03ef9..17425f98d0 100644 --- a/datahub-web-react/src/app/entityV2/view/cacheUtils.ts +++ b/datahub-web-react/src/app/entityV2/view/cacheUtils.ts @@ -1,11 +1,12 @@ +import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '@app/entityV2/view/utils'; + import { ListGlobalViewsDocument, ListGlobalViewsQuery, ListMyViewsDocument, ListMyViewsQuery, -} from '../../../graphql/view.generated'; -import { DataHubViewType, DataHubView } from '../../../types.generated'; -import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from './utils'; +} from '@graphql/view.generated'; +import { DataHubView, DataHubViewType } from '@types'; /** * This file contains utility classes for manipulating the Apollo Cache diff --git a/datahub-web-react/src/app/entityV2/view/menu/ViewDropdownMenu.tsx b/datahub-web-react/src/app/entityV2/view/menu/ViewDropdownMenu.tsx index 43f7d0fb02..cbd0eb9d61 100644 --- a/datahub-web-react/src/app/entityV2/view/menu/ViewDropdownMenu.tsx +++ b/datahub-web-react/src/app/entityV2/view/menu/ViewDropdownMenu.tsx @@ -1,27 +1,29 @@ -import React, { useState } from 'react'; -import styled from 'styled-components'; import { useApolloClient } from '@apollo/client'; import MoreVertIcon from '@mui/icons-material/MoreVert'; -import { Dropdown, Menu, message, Modal } from 'antd'; -import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; +import { Dropdown, Menu, Modal, message } from 'antd'; +import React, { useState } from 'react'; +import styled from 'styled-components'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { ViewBuilder } from '@app/entityV2/view/builder/ViewBuilder'; +import { ViewBuilderMode } from '@app/entityV2/view/builder/types'; +import { removeFromListMyViewsCache, removeFromViewSelectCaches } from '@app/entityV2/view/cacheUtils'; +import { DeleteViewItem } from '@app/entityV2/view/menu/item/DeleteViewItem'; +import { EditViewItem } from '@app/entityV2/view/menu/item/EditViewItem'; +import { PreviewViewItem } from '@app/entityV2/view/menu/item/PreviewViewItem'; +import { RemoveGlobalDefaultItem } from '@app/entityV2/view/menu/item/RemoveGlobalDefaultItem'; +import { RemoveUserDefaultItem } from '@app/entityV2/view/menu/item/RemoveUserDefaultItem'; +import { SetGlobalDefaultItem } from '@app/entityV2/view/menu/item/SetGlobalDefaultItem'; +import { SetUserDefaultItem } from '@app/entityV2/view/menu/item/SetUserDefaultItem'; +import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '@app/entityV2/view/utils'; import { colors } from '@src/alchemy-components'; -import { DataHubView, DataHubViewType } from '../../../../types.generated'; -import { useUserContext } from '../../../context/useUserContext'; -import { useUpdateCorpUserViewsSettingsMutation } from '../../../../graphql/user.generated'; -import { useUpdateGlobalViewsSettingsMutation } from '../../../../graphql/app.generated'; -import { useDeleteViewMutation } from '../../../../graphql/view.generated'; -import { removeFromListMyViewsCache, removeFromViewSelectCaches } from '../cacheUtils'; -import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '../utils'; -import { ViewBuilderMode } from '../builder/types'; -import { ViewBuilder } from '../builder/ViewBuilder'; -import { EditViewItem } from './item/EditViewItem'; -import { PreviewViewItem } from './item/PreviewViewItem'; -import { RemoveUserDefaultItem } from './item/RemoveUserDefaultItem'; -import { SetUserDefaultItem } from './item/SetUserDefaultItem'; -import { RemoveGlobalDefaultItem } from './item/RemoveGlobalDefaultItem'; -import { SetGlobalDefaultItem } from './item/SetGlobalDefaultItem'; -import { DeleteViewItem } from './item/DeleteViewItem'; -import analytics, { EventType } from '../../../analytics'; +import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; + +import { useUpdateGlobalViewsSettingsMutation } from '@graphql/app.generated'; +import { useUpdateCorpUserViewsSettingsMutation } from '@graphql/user.generated'; +import { useDeleteViewMutation } from '@graphql/view.generated'; +import { DataHubView, DataHubViewType } from '@types'; const MenuButton = styled(MoreVertIcon)<{ $isShowNavBarRedesign?: boolean }>` width: 20px; diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/DeleteViewItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/DeleteViewItem.tsx index 91b147dac1..ca28c77f0e 100644 --- a/datahub-web-react/src/app/entityV2/view/menu/item/DeleteViewItem.tsx +++ b/datahub-web-react/src/app/entityV2/view/menu/item/DeleteViewItem.tsx @@ -1,7 +1,8 @@ +import DeleteOutlineOutlinedIcon from '@mui/icons-material/DeleteOutlineOutlined'; import React from 'react'; import styled from 'styled-components'; -import DeleteOutlineOutlinedIcon from '@mui/icons-material/DeleteOutlineOutlined'; -import { ViewItem } from './ViewItem'; + +import { ViewItem } from '@app/entityV2/view/menu/item/ViewItem'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/EditViewItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/EditViewItem.tsx index 60a78b95ec..2212701071 100644 --- a/datahub-web-react/src/app/entityV2/view/menu/item/EditViewItem.tsx +++ b/datahub-web-react/src/app/entityV2/view/menu/item/EditViewItem.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import EditOutlinedIcon from '@mui/icons-material/EditOutlined'; +import React from 'react'; import styled from 'styled-components'; -import { ViewItem } from './ViewItem'; + +import { ViewItem } from '@app/entityV2/view/menu/item/ViewItem'; const EditOutlinedIconStyled = styled(EditOutlinedIcon)` font-size: 14px !important; diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/IconItemTitle.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/IconItemTitle.tsx index fe8a64fa4c..d2c6757d55 100644 --- a/datahub-web-react/src/app/entityV2/view/menu/item/IconItemTitle.tsx +++ b/datahub-web-react/src/app/entityV2/view/menu/item/IconItemTitle.tsx @@ -1,7 +1,8 @@ +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; -import { ANTD_GRAY } from '../../../shared/constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; const TitleContainer = styled.span` display: flex; diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/PreviewViewItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/PreviewViewItem.tsx index c7ccaf40cb..9adf576aa3 100644 --- a/datahub-web-react/src/app/entityV2/view/menu/item/PreviewViewItem.tsx +++ b/datahub-web-react/src/app/entityV2/view/menu/item/PreviewViewItem.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { EyeOutlined } from '@ant-design/icons'; -import { ViewItem } from './ViewItem'; +import React from 'react'; + +import { ViewItem } from '@app/entityV2/view/menu/item/ViewItem'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/RemoveGlobalDefaultItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/RemoveGlobalDefaultItem.tsx index 03a36badc3..979775f05b 100644 --- a/datahub-web-react/src/app/entityV2/view/menu/item/RemoveGlobalDefaultItem.tsx +++ b/datahub-web-react/src/app/entityV2/view/menu/item/RemoveGlobalDefaultItem.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { StopOutlined } from '@ant-design/icons'; -import { ViewItem } from './ViewItem'; +import React from 'react'; + +import { ViewItem } from '@app/entityV2/view/menu/item/ViewItem'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/RemoveUserDefaultItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/RemoveUserDefaultItem.tsx index 079bbb237a..0567722ef3 100644 --- a/datahub-web-react/src/app/entityV2/view/menu/item/RemoveUserDefaultItem.tsx +++ b/datahub-web-react/src/app/entityV2/view/menu/item/RemoveUserDefaultItem.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { StopOutlined } from '@ant-design/icons'; -import { ViewItem } from './ViewItem'; +import React from 'react'; + +import { ViewItem } from '@app/entityV2/view/menu/item/ViewItem'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/SetGlobalDefaultItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/SetGlobalDefaultItem.tsx index dccf772f7e..f75bd2bb40 100644 --- a/datahub-web-react/src/app/entityV2/view/menu/item/SetGlobalDefaultItem.tsx +++ b/datahub-web-react/src/app/entityV2/view/menu/item/SetGlobalDefaultItem.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { GlobalDefaultViewIcon } from '../../shared/GlobalDefaultViewIcon'; -import { ViewItem } from './ViewItem'; + +import { ViewItem } from '@app/entityV2/view/menu/item/ViewItem'; +import { GlobalDefaultViewIcon } from '@app/entityV2/view/shared/GlobalDefaultViewIcon'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/SetUserDefaultItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/SetUserDefaultItem.tsx index f836631124..19f5086e1a 100644 --- a/datahub-web-react/src/app/entityV2/view/menu/item/SetUserDefaultItem.tsx +++ b/datahub-web-react/src/app/entityV2/view/menu/item/SetUserDefaultItem.tsx @@ -1,9 +1,10 @@ import React from 'react'; -import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { ViewItem } from '@app/entityV2/view/menu/item/ViewItem'; +import { UserDefaultViewIcon } from '@app/entityV2/view/shared/UserDefaultViewIcon'; import { colors } from '@src/alchemy-components'; -import { UserDefaultViewIcon } from '../../shared/UserDefaultViewIcon'; -import { REDESIGN_COLORS } from '../../../shared/constants'; -import { ViewItem } from './ViewItem'; +import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/ViewItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/ViewItem.tsx index 0ac607ce61..94a50c8e1a 100644 --- a/datahub-web-react/src/app/entityV2/view/menu/item/ViewItem.tsx +++ b/datahub-web-react/src/app/entityV2/view/menu/item/ViewItem.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Menu } from 'antd'; -import { IconItemTitle } from './IconItemTitle'; +import React from 'react'; + +import { IconItemTitle } from '@app/entityV2/view/menu/item/IconItemTitle'; type Props = { key: string; diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewOption.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewOption.tsx index 69bdc64da6..eeed9873f3 100644 --- a/datahub-web-react/src/app/entityV2/view/select/ViewOption.tsx +++ b/datahub-web-react/src/app/entityV2/view/select/ViewOption.tsx @@ -1,10 +1,12 @@ +import CloseIcon from '@mui/icons-material/Close'; import React from 'react'; import styled from 'styled-components'; -import CloseIcon from '@mui/icons-material/Close'; + +import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { ViewOptionName } from '@app/entityV2/view/select/ViewOptionName'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { DataHubView } from '../../../../types.generated'; -import { ViewOptionName } from './ViewOptionName'; -import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '../../shared/constants'; + +import { DataHubView } from '@types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewOptionName.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewOptionName.tsx index 72e4f68b92..7c821e0c00 100644 --- a/datahub-web-react/src/app/entityV2/view/select/ViewOptionName.tsx +++ b/datahub-web-react/src/app/entityV2/view/select/ViewOptionName.tsx @@ -1,17 +1,14 @@ -import React from 'react'; -import styled from 'styled-components'; -import { colors, Tooltip } from '@components'; +import { Tooltip, colors } from '@components'; import FilterCenterFocusOutlinedIcon from '@mui/icons-material/FilterCenterFocusOutlined'; import LockOutlinedIcon from '@mui/icons-material/LockOutlined'; import PublicIcon from '@mui/icons-material/Public'; import { GlobeHemisphereEast, Lock } from '@phosphor-icons/react'; -import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '../../shared/constants'; -import { ViewOptionTooltipTitle } from './ViewOptionTooltipTitle'; -import { UserDefaultViewIcon } from '../shared/UserDefaultViewIcon'; -import { GlobalDefaultViewIcon } from '../shared/GlobalDefaultViewIcon'; -import { ViewDropdownMenu } from '../menu/ViewDropdownMenu'; -import { DataHubView } from '../../../../types.generated'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { ViewDropdownMenu } from '@app/entityV2/view/menu/ViewDropdownMenu'; +import { ViewOptionTooltipTitle } from '@app/entityV2/view/select/ViewOptionTooltipTitle'; import { ViewContainer, ViewContent, @@ -19,7 +16,12 @@ import { ViewIcon, ViewIconNavBarRedesign, ViewLabel, -} from './styledComponents'; +} from '@app/entityV2/view/select/styledComponents'; +import { GlobalDefaultViewIcon } from '@app/entityV2/view/shared/GlobalDefaultViewIcon'; +import { UserDefaultViewIcon } from '@app/entityV2/view/shared/UserDefaultViewIcon'; +import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; + +import { DataHubView } from '@types'; const ICON_WIDTH = 30; diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewSelect.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewSelect.tsx index 400d0a0ee0..467812bbf1 100644 --- a/datahub-web-react/src/app/entityV2/view/select/ViewSelect.tsx +++ b/datahub-web-react/src/app/entityV2/view/select/ViewSelect.tsx @@ -1,24 +1,26 @@ +import { Popover, colors } from '@components'; +import { debounce } from 'lodash'; import React, { useEffect, useRef, useState } from 'react'; import { createPortal } from 'react-dom'; import { useHistory } from 'react-router'; -import { colors, Popover } from '@components'; import styled from 'styled-components'; -import { debounce } from 'lodash'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { HALF_SECOND_IN_MS, MAX_ROWS_BEFORE_DEBOUNCE } from '@app/entityV2/shared/tabs/Dataset/Queries/utils/constants'; +import { ViewBuilder } from '@app/entityV2/view/builder/ViewBuilder'; +import { ViewBuilderMode } from '@app/entityV2/view/builder/types'; +import { ViewSelectPopoverContent } from '@app/entityV2/view/select/ViewSelectPopoverContent'; +import { renderSelectedView } from '@app/entityV2/view/select/renderSelectedView'; +import { renderViewOptionGroup } from '@app/entityV2/view/select/renderViewOptionGroup'; +import '@app/entityV2/view/select/style.css'; +import { filterViews } from '@app/entityV2/view/select/utils'; +import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '@app/entityV2/view/utils'; +import { PageRoutes } from '@conf/Global'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { useListMyViewsQuery, useListGlobalViewsQuery } from '../../../../graphql/view.generated'; -import { useUserContext } from '../../../context/useUserContext'; -import { DataHubView, DataHubViewType } from '../../../../types.generated'; -import { ViewBuilder } from '../builder/ViewBuilder'; -import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '../utils'; -import { PageRoutes } from '../../../../conf/Global'; -import { ViewBuilderMode } from '../builder/types'; -import { renderViewOptionGroup } from './renderViewOptionGroup'; -import { renderSelectedView } from './renderSelectedView'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../shared/constants'; -import { HALF_SECOND_IN_MS, MAX_ROWS_BEFORE_DEBOUNCE } from '../../shared/tabs/Dataset/Queries/utils/constants'; -import { filterViews } from './utils'; -import { ViewSelectPopoverContent } from './ViewSelectPopoverContent'; -import './style.css'; + +import { useListGlobalViewsQuery, useListMyViewsQuery } from '@graphql/view.generated'; +import { DataHubView, DataHubViewType } from '@types'; type ViewBuilderDisplayState = { mode: ViewBuilderMode; diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewSelectContent.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewSelectContent.tsx index d5cd11a848..31fe6ce327 100644 --- a/datahub-web-react/src/app/entityV2/view/select/ViewSelectContent.tsx +++ b/datahub-web-react/src/app/entityV2/view/select/ViewSelectContent.tsx @@ -1,9 +1,10 @@ +import { Tooltip } from '@components'; +import AddOutlinedIcon from '@mui/icons-material/AddOutlined'; import React from 'react'; import styled from 'styled-components'; -import AddOutlinedIcon from '@mui/icons-material/AddOutlined'; -import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { Tooltip } from '@components'; -import { ANTD_GRAY } from '../../shared/constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { ViewOptionTooltipTitle } from '@app/entityV2/view/select/ViewOptionTooltipTitle'; import { ViewContainer, ViewContent, @@ -11,9 +12,9 @@ import { ViewIcon, ViewIconNavBarRedesign, ViewLabel, -} from './styledComponents'; -import { Carousel } from '../../../sharedV2/carousel/Carousel'; -import { ViewOptionTooltipTitle } from './ViewOptionTooltipTitle'; +} from '@app/entityV2/view/select/styledComponents'; +import { Carousel } from '@app/sharedV2/carousel/Carousel'; +import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; const StyledCarousel = styled(Carousel)<{ $isShowNavBarRedesign?: boolean }>` gap: ${(props) => (props.$isShowNavBarRedesign ? '8px' : '10px')}; diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewSelectDropdown.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewSelectDropdown.tsx index 428750c0ea..3a08e1d77c 100644 --- a/datahub-web-react/src/app/entityV2/view/select/ViewSelectDropdown.tsx +++ b/datahub-web-react/src/app/entityV2/view/select/ViewSelectDropdown.tsx @@ -1,9 +1,10 @@ import React from 'react'; import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { ViewSelectContent } from '@app/entityV2/view/select/ViewSelectContent'; +import { ViewSelectHeader } from '@app/entityV2/view/select/ViewSelectHeader'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { ViewSelectContent } from './ViewSelectContent'; -import { ViewSelectHeader } from './ViewSelectHeader'; -import { ANTD_GRAY } from '../../shared/constants'; type Props = { children: React.ReactNode; diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewSelectHeader.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewSelectHeader.tsx index 2dd44435d6..df50ad4b5e 100644 --- a/datahub-web-react/src/app/entityV2/view/select/ViewSelectHeader.tsx +++ b/datahub-web-react/src/app/entityV2/view/select/ViewSelectHeader.tsx @@ -1,15 +1,16 @@ -import React from 'react'; -import styled from 'styled-components'; +import { SearchOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; import GridViewIcon from '@mui/icons-material/GridView'; import LockOutlinedIcon from '@mui/icons-material/LockOutlined'; import PublicIcon from '@mui/icons-material/Public'; +import { MagnifyingGlass } from '@phosphor-icons/react'; import { Input } from 'antd'; -import { Tooltip } from '@components'; -import { SearchOutlined } from '@ant-design/icons'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; import { colors } from '@src/alchemy-components'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { MagnifyingGlass } from '@phosphor-icons/react'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../shared/constants'; const StyledInput = styled(Input)<{ $isShowNavBarRedesign?: boolean }>` ${(props) => !props.$isShowNavBarRedesign && 'max-width: 330px;'} diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewSelectPopoverContent.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewSelectPopoverContent.tsx index d44c451ea6..bb7c454932 100644 --- a/datahub-web-react/src/app/entityV2/view/select/ViewSelectPopoverContent.tsx +++ b/datahub-web-react/src/app/entityV2/view/select/ViewSelectPopoverContent.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { ViewSelectDropdown } from './ViewSelectDropdown'; + +import { ViewSelectDropdown } from '@app/entityV2/view/select/ViewSelectDropdown'; interface Props { children: React.ReactNode; diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewsTableColumns.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewsTableColumns.tsx index 48eb3b9add..14f79dc022 100644 --- a/datahub-web-react/src/app/entityV2/view/select/ViewsTableColumns.tsx +++ b/datahub-web-react/src/app/entityV2/view/select/ViewsTableColumns.tsx @@ -1,13 +1,15 @@ +import { Button, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Button, Typography } from 'antd'; -import { DataHubViewType } from '../../../../types.generated'; -import { ANTD_GRAY } from '../../shared/constants'; -import { ViewTypeLabel } from '../ViewTypeLabel'; -import { ViewDropdownMenu } from '../menu/ViewDropdownMenu'; -import { UserDefaultViewIcon } from '../shared/UserDefaultViewIcon'; -import { GlobalDefaultViewIcon } from '../shared/GlobalDefaultViewIcon'; -import { useUserContext } from '../../../context/useUserContext'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { ViewTypeLabel } from '@app/entityV2/view/ViewTypeLabel'; +import { ViewDropdownMenu } from '@app/entityV2/view/menu/ViewDropdownMenu'; +import { GlobalDefaultViewIcon } from '@app/entityV2/view/shared/GlobalDefaultViewIcon'; +import { UserDefaultViewIcon } from '@app/entityV2/view/shared/UserDefaultViewIcon'; + +import { DataHubViewType } from '@types'; const StyledDescription = styled.div` max-width: 300px; diff --git a/datahub-web-react/src/app/entityV2/view/select/renderSelectedView.tsx b/datahub-web-react/src/app/entityV2/view/select/renderSelectedView.tsx index 97cd77d19a..d40730f049 100644 --- a/datahub-web-react/src/app/entityV2/view/select/renderSelectedView.tsx +++ b/datahub-web-react/src/app/entityV2/view/select/renderSelectedView.tsx @@ -1,12 +1,13 @@ +import { Tooltip } from '@components'; +import CloseIcon from '@mui/icons-material/Close'; +import { FadersHorizontal } from '@phosphor-icons/react'; +import { Button } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Button } from 'antd'; -import { Tooltip } from '@components'; + +import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { ViewLabel } from '@app/entityV2/view/select/styledComponents'; import { colors } from '@src/alchemy-components'; -import { FadersHorizontal } from '@phosphor-icons/react'; -import CloseIcon from '@mui/icons-material/Close'; -import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '../../shared/constants'; -import { ViewLabel } from './styledComponents'; const SelectButton = styled(Button)<{ $selectedViewName: string; $isShowNavBarRedesign?: boolean }>` background-color: ${(props) => { diff --git a/datahub-web-react/src/app/entityV2/view/select/renderViewOptionGroup.tsx b/datahub-web-react/src/app/entityV2/view/select/renderViewOptionGroup.tsx index 8b35474d1b..51c3ffe1dc 100644 --- a/datahub-web-react/src/app/entityV2/view/select/renderViewOptionGroup.tsx +++ b/datahub-web-react/src/app/entityV2/view/select/renderViewOptionGroup.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import { DataHubView } from '../../../../types.generated'; -import { ViewOption } from './ViewOption'; -import { UserContextType } from '../../../context/userContext'; + +import { UserContextType } from '@app/context/userContext'; +import { ViewOption } from '@app/entityV2/view/select/ViewOption'; + +import { DataHubView } from '@types'; const selectOptionStyle = { paddingLeft: 0 }; diff --git a/datahub-web-react/src/app/entityV2/view/select/styledComponents.tsx b/datahub-web-react/src/app/entityV2/view/select/styledComponents.tsx index 7dbff2d78a..2655c46ca4 100644 --- a/datahub-web-react/src/app/entityV2/view/select/styledComponents.tsx +++ b/datahub-web-react/src/app/entityV2/view/select/styledComponents.tsx @@ -1,8 +1,9 @@ import { RightOutlined } from '@ant-design/icons'; import { Button } from 'antd'; import styled from 'styled-components'; + +import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '@app/entityV2/shared/constants'; import { colors } from '@src/alchemy-components'; -import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '../../shared/constants'; export const NoMarginButton = styled(Button)` && { diff --git a/datahub-web-react/src/app/entityV2/view/shared/DefaultViewIcon.tsx b/datahub-web-react/src/app/entityV2/view/shared/DefaultViewIcon.tsx index 20751d9554..5095e9b7a3 100644 --- a/datahub-web-react/src/app/entityV2/view/shared/DefaultViewIcon.tsx +++ b/datahub-web-react/src/app/entityV2/view/shared/DefaultViewIcon.tsx @@ -1,6 +1,6 @@ +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; const CircleContainer = styled.span<{ size?: number }>` width: ${(props) => (props.size ? props.size : 10)}px; diff --git a/datahub-web-react/src/app/entityV2/view/shared/GlobalDefaultViewIcon.tsx b/datahub-web-react/src/app/entityV2/view/shared/GlobalDefaultViewIcon.tsx index d5d645cd3a..2a4b94567c 100644 --- a/datahub-web-react/src/app/entityV2/view/shared/GlobalDefaultViewIcon.tsx +++ b/datahub-web-react/src/app/entityV2/view/shared/GlobalDefaultViewIcon.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { ANTD_GRAY } from '../../shared/constants'; -import { DefaultViewIcon } from './DefaultViewIcon'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { DefaultViewIcon } from '@app/entityV2/view/shared/DefaultViewIcon'; type Props = { title?: React.ReactNode; diff --git a/datahub-web-react/src/app/entityV2/view/shared/UserDefaultViewIcon.tsx b/datahub-web-react/src/app/entityV2/view/shared/UserDefaultViewIcon.tsx index e80f6cf2b5..0739106297 100644 --- a/datahub-web-react/src/app/entityV2/view/shared/UserDefaultViewIcon.tsx +++ b/datahub-web-react/src/app/entityV2/view/shared/UserDefaultViewIcon.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { REDESIGN_COLORS } from '../../shared/constants'; -import { DefaultViewIcon } from './DefaultViewIcon'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { DefaultViewIcon } from '@app/entityV2/view/shared/DefaultViewIcon'; type Props = { title?: React.ReactNode; diff --git a/datahub-web-react/src/app/entityV2/view/types.ts b/datahub-web-react/src/app/entityV2/view/types.ts index 7cb89869d3..7eb313ab48 100644 --- a/datahub-web-react/src/app/entityV2/view/types.ts +++ b/datahub-web-react/src/app/entityV2/view/types.ts @@ -1,4 +1,4 @@ -import { DataHubViewFilter, DataHubViewType, EntityType, LogicalOperator } from '../../../types.generated'; +import { DataHubViewFilter, DataHubViewType, EntityType, LogicalOperator } from '@types'; /** * Default builder state when creating a new View. diff --git a/datahub-web-react/src/app/entityV2/view/utils.ts b/datahub-web-react/src/app/entityV2/view/utils.ts index 0952cacb5a..9d38792505 100644 --- a/datahub-web-react/src/app/entityV2/view/utils.ts +++ b/datahub-web-react/src/app/entityV2/view/utils.ts @@ -1,5 +1,6 @@ -import { DataHubView, DataHubViewType, EntityType, LogicalOperator } from '../../../types.generated'; -import { ViewBuilderState } from './types'; +import { ViewBuilderState } from '@app/entityV2/view/types'; + +import { DataHubView, DataHubViewType, EntityType, LogicalOperator } from '@types'; /** * The max single-page results in both the View Select and Manage Views list. diff --git a/datahub-web-react/src/app/glossary/BusinessGlossaryPage.tsx b/datahub-web-react/src/app/glossary/BusinessGlossaryPage.tsx index 78944f19ca..09dd261b62 100644 --- a/datahub-web-react/src/app/glossary/BusinessGlossaryPage.tsx +++ b/datahub-web-react/src/app/glossary/BusinessGlossaryPage.tsx @@ -1,27 +1,29 @@ -import React, { useEffect, useState } from 'react'; -import { Button, Typography } from 'antd'; import { PlusOutlined } from '@ant-design/icons'; +import { Button, Typography } from 'antd'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components/macro'; -import { useGetRootGlossaryNodesQuery, useGetRootGlossaryTermsQuery } from '../../graphql/glossary.generated'; -import TabToolbar from '../entity/shared/components/styled/TabToolbar'; -import GlossaryEntitiesList from './GlossaryEntitiesList'; -import EmptyGlossarySection from './EmptyGlossarySection'; -import CreateGlossaryEntityModal from '../entity/shared/EntityDropdown/CreateGlossaryEntityModal'; -import { EntityType } from '../../types.generated'; -import { Message } from '../shared/Message'; -import { sortGlossaryTerms } from '../entity/glossaryTerm/utils'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { sortGlossaryNodes } from '../entity/glossaryNode/utils'; + +import { useUserContext } from '@app/context/useUserContext'; +import { sortGlossaryNodes } from '@app/entity/glossaryNode/utils'; +import { sortGlossaryTerms } from '@app/entity/glossaryTerm/utils'; +import CreateGlossaryEntityModal from '@app/entity/shared/EntityDropdown/CreateGlossaryEntityModal'; +import { useGlossaryEntityData } from '@app/entity/shared/GlossaryEntityContext'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import EmptyGlossarySection from '@app/glossary/EmptyGlossarySection'; +import GlossaryEntitiesList from '@app/glossary/GlossaryEntitiesList'; +import useToggleSidebar from '@app/glossary/useToggleSidebar'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; import { - BUSINESS_GLOSSARY_INTRO_ID, - BUSINESS_GLOSSARY_CREATE_TERM_ID, BUSINESS_GLOSSARY_CREATE_TERM_GROUP_ID, -} from '../onboarding/config/BusinessGlossaryOnboardingConfig'; -import { OnboardingTour } from '../onboarding/OnboardingTour'; -import { useGlossaryEntityData } from '../entity/shared/GlossaryEntityContext'; -import { useUserContext } from '../context/useUserContext'; -import useToggleSidebar from './useToggleSidebar'; -import ToggleSidebarButton from '../search/ToggleSidebarButton'; + BUSINESS_GLOSSARY_CREATE_TERM_ID, + BUSINESS_GLOSSARY_INTRO_ID, +} from '@app/onboarding/config/BusinessGlossaryOnboardingConfig'; +import ToggleSidebarButton from '@app/search/ToggleSidebarButton'; +import { Message } from '@app/shared/Message'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetRootGlossaryNodesQuery, useGetRootGlossaryTermsQuery } from '@graphql/glossary.generated'; +import { EntityType } from '@types'; export const HeaderWrapper = styled(TabToolbar)` padding: 15px 45px 10px 24px; diff --git a/datahub-web-react/src/app/glossary/EmptyGlossarySection.tsx b/datahub-web-react/src/app/glossary/EmptyGlossarySection.tsx index 033739e8d0..ef6eaa1563 100644 --- a/datahub-web-react/src/app/glossary/EmptyGlossarySection.tsx +++ b/datahub-web-react/src/app/glossary/EmptyGlossarySection.tsx @@ -2,10 +2,12 @@ import { PlusOutlined } from '@ant-design/icons'; import { Button, Empty, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { EntityType } from '../../types.generated'; -import { useEntityData } from '../entity/shared/EntityContext'; -import CreateGlossaryEntityModal from '../entity/shared/EntityDropdown/CreateGlossaryEntityModal'; -import { useUserContext } from '../context/useUserContext'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import CreateGlossaryEntityModal from '@app/entity/shared/EntityDropdown/CreateGlossaryEntityModal'; + +import { EntityType } from '@types'; const StyledEmpty = styled(Empty)` padding: 80px 40px; diff --git a/datahub-web-react/src/app/glossary/GloassarySearchResultItem.tsx b/datahub-web-react/src/app/glossary/GloassarySearchResultItem.tsx index 03a384aab4..0bf9612674 100644 --- a/datahub-web-react/src/app/glossary/GloassarySearchResultItem.tsx +++ b/datahub-web-react/src/app/glossary/GloassarySearchResultItem.tsx @@ -1,14 +1,16 @@ // Create a new component called SearchResultItem.js import React from 'react'; -import { Link } from 'react-router-dom'; import Highlight from 'react-highlighter'; +import { Link } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { Entity } from '../../types.generated'; -import { IconStyleType } from '../entity/Entity'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import ParentEntities from '../search/filters/ParentEntities'; -import { getParentGlossary } from './utils'; -import EntityRegistry from '../entity/EntityRegistry'; + +import { IconStyleType } from '@app/entity/Entity'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { getParentGlossary } from '@app/glossary/utils'; +import ParentEntities from '@app/search/filters/ParentEntities'; + +import { Entity } from '@types'; type Props = { entity: Entity; diff --git a/datahub-web-react/src/app/glossary/GlossaryBrowser/GlossaryBrowser.tsx b/datahub-web-react/src/app/glossary/GlossaryBrowser/GlossaryBrowser.tsx index 53390d359f..c25307afbd 100644 --- a/datahub-web-react/src/app/glossary/GlossaryBrowser/GlossaryBrowser.tsx +++ b/datahub-web-react/src/app/glossary/GlossaryBrowser/GlossaryBrowser.tsx @@ -1,17 +1,19 @@ +import { LoadingOutlined } from '@ant-design/icons'; import React, { useEffect } from 'react'; import styled from 'styled-components/macro'; -import { LoadingOutlined } from '@ant-design/icons'; + +import { sortGlossaryNodes } from '@app/entity/glossaryNode/utils'; +import { sortGlossaryTerms } from '@app/entity/glossaryTerm/utils'; +import { useGlossaryEntityData } from '@app/entity/shared/GlossaryEntityContext'; +import NodeItem from '@app/glossary/GlossaryBrowser/NodeItem'; +import TermItem from '@app/glossary/GlossaryBrowser/TermItem'; +import { ROOT_NODES, ROOT_TERMS } from '@app/glossary/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { ANTD_GRAY } from '@src/app/entity/shared/constants'; -import { useGetRootGlossaryNodesQuery, useGetRootGlossaryTermsQuery } from '../../../graphql/glossary.generated'; -import { ChildGlossaryTermFragment } from '../../../graphql/glossaryNode.generated'; -import { GlossaryNode } from '../../../types.generated'; -import { sortGlossaryNodes } from '../../entity/glossaryNode/utils'; -import { sortGlossaryTerms } from '../../entity/glossaryTerm/utils'; -import { useGlossaryEntityData } from '../../entity/shared/GlossaryEntityContext'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ROOT_NODES, ROOT_TERMS } from '../utils'; -import NodeItem from './NodeItem'; -import TermItem from './TermItem'; + +import { useGetRootGlossaryNodesQuery, useGetRootGlossaryTermsQuery } from '@graphql/glossary.generated'; +import { ChildGlossaryTermFragment } from '@graphql/glossaryNode.generated'; +import { GlossaryNode } from '@types'; const BrowserWrapper = styled.div` color: #262626; diff --git a/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx b/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx index 643d478f1e..72b132056b 100644 --- a/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx +++ b/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx @@ -1,15 +1,17 @@ -import { RightOutlined, DownOutlined, LoadingOutlined } from '@ant-design/icons'; -import styled from 'styled-components/macro'; -import React, { useState, useEffect } from 'react'; +import { DownOutlined, LoadingOutlined, RightOutlined } from '@ant-design/icons'; import { BookmarksSimple } from '@phosphor-icons/react'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { EntityType, GlossaryNode, GlossaryTerm } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { useGetGlossaryNodeQuery } from '../../../graphql/glossaryNode.generated'; -import TermItem, { TermLink as NodeLink, NameWrapper } from './TermItem'; -import { sortGlossaryNodes } from '../../entity/glossaryNode/utils'; -import { sortGlossaryTerms } from '../../entity/glossaryTerm/utils'; -import { useGlossaryEntityData } from '../../entity/shared/GlossaryEntityContext'; +import React, { useEffect, useState } from 'react'; +import styled from 'styled-components/macro'; + +import { sortGlossaryNodes } from '@app/entity/glossaryNode/utils'; +import { sortGlossaryTerms } from '@app/entity/glossaryTerm/utils'; +import { useGlossaryEntityData } from '@app/entity/shared/GlossaryEntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import TermItem, { NameWrapper, TermLink as NodeLink } from '@app/glossary/GlossaryBrowser/TermItem'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetGlossaryNodeQuery } from '@graphql/glossaryNode.generated'; +import { EntityType, GlossaryNode, GlossaryTerm } from '@types'; const ItemWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/glossary/GlossaryBrowser/TermItem.tsx b/datahub-web-react/src/app/glossary/GlossaryBrowser/TermItem.tsx index 381d8a3980..0d38924dcd 100644 --- a/datahub-web-react/src/app/glossary/GlossaryBrowser/TermItem.tsx +++ b/datahub-web-react/src/app/glossary/GlossaryBrowser/TermItem.tsx @@ -1,11 +1,13 @@ import React from 'react'; -import styled from 'styled-components/macro'; import { Link } from 'react-router-dom'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { ChildGlossaryTermFragment } from '../../../graphql/glossaryNode.generated'; -import { useGlossaryEntityData } from '../../entity/shared/GlossaryEntityContext'; -import { useGlossaryActiveTabPath } from '../../entity/shared/containers/profile/utils'; +import styled from 'styled-components/macro'; + +import { useGlossaryEntityData } from '@app/entity/shared/GlossaryEntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useGlossaryActiveTabPath } from '@app/entity/shared/containers/profile/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { ChildGlossaryTermFragment } from '@graphql/glossaryNode.generated'; const TermWrapper = styled.div` font-weight: normal; diff --git a/datahub-web-react/src/app/glossary/GlossaryEntitiesList.tsx b/datahub-web-react/src/app/glossary/GlossaryEntitiesList.tsx index ed1744d800..34c2e45ce4 100644 --- a/datahub-web-react/src/app/glossary/GlossaryEntitiesList.tsx +++ b/datahub-web-react/src/app/glossary/GlossaryEntitiesList.tsx @@ -1,10 +1,12 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { GlossaryNodeFragment } from '../../graphql/fragments.generated'; -import { ChildGlossaryTermFragment } from '../../graphql/glossaryNode.generated'; -import { GlossaryNode, GlossaryTerm } from '../../types.generated'; -import { useEntityRegistry } from '../useEntityRegistry'; -import GlossaryEntityItem from './GlossaryEntityItem'; + +import GlossaryEntityItem from '@app/glossary/GlossaryEntityItem'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GlossaryNodeFragment } from '@graphql/fragments.generated'; +import { ChildGlossaryTermFragment } from '@graphql/glossaryNode.generated'; +import { GlossaryNode, GlossaryTerm } from '@types'; const EntitiesWrapper = styled.div` flex: 1; diff --git a/datahub-web-react/src/app/glossary/GlossaryEntitiesPath.tsx b/datahub-web-react/src/app/glossary/GlossaryEntitiesPath.tsx index 859ea40bd1..70bf81ac9a 100644 --- a/datahub-web-react/src/app/glossary/GlossaryEntitiesPath.tsx +++ b/datahub-web-react/src/app/glossary/GlossaryEntitiesPath.tsx @@ -3,12 +3,14 @@ import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { PageRoutes } from '../../conf/Global'; -import { GlossaryNode, GlossaryTerm, ParentNodesResult } from '../../types.generated'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { BreadcrumbItem } from '../entity/shared/containers/profile/nav/ProfileNavBrowsePath'; -import { useGlossaryEntityData } from '../entity/shared/GlossaryEntityContext'; -import { useEntityRegistry } from '../useEntityRegistry'; + +import { useGlossaryEntityData } from '@app/entity/shared/GlossaryEntityContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { BreadcrumbItem } from '@app/entity/shared/containers/profile/nav/ProfileNavBrowsePath'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; + +import { GlossaryNode, GlossaryTerm, ParentNodesResult } from '@types'; const PathWrapper = styled.div` border-bottom: 1px solid ${ANTD_GRAY[4.5]}; diff --git a/datahub-web-react/src/app/glossary/GlossaryEntityItem.tsx b/datahub-web-react/src/app/glossary/GlossaryEntityItem.tsx index 5e2ed055ec..b7ef2f054f 100644 --- a/datahub-web-react/src/app/glossary/GlossaryEntityItem.tsx +++ b/datahub-web-react/src/app/glossary/GlossaryEntityItem.tsx @@ -1,11 +1,13 @@ -import React from 'react'; import { FolderOutlined, RightOutlined } from '@ant-design/icons'; -import styled from 'styled-components/macro'; import { Maybe } from 'graphql/jsutils/Maybe'; +import React from 'react'; import { Link } from 'react-router-dom'; -import { EntityType } from '../../types.generated'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { useEntityRegistry } from '../useEntityRegistry'; +import styled from 'styled-components/macro'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const ItemWrapper = styled.div` transition: 0.15s; diff --git a/datahub-web-react/src/app/glossary/GlossaryRoutes.tsx b/datahub-web-react/src/app/glossary/GlossaryRoutes.tsx index df21a14bde..a745f44694 100644 --- a/datahub-web-react/src/app/glossary/GlossaryRoutes.tsx +++ b/datahub-web-react/src/app/glossary/GlossaryRoutes.tsx @@ -1,18 +1,19 @@ import React, { useState } from 'react'; +import { Redirect, Route, Switch } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { Switch, Route, Redirect } from 'react-router-dom'; -import { PageRoutes } from '../../conf/Global'; -import { GlossaryEntityContext } from '../entity/shared/GlossaryEntityContext'; -import { GenericEntityProperties } from '../entity/shared/types'; -import BusinessGlossaryPage from './BusinessGlossaryPage'; -import BusinessGlossaryPageV2 from '../glossaryV2/BusinessGlossaryPage'; -import { EntityPage } from '../entity/EntityPage'; -import GlossarySidebar from './GlossarySidebar'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { useAppConfig } from '../useAppConfig'; -import { useGetAuthenticatedUser } from '../useGetAuthenticatedUser'; -import { shouldShowGlossary } from '../identity/user/UserUtils'; -import { useIsThemeV2 } from '../useIsThemeV2'; + +import { EntityPage } from '@app/entity/EntityPage'; +import { GlossaryEntityContext } from '@app/entity/shared/GlossaryEntityContext'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import BusinessGlossaryPage from '@app/glossary/BusinessGlossaryPage'; +import GlossarySidebar from '@app/glossary/GlossarySidebar'; +import BusinessGlossaryPageV2 from '@app/glossaryV2/BusinessGlossaryPage'; +import { shouldShowGlossary } from '@app/identity/user/UserUtils'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { useGetAuthenticatedUser } from '@app/useGetAuthenticatedUser'; +import { useIsThemeV2 } from '@app/useIsThemeV2'; +import { PageRoutes } from '@conf/Global'; const ContentWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/glossary/GlossarySearch.tsx b/datahub-web-react/src/app/glossary/GlossarySearch.tsx index 160f8e66d7..947ca5b2c1 100644 --- a/datahub-web-react/src/app/glossary/GlossarySearch.tsx +++ b/datahub-web-react/src/app/glossary/GlossarySearch.tsx @@ -1,12 +1,14 @@ import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { useGetSearchResultsForMultipleQuery } from '../../graphql/search.generated'; -import { EntityType } from '../../types.generated'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { SearchBar } from '../search/SearchBar'; -import ClickOutside from '../shared/ClickOutside'; -import { useEntityRegistry } from '../useEntityRegistry'; -import GloassarySearchResultItem from './GloassarySearchResultItem'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import GloassarySearchResultItem from '@app/glossary/GloassarySearchResultItem'; +import { SearchBar } from '@app/search/SearchBar'; +import ClickOutside from '@app/shared/ClickOutside'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; const GlossarySearchWrapper = styled.div` position: relative; @@ -15,7 +17,10 @@ const GlossarySearchWrapper = styled.div` const ResultsWrapper = styled.div` background-color: white; border-radius: 5px; - box-shadow: 0 3px 6px -4px rgb(0 0 0 / 12%), 0 6px 16px 0 rgb(0 0 0 / 8%), 0 9px 28px 8px rgb(0 0 0 / 5%); + box-shadow: + 0 3px 6px -4px rgb(0 0 0 / 12%), + 0 6px 16px 0 rgb(0 0 0 / 8%), + 0 9px 28px 8px rgb(0 0 0 / 5%); max-height: 380px; overflow: auto; padding: 8px; diff --git a/datahub-web-react/src/app/glossary/GlossarySidebar.tsx b/datahub-web-react/src/app/glossary/GlossarySidebar.tsx index 4fa99da70e..14da55d613 100644 --- a/datahub-web-react/src/app/glossary/GlossarySidebar.tsx +++ b/datahub-web-react/src/app/glossary/GlossarySidebar.tsx @@ -1,9 +1,10 @@ import React, { useEffect, useState } from 'react'; -import GlossarySearch from './GlossarySearch'; -import GlossaryBrowser from './GlossaryBrowser/GlossaryBrowser'; -import { ProfileSidebarResizer } from '../entity/shared/containers/profile/sidebar/ProfileSidebarResizer'; -import { SidebarWrapper } from '../shared/sidebar/components'; -import { useGlossaryEntityData } from '../entity/shared/GlossaryEntityContext'; + +import { useGlossaryEntityData } from '@app/entity/shared/GlossaryEntityContext'; +import { ProfileSidebarResizer } from '@app/entity/shared/containers/profile/sidebar/ProfileSidebarResizer'; +import GlossaryBrowser from '@app/glossary/GlossaryBrowser/GlossaryBrowser'; +import GlossarySearch from '@app/glossary/GlossarySearch'; +import { SidebarWrapper } from '@app/shared/sidebar/components'; export const MAX_BROWSER_WIDTH = 500; export const MIN_BROWSWER_WIDTH = 200; diff --git a/datahub-web-react/src/app/glossary/__tests__/utils.test.ts b/datahub-web-react/src/app/glossary/__tests__/utils.test.ts index 91f50f6dfd..5135d5a619 100644 --- a/datahub-web-react/src/app/glossary/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/glossary/__tests__/utils.test.ts @@ -1,6 +1,7 @@ -import { EntityType } from '../../../types.generated'; -import { glossaryNode1, glossaryNode3, glossaryTerm1 } from '../../../Mocks'; -import { getParentNodeToUpdate, getGlossaryRootToUpdate, ROOT_NODES, ROOT_TERMS } from '../utils'; +import { ROOT_NODES, ROOT_TERMS, getGlossaryRootToUpdate, getParentNodeToUpdate } from '@app/glossary/utils'; +import { glossaryNode1, glossaryNode3, glossaryTerm1 } from '@src/Mocks'; + +import { EntityType } from '@types'; const glossaryTermWithParent = { ...glossaryTerm1, diff --git a/datahub-web-react/src/app/glossary/cacheUtils.ts b/datahub-web-react/src/app/glossary/cacheUtils.ts index f70901bf71..5b7732da2c 100644 --- a/datahub-web-react/src/app/glossary/cacheUtils.ts +++ b/datahub-web-react/src/app/glossary/cacheUtils.ts @@ -1,5 +1,6 @@ import { ApolloClient } from '@apollo/client'; -import { GetGlossaryNodeDocument, GetGlossaryNodeQuery } from '../../graphql/glossaryNode.generated'; + +import { GetGlossaryNodeDocument, GetGlossaryNodeQuery } from '@graphql/glossaryNode.generated'; export function removeTermFromGlossaryNode( client: ApolloClient, diff --git a/datahub-web-react/src/app/glossary/useToggleSidebar.tsx b/datahub-web-react/src/app/glossary/useToggleSidebar.tsx index 3f2e02385d..f7224f5dc3 100644 --- a/datahub-web-react/src/app/glossary/useToggleSidebar.tsx +++ b/datahub-web-react/src/app/glossary/useToggleSidebar.tsx @@ -1,5 +1,5 @@ -import { useGlossaryEntityData } from '../entity/shared/GlossaryEntityContext'; -import useToggle from '../shared/useToggle'; +import { useGlossaryEntityData } from '@app/entity/shared/GlossaryEntityContext'; +import useToggle from '@app/shared/useToggle'; const useToggleSidebar = () => { const { isSidebarOpen, setIsSidebarOpen } = useGlossaryEntityData(); diff --git a/datahub-web-react/src/app/glossary/utils.ts b/datahub-web-react/src/app/glossary/utils.ts index dc08d3ae3e..76deae2de0 100644 --- a/datahub-web-react/src/app/glossary/utils.ts +++ b/datahub-web-react/src/app/glossary/utils.ts @@ -1,6 +1,7 @@ -import { Entity, EntityType } from '../../types.generated'; -import EntityRegistry from '../entity/EntityRegistry'; -import { GenericEntityProperties } from '../entity/shared/types'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + +import { Entity, EntityType } from '@types'; export const ROOT_NODES = 'rootNodes'; export const ROOT_TERMS = 'rootTerms'; diff --git a/datahub-web-react/src/app/glossaryV2/BusinessGlossaryPage.tsx b/datahub-web-react/src/app/glossaryV2/BusinessGlossaryPage.tsx index bb78071252..3e0661a8a5 100644 --- a/datahub-web-react/src/app/glossaryV2/BusinessGlossaryPage.tsx +++ b/datahub-web-react/src/app/glossaryV2/BusinessGlossaryPage.tsx @@ -1,22 +1,24 @@ import React, { useEffect, useState } from 'react'; import styled from 'styled-components/macro'; -import { useGetRootGlossaryNodesQuery, useGetRootGlossaryTermsQuery } from '../../graphql/glossary.generated'; -import CreateGlossaryEntityModal from '../entityV2/shared/EntityDropdown/CreateGlossaryEntityModal'; -import { EntityType } from '../../types.generated'; -import { Message } from '../shared/Message'; -import { sortGlossaryTerms } from '../entityV2/glossaryTerm/utils'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { sortGlossaryNodes } from '../entityV2/glossaryNode/utils'; + +import { useUserContext } from '@app/context/useUserContext'; +import { sortGlossaryNodes } from '@app/entityV2/glossaryNode/utils'; +import { sortGlossaryTerms } from '@app/entityV2/glossaryTerm/utils'; +import CreateGlossaryEntityModal from '@app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal'; +import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext'; +import GlossaryContentProvider from '@app/glossaryV2/GlossaryContentProvider'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; import { - BUSINESS_GLOSSARY_INTRO_ID, - BUSINESS_GLOSSARY_CREATE_TERM_ID, BUSINESS_GLOSSARY_CREATE_TERM_GROUP_ID, -} from '../onboarding/config/BusinessGlossaryOnboardingConfig'; -import { OnboardingTour } from '../onboarding/OnboardingTour'; -import { useGlossaryEntityData } from '../entityV2/shared/GlossaryEntityContext'; -import { useUserContext } from '../context/useUserContext'; -import GlossaryContentProvider from './GlossaryContentProvider'; -import { useShowNavBarRedesign } from '../useShowNavBarRedesign'; + BUSINESS_GLOSSARY_CREATE_TERM_ID, + BUSINESS_GLOSSARY_INTRO_ID, +} from '@app/onboarding/config/BusinessGlossaryOnboardingConfig'; +import { Message } from '@app/shared/Message'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign'; + +import { useGetRootGlossaryNodesQuery, useGetRootGlossaryTermsQuery } from '@graphql/glossary.generated'; +import { EntityType } from '@types'; const GlossaryWrapper = styled.div<{ $isShowNavBarRedesign?: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/glossaryV2/EmptyGlossarySection.tsx b/datahub-web-react/src/app/glossaryV2/EmptyGlossarySection.tsx index 0a87cfbe9e..70c7ded434 100644 --- a/datahub-web-react/src/app/glossaryV2/EmptyGlossarySection.tsx +++ b/datahub-web-react/src/app/glossaryV2/EmptyGlossarySection.tsx @@ -2,10 +2,12 @@ import { PlusOutlined } from '@ant-design/icons'; import { Button, Empty, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { EntityType } from '../../types.generated'; -import { useEntityData } from '../entity/shared/EntityContext'; -import CreateGlossaryEntityModal from '../entityV2/shared/EntityDropdown/CreateGlossaryEntityModal'; -import { useUserContext } from '../context/useUserContext'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import CreateGlossaryEntityModal from '@app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal'; + +import { EntityType } from '@types'; const StyledEmpty = styled(Empty)` padding: 80px 40px; diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/GlossaryBrowser.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/GlossaryBrowser.tsx index e9e295c93c..3517ac4f42 100644 --- a/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/GlossaryBrowser.tsx +++ b/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/GlossaryBrowser.tsx @@ -1,17 +1,19 @@ +import { LoadingOutlined } from '@ant-design/icons'; import React, { useEffect } from 'react'; import styled from 'styled-components/macro'; -import { LoadingOutlined } from '@ant-design/icons'; -import { useGetRootGlossaryNodesQuery, useGetRootGlossaryTermsQuery } from '../../../graphql/glossary.generated'; -import { ChildGlossaryTermFragment } from '../../../graphql/glossaryNode.generated'; -import { GlossaryNodeFragment } from '../../../graphql/fragments.generated'; -import { sortGlossaryNodes } from '../../entityV2/glossaryNode/utils'; -import { sortGlossaryTerms } from '../../entityV2/glossaryTerm/utils'; -import { useGlossaryEntityData } from '../../entityV2/shared/GlossaryEntityContext'; -import { ANTD_GRAY } from '../../entityV2/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ROOT_NODES, ROOT_TERMS } from '../utils'; -import NodeItem from './NodeItem'; -import TermItem from './TermItem'; + +import { sortGlossaryNodes } from '@app/entityV2/glossaryNode/utils'; +import { sortGlossaryTerms } from '@app/entityV2/glossaryTerm/utils'; +import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import NodeItem from '@app/glossaryV2/GlossaryBrowser/NodeItem'; +import TermItem from '@app/glossaryV2/GlossaryBrowser/TermItem'; +import { ROOT_NODES, ROOT_TERMS } from '@app/glossaryV2/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GlossaryNodeFragment } from '@graphql/fragments.generated'; +import { useGetRootGlossaryNodesQuery, useGetRootGlossaryTermsQuery } from '@graphql/glossary.generated'; +import { ChildGlossaryTermFragment } from '@graphql/glossaryNode.generated'; const BrowserWrapper = styled.div` color: ${ANTD_GRAY[11]}; diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/NodeItem.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/NodeItem.tsx index 887e0419f3..a7bafd25ad 100644 --- a/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/NodeItem.tsx +++ b/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/NodeItem.tsx @@ -1,18 +1,20 @@ -import React, { useState, useEffect } from 'react'; import { LoadingOutlined } from '@ant-design/icons'; import { colors } from '@components'; import { KeyboardArrowDownRounded, KeyboardArrowRightRounded } from '@mui/icons-material'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components/macro'; -import { Entity, EntityType, GlossaryNode, GlossaryTerm } from '../../../types.generated'; -import { GlossaryNodeFragment } from '../../../graphql/fragments.generated'; -import { REDESIGN_COLORS } from '../../entityV2/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { useGetGlossaryNodeQuery } from '../../../graphql/glossaryNode.generated'; -import TermItem, { TermLink as NodeLink, NameWrapper } from './TermItem'; -import { sortGlossaryNodes } from '../../entityV2/glossaryNode/utils'; -import { sortGlossaryTerms } from '../../entityV2/glossaryTerm/utils'; -import { useGlossaryEntityData } from '../../entityV2/shared/GlossaryEntityContext'; -import { generateColorFromPalette } from '../colorUtils'; + +import { sortGlossaryNodes } from '@app/entityV2/glossaryNode/utils'; +import { sortGlossaryTerms } from '@app/entityV2/glossaryTerm/utils'; +import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import TermItem, { NameWrapper, TermLink as NodeLink } from '@app/glossaryV2/GlossaryBrowser/TermItem'; +import { generateColorFromPalette } from '@app/glossaryV2/colorUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GlossaryNodeFragment } from '@graphql/fragments.generated'; +import { useGetGlossaryNodeQuery } from '@graphql/glossaryNode.generated'; +import { Entity, EntityType, GlossaryNode, GlossaryTerm } from '@types'; interface ItemWrapperProps { $isSelected: boolean; diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/TermItem.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/TermItem.tsx index 07585dc490..eac06dda70 100644 --- a/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/TermItem.tsx +++ b/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/TermItem.tsx @@ -1,11 +1,13 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { ChildGlossaryTermFragment } from '../../../graphql/glossaryNode.generated'; -import { useGlossaryEntityData } from '../../entityV2/shared/GlossaryEntityContext'; -import { ANTD_GRAY, EDITING_DOCUMENTATION_URL_PARAM, REDESIGN_COLORS } from '../../entityV2/shared/constants'; -import { useGlossaryActiveTabPath } from '../../entityV2/shared/containers/profile/utils'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext'; +import { ANTD_GRAY, EDITING_DOCUMENTATION_URL_PARAM, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { useGlossaryActiveTabPath } from '@app/entityV2/shared/containers/profile/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { ChildGlossaryTermFragment } from '@graphql/glossaryNode.generated'; const TermWrapper = styled.div<{ $isSelected: boolean; $depth: number }>` padding: 13px 0; diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryContentProvider.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryContentProvider.tsx index ebae4ceeac..fe711bfbe5 100644 --- a/datahub-web-react/src/app/glossaryV2/GlossaryContentProvider.tsx +++ b/datahub-web-react/src/app/glossaryV2/GlossaryContentProvider.tsx @@ -1,13 +1,15 @@ +import { Button } from '@components'; import React from 'react'; import styled from 'styled-components/macro'; + +import EmptyGlossarySection from '@app/glossaryV2/EmptyGlossarySection'; +import GlossaryEntitiesList from '@app/glossaryV2/GlossaryEntitiesList'; +import { BUSINESS_GLOSSARY_CREATE_TERM_GROUP_ID } from '@app/onboarding/config/BusinessGlossaryOnboardingConfig'; import { PageTitle } from '@src/alchemy-components/components/PageTitle'; -import { Button } from '@components'; -import { GlossaryNodeFragment } from '../../graphql/fragments.generated'; -import { ChildGlossaryTermFragment } from '../../graphql/glossaryNode.generated'; -import { GlossaryNode, GlossaryTerm } from '../../types.generated'; -import { BUSINESS_GLOSSARY_CREATE_TERM_GROUP_ID } from '../onboarding/config/BusinessGlossaryOnboardingConfig'; -import EmptyGlossarySection from './EmptyGlossarySection'; -import GlossaryEntitiesList from './GlossaryEntitiesList'; + +import { GlossaryNodeFragment } from '@graphql/fragments.generated'; +import { ChildGlossaryTermFragment } from '@graphql/glossaryNode.generated'; +import { GlossaryNode, GlossaryTerm } from '@types'; const MainContentWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryEntitiesList.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryEntitiesList.tsx index 4e1746a34d..17bc369f55 100644 --- a/datahub-web-react/src/app/glossaryV2/GlossaryEntitiesList.tsx +++ b/datahub-web-react/src/app/glossaryV2/GlossaryEntitiesList.tsx @@ -1,13 +1,15 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { GlossaryNodeFragment } from '../../graphql/fragments.generated'; -import { ChildGlossaryTermFragment } from '../../graphql/glossaryNode.generated'; -import { GlossaryNode, GlossaryTerm } from '../../types.generated'; -import { useEntityData } from '../entity/shared/EntityContext'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; -import { useEntityRegistry } from '../useEntityRegistry'; -import GlossaryEntityItem from './GlossaryEntityItem'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import GlossaryEntityItem from '@app/glossaryV2/GlossaryEntityItem'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GlossaryNodeFragment } from '@graphql/fragments.generated'; +import { ChildGlossaryTermFragment } from '@graphql/glossaryNode.generated'; +import { GlossaryNode, GlossaryTerm } from '@types'; const SectionTitle = styled(Typography)` margin: 12px 0 12px 16px; diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryEntityItem.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryEntityItem.tsx index fda2559415..80a130e219 100644 --- a/datahub-web-react/src/app/glossaryV2/GlossaryEntityItem.tsx +++ b/datahub-web-react/src/app/glossaryV2/GlossaryEntityItem.tsx @@ -1,14 +1,16 @@ +import { Tooltip } from 'antd'; import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import { Link } from 'react-router-dom'; -import { Tooltip } from 'antd'; -import { GlossaryNodeFragment } from '../../graphql/fragments.generated'; -import { ChildGlossaryTermFragment } from '../../graphql/glossaryNode.generated'; -import { DisplayProperties, EntityType, GlossaryNode, GlossaryTerm } from '../../types.generated'; -import { useEntityData } from '../entity/shared/EntityContext'; -import { useEntityRegistry } from '../useEntityRegistry'; -import GlossaryNodeCard from './GlossaryNodeCard'; -import GlossaryListCard from './GlossaryListCard'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import GlossaryListCard from '@app/glossaryV2/GlossaryListCard'; +import GlossaryNodeCard from '@app/glossaryV2/GlossaryNodeCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GlossaryNodeFragment } from '@graphql/fragments.generated'; +import { ChildGlossaryTermFragment } from '@graphql/glossaryNode.generated'; +import { DisplayProperties, EntityType, GlossaryNode, GlossaryTerm } from '@types'; interface Props { name: string; diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryListCard.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryListCard.tsx index e39df988f4..01ca940f9b 100644 --- a/datahub-web-react/src/app/glossaryV2/GlossaryListCard.tsx +++ b/datahub-web-react/src/app/glossaryV2/GlossaryListCard.tsx @@ -1,12 +1,14 @@ +import { BookmarkSimple, BookmarksSimple } from '@phosphor-icons/react'; +import { Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { ANTD_GRAY_V2, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { generateColorFromPalette } from '@app/glossaryV2/colorUtils'; import { colors } from '@src/alchemy-components'; -import { Tooltip } from 'antd'; -import { BookmarkSimple, BookmarksSimple } from '@phosphor-icons/react'; -import { ANTD_GRAY_V2, REDESIGN_COLORS } from '../entityV2/shared/constants'; -import { EntityType, Maybe } from '../../types.generated'; -import { generateColorFromPalette } from './colorUtils'; -import { GenericEntityProperties } from '../entity/shared/types'; + +import { EntityType, Maybe } from '@types'; const SmallDescription = styled.div` color: ${REDESIGN_COLORS.SUB_TEXT}; diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryNodeCard.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryNodeCard.tsx index d0b124a471..b151310128 100644 --- a/datahub-web-react/src/app/glossaryV2/GlossaryNodeCard.tsx +++ b/datahub-web-react/src/app/glossaryV2/GlossaryNodeCard.tsx @@ -1,12 +1,14 @@ -import React from 'react'; -import styled from 'styled-components/macro'; +import { BookmarkSimple, BookmarksSimple } from '@phosphor-icons/react'; import { Tooltip, Typography } from 'antd'; import { Maybe } from 'graphql/jsutils/Maybe'; +import React from 'react'; +import styled from 'styled-components/macro'; + +import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { generateColorFromPalette } from '@app/glossaryV2/colorUtils'; import { colors } from '@src/alchemy-components'; -import { BookmarkSimple, BookmarksSimple } from '@phosphor-icons/react'; -import { DisplayProperties } from '../../types.generated'; -import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../entityV2/shared/constants'; -import { generateColorFromPalette } from './colorUtils'; + +import { DisplayProperties } from '@types'; interface GlossaryItemCardHeaderProps { color: string; diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryRoutes.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryRoutes.tsx index b23b05c85b..44928a92d9 100644 --- a/datahub-web-react/src/app/glossaryV2/GlossaryRoutes.tsx +++ b/datahub-web-react/src/app/glossaryV2/GlossaryRoutes.tsx @@ -1,17 +1,18 @@ import React, { useState } from 'react'; +import { Redirect, Route, Switch, matchPath, useLocation } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { Switch, Route, Redirect, useLocation, matchPath } from 'react-router-dom'; -import { PageRoutes } from '../../conf/Global'; -import { GlossaryEntityContext } from '../entityV2/shared/GlossaryEntityContext'; -import { GenericEntityProperties } from '../entity/shared/types'; -import BusinessGlossaryPage from './BusinessGlossaryPage'; -import { EntityPage as EntityPageV2 } from '../entityV2/EntityPage'; -import GlossarySidebar from './GlossarySidebar'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { useAppConfig } from '../useAppConfig'; -import { useGetAuthenticatedUser } from '../useGetAuthenticatedUser'; -import { shouldShowGlossary } from '../identity/user/UserUtils'; -import { useShowNavBarRedesign } from '../useShowNavBarRedesign'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { EntityPage as EntityPageV2 } from '@app/entityV2/EntityPage'; +import { GlossaryEntityContext } from '@app/entityV2/shared/GlossaryEntityContext'; +import BusinessGlossaryPage from '@app/glossaryV2/BusinessGlossaryPage'; +import GlossarySidebar from '@app/glossaryV2/GlossarySidebar'; +import { shouldShowGlossary } from '@app/identity/user/UserUtils'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { useGetAuthenticatedUser } from '@app/useGetAuthenticatedUser'; +import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign'; +import { PageRoutes } from '@conf/Global'; const ContentWrapper = styled.div<{ $isShowNavBarRedesign?: boolean; $isEntityProfile?: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/glossaryV2/GlossarySearch.tsx b/datahub-web-react/src/app/glossaryV2/GlossarySearch.tsx index e28d1da3b9..cb168a27b3 100644 --- a/datahub-web-react/src/app/glossaryV2/GlossarySearch.tsx +++ b/datahub-web-react/src/app/glossaryV2/GlossarySearch.tsx @@ -4,12 +4,14 @@ import React, { useState } from 'react'; import { Link } from 'react-router-dom'; import { useDebounce } from 'react-use'; import styled from 'styled-components/macro'; -import { useGetAutoCompleteMultipleResultsQuery } from '../../graphql/search.generated'; -import { EntityType } from '../../types.generated'; -import { IconStyleType } from '../entityV2/Entity'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../entityV2/shared/constants'; -import ClickOutside from '../shared/ClickOutside'; -import { useEntityRegistry } from '../useEntityRegistry'; + +import { IconStyleType } from '@app/entityV2/Entity'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import ClickOutside from '@app/shared/ClickOutside'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetAutoCompleteMultipleResultsQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; const GlossarySearchWrapper = styled.div` position: relative; @@ -19,7 +21,10 @@ const GlossarySearchWrapper = styled.div` const ResultsWrapper = styled.div` background-color: white; border-radius: 5px; - box-shadow: 0 3px 6px -4px rgb(0 0 0 / 12%), 0 6px 16px 0 rgb(0 0 0 / 8%), 0 9px 28px 8px rgb(0 0 0 / 5%); + box-shadow: + 0 3px 6px -4px rgb(0 0 0 / 12%), + 0 6px 16px 0 rgb(0 0 0 / 8%), + 0 9px 28px 8px rgb(0 0 0 / 5%); padding: 8px; position: absolute; max-height: 210px; diff --git a/datahub-web-react/src/app/glossaryV2/GlossarySidebar.tsx b/datahub-web-react/src/app/glossaryV2/GlossarySidebar.tsx index 6ea9c27ac5..36b8d0170c 100644 --- a/datahub-web-react/src/app/glossaryV2/GlossarySidebar.tsx +++ b/datahub-web-react/src/app/glossaryV2/GlossarySidebar.tsx @@ -1,16 +1,18 @@ +import { Button, Tooltip } from '@components'; import React, { useState } from 'react'; -import { Tooltip, Button } from '@components'; import styled from 'styled-components/macro'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; -import useSidebarWidth from '../sharedV2/sidebar/useSidebarWidth'; -import GlossarySearch from './GlossarySearch'; -import GlossaryBrowser from './GlossaryBrowser/GlossaryBrowser'; -import { SidebarWrapper } from '../sharedV2/sidebar/components'; -import CreateGlossaryEntityModal from '../entityV2/shared/EntityDropdown/CreateGlossaryEntityModal'; -import { EntityType } from '../../types.generated'; -import { useUserContext } from '../context/useUserContext'; -import { useGetRootGlossaryNodesQuery } from '../../graphql/glossary.generated'; -import { useShowNavBarRedesign } from '../useShowNavBarRedesign'; + +import { useUserContext } from '@app/context/useUserContext'; +import CreateGlossaryEntityModal from '@app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import GlossaryBrowser from '@app/glossaryV2/GlossaryBrowser/GlossaryBrowser'; +import GlossarySearch from '@app/glossaryV2/GlossarySearch'; +import { SidebarWrapper } from '@app/sharedV2/sidebar/components'; +import useSidebarWidth from '@app/sharedV2/sidebar/useSidebarWidth'; +import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign'; + +import { useGetRootGlossaryNodesQuery } from '@graphql/glossary.generated'; +import { EntityType } from '@types'; const StyledSidebarWrapper = styled(SidebarWrapper)<{ $isEntityProfile?: boolean }>` ${(props) => diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryStatsProvider.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryStatsProvider.tsx index 09e78c2065..1b9345e149 100644 --- a/datahub-web-react/src/app/glossaryV2/GlossaryStatsProvider.tsx +++ b/datahub-web-react/src/app/glossaryV2/GlossaryStatsProvider.tsx @@ -1,12 +1,14 @@ -import React from 'react'; import Icon from '@ant-design/icons'; -import styled from 'styled-components/macro'; -import { Typography } from 'antd'; import { BookmarksSimple } from '@phosphor-icons/react'; -import ActiveGlossaryTermIcon from '../../../src/images/glossary_bookmark_added.svg?react'; -import ApprovedGlossaryTermIcon from '../../../src/images/glossary_verified.svg?react'; -import OwnersIcon from '../../../src/images/glossary_account_circle.svg?react'; -import { REDESIGN_COLORS, ANTD_GRAY } from '../entityV2/shared/constants'; +import { Typography } from 'antd'; +import React from 'react'; +import styled from 'styled-components/macro'; + +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; + +import OwnersIcon from '@images/glossary_account_circle.svg?react'; +import ActiveGlossaryTermIcon from '@images/glossary_bookmark_added.svg?react'; +import ApprovedGlossaryTermIcon from '@images/glossary_verified.svg?react'; const StatusWrapper = styled.div` background-color: ${REDESIGN_COLORS.BACKGROUND_PURPLE_2}; diff --git a/datahub-web-react/src/app/glossaryV2/__tests__/utils.test.ts b/datahub-web-react/src/app/glossaryV2/__tests__/utils.test.ts index 8f3f474eba..f3927f73ea 100644 --- a/datahub-web-react/src/app/glossaryV2/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/glossaryV2/__tests__/utils.test.ts @@ -1,12 +1,13 @@ -import { EntityType } from '../../../types.generated'; -import { glossaryNode1, glossaryNode3, glossaryTerm1 } from '../../../Mocks'; import { - getParentNodeToUpdate, - getGlossaryRootToUpdate, ROOT_NODES, ROOT_TERMS, + getGlossaryRootToUpdate, + getParentNodeToUpdate, updateGlossarySidebar, -} from '../utils'; +} from '@app/glossaryV2/utils'; +import { glossaryNode1, glossaryNode3, glossaryTerm1 } from '@src/Mocks'; + +import { EntityType } from '@types'; const glossaryTermWithParent = { ...glossaryTerm1, diff --git a/datahub-web-react/src/app/glossaryV2/cacheUtils.ts b/datahub-web-react/src/app/glossaryV2/cacheUtils.ts index f70901bf71..5b7732da2c 100644 --- a/datahub-web-react/src/app/glossaryV2/cacheUtils.ts +++ b/datahub-web-react/src/app/glossaryV2/cacheUtils.ts @@ -1,5 +1,6 @@ import { ApolloClient } from '@apollo/client'; -import { GetGlossaryNodeDocument, GetGlossaryNodeQuery } from '../../graphql/glossaryNode.generated'; + +import { GetGlossaryNodeDocument, GetGlossaryNodeQuery } from '@graphql/glossaryNode.generated'; export function removeTermFromGlossaryNode( client: ApolloClient, diff --git a/datahub-web-react/src/app/glossaryV2/utils.ts b/datahub-web-react/src/app/glossaryV2/utils.ts index 9b09d2cdf3..7015873980 100644 --- a/datahub-web-react/src/app/glossaryV2/utils.ts +++ b/datahub-web-react/src/app/glossaryV2/utils.ts @@ -1,5 +1,6 @@ -import { EntityType } from '../../types.generated'; -import { GenericEntityProperties } from '../entity/shared/types'; +import { GenericEntityProperties } from '@app/entity/shared/types'; + +import { EntityType } from '@types'; export const ROOT_NODES = 'rootNodes'; export const ROOT_TERMS = 'rootTerms'; diff --git a/datahub-web-react/src/app/govern/structuredProperties/AdvancedOptions.tsx b/datahub-web-react/src/app/govern/structuredProperties/AdvancedOptions.tsx index 620143258e..a364b0b047 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/AdvancedOptions.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/AdvancedOptions.tsx @@ -1,7 +1,13 @@ import { Icon, Input, Text, Tooltip } from '@components'; import { Collapse, Form } from 'antd'; import React from 'react'; -import { CollapseHeader, FlexContainer, InputLabel, StyledCollapse } from './styledComponents'; + +import { + CollapseHeader, + FlexContainer, + InputLabel, + StyledCollapse, +} from '@app/govern/structuredProperties/styledComponents'; interface Props { isEditMode: boolean; diff --git a/datahub-web-react/src/app/govern/structuredProperties/AllowedValuesDrawer.tsx b/datahub-web-react/src/app/govern/structuredProperties/AllowedValuesDrawer.tsx index 16c07e8257..5a019073c1 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/AllowedValuesDrawer.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/AllowedValuesDrawer.tsx @@ -1,8 +1,7 @@ -import { Button, Icon, Input, Text, TextArea } from '@src/alchemy-components'; -import { AllowedValue } from '@src/types.generated'; -import { Form, FormInstance } from 'antd'; import { Tooltip } from '@components'; +import { Form, FormInstance } from 'antd'; import React, { useEffect, useRef } from 'react'; + import { AddButtonContainer, DeleteIconContainer, @@ -11,8 +10,10 @@ import { InputLabel, StyledDivider, ValuesContainer, -} from './styledComponents'; -import { PropValueField } from './utils'; +} from '@app/govern/structuredProperties/styledComponents'; +import { PropValueField } from '@app/govern/structuredProperties/utils'; +import { Button, Icon, Input, Text, TextArea } from '@src/alchemy-components'; +import { AllowedValue } from '@src/types.generated'; interface Props { showAllowedValuesDrawer: boolean; diff --git a/datahub-web-react/src/app/govern/structuredProperties/AllowedValuesField.tsx b/datahub-web-react/src/app/govern/structuredProperties/AllowedValuesField.tsx index 9a71d309c1..cea2187309 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/AllowedValuesField.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/AllowedValuesField.tsx @@ -1,6 +1,6 @@ import { Icon, Text, Tooltip } from '@components'; -import { AllowedValue } from '@src/types.generated'; import React from 'react'; + import { FieldLabel, FlexContainer, @@ -8,11 +8,12 @@ import { RowContainer, StyledIcon, ValueListContainer, - ValuesList, ValueType, + ValuesList, VerticalDivider, -} from './styledComponents'; -import { isStringOrNumberTypeSelected, PropValueField } from './utils'; +} from '@app/govern/structuredProperties/styledComponents'; +import { PropValueField, isStringOrNumberTypeSelected } from '@app/govern/structuredProperties/utils'; +import { AllowedValue } from '@src/types.generated'; interface Props { selectedValueType: string; diff --git a/datahub-web-react/src/app/govern/structuredProperties/DisplayPreferences.tsx b/datahub-web-react/src/app/govern/structuredProperties/DisplayPreferences.tsx index 6ed3703453..f3d7d74a26 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/DisplayPreferences.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/DisplayPreferences.tsx @@ -1,11 +1,17 @@ -import { Icon, Pill, Switch, Text } from '@src/alchemy-components'; -import { ConfirmationModal } from '@src/app/sharedV2/modals/ConfirmationModal'; -import { AllowedValue, StructuredPropertyEntity } from '@src/types.generated'; import { Collapse } from 'antd'; import React, { useState } from 'react'; + +import { + CollapseHeader, + StyledCollapse, + StyledFormItem, + TogglesContainer, +} from '@app/govern/structuredProperties/styledComponents'; +import { StructuredProp, canBeAssetBadge, getDisplayName } from '@app/govern/structuredProperties/utils'; +import { Icon, Pill, Switch, Text } from '@src/alchemy-components'; +import { ConfirmationModal } from '@src/app/sharedV2/modals/ConfirmationModal'; import { useUpdateStructuredPropertyMutation } from '@src/graphql/structuredProperties.generated'; -import { CollapseHeader, StyledCollapse, StyledFormItem, TogglesContainer } from './styledComponents'; -import { getDisplayName, canBeAssetBadge, StructuredProp } from './utils'; +import { AllowedValue, StructuredPropertyEntity } from '@src/types.generated'; const SCHEMA_FIELD_URN = 'urn:li:entityType:datahub.schemaField'; diff --git a/datahub-web-react/src/app/govern/structuredProperties/EmptyStructuredProperties.tsx b/datahub-web-react/src/app/govern/structuredProperties/EmptyStructuredProperties.tsx index 5f7f77b058..3a43fd0fb0 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/EmptyStructuredProperties.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/EmptyStructuredProperties.tsx @@ -1,7 +1,8 @@ import { Text } from '@components'; -import EmptyFormsImage from '@src/images/empty-forms.svg?react'; import React from 'react'; -import { EmptyContainer } from './styledComponents'; + +import { EmptyContainer } from '@app/govern/structuredProperties/styledComponents'; +import EmptyFormsImage from '@src/images/empty-forms.svg?react'; interface Props { isEmptySearch?: boolean; diff --git a/datahub-web-react/src/app/govern/structuredProperties/StructuredProperties.tsx b/datahub-web-react/src/app/govern/structuredProperties/StructuredProperties.tsx index e5d0a62b2e..bf10fe5528 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/StructuredProperties.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/StructuredProperties.tsx @@ -1,14 +1,21 @@ import { Button, PageTitle, SearchBar, Tooltip } from '@components'; +import React, { useState } from 'react'; + +import StructuredPropsDrawer from '@app/govern/structuredProperties/StructuredPropsDrawer'; +import StructuredPropsTable from '@app/govern/structuredProperties/StructuredPropsTable'; +import ViewStructuredPropsDrawer from '@app/govern/structuredProperties/ViewStructuredPropsDrawer'; +import { + ButtonContainer, + HeaderContainer, + HeaderContent, + PageContainer, + TableContainer, +} from '@app/govern/structuredProperties/styledComponents'; import analytics, { EventType } from '@src/app/analytics'; import { useUserContext } from '@src/app/context/useUserContext'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated'; import { EntityType, SearchResult, StructuredPropertyEntity } from '@src/types.generated'; -import React, { useState } from 'react'; -import StructuredPropsDrawer from './StructuredPropsDrawer'; -import StructuredPropsTable from './StructuredPropsTable'; -import { ButtonContainer, HeaderContainer, HeaderContent, PageContainer, TableContainer } from './styledComponents'; -import ViewStructuredPropsDrawer from './ViewStructuredPropsDrawer'; const StructuredProperties = () => { const isShowNavBarRedesign = useShowNavBarRedesign(); diff --git a/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsDrawer.tsx b/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsDrawer.tsx index bfc616ecee..3ca550fe00 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsDrawer.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsDrawer.tsx @@ -1,9 +1,36 @@ import { LoadingOutlined } from '@ant-design/icons'; import { useApolloClient } from '@apollo/client'; +import { Tooltip } from '@components'; +import { Form } from 'antd'; +import React, { useEffect, useState } from 'react'; + +import AllowedValuesDrawer from '@app/govern/structuredProperties/AllowedValuesDrawer'; +import StructuredPropsForm from '@app/govern/structuredProperties/StructuredPropsForm'; +import { updatePropertiesList } from '@app/govern/structuredProperties/cacheUtils'; +import { + DrawerHeader, + FooterContainer, + StyledDrawer, + StyledIcon, + StyledSpin, + TitleContainer, +} from '@app/govern/structuredProperties/styledComponents'; +import useStructuredProp from '@app/govern/structuredProperties/useStructuredProp'; +import { + PropValueField, + StructuredProp, + getDisplayName, + getNewAllowedTypes, + getNewAllowedValues, + getNewEntityTypes, + getStringOrNumberValueField, + getValueType, + valueTypes, +} from '@app/govern/structuredProperties/utils'; import { Button, Text } from '@src/alchemy-components'; import analytics, { EventType } from '@src/app/analytics'; import { useUserContext } from '@src/app/context/useUserContext'; -import { showToastMessage, ToastType } from '@src/app/sharedV2/toastMessageUtils'; +import { ToastType, showToastMessage } from '@src/app/sharedV2/toastMessageUtils'; import { useCreateStructuredPropertyMutation, useUpdateStructuredPropertyMutation, @@ -17,32 +44,6 @@ import { StructuredPropertyEntity, UpdateStructuredPropertyInput, } from '@src/types.generated'; -import { Form } from 'antd'; -import { Tooltip } from '@components'; -import React, { useEffect, useState } from 'react'; -import AllowedValuesDrawer from './AllowedValuesDrawer'; -import { updatePropertiesList } from './cacheUtils'; -import StructuredPropsForm from './StructuredPropsForm'; -import { - DrawerHeader, - FooterContainer, - StyledDrawer, - StyledIcon, - StyledSpin, - TitleContainer, -} from './styledComponents'; -import useStructuredProp from './useStructuredProp'; -import { - getDisplayName, - getNewAllowedTypes, - getNewAllowedValues, - getNewEntityTypes, - getStringOrNumberValueField, - getValueType, - PropValueField, - StructuredProp, - valueTypes, -} from './utils'; interface Props { isDrawerOpen: boolean; diff --git a/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsForm.tsx b/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsForm.tsx index caa0b969f7..d3460e0223 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsForm.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsForm.tsx @@ -1,15 +1,21 @@ +import { Tooltip } from '@components'; +import { Form, FormInstance } from 'antd'; +import React from 'react'; + +import AdvancedOptions from '@app/govern/structuredProperties/AdvancedOptions'; +import DisplayPreferences from '@app/govern/structuredProperties/DisplayPreferences'; +import RequiredAsterisk from '@app/govern/structuredProperties/RequiredAsterisk'; +import StructuredPropsFormSection from '@app/govern/structuredProperties/StructuredPropsFormSection'; +import { + FieldLabel, + FlexContainer, + GridFormItem, + RowContainer, +} from '@app/govern/structuredProperties/styledComponents'; +import useStructuredProp from '@app/govern/structuredProperties/useStructuredProp'; +import { PropValueField, StructuredProp, valueTypes } from '@app/govern/structuredProperties/utils'; import { Icon, Input, SimpleSelect, TextArea } from '@src/alchemy-components'; import { AllowedValue, PropertyCardinality, SearchResult, StructuredPropertyEntity } from '@src/types.generated'; -import { Form, FormInstance } from 'antd'; -import { Tooltip } from '@components'; -import React from 'react'; -import AdvancedOptions from './AdvancedOptions'; -import RequiredAsterisk from './RequiredAsterisk'; -import DisplayPreferences from './DisplayPreferences'; -import StructuredPropsFormSection from './StructuredPropsFormSection'; -import { FieldLabel, FlexContainer, GridFormItem, RowContainer } from './styledComponents'; -import useStructuredProp from './useStructuredProp'; -import { PropValueField, StructuredProp, valueTypes } from './utils'; interface Props { selectedProperty: SearchResult | undefined; diff --git a/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsFormSection.tsx b/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsFormSection.tsx index 90a02398ae..949bcecc3b 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsFormSection.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsFormSection.tsx @@ -1,18 +1,24 @@ -import { Icon, SimpleSelect, Text, Tooltip } from '@src/alchemy-components'; -import { AllowedValue, PropertyCardinality, SearchResult } from '@src/types.generated'; import { Form, FormInstance } from 'antd'; import React from 'react'; -import AllowedValuesField from './AllowedValuesField'; -import RequiredAsterisk from './RequiredAsterisk'; -import { FieldLabel, FlexContainer, RowContainer, SubTextContainer } from './styledComponents'; -import useStructuredProp from './useStructuredProp'; + +import AllowedValuesField from '@app/govern/structuredProperties/AllowedValuesField'; +import RequiredAsterisk from '@app/govern/structuredProperties/RequiredAsterisk'; +import { + FieldLabel, + FlexContainer, + RowContainer, + SubTextContainer, +} from '@app/govern/structuredProperties/styledComponents'; +import useStructuredProp from '@app/govern/structuredProperties/useStructuredProp'; import { APPLIES_TO_ENTITIES, - isEntityTypeSelected, PropValueField, SEARCHABLE_ENTITY_TYPES, StructuredProp, -} from './utils'; + isEntityTypeSelected, +} from '@app/govern/structuredProperties/utils'; +import { Icon, SimpleSelect, Text, Tooltip } from '@src/alchemy-components'; +import { AllowedValue, PropertyCardinality, SearchResult } from '@src/types.generated'; interface Props { selectedProperty: SearchResult | undefined; diff --git a/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsTable.tsx b/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsTable.tsx index 10c42c0925..4d5d1ca964 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsTable.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/StructuredPropsTable.tsx @@ -1,5 +1,25 @@ import { useApolloClient } from '@apollo/client'; import { Icon, Pill, Table, Text, Tooltip } from '@components'; +import { Dropdown } from 'antd'; +import React, { useState } from 'react'; +import Highlight from 'react-highlighter'; +import { Link } from 'react-router-dom'; + +import EmptyStructuredProperties from '@app/govern/structuredProperties/EmptyStructuredProperties'; +import { removeFromPropertiesList } from '@app/govern/structuredProperties/cacheUtils'; +import { + CardIcons, + CreatedByContainer, + DataContainer, + IconContainer, + MenuItem, + NameColumn, + PillContainer, + PillsContainer, + PropDescription, + PropName, +} from '@app/govern/structuredProperties/styledComponents'; +import { getDisplayName } from '@app/govern/structuredProperties/utils'; import { AlignmentOptions } from '@src/alchemy-components/theme/config'; import analytics, { EventType } from '@src/app/analytics'; import { useUserContext } from '@src/app/context/useUserContext'; @@ -7,7 +27,7 @@ import { HoverEntityTooltip } from '@src/app/recommendations/renderer/component/ import { CustomAvatar } from '@src/app/shared/avatar'; import { toLocalDateString, toRelativeTimeString } from '@src/app/shared/time/timeUtils'; import { ConfirmationModal } from '@src/app/sharedV2/modals/ConfirmationModal'; -import { showToastMessage, ToastType } from '@src/app/sharedV2/toastMessageUtils'; +import { ToastType, showToastMessage } from '@src/app/sharedV2/toastMessageUtils'; import { useEntityRegistry } from '@src/app/useEntityRegistry'; import { GetSearchResultsForMultipleQuery } from '@src/graphql/search.generated'; import { useDeleteStructuredPropertyMutation } from '@src/graphql/structuredProperties.generated'; @@ -20,25 +40,6 @@ import { SearchResults, StructuredPropertyEntity, } from '@src/types.generated'; -import { Dropdown } from 'antd'; -import React, { useState } from 'react'; -import Highlight from 'react-highlighter'; -import { Link } from 'react-router-dom'; -import { removeFromPropertiesList } from './cacheUtils'; -import EmptyStructuredProperties from './EmptyStructuredProperties'; -import { - CardIcons, - CreatedByContainer, - DataContainer, - IconContainer, - MenuItem, - NameColumn, - PillContainer, - PillsContainer, - PropDescription, - PropName, -} from './styledComponents'; -import { getDisplayName } from './utils'; interface Props { searchQuery: string; diff --git a/datahub-web-react/src/app/govern/structuredProperties/ViewAdvancedOptions.tsx b/datahub-web-react/src/app/govern/structuredProperties/ViewAdvancedOptions.tsx index 25f1d67239..296fbef3be 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/ViewAdvancedOptions.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/ViewAdvancedOptions.tsx @@ -1,8 +1,14 @@ import { Icon, Text } from '@components'; -import { StructuredPropertyEntity } from '@src/types.generated'; import { Collapse } from 'antd'; import React from 'react'; -import { CollapseHeader, RowContainer, StyledCollapse, StyledLabel } from './styledComponents'; + +import { + CollapseHeader, + RowContainer, + StyledCollapse, + StyledLabel, +} from '@app/govern/structuredProperties/styledComponents'; +import { StructuredPropertyEntity } from '@src/types.generated'; interface Props { propEntity: StructuredPropertyEntity; diff --git a/datahub-web-react/src/app/govern/structuredProperties/ViewDisplayPreferences.tsx b/datahub-web-react/src/app/govern/structuredProperties/ViewDisplayPreferences.tsx index a1baeaeb61..930ec88df2 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/ViewDisplayPreferences.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/ViewDisplayPreferences.tsx @@ -1,8 +1,14 @@ -import { colors, Icon, Switch, Text } from '@src/alchemy-components'; -import { StructuredPropertyEntity } from '@src/types.generated'; import { Collapse } from 'antd'; import React from 'react'; -import { CollapseHeader, StyledCollapse, StyledFormItem, TogglesContainer } from './styledComponents'; + +import { + CollapseHeader, + StyledCollapse, + StyledFormItem, + TogglesContainer, +} from '@app/govern/structuredProperties/styledComponents'; +import { Icon, Switch, Text, colors } from '@src/alchemy-components'; +import { StructuredPropertyEntity } from '@src/types.generated'; interface Props { propEntity: StructuredPropertyEntity; diff --git a/datahub-web-react/src/app/govern/structuredProperties/ViewStructuredPropsDrawer.tsx b/datahub-web-react/src/app/govern/structuredProperties/ViewStructuredPropsDrawer.tsx index bc91a90989..40db5eee30 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/ViewStructuredPropsDrawer.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/ViewStructuredPropsDrawer.tsx @@ -1,7 +1,8 @@ import { Text } from '@components'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import { PropertyCardinality, SearchResult, StructuredPropertyEntity } from '@src/types.generated'; import React from 'react'; + +import ViewAdvancedOptions from '@app/govern/structuredProperties/ViewAdvancedOptions'; +import ViewDisplayPreferences from '@app/govern/structuredProperties/ViewDisplayPreferences'; import { DescriptionContainer, DrawerHeader, @@ -13,10 +14,10 @@ import { VerticalDivider, ViewDivider, ViewFieldsContainer, -} from './styledComponents'; -import { getDisplayName, getValueTypeLabel } from './utils'; -import ViewAdvancedOptions from './ViewAdvancedOptions'; -import ViewDisplayPreferences from './ViewDisplayPreferences'; +} from '@app/govern/structuredProperties/styledComponents'; +import { getDisplayName, getValueTypeLabel } from '@app/govern/structuredProperties/utils'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { PropertyCardinality, SearchResult, StructuredPropertyEntity } from '@src/types.generated'; interface Props { isViewDrawerOpen: boolean; diff --git a/datahub-web-react/src/app/govern/structuredProperties/styledComponents.ts b/datahub-web-react/src/app/govern/structuredProperties/styledComponents.ts index 211b4cdab6..eb13335f1e 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/styledComponents.ts +++ b/datahub-web-react/src/app/govern/structuredProperties/styledComponents.ts @@ -1,7 +1,8 @@ -import { colors, Icon, typography } from '@src/alchemy-components'; import { Checkbox, Collapse, Divider, Drawer, Form, Modal, Select, Spin, Typography } from 'antd'; import styled from 'styled-components'; +import { Icon, colors, typography } from '@src/alchemy-components'; + export const PageContainer = styled.div<{ $isShowNavBarRedesign?: boolean }>` overflow: auto; margin: ${(props) => (props.$isShowNavBarRedesign ? '0' : '0 12px 12px 0')}; diff --git a/datahub-web-react/src/app/govern/structuredProperties/useStructuredProp.ts b/datahub-web-react/src/app/govern/structuredProperties/useStructuredProp.ts index 6de195c1cd..273e0d9ec8 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/useStructuredProp.ts +++ b/datahub-web-react/src/app/govern/structuredProperties/useStructuredProp.ts @@ -1,8 +1,9 @@ -import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import { EntityType, PropertyCardinality, SearchResult, StructuredPropertyEntity } from '@src/types.generated'; import { FormInstance } from 'antd'; import { useMemo } from 'react'; -import { getEntityTypeUrn, StructuredProp, valueTypes } from './utils'; + +import { StructuredProp, getEntityTypeUrn, valueTypes } from '@app/govern/structuredProperties/utils'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { EntityType, PropertyCardinality, SearchResult, StructuredPropertyEntity } from '@src/types.generated'; interface Props { selectedProperty?: SearchResult; diff --git a/datahub-web-react/src/app/home/AcrylDemoBanner.tsx b/datahub-web-react/src/app/home/AcrylDemoBanner.tsx index 41baae691e..052f7370fa 100644 --- a/datahub-web-react/src/app/home/AcrylDemoBanner.tsx +++ b/datahub-web-react/src/app/home/AcrylDemoBanner.tsx @@ -1,7 +1,8 @@ import Link from 'antd/lib/typography/Link'; import React from 'react'; import styled from 'styled-components'; -import DataHubLogo from '../../images/datahublogo.png'; + +import DataHubLogo from '@images/datahublogo.png'; const BannerWrapper = styled.div` padding: 12px; diff --git a/datahub-web-react/src/app/home/HomePage.tsx b/datahub-web-react/src/app/home/HomePage.tsx index c840a69350..22753f8811 100644 --- a/datahub-web-react/src/app/home/HomePage.tsx +++ b/datahub-web-react/src/app/home/HomePage.tsx @@ -1,16 +1,17 @@ import React, { useEffect } from 'react'; -import { HomePageHeader } from './HomePageHeader'; -import { HomePageBody } from './HomePageBody'; -import analytics, { EventType } from '../analytics'; -import { OnboardingTour } from '../onboarding/OnboardingTour'; + +import analytics, { EventType } from '@app/analytics'; +import { HomePageBody } from '@app/home/HomePageBody'; +import { HomePageHeader } from '@app/home/HomePageHeader'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; import { GLOBAL_WELCOME_TO_DATAHUB_ID, - HOME_PAGE_INGESTION_ID, HOME_PAGE_DOMAINS_ID, + HOME_PAGE_INGESTION_ID, HOME_PAGE_MOST_POPULAR_ID, HOME_PAGE_PLATFORMS_ID, HOME_PAGE_SEARCH_BAR_ID, -} from '../onboarding/config/HomePageOnboardingConfig'; +} from '@app/onboarding/config/HomePageOnboardingConfig'; export const HomePage = () => { useEffect(() => { diff --git a/datahub-web-react/src/app/home/HomePageBody.tsx b/datahub-web-react/src/app/home/HomePageBody.tsx index a8d42b6501..60efa7487a 100644 --- a/datahub-web-react/src/app/home/HomePageBody.tsx +++ b/datahub-web-react/src/app/home/HomePageBody.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { useUserContext } from '../context/useUserContext'; -import { HomePageRecommendations } from './HomePageRecommendations'; + +import { useUserContext } from '@app/context/useUserContext'; +import { HomePageRecommendations } from '@app/home/HomePageRecommendations'; const BodyContainer = styled.div` padding: 20px 100px; diff --git a/datahub-web-react/src/app/home/HomePageHeader.tsx b/datahub-web-react/src/app/home/HomePageHeader.tsx index 586e100ac4..2462538442 100644 --- a/datahub-web-react/src/app/home/HomePageHeader.tsx +++ b/datahub-web-react/src/app/home/HomePageHeader.tsx @@ -1,31 +1,33 @@ +import { RightOutlined } from '@ant-design/icons'; +import { Button, Image, Row, Tag, Typography } from 'antd'; +import { debounce } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useHistory } from 'react-router'; -import { Typography, Image, Row, Button, Tag } from 'antd'; -import { debounce } from 'lodash'; import styled, { useTheme } from 'styled-components/macro'; -import { RightOutlined } from '@ant-design/icons'; -import { ManageAccount } from '../shared/ManageAccount'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { navigateToSearchUrl } from '../search/utils/navigateToSearchUrl'; -import { SearchBar } from '../search/SearchBar'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import DemoButton from '@app/entity/shared/components/styled/DemoButton'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { HALF_SECOND_IN_MS } from '@app/entity/shared/tabs/Dataset/Queries/utils/constants'; +import AcrylDemoBanner from '@app/home/AcrylDemoBanner'; +import { HOME_PAGE_SEARCH_BAR_ID } from '@app/onboarding/config/HomePageOnboardingConfig'; +import { SearchBar } from '@app/search/SearchBar'; +import { getAutoCompleteInputFromQuickFilter } from '@app/search/utils/filterUtils'; +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; +import { ManageAccount } from '@app/shared/ManageAccount'; +import { HeaderLinks } from '@app/shared/admin/HeaderLinks'; +import { useAppConfig, useIsShowAcrylInfoEnabled } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { useQuickFiltersContext } from '@providers/QuickFiltersContext'; +import { DEFAULT_APP_CONFIG } from '@src/appConfigContext'; + import { GetAutoCompleteMultipleResultsQuery, useGetAutoCompleteMultipleResultsLazyQuery, useGetSearchResultsForMultipleQuery, -} from '../../graphql/search.generated'; -import { EntityType, FacetFilterInput } from '../../types.generated'; -import analytics, { EventType } from '../analytics'; -import { HeaderLinks } from '../shared/admin/HeaderLinks'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { useAppConfig, useIsShowAcrylInfoEnabled } from '../useAppConfig'; -import { DEFAULT_APP_CONFIG } from '../../appConfigContext'; -import { HOME_PAGE_SEARCH_BAR_ID } from '../onboarding/config/HomePageOnboardingConfig'; -import { useQuickFiltersContext } from '../../providers/QuickFiltersContext'; -import { getAutoCompleteInputFromQuickFilter } from '../search/utils/filterUtils'; -import { useUserContext } from '../context/useUserContext'; -import AcrylDemoBanner from './AcrylDemoBanner'; -import DemoButton from '../entity/shared/components/styled/DemoButton'; -import { HALF_SECOND_IN_MS } from '../entity/shared/tabs/Dataset/Queries/utils/constants'; +} from '@graphql/search.generated'; +import { EntityType, FacetFilterInput } from '@types'; const Background = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/home/HomePagePosts.tsx b/datahub-web-react/src/app/home/HomePagePosts.tsx index c3d3d4344b..ef516ab820 100644 --- a/datahub-web-react/src/app/home/HomePagePosts.tsx +++ b/datahub-web-react/src/app/home/HomePagePosts.tsx @@ -1,11 +1,13 @@ -import React from 'react'; import { Divider, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; + +import { PostLinkCard } from '@app/search/PostLinkCard'; +import { PostTextCard } from '@app/search/PostTextCard'; import { getHomePagePostsFilters } from '@app/utils/queryUtils'; -import { useListPostsQuery } from '../../graphql/post.generated'; -import { Post, PostContentType } from '../../types.generated'; -import { PostTextCard } from '../search/PostTextCard'; -import { PostLinkCard } from '../search/PostLinkCard'; + +import { useListPostsQuery } from '@graphql/post.generated'; +import { Post, PostContentType } from '@types'; const RecommendationContainer = styled.div` margin-bottom: 92px; diff --git a/datahub-web-react/src/app/home/HomePageRecommendations.tsx b/datahub-web-react/src/app/home/HomePageRecommendations.tsx index c55c194291..75c4578010 100644 --- a/datahub-web-react/src/app/home/HomePageRecommendations.tsx +++ b/datahub-web-react/src/app/home/HomePageRecommendations.tsx @@ -1,28 +1,30 @@ +import { Divider, Empty, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Divider, Empty, Typography } from 'antd'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { HomePagePosts } from '@app/home/HomePagePosts'; +import { + HOME_PAGE_DOMAINS_ID, + HOME_PAGE_MOST_POPULAR_ID, + HOME_PAGE_PLATFORMS_ID, +} from '@app/onboarding/config/HomePageOnboardingConfig'; +import { useToggleEducationStepIdsAllowList } from '@app/onboarding/useToggleEducationStepIdsAllowList'; +import { RecommendationModule } from '@app/recommendations/RecommendationModule'; +import { BrowseEntityCard } from '@app/search/BrowseEntityCard'; +import { useBusinessAttributesFlag } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetEntityCountsQuery } from '@graphql/app.generated'; +import { useListRecommendationsQuery } from '@graphql/recommendations.generated'; import { CorpUser, EntityType, RecommendationModule as RecommendationModuleType, RecommendationRenderType, ScenarioType, -} from '../../types.generated'; -import { useListRecommendationsQuery } from '../../graphql/recommendations.generated'; -import { RecommendationModule } from '../recommendations/RecommendationModule'; -import { BrowseEntityCard } from '../search/BrowseEntityCard'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { useGetEntityCountsQuery } from '../../graphql/app.generated'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { HomePagePosts } from './HomePagePosts'; -import { - HOME_PAGE_DOMAINS_ID, - HOME_PAGE_MOST_POPULAR_ID, - HOME_PAGE_PLATFORMS_ID, -} from '../onboarding/config/HomePageOnboardingConfig'; -import { useToggleEducationStepIdsAllowList } from '../onboarding/useToggleEducationStepIdsAllowList'; -import { useBusinessAttributesFlag } from '../useAppConfig'; -import { useUserContext } from '../context/useUserContext'; +} from '@types'; const PLATFORMS_MODULE_ID = 'Platforms'; const MOST_POPULAR_MODULE_ID = 'HighUsageEntities'; diff --git a/datahub-web-react/src/app/home/__tests__/HomePage.test.tsx b/datahub-web-react/src/app/home/__tests__/HomePage.test.tsx index 07680d2c38..c53ce975a1 100644 --- a/datahub-web-react/src/app/home/__tests__/HomePage.test.tsx +++ b/datahub-web-react/src/app/home/__tests__/HomePage.test.tsx @@ -1,9 +1,10 @@ -import React from 'react'; -import { render, waitFor, fireEvent } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; -import { HomePage } from '../HomePage'; -import { mocks } from '../../../Mocks'; -import TestPageContainer from '../../../utils/test-utils/TestPageContainer'; +import { fireEvent, render, waitFor } from '@testing-library/react'; +import React from 'react'; + +import { HomePage } from '@app/home/HomePage'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('HomePage', () => { it('renders', async () => { diff --git a/datahub-web-react/src/app/homeV2/HomePage.tsx b/datahub-web-react/src/app/homeV2/HomePage.tsx index 71fc87194d..185e7a03ab 100644 --- a/datahub-web-react/src/app/homeV2/HomePage.tsx +++ b/datahub-web-react/src/app/homeV2/HomePage.tsx @@ -1,26 +1,27 @@ import React, { useEffect } from 'react'; import styled from 'styled-components'; -import analytics, { EventType } from '../analytics'; + +import analytics, { EventType } from '@app/analytics'; +import { useRedirectToIntroduceYourself } from '@app/homeV2/introduce/useRedirectToIntroduceYourself'; +import { CenterContent } from '@app/homeV2/layout/CenterContent'; +import { LeftSidebar } from '@app/homeV2/layout/LeftSidebar'; +import { RightSidebar } from '@app/homeV2/layout/RightSidebar'; +import { NavBarStateType, useNavBarContext } from '@app/homeV2/layout/navBarRedesign/NavBarContext'; +import PersonalizationLoadingModal from '@app/homeV2/persona/PersonalizationLoadingModal'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; +import { HOME_PAGE_DOMAINS_ID, HOME_PAGE_PLATFORMS_ID } from '@app/onboarding/config/HomePageOnboardingConfig'; import { GLOBAL_WELCOME_TO_ACRYL_ID, + V2_HOME_PAGE_ANNOUNCEMENTS_ID, + V2_HOME_PAGE_DISCOVER_ID, V2_HOME_PAGE_MOST_POPULAR_ID, + V2_HOME_PAGE_PENDING_TASKS_ID, + V2_HOME_PAGE_PERSONAL_SIDEBAR_ID, V2_SEARCH_BAR_ID, V2_SEARCH_BAR_VIEWS, - V2_HOME_PAGE_DISCOVER_ID, - V2_HOME_PAGE_PERSONAL_SIDEBAR_ID, - V2_HOME_PAGE_PENDING_TASKS_ID, - V2_HOME_PAGE_ANNOUNCEMENTS_ID, -} from '../onboarding/configV2/HomePageOnboardingConfig'; -import { OnboardingTour } from '../onboarding/OnboardingTour'; -import { HOME_PAGE_DOMAINS_ID, HOME_PAGE_PLATFORMS_ID } from '../onboarding/config/HomePageOnboardingConfig'; -import { LeftSidebar } from './layout/LeftSidebar'; -import { CenterContent } from './layout/CenterContent'; -import { RightSidebar } from './layout/RightSidebar'; -import { useRedirectToIntroduceYourself } from './introduce/useRedirectToIntroduceYourself'; -import { SearchablePage } from '../searchV2/SearchablePage'; -import PersonalizationLoadingModal from './persona/PersonalizationLoadingModal'; -import { useShowNavBarRedesign } from '../useShowNavBarRedesign'; -import { NavBarStateType, useNavBarContext } from './layout/navBarRedesign/NavBarContext'; +} from '@app/onboarding/configV2/HomePageOnboardingConfig'; +import { SearchablePage } from '@app/searchV2/SearchablePage'; +import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign'; const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>` flex: 1; diff --git a/datahub-web-react/src/app/homeV2/action/announcement/Announcement.tsx b/datahub-web-react/src/app/homeV2/action/announcement/Announcement.tsx index a17d56e81d..475691657a 100644 --- a/datahub-web-react/src/app/homeV2/action/announcement/Announcement.tsx +++ b/datahub-web-react/src/app/homeV2/action/announcement/Announcement.tsx @@ -1,9 +1,11 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../../../entityV2/shared/constants'; -import { Post } from '../../../../types.generated'; -import { Editor } from '../../../entityV2/shared/tabs/Documentation/components/editor/Editor'; -import { toRelativeTimeString } from '../../../shared/time/timeUtils'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { Editor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; +import { toRelativeTimeString } from '@app/shared/time/timeUtils'; + +import { Post } from '@types'; const Content = styled.div` max-height: 368px; diff --git a/datahub-web-react/src/app/homeV2/action/announcement/Announcements.tsx b/datahub-web-react/src/app/homeV2/action/announcement/Announcements.tsx index 1d06d26d72..f884f2a74e 100644 --- a/datahub-web-react/src/app/homeV2/action/announcement/Announcements.tsx +++ b/datahub-web-react/src/app/homeV2/action/announcement/Announcements.tsx @@ -1,15 +1,16 @@ +import { CloseOutlined, NotificationOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; +import { Button, Carousel } from 'antd'; import React, { useContext, useEffect, useState } from 'react'; import styled from 'styled-components'; -import { Carousel, Button } from 'antd'; -import { Tooltip } from '@components'; -import { NotificationOutlined, CloseOutlined } from '@ant-design/icons'; -import AnnouncementsSkeleton from '../../content/tabs/announcements/AnnouncementsSkeleton'; -import { Announcement } from './Announcement'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import { useUserContext } from '../../../context/useUserContext'; -import { useUpdateLastViewedAnnouncementTime } from '../../shared/updateLastViewedAnnouncementTime'; -import { useGetUnseenAnnouncements } from './useGetUnseenAnnouncements'; -import OnboardingContext from '../../../onboarding/OnboardingContext'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { Announcement } from '@app/homeV2/action/announcement/Announcement'; +import { useGetUnseenAnnouncements } from '@app/homeV2/action/announcement/useGetUnseenAnnouncements'; +import AnnouncementsSkeleton from '@app/homeV2/content/tabs/announcements/AnnouncementsSkeleton'; +import { useUpdateLastViewedAnnouncementTime } from '@app/homeV2/shared/updateLastViewedAnnouncementTime'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; const Card = styled.div` border: 1px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/homeV2/action/announcement/useGetUnseenAnnouncements.tsx b/datahub-web-react/src/app/homeV2/action/announcement/useGetUnseenAnnouncements.tsx index 752170453b..0f5efc7eac 100644 --- a/datahub-web-react/src/app/homeV2/action/announcement/useGetUnseenAnnouncements.tsx +++ b/datahub-web-react/src/app/homeV2/action/announcement/useGetUnseenAnnouncements.tsx @@ -1,8 +1,9 @@ +import { useGetLastViewedAnnouncementTime } from '@app/homeV2/shared/useGetLastViewedAnnouncementTime'; +import { hasViewedAnnouncement } from '@app/homeV2/shared/utils'; import { getHomePagePostsFilters } from '@app/utils/queryUtils'; -import { useListPostsQuery } from '../../../../graphql/post.generated'; -import { Post, PostContentType, PostType } from '../../../../types.generated'; -import { useGetLastViewedAnnouncementTime } from '../../shared/useGetLastViewedAnnouncementTime'; -import { hasViewedAnnouncement } from '../../shared/utils'; + +import { useListPostsQuery } from '@graphql/post.generated'; +import { Post, PostContentType, PostType } from '@types'; export const useGetUnseenAnnouncements = () => { const { time: lastViewedAnnouncementsTime } = useGetLastViewedAnnouncementTime(); diff --git a/datahub-web-react/src/app/homeV2/action/learn/Resources.tsx b/datahub-web-react/src/app/homeV2/action/learn/Resources.tsx index fbcd1fc17b..c5a44de03c 100644 --- a/datahub-web-react/src/app/homeV2/action/learn/Resources.tsx +++ b/datahub-web-react/src/app/homeV2/action/learn/Resources.tsx @@ -1,15 +1,16 @@ -import React, { useContext } from 'react'; -import { Col, Row, Skeleton } from 'antd'; -import styled from 'styled-components'; import { ApiOutlined } from '@ant-design/icons'; -import AutoStoriesOutlinedIcon from '@mui/icons-material/AutoStoriesOutlined'; import { HelpCenterOutlined, OndemandVideoOutlined } from '@mui/icons-material'; +import AutoStoriesOutlinedIcon from '@mui/icons-material/AutoStoriesOutlined'; import { BookmarkSimple } from '@phosphor-icons/react'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import { PersonaType } from '../../shared/types'; -import { useUserPersona } from '../../persona/useUserPersona'; -import { useAppConfig } from '../../../useAppConfig'; -import OnboardingContext from '../../../onboarding/OnboardingContext'; +import { Col, Row, Skeleton } from 'antd'; +import React, { useContext } from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useUserPersona } from '@app/homeV2/persona/useUserPersona'; +import { PersonaType } from '@app/homeV2/shared/types'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; +import { useAppConfig } from '@app/useAppConfig'; const Header = styled.div` display: flex; @@ -57,7 +58,10 @@ const ResourceLink = styled.a` align-items: center; justify-content: center; opacity: 0.9; - transition: transform 0.3s ease, color 0.3s ease, opacity 0.3s ease; + transition: + transform 0.3s ease, + color 0.3s ease, + opacity 0.3s ease; :hover { transform: scale(1.05); // Slightly scale up the link on hover opacity: 1; diff --git a/datahub-web-react/src/app/homeV2/content/recent/EntityCard.tsx b/datahub-web-react/src/app/homeV2/content/recent/EntityCard.tsx index dbb6c4be50..02fb53e310 100644 --- a/datahub-web-react/src/app/homeV2/content/recent/EntityCard.tsx +++ b/datahub-web-react/src/app/homeV2/content/recent/EntityCard.tsx @@ -1,14 +1,16 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { GenericEntityProperties } from '../../../entity/shared/types'; -import { Entity, EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { getDisplayedEntityType } from '../../../entityV2/shared/containers/profile/header/utils'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip'; -import { SEARCH_COLORS } from '../../../entityV2/shared/constants'; -import PlatformIcon from '../../../sharedV2/icons/PlatformIcon'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { getDisplayedEntityType } from '@app/entityV2/shared/containers/profile/header/utils'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import PlatformIcon from '@app/sharedV2/icons/PlatformIcon'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, EntityType } from '@types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/homeV2/content/recent/EntityCardList.tsx b/datahub-web-react/src/app/homeV2/content/recent/EntityCardList.tsx index 0a3465eb6d..e2223ec939 100644 --- a/datahub-web-react/src/app/homeV2/content/recent/EntityCardList.tsx +++ b/datahub-web-react/src/app/homeV2/content/recent/EntityCardList.tsx @@ -1,9 +1,11 @@ +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; -import { HorizontalList } from '../../../entityV2/shared/summary/ListComponents'; -import { EntityCard } from './EntityCard'; -import { Entity } from '../../../../types.generated'; + +import { HorizontalList } from '@app/entityV2/shared/summary/ListComponents'; +import { EntityCard } from '@app/homeV2/content/recent/EntityCard'; + +import { Entity } from '@types'; const MAX_ASSETS_TO_SHOW = 5; diff --git a/datahub-web-react/src/app/homeV2/content/recent/RecentActions.tsx b/datahub-web-react/src/app/homeV2/content/recent/RecentActions.tsx index 10f0d39a32..e14c15243f 100644 --- a/datahub-web-react/src/app/homeV2/content/recent/RecentActions.tsx +++ b/datahub-web-react/src/app/homeV2/content/recent/RecentActions.tsx @@ -1,10 +1,11 @@ -import OnboardingContext from '@app/onboarding/OnboardingContext'; import React, { useContext } from 'react'; import styled from 'styled-components'; + +import { useUserContext } from '@app/context/useUserContext'; +import { RecentlyEditedOrViewed } from '@app/homeV2/content/recent/RecentlyEditedOrViewed'; +import { useGetRecentActions } from '@app/homeV2/content/recent/useGetRecentActions'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { RecentlyEditedOrViewed } from './RecentlyEditedOrViewed'; -import { useGetRecentActions } from './useGetRecentActions'; -import { useUserContext } from '../../../context/useUserContext'; const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/homeV2/content/recent/RecentlyEditedOrViewed.tsx b/datahub-web-react/src/app/homeV2/content/recent/RecentlyEditedOrViewed.tsx index 508aa791a9..8c4faca7f2 100644 --- a/datahub-web-react/src/app/homeV2/content/recent/RecentlyEditedOrViewed.tsx +++ b/datahub-web-react/src/app/homeV2/content/recent/RecentlyEditedOrViewed.tsx @@ -1,8 +1,10 @@ import React from 'react'; + +import { EntityCardList } from '@app/homeV2/content/recent/EntityCardList'; + // import styled from 'styled-components'; // import { BulbTwoTone } from '@ant-design/icons'; -import { Entity } from '../../../../types.generated'; -import { EntityCardList } from './EntityCardList'; +import { Entity } from '@types'; // const BULB_COLOR = '#EEAD1C'; diff --git a/datahub-web-react/src/app/homeV2/content/recent/constants.ts b/datahub-web-react/src/app/homeV2/content/recent/constants.ts index adee621ff0..3bac982f95 100644 --- a/datahub-web-react/src/app/homeV2/content/recent/constants.ts +++ b/datahub-web-react/src/app/homeV2/content/recent/constants.ts @@ -1,4 +1,4 @@ -import { EntityType } from '../../../../types.generated'; +import { EntityType } from '@types'; export const ENTITY_TYPES = [ EntityType.Dataset, diff --git a/datahub-web-react/src/app/homeV2/content/recent/useGetRecentActions.tsx b/datahub-web-react/src/app/homeV2/content/recent/useGetRecentActions.tsx index 2311ff2dea..7d89dc52cc 100644 --- a/datahub-web-react/src/app/homeV2/content/recent/useGetRecentActions.tsx +++ b/datahub-web-react/src/app/homeV2/content/recent/useGetRecentActions.tsx @@ -1,10 +1,11 @@ +import { ASSET_ENTITY_TYPES } from '@app/searchV2/utils/constants'; import { RECOMMENDATION_MODULE_ID_RECENTLY_EDITED_ENTITIES, RECOMMENDATION_MODULE_ID_RECENTLY_VIEWED_ENTITIES, } from '@src/app/entityV2/shared/constants'; -import { useListRecommendationsQuery } from '../../../../graphql/recommendations.generated'; -import { CorpUser, Entity, EntityType, ScenarioType } from '../../../../types.generated'; -import { ASSET_ENTITY_TYPES } from '../../../searchV2/utils/constants'; + +import { useListRecommendationsQuery } from '@graphql/recommendations.generated'; +import { CorpUser, Entity, EntityType, ScenarioType } from '@types'; const SUPPORTED_ENTITY_TYPES = [ ...ASSET_ENTITY_TYPES, diff --git a/datahub-web-react/src/app/homeV2/content/tabs/CenterTab.tsx b/datahub-web-react/src/app/homeV2/content/tabs/CenterTab.tsx index 3a66852ed3..e5f24c87c2 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/CenterTab.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/CenterTab.tsx @@ -1,8 +1,9 @@ +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components/macro'; -import { Tooltip } from '@components'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import { CountBadge } from './CountBadge'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { CountBadge } from '@app/homeV2/content/tabs/CountBadge'; const Tab = styled.div<{ selected: boolean; disabled: boolean }>` font-size: 14px; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/CenterTabs.tsx b/datahub-web-react/src/app/homeV2/content/tabs/CenterTabs.tsx index 46d2148481..0ebaa1c3ab 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/CenterTabs.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/CenterTabs.tsx @@ -1,12 +1,13 @@ +import { Skeleton } from 'antd'; import React, { useContext, useState } from 'react'; import styled from 'styled-components'; -import { Skeleton } from 'antd'; + +import { CenterTab } from '@app/homeV2/content/tabs/CenterTab'; +import { DEFAULT_TAB, TAB_NAME_DETAILS, TabType } from '@app/homeV2/content/tabs/tabs'; +import { useGetActiveTabs } from '@app/homeV2/content/tabs/useGetVisibleTabs'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; +import { useAppConfig } from '@app/useAppConfig'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import OnboardingContext from '../../../onboarding/OnboardingContext'; -import { useGetActiveTabs } from './useGetVisibleTabs'; -import { DEFAULT_TAB, TAB_NAME_DETAILS, TabType } from './tabs'; -import { CenterTab } from './CenterTab'; -import { useAppConfig } from '../../../useAppConfig'; const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>` flex: 1; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementCard.tsx index f24b8e9dff..c62939c812 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementCard.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementCard.tsx @@ -1,9 +1,11 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../../../../entity/shared/constants'; -import { Post } from '../../../../../types.generated'; -import { toRelativeTimeString } from '../../../../shared/time/timeUtils'; -import { Editor } from '../../../../entityV2/shared/tabs/Documentation/components/editor/Editor'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { Editor } from '@app/entityV2/shared/tabs/Documentation/components/editor/Editor'; +import { toRelativeTimeString } from '@app/shared/time/timeUtils'; + +import { Post } from '@types'; const Card = styled.div` border: 1px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsSkeleton.tsx b/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsSkeleton.tsx index 1302fcb244..edbce3ef4e 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsSkeleton.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsSkeleton.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Col, Row, Skeleton } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const Container = styled(Row)` diff --git a/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsTab.tsx b/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsTab.tsx index 4cecb92023..bdc5121574 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsTab.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsTab.tsx @@ -1,10 +1,11 @@ import React from 'react'; import styled from 'styled-components'; -import { useGetAnnouncements } from './useGetAnnouncements'; -import AnnouncementsSkeleton from './AnnouncementsSkeleton'; -import { AnnouncementCard } from './AnnouncementCard'; -import { V2_HOME_PAGE_ANNOUNCEMENTS_ID } from '../../../../onboarding/configV2/HomePageOnboardingConfig'; -import { EmptyAnnouncements } from './EmptyAnnouncements'; + +import { AnnouncementCard } from '@app/homeV2/content/tabs/announcements/AnnouncementCard'; +import AnnouncementsSkeleton from '@app/homeV2/content/tabs/announcements/AnnouncementsSkeleton'; +import { EmptyAnnouncements } from '@app/homeV2/content/tabs/announcements/EmptyAnnouncements'; +import { useGetAnnouncements } from '@app/homeV2/content/tabs/announcements/useGetAnnouncements'; +import { V2_HOME_PAGE_ANNOUNCEMENTS_ID } from '@app/onboarding/configV2/HomePageOnboardingConfig'; const List = styled.div` display: flex; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/announcements/useGetAnnouncements.tsx b/datahub-web-react/src/app/homeV2/content/tabs/announcements/useGetAnnouncements.tsx index 4ed30830ff..8a9b1e2ed8 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/announcements/useGetAnnouncements.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/announcements/useGetAnnouncements.tsx @@ -1,6 +1,7 @@ import { getHomePagePostsFilters } from '@app/utils/queryUtils'; -import { useListPostsQuery } from '../../../../../graphql/post.generated'; -import { Post, PostContentType, PostType } from '../../../../../types.generated'; + +import { useListPostsQuery } from '@graphql/post.generated'; +import { Post, PostContentType, PostType } from '@types'; export const useGetAnnouncements = () => { const { diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/DiscoveryTab.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/DiscoveryTab.tsx index cf22753518..7f0ed0edc8 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/DiscoveryTab.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/DiscoveryTab.tsx @@ -1,10 +1,11 @@ import React from 'react'; import styled from 'styled-components'; + +import { DataProducts } from '@app/homeV2/content/tabs/discovery/sections/dataProducts/DataProducts'; +import { Domains } from '@app/homeV2/content/tabs/discovery/sections/domains/Domains'; +import { Insights } from '@app/homeV2/content/tabs/discovery/sections/insight/Insights'; +import { Platforms } from '@app/homeV2/content/tabs/discovery/sections/platform/Platforms'; import { PinnedLinks } from '@src/app/homeV2/reference/sections/pinned/PinnedLinks'; -import { Domains } from './sections/domains/Domains'; -import { DataProducts } from './sections/dataProducts/DataProducts'; -import { Insights } from './sections/insight/Insights'; -import { Platforms } from './sections/platform/Platforms'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/Section.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/Section.tsx index e7e14f84c4..151f3aacad 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/Section.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/Section.tsx @@ -1,7 +1,8 @@ +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components/macro'; -import { Tooltip } from '@components'; -import { ANTD_GRAY } from '../../../../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Header = styled.div` display: flex; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProductCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProductCard.tsx index 35c1c4711d..031d996dba 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProductCard.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProductCard.tsx @@ -1,14 +1,16 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components/macro'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { DomainColoredIcon } from '@app/entityV2/shared/links/DomainColoredIcon'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { colors } from '@src/alchemy-components'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { DataProduct, Domain, EntityType } from '../../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../../../../../entity/shared/constants'; -import { DomainColoredIcon } from '../../../../../../entityV2/shared/links/DomainColoredIcon'; -import { HoverEntityTooltip } from '../../../../../../recommendations/renderer/component/HoverEntityTooltip'; -import { SEARCH_COLORS } from '../../../../../../entityV2/shared/constants'; + +import { DataProduct, Domain, EntityType } from '@types'; const Card = styled(Link)<{ $isShowNavBarRedesign?: boolean }>` border-radius: ${(props) => (props.$isShowNavBarRedesign ? '8px' : '10px')}; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProducts.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProducts.tsx index e363e950e6..2b0bd86c57 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProducts.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProducts.tsx @@ -2,13 +2,14 @@ import { Skeleton } from 'antd'; import React from 'react'; import { useHistory } from 'react-router'; import styled from 'styled-components'; -import { Section } from '../Section'; -import { DataProductCard } from './DataProductCard'; -import { useGetDataProducts } from './useGetDataProducts'; -import { PageRoutes } from '../../../../../../../conf/Global'; -import { HOME_PAGE_DATA_PRODUCTS_ID } from '../../../../../../onboarding/config/HomePageOnboardingConfig'; -import { Carousel } from '../../../../../../sharedV2/carousel/Carousel'; -import { HorizontalListSkeletons } from '../../../../HorizontalListSkeletons'; + +import { HorizontalListSkeletons } from '@app/homeV2/content/HorizontalListSkeletons'; +import { Section } from '@app/homeV2/content/tabs/discovery/sections/Section'; +import { DataProductCard } from '@app/homeV2/content/tabs/discovery/sections/dataProducts/DataProductCard'; +import { useGetDataProducts } from '@app/homeV2/content/tabs/discovery/sections/dataProducts/useGetDataProducts'; +import { HOME_PAGE_DATA_PRODUCTS_ID } from '@app/onboarding/config/HomePageOnboardingConfig'; +import { Carousel } from '@app/sharedV2/carousel/Carousel'; +import { PageRoutes } from '@conf/Global'; const SkeletonCard = styled(Skeleton.Button)<{ width: string }>` &&& { diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/useGetDataProducts.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/useGetDataProducts.tsx index bb13adf054..74c378a833 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/useGetDataProducts.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/useGetDataProducts.tsx @@ -1,6 +1,7 @@ import { useUserContext } from '@src/app/context/useUserContext'; import { useGetDataProductsListQuery } from '@src/graphql/dataProduct.generated'; -import { DataProduct, Domain, EntityType } from '../../../../../../../types.generated'; + +import { DataProduct, Domain, EntityType } from '@types'; const FETCH_COUNT = 100; const sortDataProducts = (a, b) => { diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/DomainCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/DomainCard.tsx index a2cacf5741..547af5f1be 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/DomainCard.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/DomainCard.tsx @@ -1,16 +1,18 @@ +import { Divider } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components/macro'; -import { Divider } from 'antd'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { DomainColoredIcon } from '@app/entityV2/shared/links/DomainColoredIcon'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { formatNumber } from '@app/shared/formatNumber'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { colors } from '@src/alchemy-components'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { Domain, EntityType } from '../../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../../../../../entity/shared/constants'; -import { formatNumber } from '../../../../../../shared/formatNumber'; -import { DomainColoredIcon } from '../../../../../../entityV2/shared/links/DomainColoredIcon'; -import { HoverEntityTooltip } from '../../../../../../recommendations/renderer/component/HoverEntityTooltip'; -import { SEARCH_COLORS } from '../../../../../../entityV2/shared/constants'; + +import { Domain, EntityType } from '@types'; const Card = styled(Link)<{ $isShowNavBarRedesign?: boolean }>` border-radius: ${(props) => (props.$isShowNavBarRedesign ? '8px' : '10px')}; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/Domains.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/Domains.tsx index f7c7602742..307afbd5c1 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/Domains.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/Domains.tsx @@ -2,16 +2,17 @@ import { Skeleton } from 'antd'; import React, { useContext } from 'react'; import { useHistory } from 'react-router'; import styled from 'styled-components'; -import { Section } from '../Section'; -import { DomainCard } from './DomainCard'; -import { useGetDomains } from './useGetDomains'; -import { useUserContext } from '../../../../../../context/useUserContext'; -import { PageRoutes } from '../../../../../../../conf/Global'; -import { HOME_PAGE_DOMAINS_ID } from '../../../../../../onboarding/config/HomePageOnboardingConfig'; -import { useUpdateEducationStepsAllowList } from '../../../../../../onboarding/useUpdateEducationStepsAllowList'; -import { Carousel } from '../../../../../../sharedV2/carousel/Carousel'; -import { HorizontalListSkeletons } from '../../../../HorizontalListSkeletons'; -import OnboardingContext from '../../../../../../onboarding/OnboardingContext'; + +import { useUserContext } from '@app/context/useUserContext'; +import { HorizontalListSkeletons } from '@app/homeV2/content/HorizontalListSkeletons'; +import { Section } from '@app/homeV2/content/tabs/discovery/sections/Section'; +import { DomainCard } from '@app/homeV2/content/tabs/discovery/sections/domains/DomainCard'; +import { useGetDomains } from '@app/homeV2/content/tabs/discovery/sections/domains/useGetDomains'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; +import { HOME_PAGE_DOMAINS_ID } from '@app/onboarding/config/HomePageOnboardingConfig'; +import { useUpdateEducationStepsAllowList } from '@app/onboarding/useUpdateEducationStepsAllowList'; +import { Carousel } from '@app/sharedV2/carousel/Carousel'; +import { PageRoutes } from '@conf/Global'; const SkeletonCard = styled(Skeleton.Button)<{ width: string }>` &&& { diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/useGetDomains.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/useGetDomains.tsx index d6c821f95a..4c199f2849 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/useGetDomains.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/useGetDomains.tsx @@ -1,6 +1,7 @@ -import { useListRecommendationsQuery } from '../../../../../../../graphql/recommendations.generated'; -import { CorpUser, Domain, ScenarioType } from '../../../../../../../types.generated'; -import { useUserContext } from '../../../../../../context/useUserContext'; +import { useUserContext } from '@app/context/useUserContext'; + +import { useListRecommendationsQuery } from '@graphql/recommendations.generated'; +import { CorpUser, Domain, ScenarioType } from '@types'; const DOMAINS_MODULE_ID = 'Domains'; const MAX_DOMAINS = 5; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/Insights.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/Insights.tsx index df65f23b1b..96ce4ebd5c 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/Insights.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/Insights.tsx @@ -1,21 +1,30 @@ import React, { useContext, useMemo } from 'react'; import styled from 'styled-components'; -import { useUserContext } from '../../../../../../context/useUserContext'; -import { HOME_PAGE_INSIGHTS_ID } from '../../../../../../onboarding/config/HomePageOnboardingConfig'; -import OnboardingContext from '../../../../../../onboarding/OnboardingContext'; -import HorizontalScroller from '../../../../../../sharedV2/carousel/HorizontalScroller'; -import { useUserPersona } from '../../../../../persona/useUserPersona'; -import { PersonaType } from '../../../../../shared/types'; -import { HorizontalListSkeletons } from '../../../../HorizontalListSkeletons'; -import { Section } from '../Section'; -import { INSIGHT_CARD_MIN_WIDTH } from './cards/SearchListInsightCard'; -import { InsightStatusProvider } from './InsightStatusProvider'; -import { MOST_ROWS_ID, MostRowsCard } from './cards/MostRowsCard'; -import { POPULAR_GLOSSARY_TERMS_ID, PopularGlossaryTerms } from './cards/PopularGlossaryTerms'; -import { RECENTLY_CREATED_DATASETS_ID, RecentlyCreatedDatasetsCard } from './cards/RecentlyCreatedDatasetsCard'; -import { RECENTLY_UPDATED_ID, RecentlyUpdatedDatasetsCard } from './cards/RecentlyUpdatedDatasetsCard'; -import InsightCardSkeleton from './shared/InsightCardSkeleton'; +import { useUserContext } from '@app/context/useUserContext'; +import { HorizontalListSkeletons } from '@app/homeV2/content/HorizontalListSkeletons'; +import { Section } from '@app/homeV2/content/tabs/discovery/sections/Section'; +import { InsightStatusProvider } from '@app/homeV2/content/tabs/discovery/sections/insight/InsightStatusProvider'; +import { MOST_ROWS_ID, MostRowsCard } from '@app/homeV2/content/tabs/discovery/sections/insight/cards/MostRowsCard'; +import { + POPULAR_GLOSSARY_TERMS_ID, + PopularGlossaryTerms, +} from '@app/homeV2/content/tabs/discovery/sections/insight/cards/PopularGlossaryTerms'; +import { + RECENTLY_CREATED_DATASETS_ID, + RecentlyCreatedDatasetsCard, +} from '@app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyCreatedDatasetsCard'; +import { + RECENTLY_UPDATED_ID, + RecentlyUpdatedDatasetsCard, +} from '@app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyUpdatedDatasetsCard'; +import { INSIGHT_CARD_MIN_WIDTH } from '@app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard'; +import InsightCardSkeleton from '@app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCardSkeleton'; +import { useUserPersona } from '@app/homeV2/persona/useUserPersona'; +import { PersonaType } from '@app/homeV2/shared/types'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; +import { HOME_PAGE_INSIGHTS_ID } from '@app/onboarding/config/HomePageOnboardingConfig'; +import HorizontalScroller from '@app/sharedV2/carousel/HorizontalScroller'; const GAP_PX = 12; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/FoundationalAssetsCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/FoundationalAssetsCard.tsx index 3c55c27f2b..f18e9e474e 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/FoundationalAssetsCard.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/FoundationalAssetsCard.tsx @@ -1,7 +1,11 @@ import React from 'react'; -import { buildFoundationalAssetsFilters, buildFoundationalAssetsSort } from './useGetFoundationalAssets'; -import { SearchListInsightCard } from './SearchListInsightCard'; -import { ASSET_ENTITY_TYPES } from '../../../../../../../searchV2/utils/constants'; + +import { SearchListInsightCard } from '@app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard'; +import { + buildFoundationalAssetsFilters, + buildFoundationalAssetsSort, +} from '@app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets'; +import { ASSET_ENTITY_TYPES } from '@app/searchV2/utils/constants'; export const FoundationalAssetsCard = () => { return ( diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/InsightLoadingCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/InsightLoadingCard.tsx index 28f7a4a356..3a52b504d5 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/InsightLoadingCard.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/InsightLoadingCard.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Skeleton } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const Container = styled.div``; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostRowsCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostRowsCard.tsx index 2ad6d75432..129a60bc56 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostRowsCard.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostRowsCard.tsx @@ -1,7 +1,12 @@ import React from 'react'; -import { SearchListInsightCard } from './SearchListInsightCard'; -import { buildMostRowsFilters, buildMostRowsSort } from './useGetMostRows'; -import { EntityType } from '../../../../../../../../types.generated'; + +import { SearchListInsightCard } from '@app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard'; +import { + buildMostRowsFilters, + buildMostRowsSort, +} from '@app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostRows'; + +import { EntityType } from '@types'; export const MOST_ROWS_ID = 'MostRows'; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/PopularGlossaryTerms.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/PopularGlossaryTerms.tsx index b1b771b0f6..373bcc66c2 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/PopularGlossaryTerms.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/PopularGlossaryTerms.tsx @@ -1,18 +1,19 @@ -import React, { useContext, useEffect, useMemo, useState } from 'react'; - import { Tooltip } from '@components'; +import React, { useContext, useEffect, useMemo, useState } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { PageRoutes } from '../../../../../../../../conf/Global'; -import { useListRecommendationsQuery } from '../../../../../../../../graphql/recommendations.generated'; -import { useUserContext } from '../../../../../../../context/useUserContext'; -import { ANTD_GRAY } from '../../../../../../../entity/shared/constants'; -import OnboardingContext from '../../../../../../../onboarding/OnboardingContext'; -import { EntityLinkList } from '../../../../../../reference/sections/EntityLinkList'; -import { RecommendationRenderType, ScenarioType } from '../../../../../../../../types.generated'; -import { useRegisterInsight } from '../InsightStatusProvider'; -import { InsightCard } from '../shared/InsightCard'; -import InsightCardSkeleton from '../shared/InsightCardSkeleton'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useRegisterInsight } from '@app/homeV2/content/tabs/discovery/sections/insight/InsightStatusProvider'; +import { InsightCard } from '@app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCard'; +import InsightCardSkeleton from '@app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCardSkeleton'; +import { EntityLinkList } from '@app/homeV2/reference/sections/EntityLinkList'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; +import { PageRoutes } from '@conf/Global'; + +import { useListRecommendationsQuery } from '@graphql/recommendations.generated'; +import { RecommendationRenderType, ScenarioType } from '@types'; const Header = styled.div` display: flex; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyCreatedDatasetsCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyCreatedDatasetsCard.tsx index b5a870f5ed..1a5d05ebcc 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyCreatedDatasetsCard.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyCreatedDatasetsCard.tsx @@ -1,7 +1,12 @@ import React from 'react'; -import { SearchListInsightCard } from './SearchListInsightCard'; -import { EntityType } from '../../../../../../../../types.generated'; -import { buildRecentlyCreatedDatasetsFilters, buildRecentlyCreatedDatasetsSort } from './useRecentlyCreatedDatasets'; + +import { SearchListInsightCard } from '@app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard'; +import { + buildRecentlyCreatedDatasetsFilters, + buildRecentlyCreatedDatasetsSort, +} from '@app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyCreatedDatasets'; + +import { EntityType } from '@types'; const MAX_AGE_DAYS = 14; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyUpdatedDatasetsCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyUpdatedDatasetsCard.tsx index eae3f73e3c..42e6285eda 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyUpdatedDatasetsCard.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyUpdatedDatasetsCard.tsx @@ -1,7 +1,12 @@ import React from 'react'; -import { SearchListInsightCard } from './SearchListInsightCard'; -import { EntityType } from '../../../../../../../../types.generated'; -import { buildRecentlyUpdatedDatasetsFilters, buildRecentlyUpdatedDatasetsSort } from './useRecentlyUpdatedDatasets'; + +import { SearchListInsightCard } from '@app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard'; +import { + buildRecentlyUpdatedDatasetsFilters, + buildRecentlyUpdatedDatasetsSort, +} from '@app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyUpdatedDatasets'; + +import { EntityType } from '@types'; const MAX_AGE_DAYS = 14; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard.tsx index edf79bc2e5..d5e2853eb0 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard.tsx @@ -1,17 +1,19 @@ +import { Tooltip } from '@components'; import React, { useContext, useEffect, useMemo, useState } from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; -import { InsightCard } from '../shared/InsightCard'; -import { EntityLinkList } from '../../../../../../reference/sections/EntityLinkList'; -import { EmbeddedListSearchModal } from '../../../../../../../entityV2/shared/components/styled/search/EmbeddedListSearchModal'; -import { ANTD_GRAY } from '../../../../../../../entity/shared/constants'; -import { EntityType, SortCriterion } from '../../../../../../../../types.generated'; -import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types'; -import { useGetSearchAssets } from './useGetSearchAssets'; -import { useRegisterInsight } from '../InsightStatusProvider'; -import { useUserContext } from '../../../../../../../context/useUserContext'; -import OnboardingContext from '../../../../../../../onboarding/OnboardingContext'; -import InsightCardSkeleton from '../shared/InsightCardSkeleton'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { EmbeddedListSearchModal } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchModal'; +import { FilterSet } from '@app/entityV2/shared/components/styled/search/types'; +import { useRegisterInsight } from '@app/homeV2/content/tabs/discovery/sections/insight/InsightStatusProvider'; +import { useGetSearchAssets } from '@app/homeV2/content/tabs/discovery/sections/insight/cards/useGetSearchAssets'; +import { InsightCard } from '@app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCard'; +import InsightCardSkeleton from '@app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCardSkeleton'; +import { EntityLinkList } from '@app/homeV2/reference/sections/EntityLinkList'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; + +import { EntityType, SortCriterion } from '@types'; export const INSIGHT_CARD_MIN_WIDTH = 340; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets.tsx index 264ab41c90..b2f49c5c1e 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets.tsx @@ -1,7 +1,8 @@ -import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated'; -import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types'; -import { LAST_MODIFIED_TIME_FIELD } from '../../../../../../../searchV2/context/constants'; -import { UnionType } from '../../../../../../../searchV2/utils/constants'; +import { FilterSet } from '@app/entityV2/shared/components/styled/search/types'; +import { LAST_MODIFIED_TIME_FIELD } from '@app/searchV2/context/constants'; +import { UnionType } from '@app/searchV2/utils/constants'; + +import { FilterOperator, SortCriterion, SortOrder } from '@types'; const FOUNDATIONAL_ASSET_TAGS = ['urn:li:tag:__default_large_table', 'urn:li:tag:__default_high_queries']; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostRows.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostRows.tsx index de648ccc00..ca22668c5e 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostRows.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostRows.tsx @@ -1,6 +1,7 @@ -import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated'; -import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types'; -import { UnionType } from '../../../../../../../searchV2/utils/constants'; +import { FilterSet } from '@app/entityV2/shared/components/styled/search/types'; +import { UnionType } from '@app/searchV2/utils/constants'; + +import { FilterOperator, SortCriterion, SortOrder } from '@types'; const MIN_ROWS = '100'; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetSearchAssets.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetSearchAssets.tsx index 8155ff7e9a..00643c2afc 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetSearchAssets.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetSearchAssets.tsx @@ -1,9 +1,10 @@ -import { useIsShowSeparateSiblingsEnabled } from '@src/app/useAppConfig'; +import { FilterSet } from '@app/entityV2/shared/components/styled/search/types'; +import { UnionType } from '@app/searchV2/utils/constants'; import { combineSiblingsInSearchResults } from '@src/app/search/utils/combineSiblingsInSearchResults'; -import { useGetSearchResultsForMultipleQuery } from '../../../../../../../../graphql/search.generated'; -import { EntityType, SortCriterion } from '../../../../../../../../types.generated'; -import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types'; -import { UnionType } from '../../../../../../../searchV2/utils/constants'; +import { useIsShowSeparateSiblingsEnabled } from '@src/app/useAppConfig'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { EntityType, SortCriterion } from '@types'; const buildOrFilters = (filters: FilterSet) => { if (filters.unionType === UnionType.AND) { diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyCreatedDatasets.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyCreatedDatasets.tsx index 0d3f0e3d32..ce9788315b 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyCreatedDatasets.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyCreatedDatasets.tsx @@ -1,7 +1,9 @@ import moment from 'moment/moment'; -import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated'; -import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types'; -import { UnionType } from '../../../../../../../searchV2/utils/constants'; + +import { FilterSet } from '@app/entityV2/shared/components/styled/search/types'; +import { UnionType } from '@app/searchV2/utils/constants'; + +import { FilterOperator, SortCriterion, SortOrder } from '@types'; export const buildRecentlyCreatedDatasetsFilters = (sinceDays: number): FilterSet => { const startDate = moment().utcOffset(0).subtract(sinceDays, 'days').set({ diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyUpdatedDatasets.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyUpdatedDatasets.tsx index 9794d2b400..8f231144c2 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyUpdatedDatasets.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyUpdatedDatasets.tsx @@ -1,7 +1,9 @@ import moment from 'moment'; -import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated'; -import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types'; -import { UnionType } from '../../../../../../../searchV2/utils/constants'; + +import { FilterSet } from '@app/entityV2/shared/components/styled/search/types'; +import { UnionType } from '@app/searchV2/utils/constants'; + +import { FilterOperator, SortCriterion, SortOrder } from '@types'; export const buildRecentlyUpdatedDatasetsFilters = (sinceDays: number): FilterSet => { const startDate = moment().utcOffset(0).subtract(sinceDays, 'days').set({ diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCard.tsx index 7e600823c3..b3070ac5be 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCard.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCard.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components/macro'; + +import { REDESIGN_COLORS } from '@app/entity/shared/constants'; import { colors } from '@src/alchemy-components'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { REDESIGN_COLORS } from '../../../../../../../entity/shared/constants'; const Card = styled.div<{ clickable: boolean; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCardSkeleton.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCardSkeleton.tsx index 34a420581d..f3eced3e1e 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCardSkeleton.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCardSkeleton.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Skeleton } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const CardHeader = styled.div` diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/PlatformCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/PlatformCard.tsx index 8423022d8a..2ed861d667 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/PlatformCard.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/PlatformCard.tsx @@ -1,17 +1,19 @@ +import { Tooltip } from '@components'; import React from 'react'; -import styled from 'styled-components/macro'; import { useHistory } from 'react-router'; +import styled from 'styled-components/macro'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { navigateToSearchUrl } from '@app/searchV2/utils/navigateToSearchUrl'; +import { formatNumber, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import PlatformIcon from '@app/sharedV2/icons/PlatformIcon'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { colors } from '@src/alchemy-components'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { Tooltip } from '@components'; -import { DataPlatform, EntityType } from '../../../../../../../types.generated'; -import { useEntityRegistry } from '../../../../../../useEntityRegistry'; -import { ANTD_GRAY } from '../../../../../../entity/shared/constants'; -import { navigateToSearchUrl } from '../../../../../../searchV2/utils/navigateToSearchUrl'; -import { PLATFORM_FILTER_NAME } from '../../../../../../searchV2/utils/constants'; -import { formatNumber, formatNumberWithoutAbbreviation } from '../../../../../../shared/formatNumber'; -import { SEARCH_COLORS } from '../../../../../../entityV2/shared/constants'; -import PlatformIcon from '../../../../../../sharedV2/icons/PlatformIcon'; + +import { DataPlatform, EntityType } from '@types'; const Card = styled.div<{ $isShowNavBarRedesign?: boolean }>` border-radius: 10px; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/Platforms.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/Platforms.tsx index 31993d835c..c22f93674e 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/Platforms.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/Platforms.tsx @@ -1,15 +1,16 @@ import { Skeleton } from 'antd'; import React, { useContext } from 'react'; import styled from 'styled-components'; -import { Section } from '../Section'; -import { PlatformCard } from './PlatformCard'; -import { useGetPlatforms } from './useGetPlatforms'; -import { useUserContext } from '../../../../../../context/useUserContext'; -import { HOME_PAGE_PLATFORMS_ID } from '../../../../../../onboarding/config/HomePageOnboardingConfig'; -import { useUpdateEducationStepsAllowList } from '../../../../../../onboarding/useUpdateEducationStepsAllowList'; -import { Carousel } from '../../../../../../sharedV2/carousel/Carousel'; -import { HorizontalListSkeletons } from '../../../../HorizontalListSkeletons'; -import OnboardingContext from '../../../../../../onboarding/OnboardingContext'; + +import { useUserContext } from '@app/context/useUserContext'; +import { HorizontalListSkeletons } from '@app/homeV2/content/HorizontalListSkeletons'; +import { Section } from '@app/homeV2/content/tabs/discovery/sections/Section'; +import { PlatformCard } from '@app/homeV2/content/tabs/discovery/sections/platform/PlatformCard'; +import { useGetPlatforms } from '@app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; +import { HOME_PAGE_PLATFORMS_ID } from '@app/onboarding/config/HomePageOnboardingConfig'; +import { useUpdateEducationStepsAllowList } from '@app/onboarding/useUpdateEducationStepsAllowList'; +import { Carousel } from '@app/sharedV2/carousel/Carousel'; const SkeletonCard = styled(Skeleton.Button)<{ width: string }>` &&& { diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms.tsx index e22b39a98b..8542effd82 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms.tsx @@ -1,5 +1,5 @@ -import { useGetDataPlatformsQuery } from '../../../../../../../graphql/dataPlatform.generated'; -import { DataPlatform } from '../../../../../../../types.generated'; +import { useGetDataPlatformsQuery } from '@graphql/dataPlatform.generated'; +import { DataPlatform } from '@types'; export const DATA_PLATFORMS_URNS = [ 'urn:li:dataPlatform:snowflake', diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms.tsx index 66a9b7bb28..4ecfe7bfd1 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms.tsx @@ -1,6 +1,7 @@ -import { useListRecommendationsQuery } from '../../../../../../../graphql/recommendations.generated'; -import { CorpUser, DataPlatform, ScenarioType } from '../../../../../../../types.generated'; -import { useUserContext } from '../../../../../../context/useUserContext'; +import { useUserContext } from '@app/context/useUserContext'; + +import { useListRecommendationsQuery } from '@graphql/recommendations.generated'; +import { CorpUser, DataPlatform, ScenarioType } from '@types'; export const PLATFORMS_MODULE_ID = 'Platforms'; diff --git a/datahub-web-react/src/app/homeV2/content/tabs/tabs.tsx b/datahub-web-react/src/app/homeV2/content/tabs/tabs.tsx index c9f383f0b8..6aff44f386 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/tabs.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/tabs.tsx @@ -1,10 +1,10 @@ +import { ActivityTab } from '@app/homeV2/content/tabs/activity/ActivityTab'; +import { AnnouncementsTab } from '@app/homeV2/content/tabs/announcements/AnnouncementsTab'; +import { DiscoveryTab } from '@app/homeV2/content/tabs/discovery/DiscoveryTab'; import { V2_HOME_PAGE_ANNOUNCEMENTS_ID, V2_HOME_PAGE_DISCOVER_ID, -} from '../../../onboarding/configV2/HomePageOnboardingConfig'; -import { DiscoveryTab } from './discovery/DiscoveryTab'; -import { ActivityTab } from './activity/ActivityTab'; -import { AnnouncementsTab } from './announcements/AnnouncementsTab'; +} from '@app/onboarding/configV2/HomePageOnboardingConfig'; // todo: decide whether we want icons for each tab! diff --git a/datahub-web-react/src/app/homeV2/content/tabs/useGetVisibleTabs.tsx b/datahub-web-react/src/app/homeV2/content/tabs/useGetVisibleTabs.tsx index 64df478ad4..b4fc27761b 100644 --- a/datahub-web-react/src/app/homeV2/content/tabs/useGetVisibleTabs.tsx +++ b/datahub-web-react/src/app/homeV2/content/tabs/useGetVisibleTabs.tsx @@ -1,11 +1,12 @@ +import { useUserContext } from '@app/context/useUserContext'; +import { TabType } from '@app/homeV2/content/tabs/tabs'; +import { useUpdateLastViewedAnnouncementTime } from '@app/homeV2/shared/updateLastViewedAnnouncementTime'; +import { useGetLastViewedAnnouncementTime } from '@app/homeV2/shared/useGetLastViewedAnnouncementTime'; +import { hasViewedAnnouncement } from '@app/homeV2/shared/utils'; import { getHomePagePostsFilters } from '@app/utils/queryUtils'; -import { useListPostsQuery } from '../../../../graphql/post.generated'; -import { PostContentType, PostType } from '../../../../types.generated'; -import { useUserContext } from '../../../context/useUserContext'; -import { useUpdateLastViewedAnnouncementTime } from '../../shared/updateLastViewedAnnouncementTime'; -import { useGetLastViewedAnnouncementTime } from '../../shared/useGetLastViewedAnnouncementTime'; -import { hasViewedAnnouncement } from '../../shared/utils'; -import { TabType } from './tabs'; + +import { useListPostsQuery } from '@graphql/post.generated'; +import { PostContentType, PostType } from '@types'; const useGetAnnouncementsExists = (): ActiveTab | null => { const { user } = useUserContext(); diff --git a/datahub-web-react/src/app/homeV2/introduce/IntroduceYourself.tsx b/datahub-web-react/src/app/homeV2/introduce/IntroduceYourself.tsx index b195b177e5..6afbb3ff3f 100644 --- a/datahub-web-react/src/app/homeV2/introduce/IntroduceYourself.tsx +++ b/datahub-web-react/src/app/homeV2/introduce/IntroduceYourself.tsx @@ -1,8 +1,9 @@ import React, { useEffect } from 'react'; import styled from 'styled-components'; -import analytics, { EventType } from '../../analytics'; -import { IntroduceYourselfLeftSidebar } from './IntroduceYourselfLeftSidebar'; -import { IntroduceYourselfMainContent } from './IntroduceYourselfMainContent'; + +import analytics, { EventType } from '@app/analytics'; +import { IntroduceYourselfLeftSidebar } from '@app/homeV2/introduce/IntroduceYourselfLeftSidebar'; +import { IntroduceYourselfMainContent } from '@app/homeV2/introduce/IntroduceYourselfMainContent'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfLeftSidebar.tsx b/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfLeftSidebar.tsx index 8eaeb3d8a5..c7015708f9 100644 --- a/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfLeftSidebar.tsx +++ b/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfLeftSidebar.tsx @@ -1,8 +1,9 @@ +import { Image } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Image } from 'antd'; -import dataHubIcon from '../../../images/datahublogo.png'; -import datahubPlatforms from '../../../images/datahub-platforms.svg'; + +import datahubPlatforms from '@images/datahub-platforms.svg'; +import dataHubIcon from '@images/datahublogo.png'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfMainContent.tsx b/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfMainContent.tsx index 00fc1443fc..183f83934d 100644 --- a/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfMainContent.tsx +++ b/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfMainContent.tsx @@ -3,28 +3,27 @@ import AccountCircleOutlinedIcon from '@mui/icons-material/AccountCircleOutlined import CheckIcon from '@mui/icons-material/Check'; import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined'; import SettingsOutlinedIcon from '@mui/icons-material/SettingsOutlined'; -import colors from '@src/alchemy-components/theme/foundations/colors'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import { useListGlobalViewsQuery } from '@src/graphql/view.generated'; import { Button, Select, message } from 'antd'; import { orderBy } from 'lodash'; import React, { useContext, useState } from 'react'; import { useHistory } from 'react-router'; import styled from 'styled-components'; -import { useListRecommendationsQuery } from '../../../graphql/recommendations.generated'; -import { - useUpdateCorpUserPropertiesMutation, - useUpdateCorpUserViewsSettingsMutation, -} from '../../../graphql/user.generated'; -import { DataHubViewType, DataPlatform, EntityType, ScenarioType } from '../../../types.generated'; -import analytics, { EventType } from '../../analytics'; -import { useUserContext } from '../../context/useUserContext'; -import OnboardingContext from '../../onboarding/OnboardingContext'; -import Loading from '../../shared/Loading'; -import PlatformIcon from '../../sharedV2/icons/PlatformIcon'; -import { useGetDataPlatforms } from '../content/tabs/discovery/sections/platform/useGetDataPlatforms'; -import { PLATFORMS_MODULE_ID } from '../content/tabs/discovery/sections/platform/useGetPlatforms'; -import { PERSONA_TYPE_TO_VIEW_URN, PersonaType, ROLE_TO_PERSONA_TYPE } from '../shared/types'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { useGetDataPlatforms } from '@app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms'; +import { PLATFORMS_MODULE_ID } from '@app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms'; +import { PERSONA_TYPE_TO_VIEW_URN, PersonaType, ROLE_TO_PERSONA_TYPE } from '@app/homeV2/shared/types'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; +import Loading from '@app/shared/Loading'; +import PlatformIcon from '@app/sharedV2/icons/PlatformIcon'; +import colors from '@src/alchemy-components/theme/foundations/colors'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { useListGlobalViewsQuery } from '@src/graphql/view.generated'; + +import { useListRecommendationsQuery } from '@graphql/recommendations.generated'; +import { useUpdateCorpUserPropertiesMutation, useUpdateCorpUserViewsSettingsMutation } from '@graphql/user.generated'; +import { DataHubViewType, DataPlatform, EntityType, ScenarioType } from '@types'; const Container = styled.div` flex: 1; diff --git a/datahub-web-react/src/app/homeV2/introduce/PersonaSelector.tsx b/datahub-web-react/src/app/homeV2/introduce/PersonaSelector.tsx index 98cfe53683..556174e641 100644 --- a/datahub-web-react/src/app/homeV2/introduce/PersonaSelector.tsx +++ b/datahub-web-react/src/app/homeV2/introduce/PersonaSelector.tsx @@ -1,13 +1,14 @@ import React from 'react'; import styled from 'styled-components'; -import colors from '@src/alchemy-components/theme/foundations/colors'; -import { Heading } from '@src/alchemy-components'; + import { + PERSONA_TYPES_TO_DISPLAY, PERSONA_TYPE_TO_DESCRIPTION, PERSONA_TYPE_TO_LABEL, PERSONA_TYPE_TO_VIEW_ICON, - PERSONA_TYPES_TO_DISPLAY, -} from '../shared/types'; +} from '@app/homeV2/shared/types'; +import { Heading } from '@src/alchemy-components'; +import colors from '@src/alchemy-components/theme/foundations/colors'; const PersonaCard = styled.div<{ selected: boolean }>` border: 1px rgb(217, 217, 217) solid; diff --git a/datahub-web-react/src/app/homeV2/introduce/useRedirectToIntroduceYourself.tsx b/datahub-web-react/src/app/homeV2/introduce/useRedirectToIntroduceYourself.tsx index fe15ffb934..0231ecb5db 100644 --- a/datahub-web-react/src/app/homeV2/introduce/useRedirectToIntroduceYourself.tsx +++ b/datahub-web-react/src/app/homeV2/introduce/useRedirectToIntroduceYourself.tsx @@ -1,7 +1,8 @@ import { useEffect } from 'react'; import { useHistory } from 'react-router'; -import { PageRoutes } from '../../../conf/Global'; -import { useLoadUserPersona } from '../persona/useLoadUserPersona'; + +import { useLoadUserPersona } from '@app/homeV2/persona/useLoadUserPersona'; +import { PageRoutes } from '@conf/Global'; const SKIP_INTRODUCE_PAGE_KEY = 'skipAcrylIntroducePage'; diff --git a/datahub-web-react/src/app/homeV2/layout/CenterContent.tsx b/datahub-web-react/src/app/homeV2/layout/CenterContent.tsx index 96f74b9cad..98215e36a2 100644 --- a/datahub-web-react/src/app/homeV2/layout/CenterContent.tsx +++ b/datahub-web-react/src/app/homeV2/layout/CenterContent.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; + +import { RecentActions } from '@app/homeV2/content/recent/RecentActions'; +import { CenterTabs } from '@app/homeV2/content/tabs/CenterTabs'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { RecentActions } from '../content/recent/RecentActions'; -import { CenterTabs } from '../content/tabs/CenterTabs'; const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>` flex: 1; diff --git a/datahub-web-react/src/app/homeV2/layout/CustomNavLink.tsx b/datahub-web-react/src/app/homeV2/layout/CustomNavLink.tsx index c96c85e0dd..6edc55a0de 100644 --- a/datahub-web-react/src/app/homeV2/layout/CustomNavLink.tsx +++ b/datahub-web-react/src/app/homeV2/layout/CustomNavLink.tsx @@ -1,8 +1,9 @@ -import { Pill } from '@src/alchemy-components'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { NavMenuItem } from './types'; + +import { NavMenuItem } from '@app/homeV2/layout/types'; +import { Pill } from '@src/alchemy-components'; const OptionContainer = styled.div``; diff --git a/datahub-web-react/src/app/homeV2/layout/LeftSidebar.tsx b/datahub-web-react/src/app/homeV2/layout/LeftSidebar.tsx index 00a437ae9e..c06e16404d 100644 --- a/datahub-web-react/src/app/homeV2/layout/LeftSidebar.tsx +++ b/datahub-web-react/src/app/homeV2/layout/LeftSidebar.tsx @@ -1,16 +1,17 @@ import React from 'react'; import styled from 'styled-components'; + +import { useUserPersona } from '@app/homeV2/persona/useUserPersona'; +import { UserHeader } from '@app/homeV2/reference/header/UserHeader'; +import { AssetsYouOwn } from '@app/homeV2/reference/sections/assets/AssetsYouOwn'; +import { DomainsYouOwn } from '@app/homeV2/reference/sections/domains/DomainsYouOwn'; +import { GlossaryNodesYouOwn } from '@app/homeV2/reference/sections/glossary/GlossaryNodesYouOwn'; +import { GroupsYouAreIn } from '@app/homeV2/reference/sections/groups/GroupsYouAreIn'; +import { TagsYouOwn } from '@app/homeV2/reference/sections/tags/TagsYouOwn'; +import { ReferenceSectionProps } from '@app/homeV2/reference/types'; +import { PersonaType } from '@app/homeV2/shared/types'; +import { V2_HOME_PAGE_PERSONAL_SIDEBAR_ID } from '@app/onboarding/configV2/HomePageOnboardingConfig'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { AssetsYouOwn } from '../reference/sections/assets/AssetsYouOwn'; -import { GroupsYouAreIn } from '../reference/sections/groups/GroupsYouAreIn'; -import { TagsYouOwn } from '../reference/sections/tags/TagsYouOwn'; -import { GlossaryNodesYouOwn } from '../reference/sections/glossary/GlossaryNodesYouOwn'; -import { DomainsYouOwn } from '../reference/sections/domains/DomainsYouOwn'; -import { ReferenceSectionProps } from '../reference/types'; -import { PersonaType } from '../shared/types'; -import { useUserPersona } from '../persona/useUserPersona'; -import { UserHeader } from '../reference/header/UserHeader'; -import { V2_HOME_PAGE_PERSONAL_SIDEBAR_ID } from '../../onboarding/configV2/HomePageOnboardingConfig'; const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>` flex: 1; diff --git a/datahub-web-react/src/app/homeV2/layout/NavLinks.tsx b/datahub-web-react/src/app/homeV2/layout/NavLinks.tsx index 6f2b49d50b..61c332b8c1 100644 --- a/datahub-web-react/src/app/homeV2/layout/NavLinks.tsx +++ b/datahub-web-react/src/app/homeV2/layout/NavLinks.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { NavLinksMenu } from './NavLinksMenu'; + +import { NavLinksMenu } from '@app/homeV2/layout/NavLinksMenu'; const Container = styled.div` border-radius: 47px; diff --git a/datahub-web-react/src/app/homeV2/layout/NavLinksMenu.tsx b/datahub-web-react/src/app/homeV2/layout/NavLinksMenu.tsx index 20c35178a4..2ada002bcd 100644 --- a/datahub-web-react/src/app/homeV2/layout/NavLinksMenu.tsx +++ b/datahub-web-react/src/app/homeV2/layout/NavLinksMenu.tsx @@ -1,23 +1,22 @@ +import { Tooltip } from '@components'; import React, { useState } from 'react'; +import { Link } from 'react-router-dom'; import styled, { useTheme } from 'styled-components/macro'; -import { Tooltip } from '@components'; -import { Link } from 'react-router-dom'; +import { useUserContext } from '@app/context/useUserContext'; +import CustomNavLink from '@app/homeV2/layout/CustomNavLink'; +import { NavMenuItem, NavSubMenuItem } from '@app/homeV2/layout/types'; +import { HOME_PAGE_INGESTION_ID } from '@app/onboarding/config/HomePageOnboardingConfig'; +import { useHandleOnboardingTour } from '@app/onboarding/useHandleOnboardingTour'; +import { useUpdateEducationStepsAllowList } from '@app/onboarding/useUpdateEducationStepsAllowList'; +import { useAppConfig } from '@app/useAppConfig'; +import { HelpLinkRoutes, PageRoutes } from '@conf/Global'; -import { HelpLinkRoutes, PageRoutes } from '../../../conf/Global'; -import { useUserContext } from '../../context/useUserContext'; -import { HOME_PAGE_INGESTION_ID } from '../../onboarding/config/HomePageOnboardingConfig'; -import { useUpdateEducationStepsAllowList } from '../../onboarding/useUpdateEducationStepsAllowList'; -import { useAppConfig } from '../../useAppConfig'; - -import AnalyticsMenuIcon from '../../../images/analyticsMenuIcon.svg?react'; -import GovernMenuIcon from '../../../images/governMenuIcon.svg?react'; -import HelpMenuIcon from '../../../images/help-icon.svg?react'; -import IngestionMenuIcon from '../../../images/ingestionMenuIcon.svg?react'; -import SettingsMenuIcon from '../../../images/settingsMenuIcon.svg?react'; -import { useHandleOnboardingTour } from '../../onboarding/useHandleOnboardingTour'; -import CustomNavLink from './CustomNavLink'; -import { NavMenuItem, NavSubMenuItem } from './types'; +import AnalyticsMenuIcon from '@images/analyticsMenuIcon.svg?react'; +import GovernMenuIcon from '@images/governMenuIcon.svg?react'; +import HelpMenuIcon from '@images/help-icon.svg?react'; +import IngestionMenuIcon from '@images/ingestionMenuIcon.svg?react'; +import SettingsMenuIcon from '@images/settingsMenuIcon.svg?react'; const LinksWrapper = styled.div<{ areLinksHidden?: boolean }>` opacity: 1; diff --git a/datahub-web-react/src/app/homeV2/layout/NavSidebar.tsx b/datahub-web-react/src/app/homeV2/layout/NavSidebar.tsx index 48a12f98af..e93fd9a142 100644 --- a/datahub-web-react/src/app/homeV2/layout/NavSidebar.tsx +++ b/datahub-web-react/src/app/homeV2/layout/NavSidebar.tsx @@ -1,17 +1,18 @@ -import React, { useContext } from 'react'; -import styled from 'styled-components'; -import { Link } from 'react-router-dom'; import { Skeleton } from 'antd'; +import React, { useContext } from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components'; -import { NavLinks } from './NavLinks'; -import { useAppConfig } from '../../useAppConfig'; -import { useUserContext } from '../../context/useUserContext'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { EntityType } from '../../../types.generated'; +import { useUserContext } from '@app/context/useUserContext'; +import { NavLinks } from '@app/homeV2/layout/NavLinks'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; -import CustomAvatar from '../../shared/avatar/CustomAvatar'; -import AcrylIcon from '../../../images/acryl-light-mark.svg?react'; -import OnboardingContext from '../../onboarding/OnboardingContext'; +import { EntityType } from '@types'; + +import AcrylIcon from '@images/acryl-light-mark.svg?react'; const Container = styled.div` height: 100vh; diff --git a/datahub-web-react/src/app/homeV2/layout/RightSidebar.tsx b/datahub-web-react/src/app/homeV2/layout/RightSidebar.tsx index 779f59e3cb..5edbca338e 100644 --- a/datahub-web-react/src/app/homeV2/layout/RightSidebar.tsx +++ b/datahub-web-react/src/app/homeV2/layout/RightSidebar.tsx @@ -1,7 +1,8 @@ import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; + +import { Announcements } from '@app/homeV2/action/announcement/Announcements'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { Announcements } from '../action/announcement/Announcements'; const Container = styled.div<{ $isHidden?: boolean; $isShowNavBarRedesign?: boolean }>` overflow-y: auto; diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarContext.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarContext.tsx index 2cfe482a19..89c08ad655 100644 --- a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarContext.tsx +++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarContext.tsx @@ -1,4 +1,4 @@ -import React, { useContext, useState, ReactNode, useMemo, useCallback, useEffect } from 'react'; +import React, { ReactNode, useCallback, useContext, useEffect, useMemo, useState } from 'react'; export enum NavBarStateType { Collapsed = 'COLLAPSED', diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarHeader.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarHeader.tsx index 65e3ba8ce8..22d84e4516 100644 --- a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarHeader.tsx +++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarHeader.tsx @@ -1,9 +1,10 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { colors, Pill } from '@src/alchemy-components'; -import NavBarToggler from './NavBarToggler'; -import { useNavBarContext } from './NavBarContext'; + +import { useNavBarContext } from '@app/homeV2/layout/navBarRedesign/NavBarContext'; +import NavBarToggler from '@app/homeV2/layout/navBarRedesign/NavBarToggler'; +import { Pill, colors } from '@src/alchemy-components'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenu.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenu.tsx index 52335ca7b0..0be417440c 100644 --- a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenu.tsx +++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenu.tsx @@ -1,10 +1,11 @@ -import React from 'react'; import { Menu, MenuProps } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import NavBarMenuItem from './NavBarMenuItem'; -import NavBarMenuItemDropdown from './NavBarMenuItemDropdown'; -import { AnyMenuItem, NavBarMenuItems, NavBarMenuItemTypes } from './types'; -import NavBarMenuItemGroup from './NavBarMenuItemGroup'; + +import NavBarMenuItem from '@app/homeV2/layout/navBarRedesign/NavBarMenuItem'; +import NavBarMenuItemDropdown from '@app/homeV2/layout/navBarRedesign/NavBarMenuItemDropdown'; +import NavBarMenuItemGroup from '@app/homeV2/layout/navBarRedesign/NavBarMenuItemGroup'; +import { AnyMenuItem, NavBarMenuItemTypes, NavBarMenuItems } from '@app/homeV2/layout/navBarRedesign/types'; const StyledMenu = styled(Menu)` && { diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItem.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItem.tsx index c77c3c2364..ad97411647 100644 --- a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItem.tsx +++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItem.tsx @@ -1,9 +1,10 @@ -import React from 'react'; import { Menu, MenuItemProps, Tooltip } from 'antd'; +import React from 'react'; import { useHistory } from 'react-router-dom'; import styled from 'styled-components'; -import { colors, Badge, Text } from '@src/alchemy-components'; -import { NavBarMenuBaseItem } from './types'; + +import { NavBarMenuBaseItem } from '@app/homeV2/layout/navBarRedesign/types'; +import { Badge, Text, colors } from '@src/alchemy-components'; const StyledMenuItem = styled(Menu.Item)<{ isCollapsed?: boolean }>` &&& { diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItemDropdown.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItemDropdown.tsx index 6f97d0f0f4..dc142e304e 100644 --- a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItemDropdown.tsx +++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItemDropdown.tsx @@ -1,10 +1,11 @@ -import React from 'react'; import { Dropdown, MenuItemProps } from 'antd'; +import React from 'react'; import { useHistory } from 'react-router'; import styled from 'styled-components'; -import { colors, Text } from '@src/alchemy-components'; -import NavBarMenuItem from './NavBarMenuItem'; -import { NavBarMenuDropdownItem } from './types'; + +import NavBarMenuItem from '@app/homeV2/layout/navBarRedesign/NavBarMenuItem'; +import { NavBarMenuDropdownItem } from '@app/homeV2/layout/navBarRedesign/types'; +import { Text, colors } from '@src/alchemy-components'; const StyledDropdownContentWrapper = styled.div` background-color: white; diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarSkeleton.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarSkeleton.tsx index e379247f61..2722797023 100644 --- a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarSkeleton.tsx +++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarSkeleton.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import SkeletonButton from 'antd/lib/skeleton/Button'; +import React from 'react'; import styled from 'styled-components'; const Spacer = styled.div` diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarToggler.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarToggler.tsx index 387ca5a701..b4f0fa6914 100644 --- a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarToggler.tsx +++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarToggler.tsx @@ -1,8 +1,9 @@ import { Sidebar } from '@phosphor-icons/react'; import React from 'react'; import styled from 'styled-components'; + +import { useNavBarContext } from '@app/homeV2/layout/navBarRedesign/NavBarContext'; import { colors } from '@src/alchemy-components'; -import { useNavBarContext } from './NavBarContext'; const Toggler = styled.button<{ $isCollapsed?: boolean }>` cursor: pointer; diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavSidebar.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavSidebar.tsx index bf9ca24cfc..dd7ad52720 100644 --- a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavSidebar.tsx +++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavSidebar.tsx @@ -1,10 +1,3 @@ -import React, { useContext, useEffect } from 'react'; -import { HOME_PAGE_INGESTION_ID } from '@src/app/onboarding/config/HomePageOnboardingConfig'; -import { useHandleOnboardingTour } from '@src/app/onboarding/useHandleOnboardingTour'; -import { useUpdateEducationStepsAllowList } from '@src/app/onboarding/useUpdateEducationStepsAllowList'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import { HelpLinkRoutes, PageRoutes } from '@src/conf/Global'; -import { EntityType } from '@src/types.generated'; import { BookBookmark, Gear, @@ -13,24 +6,37 @@ import { Question, SignOut, SquaresFour, + Tag, TextColumns, TrendUp, UserCircle, - Tag, } from '@phosphor-icons/react'; +import React, { useContext, useEffect } from 'react'; import styled, { useTheme } from 'styled-components'; -import useGetLogoutHandler from '@src/app/auth/useGetLogoutHandler'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useNavBarContext } from '@app/homeV2/layout/navBarRedesign/NavBarContext'; +import NavBarHeader from '@app/homeV2/layout/navBarRedesign/NavBarHeader'; +import NavBarMenu from '@app/homeV2/layout/navBarRedesign/NavBarMenu'; +import NavSkeleton from '@app/homeV2/layout/navBarRedesign/NavBarSkeleton'; +import { + NavBarMenuDropdownItemElement, + NavBarMenuItemTypes, + NavBarMenuItems, +} from '@app/homeV2/layout/navBarRedesign/types'; +import useSelectedKey from '@app/homeV2/layout/navBarRedesign/useSelectedKey'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; +import { useAppConfig } from '@app/useAppConfig'; import { colors } from '@src/alchemy-components'; -import AcrylIcon from '../../../../images/acryl-light-mark.svg?react'; -import { useUserContext } from '../../../context/useUserContext'; -import OnboardingContext from '../../../onboarding/OnboardingContext'; -import { useAppConfig } from '../../../useAppConfig'; -import NavBarHeader from './NavBarHeader'; -import NavBarMenu from './NavBarMenu'; -import NavSkeleton from './NavBarSkeleton'; -import { NavBarMenuDropdownItemElement, NavBarMenuItems, NavBarMenuItemTypes } from './types'; -import { useNavBarContext } from './NavBarContext'; -import useSelectedKey from './useSelectedKey'; +import useGetLogoutHandler from '@src/app/auth/useGetLogoutHandler'; +import { HOME_PAGE_INGESTION_ID } from '@src/app/onboarding/config/HomePageOnboardingConfig'; +import { useHandleOnboardingTour } from '@src/app/onboarding/useHandleOnboardingTour'; +import { useUpdateEducationStepsAllowList } from '@src/app/onboarding/useUpdateEducationStepsAllowList'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { HelpLinkRoutes, PageRoutes } from '@src/conf/Global'; +import { EntityType } from '@src/types.generated'; + +import AcrylIcon from '@images/acryl-light-mark.svg?react'; const Container = styled.div` height: 100vh; diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/useSelectedKey.ts b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/useSelectedKey.ts index 1821929090..095be7658f 100644 --- a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/useSelectedKey.ts +++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/useSelectedKey.ts @@ -1,6 +1,7 @@ import { useMemo } from 'react'; import { matchPath, useLocation } from 'react-router'; -import { NavBarMenuItems, NavBarMenuItemTypes } from './types'; + +import { NavBarMenuItemTypes, NavBarMenuItems } from '@app/homeV2/layout/navBarRedesign/types'; export default function useSelectedKey(menu: NavBarMenuItems) { const location = useLocation(); diff --git a/datahub-web-react/src/app/homeV2/layout/shared/styledComponents.tsx b/datahub-web-react/src/app/homeV2/layout/shared/styledComponents.tsx index 46dc019742..011bb7ecee 100644 --- a/datahub-web-react/src/app/homeV2/layout/shared/styledComponents.tsx +++ b/datahub-web-react/src/app/homeV2/layout/shared/styledComponents.tsx @@ -1,7 +1,8 @@ -import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; import React from 'react'; import styled from 'styled-components'; +import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; + const ReferenceSectionContainer = styled.div<{ $isShowNavBarRedesign?: boolean }>` ${(props) => !props.$isShowNavBarRedesign && 'padding: 0px 12px 0px 12px;'} overflow: wrap; diff --git a/datahub-web-react/src/app/homeV2/persona/PersonalizationLoadingModal.tsx b/datahub-web-react/src/app/homeV2/persona/PersonalizationLoadingModal.tsx index b9947177dc..6badf46ce4 100644 --- a/datahub-web-react/src/app/homeV2/persona/PersonalizationLoadingModal.tsx +++ b/datahub-web-react/src/app/homeV2/persona/PersonalizationLoadingModal.tsx @@ -1,8 +1,9 @@ -import React, { useCallback, useContext, useEffect } from 'react'; import { Modal, Progress } from 'antd'; +import React, { useCallback, useContext, useEffect } from 'react'; import styled from 'styled-components'; -import OnboardingContext from '../../onboarding/OnboardingContext'; -import { REDESIGN_COLORS } from '../../entityV2/shared/constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; const ModalStyle = styled(Modal)` .ant-modal-content { diff --git a/datahub-web-react/src/app/homeV2/persona/useLoadUserPersona.tsx b/datahub-web-react/src/app/homeV2/persona/useLoadUserPersona.tsx index c5606b5fa4..49e7f2c455 100644 --- a/datahub-web-react/src/app/homeV2/persona/useLoadUserPersona.tsx +++ b/datahub-web-react/src/app/homeV2/persona/useLoadUserPersona.tsx @@ -1,5 +1,5 @@ -import { useUserContext } from '../../context/useUserContext'; -import { PersonaType } from '../shared/types'; +import { useUserContext } from '@app/context/useUserContext'; +import { PersonaType } from '@app/homeV2/shared/types'; export const useLoadUserPersona = () => { const user = useUserContext(); diff --git a/datahub-web-react/src/app/homeV2/persona/useUserPersona.ts b/datahub-web-react/src/app/homeV2/persona/useUserPersona.ts index 713b45d2c0..4ba5102983 100644 --- a/datahub-web-react/src/app/homeV2/persona/useUserPersona.ts +++ b/datahub-web-react/src/app/homeV2/persona/useUserPersona.ts @@ -1,7 +1,8 @@ import { useEffect } from 'react'; -import { useUserContext } from '../../context/useUserContext'; -import { PersonaType } from '../shared/types'; -import { useLoadUserPersona } from './useLoadUserPersona'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useLoadUserPersona } from '@app/homeV2/persona/useLoadUserPersona'; +import { PersonaType } from '@app/homeV2/shared/types'; const DEFAULT_PERSONA = PersonaType.BUSINESS_USER; diff --git a/datahub-web-react/src/app/homeV2/reference/header/GreetingText.tsx b/datahub-web-react/src/app/homeV2/reference/header/GreetingText.tsx index cd2830e586..607327347d 100644 --- a/datahub-web-react/src/app/homeV2/reference/header/GreetingText.tsx +++ b/datahub-web-react/src/app/homeV2/reference/header/GreetingText.tsx @@ -1,9 +1,11 @@ import React from 'react'; import styled from 'styled-components'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { EntityType } from '../../../../types.generated'; -import { useUserContext } from '../../../context/useUserContext'; -import { getGreetingText } from './getGreetingText'; + +import { useUserContext } from '@app/context/useUserContext'; +import { getGreetingText } from '@app/homeV2/reference/header/getGreetingText'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const Text = styled.div` font-size: 20px; diff --git a/datahub-web-react/src/app/homeV2/reference/header/UserHeader.tsx b/datahub-web-react/src/app/homeV2/reference/header/UserHeader.tsx index 34cc792bda..e89d8aa479 100644 --- a/datahub-web-react/src/app/homeV2/reference/header/UserHeader.tsx +++ b/datahub-web-react/src/app/homeV2/reference/header/UserHeader.tsx @@ -1,14 +1,16 @@ +import { Skeleton } from 'antd'; import React, { useContext } from 'react'; import styled from 'styled-components'; -import { Skeleton } from 'antd'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useUserPersonaTitle } from '@app/homeV2/persona/useUserPersona'; +import { GreetingText } from '@app/homeV2/reference/header/GreetingText'; +import { UserHeaderImage } from '@app/homeV2/reference/header/UserHeaderImage'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { useUserContext } from '../../../context/useUserContext'; -import { GreetingText } from './GreetingText'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { EntityType } from '../../../../types.generated'; -import { UserHeaderImage } from './UserHeaderImage'; -import { useUserPersonaTitle } from '../../persona/useUserPersona'; -import OnboardingContext from '../../../onboarding/OnboardingContext'; + +import { EntityType } from '@types'; const Container = styled.div` min-height: 240px; diff --git a/datahub-web-react/src/app/homeV2/reference/header/UserHeaderImage.tsx b/datahub-web-react/src/app/homeV2/reference/header/UserHeaderImage.tsx index 3ca96c3357..599b72593d 100644 --- a/datahub-web-react/src/app/homeV2/reference/header/UserHeaderImage.tsx +++ b/datahub-web-react/src/app/homeV2/reference/header/UserHeaderImage.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; + +import getAvatarColor from '@app/shared/avatar/getAvatarColor'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import getAvatarColor from '../../../shared/avatar/getAvatarColor'; const PreviewImage = styled.img<{ $isShowNavBarRedesign?: boolean }>` color: white; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/DefaultEmptyEntityList.tsx b/datahub-web-react/src/app/homeV2/reference/sections/DefaultEmptyEntityList.tsx index f367955b3b..794bf65fd6 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/DefaultEmptyEntityList.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/DefaultEmptyEntityList.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Text = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/EntityLink.tsx b/datahub-web-react/src/app/homeV2/reference/sections/EntityLink.tsx index aeef2c318a..bc50c1d10b 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/EntityLink.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/EntityLink.tsx @@ -1,16 +1,18 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled, { CSSObject } from 'styled-components'; -import HealthIcon from '@src/app/previewV2/HealthIcon'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { GlossaryPreviewCardDecoration } from '@app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { DeprecationIcon } from '@src/app/entityV2/shared/components/styled/DeprecationIcon'; -import { useEmbeddedProfileLinkProps } from '@src/app/shared/useEmbeddedProfileLinkProps'; import PlatformHeaderIcons from '@src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformHeaderIcons'; import { getEntityPlatforms } from '@src/app/entityV2/shared/containers/profile/header/utils'; -import { Entity, EntityType } from '../../../../types.generated'; -import { GenericEntityProperties } from '../../../entity/shared/types'; -import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { GlossaryPreviewCardDecoration } from '../../../entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration'; +import HealthIcon from '@src/app/previewV2/HealthIcon'; +import { useEmbeddedProfileLinkProps } from '@src/app/shared/useEmbeddedProfileLinkProps'; + +import { Entity, EntityType } from '@types'; const Container = styled.div<{ showHover: boolean; entity: GenericEntityProperties }>` display: flex; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/EntityLinkList.tsx b/datahub-web-react/src/app/homeV2/reference/sections/EntityLinkList.tsx index 2ed483fac0..50bc852274 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/EntityLinkList.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/EntityLinkList.tsx @@ -1,14 +1,16 @@ +import { Tooltip } from '@components'; import React, { useContext } from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { DefaultEmptyEntityList } from '@app/homeV2/reference/sections/DefaultEmptyEntityList'; +import { EntityLink } from '@app/homeV2/reference/sections/EntityLink'; +import { EntityLinkListSkeleton } from '@app/homeV2/reference/sections/EntityLinkListSkeleton'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; -import { Entity, EntityType } from '../../../../types.generated'; -import { EntityLink } from './EntityLink'; -import { EntityLinkListSkeleton } from './EntityLinkListSkeleton'; -import { DefaultEmptyEntityList } from './DefaultEmptyEntityList'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import { GenericEntityProperties } from '../../../entity/shared/types'; -import OnboardingContext from '../../../onboarding/OnboardingContext'; + +import { Entity, EntityType } from '@types'; const Title = styled.div<{ hasAction: boolean }>` ${(props) => props.hasAction && `:hover { cursor: pointer; }`} diff --git a/datahub-web-react/src/app/homeV2/reference/sections/assets/AssetsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/assets/AssetsYouOwn.tsx index 7e03217d72..1cb52c49aa 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/assets/AssetsYouOwn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/assets/AssetsYouOwn.tsx @@ -1,13 +1,14 @@ import React, { useState } from 'react'; + +import { useUserContext } from '@app/context/useUserContext'; +import { EmbeddedListSearchModal } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchModal'; +import { ReferenceSection } from '@app/homeV2/layout/shared/styledComponents'; +import { EntityLinkList } from '@app/homeV2/reference/sections/EntityLinkList'; +import { EmptyAssetsYouOwn } from '@app/homeV2/reference/sections/assets/EmptyAssetsYouOwn'; +import { useGetAssetsYouOwn } from '@app/homeV2/reference/sections/assets/useGetAssetsYouOwn'; +import { ReferenceSectionProps } from '@app/homeV2/reference/types'; +import { OWNERS_FILTER_NAME, UnionType } from '@app/searchV2/utils/constants'; import useGetUserGroupUrns from '@src/app/entityV2/user/useGetUserGroupUrns'; -import { useUserContext } from '../../../../context/useUserContext'; -import { EntityLinkList } from '../EntityLinkList'; -import { EmbeddedListSearchModal } from '../../../../entityV2/shared/components/styled/search/EmbeddedListSearchModal'; -import { OWNERS_FILTER_NAME, UnionType } from '../../../../searchV2/utils/constants'; -import { useGetAssetsYouOwn } from './useGetAssetsYouOwn'; -import { EmptyAssetsYouOwn } from './EmptyAssetsYouOwn'; -import { ReferenceSectionProps } from '../../types'; -import { ReferenceSection } from '../../../layout/shared/styledComponents'; const DEFAULT_MAX_ENTITIES_TO_SHOW = 5; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/assets/EmptyAssetsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/assets/EmptyAssetsYouOwn.tsx index acbb04acc0..2c7128e276 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/assets/EmptyAssetsYouOwn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/assets/EmptyAssetsYouOwn.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Text = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/assets/useGetAssetsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/assets/useGetAssetsYouOwn.tsx index a5240adcfd..aa16e9684a 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/assets/useGetAssetsYouOwn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/assets/useGetAssetsYouOwn.tsx @@ -1,8 +1,9 @@ +import { ASSET_ENTITY_TYPES, OWNERS_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import useGetUserGroupUrns from '@src/app/entityV2/user/useGetUserGroupUrns'; -import { useGetSearchResultsForMultipleQuery } from '../../../../../graphql/search.generated'; -import { CorpUser } from '../../../../../types.generated'; -import { ASSET_ENTITY_TYPES, OWNERS_FILTER_NAME } from '../../../../searchV2/utils/constants'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { CorpUser } from '@types'; const MAX_ASSETS_TO_FETCH = 50; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/domains/DomainsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/domains/DomainsYouOwn.tsx index 4853987783..103a4417e4 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/domains/DomainsYouOwn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/domains/DomainsYouOwn.tsx @@ -1,14 +1,16 @@ import React, { useState } from 'react'; -import { useUserContext } from '../../../../context/useUserContext'; -import { EntityLinkList } from '../EntityLinkList'; -import { EmbeddedListSearchModal } from '../../../../entityV2/shared/components/styled/search/EmbeddedListSearchModal'; -import { ENTITY_FILTER_NAME, OWNERS_FILTER_NAME, UnionType } from '../../../../searchV2/utils/constants'; -import { Domain, EntityType } from '../../../../../types.generated'; -import { EmptyDomainsYouOwn } from './EmptyDomainsYouOwn'; -import { useGetDomainsYouOwn } from './useGetDomainsYouOwn'; -import { ReferenceSectionProps } from '../../types'; -import { ReferenceSection } from '../../../layout/shared/styledComponents'; -import { DomainMiniPreview } from '../../../../entityV2/shared/links/DomainMiniPreview'; + +import { useUserContext } from '@app/context/useUserContext'; +import { EmbeddedListSearchModal } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchModal'; +import { DomainMiniPreview } from '@app/entityV2/shared/links/DomainMiniPreview'; +import { ReferenceSection } from '@app/homeV2/layout/shared/styledComponents'; +import { EntityLinkList } from '@app/homeV2/reference/sections/EntityLinkList'; +import { EmptyDomainsYouOwn } from '@app/homeV2/reference/sections/domains/EmptyDomainsYouOwn'; +import { useGetDomainsYouOwn } from '@app/homeV2/reference/sections/domains/useGetDomainsYouOwn'; +import { ReferenceSectionProps } from '@app/homeV2/reference/types'; +import { ENTITY_FILTER_NAME, OWNERS_FILTER_NAME, UnionType } from '@app/searchV2/utils/constants'; + +import { Domain, EntityType } from '@types'; const DEFAULT_MAX_ENTITIES_TO_SHOW = 5; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/domains/EmptyDomainsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/domains/EmptyDomainsYouOwn.tsx index 83f00ada76..eaea24acef 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/domains/EmptyDomainsYouOwn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/domains/EmptyDomainsYouOwn.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Text = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/domains/useGetDomainsYouOwn.ts b/datahub-web-react/src/app/homeV2/reference/sections/domains/useGetDomainsYouOwn.ts index 7653ce68dc..05637ff352 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/domains/useGetDomainsYouOwn.ts +++ b/datahub-web-react/src/app/homeV2/reference/sections/domains/useGetDomainsYouOwn.ts @@ -1,7 +1,8 @@ -import { useGetSearchResultsForMultipleQuery } from '../../../../../graphql/search.generated'; -import { CorpUser, EntityType } from '../../../../../types.generated'; -import { OWNERS_FILTER_NAME } from '../../../../searchV2/utils/constants'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; +import { OWNERS_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { CorpUser, EntityType } from '@types'; const MAX_ASSETS_TO_FETCH = 50; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/glossary/EmptyGlossaryNodesYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/glossary/EmptyGlossaryNodesYouOwn.tsx index 93c8f03f7d..5284f2e10b 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/glossary/EmptyGlossaryNodesYouOwn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/glossary/EmptyGlossaryNodesYouOwn.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Text = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/glossary/GlossaryNodesYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/glossary/GlossaryNodesYouOwn.tsx index fdf023d7eb..56a245481f 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/glossary/GlossaryNodesYouOwn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/glossary/GlossaryNodesYouOwn.tsx @@ -1,14 +1,16 @@ import React, { useState } from 'react'; -import { useUserContext } from '../../../../context/useUserContext'; -import { EntityLinkList } from '../EntityLinkList'; -import { EmbeddedListSearchModal } from '../../../../entityV2/shared/components/styled/search/EmbeddedListSearchModal'; -import { ENTITY_FILTER_NAME, OWNERS_FILTER_NAME, UnionType } from '../../../../searchV2/utils/constants'; -import { useGetGlossaryNodesYouOwn } from './useGetGlossaryNodesYouOwn'; -import { EmptyGlossaryNodesYouOwn } from './EmptyGlossaryNodesYouOwn'; -import { EntityType, GlossaryTerm } from '../../../../../types.generated'; -import { ReferenceSectionProps } from '../../types'; -import { ReferenceSection } from '../../../layout/shared/styledComponents'; -import { GlossaryTermMiniPreview } from '../../../../entityV2/shared/links/GlossaryTermMiniPreview'; + +import { useUserContext } from '@app/context/useUserContext'; +import { EmbeddedListSearchModal } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchModal'; +import { GlossaryTermMiniPreview } from '@app/entityV2/shared/links/GlossaryTermMiniPreview'; +import { ReferenceSection } from '@app/homeV2/layout/shared/styledComponents'; +import { EntityLinkList } from '@app/homeV2/reference/sections/EntityLinkList'; +import { EmptyGlossaryNodesYouOwn } from '@app/homeV2/reference/sections/glossary/EmptyGlossaryNodesYouOwn'; +import { useGetGlossaryNodesYouOwn } from '@app/homeV2/reference/sections/glossary/useGetGlossaryNodesYouOwn'; +import { ReferenceSectionProps } from '@app/homeV2/reference/types'; +import { ENTITY_FILTER_NAME, OWNERS_FILTER_NAME, UnionType } from '@app/searchV2/utils/constants'; + +import { EntityType, GlossaryTerm } from '@types'; const DEFAULT_MAX_ENTITIES_TO_SHOW = 5; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/glossary/useGetGlossaryNodesYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/glossary/useGetGlossaryNodesYouOwn.tsx index 86fe77123f..f887d2afd4 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/glossary/useGetGlossaryNodesYouOwn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/glossary/useGetGlossaryNodesYouOwn.tsx @@ -1,7 +1,8 @@ -import { useGetSearchResultsForMultipleQuery } from '../../../../../graphql/search.generated'; -import { CorpUser, EntityType } from '../../../../../types.generated'; -import { OWNERS_FILTER_NAME } from '../../../../searchV2/utils/constants'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; +import { OWNERS_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { CorpUser, EntityType } from '@types'; const MAX_ASSETS_TO_FETCH = 50; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/groups/EmptyGroupsYouAreIn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/groups/EmptyGroupsYouAreIn.tsx index 9f2db59c3b..bcb3bba6c1 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/groups/EmptyGroupsYouAreIn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/groups/EmptyGroupsYouAreIn.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Text = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/groups/GroupsYouAreIn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/groups/GroupsYouAreIn.tsx index 171a11a345..71dc5db40c 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/groups/GroupsYouAreIn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/groups/GroupsYouAreIn.tsx @@ -1,13 +1,15 @@ import React, { useState } from 'react'; import { useHistory } from 'react-router'; -import { useUserContext } from '../../../../context/useUserContext'; -import { EntityLinkList } from '../EntityLinkList'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; -import { EntityType } from '../../../../../types.generated'; -import { useGetGroupsYouAreIn } from './useGetGroupsYouAreIn'; -import { EmptyGroupsYouAreIn } from './EmptyGroupsYouAreIn'; -import { ReferenceSectionProps } from '../../types'; -import { ReferenceSection } from '../../../layout/shared/styledComponents'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ReferenceSection } from '@app/homeV2/layout/shared/styledComponents'; +import { EntityLinkList } from '@app/homeV2/reference/sections/EntityLinkList'; +import { EmptyGroupsYouAreIn } from '@app/homeV2/reference/sections/groups/EmptyGroupsYouAreIn'; +import { useGetGroupsYouAreIn } from '@app/homeV2/reference/sections/groups/useGetGroupsYouAreIn'; +import { ReferenceSectionProps } from '@app/homeV2/reference/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const DEFAULT_MAX_ENTITIES_TO_SHOW = 5; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/groups/useGetGroupsYouAreIn.ts b/datahub-web-react/src/app/homeV2/reference/sections/groups/useGetGroupsYouAreIn.ts index 560f087c87..34c174a973 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/groups/useGetGroupsYouAreIn.ts +++ b/datahub-web-react/src/app/homeV2/reference/sections/groups/useGetGroupsYouAreIn.ts @@ -1,6 +1,7 @@ -import { useGetUserGroupsQuery } from '../../../../../graphql/user.generated'; -import { CorpUser, EntityType } from '../../../../../types.generated'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetUserGroupsQuery } from '@graphql/user.generated'; +import { CorpUser, EntityType } from '@types'; const MAX_ASSETS_TO_FETCH = 50; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLink.tsx b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLink.tsx index 4ab42fb9b3..6b9ed15743 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLink.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLink.tsx @@ -1,12 +1,14 @@ +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { PinnedLinkLogo } from '@app/homeV2/reference/sections/pinned/PinnedLinkLogo'; import { colors } from '@src/alchemy-components'; import { SEARCH_COLORS } from '@src/app/entityV2/shared/constants'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { Tooltip } from '@components'; -import { PostContent } from '../../../../../types.generated'; -import { PinnedLinkLogo } from './PinnedLinkLogo'; -import { ANTD_GRAY } from '../../../../entity/shared/constants'; + +import { PostContent } from '@types'; const LinkButton = styled.a<{ $isShowNavBarRedesign?: boolean }>` padding: 16px; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkList.tsx b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkList.tsx index 0ff62daab3..e48875c4d7 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkList.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkList.tsx @@ -1,8 +1,9 @@ +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; + +import { PinnedLink } from '@app/homeV2/reference/sections/pinned/PinnedLink'; import { Carousel } from '@src/app/sharedV2/carousel/Carousel'; -import { Tooltip } from '@components'; -import { PinnedLink } from './PinnedLink'; const Title = styled.div<{ hasAction: boolean }>` ${(props) => props.hasAction && `:hover { cursor: pointer; }`} diff --git a/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkLogo.tsx b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkLogo.tsx index 97d7739ac6..a3389772e0 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkLogo.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkLogo.tsx @@ -1,7 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import { PostContent } from '../../../../../types.generated'; -import getAvatarColor from '../../../../shared/avatar/getAvatarColor'; + +import getAvatarColor from '@app/shared/avatar/getAvatarColor'; + +import { PostContent } from '@types'; const PreviewImage = styled.img` color: white; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinks.tsx b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinks.tsx index 1689a74468..11f3784766 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinks.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinks.tsx @@ -1,11 +1,12 @@ import React, { useContext } from 'react'; + +import { EntityLinkListSkeleton } from '@app/homeV2/reference/sections/EntityLinkListSkeleton'; +import { PinnedLinkList } from '@app/homeV2/reference/sections/pinned/PinnedLinkList'; +import { useGetPinnedLinks } from '@app/homeV2/reference/sections/pinned/useGetPinnedLinks'; +import { ReferenceSectionProps } from '@app/homeV2/reference/types'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; +import { useAppConfig } from '@app/useAppConfig'; import { Section } from '@src/app/homeV2/content/tabs/discovery/sections/Section'; -import OnboardingContext from '../../../../onboarding/OnboardingContext'; -import { ReferenceSectionProps } from '../../types'; -import { useGetPinnedLinks } from './useGetPinnedLinks'; -import { PinnedLinkList } from './PinnedLinkList'; -import { useAppConfig } from '../../../../useAppConfig'; -import { EntityLinkListSkeleton } from '../EntityLinkListSkeleton'; export const PinnedLinks = ({ hideIfEmpty }: ReferenceSectionProps) => { const { isUserInitializing } = useContext(OnboardingContext); diff --git a/datahub-web-react/src/app/homeV2/reference/sections/pinned/useGetPinnedLinks.tsx b/datahub-web-react/src/app/homeV2/reference/sections/pinned/useGetPinnedLinks.tsx index bbb7f2812f..da72ec1ef0 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/pinned/useGetPinnedLinks.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/pinned/useGetPinnedLinks.tsx @@ -1,6 +1,7 @@ import { getHomePagePostsFilters } from '@app/utils/queryUtils'; -import { useListPostsQuery } from '../../../../../graphql/post.generated'; -import { PostContent, PostContentType, PostType } from '../../../../../types.generated'; + +import { useListPostsQuery } from '@graphql/post.generated'; +import { PostContent, PostContentType, PostType } from '@types'; export const useGetPinnedLinks = () => { const { diff --git a/datahub-web-react/src/app/homeV2/reference/sections/tags/EmptyTagsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/tags/EmptyTagsYouOwn.tsx index 81d6c28363..0c0e5f706e 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/tags/EmptyTagsYouOwn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/tags/EmptyTagsYouOwn.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Text = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/tags/TagsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/tags/TagsYouOwn.tsx index 2e71658dc7..ad953b94b8 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/tags/TagsYouOwn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/tags/TagsYouOwn.tsx @@ -1,14 +1,16 @@ import React, { useState } from 'react'; -import { useUserContext } from '../../../../context/useUserContext'; -import { EntityLinkList } from '../EntityLinkList'; -import { EmbeddedListSearchModal } from '../../../../entityV2/shared/components/styled/search/EmbeddedListSearchModal'; -import { ENTITY_FILTER_NAME, OWNERS_FILTER_NAME, UnionType } from '../../../../searchV2/utils/constants'; -import { useGetTagsYouOwn } from './useGetTagsYouOwn'; -import { EmptyTagsYouOwn } from './EmptyTagsYouOwn'; -import { EntityType } from '../../../../../types.generated'; -import TagLink from '../../../../sharedV2/tags/TagLink'; -import { ReferenceSectionProps } from '../../types'; -import { ReferenceSection } from '../../../layout/shared/styledComponents'; + +import { useUserContext } from '@app/context/useUserContext'; +import { EmbeddedListSearchModal } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchModal'; +import { ReferenceSection } from '@app/homeV2/layout/shared/styledComponents'; +import { EntityLinkList } from '@app/homeV2/reference/sections/EntityLinkList'; +import { EmptyTagsYouOwn } from '@app/homeV2/reference/sections/tags/EmptyTagsYouOwn'; +import { useGetTagsYouOwn } from '@app/homeV2/reference/sections/tags/useGetTagsYouOwn'; +import { ReferenceSectionProps } from '@app/homeV2/reference/types'; +import { ENTITY_FILTER_NAME, OWNERS_FILTER_NAME, UnionType } from '@app/searchV2/utils/constants'; +import TagLink from '@app/sharedV2/tags/TagLink'; + +import { EntityType } from '@types'; const DEFAULT_MAX_ENTITIES_TO_SHOW = 10; diff --git a/datahub-web-react/src/app/homeV2/reference/sections/tags/useGetTagsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/tags/useGetTagsYouOwn.tsx index 7ef00ff972..fb2f89fbc1 100644 --- a/datahub-web-react/src/app/homeV2/reference/sections/tags/useGetTagsYouOwn.tsx +++ b/datahub-web-react/src/app/homeV2/reference/sections/tags/useGetTagsYouOwn.tsx @@ -1,7 +1,8 @@ -import { useGetSearchResultsForMultipleQuery } from '../../../../../graphql/search.generated'; -import { CorpUser, EntityType } from '../../../../../types.generated'; -import { OWNERS_FILTER_NAME } from '../../../../searchV2/utils/constants'; -import { useEntityRegistry } from '../../../../useEntityRegistry'; +import { OWNERS_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { CorpUser, EntityType } from '@types'; const MAX_ASSETS_TO_FETCH = 50; diff --git a/datahub-web-react/src/app/homeV2/shared/__tests__/utils.test.ts b/datahub-web-react/src/app/homeV2/shared/__tests__/utils.test.ts index 5e8c0174b0..7a6f0503b6 100644 --- a/datahub-web-react/src/app/homeV2/shared/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/homeV2/shared/__tests__/utils.test.ts @@ -1,4 +1,4 @@ -import { hasViewedAnnouncement } from '../utils'; +import { hasViewedAnnouncement } from '@app/homeV2/shared/utils'; describe('home V2 utils test ->', () => { it('should return whether user has viewed announcement for valid input - true', () => { diff --git a/datahub-web-react/src/app/homeV2/shared/updateLastViewedAnnouncementTime.tsx b/datahub-web-react/src/app/homeV2/shared/updateLastViewedAnnouncementTime.tsx index a87840bb1d..e8af9226ca 100644 --- a/datahub-web-react/src/app/homeV2/shared/updateLastViewedAnnouncementTime.tsx +++ b/datahub-web-react/src/app/homeV2/shared/updateLastViewedAnnouncementTime.tsx @@ -1,6 +1,8 @@ import { useCallback } from 'react'; -import { useBatchUpdateStepStatesMutation } from '../../../graphql/step.generated'; -import { LAST_VIEWED_ANNOUNCEMENT_TIME_STEP } from './utils'; + +import { LAST_VIEWED_ANNOUNCEMENT_TIME_STEP } from '@app/homeV2/shared/utils'; + +import { useBatchUpdateStepStatesMutation } from '@graphql/step.generated'; export const useUpdateLastViewedAnnouncementTime = () => { const [updateStepState] = useBatchUpdateStepStatesMutation(); diff --git a/datahub-web-react/src/app/homeV2/shared/useGetLastViewedAnnouncementTime.tsx b/datahub-web-react/src/app/homeV2/shared/useGetLastViewedAnnouncementTime.tsx index ea30232bb1..6cb5d52af1 100644 --- a/datahub-web-react/src/app/homeV2/shared/useGetLastViewedAnnouncementTime.tsx +++ b/datahub-web-react/src/app/homeV2/shared/useGetLastViewedAnnouncementTime.tsx @@ -1,6 +1,7 @@ -import { useBatchGetStepStatesQuery } from '../../../graphql/step.generated'; -import { useUserContext } from '../../context/useUserContext'; -import { LAST_VIEWED_ANNOUNCEMENT_TIME_STEP } from './utils'; +import { useUserContext } from '@app/context/useUserContext'; +import { LAST_VIEWED_ANNOUNCEMENT_TIME_STEP } from '@app/homeV2/shared/utils'; + +import { useBatchGetStepStatesQuery } from '@graphql/step.generated'; export const useGetLastViewedAnnouncementTime = () => { const { user } = useUserContext(); diff --git a/datahub-web-react/src/app/identity/ManageIdentities.tsx b/datahub-web-react/src/app/identity/ManageIdentities.tsx index 16ef4dd57a..67c717ad10 100644 --- a/datahub-web-react/src/app/identity/ManageIdentities.tsx +++ b/datahub-web-react/src/app/identity/ManageIdentities.tsx @@ -1,9 +1,10 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { RoutedTabs } from '../shared/RoutedTabs'; -import { GroupList } from './group/GroupList'; -import { UserList } from './user/UserList'; + +import { GroupList } from '@app/identity/group/GroupList'; +import { UserList } from '@app/identity/user/UserList'; +import { RoutedTabs } from '@app/shared/RoutedTabs'; const PageContainer = styled.div` padding-top: 20px; diff --git a/datahub-web-react/src/app/identity/group/AssignRoletoGroupConfirmation.tsx b/datahub-web-react/src/app/identity/group/AssignRoletoGroupConfirmation.tsx index 513a85c97f..70ad2743ae 100644 --- a/datahub-web-react/src/app/identity/group/AssignRoletoGroupConfirmation.tsx +++ b/datahub-web-react/src/app/identity/group/AssignRoletoGroupConfirmation.tsx @@ -1,8 +1,10 @@ +import { Popconfirm, message } from 'antd'; import React from 'react'; -import { message, Popconfirm } from 'antd'; -import { useBatchAssignRoleMutation } from '../../../graphql/mutations.generated'; -import { DataHubRole } from '../../../types.generated'; -import analytics, { EventType } from '../../analytics'; + +import analytics, { EventType } from '@app/analytics'; + +import { useBatchAssignRoleMutation } from '@graphql/mutations.generated'; +import { DataHubRole } from '@types'; type Props = { open: boolean; diff --git a/datahub-web-react/src/app/identity/group/CreateGroupModal.tsx b/datahub-web-react/src/app/identity/group/CreateGroupModal.tsx index 3ff72d334a..9761260f6e 100644 --- a/datahub-web-react/src/app/identity/group/CreateGroupModal.tsx +++ b/datahub-web-react/src/app/identity/group/CreateGroupModal.tsx @@ -1,15 +1,17 @@ +import { Collapse, Form, Input, Modal, Typography, message } from 'antd'; import React, { useRef, useState } from 'react'; -import { message, Input, Modal, Typography, Form, Collapse } from 'antd'; import styled from 'styled-components'; + +import analytics, { EventType } from '@app/analytics'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { Editor as MarkdownEditor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor'; +import { validateCustomUrnId } from '@app/shared/textUtil'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; import { Button } from '@src/alchemy-components'; import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; -import { useCreateGroupMutation } from '../../../graphql/group.generated'; -import { useEnterKeyListener } from '../../shared/useEnterKeyListener'; -import { validateCustomUrnId } from '../../shared/textUtil'; -import analytics, { EventType } from '../../analytics'; -import { CorpGroup, EntityType } from '../../../types.generated'; -import { Editor as MarkdownEditor } from '../../entity/shared/tabs/Documentation/components/editor/Editor'; -import { ANTD_GRAY } from '../../entity/shared/constants'; + +import { useCreateGroupMutation } from '@graphql/group.generated'; +import { CorpGroup, EntityType } from '@types'; type Props = { onClose: () => void; diff --git a/datahub-web-react/src/app/identity/group/GroupList.tsx b/datahub-web-react/src/app/identity/group/GroupList.tsx index a8ebbedc2a..1af4df2466 100644 --- a/datahub-web-react/src/app/identity/group/GroupList.tsx +++ b/datahub-web-react/src/app/identity/group/GroupList.tsx @@ -1,22 +1,28 @@ -import React, { useEffect, useState } from 'react'; -import { Button, Empty, List, Pagination } from 'antd'; -import styled from 'styled-components'; -import { useLocation } from 'react-router'; -import * as QueryString from 'query-string'; import { UsergroupAddOutlined } from '@ant-design/icons'; -import { CorpGroup, DataHubRole } from '../../../types.generated'; -import { Message } from '../../shared/Message'; -import { useListGroupsQuery } from '../../../graphql/group.generated'; -import GroupListItem from './GroupListItem'; -import TabToolbar from '../../entity/shared/components/styled/TabToolbar'; -import CreateGroupModal from './CreateGroupModal'; -import { SearchBar } from '../../search/SearchBar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { scrollToTop } from '../../shared/searchUtils'; -import { GROUPS_CREATE_GROUP_ID, GROUPS_INTRO_ID } from '../../onboarding/config/GroupsOnboardingConfig'; -import { OnboardingTour } from '../../onboarding/OnboardingTour'; -import { addGroupToListGroupsCache, DEFAULT_GROUP_LIST_PAGE_SIZE, removeGroupFromListGroupsCache } from './cacheUtils'; -import { useListRolesQuery } from '../../../graphql/role.generated'; +import { Button, Empty, List, Pagination } from 'antd'; +import * as QueryString from 'query-string'; +import React, { useEffect, useState } from 'react'; +import { useLocation } from 'react-router'; +import styled from 'styled-components'; + +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import CreateGroupModal from '@app/identity/group/CreateGroupModal'; +import GroupListItem from '@app/identity/group/GroupListItem'; +import { + DEFAULT_GROUP_LIST_PAGE_SIZE, + addGroupToListGroupsCache, + removeGroupFromListGroupsCache, +} from '@app/identity/group/cacheUtils'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; +import { GROUPS_CREATE_GROUP_ID, GROUPS_INTRO_ID } from '@app/onboarding/config/GroupsOnboardingConfig'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListGroupsQuery } from '@graphql/group.generated'; +import { useListRolesQuery } from '@graphql/role.generated'; +import { CorpGroup, DataHubRole } from '@types'; const GroupContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/identity/group/GroupListItem.tsx b/datahub-web-react/src/app/identity/group/GroupListItem.tsx index 3559c4bdbb..da88dbefa3 100644 --- a/datahub-web-react/src/app/identity/group/GroupListItem.tsx +++ b/datahub-web-react/src/app/identity/group/GroupListItem.tsx @@ -1,15 +1,17 @@ import { LockOutlined } from '@ant-design/icons'; -import React from 'react'; -import styled from 'styled-components'; import { List, Tag, Tooltip, Typography } from 'antd'; +import React from 'react'; import { Link } from 'react-router-dom'; -import { CorpGroup, DataHubRole, EntityType, OriginType } from '../../../types.generated'; -import CustomAvatar from '../../shared/avatar/CustomAvatar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import EntityDropdown from '../../entity/shared/EntityDropdown'; -import { EntityMenuItems } from '../../entity/shared/EntityDropdown/EntityDropdown'; -import { getElasticCappedTotalValueText } from '../../entity/shared/constants'; -import SelectRoleGroup from './SelectRoleGroup'; +import styled from 'styled-components'; + +import EntityDropdown from '@app/entity/shared/EntityDropdown'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { getElasticCappedTotalValueText } from '@app/entity/shared/constants'; +import SelectRoleGroup from '@app/identity/group/SelectRoleGroup'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpGroup, DataHubRole, EntityType, OriginType } from '@types'; type Props = { group: CorpGroup; diff --git a/datahub-web-react/src/app/identity/group/SelectRoleGroup.tsx b/datahub-web-react/src/app/identity/group/SelectRoleGroup.tsx index 0e68c4e25a..8baef86c8d 100644 --- a/datahub-web-react/src/app/identity/group/SelectRoleGroup.tsx +++ b/datahub-web-react/src/app/identity/group/SelectRoleGroup.tsx @@ -1,13 +1,15 @@ -import React, { useEffect, useState } from 'react'; import { UserOutlined } from '@ant-design/icons'; -import { Select } from 'antd'; import { useApolloClient } from '@apollo/client'; +import { Select } from 'antd'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { CorpGroup, DataHubRole } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { clearRoleListCache } from '../../permissions/roles/cacheUtils'; -import AssignRoletoGroupConfirmation from './AssignRoletoGroupConfirmation'; -import { mapRoleIcon } from '../user/UserUtils'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import AssignRoletoGroupConfirmation from '@app/identity/group/AssignRoletoGroupConfirmation'; +import { mapRoleIcon } from '@app/identity/user/UserUtils'; +import { clearRoleListCache } from '@app/permissions/roles/cacheUtils'; + +import { CorpGroup, DataHubRole } from '@types'; const NO_ROLE_TEXT = 'No Role'; const NO_ROLE_URN = 'urn:li:dataHubRole:NoRole'; diff --git a/datahub-web-react/src/app/identity/group/cacheUtils.ts b/datahub-web-react/src/app/identity/group/cacheUtils.ts index 3674a1e3eb..4467c5401d 100644 --- a/datahub-web-react/src/app/identity/group/cacheUtils.ts +++ b/datahub-web-react/src/app/identity/group/cacheUtils.ts @@ -1,4 +1,4 @@ -import { ListGroupsDocument, ListGroupsQuery } from '../../../graphql/group.generated'; +import { ListGroupsDocument, ListGroupsQuery } from '@graphql/group.generated'; export const DEFAULT_GROUP_LIST_PAGE_SIZE = 25; diff --git a/datahub-web-react/src/app/identity/user/AssignRoleConfirmation.tsx b/datahub-web-react/src/app/identity/user/AssignRoleConfirmation.tsx index 8fe6b3e99f..d0e823ed0c 100644 --- a/datahub-web-react/src/app/identity/user/AssignRoleConfirmation.tsx +++ b/datahub-web-react/src/app/identity/user/AssignRoleConfirmation.tsx @@ -1,8 +1,10 @@ +import { Popconfirm, message } from 'antd'; import React from 'react'; -import { message, Popconfirm } from 'antd'; -import { useBatchAssignRoleMutation } from '../../../graphql/mutations.generated'; -import { DataHubRole } from '../../../types.generated'; -import analytics, { EventType } from '../../analytics'; + +import analytics, { EventType } from '@app/analytics'; + +import { useBatchAssignRoleMutation } from '@graphql/mutations.generated'; +import { DataHubRole } from '@types'; type Props = { open: boolean; diff --git a/datahub-web-react/src/app/identity/user/SelectRole.tsx b/datahub-web-react/src/app/identity/user/SelectRole.tsx index 7e9acb08ed..0a35f3ac9e 100644 --- a/datahub-web-react/src/app/identity/user/SelectRole.tsx +++ b/datahub-web-react/src/app/identity/user/SelectRole.tsx @@ -1,13 +1,15 @@ -import React, { useEffect, useState } from 'react'; import { UserOutlined } from '@ant-design/icons'; -import { Select } from 'antd'; import { useApolloClient } from '@apollo/client'; +import { Select } from 'antd'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { CorpUser, DataHubRole } from '../../../types.generated'; -import AssignRoleConfirmation from './AssignRoleConfirmation'; -import { mapRoleIcon } from './UserUtils'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { clearRoleListCache } from '../../permissions/roles/cacheUtils'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import AssignRoleConfirmation from '@app/identity/user/AssignRoleConfirmation'; +import { mapRoleIcon } from '@app/identity/user/UserUtils'; +import { clearRoleListCache } from '@app/permissions/roles/cacheUtils'; + +import { CorpUser, DataHubRole } from '@types'; const NO_ROLE_TEXT = 'No Role'; const NO_ROLE_URN = 'urn:li:dataHubRole:NoRole'; diff --git a/datahub-web-react/src/app/identity/user/UserList.tsx b/datahub-web-react/src/app/identity/user/UserList.tsx index e5c6822997..acee1fd7c6 100644 --- a/datahub-web-react/src/app/identity/user/UserList.tsx +++ b/datahub-web-react/src/app/identity/user/UserList.tsx @@ -1,29 +1,31 @@ -import React, { useEffect, useState } from 'react'; -import { Button, Empty, List, Pagination } from 'antd'; -import styled from 'styled-components/macro'; -import * as QueryString from 'query-string'; import { UsergroupAddOutlined } from '@ant-design/icons'; +import { Button, Empty, List, Pagination } from 'antd'; +import * as QueryString from 'query-string'; +import React, { useEffect, useState } from 'react'; import { useLocation } from 'react-router'; -import UserListItem from './UserListItem'; -import { Message } from '../../shared/Message'; -import { useListUsersQuery } from '../../../graphql/user.generated'; -import { CorpUser, DataHubRole } from '../../../types.generated'; -import TabToolbar from '../../entity/shared/components/styled/TabToolbar'; -import { SearchBar } from '../../search/SearchBar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import ViewInviteTokenModal from './ViewInviteTokenModal'; -import { useListRolesQuery } from '../../../graphql/role.generated'; -import { scrollToTop } from '../../shared/searchUtils'; -import { OnboardingTour } from '../../onboarding/OnboardingTour'; +import styled from 'styled-components/macro'; + +import { useUserContext } from '@app/context/useUserContext'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import UserListItem from '@app/identity/user/UserListItem'; +import ViewInviteTokenModal from '@app/identity/user/ViewInviteTokenModal'; +import { DEFAULT_USER_LIST_PAGE_SIZE, removeUserFromListUsersCache } from '@app/identity/user/cacheUtils'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; import { USERS_ASSIGN_ROLE_ID, USERS_INTRO_ID, USERS_INVITE_LINK_ID, USERS_SSO_ID, -} from '../../onboarding/config/UsersOnboardingConfig'; -import { useToggleEducationStepIdsAllowList } from '../../onboarding/useToggleEducationStepIdsAllowList'; -import { DEFAULT_USER_LIST_PAGE_SIZE, removeUserFromListUsersCache } from './cacheUtils'; -import { useUserContext } from '../../context/useUserContext'; +} from '@app/onboarding/config/UsersOnboardingConfig'; +import { useToggleEducationStepIdsAllowList } from '@app/onboarding/useToggleEducationStepIdsAllowList'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListRolesQuery } from '@graphql/role.generated'; +import { useListUsersQuery } from '@graphql/user.generated'; +import { CorpUser, DataHubRole } from '@types'; const UserContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/identity/user/UserListItem.tsx b/datahub-web-react/src/app/identity/user/UserListItem.tsx index 486646c05b..ad1cb7abd6 100644 --- a/datahub-web-react/src/app/identity/user/UserListItem.tsx +++ b/datahub-web-react/src/app/identity/user/UserListItem.tsx @@ -1,17 +1,19 @@ -import React, { useState } from 'react'; -import styled from 'styled-components/macro'; -import { Dropdown, List, Tag, Tooltip, Typography } from 'antd'; -import { Link } from 'react-router-dom'; import { DeleteOutlined, MoreOutlined, UnlockOutlined } from '@ant-design/icons'; -import { CorpUser, CorpUserStatus, EntityType, DataHubRole } from '../../../types.generated'; -import CustomAvatar from '../../shared/avatar/CustomAvatar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../entity/shared/constants'; -import ViewResetTokenModal from './ViewResetTokenModal'; -import useDeleteEntity from '../../entity/shared/EntityDropdown/useDeleteEntity'; -import SelectRole from './SelectRole'; -import { USERS_ASSIGN_ROLE_ID } from '../../onboarding/config/UsersOnboardingConfig'; -import { MenuItemStyle } from '../../entity/view/menu/item/styledComponent'; +import { Dropdown, List, Tag, Tooltip, Typography } from 'antd'; +import React, { useState } from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components/macro'; + +import useDeleteEntity from '@app/entity/shared/EntityDropdown/useDeleteEntity'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entity/shared/constants'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; +import SelectRole from '@app/identity/user/SelectRole'; +import ViewResetTokenModal from '@app/identity/user/ViewResetTokenModal'; +import { USERS_ASSIGN_ROLE_ID } from '@app/onboarding/config/UsersOnboardingConfig'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, CorpUserStatus, DataHubRole, EntityType } from '@types'; type Props = { user: CorpUser; diff --git a/datahub-web-react/src/app/identity/user/UserUtils.tsx b/datahub-web-react/src/app/identity/user/UserUtils.tsx index fbbbd27441..279a22f3d8 100644 --- a/datahub-web-react/src/app/identity/user/UserUtils.tsx +++ b/datahub-web-react/src/app/identity/user/UserUtils.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { EditOutlined, ReadOutlined, SettingOutlined, UserOutlined } from '@ant-design/icons'; +import React from 'react'; export const mapRoleIcon = (roleName) => { let icon = ; diff --git a/datahub-web-react/src/app/identity/user/ViewInviteTokenModal.tsx b/datahub-web-react/src/app/identity/user/ViewInviteTokenModal.tsx index 5dd1cf30be..9aa2070b3b 100644 --- a/datahub-web-react/src/app/identity/user/ViewInviteTokenModal.tsx +++ b/datahub-web-react/src/app/identity/user/ViewInviteTokenModal.tsx @@ -1,16 +1,18 @@ -import React, { useEffect, useState } from 'react'; -import * as QueryString from 'query-string'; -import { useLocation } from 'react-router'; import { UserOutlined } from '@ant-design/icons'; -import { message, Modal, Select, Typography } from 'antd'; import { Button, Tooltip } from '@components'; +import { Modal, Select, Typography, message } from 'antd'; +import * as QueryString from 'query-string'; +import React, { useEffect, useState } from 'react'; +import { useLocation } from 'react-router'; import styled from 'styled-components/macro'; -import { PageRoutes } from '../../../conf/Global'; -import { useGetInviteTokenQuery, useListRolesQuery } from '../../../graphql/role.generated'; -import { DataHubRole } from '../../../types.generated'; -import { mapRoleIcon } from './UserUtils'; -import { useCreateInviteTokenMutation } from '../../../graphql/mutations.generated'; -import analytics, { EventType } from '../../analytics'; + +import analytics, { EventType } from '@app/analytics'; +import { mapRoleIcon } from '@app/identity/user/UserUtils'; +import { PageRoutes } from '@conf/Global'; + +import { useCreateInviteTokenMutation } from '@graphql/mutations.generated'; +import { useGetInviteTokenQuery, useListRolesQuery } from '@graphql/role.generated'; +import { DataHubRole } from '@types'; const ModalSection = styled.div` display: flex; diff --git a/datahub-web-react/src/app/identity/user/ViewResetTokenModal.tsx b/datahub-web-react/src/app/identity/user/ViewResetTokenModal.tsx index 4711040bf8..ddff0f870d 100644 --- a/datahub-web-react/src/app/identity/user/ViewResetTokenModal.tsx +++ b/datahub-web-react/src/app/identity/user/ViewResetTokenModal.tsx @@ -1,10 +1,12 @@ import { RedoOutlined } from '@ant-design/icons'; -import { Button, message, Modal, Typography } from 'antd'; +import { Button, Modal, Typography, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { PageRoutes } from '../../../conf/Global'; -import { useCreateNativeUserResetTokenMutation } from '../../../graphql/user.generated'; -import analytics, { EventType } from '../../analytics'; + +import analytics, { EventType } from '@app/analytics'; +import { PageRoutes } from '@conf/Global'; + +import { useCreateNativeUserResetTokenMutation } from '@graphql/user.generated'; const ModalSection = styled.div` display: flex; diff --git a/datahub-web-react/src/app/identity/user/cacheUtils.ts b/datahub-web-react/src/app/identity/user/cacheUtils.ts index 7d2d78b036..331089947d 100644 --- a/datahub-web-react/src/app/identity/user/cacheUtils.ts +++ b/datahub-web-react/src/app/identity/user/cacheUtils.ts @@ -1,4 +1,4 @@ -import { ListUsersDocument, ListUsersQuery } from '../../../graphql/user.generated'; +import { ListUsersDocument, ListUsersQuery } from '@graphql/user.generated'; export const DEFAULT_USER_LIST_PAGE_SIZE = 25; diff --git a/datahub-web-react/src/app/identity/user/useUserTitle.ts b/datahub-web-react/src/app/identity/user/useUserTitle.ts index 059c97e356..bfd3957779 100644 --- a/datahub-web-react/src/app/identity/user/useUserTitle.ts +++ b/datahub-web-react/src/app/identity/user/useUserTitle.ts @@ -1,5 +1,6 @@ import { useEffect } from 'react'; -import { useUserContext } from '../../context/useUserContext'; + +import { useUserContext } from '@app/context/useUserContext'; export const useUserTitle = () => { const user = useUserContext(); diff --git a/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx b/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx index a0d825693b..b0ead86dcb 100644 --- a/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx +++ b/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx @@ -1,18 +1,19 @@ import { Tabs, Typography } from 'antd'; import React, { useEffect, useState } from 'react'; -import styled from 'styled-components'; import { useHistory } from 'react-router'; -import { IngestionSourceList } from './source/IngestionSourceList'; -import { useAppConfig } from '../useAppConfig'; -import { useUserContext } from '../context/useUserContext'; -import { SecretsList } from './secret/SecretsList'; -import { OnboardingTour } from '../onboarding/OnboardingTour'; +import styled from 'styled-components'; + +import { useUserContext } from '@app/context/useUserContext'; +import { SecretsList } from '@app/ingest/secret/SecretsList'; +import { IngestionSourceList } from '@app/ingest/source/IngestionSourceList'; +import { TabType } from '@app/ingest/types'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; import { INGESTION_CREATE_SOURCE_ID, INGESTION_REFRESH_SOURCES_ID, -} from '../onboarding/config/IngestionOnboardingConfig'; -import { useShowNavBarRedesign } from '../useShowNavBarRedesign'; -import { TabType } from './types'; +} from '@app/onboarding/config/IngestionOnboardingConfig'; +import { useAppConfig } from '@app/useAppConfig'; +import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign'; const PageContainer = styled.div<{ $isShowNavBarRedesign?: boolean }>` padding-top: 20px; diff --git a/datahub-web-react/src/app/ingest/secret/SecretBuilderModal.tsx b/datahub-web-react/src/app/ingest/secret/SecretBuilderModal.tsx index c3c3073602..dbd0ddb19d 100644 --- a/datahub-web-react/src/app/ingest/secret/SecretBuilderModal.tsx +++ b/datahub-web-react/src/app/ingest/secret/SecretBuilderModal.tsx @@ -1,9 +1,10 @@ import { Form, Input, Modal, Typography } from 'antd'; import React, { useEffect, useState } from 'react'; + +import { SecretBuilderState } from '@app/ingest/secret/types'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; import { Button } from '@src/alchemy-components'; import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; -import { useEnterKeyListener } from '../../shared/useEnterKeyListener'; -import { SecretBuilderState } from './types'; const NAME_FIELD_NAME = 'name'; const DESCRIPTION_FIELD_NAME = 'description'; diff --git a/datahub-web-react/src/app/ingest/secret/SecretsList.tsx b/datahub-web-react/src/app/ingest/secret/SecretsList.tsx index ee695545ba..bdc344a752 100644 --- a/datahub-web-react/src/app/ingest/secret/SecretsList.tsx +++ b/datahub-web-react/src/app/ingest/secret/SecretsList.tsx @@ -1,31 +1,33 @@ -import React, { useEffect, useState } from 'react'; -import { Button, Empty, message, Modal, Pagination, Typography } from 'antd'; -import { debounce } from 'lodash'; import { DeleteOutlined, PlusOutlined } from '@ant-design/icons'; +import { Button, Empty, Modal, Pagination, Typography, message } from 'antd'; +import { debounce } from 'lodash'; import * as QueryString from 'query-string'; +import React, { useEffect, useState } from 'react'; import { useLocation } from 'react-router'; import styled from 'styled-components'; + +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { ONE_SECOND_IN_MS } from '@app/entity/shared/tabs/Dataset/Queries/utils/constants'; +import { SecretBuilderModal } from '@app/ingest/secret/SecretBuilderModal'; +import { + addSecretToListSecretsCache, + removeSecretFromListSecretsCache, + updateSecretInListSecretsCache, +} from '@app/ingest/secret/cacheUtils'; +import { SecretBuilderState } from '@app/ingest/secret/types'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; + import { useCreateSecretMutation, useDeleteSecretMutation, useListSecretsQuery, useUpdateSecretMutation, -} from '../../../graphql/ingestion.generated'; -import { Message } from '../../shared/Message'; -import TabToolbar from '../../entity/shared/components/styled/TabToolbar'; -import { SecretBuilderModal } from './SecretBuilderModal'; -import { SecretBuilderState } from './types'; -import { StyledTable } from '../../entity/shared/components/styled/StyledTable'; -import { SearchBar } from '../../search/SearchBar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { scrollToTop } from '../../shared/searchUtils'; -import { - addSecretToListSecretsCache, - removeSecretFromListSecretsCache, - updateSecretInListSecretsCache, -} from './cacheUtils'; -import { ONE_SECOND_IN_MS } from '../../entity/shared/tabs/Dataset/Queries/utils/constants'; +} from '@graphql/ingestion.generated'; const DeleteButtonContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/ingest/secret/cacheUtils.ts b/datahub-web-react/src/app/ingest/secret/cacheUtils.ts index b3a3a45f33..4a06d971c0 100644 --- a/datahub-web-react/src/app/ingest/secret/cacheUtils.ts +++ b/datahub-web-react/src/app/ingest/secret/cacheUtils.ts @@ -1,4 +1,4 @@ -import { ListSecretsDocument, ListSecretsQuery } from '../../../graphql/ingestion.generated'; +import { ListSecretsDocument, ListSecretsQuery } from '@graphql/ingestion.generated'; export const removeSecretFromListSecretsCache = (urn, client, page, pageSize) => { const currData: ListSecretsQuery | null = client.readQuery({ diff --git a/datahub-web-react/src/app/ingest/source/IngestedAssets.tsx b/datahub-web-react/src/app/ingest/source/IngestedAssets.tsx index c363e44dab..58fe962edc 100644 --- a/datahub-web-react/src/app/ingest/source/IngestedAssets.tsx +++ b/datahub-web-react/src/app/ingest/source/IngestedAssets.tsx @@ -1,15 +1,21 @@ import { Button, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Maybe, ExecutionRequestResult } from '@src/types.generated'; -import { useGetSearchResultsForMultipleQuery } from '../../../graphql/search.generated'; -import { EmbeddedListSearchModal } from '../../entity/shared/components/styled/search/EmbeddedListSearchModal'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { UnionType } from '../../search/utils/constants'; -import { formatNumber } from '../../shared/formatNumber'; -import { Message } from '../../shared/Message'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { extractEntityTypeCountsFromFacets, getEntitiesIngestedByType, getTotalEntitiesIngested } from './utils'; + +import { EmbeddedListSearchModal } from '@app/entity/shared/components/styled/search/EmbeddedListSearchModal'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { + extractEntityTypeCountsFromFacets, + getEntitiesIngestedByType, + getTotalEntitiesIngested, +} from '@app/ingest/source/utils'; +import { UnionType } from '@app/search/utils/constants'; +import { Message } from '@app/shared/Message'; +import { formatNumber } from '@app/shared/formatNumber'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { ExecutionRequestResult, Maybe } from '@src/types.generated'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; const HeaderContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx index 827d463e92..6c4b83be06 100644 --- a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx +++ b/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx @@ -1,38 +1,44 @@ import { PlusOutlined, RedoOutlined } from '@ant-design/icons'; -import React, { useCallback, useEffect, useRef, useState } from 'react'; +import { Button, Modal, Pagination, Select, message } from 'antd'; import { debounce } from 'lodash'; import * as QueryString from 'query-string'; +import React, { useCallback, useEffect, useRef, useState } from 'react'; import { useLocation } from 'react-router'; -import { Button, message, Modal, Pagination, Select } from 'antd'; import styled from 'styled-components'; + +import analytics, { EventType } from '@app/analytics'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { ONE_SECOND_IN_MS } from '@app/entity/shared/tabs/Dataset/Queries/utils/constants'; +import IngestionSourceTable from '@app/ingest/source/IngestionSourceTable'; +import RecipeViewerModal from '@app/ingest/source/RecipeViewerModal'; +import { IngestionSourceBuilderModal } from '@app/ingest/source/builder/IngestionSourceBuilderModal'; +import { DEFAULT_EXECUTOR_ID, SourceBuilderState, StringMapEntryInput } from '@app/ingest/source/builder/types'; +import { ExecutionDetailsModal } from '@app/ingest/source/executions/ExecutionRequestDetailsModal'; +import { isExecutionRequestActive } from '@app/ingest/source/executions/IngestionSourceExecutionList'; +import useRefreshIngestionData from '@app/ingest/source/executions/useRefreshIngestionData'; +import { useCommandS } from '@app/ingest/source/hooks'; +import { + CLI_EXECUTOR_ID, + addToListIngestionSourcesCache, + removeFromListIngestionSourcesCache, +} from '@app/ingest/source/utils'; +import { + INGESTION_CREATE_SOURCE_ID, + INGESTION_REFRESH_SOURCES_ID, +} from '@app/onboarding/config/IngestionOnboardingConfig'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { useCreateIngestionExecutionRequestMutation, useCreateIngestionSourceMutation, useDeleteIngestionSourceMutation, useListIngestionSourcesQuery, useUpdateIngestionSourceMutation, -} from '../../../graphql/ingestion.generated'; -import { Message } from '../../shared/Message'; -import TabToolbar from '../../entity/shared/components/styled/TabToolbar'; -import { IngestionSourceBuilderModal } from './builder/IngestionSourceBuilderModal'; -import { addToListIngestionSourcesCache, CLI_EXECUTOR_ID, removeFromListIngestionSourcesCache } from './utils'; -import { DEFAULT_EXECUTOR_ID, SourceBuilderState, StringMapEntryInput } from './builder/types'; -import { IngestionSource, SortCriterion, SortOrder, UpdateIngestionSourceInput } from '../../../types.generated'; -import { SearchBar } from '../../search/SearchBar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ExecutionDetailsModal } from './executions/ExecutionRequestDetailsModal'; -import RecipeViewerModal from './RecipeViewerModal'; -import IngestionSourceTable from './IngestionSourceTable'; -import { scrollToTop } from '../../shared/searchUtils'; -import useRefreshIngestionData from './executions/useRefreshIngestionData'; -import { isExecutionRequestActive } from './executions/IngestionSourceExecutionList'; -import analytics, { EventType } from '../../analytics'; -import { - INGESTION_CREATE_SOURCE_ID, - INGESTION_REFRESH_SOURCES_ID, -} from '../../onboarding/config/IngestionOnboardingConfig'; -import { ONE_SECOND_IN_MS } from '../../entity/shared/tabs/Dataset/Queries/utils/constants'; -import { useCommandS } from './hooks'; +} from '@graphql/ingestion.generated'; +import { IngestionSource, SortCriterion, SortOrder, UpdateIngestionSourceInput } from '@types'; const PLACEHOLDER_URN = 'placeholder-urn'; diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx index 1dac5cd148..7dab5707dd 100644 --- a/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx +++ b/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx @@ -1,14 +1,21 @@ import { Empty } from 'antd'; +import { SorterResult } from 'antd/lib/table/interface'; import React from 'react'; import styled from 'styled-components/macro'; -import { SorterResult } from 'antd/lib/table/interface'; + +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { + ActionsColumn, + LastStatusColumn, + ScheduleColumn, + TypeColumn, +} from '@app/ingest/source/IngestionSourceTableColumns'; +import { IngestionSourceExecutionList } from '@app/ingest/source/executions/IngestionSourceExecutionList'; +import { CLI_EXECUTOR_ID, getIngestionSourceStatus } from '@app/ingest/source/utils'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { StyledTable } from '../../entity/shared/components/styled/StyledTable'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { CLI_EXECUTOR_ID, getIngestionSourceStatus } from './utils'; -import { LastStatusColumn, TypeColumn, ActionsColumn, ScheduleColumn } from './IngestionSourceTableColumns'; -import { IngestionSource } from '../../../types.generated'; -import { IngestionSourceExecutionList } from './executions/IngestionSourceExecutionList'; + +import { IngestionSource } from '@types'; const PAGE_HEADER_HEIGHT = 395; diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx index aa183b2fa9..7e534f8728 100644 --- a/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx +++ b/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx @@ -1,19 +1,20 @@ import { blue } from '@ant-design/colors'; import { CodeOutlined, CopyOutlined, DeleteOutlined } from '@ant-design/icons'; -import { Button, Image, Typography } from 'antd'; import { Tooltip } from '@components'; +import { Button, Image, Typography } from 'antd'; import cronstrue from 'cronstrue'; import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { capitalizeFirstLetter } from '../../shared/textUtil'; -import useGetSourceLogoUrl from './builder/useGetSourceLogoUrl'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import useGetSourceLogoUrl from '@app/ingest/source/builder/useGetSourceLogoUrl'; import { + RUNNING, getExecutionRequestStatusDisplayColor, getExecutionRequestStatusDisplayText, getExecutionRequestStatusIcon, - RUNNING, -} from './utils'; +} from '@app/ingest/source/utils'; +import { capitalizeFirstLetter } from '@app/shared/textUtil'; const PreviewImage = styled(Image)` max-height: 28px; diff --git a/datahub-web-react/src/app/ingest/source/RecipeViewerModal.tsx b/datahub-web-react/src/app/ingest/source/RecipeViewerModal.tsx index f08747e757..8602f4286a 100644 --- a/datahub-web-react/src/app/ingest/source/RecipeViewerModal.tsx +++ b/datahub-web-react/src/app/ingest/source/RecipeViewerModal.tsx @@ -2,7 +2,8 @@ import Editor from '@monaco-editor/react'; import { Button, Modal } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { jsonToYaml } from './utils'; + +import { jsonToYaml } from '@app/ingest/source/utils'; const YamlWrapper = styled.div` padding: 24px; diff --git a/datahub-web-react/src/app/ingest/source/__tests__/IngestionSourceExecutionList.test.ts b/datahub-web-react/src/app/ingest/source/__tests__/IngestionSourceExecutionList.test.ts index 20162e949b..2571fc9b82 100644 --- a/datahub-web-react/src/app/ingest/source/__tests__/IngestionSourceExecutionList.test.ts +++ b/datahub-web-react/src/app/ingest/source/__tests__/IngestionSourceExecutionList.test.ts @@ -1,5 +1,5 @@ -import { isExecutionRequestActive } from '../executions/IngestionSourceExecutionList'; -import { FAILURE, ROLLED_BACK, ROLLING_BACK, RUNNING, SUCCESS } from '../utils'; +import { isExecutionRequestActive } from '@app/ingest/source/executions/IngestionSourceExecutionList'; +import { FAILURE, ROLLED_BACK, ROLLING_BACK, RUNNING, SUCCESS } from '@app/ingest/source/utils'; describe('isExecutionRequestActive', () => { it('should return true if the execution is RUNNING', () => { diff --git a/datahub-web-react/src/app/ingest/source/__tests__/tests_utils.test.tsx b/datahub-web-react/src/app/ingest/source/__tests__/tests_utils.test.tsx index 8da26fc704..dfb0531a33 100644 --- a/datahub-web-react/src/app/ingest/source/__tests__/tests_utils.test.tsx +++ b/datahub-web-react/src/app/ingest/source/__tests__/tests_utils.test.tsx @@ -1,6 +1,8 @@ -import { vi, describe, test, expect, beforeEach, afterAll } from 'vitest'; -import { getEntitiesIngestedByType } from '../utils'; -import { ExecutionRequestResult } from '../../../../types.generated'; +import { afterAll, beforeEach, describe, expect, test, vi } from 'vitest'; + +import { getEntitiesIngestedByType } from '@app/ingest/source/utils'; + +import { ExecutionRequestResult } from '@types'; // Mock the structuredReport property of ExecutionRequestResult const mockExecutionRequestResult = (structuredReportData: any): Partial => { diff --git a/datahub-web-react/src/app/ingest/source/builder/CSVInfo.tsx b/datahub-web-react/src/app/ingest/source/builder/CSVInfo.tsx index f533890e17..ecb000e608 100644 --- a/datahub-web-react/src/app/ingest/source/builder/CSVInfo.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/CSVInfo.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Alert } from 'antd'; +import React from 'react'; const CSV_FORMAT_LINK = 'https://datahubproject.io/docs/generated/ingestion/sources/csv-enricher'; diff --git a/datahub-web-react/src/app/ingest/source/builder/CreateScheduleStep.tsx b/datahub-web-react/src/app/ingest/source/builder/CreateScheduleStep.tsx index d4e9a85d49..682ee4cba3 100644 --- a/datahub-web-react/src/app/ingest/source/builder/CreateScheduleStep.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/CreateScheduleStep.tsx @@ -1,17 +1,18 @@ +import { CheckCircleOutlined, WarningOutlined } from '@ant-design/icons'; import { Checkbox, Form, Input, Switch, Typography } from 'antd'; +import cronstrue from 'cronstrue'; import React, { useMemo, useState } from 'react'; -import { Button } from '@src/alchemy-components'; import { Cron } from 'react-js-cron'; import 'react-js-cron/dist/styles.css'; import styled from 'styled-components'; -import cronstrue from 'cronstrue'; -import { CheckCircleOutlined, WarningOutlined } from '@ant-design/icons'; -import { SourceBuilderState, StepProps } from './types'; -import { TimezoneSelect } from './TimezoneSelect'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../../entity/shared/constants'; -import { lowerFirstLetter } from '../../../shared/textUtil'; -import { IngestionSourceBuilderStep } from './steps'; -import { RequiredFieldForm } from '../../../shared/form/RequiredFieldForm'; + +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entity/shared/constants'; +import { TimezoneSelect } from '@app/ingest/source/builder/TimezoneSelect'; +import { IngestionSourceBuilderStep } from '@app/ingest/source/builder/steps'; +import { SourceBuilderState, StepProps } from '@app/ingest/source/builder/types'; +import { RequiredFieldForm } from '@app/shared/form/RequiredFieldForm'; +import { lowerFirstLetter } from '@app/shared/textUtil'; +import { Button } from '@src/alchemy-components'; const Section = styled.div` display: flex; diff --git a/datahub-web-react/src/app/ingest/source/builder/DataPlatformCard.tsx b/datahub-web-react/src/app/ingest/source/builder/DataPlatformCard.tsx index 34efbb3000..38fd6d1ceb 100644 --- a/datahub-web-react/src/app/ingest/source/builder/DataPlatformCard.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/DataPlatformCard.tsx @@ -1,8 +1,8 @@ -import React from 'react'; import { Button, Image } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { REDESIGN_COLORS } from '../../../entity/shared/constants'; +import { REDESIGN_COLORS } from '@app/entity/shared/constants'; const Container = styled(Button)` padding: 32px; diff --git a/datahub-web-react/src/app/ingest/source/builder/DefineRecipeStep.tsx b/datahub-web-react/src/app/ingest/source/builder/DefineRecipeStep.tsx index e6aded01b5..f488645a34 100644 --- a/datahub-web-react/src/app/ingest/source/builder/DefineRecipeStep.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/DefineRecipeStep.tsx @@ -1,15 +1,16 @@ +import { Alert, Space, Typography, message } from 'antd'; import React, { useEffect, useState } from 'react'; -import { Alert, message, Space, Typography } from 'antd'; import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import RecipeBuilder from '@app/ingest/source/builder/RecipeBuilder'; +import { getRecipeJson } from '@app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionButton'; +import { CONNECTORS_WITH_FORM } from '@app/ingest/source/builder/RecipeForm/constants'; +import { YamlEditor } from '@app/ingest/source/builder/YamlEditor'; +import { IngestionSourceBuilderStep } from '@app/ingest/source/builder/steps'; +import { StepProps } from '@app/ingest/source/builder/types'; +import { getPlaceholderRecipe, getSourceConfigs, jsonToYaml } from '@app/ingest/source/utils'; import { Button } from '@src/alchemy-components'; -import { StepProps } from './types'; -import { getPlaceholderRecipe, getSourceConfigs, jsonToYaml } from '../utils'; -import { YamlEditor } from './YamlEditor'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import { IngestionSourceBuilderStep } from './steps'; -import RecipeBuilder from './RecipeBuilder'; -import { CONNECTORS_WITH_FORM } from './RecipeForm/constants'; -import { getRecipeJson } from './RecipeForm/TestConnection/TestConnectionButton'; const LOOKML_DOC_LINK = 'https://datahubproject.io/docs/generated/ingestion/sources/looker#module-lookml'; diff --git a/datahub-web-react/src/app/ingest/source/builder/IngestionDocumentationHint.tsx b/datahub-web-react/src/app/ingest/source/builder/IngestionDocumentationHint.tsx index bda3d7f742..7f81a73edf 100644 --- a/datahub-web-react/src/app/ingest/source/builder/IngestionDocumentationHint.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/IngestionDocumentationHint.tsx @@ -1,10 +1,10 @@ +import { CloseOutlined } from '@ant-design/icons'; +import { Button, Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Button, Tooltip } from 'antd'; -import { CloseOutlined } from '@ant-design/icons'; -import { SourceConfig } from './types'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { SourceConfig } from '@app/ingest/source/builder/types'; const Container = styled.div` background-color: #ffffff; diff --git a/datahub-web-react/src/app/ingest/source/builder/IngestionSourceBuilderModal.tsx b/datahub-web-react/src/app/ingest/source/builder/IngestionSourceBuilderModal.tsx index db854e9694..59f9858be0 100644 --- a/datahub-web-react/src/app/ingest/source/builder/IngestionSourceBuilderModal.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/IngestionSourceBuilderModal.tsx @@ -1,13 +1,14 @@ import { Modal, Steps, Typography } from 'antd'; +import { isEqual } from 'lodash'; import React, { useEffect, useRef, useState } from 'react'; import styled from 'styled-components'; -import { isEqual } from 'lodash'; -import { SourceBuilderState, StepProps } from './types'; -import { CreateScheduleStep } from './CreateScheduleStep'; -import { DefineRecipeStep } from './DefineRecipeStep'; -import { NameSourceStep } from './NameSourceStep'; -import { SelectTemplateStep } from './SelectTemplateStep'; -import sourcesJson from './sources.json'; + +import { CreateScheduleStep } from '@app/ingest/source/builder/CreateScheduleStep'; +import { DefineRecipeStep } from '@app/ingest/source/builder/DefineRecipeStep'; +import { NameSourceStep } from '@app/ingest/source/builder/NameSourceStep'; +import { SelectTemplateStep } from '@app/ingest/source/builder/SelectTemplateStep'; +import sourcesJson from '@app/ingest/source/builder/sources.json'; +import { SourceBuilderState, StepProps } from '@app/ingest/source/builder/types'; const StyledModal = styled(Modal)` && .ant-modal-content { diff --git a/datahub-web-react/src/app/ingest/source/builder/LookerWarning.tsx b/datahub-web-react/src/app/ingest/source/builder/LookerWarning.tsx index ea14906081..249cbc3020 100644 --- a/datahub-web-react/src/app/ingest/source/builder/LookerWarning.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/LookerWarning.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Alert } from 'antd'; -import { LOOKER, LOOK_ML } from './constants'; +import React from 'react'; + +import { LOOKER, LOOK_ML } from '@app/ingest/source/builder/constants'; const LOOKML_DOC_LINK = 'https://datahubproject.io/docs/generated/ingestion/sources/looker#module-lookml'; const LOOKER_DOC_LINK = 'https://datahubproject.io/docs/generated/ingestion/sources/looker#module-looker'; diff --git a/datahub-web-react/src/app/ingest/source/builder/NameSourceStep.tsx b/datahub-web-react/src/app/ingest/source/builder/NameSourceStep.tsx index 9e63e91fbd..98e5ee2f25 100644 --- a/datahub-web-react/src/app/ingest/source/builder/NameSourceStep.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/NameSourceStep.tsx @@ -1,10 +1,11 @@ -import { Checkbox, Collapse, Form, Input, Typography } from 'antd'; import { Button, Tooltip } from '@components'; -import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; +import { Checkbox, Collapse, Form, Input, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { SourceBuilderState, StepProps, StringMapEntryInput } from './types'; -import { RequiredFieldForm } from '../../../shared/form/RequiredFieldForm'; + +import { SourceBuilderState, StepProps, StringMapEntryInput } from '@app/ingest/source/builder/types'; +import { RequiredFieldForm } from '@app/shared/form/RequiredFieldForm'; +import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; const ControlsContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeBuilder.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeBuilder.tsx index 16327b6c8b..a1e0e4272e 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeBuilder.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeBuilder.tsx @@ -1,17 +1,18 @@ -import React, { useState } from 'react'; -import { message, Typography } from 'antd'; -import { Button } from '@src/alchemy-components'; -import YAML from 'yamljs'; import { CodeOutlined, FormOutlined } from '@ant-design/icons'; +import { Typography, message } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import { YamlEditor } from './YamlEditor'; -import RecipeForm from './RecipeForm/RecipeForm'; -import { SourceBuilderState, SourceConfig } from './types'; -import { CSV, LOOKER, LOOK_ML } from './constants'; -import { LookerWarning } from './LookerWarning'; -import { CSVInfo } from './CSVInfo'; -import { IngestionDocumentationHint } from './IngestionDocumentationHint'; +import YAML from 'yamljs'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { CSVInfo } from '@app/ingest/source/builder/CSVInfo'; +import { IngestionDocumentationHint } from '@app/ingest/source/builder/IngestionDocumentationHint'; +import { LookerWarning } from '@app/ingest/source/builder/LookerWarning'; +import RecipeForm from '@app/ingest/source/builder/RecipeForm/RecipeForm'; +import { YamlEditor } from '@app/ingest/source/builder/YamlEditor'; +import { CSV, LOOKER, LOOK_ML } from '@app/ingest/source/builder/constants'; +import { SourceBuilderState, SourceConfig } from '@app/ingest/source/builder/types'; +import { Button } from '@src/alchemy-components'; export const ControlsContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/DictField.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/DictField.tsx index e15a83b08e..fe6e2713ce 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/DictField.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/DictField.tsx @@ -1,11 +1,12 @@ -import React from 'react'; -import { Button, Form, Input, Tooltip } from 'antd'; import { red } from '@ant-design/colors'; -import styled from 'styled-components/macro'; import { DeleteOutlined, PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons'; -import { ANTD_GRAY } from '../../../../entity/shared/constants'; -import { RecipeField } from './common'; -import { StyledFormItem } from './SecretField/SecretField'; +import { Button, Form, Input, Tooltip } from 'antd'; +import React from 'react'; +import styled from 'styled-components/macro'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { StyledFormItem } from '@app/ingest/source/builder/RecipeForm/SecretField/SecretField'; +import { RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; export const Label = styled.div` font-weight: bold; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/FormField.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/FormField.tsx index 85ba8452e0..3c1f7c9314 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/FormField.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/FormField.tsx @@ -1,13 +1,20 @@ -import React from 'react'; -import { Checkbox, DatePicker, Form, Input, Select, Tooltip } from 'antd'; -import styled from 'styled-components/macro'; -import Button from 'antd/lib/button'; import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons'; -import { RecipeField, FieldType } from './common'; -import { Secret } from '../../../../../types.generated'; -import SecretField, { StyledFormItem } from './SecretField/SecretField'; -import DictField, { Label, StyledQuestion, ListWrapper, ErrorWrapper } from './DictField'; -import { ANTD_GRAY } from '../../../../entity/shared/constants'; +import { Checkbox, DatePicker, Form, Input, Select, Tooltip } from 'antd'; +import Button from 'antd/lib/button'; +import React from 'react'; +import styled from 'styled-components/macro'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import DictField, { + ErrorWrapper, + Label, + ListWrapper, + StyledQuestion, +} from '@app/ingest/source/builder/RecipeForm/DictField'; +import SecretField, { StyledFormItem } from '@app/ingest/source/builder/RecipeForm/SecretField/SecretField'; +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; + +import { Secret } from '@types'; const StyledButton = styled(Button)` color: ${ANTD_GRAY[7]}; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/RecipeForm.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/RecipeForm.tsx index 09dd52dd01..f6da301793 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/RecipeForm.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/RecipeForm.tsx @@ -1,20 +1,24 @@ -import React, { Fragment } from 'react'; - -import { Collapse, Form, message, Typography } from 'antd'; -import { Button, Tooltip } from '@components'; -import { get } from 'lodash'; -import YAML from 'yamljs'; import { ApiOutlined, FilterOutlined, QuestionCircleOutlined, SettingOutlined } from '@ant-design/icons'; +import { Button, Tooltip } from '@components'; +import { Collapse, Form, Typography, message } from 'antd'; +import { get } from 'lodash'; +import React, { Fragment } from 'react'; import styled from 'styled-components/macro'; +import YAML from 'yamljs'; -import { jsonToYaml } from '../../utils'; -import { CONNECTORS_WITH_TEST_CONNECTION, RecipeSections, RECIPE_FIELDS } from './constants'; -import FormField from './FormField'; -import TestConnectionButton from './TestConnection/TestConnectionButton'; -import { useListSecretsQuery } from '../../../../../graphql/ingestion.generated'; -import { RecipeField, setFieldValueOnRecipe } from './common'; -import { SourceBuilderState, SourceConfig } from '../types'; -import { RequiredFieldForm } from '../../../../shared/form/RequiredFieldForm'; +import FormField from '@app/ingest/source/builder/RecipeForm/FormField'; +import TestConnectionButton from '@app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionButton'; +import { RecipeField, setFieldValueOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; +import { + CONNECTORS_WITH_TEST_CONNECTION, + RECIPE_FIELDS, + RecipeSections, +} from '@app/ingest/source/builder/RecipeForm/constants'; +import { SourceBuilderState, SourceConfig } from '@app/ingest/source/builder/types'; +import { jsonToYaml } from '@app/ingest/source/utils'; +import { RequiredFieldForm } from '@app/shared/form/RequiredFieldForm'; + +import { useListSecretsQuery } from '@graphql/ingestion.generated'; export const ControlsContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/CreateSecretButton.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/CreateSecretButton.tsx index b5788c3ecb..275d04869f 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/CreateSecretButton.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/CreateSecretButton.tsx @@ -1,11 +1,13 @@ -import React, { useState } from 'react'; -import { Button, message } from 'antd'; -import { PlusOutlined } from '@ant-design/icons'; import { blue } from '@ant-design/colors'; +import { PlusOutlined } from '@ant-design/icons'; +import { Button, message } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { SecretBuilderModal } from '../../../../secret/SecretBuilderModal'; -import { useCreateSecretMutation } from '../../../../../../graphql/ingestion.generated'; -import { SecretBuilderState } from '../../../../secret/types'; + +import { SecretBuilderModal } from '@app/ingest/secret/SecretBuilderModal'; +import { SecretBuilderState } from '@app/ingest/secret/types'; + +import { useCreateSecretMutation } from '@graphql/ingestion.generated'; const CreateButton = styled(Button)` align-items: center; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/SecretField.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/SecretField.tsx index 7e49eb836d..705b90f04b 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/SecretField.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/SecretField.tsx @@ -1,12 +1,14 @@ -import React, { ReactNode } from 'react'; -import { AutoComplete, Divider, Form } from 'antd'; import { useApolloClient } from '@apollo/client'; +import { AutoComplete, Divider, Form } from 'antd'; +import React, { ReactNode } from 'react'; import styled from 'styled-components/macro'; -import { Secret } from '../../../../../../types.generated'; -import CreateSecretButton from './CreateSecretButton'; -import { RecipeField } from '../common'; -import { ANTD_GRAY } from '../../../../../entity/shared/constants'; -import { clearSecretListCache } from '../../../../secret/cacheUtils'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { clearSecretListCache } from '@app/ingest/secret/cacheUtils'; +import CreateSecretButton from '@app/ingest/source/builder/RecipeForm/SecretField/CreateSecretButton'; +import { RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; + +import { Secret } from '@types'; const StyledDivider = styled(Divider)` margin: 0; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView.tsx index e2a9b0f146..2664cbaf3d 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView.tsx @@ -1,9 +1,10 @@ +import { green, red } from '@ant-design/colors'; import { CheckOutlined, CloseOutlined, QuestionCircleOutlined } from '@ant-design/icons'; import { Tooltip } from 'antd'; import React from 'react'; -import { green, red } from '@ant-design/colors'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../../../../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const CapabilityWrapper = styled.div` align-items: center; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionButton.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionButton.tsx index 6ea7db4d71..b814733cfa 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionButton.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionButton.tsx @@ -1,15 +1,17 @@ import { CheckCircleOutlined } from '@ant-design/icons'; import { message } from 'antd'; -import { Button } from '@src/alchemy-components'; import React, { useEffect, useState } from 'react'; + +import TestConnectionModal from '@app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal'; +import { TestConnectionResult } from '@app/ingest/source/builder/RecipeForm/TestConnection/types'; +import { SourceConfig } from '@app/ingest/source/builder/types'; +import { FAILURE, RUNNING, yamlToJson } from '@app/ingest/source/utils'; +import { Button } from '@src/alchemy-components'; + import { useCreateTestConnectionRequestMutation, useGetIngestionExecutionRequestLazyQuery, -} from '../../../../../../graphql/ingestion.generated'; -import { FAILURE, RUNNING, yamlToJson } from '../../../utils'; -import { TestConnectionResult } from './types'; -import TestConnectionModal from './TestConnectionModal'; -import { SourceConfig } from '../../types'; +} from '@graphql/ingestion.generated'; export function getRecipeJson(recipeYaml: string) { // Convert the recipe into it's json representation, and catch + report exceptions while we do it. diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal.tsx index 049e30ba5b..495d06032a 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal.tsx @@ -1,14 +1,20 @@ +import { green, red } from '@ant-design/colors'; import { CheckOutlined, CloseOutlined } from '@ant-design/icons'; import { Button, Divider, Modal, Typography } from 'antd'; import React from 'react'; -import { green, red } from '@ant-design/colors'; import styled from 'styled-components/macro'; -import LoadingSvg from '../../../../../../images/datahub-logo-color-loading_pendulum.svg?react'; -import { ANTD_GRAY } from '../../../../../entity/shared/constants'; -import ConnectionCapabilityView from './ConnectionCapabilityView'; -import { CapabilityReport, SourceCapability, TestConnectionResult } from './types'; -import { SourceConfig } from '../../types'; -import useGetSourceLogoUrl from '../../useGetSourceLogoUrl'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import ConnectionCapabilityView from '@app/ingest/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView'; +import { + CapabilityReport, + SourceCapability, + TestConnectionResult, +} from '@app/ingest/source/builder/RecipeForm/TestConnection/types'; +import { SourceConfig } from '@app/ingest/source/builder/types'; +import useGetSourceLogoUrl from '@app/ingest/source/builder/useGetSourceLogoUrl'; + +import LoadingSvg from '@images/datahub-logo-color-loading_pendulum.svg?react'; const LoadingWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/__tests__/common.test.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/__tests__/common.test.ts index d9d39a8195..89d796df6c 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/__tests__/common.test.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/__tests__/common.test.ts @@ -1,4 +1,4 @@ -import { setFieldValueOnRecipe, setListValuesOnRecipe } from '../common'; +import { setFieldValueOnRecipe, setListValuesOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; describe('setFieldValueOnRecipe', () => { const accountIdFieldPath = 'source.config.account_id'; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/__tests__/utils.test.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/__tests__/utils.test.ts index a2c4de8bbd..cb37d62cba 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/__tests__/utils.test.ts @@ -1,4 +1,4 @@ -import { validateURL } from '../../../utils'; +import { validateURL } from '@app/ingest/source/utils'; describe('validateURL function', () => { it('should resolve if the URL is valid', async () => { diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/azure.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/azure.ts index 9dfbaaae0a..91a6bdd199 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/azure.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/azure.ts @@ -1,5 +1,5 @@ -import { validateURL } from '../../utils'; -import { RecipeField, FieldType, setListValuesOnRecipe } from './common'; +import { FieldType, RecipeField, setListValuesOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; +import { validateURL } from '@app/ingest/source/utils'; export const AZURE_CLIENT_ID: RecipeField = { name: 'client_id', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/bigquery.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/bigquery.ts index 59764ffdd0..63b69dbfce 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/bigquery.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/bigquery.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType } from './common'; +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; export const BIGQUERY_PROJECT_ID: RecipeField = { name: 'project_id', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/bigqueryBeta.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/bigqueryBeta.ts index 03a9ba08f3..4707db9351 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/bigqueryBeta.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/bigqueryBeta.ts @@ -1,4 +1,4 @@ -import { FieldType, RecipeField, setListValuesOnRecipe } from './common'; +import { FieldType, RecipeField, setListValuesOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; export const BIGQUERY_BETA_PROJECT_ID: RecipeField = { name: 'credential.project_id', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/common.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/common.tsx index cbaf2f4d87..d3b874f220 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/common.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/common.tsx @@ -1,6 +1,6 @@ -import React from 'react'; -import { set, get } from 'lodash'; +import { get, set } from 'lodash'; import moment, { Moment } from 'moment-timezone'; +import React from 'react'; export enum FieldType { TEXT, diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/constants.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/constants.ts index b6d076cf6d..165b102cd3 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/constants.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/constants.ts @@ -1,161 +1,3 @@ -import { SNOWFLAKE } from '../../conf/snowflake/snowflake'; -import { BIGQUERY } from '../../conf/bigquery/bigquery'; -import { REDSHIFT } from '../../conf/redshift/redshift'; -import { LOOKER } from '../../conf/looker/looker'; -import { TABLEAU } from '../../conf/tableau/tableau'; -import { KAFKA } from '../../conf/kafka/kafka'; -import { - INCLUDE_LINEAGE, - TABLE_PROFILING_ENABLED, - STATEFUL_INGESTION_ENABLED, - INCLUDE_TABLES, - INCLUDE_VIEWS, - DATABASE_ALLOW, - DATABASE_DENY, - TABLE_LINEAGE_MODE, - INGEST_TAGS, - INGEST_OWNER, - EXTRACT_USAGE_HISTORY, - EXTRACT_OWNERS, - SKIP_PERSONAL_FOLDERS, - RecipeField, - START_TIME, - INCLUDE_TABLE_LINEAGE, - TABLE_DENY, - VIEW_DENY, - VIEW_ALLOW, - TABLE_ALLOW, - SCHEMA_DENY, - SCHEMA_ALLOW, - COLUMN_PROFILING_ENABLED, -} from './common'; -import { - SNOWFLAKE_ACCOUNT_ID, - SNOWFLAKE_WAREHOUSE, - SNOWFLAKE_USERNAME, - SNOWFLAKE_PASSWORD, - SNOWFLAKE_ROLE, -} from './snowflake'; -import { BIGQUERY_PRIVATE_KEY, BIGQUERY_PRIVATE_KEY_ID, BIGQUERY_CLIENT_EMAIL, BIGQUERY_CLIENT_ID } from './bigquery'; -import { REDSHIFT_HOST_PORT, REDSHIFT_DATABASE, REDSHIFT_USERNAME, REDSHIFT_PASSWORD } from './redshift'; -import { - TABLEAU_CONNECTION_URI, - TABLEAU_PROJECT, - TABLEAU_SITE, - TABLEAU_USERNAME, - TABLEAU_PASSWORD, - TABLEAU_TOKEN_NAME, - TABLEAU_TOKEN_VALUE, -} from './tableau'; -import { - CHART_ALLOW, - CHART_DENY, - DASHBOARD_ALLOW as LOOKER_DASHBOARD_ALLOW, - DASHBOARD_DENY as LOOKER_DASHBOARD_DENY, - LOOKER_BASE_URL, - LOOKER_CLIENT_ID, - LOOKER_CLIENT_SECRET, -} from './looker'; -import { - KAFKA_SASL_USERNAME, - KAFKA_SASL_PASSWORD, - KAFKA_BOOTSTRAP, - KAFKA_SCHEMA_REGISTRY_URL, - KAFKA_SCHEMA_REGISTRY_USER_CREDENTIAL, - KAFKA_SECURITY_PROTOCOL, - KAFKA_SASL_MECHANISM, - TOPIC_ALLOW, - TOPIC_DENY, -} from './kafka'; -import { POSTGRES } from '../../conf/postgres/postgres'; -import { POSTGRES_HOST_PORT, POSTGRES_DATABASE, POSTGRES_USERNAME, POSTGRES_PASSWORD } from './postgres'; -import { HIVE } from '../../conf/hive/hive'; -import { HIVE_HOST_PORT, HIVE_DATABASE, HIVE_USERNAME, HIVE_PASSWORD } from './hive'; -import { - LOOKML, - CONNECTION_TO_PLATFORM_MAP, - DEPLOY_KEY, - LOOKML_BASE_URL, - LOOKML_CLIENT_ID, - LOOKML_CLIENT_SECRET, - LOOKML_GITHUB_INFO_REPO, - PARSE_TABLE_NAMES_FROM_SQL, - PROJECT_NAME, -} from './lookml'; -import { PRESTO, PRESTO_HOST_PORT, PRESTO_DATABASE, PRESTO_USERNAME, PRESTO_PASSWORD } from './presto'; -import { AZURE, BIGQUERY_BETA, CSV, DBT_CLOUD, MYSQL, OKTA, POWER_BI, SAC, UNITY_CATALOG, VERTICA } from '../constants'; -import { BIGQUERY_BETA_PROJECT_ID, DATASET_ALLOW, DATASET_DENY, PROJECT_ALLOW, PROJECT_DENY } from './bigqueryBeta'; -import { MYSQL_HOST_PORT, MYSQL_PASSWORD, MYSQL_USERNAME } from './mysql'; -import { MSSQL, MSSQL_DATABASE, MSSQL_HOST_PORT, MSSQL_PASSWORD, MSSQL_USERNAME } from './mssql'; -import { TRINO, TRINO_DATABASE, TRINO_HOST_PORT, TRINO_PASSWORD, TRINO_USERNAME } from './trino'; -import { MARIADB, MARIADB_DATABASE, MARIADB_HOST_PORT, MARIADB_PASSWORD, MARIADB_USERNAME } from './mariadb'; -import { - INCLUDE_COLUMN_LINEAGE, - TOKEN, - UNITY_CATALOG_ALLOW, - UNITY_CATALOG_DENY, - UNITY_METASTORE_ID_ALLOW, - UNITY_METASTORE_ID_DENY, - UNITY_TABLE_ALLOW, - UNITY_TABLE_DENY, - WORKSPACE_URL, -} from './unity_catalog'; -import { - DBT_CLOUD_ACCOUNT_ID, - DBT_CLOUD_JOB_ID, - DBT_CLOUD_PROJECT_ID, - INCLUDE_MODELS, - INCLUDE_SEEDS, - INCLUDE_SOURCES, - INCLUDE_TEST_DEFINITIONS, - INCLUDE_TEST_RESULTS, - EXTRACT_OWNERS as DBT_EXTRACT_OWNERS, - NODE_ALLOW, - NODE_DENY, - TARGET_PLATFORM, - TARGET_PLATFORM_INSTANCE, - DBT_CLOUD_TOKEN, -} from './dbt_cloud'; -import { - ADMIN_APIS_ONLY, - EXTRACT_ENDORSEMENTS_AS_TAGS, - EXTRACT_OWNERSHIP, - INCLUDE_REPORTS, - INCLUDE_POWERBI_LINEAGE, - INCLUDE_WORKSPACES, - POWERBI_CLIENT_ID, - POWERBI_CLIENT_SECRET, - POWERBI_TENANT_ID, - WORKSPACE_ID_ALLOW, - WORKSPACE_ID_DENY, -} from './powerbi'; - -import { - VERTICA_HOST_PORT, - VERTICA_DATABASE, - VERTICA_USERNAME, - VERTICA_PASSWORD, - INCLUDE_PROJECTIONS, - INCLUDE_MLMODELS, - INCLUDE_VIEW_LINEAGE, - INCLUDE_PROJECTIONS_LINEAGE, -} from './vertica'; -import { CSV_ARRAY_DELIMITER, CSV_DELIMITER, CSV_FILE_URL, CSV_WRITE_SEMANTICS } from './csv'; -import { - INCLUDE_DEPROVISIONED_USERS, - INCLUDE_SUSPENDED_USERS, - INGEST_GROUPS, - INGEST_USERS, - OKTA_API_TOKEN, - OKTA_DOMAIN_URL, - POFILE_TO_GROUP, - POFILE_TO_GROUP_REGX_ALLOW, - POFILE_TO_GROUP_REGX_DENY, - POFILE_TO_USER, - POFILE_TO_USER_REGX_ALLOW, - POFILE_TO_USER_REGX_DENY, - SKIP_USERS_WITHOUT_GROUP, -} from './okta'; import { AZURE_AUTHORITY_URL, AZURE_CLIENT_ID, @@ -170,21 +12,244 @@ import { GROUP_DENY, USER_ALLOW, USER_DENY, -} from './azure'; +} from '@app/ingest/source/builder/RecipeForm/azure'; import { - SAC_TENANT_URL, - SAC_TOKEN_URL, - SAC_CLIENT_ID, - SAC_CLIENT_SECRET, - INGEST_STORIES, + BIGQUERY_CLIENT_EMAIL, + BIGQUERY_CLIENT_ID, + BIGQUERY_PRIVATE_KEY, + BIGQUERY_PRIVATE_KEY_ID, +} from '@app/ingest/source/builder/RecipeForm/bigquery'; +import { + BIGQUERY_BETA_PROJECT_ID, + DATASET_ALLOW, + DATASET_DENY, + PROJECT_ALLOW, + PROJECT_DENY, +} from '@app/ingest/source/builder/RecipeForm/bigqueryBeta'; +import { + COLUMN_PROFILING_ENABLED, + DATABASE_ALLOW, + DATABASE_DENY, + EXTRACT_OWNERS, + EXTRACT_USAGE_HISTORY, + INCLUDE_LINEAGE, + INCLUDE_TABLES, + INCLUDE_TABLE_LINEAGE, + INCLUDE_VIEWS, + INGEST_OWNER, + INGEST_TAGS, + RecipeField, + SCHEMA_ALLOW, + SCHEMA_DENY, + SKIP_PERSONAL_FOLDERS, + START_TIME, + STATEFUL_INGESTION_ENABLED, + TABLE_ALLOW, + TABLE_DENY, + TABLE_LINEAGE_MODE, + TABLE_PROFILING_ENABLED, + VIEW_ALLOW, + VIEW_DENY, +} from '@app/ingest/source/builder/RecipeForm/common'; +import { + CSV_ARRAY_DELIMITER, + CSV_DELIMITER, + CSV_FILE_URL, + CSV_WRITE_SEMANTICS, +} from '@app/ingest/source/builder/RecipeForm/csv'; +import { + DBT_CLOUD_ACCOUNT_ID, + DBT_CLOUD_JOB_ID, + DBT_CLOUD_PROJECT_ID, + DBT_CLOUD_TOKEN, + EXTRACT_OWNERS as DBT_EXTRACT_OWNERS, + INCLUDE_MODELS, + INCLUDE_SEEDS, + INCLUDE_SOURCES, + INCLUDE_TEST_DEFINITIONS, + INCLUDE_TEST_RESULTS, + NODE_ALLOW, + NODE_DENY, + TARGET_PLATFORM, + TARGET_PLATFORM_INSTANCE, +} from '@app/ingest/source/builder/RecipeForm/dbt_cloud'; +import { + HIVE_DATABASE, + HIVE_HOST_PORT, + HIVE_PASSWORD, + HIVE_USERNAME, +} from '@app/ingest/source/builder/RecipeForm/hive'; +import { + KAFKA_BOOTSTRAP, + KAFKA_SASL_MECHANISM, + KAFKA_SASL_PASSWORD, + KAFKA_SASL_USERNAME, + KAFKA_SCHEMA_REGISTRY_URL, + KAFKA_SCHEMA_REGISTRY_USER_CREDENTIAL, + KAFKA_SECURITY_PROTOCOL, + TOPIC_ALLOW, + TOPIC_DENY, +} from '@app/ingest/source/builder/RecipeForm/kafka'; +import { + CHART_ALLOW, + CHART_DENY, + LOOKER_BASE_URL, + LOOKER_CLIENT_ID, + LOOKER_CLIENT_SECRET, + DASHBOARD_ALLOW as LOOKER_DASHBOARD_ALLOW, + DASHBOARD_DENY as LOOKER_DASHBOARD_DENY, +} from '@app/ingest/source/builder/RecipeForm/looker'; +import { + CONNECTION_TO_PLATFORM_MAP, + DEPLOY_KEY, + LOOKML, + LOOKML_BASE_URL, + LOOKML_CLIENT_ID, + LOOKML_CLIENT_SECRET, + LOOKML_GITHUB_INFO_REPO, + PARSE_TABLE_NAMES_FROM_SQL, + PROJECT_NAME, +} from '@app/ingest/source/builder/RecipeForm/lookml'; +import { + MARIADB, + MARIADB_DATABASE, + MARIADB_HOST_PORT, + MARIADB_PASSWORD, + MARIADB_USERNAME, +} from '@app/ingest/source/builder/RecipeForm/mariadb'; +import { + MSSQL, + MSSQL_DATABASE, + MSSQL_HOST_PORT, + MSSQL_PASSWORD, + MSSQL_USERNAME, +} from '@app/ingest/source/builder/RecipeForm/mssql'; +import { MYSQL_HOST_PORT, MYSQL_PASSWORD, MYSQL_USERNAME } from '@app/ingest/source/builder/RecipeForm/mysql'; +import { + INCLUDE_DEPROVISIONED_USERS, + INCLUDE_SUSPENDED_USERS, + INGEST_GROUPS, + INGEST_USERS, + OKTA_API_TOKEN, + OKTA_DOMAIN_URL, + POFILE_TO_GROUP, + POFILE_TO_GROUP_REGX_ALLOW, + POFILE_TO_GROUP_REGX_DENY, + POFILE_TO_USER, + POFILE_TO_USER_REGX_ALLOW, + POFILE_TO_USER_REGX_DENY, + SKIP_USERS_WITHOUT_GROUP, +} from '@app/ingest/source/builder/RecipeForm/okta'; +import { + POSTGRES_DATABASE, + POSTGRES_HOST_PORT, + POSTGRES_PASSWORD, + POSTGRES_USERNAME, +} from '@app/ingest/source/builder/RecipeForm/postgres'; +import { + ADMIN_APIS_ONLY, + EXTRACT_ENDORSEMENTS_AS_TAGS, + EXTRACT_OWNERSHIP, + INCLUDE_POWERBI_LINEAGE, + INCLUDE_REPORTS, + INCLUDE_WORKSPACES, + POWERBI_CLIENT_ID, + POWERBI_CLIENT_SECRET, + POWERBI_TENANT_ID, + WORKSPACE_ID_ALLOW, + WORKSPACE_ID_DENY, +} from '@app/ingest/source/builder/RecipeForm/powerbi'; +import { + PRESTO, + PRESTO_DATABASE, + PRESTO_HOST_PORT, + PRESTO_PASSWORD, + PRESTO_USERNAME, +} from '@app/ingest/source/builder/RecipeForm/presto'; +import { + REDSHIFT_DATABASE, + REDSHIFT_HOST_PORT, + REDSHIFT_PASSWORD, + REDSHIFT_USERNAME, +} from '@app/ingest/source/builder/RecipeForm/redshift'; +import { + FOLDER_ALLOW, + FOLDER_DENY, INGEST_APPLICATIONS, + INGEST_STORIES, RESOURCE_ID_ALLOW, RESOURCE_ID_DENY, RESOURCE_NAME_ALLOW, RESOURCE_NAME_DENY, - FOLDER_ALLOW, - FOLDER_DENY, -} from './sac'; + SAC_CLIENT_ID, + SAC_CLIENT_SECRET, + SAC_TENANT_URL, + SAC_TOKEN_URL, +} from '@app/ingest/source/builder/RecipeForm/sac'; +import { + SNOWFLAKE_ACCOUNT_ID, + SNOWFLAKE_PASSWORD, + SNOWFLAKE_ROLE, + SNOWFLAKE_USERNAME, + SNOWFLAKE_WAREHOUSE, +} from '@app/ingest/source/builder/RecipeForm/snowflake'; +import { + TABLEAU_CONNECTION_URI, + TABLEAU_PASSWORD, + TABLEAU_PROJECT, + TABLEAU_SITE, + TABLEAU_TOKEN_NAME, + TABLEAU_TOKEN_VALUE, + TABLEAU_USERNAME, +} from '@app/ingest/source/builder/RecipeForm/tableau'; +import { + TRINO, + TRINO_DATABASE, + TRINO_HOST_PORT, + TRINO_PASSWORD, + TRINO_USERNAME, +} from '@app/ingest/source/builder/RecipeForm/trino'; +import { + INCLUDE_COLUMN_LINEAGE, + TOKEN, + UNITY_CATALOG_ALLOW, + UNITY_CATALOG_DENY, + UNITY_METASTORE_ID_ALLOW, + UNITY_METASTORE_ID_DENY, + UNITY_TABLE_ALLOW, + UNITY_TABLE_DENY, + WORKSPACE_URL, +} from '@app/ingest/source/builder/RecipeForm/unity_catalog'; +import { + INCLUDE_MLMODELS, + INCLUDE_PROJECTIONS, + INCLUDE_PROJECTIONS_LINEAGE, + INCLUDE_VIEW_LINEAGE, + VERTICA_DATABASE, + VERTICA_HOST_PORT, + VERTICA_PASSWORD, + VERTICA_USERNAME, +} from '@app/ingest/source/builder/RecipeForm/vertica'; +import { + AZURE, + BIGQUERY_BETA, + CSV, + DBT_CLOUD, + MYSQL, + OKTA, + POWER_BI, + SAC, + UNITY_CATALOG, + VERTICA, +} from '@app/ingest/source/builder/constants'; +import { BIGQUERY } from '@app/ingest/source/conf/bigquery/bigquery'; +import { HIVE } from '@app/ingest/source/conf/hive/hive'; +import { KAFKA } from '@app/ingest/source/conf/kafka/kafka'; +import { LOOKER } from '@app/ingest/source/conf/looker/looker'; +import { POSTGRES } from '@app/ingest/source/conf/postgres/postgres'; +import { REDSHIFT } from '@app/ingest/source/conf/redshift/redshift'; +import { SNOWFLAKE } from '@app/ingest/source/conf/snowflake/snowflake'; +import { TABLEAU } from '@app/ingest/source/conf/tableau/tableau'; export enum RecipeSections { Connection = 0, diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/csv.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/csv.ts index 2cb3e7edc9..b41a8cfebf 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/csv.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/csv.ts @@ -1,5 +1,5 @@ -import { validateURL } from '../../utils'; -import { RecipeField, FieldType } from './common'; +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; +import { validateURL } from '@app/ingest/source/utils'; export const CSV_FILE_URL: RecipeField = { name: 'filename', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/dbt_cloud.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/dbt_cloud.tsx index 684b7f949a..98c9787d0a 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/dbt_cloud.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/dbt_cloud.tsx @@ -1,7 +1,8 @@ +import { get } from 'lodash'; import React from 'react'; import styled from 'styled-components'; -import { get } from 'lodash'; -import { RecipeField, FieldType, setFieldValueOnRecipe } from './common'; + +import { FieldType, RecipeField, setFieldValueOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; const TipSection = styled.div` margin-bottom: 12px; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/hive.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/hive.ts index 8ed60f885d..853b315f6d 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/hive.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/hive.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType } from './common'; +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; export const HIVE_HOST_PORT: RecipeField = { name: 'host_port', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/kafka.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/kafka.ts index eb97f8fb8f..13c51210e2 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/kafka.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/kafka.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType, setListValuesOnRecipe } from './common'; +import { FieldType, RecipeField, setListValuesOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; // TODO: Currently platform_instance is required to be present for stateful ingestion to work // We need to solve this prior to enabling by default here. diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/looker.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/looker.ts index 197f9af8b1..f49eb7aef6 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/looker.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/looker.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType, setListValuesOnRecipe } from './common'; +import { FieldType, RecipeField, setListValuesOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; export const LOOKER_BASE_URL: RecipeField = { name: 'base_url', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/lookml.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/lookml.tsx index 6afc51dbca..84fe1bcace 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/lookml.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/lookml.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { get } from 'lodash'; -import { FieldType, RecipeField, setFieldValueOnRecipe } from './common'; +import React from 'react'; + +import { FieldType, RecipeField, setFieldValueOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; export const LOOKML = 'lookml'; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/mariadb.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/mariadb.ts index 483630604f..579c9a6392 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/mariadb.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/mariadb.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType } from './common'; +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; export const MARIADB = 'mariadb'; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/mssql.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/mssql.ts index 9e6fb38814..b1e70c0441 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/mssql.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/mssql.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType } from './common'; +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; export const MSSQL = 'mssql'; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/mysql.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/mysql.ts index fa14d1eaa5..b7bb016bda 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/mysql.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/mysql.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType } from './common'; +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; export const MYSQL_HOST_PORT: RecipeField = { name: 'host_port', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/okta.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/okta.ts index ccb16f41e9..01d775d5f7 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/okta.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/okta.ts @@ -1,5 +1,5 @@ -import { validateURL } from '../../utils'; -import { RecipeField, FieldType, setListValuesOnRecipe } from './common'; +import { FieldType, RecipeField, setListValuesOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; +import { validateURL } from '@app/ingest/source/utils'; export const OKTA_DOMAIN_URL: RecipeField = { name: 'okta_domain', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/postgres.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/postgres.ts index f816bbca0a..d0c8cecbfa 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/postgres.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/postgres.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType } from './common'; +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; export const POSTGRES_HOST_PORT: RecipeField = { name: 'host_port', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/powerbi.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/powerbi.ts index ecd0783600..78cd152a7a 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/powerbi.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/powerbi.ts @@ -1,6 +1,6 @@ import { get } from 'lodash'; -import { RecipeField, FieldType, setListValuesOnRecipe } from './common'; +import { FieldType, RecipeField, setListValuesOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; export const POWERBI_CLIENT_ID: RecipeField = { name: 'client_id', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/presto.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/presto.ts index 33b1787010..1cc640d896 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/presto.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/presto.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType } from './common'; +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; export const PRESTO = 'presto'; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/redshift.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/redshift.ts index 0091bccf77..7d533b0b3a 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/redshift.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/redshift.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType } from './common'; +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; export const REDSHIFT_HOST_PORT: RecipeField = { name: 'host_port', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/sac.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/sac.ts index 3f5c6d0b09..c61eccfac9 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/sac.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/sac.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType, setListValuesOnRecipe } from './common'; +import { FieldType, RecipeField, setListValuesOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; export const SAC_TENANT_URL: RecipeField = { name: 'tenant_url', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/snowflake.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/snowflake.ts index 0d85676e62..1ff18cac53 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/snowflake.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/snowflake.ts @@ -1,4 +1,4 @@ -import { FieldType, RecipeField } from './common'; +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; export const SNOWFLAKE_ACCOUNT_ID: RecipeField = { name: 'account_id', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/tableau.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/tableau.ts index 74fee25669..380902c76a 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/tableau.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/tableau.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType, setListValuesOnRecipe } from './common'; +import { FieldType, RecipeField, setListValuesOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; export const TABLEAU_CONNECTION_URI: RecipeField = { name: 'connect_uri', diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/trino.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/trino.ts index 1af84c0131..144cc6a7fa 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/trino.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/trino.ts @@ -1,4 +1,4 @@ -import { RecipeField, FieldType } from './common'; +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; export const TRINO = 'trino'; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/unity_catalog.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/unity_catalog.tsx index 6df3a077eb..5af79ab1e9 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/unity_catalog.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/unity_catalog.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { RecipeField, FieldType, setListValuesOnRecipe } from './common'; + +import { FieldType, RecipeField, setListValuesOnRecipe } from '@app/ingest/source/builder/RecipeForm/common'; export const UNITY_CATALOG = 'unity-catalog'; diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/vertica.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/vertica.ts index ae475d152d..2313a999cd 100644 --- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/vertica.ts +++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/vertica.ts @@ -1,5 +1,6 @@ import { get } from 'lodash'; -import { RecipeField, FieldType } from './common'; + +import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common'; export const VERTICA_HOST_PORT: RecipeField = { name: 'host_port', diff --git a/datahub-web-react/src/app/ingest/source/builder/SelectTemplateStep.tsx b/datahub-web-react/src/app/ingest/source/builder/SelectTemplateStep.tsx index 5b4b526bb9..026dde048c 100644 --- a/datahub-web-react/src/app/ingest/source/builder/SelectTemplateStep.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/SelectTemplateStep.tsx @@ -1,15 +1,15 @@ -import React, { useState } from 'react'; - -import { Input } from 'antd'; import { FormOutlined, SearchOutlined } from '@ant-design/icons'; +import { Input } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DataPlatformCard } from '@app/ingest/source/builder/DataPlatformCard'; +import { CUSTOM } from '@app/ingest/source/builder/constants'; +import { IngestionSourceBuilderStep } from '@app/ingest/source/builder/steps'; +import { SourceBuilderState, SourceConfig, StepProps } from '@app/ingest/source/builder/types'; +import useGetSourceLogoUrl from '@app/ingest/source/builder/useGetSourceLogoUrl'; import { Button } from '@src/alchemy-components'; -import { SourceConfig, SourceBuilderState, StepProps } from './types'; -import { IngestionSourceBuilderStep } from './steps'; -import useGetSourceLogoUrl from './useGetSourceLogoUrl'; -import { CUSTOM } from './constants'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import { DataPlatformCard } from './DataPlatformCard'; const Container = styled.div` max-height: 82vh; diff --git a/datahub-web-react/src/app/ingest/source/builder/TimezoneSelect.tsx b/datahub-web-react/src/app/ingest/source/builder/TimezoneSelect.tsx index 21731b69cf..a505c32161 100644 --- a/datahub-web-react/src/app/ingest/source/builder/TimezoneSelect.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/TimezoneSelect.tsx @@ -1,6 +1,6 @@ import { Select } from 'antd'; -import React from 'react'; import moment from 'moment-timezone'; +import React from 'react'; import styled from 'styled-components'; const StyledSelect = styled(Select)` diff --git a/datahub-web-react/src/app/ingest/source/builder/YamlEditor.tsx b/datahub-web-react/src/app/ingest/source/builder/YamlEditor.tsx index 8a08dc99ef..d390dd6274 100644 --- a/datahub-web-react/src/app/ingest/source/builder/YamlEditor.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/YamlEditor.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import Editor, { loader } from '@monaco-editor/react'; +import React from 'react'; const baseUrl = import.meta.env.BASE_URL; loader.config({ diff --git a/datahub-web-react/src/app/ingest/source/builder/__tests__/DefineRecipeStep.test.tsx b/datahub-web-react/src/app/ingest/source/builder/__tests__/DefineRecipeStep.test.tsx index f7af577b1b..ae95bda63b 100644 --- a/datahub-web-react/src/app/ingest/source/builder/__tests__/DefineRecipeStep.test.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/__tests__/DefineRecipeStep.test.tsx @@ -2,9 +2,10 @@ import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import defaultThemeConfig from '../../../../../conf/theme/theme_light.config.json'; -import { DefineRecipeStep } from '../DefineRecipeStep'; -import { SourceConfig } from '../types'; + +import { DefineRecipeStep } from '@app/ingest/source/builder/DefineRecipeStep'; +import { SourceConfig } from '@app/ingest/source/builder/types'; +import defaultThemeConfig from '@conf/theme/theme_light.config.json'; describe('DefineRecipeStep', () => { it('should render the RecipeBuilder if the type is in CONNECTORS_WITH_FORM', () => { diff --git a/datahub-web-react/src/app/ingest/source/builder/__tests__/NameSourceStep.test.tsx b/datahub-web-react/src/app/ingest/source/builder/__tests__/NameSourceStep.test.tsx index bfcc2fa895..52d7bb554f 100644 --- a/datahub-web-react/src/app/ingest/source/builder/__tests__/NameSourceStep.test.tsx +++ b/datahub-web-react/src/app/ingest/source/builder/__tests__/NameSourceStep.test.tsx @@ -1,6 +1,7 @@ -import { render, fireEvent } from '@testing-library/react'; +import { fireEvent, render } from '@testing-library/react'; import React from 'react'; -import { NameSourceStep } from '../NameSourceStep'; + +import { NameSourceStep } from '@app/ingest/source/builder/NameSourceStep'; describe('NameSourceStep', () => { it('should trim leading and trailing whitespaces from the text field on blur', () => { diff --git a/datahub-web-react/src/app/ingest/source/builder/constants.ts b/datahub-web-react/src/app/ingest/source/builder/constants.ts index 73a100c3c5..3eb1b0ed4a 100644 --- a/datahub-web-react/src/app/ingest/source/builder/constants.ts +++ b/datahub-web-react/src/app/ingest/source/builder/constants.ts @@ -1,45 +1,45 @@ -import snowflakeLogo from '../../../../images/snowflakelogo.png'; -import bigqueryLogo from '../../../../images/bigquerylogo.png'; -import redshiftLogo from '../../../../images/redshiftlogo.png'; -import kafkaLogo from '../../../../images/kafkalogo.png'; -import lookerLogo from '../../../../images/lookerlogo.svg'; -import tableauLogo from '../../../../images/tableaulogo.png'; -import mysqlLogo from '../../../../images/mysqllogo-2.png'; -import postgresLogo from '../../../../images/postgreslogo.png'; -import mongodbLogo from '../../../../images/mongodblogo.png'; -import azureLogo from '../../../../images/azure-ad.png'; -import oktaLogo from '../../../../images/oktalogo.png'; -import glueLogo from '../../../../images/gluelogo.png'; -import oracleLogo from '../../../../images/oraclelogo.png'; -import hiveLogo from '../../../../images/hivelogo.png'; -import supersetLogo from '../../../../images/supersetlogo.png'; -import athenaLogo from '../../../../images/awsathenalogo.png'; -import mssqlLogo from '../../../../images/mssqllogo.png'; -import clickhouseLogo from '../../../../images/clickhouselogo.png'; -import cockroachdbLogo from '../../../../images/cockroachdblogo.png'; -import trinoLogo from '../../../../images/trinologo.png'; -import dbtLogo from '../../../../images/dbtlogo.png'; -import dremioLogo from '../../../../images/dremiologo.png'; -import druidLogo from '../../../../images/druidlogo.png'; -import elasticsearchLogo from '../../../../images/elasticsearchlogo.png'; -import feastLogo from '../../../../images/feastlogo.png'; -import mariadbLogo from '../../../../images/mariadblogo.png'; -import metabaseLogo from '../../../../images/metabaselogo.png'; -import powerbiLogo from '../../../../images/powerbilogo.png'; -import modeLogo from '../../../../images/modelogo.png'; -import databricksLogo from '../../../../images/databrickslogo.png'; -import verticaLogo from '../../../../images/verticalogo.png'; -import mlflowLogo2 from '../../../../images/mlflowlogo2.png'; -import dynamodbLogo from '../../../../images/dynamodblogo.png'; -import fivetranLogo from '../../../../images/fivetranlogo.png'; -import csvLogo from '../../../../images/csv-logo.png'; -import qlikLogo from '../../../../images/qliklogo.png'; -import sigmaLogo from '../../../../images/sigmalogo.png'; -import sacLogo from '../../../../images/saclogo.svg'; -import cassandraLogo from '../../../../images/cassandralogo.png'; -import datahubLogo from '../../../../images/datahublogo.png'; -import neo4j from '../../../../images/neo4j.png'; -import vertexAI from '../../../../images/vertexai.png'; +import athenaLogo from '@images/awsathenalogo.png'; +import azureLogo from '@images/azure-ad.png'; +import bigqueryLogo from '@images/bigquerylogo.png'; +import cassandraLogo from '@images/cassandralogo.png'; +import clickhouseLogo from '@images/clickhouselogo.png'; +import cockroachdbLogo from '@images/cockroachdblogo.png'; +import csvLogo from '@images/csv-logo.png'; +import databricksLogo from '@images/databrickslogo.png'; +import datahubLogo from '@images/datahublogo.png'; +import dbtLogo from '@images/dbtlogo.png'; +import dremioLogo from '@images/dremiologo.png'; +import druidLogo from '@images/druidlogo.png'; +import dynamodbLogo from '@images/dynamodblogo.png'; +import elasticsearchLogo from '@images/elasticsearchlogo.png'; +import feastLogo from '@images/feastlogo.png'; +import fivetranLogo from '@images/fivetranlogo.png'; +import glueLogo from '@images/gluelogo.png'; +import hiveLogo from '@images/hivelogo.png'; +import kafkaLogo from '@images/kafkalogo.png'; +import lookerLogo from '@images/lookerlogo.svg'; +import mariadbLogo from '@images/mariadblogo.png'; +import metabaseLogo from '@images/metabaselogo.png'; +import mlflowLogo2 from '@images/mlflowlogo2.png'; +import modeLogo from '@images/modelogo.png'; +import mongodbLogo from '@images/mongodblogo.png'; +import mssqlLogo from '@images/mssqllogo.png'; +import mysqlLogo from '@images/mysqllogo-2.png'; +import neo4j from '@images/neo4j.png'; +import oktaLogo from '@images/oktalogo.png'; +import oracleLogo from '@images/oraclelogo.png'; +import postgresLogo from '@images/postgreslogo.png'; +import powerbiLogo from '@images/powerbilogo.png'; +import qlikLogo from '@images/qliklogo.png'; +import redshiftLogo from '@images/redshiftlogo.png'; +import sacLogo from '@images/saclogo.svg'; +import sigmaLogo from '@images/sigmalogo.png'; +import snowflakeLogo from '@images/snowflakelogo.png'; +import supersetLogo from '@images/supersetlogo.png'; +import tableauLogo from '@images/tableaulogo.png'; +import trinoLogo from '@images/trinologo.png'; +import vertexAI from '@images/vertexai.png'; +import verticaLogo from '@images/verticalogo.png'; export const ATHENA = 'athena'; export const ATHENA_URN = `urn:li:dataPlatform:${ATHENA}`; diff --git a/datahub-web-react/src/app/ingest/source/builder/types.ts b/datahub-web-react/src/app/ingest/source/builder/types.ts index 2c7c19006e..d73a9e5fad 100644 --- a/datahub-web-react/src/app/ingest/source/builder/types.ts +++ b/datahub-web-react/src/app/ingest/source/builder/types.ts @@ -1,4 +1,4 @@ -import { IngestionSourceBuilderStep } from './steps'; +import { IngestionSourceBuilderStep } from '@app/ingest/source/builder/steps'; /** * The size of the builder modal diff --git a/datahub-web-react/src/app/ingest/source/builder/useGetSourceLogoUrl.ts b/datahub-web-react/src/app/ingest/source/builder/useGetSourceLogoUrl.ts index c8f1697c3a..f981cf9c7f 100644 --- a/datahub-web-react/src/app/ingest/source/builder/useGetSourceLogoUrl.ts +++ b/datahub-web-react/src/app/ingest/source/builder/useGetSourceLogoUrl.ts @@ -1,6 +1,8 @@ import { useEffect } from 'react'; -import { useGetDataPlatformLazyQuery } from '../../../../graphql/dataPlatform.generated'; -import { CUSTOM, SOURCE_TO_PLATFORM_URN, PLATFORM_URN_TO_LOGO } from './constants'; + +import { CUSTOM, PLATFORM_URN_TO_LOGO, SOURCE_TO_PLATFORM_URN } from '@app/ingest/source/builder/constants'; + +import { useGetDataPlatformLazyQuery } from '@graphql/dataPlatform.generated'; function generatePlatformUrn(platformName: string) { return `urn:li:dataPlatform:${platformName}`; diff --git a/datahub-web-react/src/app/ingest/source/conf/azure/azure.ts b/datahub-web-react/src/app/ingest/source/conf/azure/azure.ts index 1d30d9448d..37819ba206 100644 --- a/datahub-web-react/src/app/ingest/source/conf/azure/azure.ts +++ b/datahub-web-react/src/app/ingest/source/conf/azure/azure.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import azureLogo from '../../../../../images/azure-ad.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import azureLogo from '@images/azure-ad.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/bigquery/bigquery.ts b/datahub-web-react/src/app/ingest/source/conf/bigquery/bigquery.ts index 491c7d6579..a261f47ed7 100644 --- a/datahub-web-react/src/app/ingest/source/conf/bigquery/bigquery.ts +++ b/datahub-web-react/src/app/ingest/source/conf/bigquery/bigquery.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import bigqueryLogo from '../../../../../images/bigquerylogo.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import bigqueryLogo from '@images/bigquerylogo.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/csv/csv.ts b/datahub-web-react/src/app/ingest/source/conf/csv/csv.ts index e4cdee7179..9cecd163a4 100644 --- a/datahub-web-react/src/app/ingest/source/conf/csv/csv.ts +++ b/datahub-web-react/src/app/ingest/source/conf/csv/csv.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import csvLogo from '../../../../../images/csv-logo.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import csvLogo from '@images/csv-logo.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/glue/glue.ts b/datahub-web-react/src/app/ingest/source/conf/glue/glue.ts index 449f76eea8..ff82593053 100644 --- a/datahub-web-react/src/app/ingest/source/conf/glue/glue.ts +++ b/datahub-web-react/src/app/ingest/source/conf/glue/glue.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import glueLogo from '../../../../../images/gluelogo.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import glueLogo from '@images/gluelogo.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/hive/hive.ts b/datahub-web-react/src/app/ingest/source/conf/hive/hive.ts index 75bf78e40d..faa19c07df 100644 --- a/datahub-web-react/src/app/ingest/source/conf/hive/hive.ts +++ b/datahub-web-react/src/app/ingest/source/conf/hive/hive.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import hiveLogo from '../../../../../images/hivelogo.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import hiveLogo from '@images/hivelogo.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/kafka/kafka.ts b/datahub-web-react/src/app/ingest/source/conf/kafka/kafka.ts index 6926d54a03..61abd531cd 100644 --- a/datahub-web-react/src/app/ingest/source/conf/kafka/kafka.ts +++ b/datahub-web-react/src/app/ingest/source/conf/kafka/kafka.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import kafkaLogo from '../../../../../images/kafkalogo.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import kafkaLogo from '@images/kafkalogo.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/looker/looker.ts b/datahub-web-react/src/app/ingest/source/conf/looker/looker.ts index 228afc26c7..2b6878035d 100644 --- a/datahub-web-react/src/app/ingest/source/conf/looker/looker.ts +++ b/datahub-web-react/src/app/ingest/source/conf/looker/looker.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import lookerLogo from '../../../../../images/lookerlogo.svg'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import lookerLogo from '@images/lookerlogo.svg'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/mongodb/mongodb.ts b/datahub-web-react/src/app/ingest/source/conf/mongodb/mongodb.ts index f4856adbed..ec9362e7ff 100644 --- a/datahub-web-react/src/app/ingest/source/conf/mongodb/mongodb.ts +++ b/datahub-web-react/src/app/ingest/source/conf/mongodb/mongodb.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import mongodbLogo from '../../../../../images/mongodblogo.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import mongodbLogo from '@images/mongodblogo.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/mysql/mysql.ts b/datahub-web-react/src/app/ingest/source/conf/mysql/mysql.ts index 9f90677be6..a67d8e905a 100644 --- a/datahub-web-react/src/app/ingest/source/conf/mysql/mysql.ts +++ b/datahub-web-react/src/app/ingest/source/conf/mysql/mysql.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import mysqlLogo from '../../../../../images/mysqllogo-2.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import mysqlLogo from '@images/mysqllogo-2.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/okta/okta.ts b/datahub-web-react/src/app/ingest/source/conf/okta/okta.ts index fc08db9312..2486846757 100644 --- a/datahub-web-react/src/app/ingest/source/conf/okta/okta.ts +++ b/datahub-web-react/src/app/ingest/source/conf/okta/okta.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import oktaLogo from '../../../../../images/oktalogo.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import oktaLogo from '@images/oktalogo.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/oracle/oracle.ts b/datahub-web-react/src/app/ingest/source/conf/oracle/oracle.ts index df83dd1e70..b9afed7ac5 100644 --- a/datahub-web-react/src/app/ingest/source/conf/oracle/oracle.ts +++ b/datahub-web-react/src/app/ingest/source/conf/oracle/oracle.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import oracleLogo from '../../../../../images/oraclelogo.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import oracleLogo from '@images/oraclelogo.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/postgres/postgres.ts b/datahub-web-react/src/app/ingest/source/conf/postgres/postgres.ts index 301afe8178..b24ff1c1f1 100644 --- a/datahub-web-react/src/app/ingest/source/conf/postgres/postgres.ts +++ b/datahub-web-react/src/app/ingest/source/conf/postgres/postgres.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import postgresLogo from '../../../../../images/postgreslogo.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import postgresLogo from '@images/postgreslogo.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/redshift/redshift.ts b/datahub-web-react/src/app/ingest/source/conf/redshift/redshift.ts index 4a6858a3a1..150ee40bf3 100644 --- a/datahub-web-react/src/app/ingest/source/conf/redshift/redshift.ts +++ b/datahub-web-react/src/app/ingest/source/conf/redshift/redshift.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import redshiftLogo from '../../../../../images/redshiftlogo.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import redshiftLogo from '@images/redshiftlogo.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/sac/sac.ts b/datahub-web-react/src/app/ingest/source/conf/sac/sac.ts index e8a3b1f678..c366ed4513 100644 --- a/datahub-web-react/src/app/ingest/source/conf/sac/sac.ts +++ b/datahub-web-react/src/app/ingest/source/conf/sac/sac.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import sacLogo from '../../../../../images/saclogo.svg'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import sacLogo from '@images/saclogo.svg'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/snowflake/snowflake.ts b/datahub-web-react/src/app/ingest/source/conf/snowflake/snowflake.ts index 4edb6154ce..979a8dd0ad 100644 --- a/datahub-web-react/src/app/ingest/source/conf/snowflake/snowflake.ts +++ b/datahub-web-react/src/app/ingest/source/conf/snowflake/snowflake.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import snowflakeLogo from '../../../../../images/snowflakelogo.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import snowflakeLogo from '@images/snowflakelogo.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/conf/sources.tsx b/datahub-web-react/src/app/ingest/source/conf/sources.tsx index 66644cd14d..f2c917871d 100644 --- a/datahub-web-react/src/app/ingest/source/conf/sources.tsx +++ b/datahub-web-react/src/app/ingest/source/conf/sources.tsx @@ -1,23 +1,24 @@ -import React from 'react'; import { FormOutlined } from '@ant-design/icons'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import bigqueryConfig from './bigquery/bigquery'; -import redshiftConfig from './redshift/redshift'; -import snowflakeConfig from './snowflake/snowflake'; -import lookerConfig from './looker/looker'; -import mysqlConfig from './mysql/mysql'; -import postgresConfig from './postgres/postgres'; -import kafkaConfig from './kafka/kafka'; -import azureAdConfig from './azure/azure'; -import glueConfig from './glue/glue'; -import mongoConfig from './mongodb/mongodb'; -import oktaConfig from './okta/okta'; -import { SourceConfig } from './types'; -import hiveConfig from './hive/hive'; -import oracleConfig from './oracle/oracle'; -import tableauConfig from './tableau/tableau'; -import csvConfig from './csv/csv'; -import sacConfig from './sac/sac'; +import React from 'react'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import azureAdConfig from '@app/ingest/source/conf/azure/azure'; +import bigqueryConfig from '@app/ingest/source/conf/bigquery/bigquery'; +import csvConfig from '@app/ingest/source/conf/csv/csv'; +import glueConfig from '@app/ingest/source/conf/glue/glue'; +import hiveConfig from '@app/ingest/source/conf/hive/hive'; +import kafkaConfig from '@app/ingest/source/conf/kafka/kafka'; +import lookerConfig from '@app/ingest/source/conf/looker/looker'; +import mongoConfig from '@app/ingest/source/conf/mongodb/mongodb'; +import mysqlConfig from '@app/ingest/source/conf/mysql/mysql'; +import oktaConfig from '@app/ingest/source/conf/okta/okta'; +import oracleConfig from '@app/ingest/source/conf/oracle/oracle'; +import postgresConfig from '@app/ingest/source/conf/postgres/postgres'; +import redshiftConfig from '@app/ingest/source/conf/redshift/redshift'; +import sacConfig from '@app/ingest/source/conf/sac/sac'; +import snowflakeConfig from '@app/ingest/source/conf/snowflake/snowflake'; +import tableauConfig from '@app/ingest/source/conf/tableau/tableau'; +import { SourceConfig } from '@app/ingest/source/conf/types'; const baseUrl = window.location.origin; diff --git a/datahub-web-react/src/app/ingest/source/conf/tableau/tableau.ts b/datahub-web-react/src/app/ingest/source/conf/tableau/tableau.ts index 76ce171b2b..ffdb629b63 100644 --- a/datahub-web-react/src/app/ingest/source/conf/tableau/tableau.ts +++ b/datahub-web-react/src/app/ingest/source/conf/tableau/tableau.ts @@ -1,5 +1,6 @@ -import { SourceConfig } from '../types'; -import tableauLogo from '../../../../../images/tableaulogo.png'; +import { SourceConfig } from '@app/ingest/source/conf/types'; + +import tableauLogo from '@images/tableaulogo.png'; const placeholderRecipe = `\ source: diff --git a/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx b/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx index 196db064b3..8d3c9b39d0 100644 --- a/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx +++ b/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx @@ -1,26 +1,28 @@ import { DownloadOutlined } from '@ant-design/icons'; -import { Button, message, Modal, Typography } from 'antd'; +import { Button, Modal, Typography, message } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; import YAML from 'yamljs'; -import { useGetIngestionExecutionRequestQuery } from '../../../../graphql/ingestion.generated'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import { downloadFile } from '../../../search/utils/csvUtils'; -import { Message } from '../../../shared/Message'; -import IngestedAssets from '../IngestedAssets'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import IngestedAssets from '@app/ingest/source/IngestedAssets'; +import { StructuredReport } from '@app/ingest/source/executions/reporting/StructuredReport'; import { + RUNNING, + SUCCEEDED_WITH_WARNINGS, + SUCCESS, getExecutionRequestStatusDisplayColor, getExecutionRequestStatusDisplayText, getExecutionRequestStatusIcon, getExecutionRequestSummaryText, getIngestionSourceStatus, getStructuredReport, - RUNNING, - SUCCESS, - SUCCEEDED_WITH_WARNINGS, -} from '../utils'; -import { ExecutionRequestResult } from '../../../../types.generated'; -import { StructuredReport } from './reporting/StructuredReport'; +} from '@app/ingest/source/utils'; +import { downloadFile } from '@app/search/utils/csvUtils'; +import { Message } from '@app/shared/Message'; + +import { useGetIngestionExecutionRequestQuery } from '@graphql/ingestion.generated'; +import { ExecutionRequestResult } from '@types'; const StyledTitle = styled(Typography.Title)` padding: 0px; diff --git a/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTable.tsx b/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTable.tsx index da580cdfc2..3bda86a3ae 100644 --- a/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTable.tsx +++ b/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTable.tsx @@ -1,13 +1,20 @@ -import React from 'react'; import { Empty, Pagination, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; + +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import { + ButtonsColumn, + SourceColumn, + StatusColumn, + TimeColumn, +} from '@app/ingest/source/executions/IngestionExecutionTableColumns'; +import { SUCCESS, getIngestionSourceStatus } from '@app/ingest/source/utils'; +import { formatDuration } from '@app/shared/formatDuration'; import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import { StyledTable } from '../../../entity/shared/components/styled/StyledTable'; -import { EntityType, ExecutionRequest } from '../../../../types.generated'; -import { ButtonsColumn, SourceColumn, StatusColumn, TimeColumn } from './IngestionExecutionTableColumns'; -import { SUCCESS, getIngestionSourceStatus } from '../utils'; -import { formatDuration } from '../../../shared/formatDuration'; -import { SearchCfg } from '../../../../conf'; +import { SearchCfg } from '@src/conf'; + +import { EntityType, ExecutionRequest } from '@types'; const PaginationInfoContainer = styled.span` padding: 8px; diff --git a/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTableColumns.tsx b/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTableColumns.tsx index 2cb1eee0ad..0efeb7fcad 100644 --- a/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTableColumns.tsx +++ b/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTableColumns.tsx @@ -1,21 +1,22 @@ -import React from 'react'; import { CopyOutlined } from '@ant-design/icons'; -import { Button, Typography } from 'antd'; import { Text, Tooltip } from '@components'; -import styled from 'styled-components'; -import CustomAvatar from '@src/app/shared/avatar/CustomAvatar'; +import { Button, Typography } from 'antd'; +import React from 'react'; import { Link } from 'react-router-dom'; -import { CreatedByContainer } from '@src/app/govern/structuredProperties/styledComponents'; +import styled from 'styled-components'; + import { - getExecutionRequestStatusDisplayColor, - getExecutionRequestStatusIcon, - getExecutionRequestStatusDisplayText, CLI_INGESTION_SOURCE, - SCHEDULED_INGESTION_SOURCE, MANUAL_INGESTION_SOURCE, RUNNING, + SCHEDULED_INGESTION_SOURCE, SUCCESS, -} from '../utils'; + getExecutionRequestStatusDisplayColor, + getExecutionRequestStatusDisplayText, + getExecutionRequestStatusIcon, +} from '@app/ingest/source/utils'; +import { CreatedByContainer } from '@src/app/govern/structuredProperties/styledComponents'; +import CustomAvatar from '@src/app/shared/avatar/CustomAvatar'; type Actor = { actorUrn: string; diff --git a/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx b/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx index 526f6f0833..9d8c1eaf03 100644 --- a/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx +++ b/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx @@ -1,18 +1,20 @@ +import { Modal, message } from 'antd'; import React, { useEffect, useState } from 'react'; -import { message, Modal } from 'antd'; import styled from 'styled-components'; + +import { ExecutionDetailsModal } from '@app/ingest/source/executions/ExecutionRequestDetailsModal'; +import IngestionExecutionTable from '@app/ingest/source/executions/IngestionExecutionTable'; +import useRefreshIngestionData from '@app/ingest/source/executions/useRefreshIngestionData'; +import { ROLLING_BACK, RUNNING } from '@app/ingest/source/utils'; +import { Message } from '@app/shared/Message'; +import { SearchCfg } from '@src/conf'; + import { - useGetIngestionSourceQuery, useCancelIngestionExecutionRequestMutation, + useGetIngestionSourceQuery, useRollbackIngestionMutation, -} from '../../../../graphql/ingestion.generated'; -import { Message } from '../../../shared/Message'; -import { ExecutionDetailsModal } from './ExecutionRequestDetailsModal'; -import IngestionExecutionTable from './IngestionExecutionTable'; -import { ExecutionRequest } from '../../../../types.generated'; -import { ROLLING_BACK, RUNNING } from '../utils'; -import useRefreshIngestionData from './useRefreshIngestionData'; -import { SearchCfg } from '../../../../conf'; +} from '@graphql/ingestion.generated'; +import { ExecutionRequest } from '@types'; const ListContainer = styled.div` margin-left: 28px; diff --git a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReport.tsx b/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReport.tsx index 67f07df4b1..efc3845351 100644 --- a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReport.tsx +++ b/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReport.tsx @@ -1,10 +1,10 @@ +import { CloseCircleOutlined, ExclamationCircleOutlined, InfoCircleOutlined } from '@ant-design/icons'; import React from 'react'; import styled from 'styled-components'; -import { CloseCircleOutlined, ExclamationCircleOutlined, InfoCircleOutlined } from '@ant-design/icons'; -import { StructuredReportItemLevel, StructuredReport as StructuredReportType } from '../../types'; -import { StructuredReportItemList } from './StructuredReportItemList'; -import { REDESIGN_COLORS } from '../../../../entity/shared/constants'; +import { REDESIGN_COLORS } from '@app/entity/shared/constants'; +import { StructuredReportItemList } from '@app/ingest/source/executions/reporting/StructuredReportItemList'; +import { StructuredReportItemLevel, StructuredReport as StructuredReportType } from '@app/ingest/source/types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItem.tsx b/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItem.tsx index 1cd4349f37..bc742685c9 100644 --- a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItem.tsx +++ b/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItem.tsx @@ -1,11 +1,11 @@ +import { Collapse } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Collapse } from 'antd'; -import { ANTD_GRAY } from '../../../../entity/shared/constants'; -import { applyOpacity } from '../../../../shared/styleUtils'; -import { StructuredReportItemContext } from './StructuredReportItemContext'; -import { StructuredReportLogEntry } from '../../types'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { StructuredReportItemContext } from '@app/ingest/source/executions/reporting/StructuredReportItemContext'; +import { StructuredReportLogEntry } from '@app/ingest/source/types'; +import { applyOpacity } from '@app/shared/styleUtils'; const StyledCollapse = styled(Collapse)<{ color: string }>` background-color: ${(props) => applyOpacity(props.color, 8)}; diff --git a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemContext.tsx b/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemContext.tsx index 91b6282088..dcb5d18d20 100644 --- a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemContext.tsx +++ b/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemContext.tsx @@ -1,9 +1,9 @@ +import { Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from 'antd'; -import { ANTD_GRAY } from '../../../../entity/shared/constants'; -import { StructuredReportLogEntry } from '../../types'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { StructuredReportLogEntry } from '@app/ingest/source/types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemList.tsx b/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemList.tsx index d84a5ec7d6..411cf93f0c 100644 --- a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemList.tsx +++ b/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemList.tsx @@ -1,8 +1,9 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import { StructuredReportItem } from './StructuredReportItem'; -import { ShowMoreSection } from '../../../../shared/ShowMoreSection'; -import { StructuredReportLogEntry } from '../../types'; + +import { StructuredReportItem } from '@app/ingest/source/executions/reporting/StructuredReportItem'; +import { StructuredReportLogEntry } from '@app/ingest/source/types'; +import { ShowMoreSection } from '@app/shared/ShowMoreSection'; const ItemList = styled.div` display: flex; diff --git a/datahub-web-react/src/app/ingest/source/executions/useRefreshIngestionData.ts b/datahub-web-react/src/app/ingest/source/executions/useRefreshIngestionData.ts index a41e02797e..c383872539 100644 --- a/datahub-web-react/src/app/ingest/source/executions/useRefreshIngestionData.ts +++ b/datahub-web-react/src/app/ingest/source/executions/useRefreshIngestionData.ts @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react'; +import { useEffect, useState } from 'react'; export default function useRefreshIngestionData(refresh: () => void, hasActiveExecution: () => boolean) { const [refreshInterval, setRefreshInterval] = useState(null); diff --git a/datahub-web-react/src/app/ingest/source/utils.ts b/datahub-web-react/src/app/ingest/source/utils.ts index 0e30f1e8ac..20ec4cd730 100644 --- a/datahub-web-react/src/app/ingest/source/utils.ts +++ b/datahub-web-react/src/app/ingest/source/utils.ts @@ -7,13 +7,15 @@ import { WarningOutlined, } from '@ant-design/icons'; import YAML from 'yamljs'; -import { ListIngestionSourcesDocument, ListIngestionSourcesQuery } from '../../../graphql/ingestion.generated'; -import { EntityType, ExecutionRequestResult, FacetMetadata } from '../../../types.generated'; -import EntityRegistry from '../../entity/EntityRegistry'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../entity/shared/constants'; -import { capitalizeFirstLetterOnly, pluralize } from '../../shared/textUtil'; -import { SourceConfig } from './builder/types'; -import { StructuredReport, StructuredReportLogEntry, StructuredReportItemLevel } from './types'; + +import EntityRegistry from '@app/entity/EntityRegistry'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entity/shared/constants'; +import { SourceConfig } from '@app/ingest/source/builder/types'; +import { StructuredReport, StructuredReportItemLevel, StructuredReportLogEntry } from '@app/ingest/source/types'; +import { capitalizeFirstLetterOnly, pluralize } from '@app/shared/textUtil'; + +import { ListIngestionSourcesDocument, ListIngestionSourcesQuery } from '@graphql/ingestion.generated'; +import { EntityType, ExecutionRequestResult, FacetMetadata } from '@types'; export const getSourceConfigs = (ingestionSources: SourceConfig[], sourceType: string) => { const sourceConfigs = ingestionSources.find((source) => source.name === sourceType); diff --git a/datahub-web-react/src/app/lineage/ColumnNode.tsx b/datahub-web-react/src/app/lineage/ColumnNode.tsx index bfec978c60..558cc8d425 100644 --- a/datahub-web-react/src/app/lineage/ColumnNode.tsx +++ b/datahub-web-react/src/app/lineage/ColumnNode.tsx @@ -1,14 +1,16 @@ +import { Group } from '@visx/group'; import React, { useContext, useState } from 'react'; import styled from 'styled-components/macro'; -import { Group } from '@visx/group'; -import { SchemaField } from '../../types.generated'; -import { downgradeV2FieldPath } from '../entity/dataset/profile/schema/utils/utils'; -import { NodeData } from './types'; -import { LineageExplorerContext } from './utils/LineageExplorerContext'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { centerY, COLUMN_HEIGHT, EXPAND_COLLAPSE_COLUMNS_TOGGLE_HEIGHT, iconX, width } from './constants'; -import { truncate } from '../entity/shared/utils'; -import { highlightColumnLineage } from './utils/highlightColumnLineage'; + +import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { truncate } from '@app/entity/shared/utils'; +import { COLUMN_HEIGHT, EXPAND_COLLAPSE_COLUMNS_TOGGLE_HEIGHT, centerY, iconX, width } from '@app/lineage/constants'; +import { NodeData } from '@app/lineage/types'; +import { LineageExplorerContext } from '@app/lineage/utils/LineageExplorerContext'; +import { highlightColumnLineage } from '@app/lineage/utils/highlightColumnLineage'; + +import { SchemaField } from '@types'; const MAX_NUM_FIELD_CHARACTERS = 25; const HOVER_TEXT_SHIFT = 10; diff --git a/datahub-web-react/src/app/lineage/LineageEntityColumns.tsx b/datahub-web-react/src/app/lineage/LineageEntityColumns.tsx index 4777c6fef4..f427b59e06 100644 --- a/datahub-web-react/src/app/lineage/LineageEntityColumns.tsx +++ b/datahub-web-react/src/app/lineage/LineageEntityColumns.tsx @@ -1,21 +1,28 @@ -import React, { useContext, useEffect, useState } from 'react'; import { Group } from '@visx/group'; import { Pagination } from 'antd'; +import React, { useContext, useEffect, useState } from 'react'; import styled from 'styled-components'; -import { NodeData, EntitySelectParams } from './types'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { getTitleHeight } from './utils/titleUtils'; -import { LineageExplorerContext } from './utils/LineageExplorerContext'; -import { centerY, EXPAND_COLLAPSE_COLUMNS_TOGGLE_HEIGHT, iconX, NUM_COLUMNS_PER_PAGE, width } from './constants'; -import ColumnNode from './ColumnNode'; -import NodeColumnsHeader from './NodeColumnsHeader'; -import usePrevious from '../shared/usePrevious'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import ColumnNode from '@app/lineage/ColumnNode'; +import NodeColumnsHeader from '@app/lineage/NodeColumnsHeader'; +import { + EXPAND_COLLAPSE_COLUMNS_TOGGLE_HEIGHT, + NUM_COLUMNS_PER_PAGE, + centerY, + iconX, + width, +} from '@app/lineage/constants'; +import { EntitySelectParams, NodeData } from '@app/lineage/types'; +import { LineageExplorerContext } from '@app/lineage/utils/LineageExplorerContext'; import { convertInputFieldsToSchemaFields, filterColumns, haveDisplayedFieldsChanged, -} from './utils/columnLineageUtils'; -import { useResetPageIndexAfterSelect } from './utils/useResetPageIndexAfterSelect'; +} from '@app/lineage/utils/columnLineageUtils'; +import { getTitleHeight } from '@app/lineage/utils/titleUtils'; +import { useResetPageIndexAfterSelect } from '@app/lineage/utils/useResetPageIndexAfterSelect'; +import usePrevious from '@app/shared/usePrevious'; const StyledPagination = styled(Pagination)` display: flex; diff --git a/datahub-web-react/src/app/lineage/LineageEntityEdge.tsx b/datahub-web-react/src/app/lineage/LineageEntityEdge.tsx index 485c00c798..1a9f3ab992 100644 --- a/datahub-web-react/src/app/lineage/LineageEntityEdge.tsx +++ b/datahub-web-react/src/app/lineage/LineageEntityEdge.tsx @@ -1,14 +1,15 @@ -import React from 'react'; -import { Tooltip } from 'antd'; import { ClockCircleOutlined, EyeOutlined } from '@ant-design/icons'; +import { curveBasis } from '@visx/curve'; +import { Group } from '@visx/group'; +import { LinePath } from '@visx/shape'; +import { Tooltip } from 'antd'; import dayjs from 'dayjs'; import LocalizedFormat from 'dayjs/plugin/localizedFormat'; +import React from 'react'; import styled from 'styled-components'; -import { Group } from '@visx/group'; -import { curveBasis } from '@visx/curve'; -import { LinePath } from '@visx/shape'; -import { VizEdge } from './types'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { VizEdge } from '@app/lineage/types'; dayjs.extend(LocalizedFormat); diff --git a/datahub-web-react/src/app/lineage/LineageEntityNode.tsx b/datahub-web-react/src/app/lineage/LineageEntityNode.tsx index 9940900597..2d4e6f8afb 100644 --- a/datahub-web-react/src/app/lineage/LineageEntityNode.tsx +++ b/datahub-web-react/src/app/lineage/LineageEntityNode.tsx @@ -1,28 +1,40 @@ -import React, { useContext, useEffect, useMemo, useState } from 'react'; import { Group } from '@visx/group'; import { LinkHorizontal } from '@visx/shape'; +import React, { useContext, useEffect, useMemo, useState } from 'react'; import styled from 'styled-components'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { IconStyleType } from '../entity/Entity'; -import { Direction, VizNode, EntitySelectParams, EntityAndType, UpdatedLineages } from './types'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { capitalizeFirstLetterOnly } from '../shared/textUtil'; -import { getShortenedTitle, nodeHeightFromTitleLength } from './utils/titleUtils'; -import { LineageExplorerContext } from './utils/LineageExplorerContext'; -import { useGetEntityLineageLazyQuery } from '../../graphql/lineage.generated'; -import { useIsSeparateSiblingsMode } from '../entity/shared/siblingUtils'; -import { centerX, centerY, iconHeight, iconWidth, iconX, iconY, textX, width, healthX, healthY } from './constants'; -import LineageEntityColumns from './LineageEntityColumns'; -import { convertInputFieldsToSchemaFields } from './utils/columnLineageUtils'; -import ManageLineageMenu from './manage/ManageLineageMenu'; -import { useGetLineageTimeParams } from './utils/useGetLineageTimeParams'; -import { EntityHealth } from '../entity/shared/containers/profile/header/EntityHealth'; -import { EntityType } from '../../types.generated'; +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { EntityHealth } from '@app/entity/shared/containers/profile/header/EntityHealth'; import StructuredPropertyBadge, { MAX_PROP_BADGE_WIDTH, -} from '../entity/shared/containers/profile/header/StructuredPropertyBadge'; -import { filterForAssetBadge } from '../entity/shared/containers/profile/header/utils'; +} from '@app/entity/shared/containers/profile/header/StructuredPropertyBadge'; +import { filterForAssetBadge } from '@app/entity/shared/containers/profile/header/utils'; +import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import LineageEntityColumns from '@app/lineage/LineageEntityColumns'; +import { + centerX, + centerY, + healthX, + healthY, + iconHeight, + iconWidth, + iconX, + iconY, + textX, + width, +} from '@app/lineage/constants'; +import ManageLineageMenu from '@app/lineage/manage/ManageLineageMenu'; +import { Direction, EntityAndType, EntitySelectParams, UpdatedLineages, VizNode } from '@app/lineage/types'; +import { LineageExplorerContext } from '@app/lineage/utils/LineageExplorerContext'; +import { convertInputFieldsToSchemaFields } from '@app/lineage/utils/columnLineageUtils'; +import { getShortenedTitle, nodeHeightFromTitleLength } from '@app/lineage/utils/titleUtils'; +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetEntityLineageLazyQuery } from '@graphql/lineage.generated'; +import { EntityType } from '@types'; const CLICK_DELAY_THRESHOLD = 1000; const DRAG_DISTANCE_THRESHOLD = 20; diff --git a/datahub-web-react/src/app/lineage/LineageExplorer.tsx b/datahub-web-react/src/app/lineage/LineageExplorer.tsx index fbf305a034..b9382ce115 100644 --- a/datahub-web-react/src/app/lineage/LineageExplorer.tsx +++ b/datahub-web-react/src/app/lineage/LineageExplorer.tsx @@ -1,23 +1,25 @@ +import { InfoCircleOutlined } from '@ant-design/icons'; +import { Button, Drawer } from 'antd'; import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { useHistory } from 'react-router'; -import { Button, Drawer } from 'antd'; -import { InfoCircleOutlined } from '@ant-design/icons'; import styled from 'styled-components'; -import { useEntityRegistry } from '../useEntityRegistry'; -import CompactContext from '../shared/CompactContext'; -import { EntityAndType, EntitySelectParams, FetchedEntities } from './types'; -import LineageViz from './LineageViz'; -import extendAsyncEntities from './utils/extendAsyncEntities'; -import { EntityType } from '../../types.generated'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { GetEntityLineageQuery, useGetEntityLineageQuery } from '../../graphql/lineage.generated'; -import { useIsSeparateSiblingsMode } from '../entity/shared/siblingUtils'; -import { SHOW_COLUMNS_URL_PARAMS, useIsShowColumnsMode } from './utils/useIsShowColumnsMode'; -import { ErrorSection } from '../shared/error/ErrorSection'; -import usePrevious from '../shared/usePrevious'; -import { useGetLineageTimeParams } from './utils/useGetLineageTimeParams'; -import analytics, { EventType } from '../analytics'; -import LineageLoadingSection from './LineageLoadingSection'; + +import analytics, { EventType } from '@app/analytics'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import LineageLoadingSection from '@app/lineage/LineageLoadingSection'; +import LineageViz from '@app/lineage/LineageViz'; +import { EntityAndType, EntitySelectParams, FetchedEntities } from '@app/lineage/types'; +import extendAsyncEntities from '@app/lineage/utils/extendAsyncEntities'; +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; +import { SHOW_COLUMNS_URL_PARAMS, useIsShowColumnsMode } from '@app/lineage/utils/useIsShowColumnsMode'; +import CompactContext from '@app/shared/CompactContext'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; +import usePrevious from '@app/shared/usePrevious'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GetEntityLineageQuery, useGetEntityLineageQuery } from '@graphql/lineage.generated'; +import { EntityType } from '@types'; const DEFAULT_DISTANCE_FROM_TOP = 106; diff --git a/datahub-web-react/src/app/lineage/LineageLoadingSection.tsx b/datahub-web-react/src/app/lineage/LineageLoadingSection.tsx index 3b7f0e48ec..7d0e253990 100644 --- a/datahub-web-react/src/app/lineage/LineageLoadingSection.tsx +++ b/datahub-web-react/src/app/lineage/LineageLoadingSection.tsx @@ -1,8 +1,9 @@ +import { LoadingOutlined } from '@ant-design/icons'; +import { Spin } from 'antd'; import * as React from 'react'; import styled from 'styled-components'; -import { Spin } from 'antd'; -import { LoadingOutlined } from '@ant-design/icons'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Container = styled.div` height: auto; diff --git a/datahub-web-react/src/app/lineage/LineageTimeSelector.tsx b/datahub-web-react/src/app/lineage/LineageTimeSelector.tsx index 729d4861c3..017f7fd275 100644 --- a/datahub-web-react/src/app/lineage/LineageTimeSelector.tsx +++ b/datahub-web-react/src/app/lineage/LineageTimeSelector.tsx @@ -1,11 +1,12 @@ -import React, { useEffect, useState } from 'react'; -import moment from 'moment'; -import styled from 'styled-components/macro'; -import { DatePicker, Tooltip } from 'antd'; import { CalendarOutlined, CaretDownOutlined } from '@ant-design/icons'; -import ClickOutside from '../shared/ClickOutside'; -import { getTimeRangeDescription } from '../shared/time/timeUtils'; -import { ANTD_GRAY } from '../entity/shared/constants'; +import { DatePicker, Tooltip } from 'antd'; +import moment from 'moment'; +import React, { useEffect, useState } from 'react'; +import styled from 'styled-components/macro'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import ClickOutside from '@app/shared/ClickOutside'; +import { getTimeRangeDescription } from '@app/shared/time/timeUtils'; const RangePickerWrapper = styled.div` transition: color 0s; diff --git a/datahub-web-react/src/app/lineage/LineageTree.tsx b/datahub-web-react/src/app/lineage/LineageTree.tsx index 46156baacd..cec4c519c4 100644 --- a/datahub-web-react/src/app/lineage/LineageTree.tsx +++ b/datahub-web-react/src/app/lineage/LineageTree.tsx @@ -1,12 +1,19 @@ -import React, { useContext, useEffect, useMemo, useState } from 'react'; import { TransformMatrix } from '@visx/zoom/lib/types'; +import React, { useContext, useEffect, useMemo, useState } from 'react'; -import { NodeData, EntitySelectParams, TreeProps, EntityAndType, FetchedEntity, UpdatedLineages } from './types'; -import LineageTreeNodeAndEdgeRenderer from './LineageTreeNodeAndEdgeRenderer'; -import layoutTree from './utils/layoutTree'; -import { LineageExplorerContext } from './utils/LineageExplorerContext'; -import useSortColumnsBySelectedField from './utils/useSortColumnsBySelectedField'; -import { populateColumnsByUrn } from './utils/columnLineageUtils'; +import LineageTreeNodeAndEdgeRenderer from '@app/lineage/LineageTreeNodeAndEdgeRenderer'; +import { + EntityAndType, + EntitySelectParams, + FetchedEntity, + NodeData, + TreeProps, + UpdatedLineages, +} from '@app/lineage/types'; +import { LineageExplorerContext } from '@app/lineage/utils/LineageExplorerContext'; +import { populateColumnsByUrn } from '@app/lineage/utils/columnLineageUtils'; +import layoutTree from '@app/lineage/utils/layoutTree'; +import useSortColumnsBySelectedField from '@app/lineage/utils/useSortColumnsBySelectedField'; type LineageTreeProps = { upstreamData: NodeData; diff --git a/datahub-web-react/src/app/lineage/LineageTreeNodeAndEdgeRenderer.tsx b/datahub-web-react/src/app/lineage/LineageTreeNodeAndEdgeRenderer.tsx index 2e6fc2997d..0edee9c2c0 100644 --- a/datahub-web-react/src/app/lineage/LineageTreeNodeAndEdgeRenderer.tsx +++ b/datahub-web-react/src/app/lineage/LineageTreeNodeAndEdgeRenderer.tsx @@ -1,11 +1,19 @@ -import React, { useContext } from 'react'; import { Group } from '@visx/group'; import { TransformMatrix } from '@visx/zoom/lib/types'; +import React, { useContext } from 'react'; -import { NodeData, EntitySelectParams, TreeProps, VizNode, VizEdge, EntityAndType, UpdatedLineages } from './types'; -import LineageEntityNode from './LineageEntityNode'; -import LineageEntityEdge from './LineageEntityEdge'; -import { LineageExplorerContext } from './utils/LineageExplorerContext'; +import LineageEntityEdge from '@app/lineage/LineageEntityEdge'; +import LineageEntityNode from '@app/lineage/LineageEntityNode'; +import { + EntityAndType, + EntitySelectParams, + NodeData, + TreeProps, + UpdatedLineages, + VizEdge, + VizNode, +} from '@app/lineage/types'; +import { LineageExplorerContext } from '@app/lineage/utils/LineageExplorerContext'; type Props = { data: NodeData; diff --git a/datahub-web-react/src/app/lineage/LineageViz.tsx b/datahub-web-react/src/app/lineage/LineageViz.tsx index d70bf72e4c..9f6cf9b12b 100644 --- a/datahub-web-react/src/app/lineage/LineageViz.tsx +++ b/datahub-web-react/src/app/lineage/LineageViz.tsx @@ -1,9 +1,9 @@ -import React from 'react'; import { useWindowSize } from '@react-hook/window-size'; import { Zoom } from '@visx/zoom'; +import React from 'react'; -import { TreeProps } from './types'; -import LineageVizInsideZoom from './LineageVizInsideZoom'; +import LineageVizInsideZoom from '@app/lineage/LineageVizInsideZoom'; +import { TreeProps } from '@app/lineage/types'; export const defaultMargin = { top: 10, left: 280, right: 280, bottom: 10 }; diff --git a/datahub-web-react/src/app/lineage/LineageVizInsideZoom.tsx b/datahub-web-react/src/app/lineage/LineageVizInsideZoom.tsx index 714b2b03f1..788ef518e4 100644 --- a/datahub-web-react/src/app/lineage/LineageVizInsideZoom.tsx +++ b/datahub-web-react/src/app/lineage/LineageVizInsideZoom.tsx @@ -1,16 +1,17 @@ -import React, { useEffect, useState } from 'react'; -import { PlusOutlined, MinusOutlined } from '@ant-design/icons'; -import styled from 'styled-components/macro'; -import { Button } from 'antd'; +import { MinusOutlined, PlusOutlined } from '@ant-design/icons'; import { ProvidedZoom, TransformMatrix } from '@visx/zoom/lib/types'; +import { Button } from 'antd'; +import React, { useEffect, useState } from 'react'; +import styled from 'styled-components/macro'; -import { ColumnEdge, EntityAndType, EntitySelectParams, FetchedEntity } from './types'; -import { LineageExplorerContext } from './utils/LineageExplorerContext'; -import { SchemaField, SchemaFieldRef } from '../../types.generated'; -import { useIsShowColumnsMode } from './utils/useIsShowColumnsMode'; -import { LineageVizControls } from './controls/LineageVizControls'; -import LineageVizRootSvg from './LineageVizRootSvg'; -import { useAppConfig } from '../useAppConfig'; +import LineageVizRootSvg from '@app/lineage/LineageVizRootSvg'; +import { LineageVizControls } from '@app/lineage/controls/LineageVizControls'; +import { ColumnEdge, EntityAndType, EntitySelectParams, FetchedEntity } from '@app/lineage/types'; +import { LineageExplorerContext } from '@app/lineage/utils/LineageExplorerContext'; +import { useIsShowColumnsMode } from '@app/lineage/utils/useIsShowColumnsMode'; +import { useAppConfig } from '@app/useAppConfig'; + +import { SchemaField, SchemaFieldRef } from '@types'; const ControlsDiv = styled.div` display: flex; diff --git a/datahub-web-react/src/app/lineage/LineageVizRootSvg.tsx b/datahub-web-react/src/app/lineage/LineageVizRootSvg.tsx index 8aa556ae12..6d01719c20 100644 --- a/datahub-web-react/src/app/lineage/LineageVizRootSvg.tsx +++ b/datahub-web-react/src/app/lineage/LineageVizRootSvg.tsx @@ -2,10 +2,10 @@ import { ProvidedZoom, TransformMatrix } from '@visx/zoom/lib/types'; import React, { SVGProps, useEffect, useMemo, useState } from 'react'; import styled from 'styled-components/macro'; -import { useEntityRegistry } from '../useEntityRegistry'; -import LineageTree from './LineageTree'; -import { EntityAndType, FetchedEntity, EntitySelectParams, Direction, UpdatedLineages } from './types'; -import constructTree from './utils/constructTree'; +import LineageTree from '@app/lineage/LineageTree'; +import { Direction, EntityAndType, EntitySelectParams, FetchedEntity, UpdatedLineages } from '@app/lineage/types'; +import constructTree from '@app/lineage/utils/constructTree'; +import { useEntityRegistry } from '@app/useEntityRegistry'; type Props = { margin: { top: number; right: number; bottom: number; left: number }; diff --git a/datahub-web-react/src/app/lineage/NodeColumnsHeader.tsx b/datahub-web-react/src/app/lineage/NodeColumnsHeader.tsx index 46bfc2e865..bc3a06e4ec 100644 --- a/datahub-web-react/src/app/lineage/NodeColumnsHeader.tsx +++ b/datahub-web-react/src/app/lineage/NodeColumnsHeader.tsx @@ -1,14 +1,15 @@ -import { Icon } from '@components'; -import React, { useContext, useState } from 'react'; -import { Button, Input } from 'antd'; -import { Group } from '@visx/group'; -import styled from 'styled-components'; -import { DownOutlined, UpOutlined } from '@ant-design/icons'; import { blue } from '@ant-design/colors'; -import { NodeData } from './types'; -import { getTitleHeight } from './utils/titleUtils'; -import { LineageExplorerContext } from './utils/LineageExplorerContext'; -import { centerY, EXPAND_COLLAPSE_COLUMNS_TOGGLE_HEIGHT, iconX, width } from './constants'; +import { DownOutlined, UpOutlined } from '@ant-design/icons'; +import { Icon } from '@components'; +import { Group } from '@visx/group'; +import { Button, Input } from 'antd'; +import React, { useContext, useState } from 'react'; +import styled from 'styled-components'; + +import { EXPAND_COLLAPSE_COLUMNS_TOGGLE_HEIGHT, centerY, iconX, width } from '@app/lineage/constants'; +import { NodeData } from '@app/lineage/types'; +import { LineageExplorerContext } from '@app/lineage/utils/LineageExplorerContext'; +import { getTitleHeight } from '@app/lineage/utils/titleUtils'; const HeaderWrapper = styled.div` align-items: center; diff --git a/datahub-web-react/src/app/lineage/__tests__/LineageEdges.test.tsx b/datahub-web-react/src/app/lineage/__tests__/LineageEdges.test.tsx index 1fb8420346..5587052d11 100644 --- a/datahub-web-react/src/app/lineage/__tests__/LineageEdges.test.tsx +++ b/datahub-web-react/src/app/lineage/__tests__/LineageEdges.test.tsx @@ -1,9 +1,10 @@ import { render } from '@testing-library/react'; import React from 'react'; -import { dataset1, dataset4WithLineage } from '../../../Mocks'; -import { getTestEntityRegistry } from '../../../utils/test-utils/TestPageContainer'; -import LineageEdges from '../manage/LineageEdges'; -import { Direction } from '../types'; + +import LineageEdges from '@app/lineage/manage/LineageEdges'; +import { Direction } from '@app/lineage/types'; +import { dataset1, dataset4WithLineage } from '@src/Mocks'; +import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer'; const mockEntityRegistry = getTestEntityRegistry(); vi.mock('../../useEntityRegistry', () => ({ diff --git a/datahub-web-react/src/app/lineage/__tests__/LineageEntityView.test.tsx b/datahub-web-react/src/app/lineage/__tests__/LineageEntityView.test.tsx index 1f8d4d5723..51e1ef121d 100644 --- a/datahub-web-react/src/app/lineage/__tests__/LineageEntityView.test.tsx +++ b/datahub-web-react/src/app/lineage/__tests__/LineageEntityView.test.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import React from 'react'; -import { dataset1 } from '../../../Mocks'; -import { getTestEntityRegistry } from '../../../utils/test-utils/TestPageContainer'; -import LineageEntityView from '../manage/LineageEntityView'; + +import LineageEntityView from '@app/lineage/manage/LineageEntityView'; +import { dataset1 } from '@src/Mocks'; +import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer'; const mockEntityRegistry = getTestEntityRegistry(); vi.mock('../../useEntityRegistry', () => ({ diff --git a/datahub-web-react/src/app/lineage/__tests__/LineageTree.test.tsx b/datahub-web-react/src/app/lineage/__tests__/LineageTree.test.tsx index 571ca51c46..717efa7454 100644 --- a/datahub-web-react/src/app/lineage/__tests__/LineageTree.test.tsx +++ b/datahub-web-react/src/app/lineage/__tests__/LineageTree.test.tsx @@ -1,20 +1,16 @@ -import React from 'react'; +import { MockedProvider } from '@apollo/client/testing'; import { render } from '@testing-library/react'; import { Zoom } from '@visx/zoom'; -import { MockedProvider } from '@apollo/client/testing'; -import { - dataset3WithLineage, - dataset4WithLineage, - dataset5WithLineage, - dataset6WithLineage, - mocks, -} from '../../../Mocks'; -import { Direction, EntityAndType } from '../types'; -import constructTree from '../utils/constructTree'; -import LineageTree from '../LineageTree'; -import extendAsyncEntities from '../utils/extendAsyncEntities'; -import TestPageContainer, { getTestEntityRegistry } from '../../../utils/test-utils/TestPageContainer'; -import { EntityType } from '../../../types.generated'; +import React from 'react'; + +import LineageTree from '@app/lineage/LineageTree'; +import { Direction, EntityAndType } from '@app/lineage/types'; +import constructTree from '@app/lineage/utils/constructTree'; +import extendAsyncEntities from '@app/lineage/utils/extendAsyncEntities'; +import { dataset3WithLineage, dataset4WithLineage, dataset5WithLineage, dataset6WithLineage, mocks } from '@src/Mocks'; +import TestPageContainer, { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer'; + +import { EntityType } from '@types'; const margin = { top: 10, left: 280, right: 280, bottom: 10 }; const [windowWidth, windowHeight] = [1000, 500]; diff --git a/datahub-web-react/src/app/lineage/__tests__/adjustVXTreeLayout.test.tsx b/datahub-web-react/src/app/lineage/__tests__/adjustVXTreeLayout.test.tsx index 11cc69a142..808a2ac72d 100644 --- a/datahub-web-react/src/app/lineage/__tests__/adjustVXTreeLayout.test.tsx +++ b/datahub-web-react/src/app/lineage/__tests__/adjustVXTreeLayout.test.tsx @@ -1,7 +1,11 @@ -import React from 'react'; -import { Tree, hierarchy } from '@visx/hierarchy'; import { render } from '@testing-library/react'; +import { Tree, hierarchy } from '@visx/hierarchy'; +import React from 'react'; +import { Direction, EntityAndType, NodeData } from '@app/lineage/types'; +import adjustVXTreeLayout from '@app/lineage/utils/adjustVXTreeLayout'; +import constructTree from '@app/lineage/utils/constructTree'; +import extendAsyncEntities from '@app/lineage/utils/extendAsyncEntities'; import { dataset3WithLineage, dataset4WithLineage, @@ -10,13 +14,10 @@ import { dataset6WithLineage, dataset7WithLineage, dataset7WithSelfReferentialLineage, -} from '../../../Mocks'; -import constructTree from '../utils/constructTree'; -import extendAsyncEntities from '../utils/extendAsyncEntities'; -import adjustVXTreeLayout from '../utils/adjustVXTreeLayout'; -import { NodeData, Direction, EntityAndType } from '../types'; -import { getTestEntityRegistry } from '../../../utils/test-utils/TestPageContainer'; -import { Dataset, Entity, EntityType } from '../../../types.generated'; +} from '@src/Mocks'; +import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer'; + +import { Dataset, Entity, EntityType } from '@types'; const testEntityRegistry = getTestEntityRegistry(); diff --git a/datahub-web-react/src/app/lineage/__tests__/constructFetchedNode.test.tsx b/datahub-web-react/src/app/lineage/__tests__/constructFetchedNode.test.tsx index 6ddc0dc398..ee31a44bdb 100644 --- a/datahub-web-react/src/app/lineage/__tests__/constructFetchedNode.test.tsx +++ b/datahub-web-react/src/app/lineage/__tests__/constructFetchedNode.test.tsx @@ -1,7 +1,8 @@ -import { dataset1, dataset2, dataJob1, dataset1FetchedEntity, dataset2FetchedEntity } from '../../../Mocks'; -import { Entity, EntityType } from '../../../types.generated'; -import { Direction, EntityAndType, FetchedEntity } from '../types'; -import { shouldIncludeChildEntity } from '../utils/constructFetchedNode'; +import { Direction, EntityAndType, FetchedEntity } from '@app/lineage/types'; +import { shouldIncludeChildEntity } from '@app/lineage/utils/constructFetchedNode'; +import { dataJob1, dataset1, dataset1FetchedEntity, dataset2, dataset2FetchedEntity } from '@src/Mocks'; + +import { Entity, EntityType } from '@types'; describe('shouldIncludeChildEntity', () => { const parentChildren = [ diff --git a/datahub-web-react/src/app/lineage/__tests__/constructTree.test.ts b/datahub-web-react/src/app/lineage/__tests__/constructTree.test.ts index 245265cd72..716dc5d702 100644 --- a/datahub-web-react/src/app/lineage/__tests__/constructTree.test.ts +++ b/datahub-web-react/src/app/lineage/__tests__/constructTree.test.ts @@ -1,5 +1,10 @@ +import { Direction, EntityAndType, FetchedEntity, UpdatedLineages } from '@app/lineage/types'; +import constructTree from '@app/lineage/utils/constructTree'; +import extendAsyncEntities from '@app/lineage/utils/extendAsyncEntities'; import { + dataFlow1, dataJob1, + dataset1, dataset3, dataset3WithLineage, dataset4, @@ -7,14 +12,10 @@ import { dataset5, dataset5WithLineage, dataset6WithLineage, - dataFlow1, - dataset1, -} from '../../../Mocks'; -import { DataPlatform, Dataset, Entity, EntityType, RelationshipDirection } from '../../../types.generated'; -import { getTestEntityRegistry } from '../../../utils/test-utils/TestPageContainer'; -import { Direction, EntityAndType, FetchedEntity, UpdatedLineages } from '../types'; -import constructTree from '../utils/constructTree'; -import extendAsyncEntities from '../utils/extendAsyncEntities'; +} from '@src/Mocks'; +import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer'; + +import { DataPlatform, Dataset, Entity, EntityType, RelationshipDirection } from '@types'; const testEntityRegistry = getTestEntityRegistry(); const kafkaPlatform: DataPlatform = dataset3.platform; diff --git a/datahub-web-react/src/app/lineage/__tests__/manageLineage.test.tsx b/datahub-web-react/src/app/lineage/__tests__/manageLineage.test.tsx index ba8febb89d..da582ecd8c 100644 --- a/datahub-web-react/src/app/lineage/__tests__/manageLineage.test.tsx +++ b/datahub-web-react/src/app/lineage/__tests__/manageLineage.test.tsx @@ -1,8 +1,9 @@ -import { dataFlow1, dataJob1, dataset1, dataset2, dataset3 } from '../../../Mocks'; -import { existsInEntitiesToAdd } from '../manage/AddEntityEdge'; -import { buildUpdateLineagePayload, getValidEntityTypes } from '../utils/manageLineageUtils'; -import { Direction } from '../types'; -import { EntityType } from '../../../types.generated'; +import { existsInEntitiesToAdd } from '@app/lineage/manage/AddEntityEdge'; +import { Direction } from '@app/lineage/types'; +import { buildUpdateLineagePayload, getValidEntityTypes } from '@app/lineage/utils/manageLineageUtils'; +import { dataFlow1, dataJob1, dataset1, dataset2, dataset3 } from '@src/Mocks'; + +import { EntityType } from '@types'; describe('existsInEntitiesToAdd', () => { it('should return false if the search result is not in entitiesAlreadyAdded', () => { diff --git a/datahub-web-react/src/app/lineage/controls/LineageVizControls.tsx b/datahub-web-react/src/app/lineage/controls/LineageVizControls.tsx index facbf848a7..3692d3eb95 100644 --- a/datahub-web-react/src/app/lineage/controls/LineageVizControls.tsx +++ b/datahub-web-react/src/app/lineage/controls/LineageVizControls.tsx @@ -1,11 +1,11 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { LINEAGE_GRAPH_TIME_FILTER_ID } from '../../onboarding/config/LineageGraphOnboardingConfig'; -import LineageVizTimeSelector from './LineageVizTimeSelector'; -import { useIsSeparateSiblingsMode } from '../../entity/shared/siblingUtils'; -import { useIsShowColumnsMode } from '../utils/useIsShowColumnsMode'; -import { LineageVizToggles } from './LineageVizToggles'; +import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import LineageVizTimeSelector from '@app/lineage/controls/LineageVizTimeSelector'; +import { LineageVizToggles } from '@app/lineage/controls/LineageVizToggles'; +import { useIsShowColumnsMode } from '@app/lineage/utils/useIsShowColumnsMode'; +import { LINEAGE_GRAPH_TIME_FILTER_ID } from '@app/onboarding/config/LineageGraphOnboardingConfig'; const LeftControlsDiv = styled.div` display: flex; diff --git a/datahub-web-react/src/app/lineage/controls/LineageVizTimeSelector.tsx b/datahub-web-react/src/app/lineage/controls/LineageVizTimeSelector.tsx index 287911917b..36d9726d67 100644 --- a/datahub-web-react/src/app/lineage/controls/LineageVizTimeSelector.tsx +++ b/datahub-web-react/src/app/lineage/controls/LineageVizTimeSelector.tsx @@ -1,11 +1,12 @@ -import React from 'react'; import moment from 'moment'; +import React from 'react'; import { useHistory, useLocation } from 'react-router'; -import { navigateToLineageUrl } from '../utils/navigateToLineageUrl'; -import analytics, { EventType } from '../../analytics'; -import { getTimeFromNow } from '../../shared/time/timeUtils'; -import LineageTimeSelector from '../LineageTimeSelector'; -import { useGetLineageTimeParams } from '../utils/useGetLineageTimeParams'; + +import analytics, { EventType } from '@app/analytics'; +import LineageTimeSelector from '@app/lineage/LineageTimeSelector'; +import { navigateToLineageUrl } from '@app/lineage/utils/navigateToLineageUrl'; +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; +import { getTimeFromNow } from '@app/shared/time/timeUtils'; type Props = { isHideSiblingMode: boolean; diff --git a/datahub-web-react/src/app/lineage/controls/LineageVizToggles.tsx b/datahub-web-react/src/app/lineage/controls/LineageVizToggles.tsx index 3287b180a8..11e23354ff 100644 --- a/datahub-web-react/src/app/lineage/controls/LineageVizToggles.tsx +++ b/datahub-web-react/src/app/lineage/controls/LineageVizToggles.tsx @@ -1,14 +1,14 @@ -import React from 'react'; -import { Switch, Tooltip } from 'antd'; import { QuestionCircleOutlined } from '@ant-design/icons'; +import { Switch, Tooltip } from 'antd'; +import React from 'react'; import { useHistory, useLocation } from 'react-router'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { navigateToLineageUrl } from '../utils/navigateToLineageUrl'; -import { useIsSeparateSiblingsMode } from '../../entity/shared/siblingUtils'; -import { useIsShowColumnsMode } from '../utils/useIsShowColumnsMode'; -import { useIsShowSeparateSiblingsEnabled } from '../../useAppConfig'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; +import { navigateToLineageUrl } from '@app/lineage/utils/navigateToLineageUrl'; +import { useIsShowColumnsMode } from '@app/lineage/utils/useIsShowColumnsMode'; +import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig'; const ControlDiv = styled.div` display: flex; diff --git a/datahub-web-react/src/app/lineage/manage/AddEntityEdge.tsx b/datahub-web-react/src/app/lineage/manage/AddEntityEdge.tsx index a4057f97fe..45b6a9c9de 100644 --- a/datahub-web-react/src/app/lineage/manage/AddEntityEdge.tsx +++ b/datahub-web-react/src/app/lineage/manage/AddEntityEdge.tsx @@ -2,14 +2,16 @@ import { LoadingOutlined, SubnodeOutlined } from '@ant-design/icons'; import { AutoComplete, Empty } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { useGetAutoCompleteMultipleResultsLazyQuery } from '../../../graphql/search.generated'; -import { Entity, EntityType } from '../../../types.generated'; -import { Direction } from '../types'; -import { getValidEntityTypes } from '../utils/manageLineageUtils'; -import LineageEntityView from './LineageEntityView'; -import EntityRegistry from '../../entity/EntityRegistry'; -import { ANTD_GRAY } from '../../entity/shared/constants'; + +import EntityRegistry from '@app/entity/EntityRegistry'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import LineageEntityView from '@app/lineage/manage/LineageEntityView'; +import { Direction } from '@app/lineage/types'; +import { getValidEntityTypes } from '@app/lineage/utils/manageLineageUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetAutoCompleteMultipleResultsLazyQuery } from '@graphql/search.generated'; +import { Entity, EntityType } from '@types'; const AddEdgeWrapper = styled.div` padding: 15px 20px; diff --git a/datahub-web-react/src/app/lineage/manage/EntityEdge.tsx b/datahub-web-react/src/app/lineage/manage/EntityEdge.tsx index f8582e7615..609ccb7a29 100644 --- a/datahub-web-react/src/app/lineage/manage/EntityEdge.tsx +++ b/datahub-web-react/src/app/lineage/manage/EntityEdge.tsx @@ -2,10 +2,12 @@ import { CloseOutlined } from '@ant-design/icons'; import Text from 'antd/lib/typography/Text'; import React from 'react'; import styled from 'styled-components/macro'; -import { CorpUser, Entity } from '../../../types.generated'; -import { ANTD_GRAY, DEFAULT_SYSTEM_ACTOR_URNS } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import UserAvatar from './UserAvatar'; + +import { ANTD_GRAY, DEFAULT_SYSTEM_ACTOR_URNS } from '@app/entity/shared/constants'; +import UserAvatar from '@app/lineage/manage/UserAvatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, Entity } from '@types'; const EntityItem = styled.div` border-bottom: 1px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/lineage/manage/LineageEdges.tsx b/datahub-web-react/src/app/lineage/manage/LineageEdges.tsx index da45a2f3d2..44f1eb1d81 100644 --- a/datahub-web-react/src/app/lineage/manage/LineageEdges.tsx +++ b/datahub-web-react/src/app/lineage/manage/LineageEdges.tsx @@ -1,11 +1,13 @@ import { Empty } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { CorpUser, Entity, Maybe } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { Direction, FetchedEntity } from '../types'; -import EntityEdge from './EntityEdge'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import EntityEdge from '@app/lineage/manage/EntityEdge'; +import { Direction, FetchedEntity } from '@app/lineage/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, Entity, Maybe } from '@types'; const LineageEdgesWrapper = styled.div` height: 225px; diff --git a/datahub-web-react/src/app/lineage/manage/LineageEntityView.tsx b/datahub-web-react/src/app/lineage/manage/LineageEntityView.tsx index f0e8a91cca..99fbd7310d 100644 --- a/datahub-web-react/src/app/lineage/manage/LineageEntityView.tsx +++ b/datahub-web-react/src/app/lineage/manage/LineageEntityView.tsx @@ -1,11 +1,13 @@ import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Entity } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { getPlatformName } from '../../entity/shared/utils'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { getPlatformName } from '@app/entity/shared/utils'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity } from '@types'; const EntityWrapper = styled.div<{ shrinkPadding?: boolean }>` border-bottom: 1px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/lineage/manage/ManageLineageMenu.tsx b/datahub-web-react/src/app/lineage/manage/ManageLineageMenu.tsx index b321075fde..b90ce2918a 100644 --- a/datahub-web-react/src/app/lineage/manage/ManageLineageMenu.tsx +++ b/datahub-web-react/src/app/lineage/manage/ManageLineageMenu.tsx @@ -2,12 +2,15 @@ import { ArrowDownOutlined, ArrowUpOutlined, MoreOutlined } from '@ant-design/ic import { Dropdown, Popover, Tooltip } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import FocusIcon from '../../../images/focus.svg'; -import { Direction, UpdatedLineages } from '../types'; -import { EntityType } from '../../../types.generated'; -import ManageLineageModal from './ManageLineageModal'; -import { ENTITY_TYPES_WITH_MANUAL_LINEAGE } from '../../entity/shared/constants'; -import { MenuItemStyle } from '../../entity/view/menu/item/styledComponent'; + +import { ENTITY_TYPES_WITH_MANUAL_LINEAGE } from '@app/entity/shared/constants'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; +import ManageLineageModal from '@app/lineage/manage/ManageLineageModal'; +import { Direction, UpdatedLineages } from '@app/lineage/types'; + +import { EntityType } from '@types'; + +import FocusIcon from '@images/focus.svg'; const DROPDOWN_Z_INDEX = 1; const POPOVER_Z_INDEX = 2; diff --git a/datahub-web-react/src/app/lineage/manage/ManageLineageModal.tsx b/datahub-web-react/src/app/lineage/manage/ManageLineageModal.tsx index 5648838bb5..51c1807a9a 100644 --- a/datahub-web-react/src/app/lineage/manage/ManageLineageModal.tsx +++ b/datahub-web-react/src/app/lineage/manage/ManageLineageModal.tsx @@ -1,16 +1,18 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { Button, message, Modal } from 'antd'; +import { Button, Modal, message } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { useGetEntityLineageQuery } from '../../../graphql/lineage.generated'; -import { Direction, UpdatedLineages } from '../types'; -import AddEntityEdge from './AddEntityEdge'; -import LineageEntityView from './LineageEntityView'; -import LineageEdges from './LineageEdges'; -import { Entity, EntityType } from '../../../types.generated'; -import { useUpdateLineageMutation } from '../../../graphql/mutations.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { buildUpdateLineagePayload, recordAnalyticsEvents } from '../utils/manageLineageUtils'; + +import AddEntityEdge from '@app/lineage/manage/AddEntityEdge'; +import LineageEdges from '@app/lineage/manage/LineageEdges'; +import LineageEntityView from '@app/lineage/manage/LineageEntityView'; +import { Direction, UpdatedLineages } from '@app/lineage/types'; +import { buildUpdateLineagePayload, recordAnalyticsEvents } from '@app/lineage/utils/manageLineageUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetEntityLineageQuery } from '@graphql/lineage.generated'; +import { useUpdateLineageMutation } from '@graphql/mutations.generated'; +import { Entity, EntityType } from '@types'; const ModalFooter = styled.div` display: flex; diff --git a/datahub-web-react/src/app/lineage/manage/UserAvatar.tsx b/datahub-web-react/src/app/lineage/manage/UserAvatar.tsx index 93f3c89c14..84fa53fc33 100644 --- a/datahub-web-react/src/app/lineage/manage/UserAvatar.tsx +++ b/datahub-web-react/src/app/lineage/manage/UserAvatar.tsx @@ -2,10 +2,12 @@ import { PartitionOutlined } from '@ant-design/icons'; import { Avatar, Popover } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { CorpUser, EntityType } from '../../../types.generated'; -import getAvatarColor from '../../shared/avatar/getAvatarColor'; -import { toLocalDateTimeString } from '../../shared/time/timeUtils'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import getAvatarColor from '@app/shared/avatar/getAvatarColor'; +import { toLocalDateTimeString } from '@app/shared/time/timeUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, EntityType } from '@types'; const StyledAvatar = styled(Avatar)<{ backgroundColor: string }>` color: #fff; diff --git a/datahub-web-react/src/app/lineage/types.ts b/datahub-web-react/src/app/lineage/types.ts index 669243b13c..a822e83067 100644 --- a/datahub-web-react/src/app/lineage/types.ts +++ b/datahub-web-react/src/app/lineage/types.ts @@ -1,5 +1,6 @@ import { GenericEntityProperties } from '@app/entity/shared/types'; -import { FullLineageResultsFragment } from '../../graphql/lineage.generated'; + +import { FullLineageResultsFragment } from '@graphql/lineage.generated'; import { Chart, Dashboard, @@ -23,7 +24,7 @@ import { SiblingProperties, Status, StructuredProperties, -} from '../../types.generated'; +} from '@types'; export type EntitySelectParams = { type: EntityType; diff --git a/datahub-web-react/src/app/lineage/utils/LineageExplorerContext.tsx b/datahub-web-react/src/app/lineage/utils/LineageExplorerContext.tsx index cca09f9b1a..42b5475c78 100644 --- a/datahub-web-react/src/app/lineage/utils/LineageExplorerContext.tsx +++ b/datahub-web-react/src/app/lineage/utils/LineageExplorerContext.tsx @@ -1,6 +1,8 @@ import React from 'react'; -import { SchemaField, SchemaFieldRef } from '../../../types.generated'; -import { ColumnEdge } from '../types'; + +import { ColumnEdge } from '@app/lineage/types'; + +import { SchemaField, SchemaFieldRef } from '@types'; export const LineageExplorerContext = React.createContext({ expandTitles: false, diff --git a/datahub-web-react/src/app/lineage/utils/__tests__/columnLineageUtils.test.tsx b/datahub-web-react/src/app/lineage/utils/__tests__/columnLineageUtils.test.tsx index 235fce08a8..4706084ada 100644 --- a/datahub-web-react/src/app/lineage/utils/__tests__/columnLineageUtils.test.tsx +++ b/datahub-web-react/src/app/lineage/utils/__tests__/columnLineageUtils.test.tsx @@ -1,13 +1,14 @@ +import { FetchedEntity } from '@app/lineage/types'; import { decodeSchemaField, encodeSchemaField, getFieldPathFromSchemaFieldUrn, getPopulatedColumnsByUrn, getSourceUrnFromSchemaFieldUrn, -} from '../columnLineageUtils'; -import { dataJob1, dataset1, dataset2 } from '../../../../Mocks'; -import { FetchedEntity } from '../../types'; -import { FineGrainedLineage, SchemaFieldDataType } from '../../../../types.generated'; +} from '@app/lineage/utils/columnLineageUtils'; +import { dataJob1, dataset1, dataset2 } from '@src/Mocks'; + +import { FineGrainedLineage, SchemaFieldDataType } from '@types'; describe('getSourceUrnFromSchemaFieldUrn', () => { it('should get the source urn for a chart schemaField', () => { diff --git a/datahub-web-react/src/app/lineage/utils/__tests__/extendAsyncEntities.test.ts b/datahub-web-react/src/app/lineage/utils/__tests__/extendAsyncEntities.test.ts index 6af9b1b2c0..bf54b21513 100644 --- a/datahub-web-react/src/app/lineage/utils/__tests__/extendAsyncEntities.test.ts +++ b/datahub-web-react/src/app/lineage/utils/__tests__/extendAsyncEntities.test.ts @@ -1,7 +1,8 @@ -import { dataJob1, dataset1, dataset2 } from '../../../../Mocks'; -import { FetchedEntity } from '../../types'; -import { FineGrainedLineage } from '../../../../types.generated'; -import { extendColumnLineage } from '../extendAsyncEntities'; +import { FetchedEntity } from '@app/lineage/types'; +import { extendColumnLineage } from '@app/lineage/utils/extendAsyncEntities'; +import { dataJob1, dataset1, dataset2 } from '@src/Mocks'; + +import { FineGrainedLineage } from '@types'; describe('extendColumnLineage', () => { it('should update fineGrainedMap to draw lines from downstream and upstream datasets with a datajob in between', () => { diff --git a/datahub-web-react/src/app/lineage/utils/adjustVXTreeLayout.ts b/datahub-web-react/src/app/lineage/utils/adjustVXTreeLayout.ts index 3fde422494..81409d0d83 100644 --- a/datahub-web-react/src/app/lineage/utils/adjustVXTreeLayout.ts +++ b/datahub-web-react/src/app/lineage/utils/adjustVXTreeLayout.ts @@ -1,7 +1,8 @@ import { HierarchyPointNode } from '@visx/hierarchy/lib/types'; -import { NodeData, Direction } from '../types'; + // eslint-disable-next-line @typescript-eslint/no-unused-vars -import { width as nodeWidth } from '../constants'; +import { width as nodeWidth } from '@app/lineage/constants'; +import { Direction, NodeData } from '@app/lineage/types'; export default function adjustVXTreeLayout({ tree, diff --git a/datahub-web-react/src/app/lineage/utils/columnLineageUtils.ts b/datahub-web-react/src/app/lineage/utils/columnLineageUtils.ts index bd4f07cae1..bd16aa67f5 100644 --- a/datahub-web-react/src/app/lineage/utils/columnLineageUtils.ts +++ b/datahub-web-react/src/app/lineage/utils/columnLineageUtils.ts @@ -1,6 +1,7 @@ -import { ColumnEdge, FetchedEntity, NodeData } from '../types'; -import { EntityType, InputFields, SchemaField, SchemaFieldDataType } from '../../../types.generated'; -import { downgradeV2FieldPath } from '../../entity/dataset/profile/schema/utils/utils'; +import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { ColumnEdge, FetchedEntity, NodeData } from '@app/lineage/types'; + +import { EntityType, InputFields, SchemaField, SchemaFieldDataType } from '@types'; export function getHighlightedColumnsForNode(highlightedEdges: ColumnEdge[], fields: SchemaField[], nodeUrn: string) { return highlightedEdges diff --git a/datahub-web-react/src/app/lineage/utils/constructFetchedNode.ts b/datahub-web-react/src/app/lineage/utils/constructFetchedNode.ts index bb9f29522d..616b000b53 100644 --- a/datahub-web-react/src/app/lineage/utils/constructFetchedNode.ts +++ b/datahub-web-react/src/app/lineage/utils/constructFetchedNode.ts @@ -1,5 +1,6 @@ -import { EntityType } from '../../../types.generated'; -import { Direction, EntityAndType, FetchedEntities, FetchedEntity, NodeData } from '../types'; +import { Direction, EntityAndType, FetchedEntities, FetchedEntity, NodeData } from '@app/lineage/types'; + +import { EntityType } from '@types'; // If there are nodes A, B, C and A -> B, B -> C, A -> C, where A and C are Datasets and B is a DataJob, we don't want to show edge A -> C export function shouldIncludeChildEntity( diff --git a/datahub-web-react/src/app/lineage/utils/constructTree.ts b/datahub-web-react/src/app/lineage/utils/constructTree.ts index 6118b24f85..b7cd3799c0 100644 --- a/datahub-web-react/src/app/lineage/utils/constructTree.ts +++ b/datahub-web-react/src/app/lineage/utils/constructTree.ts @@ -1,8 +1,16 @@ -import { Entity } from '../../../types.generated'; -import EntityRegistry from '../../entity/EntityRegistry'; -import { Direction, EntityAndType, FetchedEntities, FetchedEntity, NodeData, UpdatedLineages } from '../types'; -import constructFetchedNode, { shouldIncludeChildEntity } from './constructFetchedNode'; -import extendAsyncEntities from './extendAsyncEntities'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { + Direction, + EntityAndType, + FetchedEntities, + FetchedEntity, + NodeData, + UpdatedLineages, +} from '@app/lineage/types'; +import constructFetchedNode, { shouldIncludeChildEntity } from '@app/lineage/utils/constructFetchedNode'; +import extendAsyncEntities from '@app/lineage/utils/extendAsyncEntities'; + +import { Entity } from '@types'; function createEntityAndType(entity: Entity) { return { diff --git a/datahub-web-react/src/app/lineage/utils/extendAsyncEntities.ts b/datahub-web-react/src/app/lineage/utils/extendAsyncEntities.ts index 6412640d23..6a11307cfc 100644 --- a/datahub-web-react/src/app/lineage/utils/extendAsyncEntities.ts +++ b/datahub-web-react/src/app/lineage/utils/extendAsyncEntities.ts @@ -1,12 +1,13 @@ -import { EntityType, SchemaFieldRef } from '../../../types.generated'; -import EntityRegistry from '../../entity/EntityRegistry'; -import { EntityAndType, FetchedEntities, FetchedEntity } from '../types'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { EntityAndType, FetchedEntities, FetchedEntity } from '@app/lineage/types'; import { decodeSchemaField, getFieldPathFromSchemaFieldUrn, getSourceUrnFromSchemaFieldUrn, isSameColumn, -} from './columnLineageUtils'; +} from '@app/lineage/utils/columnLineageUtils'; + +import { EntityType, SchemaFieldRef } from '@types'; const breakFieldUrn = (ref: SchemaFieldRef) => { const before = ref.urn; diff --git a/datahub-web-react/src/app/lineage/utils/highlightColumnLineage.ts b/datahub-web-react/src/app/lineage/utils/highlightColumnLineage.ts index eaff8f9588..f6f511bf1f 100644 --- a/datahub-web-react/src/app/lineage/utils/highlightColumnLineage.ts +++ b/datahub-web-react/src/app/lineage/utils/highlightColumnLineage.ts @@ -1,5 +1,6 @@ import { isEqual } from 'lodash'; -import { ColumnEdge } from '../types'; + +import { ColumnEdge } from '@app/lineage/types'; function highlightDownstreamColumnLineage( sourceField: string, diff --git a/datahub-web-react/src/app/lineage/utils/layoutTree.ts b/datahub-web-react/src/app/lineage/utils/layoutTree.ts index bc88337cce..1afb36f150 100644 --- a/datahub-web-react/src/app/lineage/utils/layoutTree.ts +++ b/datahub-web-react/src/app/lineage/utils/layoutTree.ts @@ -1,4 +1,3 @@ -import { EntityType, SchemaField } from '../../../types.generated'; import { COLUMN_HEIGHT, CURVE_PADDING, @@ -7,10 +6,12 @@ import { NUM_COLUMNS_PER_PAGE, VERTICAL_SPACE_BETWEEN_NODES, width as nodeWidth, -} from '../constants'; -import { Direction, NodeData, VizEdge, VizNode } from '../types'; -import { convertInputFieldsToSchemaFields } from './columnLineageUtils'; -import { getTitleHeight, nodeHeightFromTitleLength } from './titleUtils'; +} from '@app/lineage/constants'; +import { Direction, NodeData, VizEdge, VizNode } from '@app/lineage/types'; +import { convertInputFieldsToSchemaFields } from '@app/lineage/utils/columnLineageUtils'; +import { getTitleHeight, nodeHeightFromTitleLength } from '@app/lineage/utils/titleUtils'; + +import { EntityType, SchemaField } from '@types'; type ProcessArray = { parent: VizNode | null; diff --git a/datahub-web-react/src/app/lineage/utils/manageLineageUtils.ts b/datahub-web-react/src/app/lineage/utils/manageLineageUtils.ts index f59bbd1168..89f8fb3d61 100644 --- a/datahub-web-react/src/app/lineage/utils/manageLineageUtils.ts +++ b/datahub-web-react/src/app/lineage/utils/manageLineageUtils.ts @@ -1,7 +1,8 @@ -import { Entity, EntityType, LineageEdge } from '../../../types.generated'; -import analytics, { EventType } from '../../analytics'; -import EntityRegistry from '../../entity/EntityRegistry'; -import { Direction } from '../types'; +import analytics, { EventType } from '@app/analytics'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { Direction } from '@app/lineage/types'; + +import { Entity, EntityType, LineageEdge } from '@types'; interface AnalyticsEventsProps { lineageDirection: Direction; diff --git a/datahub-web-react/src/app/lineage/utils/navigateToLineageUrl.ts b/datahub-web-react/src/app/lineage/utils/navigateToLineageUrl.ts index 6deed52674..242c5f7c98 100644 --- a/datahub-web-react/src/app/lineage/utils/navigateToLineageUrl.ts +++ b/datahub-web-react/src/app/lineage/utils/navigateToLineageUrl.ts @@ -1,7 +1,8 @@ import * as QueryString from 'query-string'; import { RouteComponentProps } from 'react-router-dom'; -import { SEPARATE_SIBLINGS_URL_PARAM } from '../../entity/shared/siblingUtils'; -import { SHOW_COLUMNS_URL_PARAMS } from './useIsShowColumnsMode'; + +import { SEPARATE_SIBLINGS_URL_PARAM } from '@app/entity/shared/siblingUtils'; +import { SHOW_COLUMNS_URL_PARAMS } from '@app/lineage/utils/useIsShowColumnsMode'; export const navigateToLineageUrl = ({ location, diff --git a/datahub-web-react/src/app/lineage/utils/titleUtils.ts b/datahub-web-react/src/app/lineage/utils/titleUtils.ts index 8bd0cbda55..c5b63ea5a5 100644 --- a/datahub-web-react/src/app/lineage/utils/titleUtils.ts +++ b/datahub-web-react/src/app/lineage/utils/titleUtils.ts @@ -1,5 +1,6 @@ -import { SchemaField } from '../../../types.generated'; -import { COLUMN_HEIGHT, EXPAND_COLLAPSE_COLUMNS_TOGGLE_HEIGHT, NUM_COLUMNS_PER_PAGE } from '../constants'; +import { COLUMN_HEIGHT, EXPAND_COLLAPSE_COLUMNS_TOGGLE_HEIGHT, NUM_COLUMNS_PER_PAGE } from '@app/lineage/constants'; + +import { SchemaField } from '@types'; interface OptionalOptions { font?: string; diff --git a/datahub-web-react/src/app/lineage/utils/useGetLineageTimeParams.ts b/datahub-web-react/src/app/lineage/utils/useGetLineageTimeParams.ts index 6a11b218e6..f6c41a01bd 100644 --- a/datahub-web-react/src/app/lineage/utils/useGetLineageTimeParams.ts +++ b/datahub-web-react/src/app/lineage/utils/useGetLineageTimeParams.ts @@ -1,6 +1,6 @@ import * as QueryString from 'query-string'; -import { useLocation } from 'react-router-dom'; import { useMemo } from 'react'; +import { useLocation } from 'react-router-dom'; export const START_TIME_MILLIS_URL_PARAM = 'start_time_millis'; export const END_TIME_MILLIS_URL_PARAM = 'end_time_millis'; diff --git a/datahub-web-react/src/app/lineage/utils/useResetPageIndexAfterSelect.ts b/datahub-web-react/src/app/lineage/utils/useResetPageIndexAfterSelect.ts index 795f018350..8eadfa2592 100644 --- a/datahub-web-react/src/app/lineage/utils/useResetPageIndexAfterSelect.ts +++ b/datahub-web-react/src/app/lineage/utils/useResetPageIndexAfterSelect.ts @@ -1,9 +1,11 @@ import { useContext, useEffect } from 'react'; -import { SchemaField } from '../../../types.generated'; -import usePrevious from '../../shared/usePrevious'; -import { NUM_COLUMNS_PER_PAGE } from '../constants'; -import { getHighlightedColumnsForNode } from './columnLineageUtils'; -import { LineageExplorerContext } from './LineageExplorerContext'; + +import { NUM_COLUMNS_PER_PAGE } from '@app/lineage/constants'; +import { LineageExplorerContext } from '@app/lineage/utils/LineageExplorerContext'; +import { getHighlightedColumnsForNode } from '@app/lineage/utils/columnLineageUtils'; +import usePrevious from '@app/shared/usePrevious'; + +import { SchemaField } from '@types'; export function useResetPageIndexAfterSelect( nodeUrn: string, diff --git a/datahub-web-react/src/app/lineage/utils/useSortColumnsBySelectedField.ts b/datahub-web-react/src/app/lineage/utils/useSortColumnsBySelectedField.ts index d27764d6ed..863f97f913 100644 --- a/datahub-web-react/src/app/lineage/utils/useSortColumnsBySelectedField.ts +++ b/datahub-web-react/src/app/lineage/utils/useSortColumnsBySelectedField.ts @@ -1,16 +1,18 @@ import { useContext, useEffect } from 'react'; -import { SchemaField } from '../../../types.generated'; -import usePrevious from '../../shared/usePrevious'; -import { NUM_COLUMNS_PER_PAGE } from '../constants'; -import { FetchedEntity } from '../types'; + +import { NUM_COLUMNS_PER_PAGE } from '@app/lineage/constants'; +import { FetchedEntity } from '@app/lineage/types'; +import { LineageExplorerContext } from '@app/lineage/utils/LineageExplorerContext'; import { convertFieldsToV1FieldPath, convertInputFieldsToSchemaFields, getHighlightedColumnsForNode, sortColumnsByDefault, sortRelatedLineageColumns, -} from './columnLineageUtils'; -import { LineageExplorerContext } from './LineageExplorerContext'; +} from '@app/lineage/utils/columnLineageUtils'; +import usePrevious from '@app/shared/usePrevious'; + +import { SchemaField } from '@types'; export default function useSortColumnsBySelectedField(fetchedEntities: Map) { const { highlightedEdges, selectedField, columnsByUrn, setColumnsByUrn } = useContext(LineageExplorerContext); diff --git a/datahub-web-react/src/app/lineageV2/LineageDisplay.tsx b/datahub-web-react/src/app/lineageV2/LineageDisplay.tsx index 9b0e9df76b..215c683ebd 100644 --- a/datahub-web-react/src/app/lineageV2/LineageDisplay.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageDisplay.tsx @@ -1,15 +1,16 @@ -import useComputeGraph from '@app/lineageV2/useComputeGraph/useComputeGraph'; import React, { useContext, useEffect, useMemo, useState } from 'react'; import { useReactFlow } from 'reactflow'; -import { EntityType } from '@types'; -import { ColumnRef, LineageDisplayContext, LineageNodesContext } from './common'; -import LineageSidebar from './LineageSidebar'; -import LineageVisualization from './LineageVisualization'; -import useColumnHighlighting from './useColumnHighlighting'; -import useBulkEntityLineage from './useBulkEntityLineage'; -import { LINEAGE_FILTER_NODE_NAME } from './LineageFilterNode/LineageFilterNodeBasic'; -import useNodeHighlighting from './useNodeHighlighting'; +import { LINEAGE_FILTER_NODE_NAME } from '@app/lineageV2/LineageFilterNode/LineageFilterNodeBasic'; +import LineageSidebar from '@app/lineageV2/LineageSidebar'; +import LineageVisualization from '@app/lineageV2/LineageVisualization'; +import { ColumnRef, LineageDisplayContext, LineageNodesContext } from '@app/lineageV2/common'; +import useBulkEntityLineage from '@app/lineageV2/useBulkEntityLineage'; +import useColumnHighlighting from '@app/lineageV2/useColumnHighlighting'; +import useComputeGraph from '@app/lineageV2/useComputeGraph/useComputeGraph'; +import useNodeHighlighting from '@app/lineageV2/useNodeHighlighting'; + +import { EntityType } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/lineageV2/LineageEdge/LineageTableEdge.tsx b/datahub-web-react/src/app/lineageV2/LineageEdge/LineageTableEdge.tsx index 1b4b9c7c69..317a319633 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEdge/LineageTableEdge.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEdge/LineageTableEdge.tsx @@ -2,8 +2,9 @@ import React, { useContext, useMemo, useState } from 'react'; import { useDebounce } from 'react-use'; import { EdgeLabelRenderer, EdgeProps, getBezierPath } from 'reactflow'; import styled from 'styled-components'; -import { LineageDisplayContext, LineageTableEdgeData } from '../common'; -import { LINEAGE_COLORS } from '../../entityV2/shared/constants'; + +import { LINEAGE_COLORS } from '@app/entityV2/shared/constants'; +import { LineageDisplayContext, LineageTableEdgeData } from '@app/lineageV2/common'; export const LINEAGE_TABLE_EDGE_NAME = 'table-table'; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/Column.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/Column.tsx index ddd6f6d930..626e9e71fd 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/Column.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/Column.tsx @@ -1,32 +1,35 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; -import { useGetLineageUrl } from '@app/lineageV2/lineageUtils'; -import { ColumnAsset } from '@app/lineageV2/types'; -import { useAppConfig } from '@app/useAppConfig'; -import { useGetLineageCountsLazyQuery } from '@graphql/lineage.generated'; -import LinkOut from '@images/link-out.svg?react'; -import { Spin, Typography } from 'antd'; import { Tooltip } from '@components'; +import { Spin, Typography } from 'antd'; import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react'; import { Link } from 'react-router-dom'; import { Handle, Position } from 'reactflow'; import styled from 'styled-components'; -import { EntityType } from '../../../types.generated'; -import { EventType } from '../../analytics'; -import analytics from '../../analytics/analytics'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../entityV2/shared/constants'; -import { generateSchemaFieldUrn } from '../../entityV2/shared/tabs/Lineage/utils'; -import { CompactFieldIconWithTooltip } from '../../sharedV2/icons/CompactFieldIcon'; + +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { generateSchemaFieldUrn } from '@app/entityV2/shared/tabs/Lineage/utils'; +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; +import { LineageDisplayColumn } from '@app/lineageV2/LineageEntityNode/useDisplayedColumns'; import { - createColumnRef, HOVER_COLOR, LineageDisplayContext, LineageNodesContext, - onClickPreventSelect, SELECT_COLOR, + createColumnRef, + onClickPreventSelect, useIgnoreSchemaFieldStatus, -} from '../common'; -import { LineageDisplayColumn } from './useDisplayedColumns'; +} from '@app/lineageV2/common'; +import { useGetLineageUrl } from '@app/lineageV2/lineageUtils'; +import { ColumnAsset } from '@app/lineageV2/types'; +import { CompactFieldIconWithTooltip } from '@app/sharedV2/icons/CompactFieldIcon'; +import { useAppConfig } from '@app/useAppConfig'; + +import { useGetLineageCountsLazyQuery } from '@graphql/lineage.generated'; +import { EntityType } from '@types'; + +import LinkOut from '@images/link-out.svg?react'; const HOVER_REQUEST_DELAY = 300; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ColumnSearch.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ColumnSearch.tsx index 7ab9fa5380..c8e2da841e 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ColumnSearch.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ColumnSearch.tsx @@ -1,7 +1,8 @@ import { Input } from 'antd'; import React, { Dispatch, SetStateAction } from 'react'; import styled from 'styled-components'; -import { onClickPreventSelect } from '../common'; + +import { onClickPreventSelect } from '@app/lineageV2/common'; const SearchInput = styled(Input)` border-radius: 4px; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/Columns.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/Columns.tsx index a5d00102ec..42595b2f51 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/Columns.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/Columns.tsx @@ -1,26 +1,29 @@ -import { LineageAssetType } from '@app/lineageV2/types'; +import { PartitionOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; +import { Pagination } from 'antd'; import React, { Dispatch, SetStateAction, useCallback, useContext, useEffect, useMemo, useState } from 'react'; import { useDebounce } from 'react-use'; import { useUpdateNodeInternals } from 'reactflow'; -import { Pagination } from 'antd'; -import { Tooltip } from '@components'; -import { PartitionOutlined } from '@ant-design/icons'; import styled from 'styled-components'; -import { EventType } from '../../analytics'; -import analytics from '../../analytics/analytics'; -import { NUM_COLUMNS_PER_PAGE } from '../constants'; -import Column from './Column'; -import ColumnSearch from './ColumnSearch'; -import { FetchedEntity } from '../../lineage/types'; -import { LineageDisplayColumn } from './useDisplayedColumns'; -import { LINEAGE_COLORS, REDESIGN_COLORS } from '../../entityV2/shared/constants'; -import { LineageNodesContext, onClickPreventSelect, TRANSITION_DURATION_MS } from '../common'; + +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import { LINEAGE_COLORS, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { FetchedEntity } from '@app/lineage/types'; +import Column from '@app/lineageV2/LineageEntityNode/Column'; +import ColumnSearch from '@app/lineageV2/LineageEntityNode/ColumnSearch'; +import { LineageDisplayColumn } from '@app/lineageV2/LineageEntityNode/useDisplayedColumns'; +import { LineageNodesContext, TRANSITION_DURATION_MS, onClickPreventSelect } from '@app/lineageV2/common'; +import { NUM_COLUMNS_PER_PAGE } from '@app/lineageV2/constants'; +import { LineageAssetType } from '@app/lineageV2/types'; const MainColumnsWrapper = styled.div<{ isGhost: boolean }>` align-items: center; display: flex; flex-direction: column; - font: 12px 'Roboto Mono', monospace; + font: + 12px 'Roboto Mono', + monospace; width: 100%; padding: 8px 11px; opacity: ${({ isGhost }) => (isGhost ? 0.5 : 1)}; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContainerPath.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContainerPath.tsx index 47ec4d1a47..738e27fe93 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContainerPath.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContainerPath.tsx @@ -1,12 +1,14 @@ +import { Typography } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; + import { GenericEntityProperties } from '@app/entity/shared/types'; import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; import { ContainerIconBase } from '@app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon'; import MatchTextSizeWrapper from '@app/sharedV2/text/MatchTextSizeWrapper'; import { useEntityRegistry } from '@app/useEntityRegistry'; + import { Container } from '@types'; -import { Typography } from 'antd'; -import React from 'react'; -import styled from 'styled-components'; const ContainerPathWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContractLineageButton.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContractLineageButton.tsx index 4df6a0b177..3187c6f8f4 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContractLineageButton.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContractLineageButton.tsx @@ -1,9 +1,11 @@ -import React, { useContext } from 'react'; import { KeyboardArrowLeft } from '@mui/icons-material'; -import { LineageDirection } from '../../../types.generated'; -import { UpstreamWrapper, DownstreamWrapper, Button } from './components'; -import { LineageNodesContext, onClickPreventSelect } from '../common'; -import analytics, { EventType } from '../../analytics'; +import React, { useContext } from 'react'; + +import analytics, { EventType } from '@app/analytics'; +import { Button, DownstreamWrapper, UpstreamWrapper } from '@app/lineageV2/LineageEntityNode/components'; +import { LineageNodesContext, onClickPreventSelect } from '@app/lineageV2/common'; + +import { LineageDirection } from '@types'; interface Props { urn: string; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ExpandLineageButton.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ExpandLineageButton.tsx index 0705f4406a..d5f0488a7d 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ExpandLineageButton.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ExpandLineageButton.tsx @@ -1,12 +1,14 @@ +import { KeyboardArrowRight, KeyboardDoubleArrowRight } from '@mui/icons-material'; import React from 'react'; import styled from 'styled-components'; -import { KeyboardArrowRight, KeyboardDoubleArrowRight } from '@mui/icons-material'; -import { EntityType, LineageDirection } from '../../../types.generated'; -import { FetchStatus, onClickPreventSelect } from '../common'; -import { ANTD_GRAY } from '../../entityV2/shared/constants'; -import { UpstreamWrapper, DownstreamWrapper, Button } from './components'; -import { useOnClickExpandLineage } from './useOnClickExpandLineage'; -import analytics, { EventType } from '../../analytics'; + +import analytics, { EventType } from '@app/analytics'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { Button, DownstreamWrapper, UpstreamWrapper } from '@app/lineageV2/LineageEntityNode/components'; +import { useOnClickExpandLineage } from '@app/lineageV2/LineageEntityNode/useOnClickExpandLineage'; +import { FetchStatus, onClickPreventSelect } from '@app/lineageV2/common'; + +import { EntityType, LineageDirection } from '@types'; const VerticalDivider = styled.hr<{ margin: number }>` align-self: stretch; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/GhostEntityMenu.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/GhostEntityMenu.tsx index d8a468607e..0501b213df 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/GhostEntityMenu.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/GhostEntityMenu.tsx @@ -1,10 +1,12 @@ import { MoreOutlined } from '@ant-design/icons'; -import { LineageDisplayContext, onClickPreventSelect } from '@app/lineageV2/common'; -import Colors from '@components/theme/foundations/colors'; import { Button, Dropdown } from 'antd'; import React, { useContext } from 'react'; import styled from 'styled-components'; +import Colors from '@components/theme/foundations/colors'; + +import { LineageDisplayContext, onClickPreventSelect } from '@app/lineageV2/common'; + const DROPDOWN_Z_INDEX = 100; const Wrapper = styled.div` diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/LineageEntityNode.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/LineageEntityNode.tsx index 4d36ec6d86..b76c81044a 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/LineageEntityNode.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/LineageEntityNode.tsx @@ -1,20 +1,22 @@ import { HomeOutlined } from '@ant-design/icons'; -import LineageVisualizationContext from '@app/lineageV2/LineageVisualizationContext'; import React, { useContext, useEffect, useMemo, useState } from 'react'; import { NodeProps } from 'reactflow'; import styled from 'styled-components'; -import { EntityType, LineageDirection } from '../../../types.generated'; -import { LINEAGE_COLORS } from '../../entityV2/shared/constants'; + +import { LINEAGE_COLORS } from '@app/entityV2/shared/constants'; +import NodeContents from '@app/lineageV2/LineageEntityNode/NodeContents'; +import useDisplayedColumns from '@app/lineageV2/LineageEntityNode/useDisplayedColumns'; +import LineageVisualizationContext from '@app/lineageV2/LineageVisualizationContext'; import { LineageDisplayContext, LineageEntity, LineageNodesContext, TRANSITION_DURATION_MS, useIgnoreSchemaFieldStatus, -} from '../common'; -import useSearchAcrossLineage from '../useSearchAcrossLineage'; -import NodeContents from './NodeContents'; -import useDisplayedColumns from './useDisplayedColumns'; +} from '@app/lineageV2/common'; +import useSearchAcrossLineage from '@app/lineageV2/useSearchAcrossLineage'; + +import { EntityType, LineageDirection } from '@types'; export const LINEAGE_ENTITY_NODE_NAME = 'lineage-entity'; const MAX_NODES_FOR_TRANSITION = 50; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ManageLineageMenu.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ManageLineageMenu.tsx index 15c8bc361b..ff77980f8c 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ManageLineageMenu.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ManageLineageMenu.tsx @@ -1,15 +1,18 @@ import { ArrowLeftOutlined, ArrowRightOutlined, MoreOutlined } from '@ant-design/icons'; import { Popover } from '@components'; -import Colors from '@components/theme/foundations/colors'; import { Button, Dropdown, Menu } from 'antd'; import * as QueryString from 'query-string'; import React, { useCallback, useContext, useEffect, useState } from 'react'; import { useHistory, useLocation } from 'react-router-dom'; import styled from 'styled-components'; -import { EntityType, LineageDirection } from '../../../types.generated'; -import { ENTITY_TYPES_WITH_MANUAL_LINEAGE } from '../../entityV2/shared/constants'; -import { LineageDisplayContext, LineageEntity, onClickPreventSelect } from '../common'; -import ManageLineageModal from '../manualLineage/ManageLineageModal'; + +import Colors from '@components/theme/foundations/colors'; + +import { ENTITY_TYPES_WITH_MANUAL_LINEAGE } from '@app/entityV2/shared/constants'; +import { LineageDisplayContext, LineageEntity, onClickPreventSelect } from '@app/lineageV2/common'; +import ManageLineageModal from '@app/lineageV2/manualLineage/ManageLineageModal'; + +import { EntityType, LineageDirection } from '@types'; const DROPDOWN_Z_INDEX = 100; const POPOVER_Z_INDEX = 101; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeContents.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeContents.tsx index 17e4864d58..1f04d925df 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeContents.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeContents.tsx @@ -1,35 +1,41 @@ import { LoadingOutlined } from '@ant-design/icons'; -import VersioningBadge from '@app/entityV2/shared/versioning/VersioningBadge'; -import ContainerPath from '@app/lineageV2/LineageEntityNode/ContainerPath'; -import GhostEntityMenu from '@app/lineageV2/LineageEntityNode/GhostEntityMenu'; -import SchemaFieldNodeContents from '@app/lineageV2/LineageEntityNode/SchemaFieldNodeContents'; -import MatchTextSizeWrapper from '@app/sharedV2/text/MatchTextSizeWrapper'; import { Tooltip } from '@components'; import { KeyboardArrowDown, KeyboardArrowUp } from '@mui/icons-material'; -import { DeprecationIcon } from '@src/app/entityV2/shared/components/styled/DeprecationIcon'; -import StructuredPropertyBadge from '@src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge'; import { Skeleton, Spin } from 'antd'; import React, { Dispatch, SetStateAction, useCallback } from 'react'; import { Handle, Position } from 'reactflow'; import styled from 'styled-components'; -import { EntityType, LineageDirection } from '../../../types.generated'; -import { EventType } from '../../analytics'; -import analytics from '../../analytics/analytics'; -import { ANTD_GRAY, LINEAGE_COLORS, REDESIGN_COLORS } from '../../entityV2/shared/constants'; -import HealthIcon from '../../previewV2/HealthIcon'; -import getTypeIcon from '../../sharedV2/icons/getTypeIcon'; -import OverflowTitle from '../../sharedV2/text/OverflowTitle'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { FetchStatus, getNodeColor, isGhostEntity, LineageEntity, onClickPreventSelect } from '../common'; -import { NUM_COLUMNS_PER_PAGE } from '../constants'; -import { FetchedEntityV2 } from '../types'; -import Columns from './Columns'; -import { ContractLineageButton } from './ContractLineageButton'; -import { ExpandLineageButton } from './ExpandLineageButton'; -import ManageLineageMenu from './ManageLineageMenu'; -import NodeSkeleton from './NodeSkeleton'; -import useAvoidIntersections from './useAvoidIntersections'; -import { DisplayedColumns, LINEAGE_NODE_HEIGHT, LINEAGE_NODE_WIDTH } from './useDisplayedColumns'; + +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import { ANTD_GRAY, LINEAGE_COLORS, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import VersioningBadge from '@app/entityV2/shared/versioning/VersioningBadge'; +import Columns from '@app/lineageV2/LineageEntityNode/Columns'; +import ContainerPath from '@app/lineageV2/LineageEntityNode/ContainerPath'; +import { ContractLineageButton } from '@app/lineageV2/LineageEntityNode/ContractLineageButton'; +import { ExpandLineageButton } from '@app/lineageV2/LineageEntityNode/ExpandLineageButton'; +import GhostEntityMenu from '@app/lineageV2/LineageEntityNode/GhostEntityMenu'; +import ManageLineageMenu from '@app/lineageV2/LineageEntityNode/ManageLineageMenu'; +import NodeSkeleton from '@app/lineageV2/LineageEntityNode/NodeSkeleton'; +import SchemaFieldNodeContents from '@app/lineageV2/LineageEntityNode/SchemaFieldNodeContents'; +import useAvoidIntersections from '@app/lineageV2/LineageEntityNode/useAvoidIntersections'; +import { + DisplayedColumns, + LINEAGE_NODE_HEIGHT, + LINEAGE_NODE_WIDTH, +} from '@app/lineageV2/LineageEntityNode/useDisplayedColumns'; +import { FetchStatus, LineageEntity, getNodeColor, isGhostEntity, onClickPreventSelect } from '@app/lineageV2/common'; +import { NUM_COLUMNS_PER_PAGE } from '@app/lineageV2/constants'; +import { FetchedEntityV2 } from '@app/lineageV2/types'; +import HealthIcon from '@app/previewV2/HealthIcon'; +import getTypeIcon from '@app/sharedV2/icons/getTypeIcon'; +import MatchTextSizeWrapper from '@app/sharedV2/text/MatchTextSizeWrapper'; +import OverflowTitle from '@app/sharedV2/text/OverflowTitle'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { DeprecationIcon } from '@src/app/entityV2/shared/components/styled/DeprecationIcon'; +import StructuredPropertyBadge from '@src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge'; + +import { EntityType, LineageDirection } from '@types'; const NodeWrapper = styled.div<{ selected: boolean; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeSkeleton.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeSkeleton.tsx index 1846e1929a..a32ac72836 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeSkeleton.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeSkeleton.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Skeleton } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const Wrapper = styled.div` diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/SchemaFieldNodeContents.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/SchemaFieldNodeContents.tsx index f0b7339882..5a5b77a082 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/SchemaFieldNodeContents.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/SchemaFieldNodeContents.tsx @@ -1,25 +1,28 @@ import { LoadingOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; +import { Skeleton, Spin } from 'antd'; +import React from 'react'; +import { Link } from 'react-router-dom'; +import { Handle, Position } from 'reactflow'; +import styled from 'styled-components'; + import { ANTD_GRAY, LINEAGE_COLORS, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; -import { FetchStatus } from '@app/lineageV2/common'; import ContainerPath from '@app/lineageV2/LineageEntityNode/ContainerPath'; import { ContractLineageButton } from '@app/lineageV2/LineageEntityNode/ContractLineageButton'; import { ExpandLineageButton } from '@app/lineageV2/LineageEntityNode/ExpandLineageButton'; import { LoadingWrapper } from '@app/lineageV2/LineageEntityNode/NodeContents'; import NodeSkeleton from '@app/lineageV2/LineageEntityNode/NodeSkeleton'; +import { FetchStatus } from '@app/lineageV2/common'; +import { downgradeV2FieldPath, useGetLineageUrl } from '@app/lineageV2/lineageUtils'; import { FetchedEntityV2 } from '@app/lineageV2/types'; import { COLORS } from '@app/sharedV2/colors'; import getTypeIcon from '@app/sharedV2/icons/getTypeIcon'; import OverflowTitle from '@app/sharedV2/text/OverflowTitle'; import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + import { EntityType, LineageDirection } from '@types'; -import { Skeleton, Spin } from 'antd'; -import { Tooltip } from '@components'; -import React from 'react'; -import { Link } from 'react-router-dom'; -import { Handle, Position } from 'reactflow'; -import styled from 'styled-components'; + import LinkOut from '@images/link-out.svg?react'; -import { downgradeV2FieldPath, useGetLineageUrl } from '../lineageUtils'; export const SCHEMA_FIELD_NODE_HEIGHT = 80; export const SCHEMA_FIELD_NODE_WIDTH = 240; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/components.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/components.tsx index 6216520b99..1e6b91d2ad 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/components.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/components.tsx @@ -1,5 +1,6 @@ import styled from 'styled-components'; -import { ANTD_GRAY, LINEAGE_COLORS } from '../../entityV2/shared/constants'; + +import { ANTD_GRAY, LINEAGE_COLORS } from '@app/entityV2/shared/constants'; export const ExpandContractButton = styled.div<{ expandOnHover?: boolean }>` background-color: white; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/useAvoidIntersections.ts b/datahub-web-react/src/app/lineageV2/LineageEntityNode/useAvoidIntersections.ts index 91c06e5119..d5b46b224f 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/useAvoidIntersections.ts +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/useAvoidIntersections.ts @@ -1,8 +1,9 @@ import { ReactFlowInstance } from '@reactflow/core/dist/esm/types'; import { useContext, useEffect } from 'react'; import { Node, useReactFlow } from 'reactflow'; -import { isTransformational, LineageNode, LineageNodesContext } from '../common'; -import { LINEAGE_NODE_HEIGHT, LINEAGE_NODE_WIDTH } from './useDisplayedColumns'; + +import { LINEAGE_NODE_HEIGHT, LINEAGE_NODE_WIDTH } from '@app/lineageV2/LineageEntityNode/useDisplayedColumns'; +import { LineageNode, LineageNodesContext, isTransformational } from '@app/lineageV2/common'; export default function useAvoidIntersections(id: string, expandHeight: number) { const { getNode, getNodes, setNodes } = useReactFlow(); diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/useDisplayedColumns.ts b/datahub-web-react/src/app/lineageV2/LineageEntityNode/useDisplayedColumns.ts index 5548781066..55d3924608 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/useDisplayedColumns.ts +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/useDisplayedColumns.ts @@ -1,8 +1,10 @@ import { useContext, useMemo, useRef } from 'react'; + +import { FineGrainedLineage, LineageDisplayContext, createColumnRef } from '@app/lineageV2/common'; +import { NUM_COLUMNS_PER_PAGE } from '@app/lineageV2/constants'; +import { ColumnAsset, FetchedEntityV2, LineageAssetType } from '@app/lineageV2/types'; + import { SchemaFieldDataType } from '@types'; -import { createColumnRef, FineGrainedLineage, LineageDisplayContext } from '../common'; -import { NUM_COLUMNS_PER_PAGE } from '../constants'; -import { ColumnAsset, FetchedEntityV2, LineageAssetType } from '../types'; export const LINEAGE_NODE_WIDTH = 240; export const LINEAGE_NODE_HEIGHT = 80; diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/useOnClickExpandLineage.ts b/datahub-web-react/src/app/lineageV2/LineageEntityNode/useOnClickExpandLineage.ts index 3807f5116d..04db005651 100644 --- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/useOnClickExpandLineage.ts +++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/useOnClickExpandLineage.ts @@ -1,7 +1,9 @@ import { useContext } from 'react'; -import { EntityType, LineageDirection } from '../../../types.generated'; -import { FetchStatus, LineageNodesContext } from '../common'; -import useSearchAcrossLineage from '../useSearchAcrossLineage'; + +import { FetchStatus, LineageNodesContext } from '@app/lineageV2/common'; +import useSearchAcrossLineage from '@app/lineageV2/useSearchAcrossLineage'; + +import { EntityType, LineageDirection } from '@types'; export function useOnClickExpandLineage(urn: string, type: EntityType, direction: LineageDirection, maxDepth: boolean) { const context = useContext(LineageNodesContext); diff --git a/datahub-web-react/src/app/lineageV2/LineageExplorer.tsx b/datahub-web-react/src/app/lineageV2/LineageExplorer.tsx index a1c340d8e1..ad3e0e244d 100644 --- a/datahub-web-react/src/app/lineageV2/LineageExplorer.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageExplorer.tsx @@ -1,10 +1,8 @@ -import useShouldHideTransformations from '@app/lineageV2/useShouldHideTransformations'; -import useShouldShowDataProcessInstances from '@app/lineageV2/useShouldShowDataProcessInstances'; import React, { useContext, useEffect, useState } from 'react'; import { ReactFlowProvider } from 'reactflow'; -import { EntityType, LineageDirection } from '../../types.generated'; -import { useGetLineageTimeParams } from '../lineage/utils/useGetLineageTimeParams'; -import TabFullsizedContext from '../shared/TabFullsizedContext'; + +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; +import LineageDisplay from '@app/lineageV2/LineageDisplay'; import { EdgeId, FetchStatus, @@ -14,9 +12,13 @@ import { LineageNodesContext, NodeContext, useIgnoreSchemaFieldStatus, -} from './common'; -import LineageDisplay from './LineageDisplay'; -import useSearchAcrossLineage from './useSearchAcrossLineage'; +} from '@app/lineageV2/common'; +import useSearchAcrossLineage from '@app/lineageV2/useSearchAcrossLineage'; +import useShouldHideTransformations from '@app/lineageV2/useShouldHideTransformations'; +import useShouldShowDataProcessInstances from '@app/lineageV2/useShouldShowDataProcessInstances'; +import TabFullsizedContext from '@app/shared/TabFullsizedContext'; + +import { EntityType, LineageDirection } from '@types'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterNodeBasic.tsx b/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterNodeBasic.tsx index b8b72bf577..aa910dc030 100644 --- a/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterNodeBasic.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterNodeBasic.tsx @@ -1,17 +1,22 @@ -import { EntityType } from '@types'; import React, { useContext, useState } from 'react'; import { Handle, NodeProps, Position } from 'reactflow'; import styled from 'styled-components'; -import { LINEAGE_COLORS } from '../../entityV2/shared/constants'; -import { getFilterIconAndLabel } from '../../searchV2/filters/utils'; -import { ENTITY_SUB_TYPE_FILTER_NAME, PLATFORM_FILTER_NAME } from '../../searchV2/utils/constants'; -import { useEntityRegistryV2 } from '../../useEntityRegistry'; -import { LineageFilter, LineageNodesContext, useIgnoreSchemaFieldStatus } from '../common'; -import { useAvoidIntersectionsOften } from '../LineageEntityNode/useAvoidIntersections'; -import { LINEAGE_NODE_WIDTH } from '../LineageEntityNode/useDisplayedColumns'; -import { ShowMoreButton } from './ShowMoreButton'; -import useFetchFilterNodeContents, { PlatformAggregate, SubtypeAggregate } from './useFetchFilterNodeContents'; -import LineageFilterSearch from './LineageFilterSearch'; + +import { LINEAGE_COLORS } from '@app/entityV2/shared/constants'; +import { useAvoidIntersectionsOften } from '@app/lineageV2/LineageEntityNode/useAvoidIntersections'; +import { LINEAGE_NODE_WIDTH } from '@app/lineageV2/LineageEntityNode/useDisplayedColumns'; +import LineageFilterSearch from '@app/lineageV2/LineageFilterNode/LineageFilterSearch'; +import { ShowMoreButton } from '@app/lineageV2/LineageFilterNode/ShowMoreButton'; +import useFetchFilterNodeContents, { + PlatformAggregate, + SubtypeAggregate, +} from '@app/lineageV2/LineageFilterNode/useFetchFilterNodeContents'; +import { LineageFilter, LineageNodesContext, useIgnoreSchemaFieldStatus } from '@app/lineageV2/common'; +import { getFilterIconAndLabel } from '@app/searchV2/filters/utils'; +import { ENTITY_SUB_TYPE_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; export const LINEAGE_FILTER_NODE_NAME = 'lineage-filter'; @@ -91,7 +96,7 @@ export default function LineageFilterNode(props: NodeProps) { useAvoidIntersectionsOften(id, numMatches ? 133 : 117); const numerator = numShown ?? shown.size; - const denominator = showGhostEntities ? allChildren.size : total ?? allChildren.size; + const denominator = showGhostEntities ? allChildren.size : (total ?? allChildren.size); return ( @@ -112,16 +117,12 @@ export default function LineageFilterNode(props: NodeProps) { - {platforms?.map((agg, index) => ( - - ))} + {platforms?.map((agg, index) => )} {subtypes ?.filter(([filterValue]) => !filterValue.toLocaleLowerCase().endsWith('query')) - .map((agg, index) => ( - - ))} + .map((agg, index) => )} diff --git a/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterSearch.tsx b/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterSearch.tsx index ae61c50899..9c16492f2a 100644 --- a/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterSearch.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterSearch.tsx @@ -1,18 +1,20 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { DBT_URN } from '@app/ingest/source/builder/constants'; -import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; -import { LineageFilter, LineageNodesContext, useIgnoreSchemaFieldStatus } from '@app/lineageV2/common'; -import computeOrFilters from '@app/lineageV2/LineageFilterNode/computeOrFilters'; -import { DEGREE_FILTER_NAME } from '@app/search/utils/constants'; import { Input, Text } from '@components'; -import { useSearchAcrossLineageNamesQuery } from '@graphql/lineage.generated'; -import { EntityType } from '@types'; import { Spin } from 'antd'; import React, { useContext, useEffect, useState } from 'react'; import { usePrevious } from 'react-js-cron/dist/cjs/utils'; import { useDebounce } from 'react-use'; import styled from 'styled-components'; +import { DBT_URN } from '@app/ingest/source/builder/constants'; +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; +import computeOrFilters from '@app/lineageV2/LineageFilterNode/computeOrFilters'; +import { LineageFilter, LineageNodesContext, useIgnoreSchemaFieldStatus } from '@app/lineageV2/common'; +import { DEGREE_FILTER_NAME } from '@app/search/utils/constants'; + +import { useSearchAcrossLineageNamesQuery } from '@graphql/lineage.generated'; +import { EntityType } from '@types'; + const SearchLine = styled.div` display: flex; align-items: center; diff --git a/datahub-web-react/src/app/lineageV2/LineageFilterNode/ShowMoreButton.tsx b/datahub-web-react/src/app/lineageV2/LineageFilterNode/ShowMoreButton.tsx index e058e7e6b9..7807c78afc 100644 --- a/datahub-web-react/src/app/lineageV2/LineageFilterNode/ShowMoreButton.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageFilterNode/ShowMoreButton.tsx @@ -1,9 +1,10 @@ -import { applyOpacity } from '@app/sharedV2/colors/colorUtils'; +import KeyboardDoubleArrowDownIcon from '@mui/icons-material/KeyboardDoubleArrowDown'; import React, { useCallback, useContext, useMemo } from 'react'; import styled from 'styled-components'; -import KeyboardDoubleArrowDownIcon from '@mui/icons-material/KeyboardDoubleArrowDown'; -import { LineageFilter, LineageNodesContext, LINEAGE_FILTER_PAGINATION } from '../common'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../../entityV2/shared/constants'; + +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { LINEAGE_FILTER_PAGINATION, LineageFilter, LineageNodesContext } from '@app/lineageV2/common'; +import { applyOpacity } from '@app/sharedV2/colors/colorUtils'; const MAX_INCREASE = 100; const LINE_HEIGHT = '1.5em'; diff --git a/datahub-web-react/src/app/lineageV2/LineageFilterNode/computeOrFilters.ts b/datahub-web-react/src/app/lineageV2/LineageFilterNode/computeOrFilters.ts index 44b523efe4..ee3c766c03 100644 --- a/datahub-web-react/src/app/lineageV2/LineageFilterNode/computeOrFilters.ts +++ b/datahub-web-react/src/app/lineageV2/LineageFilterNode/computeOrFilters.ts @@ -1,5 +1,6 @@ import { DBT_URN } from '@app/ingest/source/builder/constants'; import { ENTITY_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants'; + import { AndFilterInput, EntityType, FacetFilterInput } from '@types'; /** diff --git a/datahub-web-react/src/app/lineageV2/LineageFilterNode/useFetchFilterNodeContents.ts b/datahub-web-react/src/app/lineageV2/LineageFilterNode/useFetchFilterNodeContents.ts index 75a2b024aa..c79d3247ca 100644 --- a/datahub-web-react/src/app/lineageV2/LineageFilterNode/useFetchFilterNodeContents.ts +++ b/datahub-web-react/src/app/lineageV2/LineageFilterNode/useFetchFilterNodeContents.ts @@ -1,13 +1,15 @@ +import { useContext } from 'react'; + import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; -import { LineageNodesContext } from '@app/lineageV2/common'; import computeOrFilters from '@app/lineageV2/LineageFilterNode/computeOrFilters'; +import { LineageNodesContext } from '@app/lineageV2/common'; import { DEFAULT_IGNORE_AS_HOPS, DEFAULT_SEARCH_FLAGS } from '@app/lineageV2/useSearchAcrossLineage'; import { DEGREE_FILTER_NAME } from '@app/search/utils/constants'; -import { useContext } from 'react'; -import { PlatformFieldsFragment } from '../../../graphql/fragments.generated'; -import { useAggregateAcrossLineageQuery } from '../../../graphql/search.generated'; -import { AggregationMetadata, LineageDirection } from '../../../types.generated'; -import { ENTITY_SUB_TYPE_FILTER_NAME, FILTER_DELIMITER, PLATFORM_FILTER_NAME } from '../../searchV2/utils/constants'; +import { ENTITY_SUB_TYPE_FILTER_NAME, FILTER_DELIMITER, PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants'; + +import { PlatformFieldsFragment } from '@graphql/fragments.generated'; +import { useAggregateAcrossLineageQuery } from '@graphql/search.generated'; +import { AggregationMetadata, LineageDirection } from '@types'; export type PlatformAggregate = readonly [string, number, PlatformFieldsFragment]; export type SubtypeAggregate = readonly [string, number]; diff --git a/datahub-web-react/src/app/lineageV2/LineageGraph.tsx b/datahub-web-react/src/app/lineageV2/LineageGraph.tsx index bc286fe28f..af2d3db76f 100644 --- a/datahub-web-react/src/app/lineageV2/LineageGraph.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageGraph.tsx @@ -1,8 +1,9 @@ +import React from 'react'; +import styled from 'styled-components/macro'; + import { useEntityData } from '@app/entity/shared/EntityContext'; import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils'; import LineageExplorerV2 from '@app/lineageV2/LineageExplorer'; -import React from 'react'; -import styled from 'styled-components/macro'; const LineageFullscreenWrapper = styled.div` background-color: white; diff --git a/datahub-web-react/src/app/lineageV2/LineageSidebar.tsx b/datahub-web-react/src/app/lineageV2/LineageSidebar.tsx index ecc7a8c215..074becb33c 100644 --- a/datahub-web-react/src/app/lineageV2/LineageSidebar.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageSidebar.tsx @@ -1,12 +1,13 @@ import React, { useCallback, useContext, useState } from 'react'; import { useOnSelectionChange, useStore } from 'reactflow'; import styled from 'styled-components/macro'; -import translateFieldPath from '../entityV2/dataset/profile/schema/utils/translateFieldPath'; -import EntitySidebarContext, { FineGrainedOperation } from '../sharedV2/EntitySidebarContext'; -import CompactContext from '../shared/CompactContext'; -import useSidebarWidth from '../sharedV2/sidebar/useSidebarWidth'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { LineageDisplayContext, LineageEntity, LineageNodesContext } from './common'; + +import translateFieldPath from '@app/entityV2/dataset/profile/schema/utils/translateFieldPath'; +import { LineageDisplayContext, LineageEntity, LineageNodesContext } from '@app/lineageV2/common'; +import CompactContext from '@app/shared/CompactContext'; +import EntitySidebarContext, { FineGrainedOperation } from '@app/sharedV2/EntitySidebarContext'; +import useSidebarWidth from '@app/sharedV2/sidebar/useSidebarWidth'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const SidebarWrapper = styled.div<{ $distanceFromTop: number }>` position: absolute; diff --git a/datahub-web-react/src/app/lineageV2/LineageTimeSelector.tsx b/datahub-web-react/src/app/lineageV2/LineageTimeSelector.tsx index 6ff7af1fad..616b993802 100644 --- a/datahub-web-react/src/app/lineageV2/LineageTimeSelector.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageTimeSelector.tsx @@ -1,10 +1,11 @@ +import { CalendarOutlined, CaretDownOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; +import { Button, DatePicker, Space, Typography } from 'antd'; +import moment from 'moment'; import React, { useCallback, useEffect, useRef, useState } from 'react'; import styled from 'styled-components'; -import moment from 'moment'; -import { DatePicker, Space, Button, Typography } from 'antd'; -import { Tooltip } from '@components'; -import { CalendarOutlined, CaretDownOutlined } from '@ant-design/icons'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; const { RangePicker } = DatePicker; diff --git a/datahub-web-react/src/app/lineageV2/LineageTransformationNode/LineageTransformationNode.tsx b/datahub-web-react/src/app/lineageV2/LineageTransformationNode/LineageTransformationNode.tsx index aef9ecf983..1dfe2c2a2a 100644 --- a/datahub-web-react/src/app/lineageV2/LineageTransformationNode/LineageTransformationNode.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageTransformationNode/LineageTransformationNode.tsx @@ -1,23 +1,25 @@ import { ConsoleSqlOutlined, HomeOutlined, LoadingOutlined } from '@ant-design/icons'; -import LineageVisualizationContext from '@app/lineageV2/LineageVisualizationContext'; -import { Skeleton, Spin } from 'antd'; import { Tooltip } from '@components'; -import { useEntityRegistryV2 } from '@app/useEntityRegistry'; +import { Skeleton, Spin } from 'antd'; import React, { useContext } from 'react'; import { Handle, NodeProps, Position } from 'reactflow'; import styled from 'styled-components'; -import { useGetQueryQuery } from '../../../graphql/query.generated'; -import { EntityType, LineageDirection } from '../../../types.generated'; -import { LINEAGE_COLORS, REDESIGN_COLORS } from '../../entityV2/shared/constants'; + +import { LINEAGE_COLORS, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { LoadingWrapper } from '@app/lineageV2/LineageEntityNode/NodeContents'; +import LineageVisualizationContext from '@app/lineageV2/LineageVisualizationContext'; import { FetchStatus, - isGhostEntity, LineageDisplayContext, LineageEntity, LineageNodesContext, + isGhostEntity, useIgnoreSchemaFieldStatus, -} from '../common'; -import { LoadingWrapper } from '../LineageEntityNode/NodeContents'; +} from '@app/lineageV2/common'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { useGetQueryQuery } from '@graphql/query.generated'; +import { EntityType, LineageDirection } from '@types'; export const LINEAGE_TRANSFORMATION_NODE_NAME = 'lineage-transformation'; export const TRANSFORMATION_NODE_SIZE = 30; diff --git a/datahub-web-react/src/app/lineageV2/LineageVisualization.tsx b/datahub-web-react/src/app/lineageV2/LineageVisualization.tsx index dfb58def3d..fb8269e2cc 100644 --- a/datahub-web-react/src/app/lineageV2/LineageVisualization.tsx +++ b/datahub-web-react/src/app/lineageV2/LineageVisualization.tsx @@ -1,21 +1,23 @@ -import SearchControl from '@app/lineageV2/controls/SearchControl'; -import TentativeEdge, { TENTATIVE_EDGE_NAME } from '@app/lineageV2/LineageEdge/TentativeEdge'; import React, { useContext, useEffect, useState } from 'react'; import ReactFlow, { Background, BackgroundVariant, Edge, EdgeTypes, MiniMap, NodeTypes, useReactFlow } from 'reactflow'; +import 'reactflow/dist/style.css'; import styled from 'styled-components'; -import 'reactflow/dist/style.css'; -import { LineageDisplayContext, TRANSITION_DURATION_MS } from './common'; -import { LINEAGE_TABLE_EDGE_NAME, LineageTableEdge } from './LineageEdge/LineageTableEdge'; -import LineageEntityNode, { LINEAGE_ENTITY_NODE_NAME } from './LineageEntityNode/LineageEntityNode'; -import LineageFilterNodeBasic, { LINEAGE_FILTER_NODE_NAME } from './LineageFilterNode/LineageFilterNodeBasic'; +import { LINEAGE_TABLE_EDGE_NAME, LineageTableEdge } from '@app/lineageV2/LineageEdge/LineageTableEdge'; +import TentativeEdge, { TENTATIVE_EDGE_NAME } from '@app/lineageV2/LineageEdge/TentativeEdge'; +import LineageEntityNode, { LINEAGE_ENTITY_NODE_NAME } from '@app/lineageV2/LineageEntityNode/LineageEntityNode'; +import LineageFilterNodeBasic, { + LINEAGE_FILTER_NODE_NAME, +} from '@app/lineageV2/LineageFilterNode/LineageFilterNodeBasic'; import LineageTransformationNode, { LINEAGE_TRANSFORMATION_NODE_NAME, -} from './LineageTransformationNode/LineageTransformationNode'; -import { LineageVisualizationNode } from './NodeBuilder'; -import LineageControls from './controls/LineageControls'; -import ZoomControls from './controls/ZoomControls'; -import LineageVisualizationContext from './LineageVisualizationContext'; +} from '@app/lineageV2/LineageTransformationNode/LineageTransformationNode'; +import LineageVisualizationContext from '@app/lineageV2/LineageVisualizationContext'; +import { LineageVisualizationNode } from '@app/lineageV2/NodeBuilder'; +import { LineageDisplayContext, TRANSITION_DURATION_MS } from '@app/lineageV2/common'; +import LineageControls from '@app/lineageV2/controls/LineageControls'; +import SearchControl from '@app/lineageV2/controls/SearchControl'; +import ZoomControls from '@app/lineageV2/controls/ZoomControls'; const StyledReactFlow = styled(ReactFlow)<{ $edgesOnTop: boolean }>` .react-flow__node-lineage-entity:not(.dragging) { diff --git a/datahub-web-react/src/app/lineageV2/NodeBuilder.ts b/datahub-web-react/src/app/lineageV2/NodeBuilder.ts index 07eacabc97..9bebd9de84 100644 --- a/datahub-web-react/src/app/lineageV2/NodeBuilder.ts +++ b/datahub-web-react/src/app/lineageV2/NodeBuilder.ts @@ -1,34 +1,36 @@ +import { EdgeMarker } from '@reactflow/core/dist/esm/types/edges'; +import { Edge, MarkerType, Node } from 'reactflow'; + +import { LINEAGE_TABLE_EDGE_NAME } from '@app/lineageV2/LineageEdge/LineageTableEdge'; +import { LINEAGE_ENTITY_NODE_NAME } from '@app/lineageV2/LineageEntityNode/LineageEntityNode'; import { SCHEMA_FIELD_NODE_HEIGHT, SCHEMA_FIELD_NODE_WIDTH, } from '@app/lineageV2/LineageEntityNode/SchemaFieldNodeContents'; -import { EdgeMarker } from '@reactflow/core/dist/esm/types/edges'; -import { Edge, MarkerType, Node } from 'reactflow'; -import { EntityType, LineageDirection } from '../../types.generated'; +import { LINEAGE_NODE_HEIGHT, LINEAGE_NODE_WIDTH } from '@app/lineageV2/LineageEntityNode/useDisplayedColumns'; +import { LINEAGE_FILTER_NODE_NAME } from '@app/lineageV2/LineageFilterNode/LineageFilterNodeBasic'; +import { + LINEAGE_TRANSFORMATION_NODE_NAME, + TRANSFORMATION_NODE_SIZE, +} from '@app/lineageV2/LineageTransformationNode/LineageTransformationNode'; import { - createEdgeId, EdgeId, - getEdgeId, - getParents, - isGhostEntity, - isTransformational, LINEAGE_FILTER_TYPE, LineageEntity, LineageFilter, LineageNode, LineageTableEdgeData, NodeContext, + createEdgeId, + getEdgeId, + getParents, + isGhostEntity, + isTransformational, parseEdgeId, setDefault, -} from './common'; -import { LINEAGE_TABLE_EDGE_NAME } from './LineageEdge/LineageTableEdge'; -import { LINEAGE_ENTITY_NODE_NAME } from './LineageEntityNode/LineageEntityNode'; -import { LINEAGE_NODE_HEIGHT, LINEAGE_NODE_WIDTH } from './LineageEntityNode/useDisplayedColumns'; -import { LINEAGE_FILTER_NODE_NAME } from './LineageFilterNode/LineageFilterNodeBasic'; -import { - LINEAGE_TRANSFORMATION_NODE_NAME, - TRANSFORMATION_NODE_SIZE, -} from './LineageTransformationNode/LineageTransformationNode'; +} from '@app/lineageV2/common'; + +import { EntityType, LineageDirection } from '@types'; const MAIN_X_SEP_RATIO = 0.75; const MAIN_TO_MINI_X_SEP_RATIO = 0.375; diff --git a/datahub-web-react/src/app/lineageV2/common.ts b/datahub-web-react/src/app/lineageV2/common.ts index 65ae9736f2..ad13177d49 100644 --- a/datahub-web-react/src/app/lineageV2/common.ts +++ b/datahub-web-react/src/app/lineageV2/common.ts @@ -1,15 +1,17 @@ -import { GenericEntityProperties } from '@app/entity/shared/types'; -import { LINEAGE_COLORS } from '@app/entityV2/shared/constants'; -import { useAppConfig } from '@app/useAppConfig'; import { Maybe } from 'graphql/jsutils/Maybe'; import React, { Dispatch, SetStateAction } from 'react'; -import { Entity, EntityType, LineageDirection, SchemaFieldRef } from '../../types.generated'; -import EntityRegistry from '../entityV2/EntityRegistry'; -import { DBT_CLOUD_URN } from '../ingest/source/builder/constants'; -import { hashString } from '../shared/avatar/getAvatarColor'; -import { FineGrainedOperation } from '../sharedV2/EntitySidebarContext'; -import { getEntityTypeFromEntityUrn, getPlatformUrnFromEntityUrn } from './lineageUtils'; -import { FetchedEntityV2 } from './types'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import EntityRegistry from '@app/entityV2/EntityRegistry'; +import { LINEAGE_COLORS } from '@app/entityV2/shared/constants'; +import { DBT_CLOUD_URN } from '@app/ingest/source/builder/constants'; +import { getEntityTypeFromEntityUrn, getPlatformUrnFromEntityUrn } from '@app/lineageV2/lineageUtils'; +import { FetchedEntityV2 } from '@app/lineageV2/types'; +import { hashString } from '@app/shared/avatar/getAvatarColor'; +import { FineGrainedOperation } from '@app/sharedV2/EntitySidebarContext'; +import { useAppConfig } from '@app/useAppConfig'; + +import { Entity, EntityType, LineageDirection, SchemaFieldRef } from '@types'; export const TRANSITION_DURATION_MS = 200; export const LINEAGE_FILTER_PAGINATION = 4; diff --git a/datahub-web-react/src/app/lineageV2/controls/DownloadLineageScreenshotButton.tsx b/datahub-web-react/src/app/lineageV2/controls/DownloadLineageScreenshotButton.tsx index 950226b6f0..12a2a1e9a2 100644 --- a/datahub-web-react/src/app/lineageV2/controls/DownloadLineageScreenshotButton.tsx +++ b/datahub-web-react/src/app/lineageV2/controls/DownloadLineageScreenshotButton.tsx @@ -1,8 +1,9 @@ -import React from 'react'; -import { getRectOfNodes, getTransformForBounds, useReactFlow } from 'reactflow'; import { CameraOutlined } from '@ant-design/icons'; import { toPng } from 'html-to-image'; -import { StyledPanelButton } from './StyledPanelButton'; +import React from 'react'; +import { getRectOfNodes, getTransformForBounds, useReactFlow } from 'reactflow'; + +import { StyledPanelButton } from '@app/lineageV2/controls/StyledPanelButton'; type Props = { showExpandedText: boolean; diff --git a/datahub-web-react/src/app/lineageV2/controls/LineageControls.tsx b/datahub-web-react/src/app/lineageV2/controls/LineageControls.tsx index 7bb34af634..1519cd57fa 100644 --- a/datahub-web-react/src/app/lineageV2/controls/LineageControls.tsx +++ b/datahub-web-react/src/app/lineageV2/controls/LineageControls.tsx @@ -1,8 +1,3 @@ -import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; -import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; -import React, { useContext, useEffect, useState } from 'react'; -import { Panel, useReactFlow } from 'reactflow'; -import styled from 'styled-components'; import { ArrowsAltOutlined, CalendarOutlined, @@ -12,14 +7,19 @@ import { VerticalLeftOutlined, } from '@ant-design/icons'; import { Button, Divider } from 'antd'; -import { LineageNodesContext, TRANSITION_DURATION_MS } from '../common'; +import React, { useContext, useEffect, useState } from 'react'; +import { Panel, useReactFlow } from 'reactflow'; +import styled from 'styled-components'; -import LineageSearchFilters from './LineageSearchFilters'; -import { StyledPanelButton } from './StyledPanelButton'; -import DownloadLineageScreenshotButton from './DownloadLineageScreenshotButton'; -import LineageTimeRangeControls from './LineageTimeRangeControls'; -import TabFullsizedContext from '../../shared/TabFullsizedContext'; -import { ControlPanel } from './common'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; +import { LineageNodesContext, TRANSITION_DURATION_MS } from '@app/lineageV2/common'; +import DownloadLineageScreenshotButton from '@app/lineageV2/controls/DownloadLineageScreenshotButton'; +import LineageSearchFilters from '@app/lineageV2/controls/LineageSearchFilters'; +import LineageTimeRangeControls from '@app/lineageV2/controls/LineageTimeRangeControls'; +import { StyledPanelButton } from '@app/lineageV2/controls/StyledPanelButton'; +import { ControlPanel } from '@app/lineageV2/controls/common'; +import TabFullsizedContext from '@app/shared/TabFullsizedContext'; const StyledPanel = styled(Panel)` margin-top: 80px; diff --git a/datahub-web-react/src/app/lineageV2/controls/LineageSearchFilters.tsx b/datahub-web-react/src/app/lineageV2/controls/LineageSearchFilters.tsx index 6a8d4cf13f..b5205133d2 100644 --- a/datahub-web-react/src/app/lineageV2/controls/LineageSearchFilters.tsx +++ b/datahub-web-react/src/app/lineageV2/controls/LineageSearchFilters.tsx @@ -1,12 +1,13 @@ -import { ANTD_GRAY } from '@app/entityV2/shared/constants'; -import { isTransformational, LineageNodesContext } from '@app/lineageV2/common'; -import { ControlPanel, ControlPanelSubtext, ControlPanelTitle } from '@app/lineageV2/controls/common'; -import InfoPopover from '@app/sharedV2/icons/InfoPopover'; -import { Switch } from 'antd'; import { Tooltip } from '@components'; +import { Switch } from 'antd'; import React, { useContext, useMemo } from 'react'; import styled from 'styled-components'; +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { LineageNodesContext, isTransformational } from '@app/lineageV2/common'; +import { ControlPanel, ControlPanelSubtext, ControlPanelTitle } from '@app/lineageV2/controls/common'; +import InfoPopover from '@app/sharedV2/icons/InfoPopover'; + const ToggleWrapper = styled.div` display: flex; flex-direction: row; diff --git a/datahub-web-react/src/app/lineageV2/controls/LineageTimeRangeControls.tsx b/datahub-web-react/src/app/lineageV2/controls/LineageTimeRangeControls.tsx index 81a0932a09..2983a859d1 100644 --- a/datahub-web-react/src/app/lineageV2/controls/LineageTimeRangeControls.tsx +++ b/datahub-web-react/src/app/lineageV2/controls/LineageTimeRangeControls.tsx @@ -1,6 +1,7 @@ -import { ControlPanel, ControlPanelSubtext, ControlPanelTitle } from '@app/lineageV2/controls/common'; import React from 'react'; -import LineageTabTimeSelector from '../../entityV2/shared/tabs/Lineage/LineageTabTimeSelector'; + +import LineageTabTimeSelector from '@app/entityV2/shared/tabs/Lineage/LineageTabTimeSelector'; +import { ControlPanel, ControlPanelSubtext, ControlPanelTitle } from '@app/lineageV2/controls/common'; const LineageTimeRangeControls = () => { return ( diff --git a/datahub-web-react/src/app/lineageV2/controls/SearchControl.tsx b/datahub-web-react/src/app/lineageV2/controls/SearchControl.tsx index 3af11d043e..dfddf05959 100644 --- a/datahub-web-react/src/app/lineageV2/controls/SearchControl.tsx +++ b/datahub-web-react/src/app/lineageV2/controls/SearchControl.tsx @@ -1,7 +1,4 @@ import { SearchOutlined } from '@ant-design/icons'; -import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; -import { LineageDisplayContext, LineageNodesContext } from '@app/lineageV2/common'; -import LineageVisualizationContext from '@app/lineageV2/LineageVisualizationContext'; import { Button } from '@components'; import { Input, InputRef } from 'antd'; import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react'; @@ -9,6 +6,10 @@ import { useDebounce } from 'react-use'; import { Panel } from 'reactflow'; import styled from 'styled-components'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import LineageVisualizationContext from '@app/lineageV2/LineageVisualizationContext'; +import { LineageDisplayContext, LineageNodesContext } from '@app/lineageV2/common'; + const StyledPanel = styled(Panel)` margin-top: 20px; `; diff --git a/datahub-web-react/src/app/lineageV2/controls/StyledPanelButton.tsx b/datahub-web-react/src/app/lineageV2/controls/StyledPanelButton.tsx index b5ebfa8dcd..b8d7200b1a 100644 --- a/datahub-web-react/src/app/lineageV2/controls/StyledPanelButton.tsx +++ b/datahub-web-react/src/app/lineageV2/controls/StyledPanelButton.tsx @@ -1,5 +1,5 @@ -import styled from 'styled-components'; import { Button } from 'antd'; +import styled from 'styled-components'; export const StyledPanelButton = styled(Button)` margin: 2px 0; diff --git a/datahub-web-react/src/app/lineageV2/controls/ZoomControls.tsx b/datahub-web-react/src/app/lineageV2/controls/ZoomControls.tsx index 0b8b10e7dd..04d210d494 100644 --- a/datahub-web-react/src/app/lineageV2/controls/ZoomControls.tsx +++ b/datahub-web-react/src/app/lineageV2/controls/ZoomControls.tsx @@ -3,7 +3,8 @@ import { Button } from 'antd'; import React from 'react'; import { Panel, useReactFlow } from 'reactflow'; import styled from 'styled-components'; -import { TRANSITION_DURATION_MS } from '../common'; + +import { TRANSITION_DURATION_MS } from '@app/lineageV2/common'; const StyledZoomButton = styled(Button)` border-radius: 8px; diff --git a/datahub-web-react/src/app/lineageV2/controls/common.tsx b/datahub-web-react/src/app/lineageV2/controls/common.tsx index b035af935c..d02bbfefc9 100644 --- a/datahub-web-react/src/app/lineageV2/controls/common.tsx +++ b/datahub-web-react/src/app/lineageV2/controls/common.tsx @@ -1,6 +1,7 @@ -import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; import styled from 'styled-components'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; + export const ControlPanel = styled.div` display: flex; flex-direction: column; diff --git a/datahub-web-react/src/app/lineageV2/lineageUtils.ts b/datahub-web-react/src/app/lineageV2/lineageUtils.ts index 9ea2d67efe..e16061e329 100644 --- a/datahub-web-react/src/app/lineageV2/lineageUtils.ts +++ b/datahub-web-react/src/app/lineageV2/lineageUtils.ts @@ -1,9 +1,11 @@ -import { useEntityRegistry } from '@app/useEntityRegistry'; import { useLocation } from 'react-router-dom'; -import { EntityType, SchemaField } from '../../types.generated'; -import { KEY_SCHEMA_PREFIX, VERSION_PREFIX } from '../entity/dataset/profile/schema/utils/constants'; -import EntityRegistry from '../entityV2/EntityRegistry'; -import { getFieldPathFromSchemaFieldUrn } from '../entityV2/schemaField/utils'; + +import { KEY_SCHEMA_PREFIX, VERSION_PREFIX } from '@app/entity/dataset/profile/schema/utils/constants'; +import EntityRegistry from '@app/entityV2/EntityRegistry'; +import { getFieldPathFromSchemaFieldUrn } from '@app/entityV2/schemaField/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, SchemaField } from '@types'; export function downgradeV2FieldPath(fieldPath: string): string; export function downgradeV2FieldPath(fieldPath?: string | null) { diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/EntityEdge.tsx b/datahub-web-react/src/app/lineageV2/manualLineage/EntityEdge.tsx index b6e291fc9d..8079e3bb2a 100644 --- a/datahub-web-react/src/app/lineageV2/manualLineage/EntityEdge.tsx +++ b/datahub-web-react/src/app/lineageV2/manualLineage/EntityEdge.tsx @@ -1,11 +1,13 @@ -import { Icon } from '@src/alchemy-components'; import Text from 'antd/lib/typography/Text'; import React from 'react'; import styled from 'styled-components/macro'; -import { CorpUser, Entity } from '../../../types.generated'; -import { ANTD_GRAY, DEFAULT_SYSTEM_ACTOR_URNS } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import UserAvatar from './UserAvatar'; + +import { ANTD_GRAY, DEFAULT_SYSTEM_ACTOR_URNS } from '@app/entity/shared/constants'; +import UserAvatar from '@app/lineageV2/manualLineage/UserAvatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { Icon } from '@src/alchemy-components'; + +import { CorpUser, Entity } from '@types'; const EntityItem = styled.div` border-bottom: 1px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/LineageEdges.tsx b/datahub-web-react/src/app/lineageV2/manualLineage/LineageEdges.tsx index 25927e3961..f1b9212f5e 100644 --- a/datahub-web-react/src/app/lineageV2/manualLineage/LineageEdges.tsx +++ b/datahub-web-react/src/app/lineageV2/manualLineage/LineageEdges.tsx @@ -1,10 +1,12 @@ import { Empty } from 'antd'; import React, { useContext, useMemo } from 'react'; import styled from 'styled-components/macro'; -import { CorpUser, Entity, LineageDirection } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { getEdgeId, LineageNodesContext, setDifference } from '../common'; -import EntityEdge from './EntityEdge'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { LineageNodesContext, getEdgeId, setDifference } from '@app/lineageV2/common'; +import EntityEdge from '@app/lineageV2/manualLineage/EntityEdge'; + +import { CorpUser, Entity, LineageDirection } from '@types'; const LineageEdgesWrapper = styled.div` padding: 0 20px 10px 20px; diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/ManageLineageModal.tsx b/datahub-web-react/src/app/lineageV2/manualLineage/ManageLineageModal.tsx index dc27d7fe78..f13f4a26eb 100644 --- a/datahub-web-react/src/app/lineageV2/manualLineage/ManageLineageModal.tsx +++ b/datahub-web-react/src/app/lineageV2/manualLineage/ManageLineageModal.tsx @@ -1,23 +1,25 @@ -import { colors, Modal } from '@src/alchemy-components'; +import { Modal as AntModal, message } from 'antd'; +import React, { useContext, useEffect, useState } from 'react'; +import styled from 'styled-components/macro'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useOnClickExpandLineage } from '@app/lineageV2/LineageEntityNode/useOnClickExpandLineage'; +import { FetchStatus, LineageEntity, LineageNodesContext } from '@app/lineageV2/common'; +import LineageEdges from '@app/lineageV2/manualLineage/LineageEdges'; +import { buildUpdateLineagePayload } from '@app/lineageV2/manualLineage/buildUpdateLineagePayload'; +import { recordAnalyticsEvents } from '@app/lineageV2/manualLineage/recordManualLineageAnalyticsEvent'; +import updateNodeContext from '@app/lineageV2/manualLineage/updateNodeContext'; +import { getValidEntityTypes } from '@app/lineageV2/manualLineage/utils'; +import { useEntityRegistryV2 as useEntityRegistry } from '@app/useEntityRegistry'; +import { Modal, colors } from '@src/alchemy-components'; import { EntityAndType } from '@src/app/entity/shared/types'; import { extractTypeFromUrn } from '@src/app/entity/shared/utils'; import { SearchSelect } from '@src/app/entityV2/shared/components/styled/search/SearchSelect'; import ClickOutside from '@src/app/shared/ClickOutside'; -import { Modal as AntModal, message } from 'antd'; -import React, { useContext, useEffect, useState } from 'react'; -import styled from 'styled-components/macro'; -import { toTitleCase } from '../../../graphql-mock/helper'; -import { useUpdateLineageMutation } from '../../../graphql/mutations.generated'; -import { Entity, EntityType, LineageDirection } from '../../../types.generated'; -import { useUserContext } from '../../context/useUserContext'; -import { useEntityRegistryV2 as useEntityRegistry } from '../../useEntityRegistry'; -import { useOnClickExpandLineage } from '../LineageEntityNode/useOnClickExpandLineage'; -import { FetchStatus, LineageEntity, LineageNodesContext } from '../common'; -import LineageEdges from './LineageEdges'; -import { buildUpdateLineagePayload } from './buildUpdateLineagePayload'; -import { recordAnalyticsEvents } from './recordManualLineageAnalyticsEvent'; -import updateNodeContext from './updateNodeContext'; -import { getValidEntityTypes } from './utils'; + +import { toTitleCase } from '@graphql-mock/helper'; +import { useUpdateLineageMutation } from '@graphql/mutations.generated'; +import { Entity, EntityType, LineageDirection } from '@types'; const MODAL_WIDTH_PX = 1400; @@ -94,7 +96,7 @@ export default function ManageLineageModal({ node, direction, closeModal, refetc const entitiesToAdd = selectedEntities.filter((entity) => !initialSetOfRelationshipsUrns.has(entity.urn)); const entitiesToRemove = Array.from(initialSetOfRelationshipsUrns) .filter((urn) => !selectedEntities.map((entity) => entity.urn).includes(urn)) - .map((urn) => ({ urn } as Entity)); + .map((urn) => ({ urn }) as Entity); // save lineage changes will disable the button while its processing function saveLineageChanges() { diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/UserAvatar.tsx b/datahub-web-react/src/app/lineageV2/manualLineage/UserAvatar.tsx index 9846024c9f..5558bf3ab7 100644 --- a/datahub-web-react/src/app/lineageV2/manualLineage/UserAvatar.tsx +++ b/datahub-web-react/src/app/lineageV2/manualLineage/UserAvatar.tsx @@ -2,10 +2,12 @@ import { PartitionOutlined } from '@ant-design/icons'; import { Avatar, Popover } from '@components'; import React from 'react'; import styled from 'styled-components/macro'; -import { CorpUser, EntityType } from '../../../types.generated'; -import getAvatarColor from '../../shared/avatar/getAvatarColor'; -import { toLocalDateTimeString } from '../../shared/time/timeUtils'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import getAvatarColor from '@app/shared/avatar/getAvatarColor'; +import { toLocalDateTimeString } from '@app/shared/time/timeUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, EntityType } from '@types'; const StyledAvatar = styled(Avatar)<{ $backgroundColor: string }>` color: #fff; diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/__tests__/ManageLineageModal.test.tsx b/datahub-web-react/src/app/lineageV2/manualLineage/__tests__/ManageLineageModal.test.tsx index 5e77b96fbe..3e208b2521 100644 --- a/datahub-web-react/src/app/lineageV2/manualLineage/__tests__/ManageLineageModal.test.tsx +++ b/datahub-web-react/src/app/lineageV2/manualLineage/__tests__/ManageLineageModal.test.tsx @@ -1,10 +1,12 @@ import { MockedProvider } from '@apollo/client/testing'; import { fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { EntityType, LineageDirection } from '../../../../types.generated'; -import TestPageContainer from '../../../../utils/test-utils/TestPageContainer'; -import { FetchStatus, LineageNodesContext } from '../../common'; -import ManageLineageModal from '../ManageLineageModal'; + +import { FetchStatus, LineageNodesContext } from '@app/lineageV2/common'; +import ManageLineageModal from '@app/lineageV2/manualLineage/ManageLineageModal'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { EntityType, LineageDirection } from '@types'; // Mock the SearchSelect component to avoid rendering it vi.mock('../../../entityV2/shared/components/styled/search/SearchSelect', () => ({ diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/_test_/utils.test.ts b/datahub-web-react/src/app/lineageV2/manualLineage/_test_/utils.test.ts index 21b0a876d0..0c679922f0 100644 --- a/datahub-web-react/src/app/lineageV2/manualLineage/_test_/utils.test.ts +++ b/datahub-web-react/src/app/lineageV2/manualLineage/_test_/utils.test.ts @@ -1,5 +1,6 @@ -import { EntityType, LineageDirection } from '../../../../types.generated'; -import { getValidEntityTypes } from '../utils'; +import { getValidEntityTypes } from '@app/lineageV2/manualLineage/utils'; + +import { EntityType, LineageDirection } from '@types'; describe('getValidEntityTypes', () => { describe('For Downstream', () => { diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/buildUpdateLineagePayload.ts b/datahub-web-react/src/app/lineageV2/manualLineage/buildUpdateLineagePayload.ts index c892c18540..3dfb054ad2 100644 --- a/datahub-web-react/src/app/lineageV2/manualLineage/buildUpdateLineagePayload.ts +++ b/datahub-web-react/src/app/lineageV2/manualLineage/buildUpdateLineagePayload.ts @@ -1,4 +1,4 @@ -import { Entity, LineageDirection, LineageEdge } from '../../../types.generated'; +import { Entity, LineageDirection, LineageEdge } from '@types'; export function buildUpdateLineagePayload( lineageDirection: LineageDirection, diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/recordManualLineageAnalyticsEvent.ts b/datahub-web-react/src/app/lineageV2/manualLineage/recordManualLineageAnalyticsEvent.ts index 44b3a325f7..62a1be63d3 100644 --- a/datahub-web-react/src/app/lineageV2/manualLineage/recordManualLineageAnalyticsEvent.ts +++ b/datahub-web-react/src/app/lineageV2/manualLineage/recordManualLineageAnalyticsEvent.ts @@ -1,8 +1,9 @@ -import { Entity, EntityType, LineageDirection } from '../../../types.generated'; -import { EventType } from '../../analytics'; -import analytics from '../../analytics/analytics'; -import EntityRegistry from '../../entity/EntityRegistry'; -import { Direction } from '../../lineage/types'; +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { Direction } from '@app/lineage/types'; + +import { Entity, EntityType, LineageDirection } from '@types'; interface AnalyticsEventsProps { direction: LineageDirection; diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/updateNodeContext.ts b/datahub-web-react/src/app/lineageV2/manualLineage/updateNodeContext.ts index ee2f47eee2..d14bfdb3ef 100644 --- a/datahub-web-react/src/app/lineageV2/manualLineage/updateNodeContext.ts +++ b/datahub-web-react/src/app/lineageV2/manualLineage/updateNodeContext.ts @@ -1,14 +1,15 @@ -import { CorpUser, Entity, LineageDirection } from '../../../types.generated'; import { - addToAdjacencyList, FetchStatus, + NodeContext, + addToAdjacencyList, getEdgeId, isTransformational, - NodeContext, removeFromAdjacencyList, setDefault, -} from '../common'; -import { entityNodeDefault } from '../useSearchAcrossLineage'; +} from '@app/lineageV2/common'; +import { entityNodeDefault } from '@app/lineageV2/useSearchAcrossLineage'; + +import { CorpUser, Entity, LineageDirection } from '@types'; export default function updateNodeContext( urn: string, diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/utils.ts b/datahub-web-react/src/app/lineageV2/manualLineage/utils.ts index 798df10172..0de385e488 100644 --- a/datahub-web-react/src/app/lineageV2/manualLineage/utils.ts +++ b/datahub-web-react/src/app/lineageV2/manualLineage/utils.ts @@ -1,4 +1,4 @@ -import { EntityType, LineageDirection } from '../../../types.generated'; +import { EntityType, LineageDirection } from '@types'; export function getValidEntityTypes(lineageDirection: LineageDirection, entityType?: EntityType) { if (lineageDirection === LineageDirection.Upstream) { diff --git a/datahub-web-react/src/app/lineageV2/pruneAllDuplicateEdges.ts b/datahub-web-react/src/app/lineageV2/pruneAllDuplicateEdges.ts index 9873b5906a..771d755c90 100644 --- a/datahub-web-react/src/app/lineageV2/pruneAllDuplicateEdges.ts +++ b/datahub-web-react/src/app/lineageV2/pruneAllDuplicateEdges.ts @@ -1,11 +1,12 @@ import EntityRegistry from '@app/entityV2/EntityRegistry'; import { + NodeContext, createEdgeId, getEdgeId, isUrnDataProcessInstance, isUrnTransformational, - NodeContext, } from '@app/lineageV2/common'; + import { LineageDirection } from '@types'; enum HideOption { diff --git a/datahub-web-react/src/app/lineageV2/types.ts b/datahub-web-react/src/app/lineageV2/types.ts index 71a270d353..ddfa017fc7 100644 --- a/datahub-web-react/src/app/lineageV2/types.ts +++ b/datahub-web-react/src/app/lineageV2/types.ts @@ -1,4 +1,5 @@ import { GenericEntityProperties } from '@app/entity/shared/types'; + import { DataPlatform, Deprecation, diff --git a/datahub-web-react/src/app/lineageV2/useAvoidIntersections.ts b/datahub-web-react/src/app/lineageV2/useAvoidIntersections.ts index 332c9191a3..db4e4ad21c 100644 --- a/datahub-web-react/src/app/lineageV2/useAvoidIntersections.ts +++ b/datahub-web-react/src/app/lineageV2/useAvoidIntersections.ts @@ -1,7 +1,8 @@ import { useCallback, useEffect, useState } from 'react'; import { Node, useReactFlow } from 'reactflow'; -import { NodeBase } from './common'; -import { LINEAGE_NODE_WIDTH } from './LineageEntityNode/useDisplayedColumns'; + +import { LINEAGE_NODE_WIDTH } from '@app/lineageV2/LineageEntityNode/useDisplayedColumns'; +import { NodeBase } from '@app/lineageV2/common'; interface ReturnType { onNodeHeightChange: (id: string, height: number) => void; diff --git a/datahub-web-react/src/app/lineageV2/useBulkEntityLineage.ts b/datahub-web-react/src/app/lineageV2/useBulkEntityLineage.ts index 54769a0a12..fdde204f4d 100644 --- a/datahub-web-react/src/app/lineageV2/useBulkEntityLineage.ts +++ b/datahub-web-react/src/app/lineageV2/useBulkEntityLineage.ts @@ -1,25 +1,27 @@ -import pruneAllDuplicateEdges from '@app/lineageV2/pruneAllDuplicateEdges'; -import { useAppConfig } from '@app/useAppConfig'; import { useCallback, useContext, useEffect, useState } from 'react'; -import { useGetBulkEntityLineageV2Query } from '../../graphql/lineage.generated'; -import { EntityType, LineageDirection } from '../../types.generated'; -import { useGetLineageTimeParams } from '../lineage/utils/useGetLineageTimeParams'; -import usePrevious from '../shared/usePrevious'; -import { useEntityRegistryV2 } from '../useEntityRegistry'; + +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; import { - addToAdjacencyList, FetchStatus, - getEdgeId, - isQuery, - isTransformational, LineageEdge, LineageEntity, LineageNodesContext, NodeContext, + addToAdjacencyList, + getEdgeId, + isQuery, + isTransformational, useIgnoreSchemaFieldStatus, -} from './common'; -import { FetchedEntityV2Relationship } from './types'; -import { addQueryNodes, setEntityNodeDefault } from './useSearchAcrossLineage'; +} from '@app/lineageV2/common'; +import pruneAllDuplicateEdges from '@app/lineageV2/pruneAllDuplicateEdges'; +import { FetchedEntityV2Relationship } from '@app/lineageV2/types'; +import { addQueryNodes, setEntityNodeDefault } from '@app/lineageV2/useSearchAcrossLineage'; +import usePrevious from '@app/shared/usePrevious'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { useGetBulkEntityLineageV2Query } from '@graphql/lineage.generated'; +import { EntityType, LineageDirection } from '@types'; const BATCH_SIZE = 10; diff --git a/datahub-web-react/src/app/lineageV2/useColumnHighlighting.ts b/datahub-web-react/src/app/lineageV2/useColumnHighlighting.ts index 82de533034..f5dc446fbc 100644 --- a/datahub-web-react/src/app/lineageV2/useColumnHighlighting.ts +++ b/datahub-web-react/src/app/lineageV2/useColumnHighlighting.ts @@ -1,26 +1,28 @@ -import EntityRegistry from '@app/entityV2/EntityRegistry'; -import { TENTATIVE_EDGE_NAME } from '@app/lineageV2/LineageEdge/TentativeEdge'; import { useContext, useEffect, useMemo } from 'react'; import { Edge, MarkerType, useReactFlow } from 'reactflow'; -import { EntityType, LineageDirection } from '@types'; + +import EntityRegistry from '@app/entityV2/EntityRegistry'; +import { TENTATIVE_EDGE_NAME } from '@app/lineageV2/LineageEdge/TentativeEdge'; import { ColumnRef, - createLineageFilterNodeId, FineGrainedLineage, FineGrainedLineageMap, FineGrainedOperationRef, - HighlightedColumns, HOVER_COLOR, - isTransformational, - isUrnQuery, + HighlightedColumns, LineageNodesContext, NodeContext, - parseColumnRef, SELECT_COLOR, + createLineageFilterNodeId, + isTransformational, + isUrnQuery, + parseColumnRef, setDefault, setDifference, -} from './common'; -import { useEntityRegistryV2 } from '../useEntityRegistry'; +} from '@app/lineageV2/common'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { EntityType, LineageDirection } from '@types'; export default function useColumnHighlighting( selectedColumn: ColumnRef | null, diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/filterNodes.ts b/datahub-web-react/src/app/lineageV2/useComputeGraph/filterNodes.ts index edfd36dd53..b1d97ffed8 100644 --- a/datahub-web-react/src/app/lineageV2/useComputeGraph/filterNodes.ts +++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/filterNodes.ts @@ -1,17 +1,18 @@ import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider'; import { - addToAdjacencyList, EdgeId, + LineageAuditStamp, + LineageEdge, + NodeContext, + addToAdjacencyList, getEdgeId, isGhostEntity, isTransformational, isUrnQuery, - LineageAuditStamp, - LineageEdge, - NodeContext, parseEdgeId, setDefault, } from '@app/lineageV2/common'; + import { EntityType, LineageDirection } from '@types'; export interface HideNodesConfig { diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/getDisplayedNodes.ts b/datahub-web-react/src/app/lineageV2/useComputeGraph/getDisplayedNodes.ts index cfe4e44288..50ea174011 100644 --- a/datahub-web-react/src/app/lineageV2/useComputeGraph/getDisplayedNodes.ts +++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/getDisplayedNodes.ts @@ -1,20 +1,21 @@ import { SubType } from '@app/entityV2/shared/components/subtypes'; import { - createLineageFilterNodeId, - getEdgeId, - getParents, - isDbt, - isQuery, - isTransformational, LINEAGE_FILTER_PAGINATION, LINEAGE_FILTER_TYPE, LineageEntity, LineageFilter, LineageNode, NodeContext, + createLineageFilterNodeId, + getEdgeId, + getParents, + isDbt, + isQuery, + isTransformational, setDefault, } from '@app/lineageV2/common'; import { ENTITY_SUB_TYPE_FILTER_NAME, FILTER_DELIMITER, PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants'; + import { LineageDirection } from '@types'; interface Output { diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/getFineGrainedLineage.ts b/datahub-web-react/src/app/lineageV2/useComputeGraph/getFineGrainedLineage.ts index 859ec56123..55f0f204f0 100644 --- a/datahub-web-react/src/app/lineageV2/useComputeGraph/getFineGrainedLineage.ts +++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/getFineGrainedLineage.ts @@ -1,19 +1,20 @@ import EntityRegistry from '@app/entityV2/EntityRegistry'; import { ColumnRef, - createColumnRef, - createEdgeId, - createFineGrainedOperationRef, FineGrainedLineage, FineGrainedLineageMap, FineGrainedOperationRef, - isUrnTransformational, NodeContext, + createColumnRef, + createEdgeId, + createFineGrainedOperationRef, + isUrnTransformational, parseColumnRef, setDefault, } from '@app/lineageV2/common'; -import { getFieldPathFromSchemaFieldUrn, getSourceUrnFromSchemaFieldUrn } from '@src/app/entityV2/schemaField/utils'; import { FineGrainedOperation } from '@app/sharedV2/EntitySidebarContext'; +import { getFieldPathFromSchemaFieldUrn, getSourceUrnFromSchemaFieldUrn } from '@src/app/entityV2/schemaField/utils'; + import { EntityType } from '@types'; export interface FineGrainedLineageData { diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/orderNodes.ts b/datahub-web-react/src/app/lineageV2/useComputeGraph/orderNodes.ts index 200a358699..6557354a98 100644 --- a/datahub-web-react/src/app/lineageV2/useComputeGraph/orderNodes.ts +++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/orderNodes.ts @@ -1,5 +1,6 @@ import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider'; -import { isUrnTransformational, LineageEntity, NodeContext } from '@app/lineageV2/common'; +import { LineageEntity, NodeContext, isUrnTransformational } from '@app/lineageV2/common'; + import { LineageDirection } from '@types'; /** diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/useComputeGraph.tsx b/datahub-web-react/src/app/lineageV2/useComputeGraph/useComputeGraph.tsx index 4d1040ded3..0e0b0220c9 100644 --- a/datahub-web-react/src/app/lineageV2/useComputeGraph/useComputeGraph.tsx +++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/useComputeGraph.tsx @@ -1,14 +1,16 @@ -import { LineageNodesContext, useIgnoreSchemaFieldStatus } from '@app/lineageV2/common'; +import { useContext, useMemo } from 'react'; +import { Edge } from 'reactflow'; + import NodeBuilder, { LineageVisualizationNode } from '@app/lineageV2/NodeBuilder'; +import { LineageNodesContext, useIgnoreSchemaFieldStatus } from '@app/lineageV2/common'; import hideNodes, { HideNodesConfig } from '@app/lineageV2/useComputeGraph/filterNodes'; import getDisplayedNodes from '@app/lineageV2/useComputeGraph/getDisplayedNodes'; import getFineGrainedLineage, { FineGrainedLineageData } from '@app/lineageV2/useComputeGraph/getFineGrainedLineage'; import orderNodes from '@app/lineageV2/useComputeGraph/orderNodes'; import usePrevious from '@app/shared/usePrevious'; import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + import { EntityType, LineageDirection } from '@types'; -import { useContext, useMemo } from 'react'; -import { Edge } from 'reactflow'; interface ProcessedData { fineGrainedLineage: FineGrainedLineageData; diff --git a/datahub-web-react/src/app/lineageV2/useLineageV2.ts b/datahub-web-react/src/app/lineageV2/useLineageV2.ts index 10b6c3dc3c..c26b9a4f3f 100644 --- a/datahub-web-react/src/app/lineageV2/useLineageV2.ts +++ b/datahub-web-react/src/app/lineageV2/useLineageV2.ts @@ -1,4 +1,4 @@ -import { useAppConfig } from '../useAppConfig'; +import { useAppConfig } from '@app/useAppConfig'; export function useLineageV2(): boolean { const appConfig = useAppConfig(); diff --git a/datahub-web-react/src/app/lineageV2/useNodeHighlighting.ts b/datahub-web-react/src/app/lineageV2/useNodeHighlighting.ts index 495fa32298..ccb3fa861c 100644 --- a/datahub-web-react/src/app/lineageV2/useNodeHighlighting.ts +++ b/datahub-web-react/src/app/lineageV2/useNodeHighlighting.ts @@ -1,7 +1,9 @@ import { useContext, useMemo } from 'react'; import { Node, useReactFlow } from 'reactflow'; -import { LineageDirection } from '../../types.generated'; -import { createEdgeId, LineageNode, LineageNodesContext, NodeContext } from './common'; + +import { LineageNode, LineageNodesContext, NodeContext, createEdgeId } from '@app/lineageV2/common'; + +import { LineageDirection } from '@types'; export default function useNodeHighlighting(hoveredNode: string | null): { highlightedNodes: Set; diff --git a/datahub-web-react/src/app/lineageV2/useSearchAcrossLineage.ts b/datahub-web-react/src/app/lineageV2/useSearchAcrossLineage.ts index 532fe232de..4eac40e5d2 100644 --- a/datahub-web-react/src/app/lineageV2/useSearchAcrossLineage.ts +++ b/datahub-web-react/src/app/lineageV2/useSearchAcrossLineage.ts @@ -1,24 +1,26 @@ -import pruneAllDuplicateEdges from '@app/lineageV2/pruneAllDuplicateEdges'; import { useEffect, useState } from 'react'; -import { useSearchAcrossLineageStructureLazyQuery } from '../../graphql/search.generated'; -import { Entity, EntityType, LineageDirection, Maybe, SearchAcrossLineageInput } from '../../types.generated'; -import { DBT_URN } from '../ingest/source/builder/constants'; -import { useGetLineageTimeParams } from '../lineage/utils/useGetLineageTimeParams'; -import { DEGREE_FILTER_NAME } from '../search/utils/constants'; -import { useEntityRegistryV2 } from '../useEntityRegistry'; + +import { DBT_URN } from '@app/ingest/source/builder/constants'; +import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams'; import { - addToAdjacencyList, FetchStatus, Filters, - getEdgeId, - isQuery, - isTransformational, LINEAGE_FILTER_PAGINATION, LineageEntity, NodeContext, + addToAdjacencyList, + getEdgeId, + isQuery, + isTransformational, reverseDirection, setDefault, -} from './common'; +} from '@app/lineageV2/common'; +import pruneAllDuplicateEdges from '@app/lineageV2/pruneAllDuplicateEdges'; +import { DEGREE_FILTER_NAME } from '@app/search/utils/constants'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { useSearchAcrossLineageStructureLazyQuery } from '@graphql/search.generated'; +import { Entity, EntityType, LineageDirection, Maybe, SearchAcrossLineageInput } from '@types'; const PER_HOP_LIMIT = 2; diff --git a/datahub-web-react/src/app/onboarding/OnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/OnboardingConfig.tsx index 024ee7f607..c4c0c29387 100644 --- a/datahub-web-react/src/app/onboarding/OnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/OnboardingConfig.tsx @@ -1,16 +1,16 @@ -import { BusinessGlossaryOnboardingConfig } from './config/BusinessGlossaryOnboardingConfig'; -import { DomainsOnboardingConfig } from './config/DomainsOnboardingConfig'; -import { EntityProfileOnboardingConfig } from './config/EntityProfileOnboardingConfig'; -import { GroupsOnboardingConfig } from './config/GroupsOnboardingConfig'; -import { HomePageOnboardingConfig } from './config/HomePageOnboardingConfig'; -import { IngestionOnboardingConfig } from './config/IngestionOnboardingConfig'; -import { LineageGraphOnboardingConfig } from './config/LineageGraphOnboardingConfig'; -import { PoliciesOnboardingConfig } from './config/PoliciesOnboardingConfig'; -import { RolesOnboardingConfig } from './config/RolesOnboardingConfig'; -import { SearchOnboardingConfig } from './config/SearchOnboardingConfig'; -import { UsersOnboardingConfig } from './config/UsersOnboardingConfig'; -import { ALL_V2_ONBOARDING_CONFIGS } from './configV2'; -import { OnboardingStep } from './OnboardingStep'; +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; +import { BusinessGlossaryOnboardingConfig } from '@app/onboarding/config/BusinessGlossaryOnboardingConfig'; +import { DomainsOnboardingConfig } from '@app/onboarding/config/DomainsOnboardingConfig'; +import { EntityProfileOnboardingConfig } from '@app/onboarding/config/EntityProfileOnboardingConfig'; +import { GroupsOnboardingConfig } from '@app/onboarding/config/GroupsOnboardingConfig'; +import { HomePageOnboardingConfig } from '@app/onboarding/config/HomePageOnboardingConfig'; +import { IngestionOnboardingConfig } from '@app/onboarding/config/IngestionOnboardingConfig'; +import { LineageGraphOnboardingConfig } from '@app/onboarding/config/LineageGraphOnboardingConfig'; +import { PoliciesOnboardingConfig } from '@app/onboarding/config/PoliciesOnboardingConfig'; +import { RolesOnboardingConfig } from '@app/onboarding/config/RolesOnboardingConfig'; +import { SearchOnboardingConfig } from '@app/onboarding/config/SearchOnboardingConfig'; +import { UsersOnboardingConfig } from '@app/onboarding/config/UsersOnboardingConfig'; +import { ALL_V2_ONBOARDING_CONFIGS } from '@app/onboarding/configV2'; const ALL_ONBOARDING_CONFIGS: OnboardingStep[][] = [ HomePageOnboardingConfig, diff --git a/datahub-web-react/src/app/onboarding/OnboardingContextProvider.tsx b/datahub-web-react/src/app/onboarding/OnboardingContextProvider.tsx index a9b9741e22..b84e49332a 100644 --- a/datahub-web-react/src/app/onboarding/OnboardingContextProvider.tsx +++ b/datahub-web-react/src/app/onboarding/OnboardingContextProvider.tsx @@ -1,5 +1,6 @@ import React, { useState } from 'react'; -import OnboardingContext from './OnboardingContext'; + +import OnboardingContext from '@app/onboarding/OnboardingContext'; export const OnboardingContextProvider = ({ children }: { children: React.ReactNode }) => { const [isOpen, setIsOpen] = useState(false); diff --git a/datahub-web-react/src/app/onboarding/OnboardingTour.tsx b/datahub-web-react/src/app/onboarding/OnboardingTour.tsx index 4038ee6863..a599e56454 100644 --- a/datahub-web-react/src/app/onboarding/OnboardingTour.tsx +++ b/datahub-web-react/src/app/onboarding/OnboardingTour.tsx @@ -1,14 +1,16 @@ import { Button } from 'antd'; import React, { useContext, useEffect, useState } from 'react'; import Tour from 'reactour'; -import { useBatchUpdateStepStatesMutation } from '../../graphql/step.generated'; -import { EducationStepsContext } from '../../providers/EducationStepsContext'; -import { StepStateResult } from '../../types.generated'; -import { useUserContext } from '../context/useUserContext'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; -import { useIsThemeV2 } from '../useIsThemeV2'; -import { convertStepId, getConditionalStepIdsToAdd, getStepsToRender } from './utils'; -import useShouldSkipOnboardingTour from './useShouldSkipOnboardingTour'; + +import { useUserContext } from '@app/context/useUserContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import useShouldSkipOnboardingTour from '@app/onboarding/useShouldSkipOnboardingTour'; +import { convertStepId, getConditionalStepIdsToAdd, getStepsToRender } from '@app/onboarding/utils'; +import { useIsThemeV2 } from '@app/useIsThemeV2'; +import { EducationStepsContext } from '@providers/EducationStepsContext'; + +import { useBatchUpdateStepStatesMutation } from '@graphql/step.generated'; +import { StepStateResult } from '@types'; type Props = { stepIds: string[]; @@ -52,7 +54,7 @@ export const OnboardingTour = ({ stepIds }: Props) => { const convertedIds = finalStepIds.map((id) => convertStepId(id, userUrn || '')); const stepStates = convertedIds.map((id) => ({ id, properties: [] })); batchUpdateStepStates({ variables: { input: { states: stepStates } } }).then(() => { - const results = convertedIds.map((id) => ({ id, properties: [{}] } as StepStateResult)); + const results = convertedIds.map((id) => ({ id, properties: [{}] }) as StepStateResult); setEducationSteps((existingSteps) => (existingSteps ? [...existingSteps, ...results] : results)); }); } diff --git a/datahub-web-react/src/app/onboarding/config/BusinessGlossaryOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/BusinessGlossaryOnboardingConfig.tsx index 2f4f8cc75e..f844e90416 100644 --- a/datahub-web-react/src/app/onboarding/config/BusinessGlossaryOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/config/BusinessGlossaryOnboardingConfig.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; +import React from 'react'; + +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; export const BUSINESS_GLOSSARY_INTRO_ID = 'business-glossary-intro'; export const BUSINESS_GLOSSARY_CREATE_TERM_ID = 'business-glossary-create-term'; diff --git a/datahub-web-react/src/app/onboarding/config/DomainsOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/DomainsOnboardingConfig.tsx index 2a1c7003c4..ba483d3da8 100644 --- a/datahub-web-react/src/app/onboarding/config/DomainsOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/config/DomainsOnboardingConfig.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; +import React from 'react'; + +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; export const DOMAINS_INTRO_ID = 'domains-intro'; export const DOMAINS_CREATE_DOMAIN_ID = 'domains-create-domain'; diff --git a/datahub-web-react/src/app/onboarding/config/EntityProfileOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/EntityProfileOnboardingConfig.tsx index 000e045d14..99e2f5426f 100644 --- a/datahub-web-react/src/app/onboarding/config/EntityProfileOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/config/EntityProfileOnboardingConfig.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; +import React from 'react'; + +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; // Entity profile tabs. Note that the 'rc-tab' prefix for the ID is added by the antd library and may change in the future. export const ENTITY_PROFILE_ENTITIES_ID = 'entity-profile-entities'; diff --git a/datahub-web-react/src/app/onboarding/config/GroupsOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/GroupsOnboardingConfig.tsx index c9dcee7f50..1f7f07d29d 100644 --- a/datahub-web-react/src/app/onboarding/config/GroupsOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/config/GroupsOnboardingConfig.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; +import React from 'react'; + +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; export const GROUPS_INTRO_ID = 'groups-intro'; export const GROUPS_CREATE_GROUP_ID = 'groups-create-group'; diff --git a/datahub-web-react/src/app/onboarding/config/HomePageOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/HomePageOnboardingConfig.tsx index 95670ae6ac..8889c90a98 100644 --- a/datahub-web-react/src/app/onboarding/config/HomePageOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/config/HomePageOnboardingConfig.tsx @@ -1,8 +1,10 @@ -import React from 'react'; import { Image, Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import dataHubFlowDiagram from '../../../images/datahub-flow-diagram-light.png'; +import React from 'react'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; + +import dataHubFlowDiagram from '@images/datahub-flow-diagram-light.png'; export const GLOBAL_WELCOME_TO_DATAHUB_ID = 'global-welcome-to-datahub'; export const HOME_PAGE_INGESTION_ID = 'home-page-ingestion'; diff --git a/datahub-web-react/src/app/onboarding/config/IngestionOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/IngestionOnboardingConfig.tsx index 04330bc432..19605d6866 100644 --- a/datahub-web-react/src/app/onboarding/config/IngestionOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/config/IngestionOnboardingConfig.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; +import React from 'react'; + +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; export const INGESTION_CREATE_SOURCE_ID = 'ingestion-create-source'; export const INGESTION_REFRESH_SOURCES_ID = 'ingestion-refresh-sources'; diff --git a/datahub-web-react/src/app/onboarding/config/LineageGraphOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/LineageGraphOnboardingConfig.tsx index 89a01ab3bd..cc444df07d 100644 --- a/datahub-web-react/src/app/onboarding/config/LineageGraphOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/config/LineageGraphOnboardingConfig.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; +import React from 'react'; + +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; export const LINEAGE_GRAPH_INTRO_ID = 'lineage-graph-intro'; export const LINEAGE_GRAPH_TIME_FILTER_ID = 'lineage-graph-time-filter'; diff --git a/datahub-web-react/src/app/onboarding/config/PoliciesOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/PoliciesOnboardingConfig.tsx index 961f5851ca..bc363bddd9 100644 --- a/datahub-web-react/src/app/onboarding/config/PoliciesOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/config/PoliciesOnboardingConfig.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; +import React from 'react'; + +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; export const POLICIES_INTRO_ID = 'policies-intro'; export const POLICIES_CREATE_POLICY_ID = 'policies-create-policy'; diff --git a/datahub-web-react/src/app/onboarding/config/RolesOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/RolesOnboardingConfig.tsx index cd83cb8da6..a398ccd1c3 100644 --- a/datahub-web-react/src/app/onboarding/config/RolesOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/config/RolesOnboardingConfig.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; +import React from 'react'; + +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; export const ROLES_INTRO_ID = 'roles-intro'; diff --git a/datahub-web-react/src/app/onboarding/config/SearchOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/SearchOnboardingConfig.tsx index bec7a6e4cc..349853bd15 100644 --- a/datahub-web-react/src/app/onboarding/config/SearchOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/config/SearchOnboardingConfig.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; +import React from 'react'; + +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; export const SEARCH_RESULTS_FILTERS_ID = 'search-results-filters'; export const SEARCH_RESULTS_ADVANCED_SEARCH_ID = 'search-results-advanced-search'; diff --git a/datahub-web-react/src/app/onboarding/config/UsersOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/UsersOnboardingConfig.tsx index d2ff34f477..b34cdff3b9 100644 --- a/datahub-web-react/src/app/onboarding/config/UsersOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/config/UsersOnboardingConfig.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; +import React from 'react'; + +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; export const USERS_INTRO_ID = 'users-intro'; export const USERS_SSO_ID = 'users-sso'; diff --git a/datahub-web-react/src/app/onboarding/configV2/EntityProfileOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/configV2/EntityProfileOnboardingConfig.tsx index 4dbe362c6d..486b18be10 100644 --- a/datahub-web-react/src/app/onboarding/configV2/EntityProfileOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/configV2/EntityProfileOnboardingConfig.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; +import React from 'react'; + +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; export const ENTITY_PROFILE_V2_COLUMNS_ID = 'entity-profile-v2-columns'; export const ENTITY_PROFILE_V2_CONTENTS_ID = 'entity-profile-v2-contents'; diff --git a/datahub-web-react/src/app/onboarding/configV2/HomePageOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/configV2/HomePageOnboardingConfig.tsx index fd60654bac..ce47a83bcd 100644 --- a/datahub-web-react/src/app/onboarding/configV2/HomePageOnboardingConfig.tsx +++ b/datahub-web-react/src/app/onboarding/configV2/HomePageOnboardingConfig.tsx @@ -1,8 +1,10 @@ -import React from 'react'; import { Image, Typography } from 'antd'; -import { OnboardingStep } from '../OnboardingStep'; -import dataHubFlowDiagram from '../../../images/datahub-flow-diagram-light.png'; -import { ANTD_GRAY } from '../../entityV2/shared/constants'; +import React from 'react'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; + +import dataHubFlowDiagram from '@images/datahub-flow-diagram-light.png'; export const V2_SEARCH_BAR_ID = 'v2-search-bar'; export const V2_HOME_PAGE_MOST_POPULAR_ID = 'v2-home-page-most-popular'; diff --git a/datahub-web-react/src/app/onboarding/configV2/index.ts b/datahub-web-react/src/app/onboarding/configV2/index.ts index 783a233387..a76a4d0a3a 100644 --- a/datahub-web-react/src/app/onboarding/configV2/index.ts +++ b/datahub-web-react/src/app/onboarding/configV2/index.ts @@ -1,5 +1,5 @@ -import { OnboardingStep } from '../OnboardingStep'; -import EntityProfileOnboardingConfig from './EntityProfileOnboardingConfig'; -import HomePageOnboardingConfig from './HomePageOnboardingConfig'; +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; +import EntityProfileOnboardingConfig from '@app/onboarding/configV2/EntityProfileOnboardingConfig'; +import HomePageOnboardingConfig from '@app/onboarding/configV2/HomePageOnboardingConfig'; export const ALL_V2_ONBOARDING_CONFIGS: OnboardingStep[][] = [EntityProfileOnboardingConfig, HomePageOnboardingConfig]; diff --git a/datahub-web-react/src/app/onboarding/useHandleOnboardingTour.ts b/datahub-web-react/src/app/onboarding/useHandleOnboardingTour.ts index b8601713ef..7ab30b1dd9 100644 --- a/datahub-web-react/src/app/onboarding/useHandleOnboardingTour.ts +++ b/datahub-web-react/src/app/onboarding/useHandleOnboardingTour.ts @@ -1,5 +1,6 @@ import { useContext, useEffect } from 'react'; -import OnboardingContext from './OnboardingContext'; + +import OnboardingContext from '@app/onboarding/OnboardingContext'; export const useHandleOnboardingTour = () => { const { setTourReshow, setIsTourOpen } = useContext(OnboardingContext); diff --git a/datahub-web-react/src/app/onboarding/useToggleEducationStepIdsAllowList.tsx b/datahub-web-react/src/app/onboarding/useToggleEducationStepIdsAllowList.tsx index acf85d0a87..ea4cef2852 100644 --- a/datahub-web-react/src/app/onboarding/useToggleEducationStepIdsAllowList.tsx +++ b/datahub-web-react/src/app/onboarding/useToggleEducationStepIdsAllowList.tsx @@ -1,6 +1,7 @@ import { useContext, useEffect } from 'react'; -import { EducationStepsContext } from '../../providers/EducationStepsContext'; -import { useUpdateEducationStepsAllowList } from './useUpdateEducationStepsAllowList'; + +import { useUpdateEducationStepsAllowList } from '@app/onboarding/useUpdateEducationStepsAllowList'; +import { EducationStepsContext } from '@providers/EducationStepsContext'; export function useToggleEducationStepIdsAllowList(condition: boolean, id: string) { const { educationStepIdsAllowlist } = useContext(EducationStepsContext); diff --git a/datahub-web-react/src/app/onboarding/useUpdateEducationStepsAllowList.tsx b/datahub-web-react/src/app/onboarding/useUpdateEducationStepsAllowList.tsx index 43c2ba6616..4d1d190353 100644 --- a/datahub-web-react/src/app/onboarding/useUpdateEducationStepsAllowList.tsx +++ b/datahub-web-react/src/app/onboarding/useUpdateEducationStepsAllowList.tsx @@ -1,5 +1,6 @@ import { useContext, useEffect } from 'react'; -import { EducationStepsContext } from '../../providers/EducationStepsContext'; + +import { EducationStepsContext } from '@providers/EducationStepsContext'; // function use diff --git a/datahub-web-react/src/app/onboarding/utils.tsx b/datahub-web-react/src/app/onboarding/utils.tsx index 5237474e9f..8431d419c7 100644 --- a/datahub-web-react/src/app/onboarding/utils.tsx +++ b/datahub-web-react/src/app/onboarding/utils.tsx @@ -1,9 +1,11 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { StepStateResult } from '../../types.generated'; -import { OnboardingConfig } from './OnboardingConfig'; -import { OnboardingStep } from './OnboardingStep'; + +import { OnboardingConfig } from '@app/onboarding/OnboardingConfig'; +import { OnboardingStep } from '@app/onboarding/OnboardingStep'; + +import { StepStateResult } from '@types'; export function convertStepId(stepId: string, userUrn: string) { const step = OnboardingConfig.find((configStep) => configStep.id === stepId); diff --git a/datahub-web-react/src/app/permissions/AvatarsGroup.tsx b/datahub-web-react/src/app/permissions/AvatarsGroup.tsx index df6a789486..87f2abe5b1 100644 --- a/datahub-web-react/src/app/permissions/AvatarsGroup.tsx +++ b/datahub-web-react/src/app/permissions/AvatarsGroup.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { CorpGroup, CorpUser, EntityType, Maybe, DataHubPolicy, DataHubRole } from '../../types.generated'; -import EntityRegistry from '../entity/EntityRegistry'; -import { CustomAvatar } from '../shared/avatar'; -import { SpacedAvatarGroup } from '../shared/avatar/SpaceAvatarGroup'; + +import EntityRegistry from '@app/entity/EntityRegistry'; +import { CustomAvatar } from '@app/shared/avatar'; +import { SpacedAvatarGroup } from '@app/shared/avatar/SpaceAvatarGroup'; + +import { CorpGroup, CorpUser, DataHubPolicy, DataHubRole, EntityType, Maybe } from '@types'; type Props = { users?: Maybe>; diff --git a/datahub-web-react/src/app/permissions/ManagePermissions.tsx b/datahub-web-react/src/app/permissions/ManagePermissions.tsx index 737af3fdee..50c8542c05 100644 --- a/datahub-web-react/src/app/permissions/ManagePermissions.tsx +++ b/datahub-web-react/src/app/permissions/ManagePermissions.tsx @@ -1,9 +1,10 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { RoutedTabs } from '../shared/RoutedTabs'; -import { ManagePolicies } from './policy/ManagePolicies'; -import { ManageRoles } from './roles/ManageRoles'; + +import { ManagePolicies } from '@app/permissions/policy/ManagePolicies'; +import { ManageRoles } from '@app/permissions/roles/ManageRoles'; +import { RoutedTabs } from '@app/shared/RoutedTabs'; const PageContainer = styled.div` padding-top: 20px; diff --git a/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx b/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx index d392662ed8..c5fae16808 100644 --- a/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx +++ b/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx @@ -1,27 +1,29 @@ -import React, { useEffect, useMemo, useState } from 'react'; -import { Button, Empty, message, Pagination, Select, Tag } from 'antd'; -import styled from 'styled-components/macro'; -import * as QueryString from 'query-string'; import { DeleteOutlined, PlusOutlined } from '@ant-design/icons'; +import { Button, Empty, Pagination, Select, Tag, message } from 'antd'; +import * as QueryString from 'query-string'; +import React, { useEffect, useMemo, useState } from 'react'; import { useLocation } from 'react-router'; -import PolicyBuilderModal from './PolicyBuilderModal'; -import { AndFilterInput, Policy, PolicyState, FilterOperator } from '../../../types.generated'; -import { useAppConfig } from '../../useAppConfig'; -import PolicyDetailsModal from './PolicyDetailsModal'; -import { useListPoliciesQuery } from '../../../graphql/policy.generated'; -import { Message } from '../../shared/Message'; -import { DEFAULT_PAGE_SIZE, EMPTY_POLICY } from './policyUtils'; -import TabToolbar from '../../entity/shared/components/styled/TabToolbar'; -import { StyledTable } from '../../entity/shared/components/styled/StyledTable'; -import AvatarsGroup from '../AvatarsGroup'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { SearchBar } from '../../search/SearchBar'; -import { scrollToTop } from '../../shared/searchUtils'; -import analytics, { EventType } from '../../analytics'; -import { POLICIES_CREATE_POLICY_ID, POLICIES_INTRO_ID } from '../../onboarding/config/PoliciesOnboardingConfig'; -import { OnboardingTour } from '../../onboarding/OnboardingTour'; -import { usePolicy } from './usePolicy'; +import styled from 'styled-components/macro'; + +import analytics, { EventType } from '@app/analytics'; +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; +import { POLICIES_CREATE_POLICY_ID, POLICIES_INTRO_ID } from '@app/onboarding/config/PoliciesOnboardingConfig'; +import AvatarsGroup from '@app/permissions/AvatarsGroup'; +import PolicyBuilderModal from '@app/permissions/policy/PolicyBuilderModal'; +import PolicyDetailsModal from '@app/permissions/policy/PolicyDetailsModal'; +import { DEFAULT_PAGE_SIZE, EMPTY_POLICY } from '@app/permissions/policy/policyUtils'; +import { usePolicy } from '@app/permissions/policy/usePolicy'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListPoliciesQuery } from '@graphql/policy.generated'; +import { AndFilterInput, FilterOperator, Policy, PolicyState } from '@types'; const SourceContainer = styled.div` overflow: auto; diff --git a/datahub-web-react/src/app/permissions/policy/PolicyActorForm.tsx b/datahub-web-react/src/app/permissions/policy/PolicyActorForm.tsx index f351c6db39..8adfcdc76d 100644 --- a/datahub-web-react/src/app/permissions/policy/PolicyActorForm.tsx +++ b/datahub-web-react/src/app/permissions/policy/PolicyActorForm.tsx @@ -1,13 +1,14 @@ -import React from 'react'; import { Form, Select, Switch, Tag, Typography } from 'antd'; -import styled from 'styled-components'; import { Maybe } from 'graphql/jsutils/Maybe'; +import React from 'react'; +import styled from 'styled-components'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ActorFilter, CorpUser, EntityType, PolicyType, SearchResult } from '../../../types.generated'; -import { useGetSearchResultsLazyQuery } from '../../../graphql/search.generated'; -import { useListOwnershipTypesQuery } from '../../../graphql/ownership.generated'; -import { CustomAvatar } from '../../shared/avatar'; +import { CustomAvatar } from '@app/shared/avatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListOwnershipTypesQuery } from '@graphql/ownership.generated'; +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { ActorFilter, CorpUser, EntityType, PolicyType, SearchResult } from '@types'; type Props = { policyType: PolicyType; diff --git a/datahub-web-react/src/app/permissions/policy/PolicyBuilderModal.tsx b/datahub-web-react/src/app/permissions/policy/PolicyBuilderModal.tsx index 3989a2c4c5..e76ecae653 100644 --- a/datahub-web-react/src/app/permissions/policy/PolicyBuilderModal.tsx +++ b/datahub-web-react/src/app/permissions/policy/PolicyBuilderModal.tsx @@ -1,14 +1,16 @@ +import { Modal, Steps } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { Modal, Steps } from 'antd'; + +import PolicyActorForm from '@app/permissions/policy/PolicyActorForm'; +import PolicyPrivilegeForm from '@app/permissions/policy/PolicyPrivilegeForm'; +import PolicyTypeForm from '@app/permissions/policy/PolicyTypeForm'; +import { EMPTY_POLICY } from '@app/permissions/policy/policyUtils'; +import ClickOutside from '@app/shared/ClickOutside'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; import { Button } from '@src/alchemy-components'; -import PolicyPrivilegeForm from './PolicyPrivilegeForm'; -import PolicyTypeForm from './PolicyTypeForm'; -import PolicyActorForm from './PolicyActorForm'; -import { ActorFilter, Policy, PolicyType, ResourceFilter } from '../../../types.generated'; -import { EMPTY_POLICY } from './policyUtils'; -import { useEnterKeyListener } from '../../shared/useEnterKeyListener'; -import ClickOutside from '../../shared/ClickOutside'; + +import { ActorFilter, Policy, PolicyType, ResourceFilter } from '@types'; type Props = { policy: Omit; diff --git a/datahub-web-react/src/app/permissions/policy/PolicyDetailsModal.tsx b/datahub-web-react/src/app/permissions/policy/PolicyDetailsModal.tsx index 1988fea349..e0747d242f 100644 --- a/datahub-web-react/src/app/permissions/policy/PolicyDetailsModal.tsx +++ b/datahub-web-react/src/app/permissions/policy/PolicyDetailsModal.tsx @@ -1,18 +1,20 @@ +import { Button, Divider, Modal, Tag, Typography } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; -import { Button, Divider, Modal, Tag, Typography } from 'antd'; import styled from 'styled-components'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { Maybe, Policy, PolicyMatchCondition, PolicyState, PolicyType } from '../../../types.generated'; -import { useAppConfig } from '../../useAppConfig'; + +import AvatarsGroup from '@app/permissions/AvatarsGroup'; +import { RESOURCE_TYPE, RESOURCE_URN, TYPE, URN } from '@app/permissions/policy/constants'; import { convertLegacyResourceFilter, - getFieldValues, getFieldCondition, + getFieldValues, mapResourceTypeToDisplayName, -} from './policyUtils'; -import AvatarsGroup from '../AvatarsGroup'; -import { RESOURCE_TYPE, RESOURCE_URN, TYPE, URN } from './constants'; +} from '@app/permissions/policy/policyUtils'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Maybe, Policy, PolicyMatchCondition, PolicyState, PolicyType } from '@types'; type PrivilegeOptionType = { type?: string; @@ -122,11 +124,7 @@ export default function PolicyDetailsModal({ policy, open, onClose, privileges } } if ((actors?.resolvedOwnershipTypes?.length ?? 0) > 0) { return ( -
- {actors?.resolvedOwnershipTypes?.map((type) => ( - {type.info.name} - ))} -
+
{actors?.resolvedOwnershipTypes?.map((type) => {type.info.name})}
); } return Yes - All owners; diff --git a/datahub-web-react/src/app/permissions/policy/PolicyListItem.tsx b/datahub-web-react/src/app/permissions/policy/PolicyListItem.tsx index 5a227cc01b..a43adb1307 100644 --- a/datahub-web-react/src/app/permissions/policy/PolicyListItem.tsx +++ b/datahub-web-react/src/app/permissions/policy/PolicyListItem.tsx @@ -1,9 +1,10 @@ +import { Button, List, Space, Tag, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Button, List, Space, Tag, Typography } from 'antd'; -import { Policy, PolicyState } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; + +import { Policy, PolicyState } from '@types'; type Props = { policy: Policy; diff --git a/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx b/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx index 619a4b9a7e..5e3e870287 100644 --- a/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx +++ b/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx @@ -1,35 +1,33 @@ +import { Tooltip } from '@components'; +import { Tag as CustomTag, Form, Select, Tag, Typography } from 'antd'; import React, { useEffect, useMemo, useRef, useState } from 'react'; import { Link } from 'react-router-dom'; -import { Form, Select, Tag, Typography, Tag as CustomTag } from 'antd'; -import { Tooltip } from '@components'; import styled from 'styled-components/macro'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { useAppConfig } from '../../useAppConfig'; -import { - useGetSearchResultsForMultipleLazyQuery, - useGetSearchResultsLazyQuery, -} from '../../../graphql/search.generated'; -import { ResourceFilter, PolicyType, EntityType, Domain, Entity } from '../../../types.generated'; +import DomainNavigator from '@app/domain/nestedDomains/domainNavigator/DomainNavigator'; +import { RESOURCE_TYPE, RESOURCE_URN, TYPE, URN } from '@app/permissions/policy/constants'; import { + EMPTY_POLICY, convertLegacyResourceFilter, createCriterionValue, createCriterionValueWithEntity, - EMPTY_POLICY, getFieldValues, getFieldValuesOfTags, mapResourceTypeToDisplayName, mapResourceTypeToEntityType, mapResourceTypeToPrivileges, setFieldValues, -} from './policyUtils'; -import DomainNavigator from '../../domain/nestedDomains/domainNavigator/DomainNavigator'; -import { BrowserWrapper } from '../../shared/tags/AddTagsTermsModal'; -import ClickOutside from '../../shared/ClickOutside'; -import { TagTermLabel } from '../../shared/tags/TagTermLabel'; -import { ENTER_KEY_CODE } from '../../shared/constants'; -import { useGetRecommendations } from '../../shared/recommendation'; -import { RESOURCE_TYPE, RESOURCE_URN, TYPE, URN } from './constants'; +} from '@app/permissions/policy/policyUtils'; +import ClickOutside from '@app/shared/ClickOutside'; +import { ENTER_KEY_CODE } from '@app/shared/constants'; +import { useGetRecommendations } from '@app/shared/recommendation'; +import { BrowserWrapper } from '@app/shared/tags/AddTagsTermsModal'; +import { TagTermLabel } from '@app/shared/tags/TagTermLabel'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useGetSearchResultsForMultipleLazyQuery, useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { Domain, Entity, EntityType, PolicyType, ResourceFilter } from '@types'; type Props = { policyType: PolicyType; diff --git a/datahub-web-react/src/app/permissions/policy/PolicyTypeForm.tsx b/datahub-web-react/src/app/permissions/policy/PolicyTypeForm.tsx index 240b024e0e..1d87d78b46 100644 --- a/datahub-web-react/src/app/permissions/policy/PolicyTypeForm.tsx +++ b/datahub-web-react/src/app/permissions/policy/PolicyTypeForm.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { Form, Input, Select, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { PolicyType } from '../../../types.generated'; + +import { PolicyType } from '@types'; type Props = { policyType: string; diff --git a/datahub-web-react/src/app/permissions/policy/_tests_/policyUtils.test.tsx b/datahub-web-react/src/app/permissions/policy/_tests_/policyUtils.test.tsx index eae735b347..d6fdd43079 100644 --- a/datahub-web-react/src/app/permissions/policy/_tests_/policyUtils.test.tsx +++ b/datahub-web-react/src/app/permissions/policy/_tests_/policyUtils.test.tsx @@ -1,12 +1,13 @@ -import { PolicyMatchCondition } from '../../../../types.generated'; import { addOrUpdatePoliciesInList, - updateListPoliciesCache, - removeFromListPoliciesCache, - getFieldValues, getFieldCondition, + getFieldValues, + removeFromListPoliciesCache, setFieldValues, -} from '../policyUtils'; + updateListPoliciesCache, +} from '@app/permissions/policy/policyUtils'; + +import { PolicyMatchCondition } from '@types'; // Mock the Apollo Client readQuery and writeQuery methods const mockReadQuery = vi.fn(); diff --git a/datahub-web-react/src/app/permissions/policy/policyUtils.ts b/datahub-web-react/src/app/permissions/policy/policyUtils.ts index d6221a0a92..30322039e3 100644 --- a/datahub-web-react/src/app/permissions/policy/policyUtils.ts +++ b/datahub-web-react/src/app/permissions/policy/policyUtils.ts @@ -1,4 +1,6 @@ import { Maybe } from 'graphql/jsutils/Maybe'; + +import { ListPoliciesDocument, ListPoliciesQuery } from '@graphql/policy.generated'; import { PolicyMatchCondition, PolicyMatchCriterion, @@ -9,8 +11,7 @@ import { Privilege, ResourceFilter, ResourcePrivileges, -} from '../../../types.generated'; -import { ListPoliciesDocument, ListPoliciesQuery } from '../../../graphql/policy.generated'; +} from '@types'; export const DEFAULT_PAGE_SIZE = 10; diff --git a/datahub-web-react/src/app/permissions/policy/usePolicy.ts b/datahub-web-react/src/app/permissions/policy/usePolicy.ts index 05e21a3e81..e6fc27725b 100644 --- a/datahub-web-react/src/app/permissions/policy/usePolicy.ts +++ b/datahub-web-react/src/app/permissions/policy/usePolicy.ts @@ -1,24 +1,26 @@ -import { Modal, message } from 'antd'; import { useApolloClient } from '@apollo/client'; +import { Modal, message } from 'antd'; + +import analytics, { EventType } from '@app/analytics'; +import { + DEFAULT_PAGE_SIZE, + removeFromListPoliciesCache, + updateListPoliciesCache, +} from '@app/permissions/policy/policyUtils'; + +import { useCreatePolicyMutation, useDeletePolicyMutation, useUpdatePolicyMutation } from '@graphql/policy.generated'; import { EntityType, + Maybe, Policy, PolicyMatchCriterionInput, PolicyMatchFilter, PolicyMatchFilterInput, PolicyState, PolicyType, - Maybe, PolicyUpdateInput, ResourceFilterInput, -} from '../../../types.generated'; -import { - useCreatePolicyMutation, - useDeletePolicyMutation, - useUpdatePolicyMutation, -} from '../../../graphql/policy.generated'; -import analytics, { EventType } from '../../analytics'; -import { DEFAULT_PAGE_SIZE, removeFromListPoliciesCache, updateListPoliciesCache } from './policyUtils'; +} from '@types'; type PrivilegeOptionType = { type?: string; diff --git a/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx b/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx index 671831fe4f..44459711ac 100644 --- a/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx +++ b/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx @@ -1,26 +1,28 @@ -import React, { useEffect, useMemo, useState } from 'react'; -import { Empty, message, Pagination, Typography } from 'antd'; import { Button, Tooltip } from '@components'; -import styled from 'styled-components'; +import { Empty, Pagination, Typography, message } from 'antd'; import * as QueryString from 'query-string'; +import React, { useEffect, useMemo, useState } from 'react'; import { useLocation } from 'react-router'; -import { useListRolesQuery } from '../../../graphql/role.generated'; -import { Message } from '../../shared/Message'; -import TabToolbar from '../../entity/shared/components/styled/TabToolbar'; -import { StyledTable } from '../../entity/shared/components/styled/StyledTable'; -import AvatarsGroup from '../AvatarsGroup'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { SearchBar } from '../../search/SearchBar'; -import { SearchSelectModal } from '../../entity/shared/components/styled/search/SearchSelectModal'; -import { EntityCapabilityType } from '../../entity/Entity'; -import { useBatchAssignRoleMutation } from '../../../graphql/mutations.generated'; -import { CorpUser, DataHubRole, DataHubPolicy } from '../../../types.generated'; -import RoleDetailsModal from './RoleDetailsModal'; -import analytics, { EventType } from '../../analytics'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { OnboardingTour } from '../../onboarding/OnboardingTour'; -import { ROLES_INTRO_ID } from '../../onboarding/config/RolesOnboardingConfig'; -import { clearUserListCache } from '../../identity/user/cacheUtils'; +import styled from 'styled-components'; + +import analytics, { EventType } from '@app/analytics'; +import { EntityCapabilityType } from '@app/entity/Entity'; +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { SearchSelectModal } from '@app/entity/shared/components/styled/search/SearchSelectModal'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { clearUserListCache } from '@app/identity/user/cacheUtils'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; +import { ROLES_INTRO_ID } from '@app/onboarding/config/RolesOnboardingConfig'; +import AvatarsGroup from '@app/permissions/AvatarsGroup'; +import RoleDetailsModal from '@app/permissions/roles/RoleDetailsModal'; +import { SearchBar } from '@app/search/SearchBar'; +import { Message } from '@app/shared/Message'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useBatchAssignRoleMutation } from '@graphql/mutations.generated'; +import { useListRolesQuery } from '@graphql/role.generated'; +import { CorpUser, DataHubPolicy, DataHubRole } from '@types'; const SourceContainer = styled.div` overflow: auto; diff --git a/datahub-web-react/src/app/permissions/roles/RoleDetailsModal.tsx b/datahub-web-react/src/app/permissions/roles/RoleDetailsModal.tsx index 6dc7ebbe14..c1d313bfeb 100644 --- a/datahub-web-react/src/app/permissions/roles/RoleDetailsModal.tsx +++ b/datahub-web-react/src/app/permissions/roles/RoleDetailsModal.tsx @@ -1,9 +1,11 @@ -import React from 'react'; import { Button, Divider, Modal, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { CorpUser, DataHubPolicy, DataHubRole } from '../../../types.generated'; -import AvatarsGroup from '../AvatarsGroup'; + +import AvatarsGroup from '@app/permissions/AvatarsGroup'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, DataHubPolicy, DataHubRole } from '@types'; type Props = { role: DataHubRole; diff --git a/datahub-web-react/src/app/preview/DataProcessInstanceInfo.tsx b/datahub-web-react/src/app/preview/DataProcessInstanceInfo.tsx index 859635676a..307c9130bb 100644 --- a/datahub-web-react/src/app/preview/DataProcessInstanceInfo.tsx +++ b/datahub-web-react/src/app/preview/DataProcessInstanceInfo.tsx @@ -1,15 +1,17 @@ +import { Pill, Popover } from '@components'; +import { capitalize } from 'lodash'; +import React from 'react'; +import styled from 'styled-components'; + import { formatDetailedDuration, formatDuration, toLocalDateTimeString, toRelativeTimeString, } from '@app/shared/time/timeUtils'; -import { Pill, Popover } from '@components'; -import { capitalize } from 'lodash'; -import React from 'react'; -import styled from 'styled-components'; import colors from '@src/alchemy-components/theme/foundations/colors'; -import { DataProcessInstanceRunResultType, DataProcessRunEvent } from '../../types.generated'; + +import { DataProcessInstanceRunResultType, DataProcessRunEvent } from '@types'; const StatContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/preview/DefaultPreviewCard.tsx b/datahub-web-react/src/app/preview/DefaultPreviewCard.tsx index f220daef03..a9ec5ba0e2 100644 --- a/datahub-web-react/src/app/preview/DefaultPreviewCard.tsx +++ b/datahub-web-react/src/app/preview/DefaultPreviewCard.tsx @@ -1,45 +1,47 @@ -import DataProcessInstanceInfo from '@src/app/preview/DataProcessInstanceInfo'; -import React, { ReactNode, useState } from 'react'; import { Divider, Tooltip, Typography } from 'antd'; +import React, { ReactNode, useState } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; + +import { PreviewType } from '@app/entity/Entity'; +import { useEntityData } from '@app/entity/shared/EntityContext'; +import ExternalUrlButton from '@app/entity/shared/ExternalUrlButton'; +import { usePreviewData } from '@app/entity/shared/PreviewContext'; +import { DeprecationPill } from '@app/entity/shared/components/styled/DeprecationPill'; +import { ExpandedActorGroup } from '@app/entity/shared/components/styled/ExpandedActorGroup'; +import NoMarkdownViewer from '@app/entity/shared/components/styled/StripMarkdownText'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import EntityCount from '@app/entity/shared/containers/profile/header/EntityCount'; +import { EntityHealth } from '@app/entity/shared/containers/profile/header/EntityHealth'; +import PlatformContentView from '@app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView'; +import StructuredPropertyBadge from '@app/entity/shared/containers/profile/header/StructuredPropertyBadge'; +import { getNumberWithOrdinal } from '@app/entity/shared/utils'; +import EntityPaths from '@app/preview/EntityPaths/EntityPaths'; +import { getUniqueOwners } from '@app/preview/utils'; +import SearchTextHighlighter from '@app/search/matches/SearchTextHighlighter'; +import { DataProductLink } from '@app/shared/tags/DataProductLink'; +import TagTermGroup from '@app/shared/tags/TagTermGroup'; +import useContentTruncation from '@app/shared/useContentTruncation'; +import DataProcessInstanceInfo from '@src/app/preview/DataProcessInstanceInfo'; + import { - GlobalTags, - Owner, - GlossaryTerms, - SearchInsight, Container, - Dataset, - ParentContainersResult, - Maybe, CorpUser, + DataProcessRunEvent, + DataProduct, + Dataset, Deprecation, Domain, - EntityPath, - DataProduct, - Health, Entity, - DataProcessRunEvent, -} from '../../types.generated'; -import TagTermGroup from '../shared/tags/TagTermGroup'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import NoMarkdownViewer from '../entity/shared/components/styled/StripMarkdownText'; -import { getNumberWithOrdinal } from '../entity/shared/utils'; -import { useEntityData } from '../entity/shared/EntityContext'; -import PlatformContentView from '../entity/shared/containers/profile/header/PlatformContent/PlatformContentView'; -import useContentTruncation from '../shared/useContentTruncation'; -import EntityCount from '../entity/shared/containers/profile/header/EntityCount'; -import { ExpandedActorGroup } from '../entity/shared/components/styled/ExpandedActorGroup'; -import { DeprecationPill } from '../entity/shared/components/styled/DeprecationPill'; -import { PreviewType } from '../entity/Entity'; -import ExternalUrlButton from '../entity/shared/ExternalUrlButton'; -import EntityPaths from './EntityPaths/EntityPaths'; -import { DataProductLink } from '../shared/tags/DataProductLink'; -import { EntityHealth } from '../entity/shared/containers/profile/header/EntityHealth'; -import SearchTextHighlighter from '../search/matches/SearchTextHighlighter'; -import { getUniqueOwners } from './utils'; -import StructuredPropertyBadge from '../entity/shared/containers/profile/header/StructuredPropertyBadge'; -import { usePreviewData } from '../entity/shared/PreviewContext'; + EntityPath, + GlobalTags, + GlossaryTerms, + Health, + Maybe, + Owner, + ParentContainersResult, + SearchInsight, +} from '@types'; const PreviewContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/preview/EntityPaths/ColumnPathsText.tsx b/datahub-web-react/src/app/preview/EntityPaths/ColumnPathsText.tsx index 5bef59c023..a98b1a10d1 100644 --- a/datahub-web-react/src/app/preview/EntityPaths/ColumnPathsText.tsx +++ b/datahub-web-react/src/app/preview/EntityPaths/ColumnPathsText.tsx @@ -1,11 +1,13 @@ import { Tooltip } from 'antd'; import React, { useContext } from 'react'; import styled from 'styled-components/macro'; -import { EntityPath, EntityType, LineageDirection, SchemaFieldEntity } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { LineageTabContext } from '../../entity/shared/tabs/Lineage/LineageTabContext'; -import ColumnsRelationshipText from './ColumnsRelationshipText'; -import DisplayedColumns from './DisplayedColumns'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { LineageTabContext } from '@app/entity/shared/tabs/Lineage/LineageTabContext'; +import ColumnsRelationshipText from '@app/preview/EntityPaths/ColumnsRelationshipText'; +import DisplayedColumns from '@app/preview/EntityPaths/DisplayedColumns'; + +import { EntityPath, EntityType, LineageDirection, SchemaFieldEntity } from '@types'; export const ResultText = styled.span` &:hover { diff --git a/datahub-web-react/src/app/preview/EntityPaths/ColumnsRelationshipText.tsx b/datahub-web-react/src/app/preview/EntityPaths/ColumnsRelationshipText.tsx index 1f73ef1d7c..0758a959b7 100644 --- a/datahub-web-react/src/app/preview/EntityPaths/ColumnsRelationshipText.tsx +++ b/datahub-web-react/src/app/preview/EntityPaths/ColumnsRelationshipText.tsx @@ -1,11 +1,13 @@ import { Maybe } from 'graphql/jsutils/Maybe'; import React, { useContext } from 'react'; import styled from 'styled-components/macro'; -import { Entity, LineageDirection } from '../../../types.generated'; -import { downgradeV2FieldPath } from '../../entity/dataset/profile/schema/utils/utils'; -import { LineageTabContext } from '../../entity/shared/tabs/Lineage/LineageTabContext'; -import { decodeSchemaField } from '../../lineage/utils/columnLineageUtils'; -import DisplayedColumns from './DisplayedColumns'; + +import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { LineageTabContext } from '@app/entity/shared/tabs/Lineage/LineageTabContext'; +import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils'; +import DisplayedColumns from '@app/preview/EntityPaths/DisplayedColumns'; + +import { Entity, LineageDirection } from '@types'; const ColumnNameWrapper = styled.span<{ isBlack?: boolean }>` font-family: 'Roboto Mono', monospace; diff --git a/datahub-web-react/src/app/preview/EntityPaths/DisplayedColumns.tsx b/datahub-web-react/src/app/preview/EntityPaths/DisplayedColumns.tsx index c5357522a3..e900986f6c 100644 --- a/datahub-web-react/src/app/preview/EntityPaths/DisplayedColumns.tsx +++ b/datahub-web-react/src/app/preview/EntityPaths/DisplayedColumns.tsx @@ -1,10 +1,12 @@ import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import styled from 'styled-components/macro'; -import { Entity, EntityType, SchemaFieldEntity } from '../../../types.generated'; -import { downgradeV2FieldPath } from '../../entity/dataset/profile/schema/utils/utils'; -import { decodeSchemaField } from '../../lineage/utils/columnLineageUtils'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, EntityType, SchemaFieldEntity } from '@types'; const ColumnNameWrapper = styled.span<{ isBlack?: boolean }>` font-family: 'Roboto Mono', monospace; diff --git a/datahub-web-react/src/app/preview/EntityPaths/EntityPaths.tsx b/datahub-web-react/src/app/preview/EntityPaths/EntityPaths.tsx index cfb844f66a..cf34142ed3 100644 --- a/datahub-web-react/src/app/preview/EntityPaths/EntityPaths.tsx +++ b/datahub-web-react/src/app/preview/EntityPaths/EntityPaths.tsx @@ -1,9 +1,11 @@ import React, { useContext, useState } from 'react'; import styled from 'styled-components/macro'; -import { EntityPath } from '../../../types.generated'; -import { LineageTabContext } from '../../entity/shared/tabs/Lineage/LineageTabContext'; -import ColumnPathsText from './ColumnPathsText'; -import EntityPathsModal from './EntityPathsModal'; + +import { LineageTabContext } from '@app/entity/shared/tabs/Lineage/LineageTabContext'; +import ColumnPathsText from '@app/preview/EntityPaths/ColumnPathsText'; +import EntityPathsModal from '@app/preview/EntityPaths/EntityPathsModal'; + +import { EntityPath } from '@types'; const EntityPathsWrapper = styled.div` margin-bottom: 5px; diff --git a/datahub-web-react/src/app/preview/EntityPaths/EntityPathsModal.tsx b/datahub-web-react/src/app/preview/EntityPaths/EntityPathsModal.tsx index 68c754b6b2..00f240f76f 100644 --- a/datahub-web-react/src/app/preview/EntityPaths/EntityPathsModal.tsx +++ b/datahub-web-react/src/app/preview/EntityPaths/EntityPathsModal.tsx @@ -1,11 +1,13 @@ import { Modal } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Entity, EntityPath } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { CompactEntityNameList } from '../../recommendations/renderer/component/CompactEntityNameList'; -import { getDisplayedColumns } from './ColumnPathsText'; -import ColumnsRelationshipText from './ColumnsRelationshipText'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { getDisplayedColumns } from '@app/preview/EntityPaths/ColumnPathsText'; +import ColumnsRelationshipText from '@app/preview/EntityPaths/ColumnsRelationshipText'; +import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList'; + +import { Entity, EntityPath } from '@types'; const StyledModal = styled(Modal)` width: 70vw; diff --git a/datahub-web-react/src/app/preview/utils.ts b/datahub-web-react/src/app/preview/utils.ts index f5a562dc2f..6b4a5bbb9c 100644 --- a/datahub-web-react/src/app/preview/utils.ts +++ b/datahub-web-react/src/app/preview/utils.ts @@ -1,4 +1,4 @@ -import { Owner } from '../../types.generated'; +import { Owner } from '@types'; export function getUniqueOwners(owners?: Owner[] | null) { const uniqueOwnerUrns = new Set(); diff --git a/datahub-web-react/src/app/previewV2/BrowsePaths.tsx b/datahub-web-react/src/app/previewV2/BrowsePaths.tsx index e35c6eae6a..4cd06e110d 100644 --- a/datahub-web-react/src/app/previewV2/BrowsePaths.tsx +++ b/datahub-web-react/src/app/previewV2/BrowsePaths.tsx @@ -1,12 +1,17 @@ import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import styled from 'styled-components'; -import { BrowsePathEntry, BrowsePathV2 } from '../../types.generated'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; -import { Ellipsis, StyledTooltip } from '../entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView'; -import ContextPathEntityLink from './ContextPathEntityLink'; -import { PreviewType } from '../entityV2/Entity'; -import { ContextPathSeparator } from './ContextPathSeparator'; + +import { PreviewType } from '@app/entityV2/Entity'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { + Ellipsis, + StyledTooltip, +} from '@app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView'; +import ContextPathEntityLink from '@app/previewV2/ContextPathEntityLink'; +import { ContextPathSeparator } from '@app/previewV2/ContextPathSeparator'; + +import { BrowsePathEntry, BrowsePathV2 } from '@types'; export const PlatformText = styled.div<{ $maxWidth?: number; diff --git a/datahub-web-react/src/app/previewV2/CardActionCircle.tsx b/datahub-web-react/src/app/previewV2/CardActionCircle.tsx index 93fa8176f2..575e8f3bad 100644 --- a/datahub-web-react/src/app/previewV2/CardActionCircle.tsx +++ b/datahub-web-react/src/app/previewV2/CardActionCircle.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../entityV2/shared/constants'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; type Props = { icon: any; diff --git a/datahub-web-react/src/app/previewV2/ColoredBackgroundPlatformIconGroup.tsx b/datahub-web-react/src/app/previewV2/ColoredBackgroundPlatformIconGroup.tsx index c67defc5a7..a1ddc9a999 100644 --- a/datahub-web-react/src/app/previewV2/ColoredBackgroundPlatformIconGroup.tsx +++ b/datahub-web-react/src/app/previewV2/ColoredBackgroundPlatformIconGroup.tsx @@ -1,11 +1,12 @@ import { Tooltip } from '@components'; -import { Maybe } from 'graphql/jsutils/Maybe'; import OutputIcon from '@mui/icons-material/Output'; +import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import styled from 'styled-components'; -import ImageWithColoredBackground, { Icon } from './ImageWIthColoredBackground'; -import { ANTD_GRAY } from '../entityV2/shared/constants'; -import { useIsShowSeparateSiblingsEnabled } from '../useAppConfig'; + +import { ANTD_GRAY } from '@app/entityV2/shared/constants'; +import ImageWithColoredBackground, { Icon } from '@app/previewV2/ImageWIthColoredBackground'; +import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig'; const LogoIcon = styled.span` display: flex; diff --git a/datahub-web-react/src/app/previewV2/CompactView.tsx b/datahub-web-react/src/app/previewV2/CompactView.tsx index 13248760f8..36e846f9e2 100644 --- a/datahub-web-react/src/app/previewV2/CompactView.tsx +++ b/datahub-web-react/src/app/previewV2/CompactView.tsx @@ -1,18 +1,22 @@ -import ViewInPlatform from '@app/entityV2/shared/externalUrl/ViewInPlatform'; -import { ActionsAndStatusSection } from '@app/previewV2/shared'; +import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import styled from 'styled-components'; -import { Maybe } from 'graphql/jsutils/Maybe'; -import ColoredBackgroundPlatformIconGroup, { PlatformContentWrapper } from './ColoredBackgroundPlatformIconGroup'; -import MoreOptionsMenuAction from '../entityV2/shared/EntityDropdown/MoreOptionsMenuAction'; -import EntityHeader from './EntityHeader'; -import { PreviewType } from '../entity/Entity'; -import { BrowsePathV2, Deprecation, Entity, EntityType, Health } from '../../types.generated'; -import { EntityMenuActions } from '../entityV2/Entity'; -import { EntityMenuItems } from '../entityV2/shared/EntityDropdown/EntityMenuActions'; -import { GenericEntityProperties } from '../entity/shared/types'; -import ContextPath from './ContextPath'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; + +import { PreviewType } from '@app/entity/Entity'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { EntityMenuActions } from '@app/entityV2/Entity'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import MoreOptionsMenuAction from '@app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import ViewInPlatform from '@app/entityV2/shared/externalUrl/ViewInPlatform'; +import ColoredBackgroundPlatformIconGroup, { + PlatformContentWrapper, +} from '@app/previewV2/ColoredBackgroundPlatformIconGroup'; +import ContextPath from '@app/previewV2/ContextPath'; +import EntityHeader from '@app/previewV2/EntityHeader'; +import { ActionsAndStatusSection } from '@app/previewV2/shared'; + +import { BrowsePathV2, Deprecation, Entity, EntityType, Health } from '@types'; const RowContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/previewV2/ContextPath.tsx b/datahub-web-react/src/app/previewV2/ContextPath.tsx index 4bfbb5e08e..bbdaa24106 100644 --- a/datahub-web-react/src/app/previewV2/ContextPath.tsx +++ b/datahub-web-react/src/app/previewV2/ContextPath.tsx @@ -1,16 +1,18 @@ import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import styled from 'styled-components'; -import { BrowsePathEntry, BrowsePathV2, Entity, EntityType } from '../../types.generated'; -import { getSubTypeIcon } from '../entityV2/shared/components/subtypes'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; -import ParentEntities from '../searchV2/filters/ParentEntities'; -import { capitalizeFirstLetterOnly } from '../shared/textUtil'; -import { useEntityRegistryV2 } from '../useEntityRegistry'; -import { IconStyleType, PreviewType } from '../entityV2/Entity'; -import BrowsePaths from './BrowsePaths'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { isDefaultBrowsePath } from './utils'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { IconStyleType, PreviewType } from '@app/entityV2/Entity'; +import { getSubTypeIcon } from '@app/entityV2/shared/components/subtypes'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import BrowsePaths from '@app/previewV2/BrowsePaths'; +import { isDefaultBrowsePath } from '@app/previewV2/utils'; +import ParentEntities from '@app/searchV2/filters/ParentEntities'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { BrowsePathEntry, BrowsePathV2, Entity, EntityType } from '@types'; const PlatformContentWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/previewV2/ContextPathEntityIcon.tsx b/datahub-web-react/src/app/previewV2/ContextPathEntityIcon.tsx index 2e12169fe3..5f4f5a84fb 100644 --- a/datahub-web-react/src/app/previewV2/ContextPathEntityIcon.tsx +++ b/datahub-web-react/src/app/previewV2/ContextPathEntityIcon.tsx @@ -1,7 +1,8 @@ -import React from 'react'; -import styled from 'styled-components'; import { FolderOpenOutlined } from '@ant-design/icons'; import { Maybe } from 'graphql/jsutils/Maybe'; +import React from 'react'; +import styled from 'styled-components'; + import { Entity } from '@types'; const IconWrapper = styled.span` diff --git a/datahub-web-react/src/app/previewV2/ContextPathEntityLink.tsx b/datahub-web-react/src/app/previewV2/ContextPathEntityLink.tsx index 65ba872e7b..3e5ba5b434 100644 --- a/datahub-web-react/src/app/previewV2/ContextPathEntityLink.tsx +++ b/datahub-web-react/src/app/previewV2/ContextPathEntityLink.tsx @@ -2,12 +2,14 @@ import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { Entity } from '@types'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import ContextPathEntityIcon from '@app/previewV2/ContextPathEntityIcon'; +import { useEmbeddedProfileLinkProps } from '@app/shared/useEmbeddedProfileLinkProps'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { colors } from '@src/alchemy-components'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; -import { useEntityRegistry } from '../useEntityRegistry'; -import ContextPathEntityIcon from './ContextPathEntityIcon'; -import { useEmbeddedProfileLinkProps } from '../shared/useEmbeddedProfileLinkProps'; + +import { Entity } from '@types'; const Path = styled.div` white-space: nowrap; diff --git a/datahub-web-react/src/app/previewV2/ContextPathSeparator.tsx b/datahub-web-react/src/app/previewV2/ContextPathSeparator.tsx index f2e276bec7..84d0021849 100644 --- a/datahub-web-react/src/app/previewV2/ContextPathSeparator.tsx +++ b/datahub-web-react/src/app/previewV2/ContextPathSeparator.tsx @@ -1,6 +1,7 @@ -import styled from 'styled-components'; import { RightOutlined } from '@ant-design/icons'; -import { ANTD_GRAY } from '../entity/shared/constants'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export const ContextPathSeparator = styled(RightOutlined)` color: ${ANTD_GRAY[6]}; diff --git a/datahub-web-react/src/app/previewV2/DefaultPreviewCard.tsx b/datahub-web-react/src/app/previewV2/DefaultPreviewCard.tsx index 7f0e9bc49e..6820dfa925 100644 --- a/datahub-web-react/src/app/previewV2/DefaultPreviewCard.tsx +++ b/datahub-web-react/src/app/previewV2/DefaultPreviewCard.tsx @@ -1,12 +1,33 @@ -import DataProcessInstanceInfo from '@src/app/preview/DataProcessInstanceInfo'; import { CloseOutlined } from '@ant-design/icons'; -import { GenericEntityProperties } from '@app/entity/shared/types'; -import ViewInPlatform from '@app/entityV2/shared/externalUrl/ViewInPlatform'; -import { useSearchCardContext } from '@app/entityV2/shared/SearchCardContext'; -import { ActionsAndStatusSection } from '@app/previewV2/shared'; import { Button, Typography } from 'antd'; import React, { ReactNode } from 'react'; import styled from 'styled-components'; + +import { useEntityContext, useEntityData } from '@app/entity/shared/EntityContext'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { EntityMenuActions, PreviewType } from '@app/entityV2/Entity'; +import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions'; +import MoreOptionsMenuAction from '@app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction'; +import { usePreviewData } from '@app/entityV2/shared/PreviewContext'; +import { useSearchCardContext } from '@app/entityV2/shared/SearchCardContext'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { GlossaryPreviewCardDecoration } from '@app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration'; +import { PopularityTier } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import ViewInPlatform from '@app/entityV2/shared/externalUrl/ViewInPlatform'; +import CompactMarkdownViewer from '@app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer'; +import { DashboardLastUpdatedMs, DatasetLastUpdatedMs } from '@app/entityV2/shared/utils'; +import ColoredBackgroundPlatformIconGroup from '@app/previewV2/ColoredBackgroundPlatformIconGroup'; +import { CompactView } from '@app/previewV2/CompactView'; +import ContextPath from '@app/previewV2/ContextPath'; +import DefaultPreviewCardFooter from '@app/previewV2/DefaultPreviewCardFooter'; +import EntityHeader from '@app/previewV2/EntityHeader'; +import { ActionsAndStatusSection } from '@app/previewV2/shared'; +import { useRemoveDataProductAssets, useRemoveDomainAssets, useRemoveGlossaryTermAssets } from '@app/previewV2/utils'; +import { useSearchContext } from '@app/search/context/SearchContext'; +import useContentTruncation from '@app/shared/useContentTruncation'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; +import DataProcessInstanceInfo from '@src/app/preview/DataProcessInstanceInfo'; + import { BrowsePathV2, Container, @@ -23,27 +44,7 @@ import { Maybe, Owner, SearchInsight, -} from '../../types.generated'; -import { EntityMenuActions, PreviewType } from '../entityV2/Entity'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../entityV2/shared/constants'; -import { GlossaryPreviewCardDecoration } from '../entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration'; -import { PopularityTier } from '../entityV2/shared/containers/profile/sidebar/shared/utils'; -import { EntityMenuItems } from '../entityV2/shared/EntityDropdown/EntityMenuActions'; -import MoreOptionsMenuAction from '../entityV2/shared/EntityDropdown/MoreOptionsMenuAction'; -import { usePreviewData } from '../entityV2/shared/PreviewContext'; -import { useSearchContext } from '../search/context/SearchContext'; -import useContentTruncation from '../shared/useContentTruncation'; -import { useEntityRegistryV2 } from '../useEntityRegistry'; -import ColoredBackgroundPlatformIconGroup from './ColoredBackgroundPlatformIconGroup'; -import { CompactView } from './CompactView'; -import ContextPath from './ContextPath'; -import DefaultPreviewCardFooter from './DefaultPreviewCardFooter'; -import EntityHeader from './EntityHeader'; - -import { useEntityContext, useEntityData } from '../entity/shared/EntityContext'; -import { DashboardLastUpdatedMs, DatasetLastUpdatedMs } from '../entityV2/shared/utils'; -import { useRemoveDataProductAssets, useRemoveDomainAssets, useRemoveGlossaryTermAssets } from './utils'; -import CompactMarkdownViewer from '../entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer'; +} from '@types'; const TransparentButton = styled(Button)` color: ${REDESIGN_COLORS.TITLE_PURPLE}; diff --git a/datahub-web-react/src/app/previewV2/DefaultPreviewCardFooter.tsx b/datahub-web-react/src/app/previewV2/DefaultPreviewCardFooter.tsx index cf3f15ce40..63be52f99c 100644 --- a/datahub-web-react/src/app/previewV2/DefaultPreviewCardFooter.tsx +++ b/datahub-web-react/src/app/previewV2/DefaultPreviewCardFooter.tsx @@ -1,24 +1,17 @@ +import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Divider } from 'antd'; -import Pills from './Pills'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; -import { PopularityTier } from '../entityV2/shared/containers/profile/sidebar/shared/utils'; -import { - DatasetStatsSummary, - EntityPath, - EntityType, - GlobalTags, - GlossaryTerms, - Maybe, - Owner, -} from '../../types.generated'; -import { EntityCapabilityType, PreviewType } from '../entityV2/Entity'; -import PreviewCardFooterRightSection from './PreviewCardFooterRightSection'; -import EntityRegistry from '../entityV2/EntityRegistry'; -import { entityHasCapability } from './utils'; -import { DatasetLastUpdatedMs, DashboardLastUpdatedMs } from '../entityV2/shared/utils'; +import { EntityCapabilityType, PreviewType } from '@app/entityV2/Entity'; +import EntityRegistry from '@app/entityV2/EntityRegistry'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { PopularityTier } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { DashboardLastUpdatedMs, DatasetLastUpdatedMs } from '@app/entityV2/shared/utils'; +import Pills from '@app/previewV2/Pills'; +import PreviewCardFooterRightSection from '@app/previewV2/PreviewCardFooterRightSection'; +import { entityHasCapability } from '@app/previewV2/utils'; + +import { DatasetStatsSummary, EntityPath, EntityType, GlobalTags, GlossaryTerms, Maybe, Owner } from '@types'; interface DefaultPreviewCardFooterProps { glossaryTerms?: GlossaryTerms; diff --git a/datahub-web-react/src/app/previewV2/EntityHeader.tsx b/datahub-web-react/src/app/previewV2/EntityHeader.tsx index f4ab41eb79..33cba21d78 100644 --- a/datahub-web-react/src/app/previewV2/EntityHeader.tsx +++ b/datahub-web-react/src/app/previewV2/EntityHeader.tsx @@ -1,18 +1,20 @@ -import VersioningBadge from '@app/entityV2/shared/versioning/VersioningBadge'; +import { Tooltip } from '@components'; import React from 'react'; import { Link } from 'react-router-dom'; -import { Tooltip } from '@components'; import styled from 'styled-components'; -import { Deprecation, Health, Maybe } from '../../types.generated'; -import { GenericEntityProperties } from '../entity/shared/types'; -import { PreviewType } from '../entityV2/Entity'; -import { DeprecationIcon } from '../entityV2/shared/components/styled/DeprecationIcon'; -import { REDESIGN_COLORS, SEARCH_COLORS } from '../entityV2/shared/constants'; -import StructuredPropertyBadge from '../entityV2/shared/containers/profile/header/StructuredPropertyBadge'; -import { getNumberWithOrdinal } from '../entityV2/shared/utils'; -import SearchTextHighlighter from '../searchV2/matches/SearchTextHighlighter'; -import { useEmbeddedProfileLinkProps } from '../shared/useEmbeddedProfileLinkProps'; -import HealthIcon from './HealthIcon'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { PreviewType } from '@app/entityV2/Entity'; +import { DeprecationIcon } from '@app/entityV2/shared/components/styled/DeprecationIcon'; +import { REDESIGN_COLORS, SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import StructuredPropertyBadge from '@app/entityV2/shared/containers/profile/header/StructuredPropertyBadge'; +import { getNumberWithOrdinal } from '@app/entityV2/shared/utils'; +import VersioningBadge from '@app/entityV2/shared/versioning/VersioningBadge'; +import HealthIcon from '@app/previewV2/HealthIcon'; +import SearchTextHighlighter from '@app/searchV2/matches/SearchTextHighlighter'; +import { useEmbeddedProfileLinkProps } from '@app/shared/useEmbeddedProfileLinkProps'; + +import { Deprecation, Health, Maybe } from '@types'; const EntityTitleContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/previewV2/EntityPaths/ColumnPathsText.tsx b/datahub-web-react/src/app/previewV2/EntityPaths/ColumnPathsText.tsx index 26891a7dfd..daea4bbfbd 100644 --- a/datahub-web-react/src/app/previewV2/EntityPaths/ColumnPathsText.tsx +++ b/datahub-web-react/src/app/previewV2/EntityPaths/ColumnPathsText.tsx @@ -1,11 +1,13 @@ import { Tooltip } from '@components'; import React, { useContext } from 'react'; import styled from 'styled-components/macro'; -import { EntityPath, EntityType, LineageDirection, SchemaFieldEntity } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import ColumnsRelationshipText from './ColumnsRelationshipText'; -import DisplayedColumns from './DisplayedColumns'; -import { LineageTabContext } from '../../entityV2/shared/tabs/Lineage/LineageTabContext'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { LineageTabContext } from '@app/entityV2/shared/tabs/Lineage/LineageTabContext'; +import ColumnsRelationshipText from '@app/previewV2/EntityPaths/ColumnsRelationshipText'; +import DisplayedColumns from '@app/previewV2/EntityPaths/DisplayedColumns'; + +import { EntityPath, EntityType, LineageDirection, SchemaFieldEntity } from '@types'; export const ResultText = styled.span` white-space: nowrap; diff --git a/datahub-web-react/src/app/previewV2/EntityPaths/ColumnsRelationshipText.tsx b/datahub-web-react/src/app/previewV2/EntityPaths/ColumnsRelationshipText.tsx index 1da1bf49ef..019c3ac4a5 100644 --- a/datahub-web-react/src/app/previewV2/EntityPaths/ColumnsRelationshipText.tsx +++ b/datahub-web-react/src/app/previewV2/EntityPaths/ColumnsRelationshipText.tsx @@ -1,11 +1,13 @@ import { Maybe } from 'graphql/jsutils/Maybe'; import React, { useContext } from 'react'; import styled from 'styled-components/macro'; -import { Entity, LineageDirection } from '../../../types.generated'; -import { downgradeV2FieldPath } from '../../entity/dataset/profile/schema/utils/utils'; -import { decodeSchemaField } from '../../lineage/utils/columnLineageUtils'; -import DisplayedColumns from './DisplayedColumns'; -import { LineageTabContext } from '../../entityV2/shared/tabs/Lineage/LineageTabContext'; + +import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { LineageTabContext } from '@app/entityV2/shared/tabs/Lineage/LineageTabContext'; +import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils'; +import DisplayedColumns from '@app/previewV2/EntityPaths/DisplayedColumns'; + +import { Entity, LineageDirection } from '@types'; const ColumnNameWrapper = styled.span<{ isBlack?: boolean }>` font-weight: bold; diff --git a/datahub-web-react/src/app/previewV2/EntityPaths/DisplayedColumns.tsx b/datahub-web-react/src/app/previewV2/EntityPaths/DisplayedColumns.tsx index c707ef3013..07ebe79f1b 100644 --- a/datahub-web-react/src/app/previewV2/EntityPaths/DisplayedColumns.tsx +++ b/datahub-web-react/src/app/previewV2/EntityPaths/DisplayedColumns.tsx @@ -1,10 +1,12 @@ import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import styled from 'styled-components/macro'; -import { Entity, EntityType, SchemaFieldEntity } from '../../../types.generated'; -import { downgradeV2FieldPath } from '../../entity/dataset/profile/schema/utils/utils'; -import { decodeSchemaField } from '../../lineage/utils/columnLineageUtils'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; +import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, EntityType, SchemaFieldEntity } from '@types'; const ColumnNameWrapper = styled.span<{ isBlack?: boolean }>` font-weight: bold; diff --git a/datahub-web-react/src/app/previewV2/EntityPaths/EntityPaths.tsx b/datahub-web-react/src/app/previewV2/EntityPaths/EntityPaths.tsx index c94a437240..e7da5942a7 100644 --- a/datahub-web-react/src/app/previewV2/EntityPaths/EntityPaths.tsx +++ b/datahub-web-react/src/app/previewV2/EntityPaths/EntityPaths.tsx @@ -1,8 +1,10 @@ import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { EntityPath } from '../../../types.generated'; -import ColumnPathsText from './ColumnPathsText'; -import EntityPathsModal from './EntityPathsModal'; + +import ColumnPathsText from '@app/previewV2/EntityPaths/ColumnPathsText'; +import EntityPathsModal from '@app/previewV2/EntityPaths/EntityPathsModal'; + +import { EntityPath } from '@types'; const EntityPathsWrapper = styled.div` padding-bottom: 10px; diff --git a/datahub-web-react/src/app/previewV2/EntityPaths/EntityPathsModal.tsx b/datahub-web-react/src/app/previewV2/EntityPaths/EntityPathsModal.tsx index 3d86a2a0d9..39c10019a1 100644 --- a/datahub-web-react/src/app/previewV2/EntityPaths/EntityPathsModal.tsx +++ b/datahub-web-react/src/app/previewV2/EntityPaths/EntityPathsModal.tsx @@ -1,13 +1,15 @@ import { Modal, Skeleton } from 'antd'; import React, { useContext } from 'react'; import styled from 'styled-components/macro'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { LineageTabContext } from '@app/entityV2/shared/tabs/Lineage/LineageTabContext'; +import { getDisplayedColumns } from '@app/previewV2/EntityPaths/ColumnPathsText'; +import ColumnsRelationshipText from '@app/previewV2/EntityPaths/ColumnsRelationshipText'; +import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList'; import { useGetEntitiesQuery } from '@src/graphql/entity.generated'; -import { Entity, EntityPath, LineageDirection } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { CompactEntityNameList } from '../../recommendations/renderer/component/CompactEntityNameList'; -import { getDisplayedColumns } from './ColumnPathsText'; -import ColumnsRelationshipText from './ColumnsRelationshipText'; -import { LineageTabContext } from '../../entityV2/shared/tabs/Lineage/LineageTabContext'; + +import { Entity, EntityPath, LineageDirection } from '@types'; const StyledModal = styled(Modal)` width: 70vw; diff --git a/datahub-web-react/src/app/previewV2/Freshness.tsx b/datahub-web-react/src/app/previewV2/Freshness.tsx index 812b30cd47..cb39386889 100644 --- a/datahub-web-react/src/app/previewV2/Freshness.tsx +++ b/datahub-web-react/src/app/previewV2/Freshness.tsx @@ -1,14 +1,12 @@ -import React from 'react'; - import { Popover } from '@components'; import UpdateOutlinedIcon from '@mui/icons-material/UpdateOutlined'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { getLastIngestedColor } from '../entity/shared/containers/profile/sidebar/LastIngested'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; - -import { toLocalDateString, toRelativeTimeString } from '../shared/time/timeUtils'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { getLastIngestedColor } from '@app/entity/shared/containers/profile/sidebar/LastIngested'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { toLocalDateString, toRelativeTimeString } from '@app/shared/time/timeUtils'; const LastUpdatedContainer = styled.div<{ color: string }>` align-items: center; diff --git a/datahub-web-react/src/app/previewV2/HealthIcon.tsx b/datahub-web-react/src/app/previewV2/HealthIcon.tsx index 9c141a816a..507715346e 100644 --- a/datahub-web-react/src/app/previewV2/HealthIcon.tsx +++ b/datahub-web-react/src/app/previewV2/HealthIcon.tsx @@ -1,12 +1,15 @@ -import React from 'react'; -import { Popover } from '@components'; -import styled from 'styled-components'; import { CheckCircleOutlined } from '@ant-design/icons'; -import AmbulanceIcon from '../../images/ambulance-icon.svg?react'; -import { isHealthy, isUnhealthy } from '../shared/health/healthUtils'; -import { COLORS } from '../sharedV2/colors'; -import HealthPopover from './HealthPopover'; -import { Health } from '../../types.generated'; +import { Popover } from '@components'; +import React from 'react'; +import styled from 'styled-components'; + +import HealthPopover from '@app/previewV2/HealthPopover'; +import { isHealthy, isUnhealthy } from '@app/shared/health/healthUtils'; +import { COLORS } from '@app/sharedV2/colors'; + +import { Health } from '@types'; + +import AmbulanceIcon from '@images/ambulance-icon.svg?react'; const IconContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/previewV2/HealthPopover.tsx b/datahub-web-react/src/app/previewV2/HealthPopover.tsx index ffabbae216..6416c9a950 100644 --- a/datahub-web-react/src/app/previewV2/HealthPopover.tsx +++ b/datahub-web-react/src/app/previewV2/HealthPopover.tsx @@ -4,9 +4,11 @@ import { Typography } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { Health, HealthStatus, HealthStatusType } from '../../types.generated'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; -import { useEmbeddedProfileLinkProps } from '../shared/useEmbeddedProfileLinkProps'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { useEmbeddedProfileLinkProps } from '@app/shared/useEmbeddedProfileLinkProps'; + +import { Health, HealthStatus, HealthStatusType } from '@types'; const Content = styled.div` display: flex; diff --git a/datahub-web-react/src/app/previewV2/ImageWIthColoredBackground.tsx b/datahub-web-react/src/app/previewV2/ImageWIthColoredBackground.tsx index 89d5ad725b..68229a234c 100644 --- a/datahub-web-react/src/app/previewV2/ImageWIthColoredBackground.tsx +++ b/datahub-web-react/src/app/previewV2/ImageWIthColoredBackground.tsx @@ -1,8 +1,9 @@ import ColorThief from 'colorthief'; import React from 'react'; import styled from 'styled-components'; -import { getLighterRGBColor } from '../sharedV2/icons/colorUtils'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getLighterRGBColor } from '@app/sharedV2/icons/colorUtils'; type Props = { src: string; diff --git a/datahub-web-react/src/app/previewV2/LineageBadge.tsx b/datahub-web-react/src/app/previewV2/LineageBadge.tsx index 4f3910f444..fe6152f8da 100644 --- a/datahub-web-react/src/app/previewV2/LineageBadge.tsx +++ b/datahub-web-react/src/app/previewV2/LineageBadge.tsx @@ -1,14 +1,17 @@ -import React from 'react'; -import styled from 'styled-components'; -import { Link } from 'react-router-dom'; import { Popover } from '@components'; -import { EntityType } from '../../types.generated'; -import EntityRegistry from '../entityV2/EntityRegistry'; -import LineageStatusIcon from '../../images/lineage-status.svg?react'; -import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '../entityV2/shared/constants'; -import { pluralize } from '../shared/textUtil'; -import { isNullOrUndefined } from './utils'; -import { useEmbeddedProfileLinkProps } from '../shared/useEmbeddedProfileLinkProps'; +import React from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components'; + +import EntityRegistry from '@app/entityV2/EntityRegistry'; +import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { isNullOrUndefined } from '@app/previewV2/utils'; +import { pluralize } from '@app/shared/textUtil'; +import { useEmbeddedProfileLinkProps } from '@app/shared/useEmbeddedProfileLinkProps'; + +import { EntityType } from '@types'; + +import LineageStatusIcon from '@images/lineage-status.svg?react'; const Icon = styled(LineageStatusIcon)<{ highlighted?: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/previewV2/NotesIcon.tsx b/datahub-web-react/src/app/previewV2/NotesIcon.tsx index 99f5dc9569..3a11ff8b9a 100644 --- a/datahub-web-react/src/app/previewV2/NotesIcon.tsx +++ b/datahub-web-react/src/app/previewV2/NotesIcon.tsx @@ -1,10 +1,12 @@ -import React from 'react'; -import styled from 'styled-components'; import { Popover } from '@components'; import { CampaignOutlined } from '@mui/icons-material'; -import { Post } from '../../types.generated'; -import { pluralize } from '../shared/textUtil'; -import { COLORS } from '../sharedV2/colors'; +import React from 'react'; +import styled from 'styled-components'; + +import { pluralize } from '@app/shared/textUtil'; +import { COLORS } from '@app/sharedV2/colors'; + +import { Post } from '@types'; const IconWrapper = styled.div<{ count: number }>` display: flex; diff --git a/datahub-web-react/src/app/previewV2/Pills.tsx b/datahub-web-react/src/app/previewV2/Pills.tsx index c8467c6eb6..00fcc118a2 100644 --- a/datahub-web-react/src/app/previewV2/Pills.tsx +++ b/datahub-web-react/src/app/previewV2/Pills.tsx @@ -1,17 +1,19 @@ import { LayoutOutlined } from '@ant-design/icons'; -import React, { useContext } from 'react'; import AccountCircleOutlinedIcon from '@mui/icons-material/AccountCircleOutlined'; import FindInPageOutlinedIcon from '@mui/icons-material/FindInPageOutlined'; import SellOutlinedIcon from '@mui/icons-material/SellOutlined'; -import styled from 'styled-components'; import { BookmarkSimple } from '@phosphor-icons/react'; -import { useMatchedFieldsForList } from '../search/context/SearchResultContext'; -import { EntityPath, EntityType, GlobalTags, GlossaryTerms, LineageDirection, Owner } from '../../types.generated'; -import { EntityCapabilityType } from '../entityV2/Entity'; -import MatchesContext, { PreviewSection } from '../shared/MatchesContext'; -import SearchPill from './SearchPill'; -import { entityHasCapability, getHighlightedTag } from './utils'; -import { LineageTabContext } from '../entityV2/shared/tabs/Lineage/LineageTabContext'; +import React, { useContext } from 'react'; +import styled from 'styled-components'; + +import { EntityCapabilityType } from '@app/entityV2/Entity'; +import { LineageTabContext } from '@app/entityV2/shared/tabs/Lineage/LineageTabContext'; +import SearchPill from '@app/previewV2/SearchPill'; +import { entityHasCapability, getHighlightedTag } from '@app/previewV2/utils'; +import { useMatchedFieldsForList } from '@app/search/context/SearchResultContext'; +import MatchesContext, { PreviewSection } from '@app/shared/MatchesContext'; + +import { EntityPath, EntityType, GlobalTags, GlossaryTerms, LineageDirection, Owner } from '@types'; const PillsContainer = styled.div` gap: 5px; diff --git a/datahub-web-react/src/app/previewV2/PreviewCardFooterRightSection.tsx b/datahub-web-react/src/app/previewV2/PreviewCardFooterRightSection.tsx index cb9f082b88..ef2a451387 100644 --- a/datahub-web-react/src/app/previewV2/PreviewCardFooterRightSection.tsx +++ b/datahub-web-react/src/app/previewV2/PreviewCardFooterRightSection.tsx @@ -1,22 +1,23 @@ +import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Divider } from 'antd'; -import { DatasetStatsSummary, EntityType } from '../../types.generated'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; -import { EntityCapabilityType } from '../entityV2/Entity'; -import { usePreviewData } from '../entityV2/shared/PreviewContext'; -import { entityHasCapability } from './utils'; -import EntityRegistry from '../entityV2/EntityRegistry'; -import LineageBadge from './LineageBadge'; -import Freshness from './Freshness'; + +import { EntityCapabilityType } from '@app/entityV2/Entity'; +import EntityRegistry from '@app/entityV2/EntityRegistry'; +import { usePreviewData } from '@app/entityV2/shared/PreviewContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import SidebarPopularityHeaderSection from '@app/entityV2/shared/containers/profile/sidebar/shared/SidebarPopularityHeaderSection'; import { PopularityTier, getBarsStatusFromPopularityTier, -} from '../entityV2/shared/containers/profile/sidebar/shared/utils'; -import QueryStat from './QueryStat'; -import SidebarPopularityHeaderSection from '../entityV2/shared/containers/profile/sidebar/shared/SidebarPopularityHeaderSection'; +} from '@app/entityV2/shared/containers/profile/sidebar/shared/utils'; +import { DashboardLastUpdatedMs, DatasetLastUpdatedMs } from '@app/entityV2/shared/utils'; +import Freshness from '@app/previewV2/Freshness'; +import LineageBadge from '@app/previewV2/LineageBadge'; +import QueryStat from '@app/previewV2/QueryStat'; +import { entityHasCapability } from '@app/previewV2/utils'; -import { DatasetLastUpdatedMs, DashboardLastUpdatedMs } from '../entityV2/shared/utils'; +import { DatasetStatsSummary, EntityType } from '@types'; const Container = styled.div` text-align: center; diff --git a/datahub-web-react/src/app/previewV2/QueryStat.tsx b/datahub-web-react/src/app/previewV2/QueryStat.tsx index 21b0313841..1882d91359 100644 --- a/datahub-web-react/src/app/previewV2/QueryStat.tsx +++ b/datahub-web-react/src/app/previewV2/QueryStat.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { formatNumber } from '../shared/formatNumber'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { formatNumber } from '@app/shared/formatNumber'; const Container = styled.div` color: ${REDESIGN_COLORS.FOUNDATION_BLUE_4}; diff --git a/datahub-web-react/src/app/previewV2/SearchPill.tsx b/datahub-web-react/src/app/previewV2/SearchPill.tsx index 4b5250e459..4d8b348a54 100644 --- a/datahub-web-react/src/app/previewV2/SearchPill.tsx +++ b/datahub-web-react/src/app/previewV2/SearchPill.tsx @@ -1,8 +1,9 @@ import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { pluralize } from '../shared/textUtil'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { pluralize } from '@app/shared/textUtil'; type Props = { icon: any; diff --git a/datahub-web-react/src/app/previewV2/__tests__/utils.test.ts b/datahub-web-react/src/app/previewV2/__tests__/utils.test.ts index e3208fabfc..9f230026fc 100644 --- a/datahub-web-react/src/app/previewV2/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/previewV2/__tests__/utils.test.ts @@ -1,6 +1,6 @@ -import { entityCapabilities, globalTags, owners } from '../../../Mocks'; -import { EntityCapabilityType } from '../../entityV2/Entity'; -import { entityHasCapability, getHighlightedTag, getUniqueOwners } from '../utils'; +import { EntityCapabilityType } from '@app/entityV2/Entity'; +import { entityHasCapability, getHighlightedTag, getUniqueOwners } from '@app/previewV2/utils'; +import { entityCapabilities, globalTags, owners } from '@src/Mocks'; describe('Preview V2 utils tests', () => { it('getUniqueOwners -> should return all unique owners based on URN', () => { diff --git a/datahub-web-react/src/app/previewV2/utils.ts b/datahub-web-react/src/app/previewV2/utils.ts index 3c72600990..f24517bac9 100644 --- a/datahub-web-react/src/app/previewV2/utils.ts +++ b/datahub-web-react/src/app/previewV2/utils.ts @@ -1,9 +1,11 @@ import { Modal, message } from 'antd'; + +import { useEntityContext } from '@app/entity/shared/EntityContext'; +import { EntityCapabilityType } from '@app/entityV2/Entity'; import { useBatchSetDataProductMutation } from '@src/graphql/dataProduct.generated'; -import { useRemoveTermMutation, useUnsetDomainMutation } from '../../graphql/mutations.generated'; -import { BrowsePathV2, GlobalTags, Owner } from '../../types.generated'; -import { EntityCapabilityType } from '../entityV2/Entity'; -import { useEntityContext } from '../entity/shared/EntityContext'; + +import { useRemoveTermMutation, useUnsetDomainMutation } from '@graphql/mutations.generated'; +import { BrowsePathV2, GlobalTags, Owner } from '@types'; export function getUniqueOwners(owners?: Owner[] | null) { const uniqueOwnerUrns = new Set(); diff --git a/datahub-web-react/src/app/recommendations/RecommendationModule.tsx b/datahub-web-react/src/app/recommendations/RecommendationModule.tsx index 6efe3158d4..6578a4a3ea 100644 --- a/datahub-web-react/src/app/recommendations/RecommendationModule.tsx +++ b/datahub-web-react/src/app/recommendations/RecommendationModule.tsx @@ -1,10 +1,12 @@ import { Typography } from 'antd'; import React, { useEffect, useMemo } from 'react'; import { v4 as uuidv4 } from 'uuid'; -import { RecommendationModule as RecommendationModuleType, ScenarioType } from '../../types.generated'; -import analytics, { EventType } from '../analytics'; -import { renderTypeToRenderer } from './renderers'; -import { RecommendationDisplayType } from './types'; + +import analytics, { EventType } from '@app/analytics'; +import { renderTypeToRenderer } from '@app/recommendations/renderers'; +import { RecommendationDisplayType } from '@app/recommendations/types'; + +import { RecommendationModule as RecommendationModuleType, ScenarioType } from '@types'; type Props = { module: RecommendationModuleType; diff --git a/datahub-web-react/src/app/recommendations/__tests__/Recommendations.test.tsx b/datahub-web-react/src/app/recommendations/__tests__/Recommendations.test.tsx index 282a7b7006..3048676c1d 100644 --- a/datahub-web-react/src/app/recommendations/__tests__/Recommendations.test.tsx +++ b/datahub-web-react/src/app/recommendations/__tests__/Recommendations.test.tsx @@ -1,12 +1,13 @@ -import React from 'react'; -import { render, waitFor } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; +import { render, waitFor } from '@testing-library/react'; +import React from 'react'; import { Route } from 'react-router'; -import { HomePage } from '../../home/HomePage'; -import { mocks } from '../../../Mocks'; -import TestPageContainer from '../../../utils/test-utils/TestPageContainer'; -import { PageRoutes } from '../../../conf/Global'; -import { SearchPage } from '../../search/SearchPage'; + +import { HomePage } from '@app/home/HomePage'; +import { SearchPage } from '@app/search/SearchPage'; +import { PageRoutes } from '@conf/Global'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; describe('Recommendations', () => { it('home renders recommendations', async () => { diff --git a/datahub-web-react/src/app/recommendations/renderer/DomainSearchListRenderer.tsx b/datahub-web-react/src/app/recommendations/renderer/DomainSearchListRenderer.tsx index e0414683ff..bbab65fbf7 100644 --- a/datahub-web-react/src/app/recommendations/renderer/DomainSearchListRenderer.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/DomainSearchListRenderer.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { RecommendationRenderProps } from '../types'; -import { recommendationClickEvent } from '../util/recommendationClickEvent'; -import { DomainSearchList } from './component/DomainSearchList'; + +import { DomainSearchList } from '@app/recommendations/renderer/component/DomainSearchList'; +import { RecommendationRenderProps } from '@app/recommendations/types'; +import { recommendationClickEvent } from '@app/recommendations/util/recommendationClickEvent'; export const DomainSearchListRenderer = ({ renderId, diff --git a/datahub-web-react/src/app/recommendations/renderer/EntityNameListRenderer.tsx b/datahub-web-react/src/app/recommendations/renderer/EntityNameListRenderer.tsx index 159913e2d8..37edeca877 100644 --- a/datahub-web-react/src/app/recommendations/renderer/EntityNameListRenderer.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/EntityNameListRenderer.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { Entity } from '../../../types.generated'; -import { CompactEntityNameList } from './component/CompactEntityNameList'; -import { EntityNameList } from './component/EntityNameList'; -import { recommendationClickEvent } from '../util/recommendationClickEvent'; -import { RecommendationDisplayType, RecommendationRenderProps } from '../types'; + +import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList'; +import { EntityNameList } from '@app/recommendations/renderer/component/EntityNameList'; +import { RecommendationDisplayType, RecommendationRenderProps } from '@app/recommendations/types'; +import { recommendationClickEvent } from '@app/recommendations/util/recommendationClickEvent'; + +import { Entity } from '@types'; export const EntityNameListRenderer = ({ renderId, diff --git a/datahub-web-react/src/app/recommendations/renderer/GlossaryTermSearchListRenderer.tsx b/datahub-web-react/src/app/recommendations/renderer/GlossaryTermSearchListRenderer.tsx index c77ad49b00..ee9612f82c 100644 --- a/datahub-web-react/src/app/recommendations/renderer/GlossaryTermSearchListRenderer.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/GlossaryTermSearchListRenderer.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { RecommendationRenderProps } from '../types'; -import { recommendationClickEvent } from '../util/recommendationClickEvent'; -import { GlossaryTermSearchList } from './component/GlossaryTermSearchList'; + +import { GlossaryTermSearchList } from '@app/recommendations/renderer/component/GlossaryTermSearchList'; +import { RecommendationRenderProps } from '@app/recommendations/types'; +import { recommendationClickEvent } from '@app/recommendations/util/recommendationClickEvent'; export const GlossaryTermSearchListRenderer = ({ renderId, diff --git a/datahub-web-react/src/app/recommendations/renderer/PlatformListRenderer.tsx b/datahub-web-react/src/app/recommendations/renderer/PlatformListRenderer.tsx index 9f58331406..211ed13dec 100644 --- a/datahub-web-react/src/app/recommendations/renderer/PlatformListRenderer.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/PlatformListRenderer.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { RecommendationRenderProps } from '../types'; -import { recommendationClickEvent } from '../util/recommendationClickEvent'; -import { PlatformList } from './component/PlatformList'; + +import { PlatformList } from '@app/recommendations/renderer/component/PlatformList'; +import { RecommendationRenderProps } from '@app/recommendations/types'; +import { recommendationClickEvent } from '@app/recommendations/util/recommendationClickEvent'; export const PlatformListRenderer = ({ renderId, diff --git a/datahub-web-react/src/app/recommendations/renderer/SearchQueryListRenderer.tsx b/datahub-web-react/src/app/recommendations/renderer/SearchQueryListRenderer.tsx index a273039a42..52b45a5fd3 100644 --- a/datahub-web-react/src/app/recommendations/renderer/SearchQueryListRenderer.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/SearchQueryListRenderer.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { RecommendationRenderProps } from '../types'; -import { recommendationClickEvent } from '../util/recommendationClickEvent'; -import { SearchQueryList } from './component/SearchQueryList'; + +import { SearchQueryList } from '@app/recommendations/renderer/component/SearchQueryList'; +import { RecommendationRenderProps } from '@app/recommendations/types'; +import { recommendationClickEvent } from '@app/recommendations/util/recommendationClickEvent'; export const SearchQueryListRenderer = ({ renderId, diff --git a/datahub-web-react/src/app/recommendations/renderer/TagSearchListRenderer.tsx b/datahub-web-react/src/app/recommendations/renderer/TagSearchListRenderer.tsx index 2c2a8ae48a..446e418912 100644 --- a/datahub-web-react/src/app/recommendations/renderer/TagSearchListRenderer.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/TagSearchListRenderer.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { RecommendationRenderProps } from '../types'; -import { recommendationClickEvent } from '../util/recommendationClickEvent'; -import { TagSearchList } from './component/TagSearchList'; + +import { TagSearchList } from '@app/recommendations/renderer/component/TagSearchList'; +import { RecommendationRenderProps } from '@app/recommendations/types'; +import { recommendationClickEvent } from '@app/recommendations/util/recommendationClickEvent'; export const TagSearchListRenderer = ({ renderId, diff --git a/datahub-web-react/src/app/recommendations/renderer/component/CompactEntityNameComponent.tsx b/datahub-web-react/src/app/recommendations/renderer/component/CompactEntityNameComponent.tsx index baa47a19b8..c2a03a02cd 100644 --- a/datahub-web-react/src/app/recommendations/renderer/component/CompactEntityNameComponent.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/component/CompactEntityNameComponent.tsx @@ -2,12 +2,14 @@ import { ArrowRightOutlined } from '@ant-design/icons'; import { TooltipPlacement } from 'antd/es/tooltip'; import React from 'react'; import styled from 'styled-components/macro'; -import { Entity, EntityType, SchemaFieldEntity } from '../../../../types.generated'; -import { IconStyleType } from '../../../entity/Entity'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { EntityPreviewTag } from './EntityPreviewTag'; -import { HoverEntityTooltip } from './HoverEntityTooltip'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { EntityPreviewTag } from '@app/recommendations/renderer/component/EntityPreviewTag'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, EntityType, SchemaFieldEntity } from '@types'; const NameWrapper = styled.span<{ addMargin: boolean }>` display: inline-flex; diff --git a/datahub-web-react/src/app/recommendations/renderer/component/CompactEntityNameList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/CompactEntityNameList.tsx index d918b4458c..c9f2233507 100644 --- a/datahub-web-react/src/app/recommendations/renderer/component/CompactEntityNameList.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/component/CompactEntityNameList.tsx @@ -1,7 +1,8 @@ -import { Entity } from '@src/types.generated'; import { TooltipPlacement } from 'antd/es/tooltip'; import React from 'react'; -import { CompactEntityNameComponent } from './CompactEntityNameComponent'; + +import { CompactEntityNameComponent } from '@app/recommendations/renderer/component/CompactEntityNameComponent'; +import { Entity } from '@src/types.generated'; type CompactEntityNameListProps = { entities: Array; diff --git a/datahub-web-react/src/app/recommendations/renderer/component/DomainSearchList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/DomainSearchList.tsx index c82521dab1..44c0ab71ca 100644 --- a/datahub-web-react/src/app/recommendations/renderer/component/DomainSearchList.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/component/DomainSearchList.tsx @@ -2,13 +2,15 @@ import { ArrowRightOutlined } from '@ant-design/icons'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { Domain, EntityType, RecommendationContent } from '../../../../types.generated'; -import { LogoCountCard } from '../../../shared/LogoCountCard'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import DomainIcon from '../../../domain/DomainIcon'; -import { PageRoutes } from '../../../../conf/Global'; -import { HomePageButton } from '../../../shared/components'; -import { HoverEntityTooltip } from './HoverEntityTooltip'; + +import DomainIcon from '@app/domain/DomainIcon'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { LogoCountCard } from '@app/shared/LogoCountCard'; +import { HomePageButton } from '@app/shared/components'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; + +import { Domain, EntityType, RecommendationContent } from '@types'; const DomainListContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/recommendations/renderer/component/EntityNameList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/EntityNameList.tsx index 9e8454ae22..188146a3af 100644 --- a/datahub-web-react/src/app/recommendations/renderer/component/EntityNameList.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/component/EntityNameList.tsx @@ -1,12 +1,14 @@ -import React from 'react'; import { Divider, List } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { Entity } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import DefaultPreviewCard from '../../../preview/DefaultPreviewCard'; -import { IconStyleType } from '../../../entity/Entity'; -import { getPlatformName } from '../../../entity/shared/utils'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; + +import { IconStyleType } from '@app/entity/Entity'; +import { getPlatformName } from '@app/entity/shared/utils'; +import DefaultPreviewCard from '@app/preview/DefaultPreviewCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity } from '@types'; export const StyledList = styled(List)` overflow-y: auto; diff --git a/datahub-web-react/src/app/recommendations/renderer/component/EntityPreviewTag.tsx b/datahub-web-react/src/app/recommendations/renderer/component/EntityPreviewTag.tsx index 3d7c57ca20..39b079fdc6 100644 --- a/datahub-web-react/src/app/recommendations/renderer/component/EntityPreviewTag.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/component/EntityPreviewTag.tsx @@ -1,11 +1,12 @@ import { Tooltip } from '@components'; -import { useEmbeddedProfileLinkProps } from '@src/app/shared/useEmbeddedProfileLinkProps'; import { Divider, Image, Tag } from 'antd'; import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useEmbeddedProfileLinkProps } from '@src/app/shared/useEmbeddedProfileLinkProps'; const EntityTag = styled(Tag)` margin: 4px; diff --git a/datahub-web-react/src/app/recommendations/renderer/component/GlossaryTermSearchList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/GlossaryTermSearchList.tsx index 7c3c6604eb..e2b75a3f78 100644 --- a/datahub-web-react/src/app/recommendations/renderer/component/GlossaryTermSearchList.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/component/GlossaryTermSearchList.tsx @@ -1,12 +1,14 @@ -import React from 'react'; -import styled from 'styled-components'; import { BookOutlined } from '@ant-design/icons'; import { Button, Tag } from 'antd'; +import React from 'react'; import { useHistory } from 'react-router-dom'; -import { RecommendationContent, GlossaryTerm } from '../../../../types.generated'; -import { navigateToSearchUrl } from '../../../search/utils/navigateToSearchUrl'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { UnionType } from '../../../search/utils/constants'; +import styled from 'styled-components'; + +import { UnionType } from '@app/search/utils/constants'; +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { GlossaryTerm, RecommendationContent } from '@types'; const TermSearchListContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/recommendations/renderer/component/HoverEntityTooltip.tsx b/datahub-web-react/src/app/recommendations/renderer/component/HoverEntityTooltip.tsx index 0bf2f0eebc..0e5fb4ef3b 100644 --- a/datahub-web-react/src/app/recommendations/renderer/component/HoverEntityTooltip.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/component/HoverEntityTooltip.tsx @@ -1,10 +1,12 @@ import { Tooltip } from '@components'; import { TooltipPlacement } from 'antd/es/tooltip'; import React from 'react'; -import { Entity } from '../../../../types.generated'; -import { PreviewType } from '../../../entity/Entity'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { HoverEntityTooltipContext } from '../../HoverEntityTooltipContext'; + +import { PreviewType } from '@app/entity/Entity'; +import { HoverEntityTooltipContext } from '@app/recommendations/HoverEntityTooltipContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity } from '@types'; type Props = { entity?: Entity; diff --git a/datahub-web-react/src/app/recommendations/renderer/component/PlatformList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/PlatformList.tsx index 30d3c87b4d..fad0d6492f 100644 --- a/datahub-web-react/src/app/recommendations/renderer/component/PlatformList.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/component/PlatformList.tsx @@ -1,11 +1,13 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { PageRoutes } from '../../../../conf/Global'; -import { DataPlatform, RecommendationContent } from '../../../../types.generated'; -import { urlEncodeUrn } from '../../../entity/shared/utils'; -import { LogoCountCard } from '../../../shared/LogoCountCard'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; + +import { urlEncodeUrn } from '@app/entity/shared/utils'; +import { LogoCountCard } from '@app/shared/LogoCountCard'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { PageRoutes } from '@conf/Global'; + +import { DataPlatform, RecommendationContent } from '@types'; const PlatformListContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/recommendations/renderer/component/SearchQueryList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/SearchQueryList.tsx index d84918c04b..5f586b7b1d 100644 --- a/datahub-web-react/src/app/recommendations/renderer/component/SearchQueryList.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/component/SearchQueryList.tsx @@ -2,8 +2,10 @@ import { Button, Tag } from 'antd'; import React from 'react'; import { useHistory } from 'react-router-dom'; import styled from 'styled-components'; -import { EntityType, FacetFilterInput, RecommendationContent, SearchParams } from '../../../../types.generated'; -import { navigateToSearchUrl } from '../../../search/utils/navigateToSearchUrl'; + +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; + +import { EntityType, FacetFilterInput, RecommendationContent, SearchParams } from '@types'; const SearchQueryListContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/recommendations/renderer/component/TagSearchList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/TagSearchList.tsx index 62dff17683..d97ec326b0 100644 --- a/datahub-web-react/src/app/recommendations/renderer/component/TagSearchList.tsx +++ b/datahub-web-react/src/app/recommendations/renderer/component/TagSearchList.tsx @@ -2,11 +2,13 @@ import { Button } from 'antd'; import React from 'react'; import { useHistory } from 'react-router-dom'; import styled from 'styled-components'; -import { EntityType, RecommendationContent, Tag } from '../../../../types.generated'; -import { StyledTag } from '../../../entity/shared/components/styled/StyledTag'; -import { UnionType } from '../../../search/utils/constants'; -import { navigateToSearchUrl } from '../../../search/utils/navigateToSearchUrl'; -import { useEntityRegistry } from '../../../useEntityRegistry'; + +import { StyledTag } from '@app/entity/shared/components/styled/StyledTag'; +import { UnionType } from '@app/search/utils/constants'; +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, RecommendationContent, Tag } from '@types'; const TagSearchListContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/recommendations/renderers.ts b/datahub-web-react/src/app/recommendations/renderers.ts index bc83117912..726c90193d 100644 --- a/datahub-web-react/src/app/recommendations/renderers.ts +++ b/datahub-web-react/src/app/recommendations/renderers.ts @@ -1,12 +1,14 @@ import React from 'react'; -import { RecommendationRenderType } from '../../types.generated'; -import { SearchQueryList } from './renderer/component/SearchQueryList'; -import { EntityNameListRenderer } from './renderer/EntityNameListRenderer'; -import { PlatformListRenderer } from './renderer/PlatformListRenderer'; -import { TagSearchListRenderer } from './renderer/TagSearchListRenderer'; -import { GlossaryTermSearchListRenderer } from './renderer/GlossaryTermSearchListRenderer'; -import { RecommendationRenderProps } from './types'; -import { DomainSearchListRenderer } from './renderer/DomainSearchListRenderer'; + +import { DomainSearchListRenderer } from '@app/recommendations/renderer/DomainSearchListRenderer'; +import { EntityNameListRenderer } from '@app/recommendations/renderer/EntityNameListRenderer'; +import { GlossaryTermSearchListRenderer } from '@app/recommendations/renderer/GlossaryTermSearchListRenderer'; +import { PlatformListRenderer } from '@app/recommendations/renderer/PlatformListRenderer'; +import { TagSearchListRenderer } from '@app/recommendations/renderer/TagSearchListRenderer'; +import { SearchQueryList } from '@app/recommendations/renderer/component/SearchQueryList'; +import { RecommendationRenderProps } from '@app/recommendations/types'; + +import { RecommendationRenderType } from '@types'; /** * Renderers that are responsible for rendering recommendations of a particular RenderType! diff --git a/datahub-web-react/src/app/recommendations/types.ts b/datahub-web-react/src/app/recommendations/types.ts index 280202e900..07c730c188 100644 --- a/datahub-web-react/src/app/recommendations/types.ts +++ b/datahub-web-react/src/app/recommendations/types.ts @@ -1,4 +1,4 @@ -import { RecommendationContent, RecommendationRenderType, ScenarioType } from '../../types.generated'; +import { RecommendationContent, RecommendationRenderType, ScenarioType } from '@types'; /** * The display type that should be used when rendering the recommendation. diff --git a/datahub-web-react/src/app/recommendations/util/recommendationClickEvent.ts b/datahub-web-react/src/app/recommendations/util/recommendationClickEvent.ts index 68bb5ab0bb..c2750db94b 100644 --- a/datahub-web-react/src/app/recommendations/util/recommendationClickEvent.ts +++ b/datahub-web-react/src/app/recommendations/util/recommendationClickEvent.ts @@ -1,5 +1,6 @@ -import { RecommendationRenderType, ScenarioType } from '../../../types.generated'; -import analytics, { EventType } from '../../analytics'; +import analytics, { EventType } from '@app/analytics'; + +import { RecommendationRenderType, ScenarioType } from '@types'; export function recommendationClickEvent({ renderId, diff --git a/datahub-web-react/src/app/search/AdvancedFilterSelectValueModal.tsx b/datahub-web-react/src/app/search/AdvancedFilterSelectValueModal.tsx index 43b4388e92..4e0493c506 100644 --- a/datahub-web-react/src/app/search/AdvancedFilterSelectValueModal.tsx +++ b/datahub-web-react/src/app/search/AdvancedFilterSelectValueModal.tsx @@ -1,12 +1,11 @@ import React from 'react'; -import { FacetMetadata, EntityType } from '../../types.generated'; -import { ContainerSelectModal } from '../entity/shared/containers/profile/sidebar/Container/ContainerSelectModal'; -import { SetDomainModal } from '../entity/shared/containers/profile/sidebar/Domain/SetDomainModal'; -import { EditOwnersModal } from '../entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal'; -import { SelectPlatformModal } from '../entity/shared/containers/profile/sidebar/Platform/SelectPlatformModal'; -import EditTagTermsModal from '../shared/tags/AddTagsTermsModal'; -import { ChooseEntityTypeModal } from './ChooseEntityTypeModal'; -import { EditTextModal } from './EditTextModal'; + +import { ContainerSelectModal } from '@app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal'; +import { SetDomainModal } from '@app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal'; +import { EditOwnersModal } from '@app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal'; +import { SelectPlatformModal } from '@app/entity/shared/containers/profile/sidebar/Platform/SelectPlatformModal'; +import { ChooseEntityTypeModal } from '@app/search/ChooseEntityTypeModal'; +import { EditTextModal } from '@app/search/EditTextModal'; import { CONTAINER_FILTER_NAME, DESCRIPTION_FILTER_NAME, @@ -23,7 +22,10 @@ import { REMOVED_FILTER_NAME, TAGS_FILTER_NAME, TYPE_NAMES_FILTER_NAME, -} from './utils/constants'; +} from '@app/search/utils/constants'; +import EditTagTermsModal from '@app/shared/tags/AddTagsTermsModal'; + +import { EntityType, FacetMetadata } from '@types'; type Props = { facet?: FacetMetadata | null; diff --git a/datahub-web-react/src/app/search/AdvancedSearchAddFilterSelect.tsx b/datahub-web-react/src/app/search/AdvancedSearchAddFilterSelect.tsx index 753742b6e3..989b41fb53 100644 --- a/datahub-web-react/src/app/search/AdvancedSearchAddFilterSelect.tsx +++ b/datahub-web-react/src/app/search/AdvancedSearchAddFilterSelect.tsx @@ -1,10 +1,11 @@ +import { PlusOutlined } from '@ant-design/icons'; import { Select } from 'antd'; import * as React from 'react'; import styled from 'styled-components'; -import { PlusOutlined } from '@ant-design/icons'; -import { FacetFilterInput } from '../../types.generated'; -import { DEGREE_FILTER_NAME, FIELD_TO_LABEL, ORDERED_FIELDS } from './utils/constants'; +import { DEGREE_FILTER_NAME, FIELD_TO_LABEL, ORDERED_FIELDS } from '@app/search/utils/constants'; + +import { FacetFilterInput } from '@types'; const StyledPlus = styled(PlusOutlined)` margin-right: 6px; diff --git a/datahub-web-react/src/app/search/AdvancedSearchFilter.tsx b/datahub-web-react/src/app/search/AdvancedSearchFilter.tsx index f30a3fa764..794458ec0f 100644 --- a/datahub-web-react/src/app/search/AdvancedSearchFilter.tsx +++ b/datahub-web-react/src/app/search/AdvancedSearchFilter.tsx @@ -1,15 +1,16 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata } from '../../types.generated'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { AdvancedSearchFilterConditionSelect } from './AdvancedSearchFilterConditionSelect'; -import { AdvancedFilterSelectValueModal } from './AdvancedFilterSelectValueModal'; -import { ENTITY_SUB_TYPE_FILTER_NAME, FIELD_TO_LABEL } from './utils/constants'; -import { AdvancedSearchFilterValuesSection } from './AdvancedSearchFilterValuesSection'; -import AdvancedFilterCloseButton from './advanced/AdvancedFilterCloseButton'; -import { FilterContainer } from './advanced/styles'; -import EntitySubTypeAdvancedFilterLabel from './advanced/EntitySubTypeAdvancedFilterLabel'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { AdvancedFilterSelectValueModal } from '@app/search/AdvancedFilterSelectValueModal'; +import { AdvancedSearchFilterConditionSelect } from '@app/search/AdvancedSearchFilterConditionSelect'; +import { AdvancedSearchFilterValuesSection } from '@app/search/AdvancedSearchFilterValuesSection'; +import AdvancedFilterCloseButton from '@app/search/advanced/AdvancedFilterCloseButton'; +import EntitySubTypeAdvancedFilterLabel from '@app/search/advanced/EntitySubTypeAdvancedFilterLabel'; +import { FilterContainer } from '@app/search/advanced/styles'; +import { ENTITY_SUB_TYPE_FILTER_NAME, FIELD_TO_LABEL } from '@app/search/utils/constants'; + +import { FacetFilterInput, FacetMetadata } from '@types'; type Props = { facet: FacetMetadata; diff --git a/datahub-web-react/src/app/search/AdvancedSearchFilterConditionSelect.tsx b/datahub-web-react/src/app/search/AdvancedSearchFilterConditionSelect.tsx index 94fffd0126..294d571ae4 100644 --- a/datahub-web-react/src/app/search/AdvancedSearchFilterConditionSelect.tsx +++ b/datahub-web-react/src/app/search/AdvancedSearchFilterConditionSelect.tsx @@ -1,8 +1,8 @@ import { Select } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { FacetFilterInput } from '../../types.generated'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; import { DESCRIPTION_FILTER_NAME, DOMAINS_FILTER_NAME, @@ -12,7 +12,9 @@ import { ORIGIN_FILTER_NAME, REMOVED_FILTER_NAME, TYPE_NAMES_FILTER_NAME, -} from './utils/constants'; +} from '@app/search/utils/constants'; + +import { FacetFilterInput } from '@types'; type Props = { filter: FacetFilterInput; diff --git a/datahub-web-react/src/app/search/AdvancedSearchFilterOverallUnionTypeSelect.tsx b/datahub-web-react/src/app/search/AdvancedSearchFilterOverallUnionTypeSelect.tsx index a37605182f..47b26cdf99 100644 --- a/datahub-web-react/src/app/search/AdvancedSearchFilterOverallUnionTypeSelect.tsx +++ b/datahub-web-react/src/app/search/AdvancedSearchFilterOverallUnionTypeSelect.tsx @@ -2,8 +2,8 @@ import { Select } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { UnionType } from './utils/constants'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { UnionType } from '@app/search/utils/constants'; type Props = { unionType: UnionType; diff --git a/datahub-web-react/src/app/search/AdvancedSearchFilterValuesSection.tsx b/datahub-web-react/src/app/search/AdvancedSearchFilterValuesSection.tsx index 04dc9a0f03..6b8b1464c1 100644 --- a/datahub-web-react/src/app/search/AdvancedSearchFilterValuesSection.tsx +++ b/datahub-web-react/src/app/search/AdvancedSearchFilterValuesSection.tsx @@ -1,8 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata } from '../../types.generated'; -import { SearchFilterLabel } from './SearchFilterLabel'; +import { SearchFilterLabel } from '@app/search/SearchFilterLabel'; + +import { FacetFilterInput, FacetMetadata } from '@types'; type Props = { facet: FacetMetadata; diff --git a/datahub-web-react/src/app/search/AdvancedSearchFilters.tsx b/datahub-web-react/src/app/search/AdvancedSearchFilters.tsx index d652b64012..b9aae02149 100644 --- a/datahub-web-react/src/app/search/AdvancedSearchFilters.tsx +++ b/datahub-web-react/src/app/search/AdvancedSearchFilters.tsx @@ -1,13 +1,15 @@ import * as React from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata } from '../../types.generated'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { AdvancedSearchFilter } from './AdvancedSearchFilter'; -import { AdvancedSearchFilterOverallUnionTypeSelect } from './AdvancedSearchFilterOverallUnionTypeSelect'; -import { AdvancedFilterSelectValueModal } from './AdvancedFilterSelectValueModal'; -import { UnionType } from './utils/constants'; -import { AdvancedSearchAddFilterSelect } from './AdvancedSearchAddFilterSelect'; -import useAdvancedSearchSelectFilters from './useAdvancedSearchSelectFilters'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { AdvancedFilterSelectValueModal } from '@app/search/AdvancedFilterSelectValueModal'; +import { AdvancedSearchAddFilterSelect } from '@app/search/AdvancedSearchAddFilterSelect'; +import { AdvancedSearchFilter } from '@app/search/AdvancedSearchFilter'; +import { AdvancedSearchFilterOverallUnionTypeSelect } from '@app/search/AdvancedSearchFilterOverallUnionTypeSelect'; +import useAdvancedSearchSelectFilters from '@app/search/useAdvancedSearchSelectFilters'; +import { UnionType } from '@app/search/utils/constants'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const AnyAllSection = styled.div` padding: 6px; diff --git a/datahub-web-react/src/app/search/AnalyticsLink.tsx b/datahub-web-react/src/app/search/AnalyticsLink.tsx index 15d3eddcac..3ded3bdf61 100644 --- a/datahub-web-react/src/app/search/AnalyticsLink.tsx +++ b/datahub-web-react/src/app/search/AnalyticsLink.tsx @@ -1,5 +1,5 @@ +import { Tag, Typography } from 'antd'; import * as React from 'react'; -import { Typography, Tag } from 'antd'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; diff --git a/datahub-web-react/src/app/search/BrowseEntityCard.tsx b/datahub-web-react/src/app/search/BrowseEntityCard.tsx index beacce04b4..ecaa43738f 100644 --- a/datahub-web-react/src/app/search/BrowseEntityCard.tsx +++ b/datahub-web-react/src/app/search/BrowseEntityCard.tsx @@ -1,16 +1,18 @@ -import styled from 'styled-components'; import React from 'react'; import { useHistory } from 'react-router-dom'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { PageRoutes } from '../../conf/Global'; -import { IconStyleType } from '../entity/Entity'; -import { EntityType } from '../../types.generated'; -import { LogoCountCard } from '../shared/LogoCountCard'; -import { EventType } from '../analytics/event'; -import analytics from '../analytics'; -import { navigateToSearchUrl } from './utils/navigateToSearchUrl'; -import { ENTITY_SUB_TYPE_FILTER_NAME } from './utils/constants'; -import { useIsBrowseV2 } from './useSearchAndBrowseVersion'; +import styled from 'styled-components'; + +import analytics from '@app/analytics'; +import { EventType } from '@app/analytics/event'; +import { IconStyleType } from '@app/entity/Entity'; +import { useIsBrowseV2 } from '@app/search/useSearchAndBrowseVersion'; +import { ENTITY_SUB_TYPE_FILTER_NAME } from '@app/search/utils/constants'; +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; +import { LogoCountCard } from '@app/shared/LogoCountCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; + +import { EntityType } from '@types'; const BrowseEntityCardWrapper = styled.div``; diff --git a/datahub-web-react/src/app/search/ChooseEntityTypeModal.tsx b/datahub-web-react/src/app/search/ChooseEntityTypeModal.tsx index dd611bba34..da0bef5f29 100644 --- a/datahub-web-react/src/app/search/ChooseEntityTypeModal.tsx +++ b/datahub-web-react/src/app/search/ChooseEntityTypeModal.tsx @@ -1,7 +1,9 @@ import { Button, Modal, Select } from 'antd'; import React, { useState } from 'react'; -import { EntityType } from '../../types.generated'; -import { useEntityRegistry } from '../useEntityRegistry'; + +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; type Props = { onCloseModal: () => void; diff --git a/datahub-web-react/src/app/search/CommandK.tsx b/datahub-web-react/src/app/search/CommandK.tsx index 13e55a0e3f..96d3827a58 100644 --- a/datahub-web-react/src/app/search/CommandK.tsx +++ b/datahub-web-react/src/app/search/CommandK.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Container = styled.div` color: ${ANTD_GRAY[6]}; diff --git a/datahub-web-react/src/app/search/EmptySearchResults.tsx b/datahub-web-react/src/app/search/EmptySearchResults.tsx index cde61f746d..80942ef758 100644 --- a/datahub-web-react/src/app/search/EmptySearchResults.tsx +++ b/datahub-web-react/src/app/search/EmptySearchResults.tsx @@ -1,15 +1,17 @@ import { RocketOutlined } from '@ant-design/icons'; -import { useHistory } from 'react-router'; import { Button } from 'antd'; import React, { useCallback } from 'react'; +import { useHistory } from 'react-router'; import styled from 'styled-components'; -import { ANTD_GRAY_V2 } from '../entity/shared/constants'; -import { navigateToSearchUrl } from './utils/navigateToSearchUrl'; -import analytics, { EventType } from '../analytics'; -import { SuggestedText } from './suggestions/SearchQuerySugggester'; -import useGetSearchQueryInputs from './useGetSearchQueryInputs'; -import { FacetFilterInput, SearchSuggestion } from '../../types.generated'; -import { useUserContext } from '../context/useUserContext'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { SuggestedText } from '@app/search/suggestions/SearchQuerySugggester'; +import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs'; +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; + +import { FacetFilterInput, SearchSuggestion } from '@types'; const NoDataContainer = styled.div` margin: 40px auto; diff --git a/datahub-web-react/src/app/search/PostLinkCard.tsx b/datahub-web-react/src/app/search/PostLinkCard.tsx index 72a4b1d294..2d22c4b57b 100644 --- a/datahub-web-react/src/app/search/PostLinkCard.tsx +++ b/datahub-web-react/src/app/search/PostLinkCard.tsx @@ -1,9 +1,11 @@ -import React from 'react'; -import { Button, Image, Typography } from 'antd'; import { ArrowRightOutlined } from '@ant-design/icons'; +import { Button, Image, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { Post } from '../../types.generated'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; + +import { Post } from '@types'; const CardContainer = styled(Button)` display: flex; diff --git a/datahub-web-react/src/app/search/PostTextCard.tsx b/datahub-web-react/src/app/search/PostTextCard.tsx index 15b34e37fc..efb790b280 100644 --- a/datahub-web-react/src/app/search/PostTextCard.tsx +++ b/datahub-web-react/src/app/search/PostTextCard.tsx @@ -1,8 +1,10 @@ -import React from 'react'; import { Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { Post } from '../../types.generated'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; + +import { Post } from '@types'; const CardContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/search/SearchBar.tsx b/datahub-web-react/src/app/search/SearchBar.tsx index 99bdff894e..2fb5a415ba 100644 --- a/datahub-web-react/src/app/search/SearchBar.tsx +++ b/datahub-web-react/src/app/search/SearchBar.tsx @@ -1,39 +1,41 @@ +import { CloseCircleFilled, SearchOutlined } from '@ant-design/icons'; +import { AutoComplete, Button, Input } from 'antd'; import React, { + EventHandler, + MutableRefObject, + SyntheticEvent, + useCallback, useEffect, useMemo, - useState, useRef, - useCallback, - EventHandler, - SyntheticEvent, - MutableRefObject, + useState, } from 'react'; -import { Input, AutoComplete, Button } from 'antd'; -import { CloseCircleFilled, SearchOutlined } from '@ant-design/icons'; -import styled from 'styled-components/macro'; import { useHistory } from 'react-router'; -import { AutoCompleteResultForEntity, EntityType, FacetFilterInput, ScenarioType } from '../../types.generated'; -import EntityRegistry from '../entity/EntityRegistry'; -import filterSearchQuery from './utils/filterSearchQuery'; -import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../entity/shared/constants'; -import { getEntityPath } from '../entity/shared/containers/profile/utils'; -import { EXACT_SEARCH_PREFIX } from './utils/constants'; -import { useListRecommendationsQuery } from '../../graphql/recommendations.generated'; -import AutoCompleteItem from './autoComplete/AutoCompleteItem'; -import { useQuickFiltersContext } from '../../providers/QuickFiltersContext'; -import QuickFilters from './autoComplete/quickFilters/QuickFilters'; -import { getFiltersWithQuickFilter } from './utils/filterUtils'; -import usePrevious from '../shared/usePrevious'; -import analytics, { Event, EventType } from '../analytics'; -import RecommendedOption from './autoComplete/RecommendedOption'; -import SectionHeader, { EntityTypeLabel } from './autoComplete/SectionHeader'; -import { useUserContext } from '../context/useUserContext'; -import { navigateToSearchUrl } from './utils/navigateToSearchUrl'; -import ViewAllSearchItem from './ViewAllSearchItem'; -import { ViewSelect } from '../entity/view/select/ViewSelect'; -import { combineSiblingsInAutoComplete } from './utils/combineSiblingsInAutoComplete'; -import { CommandK } from './CommandK'; -import { useIsShowSeparateSiblingsEnabled } from '../useAppConfig'; +import styled from 'styled-components/macro'; + +import analytics, { Event, EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '@app/entity/shared/constants'; +import { getEntityPath } from '@app/entity/shared/containers/profile/utils'; +import { ViewSelect } from '@app/entity/view/select/ViewSelect'; +import { CommandK } from '@app/search/CommandK'; +import ViewAllSearchItem from '@app/search/ViewAllSearchItem'; +import AutoCompleteItem from '@app/search/autoComplete/AutoCompleteItem'; +import RecommendedOption from '@app/search/autoComplete/RecommendedOption'; +import SectionHeader, { EntityTypeLabel } from '@app/search/autoComplete/SectionHeader'; +import QuickFilters from '@app/search/autoComplete/quickFilters/QuickFilters'; +import { combineSiblingsInAutoComplete } from '@app/search/utils/combineSiblingsInAutoComplete'; +import { EXACT_SEARCH_PREFIX } from '@app/search/utils/constants'; +import filterSearchQuery from '@app/search/utils/filterSearchQuery'; +import { getFiltersWithQuickFilter } from '@app/search/utils/filterUtils'; +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; +import usePrevious from '@app/shared/usePrevious'; +import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig'; +import { useQuickFiltersContext } from '@providers/QuickFiltersContext'; + +import { useListRecommendationsQuery } from '@graphql/recommendations.generated'; +import { AutoCompleteResultForEntity, EntityType, FacetFilterInput, ScenarioType } from '@types'; const StyledAutoComplete = styled(AutoComplete)` width: 100%; diff --git a/datahub-web-react/src/app/search/SearchFilterLabel.tsx b/datahub-web-react/src/app/search/SearchFilterLabel.tsx index 2ed2d4608d..47f6148669 100644 --- a/datahub-web-react/src/app/search/SearchFilterLabel.tsx +++ b/datahub-web-react/src/app/search/SearchFilterLabel.tsx @@ -1,31 +1,33 @@ -import * as React from 'react'; import { BookOutlined } from '@ant-design/icons'; import { Tag, Tooltip } from 'antd'; +import * as React from 'react'; import styled from 'styled-components'; + +import { IconStyleType } from '@app/entity/Entity'; +import { StyledTag } from '@app/entity/shared/components/styled/StyledTag'; +import { ParentWrapper } from '@app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal'; +import ParentEntities from '@app/search/filters/ParentEntities'; +import useGetBrowseV2LabelOverride from '@app/search/filters/useGetBrowseV2LabelOverride'; +import { getParentEntities } from '@app/search/filters/utils'; +import { BROWSE_PATH_V2_FILTER_NAME, ENTITY_FILTER_NAME, MAX_COUNT_VAL } from '@app/search/utils/constants'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; +import { formatNumber } from '@app/shared/formatNumber'; +import { DomainLink } from '@app/shared/tags/DomainLink'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { - Domain, Container, + CorpGroup, + CorpUser, DataPlatform, + DataPlatformInstance, + Domain, + Entity, EntityType, GlossaryTerm, Tag as TagType, - CorpUser, - CorpGroup, - DataPlatformInstance, - Entity, -} from '../../types.generated'; -import { StyledTag } from '../entity/shared/components/styled/StyledTag'; -import { capitalizeFirstLetterOnly } from '../shared/textUtil'; -import { DomainLink } from '../shared/tags/DomainLink'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { BROWSE_PATH_V2_FILTER_NAME, ENTITY_FILTER_NAME, MAX_COUNT_VAL } from './utils/constants'; -import CustomAvatar from '../shared/avatar/CustomAvatar'; -import { IconStyleType } from '../entity/Entity'; -import { formatNumber } from '../shared/formatNumber'; -import useGetBrowseV2LabelOverride from './filters/useGetBrowseV2LabelOverride'; -import { getParentEntities } from './filters/utils'; -import { ParentWrapper } from '../entity/shared/containers/profile/sidebar/Container/ContainerSelectModal'; -import ParentEntities from './filters/ParentEntities'; +} from '@types'; type Props = { field: string; diff --git a/datahub-web-react/src/app/search/SearchFiltersSection.tsx b/datahub-web-react/src/app/search/SearchFiltersSection.tsx index 4d04477fe8..682f8efaea 100644 --- a/datahub-web-react/src/app/search/SearchFiltersSection.tsx +++ b/datahub-web-react/src/app/search/SearchFiltersSection.tsx @@ -1,17 +1,19 @@ import { Button } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { FacetFilterInput, FacetMetadata } from '../../types.generated'; -import { UnionType } from './utils/constants'; -import { hasAdvancedFilters } from './utils/hasAdvancedFilters'; -import { AdvancedSearchFilters } from './AdvancedSearchFilters'; -import { SimpleSearchFilters } from './SimpleSearchFilters'; -import { SEARCH_RESULTS_ADVANCED_SEARCH_ID } from '../onboarding/config/SearchOnboardingConfig'; -import { ViewBuilder } from '../entity/view/builder/ViewBuilder'; -import { buildInitialViewState, fromUnionType } from '../entity/view/builder/utils'; -import { SaveAsViewButton } from './SaveAsViewButton'; -import { useUserContext } from '../context/useUserContext'; -import { ViewBuilderMode } from '../entity/view/builder/types'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ViewBuilder } from '@app/entity/view/builder/ViewBuilder'; +import { ViewBuilderMode } from '@app/entity/view/builder/types'; +import { buildInitialViewState, fromUnionType } from '@app/entity/view/builder/utils'; +import { SEARCH_RESULTS_ADVANCED_SEARCH_ID } from '@app/onboarding/config/SearchOnboardingConfig'; +import { AdvancedSearchFilters } from '@app/search/AdvancedSearchFilters'; +import { SaveAsViewButton } from '@app/search/SaveAsViewButton'; +import { SimpleSearchFilters } from '@app/search/SimpleSearchFilters'; +import { UnionType } from '@app/search/utils/constants'; +import { hasAdvancedFilters } from '@app/search/utils/hasAdvancedFilters'; + +import { FacetFilterInput, FacetMetadata } from '@types'; type Props = { filters?: Array | null; diff --git a/datahub-web-react/src/app/search/SearchHeader.tsx b/datahub-web-react/src/app/search/SearchHeader.tsx index 0b6bf5488a..2154551a01 100644 --- a/datahub-web-react/src/app/search/SearchHeader.tsx +++ b/datahub-web-react/src/app/search/SearchHeader.tsx @@ -1,16 +1,17 @@ -import React, { useState } from 'react'; import { Layout } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components'; -import { SearchBar } from './SearchBar'; -import { ManageAccount } from '../shared/ManageAccount'; -import { AutoCompleteResultForEntity, EntityType } from '../../types.generated'; -import EntityRegistry from '../entity/EntityRegistry'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { HeaderLinks } from '../shared/admin/HeaderLinks'; -import { useAppConfig, useIsShowAcrylInfoEnabled } from '../useAppConfig'; -import DemoButton from '../entity/shared/components/styled/DemoButton'; -import AppLogoLink from '../shared/AppLogoLink'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import DemoButton from '@app/entity/shared/components/styled/DemoButton'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { SearchBar } from '@app/search/SearchBar'; +import AppLogoLink from '@app/shared/AppLogoLink'; +import { ManageAccount } from '@app/shared/ManageAccount'; +import { HeaderLinks } from '@app/shared/admin/HeaderLinks'; +import { useAppConfig, useIsShowAcrylInfoEnabled } from '@app/useAppConfig'; + +import { AutoCompleteResultForEntity, EntityType } from '@types'; const { Header } = Layout; diff --git a/datahub-web-react/src/app/search/SearchPage.tsx b/datahub-web-react/src/app/search/SearchPage.tsx index aa83e739f2..b03da23672 100644 --- a/datahub-web-react/src/app/search/SearchPage.tsx +++ b/datahub-web-react/src/app/search/SearchPage.tsx @@ -1,30 +1,32 @@ import React, { useEffect, useState } from 'react'; import { useHistory } from 'react-router'; -import { FacetFilterInput } from '../../types.generated'; -import { navigateToSearchUrl } from './utils/navigateToSearchUrl'; -import { SearchResults } from './SearchResults'; -import analytics, { EventType } from '../analytics'; -import { useGetSearchResultsForMultipleQuery } from '../../graphql/search.generated'; -import { SearchCfg } from '../../conf'; -import { ENTITY_SUB_TYPE_FILTER_FIELDS, UnionType } from './utils/constants'; -import { EntityAndType } from '../entity/shared/types'; -import { scrollToTop } from '../shared/searchUtils'; -import { OnboardingTour } from '../onboarding/OnboardingTour'; + +import analytics, { EventType } from '@app/analytics'; +import { EntityAndType } from '@app/entity/shared/types'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; import { SEARCH_RESULTS_ADVANCED_SEARCH_ID, SEARCH_RESULTS_BROWSE_SIDEBAR_ID, SEARCH_RESULTS_FILTERS_ID, SEARCH_RESULTS_FILTERS_V2_INTRO, -} from '../onboarding/config/SearchOnboardingConfig'; -import { useDownloadScrollAcrossEntitiesSearchResults } from './utils/useDownloadScrollAcrossEntitiesSearchResults'; -import { DownloadSearchResults, DownloadSearchResultsInput } from './utils/types'; -import SearchFilters from './filters/SearchFilters'; -import useGetSearchQueryInputs from './useGetSearchQueryInputs'; -import useSearchFilterAnalytics from './filters/useSearchFilterAnalytics'; -import { useIsBrowseV2, useIsSearchV2, useSearchVersion } from './useSearchAndBrowseVersion'; -import useFilterMode from './filters/useFilterMode'; -import { useToggleEducationStepIdsAllowList } from '../onboarding/useToggleEducationStepIdsAllowList'; -import { useSelectedSortOption } from './context/SearchContext'; +} from '@app/onboarding/config/SearchOnboardingConfig'; +import { useToggleEducationStepIdsAllowList } from '@app/onboarding/useToggleEducationStepIdsAllowList'; +import { SearchResults } from '@app/search/SearchResults'; +import { useSelectedSortOption } from '@app/search/context/SearchContext'; +import SearchFilters from '@app/search/filters/SearchFilters'; +import useFilterMode from '@app/search/filters/useFilterMode'; +import useSearchFilterAnalytics from '@app/search/filters/useSearchFilterAnalytics'; +import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs'; +import { useIsBrowseV2, useIsSearchV2, useSearchVersion } from '@app/search/useSearchAndBrowseVersion'; +import { ENTITY_SUB_TYPE_FILTER_FIELDS, UnionType } from '@app/search/utils/constants'; +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; +import { DownloadSearchResults, DownloadSearchResultsInput } from '@app/search/utils/types'; +import { useDownloadScrollAcrossEntitiesSearchResults } from '@app/search/utils/useDownloadScrollAcrossEntitiesSearchResults'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { SearchCfg } from '@src/conf'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { FacetFilterInput } from '@types'; /** * A search results page. diff --git a/datahub-web-react/src/app/search/SearchResultList.tsx b/datahub-web-react/src/app/search/SearchResultList.tsx index bc0efcfa3f..cfbe9686f1 100644 --- a/datahub-web-react/src/app/search/SearchResultList.tsx +++ b/datahub-web-react/src/app/search/SearchResultList.tsx @@ -1,16 +1,18 @@ -import React from 'react'; import { Checkbox, Divider, List, ListProps } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { SEPARATE_SIBLINGS_URL_PARAM } from '../entity/shared/siblingUtils'; -import { CompactEntityNameList } from '../recommendations/renderer/component/CompactEntityNameList'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { SearchResult, SearchSuggestion } from '../../types.generated'; -import analytics, { EventType } from '../analytics'; -import { EntityAndType } from '../entity/shared/types'; -import { useIsSearchV2 } from './useSearchAndBrowseVersion'; -import { CombinedSearchResult } from './utils/combineSiblingsInSearchResults'; -import EmptySearchResults from './EmptySearchResults'; + +import analytics, { EventType } from '@app/analytics'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { SEPARATE_SIBLINGS_URL_PARAM } from '@app/entity/shared/siblingUtils'; +import { EntityAndType } from '@app/entity/shared/types'; +import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList'; +import EmptySearchResults from '@app/search/EmptySearchResults'; +import { useIsSearchV2 } from '@app/search/useSearchAndBrowseVersion'; +import { CombinedSearchResult } from '@app/search/utils/combineSiblingsInSearchResults'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { SearchResult, SearchSuggestion } from '@types'; const ResultList = styled(List)` &&& { diff --git a/datahub-web-react/src/app/search/SearchResults.tsx b/datahub-web-react/src/app/search/SearchResults.tsx index e96e8fd528..f33cf5d66b 100644 --- a/datahub-web-react/src/app/search/SearchResults.tsx +++ b/datahub-web-react/src/app/search/SearchResults.tsx @@ -1,35 +1,37 @@ -import React from 'react'; import { Pagination, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components/macro'; -import { Entity, FacetFilterInput, FacetMetadata, MatchedField, SearchSuggestion } from '../../types.generated'; -import { SearchCfg } from '../../conf'; -import { SearchResultsRecommendations } from './SearchResultsRecommendations'; -import SearchExtendedMenu from '../entity/shared/components/styled/search/SearchExtendedMenu'; -import { SearchSelectBar } from '../entity/shared/components/styled/search/SearchSelectBar'; -import { SearchResultList } from './SearchResultList'; -import { isListSubset } from '../entity/shared/utils'; -import TabToolbar from '../entity/shared/components/styled/TabToolbar'; -import { EntityAndType } from '../entity/shared/types'; -import { ErrorSection } from '../shared/error/ErrorSection'; -import { UnionType } from './utils/constants'; -import { SearchFiltersSection } from './SearchFiltersSection'; -import { generateOrFilters } from './utils/generateOrFilters'; -import { SEARCH_RESULTS_FILTERS_ID } from '../onboarding/config/SearchOnboardingConfig'; -import { useUserContext } from '../context/useUserContext'; -import { DownloadSearchResults, DownloadSearchResultsInput } from './utils/types'; -import BrowseSidebar from './sidebar'; -import ToggleSidebarButton from './ToggleSidebarButton'; -import { SidebarProvider } from './sidebar/SidebarContext'; -import { BrowseProvider } from './sidebar/BrowseContext'; -import { useIsBrowseV2, useIsSearchV2 } from './useSearchAndBrowseVersion'; -import useToggleSidebar from './useToggleSidebar'; -import SearchSortSelect from './sorting/SearchSortSelect'; -import { combineSiblingsInSearchResults } from './utils/combineSiblingsInSearchResults'; -import SearchQuerySuggester from './suggestions/SearchQuerySugggester'; -import { ANTD_GRAY_V2 } from '../entity/shared/constants'; -import { formatNumberWithoutAbbreviation } from '../shared/formatNumber'; -import SearchResultsLoadingSection from './SearchResultsLoadingSection'; -import { useIsShowSeparateSiblingsEnabled } from '../useAppConfig'; + +import { useUserContext } from '@app/context/useUserContext'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import SearchExtendedMenu from '@app/entity/shared/components/styled/search/SearchExtendedMenu'; +import { SearchSelectBar } from '@app/entity/shared/components/styled/search/SearchSelectBar'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { EntityAndType } from '@app/entity/shared/types'; +import { isListSubset } from '@app/entity/shared/utils'; +import { SEARCH_RESULTS_FILTERS_ID } from '@app/onboarding/config/SearchOnboardingConfig'; +import { SearchFiltersSection } from '@app/search/SearchFiltersSection'; +import { SearchResultList } from '@app/search/SearchResultList'; +import SearchResultsLoadingSection from '@app/search/SearchResultsLoadingSection'; +import { SearchResultsRecommendations } from '@app/search/SearchResultsRecommendations'; +import ToggleSidebarButton from '@app/search/ToggleSidebarButton'; +import BrowseSidebar from '@app/search/sidebar'; +import { BrowseProvider } from '@app/search/sidebar/BrowseContext'; +import { SidebarProvider } from '@app/search/sidebar/SidebarContext'; +import SearchSortSelect from '@app/search/sorting/SearchSortSelect'; +import SearchQuerySuggester from '@app/search/suggestions/SearchQuerySugggester'; +import { useIsBrowseV2, useIsSearchV2 } from '@app/search/useSearchAndBrowseVersion'; +import useToggleSidebar from '@app/search/useToggleSidebar'; +import { combineSiblingsInSearchResults } from '@app/search/utils/combineSiblingsInSearchResults'; +import { UnionType } from '@app/search/utils/constants'; +import { generateOrFilters } from '@app/search/utils/generateOrFilters'; +import { DownloadSearchResults, DownloadSearchResultsInput } from '@app/search/utils/types'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig'; +import { SearchCfg } from '@src/conf'; + +import { Entity, FacetFilterInput, FacetMetadata, MatchedField, SearchSuggestion } from '@types'; const SearchResultsWrapper = styled.div<{ v2Styles: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/search/SearchResultsLoadingSection.tsx b/datahub-web-react/src/app/search/SearchResultsLoadingSection.tsx index d669044b7c..3706e3d2a6 100644 --- a/datahub-web-react/src/app/search/SearchResultsLoadingSection.tsx +++ b/datahub-web-react/src/app/search/SearchResultsLoadingSection.tsx @@ -1,7 +1,8 @@ -import * as React from 'react'; import { Skeleton } from 'antd'; +import * as React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Container = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/search/SearchResultsRecommendations.tsx b/datahub-web-react/src/app/search/SearchResultsRecommendations.tsx index 92e5817b07..38388457cd 100644 --- a/datahub-web-react/src/app/search/SearchResultsRecommendations.tsx +++ b/datahub-web-react/src/app/search/SearchResultsRecommendations.tsx @@ -1,14 +1,12 @@ +import { Divider, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Divider, Typography } from 'antd'; -import { - FacetFilterInput, - RecommendationModule as RecommendationModuleType, - ScenarioType, -} from '../../types.generated'; -import { useListRecommendationsQuery } from '../../graphql/recommendations.generated'; -import { RecommendationModule } from '../recommendations/RecommendationModule'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { RecommendationModule } from '@app/recommendations/RecommendationModule'; + +import { useListRecommendationsQuery } from '@graphql/recommendations.generated'; +import { FacetFilterInput, RecommendationModule as RecommendationModuleType, ScenarioType } from '@types'; const RecommendationsContainer = styled.div` margin-left: 40px; diff --git a/datahub-web-react/src/app/search/SearchablePage.tsx b/datahub-web-react/src/app/search/SearchablePage.tsx index 8e34767107..7b09fc3f9e 100644 --- a/datahub-web-react/src/app/search/SearchablePage.tsx +++ b/datahub-web-react/src/app/search/SearchablePage.tsx @@ -1,26 +1,28 @@ -import React, { useEffect, useState } from 'react'; -import { useHistory, useLocation } from 'react-router'; import { debounce } from 'lodash'; import * as QueryString from 'query-string'; -import { useTheme } from 'styled-components'; +import React, { useEffect, useState } from 'react'; import { Helmet } from 'react-helmet-async'; -import { SearchHeader } from './SearchHeader'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { EntityType, FacetFilterInput } from '../../types.generated'; +import { useHistory, useLocation } from 'react-router'; +import { useTheme } from 'styled-components'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { HALF_SECOND_IN_MS } from '@app/entity/shared/tabs/Dataset/Queries/utils/constants'; +import { SearchHeader } from '@app/search/SearchHeader'; +import { useSelectedSortOption } from '@app/search/context/SearchContext'; +import { getAutoCompleteInputFromQuickFilter } from '@app/search/utils/filterUtils'; +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; +import useFilters from '@app/search/utils/useFilters'; +import { useBrowserTitle } from '@app/shared/BrowserTabTitleContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; +import { useQuickFiltersContext } from '@providers/QuickFiltersContext'; + import { GetAutoCompleteMultipleResultsQuery, useGetAutoCompleteMultipleResultsLazyQuery, -} from '../../graphql/search.generated'; -import { navigateToSearchUrl } from './utils/navigateToSearchUrl'; -import analytics, { EventType } from '../analytics'; -import useFilters from './utils/useFilters'; -import { PageRoutes } from '../../conf/Global'; -import { getAutoCompleteInputFromQuickFilter } from './utils/filterUtils'; -import { useQuickFiltersContext } from '../../providers/QuickFiltersContext'; -import { useUserContext } from '../context/useUserContext'; -import { useSelectedSortOption } from './context/SearchContext'; -import { HALF_SECOND_IN_MS } from '../entity/shared/tabs/Dataset/Queries/utils/constants'; -import { useBrowserTitle } from '../shared/BrowserTabTitleContext'; +} from '@graphql/search.generated'; +import { EntityType, FacetFilterInput } from '@types'; const styles = { children: { diff --git a/datahub-web-react/src/app/search/SimpleSearchFilter.tsx b/datahub-web-react/src/app/search/SimpleSearchFilter.tsx index e8ed79f340..84f073be22 100644 --- a/datahub-web-react/src/app/search/SimpleSearchFilter.tsx +++ b/datahub-web-react/src/app/search/SimpleSearchFilter.tsx @@ -2,12 +2,13 @@ import { DownOutlined, UpOutlined } from '@ant-design/icons'; import { Button, Checkbox } from 'antd'; import { CheckboxChangeEvent } from 'antd/lib/checkbox'; import * as React from 'react'; -import { useState, useEffect } from 'react'; +import { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata } from '../../types.generated'; -import { SearchFilterLabel } from './SearchFilterLabel'; -import { TRUNCATED_FILTER_LENGTH } from './utils/constants'; +import { SearchFilterLabel } from '@app/search/SearchFilterLabel'; +import { TRUNCATED_FILTER_LENGTH } from '@app/search/utils/constants'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const GRAPH_DEGREE_FILTER_FIELD = 'degree'; diff --git a/datahub-web-react/src/app/search/SimpleSearchFilters.tsx b/datahub-web-react/src/app/search/SimpleSearchFilters.tsx index 28b5da73c1..9410054902 100644 --- a/datahub-web-react/src/app/search/SimpleSearchFilters.tsx +++ b/datahub-web-react/src/app/search/SimpleSearchFilters.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; import { useEffect, useState } from 'react'; -import { FacetFilterInput, FacetMetadata } from '../../types.generated'; -import { FilterScenarioType } from './filters/render/types'; -import { useFilterRendererRegistry } from './filters/render/useFilterRenderer'; -import { SimpleSearchFilter } from './SimpleSearchFilter'; + +import { SimpleSearchFilter } from '@app/search/SimpleSearchFilter'; +import { FilterScenarioType } from '@app/search/filters/render/types'; +import { useFilterRendererRegistry } from '@app/search/filters/render/useFilterRenderer'; import { DEGREE_FILTER_NAME, ENTITY_FILTER_NAME, @@ -11,8 +11,10 @@ import { ENTITY_SUB_TYPE_FILTER_NAME, LEGACY_ENTITY_FILTER_NAME, SCHEMA_FIELD_ALIASES_FILTER_NAME, -} from './utils/constants'; -import { useAppConfig } from '../useAppConfig'; +} from '@app/search/utils/constants'; +import { useAppConfig } from '@app/useAppConfig'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const TOP_FILTERS = ['degree', ENTITY_FILTER_NAME, 'platform', 'tags', 'glossaryTerms', 'domains', 'owners']; diff --git a/datahub-web-react/src/app/search/ToggleSidebarButton.tsx b/datahub-web-react/src/app/search/ToggleSidebarButton.tsx index 8c94d15476..89790c63af 100644 --- a/datahub-web-react/src/app/search/ToggleSidebarButton.tsx +++ b/datahub-web-react/src/app/search/ToggleSidebarButton.tsx @@ -1,9 +1,10 @@ -import React, { memo, useState } from 'react'; import Icon from '@ant-design/icons/lib/components/Icon'; import { Button, Tooltip } from 'antd'; +import React, { memo, useState } from 'react'; import styled from 'styled-components'; -import ExpandIcon from '../../images/expand.svg?react'; -import CollapseIcon from '../../images/collapse.svg?react'; + +import CollapseIcon from '@images/collapse.svg?react'; +import ExpandIcon from '@images/expand.svg?react'; const ToggleIcon = styled(Icon)` color: ${(props) => props.theme.styles['primary-color']}; diff --git a/datahub-web-react/src/app/search/ViewAllSearchItem.tsx b/datahub-web-react/src/app/search/ViewAllSearchItem.tsx index cbf438c3f5..f1f60c2d8c 100644 --- a/datahub-web-react/src/app/search/ViewAllSearchItem.tsx +++ b/datahub-web-react/src/app/search/ViewAllSearchItem.tsx @@ -1,7 +1,7 @@ import { Icon } from '@components'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Typography } from 'antd'; const ExploreForEntity = styled.span` font-weight: light; diff --git a/datahub-web-react/src/app/search/__tests__/SearchPage.test.tsx b/datahub-web-react/src/app/search/__tests__/SearchPage.test.tsx index 5d921c8291..091601c5f2 100644 --- a/datahub-web-react/src/app/search/__tests__/SearchPage.test.tsx +++ b/datahub-web-react/src/app/search/__tests__/SearchPage.test.tsx @@ -1,13 +1,14 @@ -import React from 'react'; -import { render, waitFor } from '@testing-library/react'; import { InMemoryCache } from '@apollo/client'; import { MockedProvider } from '@apollo/client/testing'; +import { render, waitFor } from '@testing-library/react'; +import React from 'react'; import { Route } from 'react-router'; -import { SearchPage } from '../SearchPage'; -import TestPageContainer from '../../../utils/test-utils/TestPageContainer'; -import { mocksWithSearchFlagsOff } from '../../../Mocks'; -import { PageRoutes } from '../../../conf/Global'; -import possibleTypesResult from '../../../possibleTypes.generated'; + +import { SearchPage } from '@app/search/SearchPage'; +import { PageRoutes } from '@conf/Global'; +import { mocksWithSearchFlagsOff } from '@src/Mocks'; +import possibleTypesResult from '@src/possibleTypes.generated'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; const cache = new InMemoryCache({ // need to define possibleTypes to allow us to use Apollo cache with union types diff --git a/datahub-web-react/src/app/search/__tests__/constants.test.tsx b/datahub-web-react/src/app/search/__tests__/constants.test.tsx index ad5f38e944..1de9a58fa5 100644 --- a/datahub-web-react/src/app/search/__tests__/constants.test.tsx +++ b/datahub-web-react/src/app/search/__tests__/constants.test.tsx @@ -1,4 +1,4 @@ -import { FIELD_TO_LABEL, ORDERED_FIELDS } from '../utils/constants'; +import { FIELD_TO_LABEL, ORDERED_FIELDS } from '@app/search/utils/constants'; describe('constants', () => { it('ensure that all ordered fields have a corresponding label', () => { diff --git a/datahub-web-react/src/app/search/__tests__/filterUtils.test.tsx b/datahub-web-react/src/app/search/__tests__/filterUtils.test.tsx index 47bfcb912a..9607fdb5c4 100644 --- a/datahub-web-react/src/app/search/__tests__/filterUtils.test.tsx +++ b/datahub-web-react/src/app/search/__tests__/filterUtils.test.tsx @@ -1,5 +1,5 @@ -import { UnionType } from '../utils/constants'; -import { mergeFilterSets } from '../utils/filterUtils'; +import { UnionType } from '@app/search/utils/constants'; +import { mergeFilterSets } from '@app/search/utils/filterUtils'; describe('filterUtils', () => { describe('mergeFilterSets', () => { diff --git a/datahub-web-react/src/app/search/advanced/EntitySubTypeAdvancedFilterLabel.tsx b/datahub-web-react/src/app/search/advanced/EntitySubTypeAdvancedFilterLabel.tsx index 6027ee865b..a6f95388bb 100644 --- a/datahub-web-react/src/app/search/advanced/EntitySubTypeAdvancedFilterLabel.tsx +++ b/datahub-web-react/src/app/search/advanced/EntitySubTypeAdvancedFilterLabel.tsx @@ -1,12 +1,14 @@ import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { FILTER_DELIMITER } from '../utils/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { EntityType, FacetFilterInput } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import AdvancedFilterCloseButton from './AdvancedFilterCloseButton'; -import { FilterContainer } from './styles'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import AdvancedFilterCloseButton from '@app/search/advanced/AdvancedFilterCloseButton'; +import { FilterContainer } from '@app/search/advanced/styles'; +import { FILTER_DELIMITER } from '@app/search/utils/constants'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, FacetFilterInput } from '@types'; const FilterFieldLabel = styled.span` font-weight: 600; diff --git a/datahub-web-react/src/app/search/advanced/styles.ts b/datahub-web-react/src/app/search/advanced/styles.ts index 18e64ad859..6cb18c949f 100644 --- a/datahub-web-react/src/app/search/advanced/styles.ts +++ b/datahub-web-react/src/app/search/advanced/styles.ts @@ -1,5 +1,6 @@ import styled from 'styled-components'; -import { ANTD_GRAY } from '../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export const FilterContainer = styled.div<{ isCompact: boolean; isDisabled?: boolean }>` box-shadow: 0px 0px 4px 0px #00000010; diff --git a/datahub-web-react/src/app/search/autoComplete/AutoCompleteEntity.tsx b/datahub-web-react/src/app/search/autoComplete/AutoCompleteEntity.tsx index e59fbad316..e3927b1f8d 100644 --- a/datahub-web-react/src/app/search/autoComplete/AutoCompleteEntity.tsx +++ b/datahub-web-react/src/app/search/autoComplete/AutoCompleteEntity.tsx @@ -1,17 +1,19 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Entity, EntityType } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { getAutoCompleteEntityText } from './utils'; -import ParentContainers from './ParentContainers'; -import { ANTD_GRAY_V2 } from '../../entity/shared/constants'; -import AutoCompleteEntityIcon from './AutoCompleteEntityIcon'; -import { SuggestionText } from './styledComponents'; -import AutoCompletePlatformNames from './AutoCompletePlatformNames'; -import { getPlatformName } from '../../entity/shared/utils'; -import { getParentEntities } from '../filters/utils'; -import ParentEntities from '../filters/ParentEntities'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { getPlatformName } from '@app/entity/shared/utils'; +import AutoCompleteEntityIcon from '@app/search/autoComplete/AutoCompleteEntityIcon'; +import AutoCompletePlatformNames from '@app/search/autoComplete/AutoCompletePlatformNames'; +import ParentContainers from '@app/search/autoComplete/ParentContainers'; +import { SuggestionText } from '@app/search/autoComplete/styledComponents'; +import { getAutoCompleteEntityText } from '@app/search/autoComplete/utils'; +import ParentEntities from '@app/search/filters/ParentEntities'; +import { getParentEntities } from '@app/search/filters/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, EntityType } from '@types'; const AutoCompleteEntityWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/search/autoComplete/AutoCompleteEntityIcon.tsx b/datahub-web-react/src/app/search/autoComplete/AutoCompleteEntityIcon.tsx index da37106a9d..eedabbfb4d 100644 --- a/datahub-web-react/src/app/search/autoComplete/AutoCompleteEntityIcon.tsx +++ b/datahub-web-react/src/app/search/autoComplete/AutoCompleteEntityIcon.tsx @@ -1,10 +1,12 @@ +import { Image } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Image } from 'antd'; -import { Entity } from '../../../types.generated'; -import { getPlatformName } from '../../entity/shared/utils'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { IconStyleType } from '../../entity/Entity'; + +import { IconStyleType } from '@app/entity/Entity'; +import { getPlatformName } from '@app/entity/shared/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity } from '@types'; const PreviewImage = styled(Image)` height: 16px; diff --git a/datahub-web-react/src/app/search/autoComplete/AutoCompleteItem.tsx b/datahub-web-react/src/app/search/autoComplete/AutoCompleteItem.tsx index b8f5a2c7e4..1146b71c70 100644 --- a/datahub-web-react/src/app/search/autoComplete/AutoCompleteItem.tsx +++ b/datahub-web-react/src/app/search/autoComplete/AutoCompleteItem.tsx @@ -1,13 +1,15 @@ import { Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { CorpUser, Entity, EntityType, Tag } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import AutoCompleteEntity from './AutoCompleteEntity'; -import AutoCompleteTag from './AutoCompleteTag'; -import AutoCompleteTooltipContent from './AutoCompleteTooltipContent'; -import AutoCompleteUser from './AutoCompleteUser'; -import { getShouldDisplayTooltip } from './utils'; + +import AutoCompleteEntity from '@app/search/autoComplete/AutoCompleteEntity'; +import AutoCompleteTag from '@app/search/autoComplete/AutoCompleteTag'; +import AutoCompleteTooltipContent from '@app/search/autoComplete/AutoCompleteTooltipContent'; +import AutoCompleteUser from '@app/search/autoComplete/AutoCompleteUser'; +import { getShouldDisplayTooltip } from '@app/search/autoComplete/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, Entity, EntityType, Tag } from '@types'; export const SuggestionContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/search/autoComplete/AutoCompletePlatformNames.tsx b/datahub-web-react/src/app/search/autoComplete/AutoCompletePlatformNames.tsx index 61fe6bcae7..9c878b179f 100644 --- a/datahub-web-react/src/app/search/autoComplete/AutoCompletePlatformNames.tsx +++ b/datahub-web-react/src/app/search/autoComplete/AutoCompletePlatformNames.tsx @@ -1,7 +1,8 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY_V2 } from '../../entity/shared/constants'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; const PlatformText = styled(Typography.Text)` font-size: 12px; diff --git a/datahub-web-react/src/app/search/autoComplete/AutoCompleteTag.tsx b/datahub-web-react/src/app/search/autoComplete/AutoCompleteTag.tsx index 6851ac4e4c..d0596d00b6 100644 --- a/datahub-web-react/src/app/search/autoComplete/AutoCompleteTag.tsx +++ b/datahub-web-react/src/app/search/autoComplete/AutoCompleteTag.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import { EntityType, Tag } from '../../../types.generated'; -import { StyledTag } from '../../entity/shared/components/styled/StyledTag'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { StyledTag } from '@app/entity/shared/components/styled/StyledTag'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, Tag } from '@types'; interface Props { tag: Tag; diff --git a/datahub-web-react/src/app/search/autoComplete/AutoCompleteTooltipContent.tsx b/datahub-web-react/src/app/search/autoComplete/AutoCompleteTooltipContent.tsx index 4e40c29722..fef9389ee8 100644 --- a/datahub-web-react/src/app/search/autoComplete/AutoCompleteTooltipContent.tsx +++ b/datahub-web-react/src/app/search/autoComplete/AutoCompleteTooltipContent.tsx @@ -1,11 +1,13 @@ import { FolderOpenOutlined } from '@ant-design/icons'; import React from 'react'; import styled from 'styled-components'; -import { Dataset, Entity, EntityType } from '../../../types.generated'; -import { DatasetStatsSummary } from '../../entity/dataset/shared/DatasetStatsSummary'; -import { getLastUpdatedMs } from '../../entity/dataset/shared/utils'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ArrowWrapper } from './ParentContainers'; + +import { DatasetStatsSummary } from '@app/entity/dataset/shared/DatasetStatsSummary'; +import { getLastUpdatedMs } from '@app/entity/dataset/shared/utils'; +import { ArrowWrapper } from '@app/search/autoComplete/ParentContainers'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Dataset, Entity, EntityType } from '@types'; const ContentWrapper = styled.div` font-size: 12px; diff --git a/datahub-web-react/src/app/search/autoComplete/AutoCompleteUser.tsx b/datahub-web-react/src/app/search/autoComplete/AutoCompleteUser.tsx index 53b4d53ef4..37069ec5b1 100644 --- a/datahub-web-react/src/app/search/autoComplete/AutoCompleteUser.tsx +++ b/datahub-web-react/src/app/search/autoComplete/AutoCompleteUser.tsx @@ -1,10 +1,12 @@ import { Typography } from 'antd'; import React from 'react'; -import { CorpUser, EntityType } from '../../../types.generated'; -import { CustomAvatar } from '../../shared/avatar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { getAutoCompleteEntityText } from './utils'; -import { SuggestionText } from './styledComponents'; + +import { SuggestionText } from '@app/search/autoComplete/styledComponents'; +import { getAutoCompleteEntityText } from '@app/search/autoComplete/utils'; +import { CustomAvatar } from '@app/shared/avatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, EntityType } from '@types'; interface Props { query: string; diff --git a/datahub-web-react/src/app/search/autoComplete/ParentContainers.tsx b/datahub-web-react/src/app/search/autoComplete/ParentContainers.tsx index 98a4f5aa21..f32f08b99b 100644 --- a/datahub-web-react/src/app/search/autoComplete/ParentContainers.tsx +++ b/datahub-web-react/src/app/search/autoComplete/ParentContainers.tsx @@ -2,9 +2,11 @@ import { FolderOpenOutlined } from '@ant-design/icons'; import { Typography } from 'antd'; import React, { Fragment } from 'react'; import styled from 'styled-components/macro'; -import { Container, EntityType } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ANTD_GRAY_V2 } from '../../entity/shared/constants'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Container, EntityType } from '@types'; const NUM_VISIBLE_CONTAINERS = 2; diff --git a/datahub-web-react/src/app/search/autoComplete/RecommendedOption.tsx b/datahub-web-react/src/app/search/autoComplete/RecommendedOption.tsx index 9a63f9e67f..50c0ec16c2 100644 --- a/datahub-web-react/src/app/search/autoComplete/RecommendedOption.tsx +++ b/datahub-web-react/src/app/search/autoComplete/RecommendedOption.tsx @@ -1,7 +1,8 @@ import { Icon } from '@components'; import React from 'react'; import styled from 'styled-components/macro'; -import { SuggestionText } from './styledComponents'; + +import { SuggestionText } from '@app/search/autoComplete/styledComponents'; const TextWrapper = styled.span``; diff --git a/datahub-web-react/src/app/search/autoComplete/SectionHeader.tsx b/datahub-web-react/src/app/search/autoComplete/SectionHeader.tsx index 2f20f130bf..816b29a0c2 100644 --- a/datahub-web-react/src/app/search/autoComplete/SectionHeader.tsx +++ b/datahub-web-react/src/app/search/autoComplete/SectionHeader.tsx @@ -1,8 +1,10 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { EntityType } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; export const EntityTypeLabel = styled.div<{ showBorder?: boolean }>` font-size: 14px; diff --git a/datahub-web-react/src/app/search/autoComplete/__tests__/utils.test.ts b/datahub-web-react/src/app/search/autoComplete/__tests__/utils.test.ts index 05ac92bd84..a872862775 100644 --- a/datahub-web-react/src/app/search/autoComplete/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/search/autoComplete/__tests__/utils.test.ts @@ -1,4 +1,4 @@ -import { getAutoCompleteEntityText } from '../utils'; +import { getAutoCompleteEntityText } from '@app/search/autoComplete/utils'; describe('utils tests', () => { it('should return matched and unmatched text when the name begins with the query', () => { diff --git a/datahub-web-react/src/app/search/autoComplete/quickFilters/QuickFilter.tsx b/datahub-web-react/src/app/search/autoComplete/quickFilters/QuickFilter.tsx index 5864ebc685..5bd25663bb 100644 --- a/datahub-web-react/src/app/search/autoComplete/quickFilters/QuickFilter.tsx +++ b/datahub-web-react/src/app/search/autoComplete/quickFilters/QuickFilter.tsx @@ -1,12 +1,14 @@ import { Button } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { useQuickFiltersContext } from '../../../../providers/QuickFiltersContext'; -import { QuickFilter as QuickFilterType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { getQuickFilterDetails } from './utils'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import analytics, { Event, EventType } from '../../../analytics'; + +import analytics, { Event, EventType } from '@app/analytics'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { getQuickFilterDetails } from '@app/search/autoComplete/quickFilters/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { useQuickFiltersContext } from '@providers/QuickFiltersContext'; + +import { QuickFilter as QuickFilterType } from '@types'; const QuickFilterWrapper = styled(Button)<{ selected: boolean }>` border: 1px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/search/autoComplete/quickFilters/QuickFilters.tsx b/datahub-web-react/src/app/search/autoComplete/quickFilters/QuickFilters.tsx index 086160e6f2..83fc90d0b2 100644 --- a/datahub-web-react/src/app/search/autoComplete/quickFilters/QuickFilters.tsx +++ b/datahub-web-react/src/app/search/autoComplete/quickFilters/QuickFilters.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { useQuickFiltersContext } from '../../../../providers/QuickFiltersContext'; -import QuickFilter from './QuickFilter'; + +import QuickFilter from '@app/search/autoComplete/quickFilters/QuickFilter'; +import { useQuickFiltersContext } from '@providers/QuickFiltersContext'; const QuickFiltersWrapper = styled.div` display: flex; @@ -15,9 +16,7 @@ export default function QuickFilters() { return ( - {quickFilters?.map((quickFilter) => ( - - ))} + {quickFilters?.map((quickFilter) => )} ); } diff --git a/datahub-web-react/src/app/search/autoComplete/quickFilters/utils.tsx b/datahub-web-react/src/app/search/autoComplete/quickFilters/utils.tsx index cc59714c0d..0d22653e41 100644 --- a/datahub-web-react/src/app/search/autoComplete/quickFilters/utils.tsx +++ b/datahub-web-react/src/app/search/autoComplete/quickFilters/utils.tsx @@ -1,8 +1,10 @@ import React from 'react'; import styled from 'styled-components'; -import { EntityType, QuickFilter } from '../../../../types.generated'; -import { IconStyleType } from '../../../entity/Entity'; -import EntityRegistry from '../../../entity/EntityRegistry'; + +import { IconStyleType } from '@app/entity/Entity'; +import EntityRegistry from '@app/entity/EntityRegistry'; + +import { EntityType, QuickFilter } from '@types'; const StyledIcon = styled.img` width: 14px; diff --git a/datahub-web-react/src/app/search/autoComplete/styledComponents.tsx b/datahub-web-react/src/app/search/autoComplete/styledComponents.tsx index 9e4b084ab3..6e9d8f0302 100644 --- a/datahub-web-react/src/app/search/autoComplete/styledComponents.tsx +++ b/datahub-web-react/src/app/search/autoComplete/styledComponents.tsx @@ -1,5 +1,6 @@ import styled from 'styled-components'; -import { ANTD_GRAY } from '../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export const SuggestionText = styled.div` margin-left: 12px; diff --git a/datahub-web-react/src/app/search/autoComplete/utils.ts b/datahub-web-react/src/app/search/autoComplete/utils.ts index d2c2e9b083..2be4de4f55 100644 --- a/datahub-web-react/src/app/search/autoComplete/utils.ts +++ b/datahub-web-react/src/app/search/autoComplete/utils.ts @@ -1,5 +1,6 @@ -import { Entity } from '../../../types.generated'; -import EntityRegistry from '../../entity/EntityRegistry'; +import EntityRegistry from '@app/entity/EntityRegistry'; + +import { Entity } from '@types'; export function getAutoCompleteEntityText(displayName: string, query: string) { const isPrefixMatch = displayName.toLowerCase().startsWith(query.toLowerCase()); diff --git a/datahub-web-react/src/app/search/context/SearchContextProvider.tsx b/datahub-web-react/src/app/search/context/SearchContextProvider.tsx index 5b412c4114..209370a4e4 100644 --- a/datahub-web-react/src/app/search/context/SearchContextProvider.tsx +++ b/datahub-web-react/src/app/search/context/SearchContextProvider.tsx @@ -1,8 +1,9 @@ import * as QueryString from 'query-string'; -import { useHistory, useLocation } from 'react-router'; import React, { useCallback, useMemo, useState } from 'react'; -import { SearchContext } from './SearchContext'; -import { updateUrlParam } from '../../shared/updateUrlParam'; +import { useHistory, useLocation } from 'react-router'; + +import { SearchContext } from '@app/search/context/SearchContext'; +import { updateUrlParam } from '@app/shared/updateUrlParam'; export default function SearchContextProvider({ children }: { children: React.ReactNode }) { const history = useHistory(); diff --git a/datahub-web-react/src/app/search/context/SearchResultContext.tsx b/datahub-web-react/src/app/search/context/SearchResultContext.tsx index 0e69e6894f..2aa8734ef3 100644 --- a/datahub-web-react/src/app/search/context/SearchResultContext.tsx +++ b/datahub-web-react/src/app/search/context/SearchResultContext.tsx @@ -1,14 +1,16 @@ import React, { ReactNode, createContext, useContext, useMemo } from 'react'; -import { EntityType, MatchedField, SearchResult } from '../../../types.generated'; + +import { MatchedFieldName } from '@app/search/matches/constants'; import { - getMatchedFieldsByUrn, + getMatchedFieldLabel, getMatchedFieldNames, getMatchedFieldsByNames, - shouldShowInMatchedFieldList, - getMatchedFieldLabel, + getMatchedFieldsByUrn, getMatchesPrioritized, -} from '../matches/utils'; -import { MatchedFieldName } from '../matches/constants'; + shouldShowInMatchedFieldList, +} from '@app/search/matches/utils'; + +import { EntityType, MatchedField, SearchResult } from '@types'; type SearchResultContextValue = { searchResult: SearchResult; diff --git a/datahub-web-react/src/app/search/context/constants.ts b/datahub-web-react/src/app/search/context/constants.ts index 96e5d7c787..94a07d44aa 100644 --- a/datahub-web-react/src/app/search/context/constants.ts +++ b/datahub-web-react/src/app/search/context/constants.ts @@ -1,4 +1,4 @@ -import { SortOrder } from '../../../types.generated'; +import { SortOrder } from '@types'; export const RELEVANCE = 'relevance'; export const ENTITY_NAME_FIELD = '_entityName'; diff --git a/datahub-web-react/src/app/search/filters/ActiveFilter.tsx b/datahub-web-react/src/app/search/filters/ActiveFilter.tsx index 5882641cd2..564989c6a9 100644 --- a/datahub-web-react/src/app/search/filters/ActiveFilter.tsx +++ b/datahub-web-react/src/app/search/filters/ActiveFilter.tsx @@ -2,13 +2,15 @@ import { CloseCircleOutlined } from '@ant-design/icons'; import { Button } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { getFilterEntity, getFilterIconAndLabel, getNewFilters } from './utils'; -import useGetBrowseV2LabelOverride from './useGetBrowseV2LabelOverride'; -import { useFilterRendererRegistry } from './render/useFilterRenderer'; -import { IconSpacer, Label } from './styledComponents'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useFilterRendererRegistry } from '@app/search/filters/render/useFilterRenderer'; +import { IconSpacer, Label } from '@app/search/filters/styledComponents'; +import useGetBrowseV2LabelOverride from '@app/search/filters/useGetBrowseV2LabelOverride'; +import { getFilterEntity, getFilterIconAndLabel, getNewFilters } from '@app/search/filters/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const ActiveFilterWrapper = styled.div` border: 1px solid ${ANTD_GRAY[5]}; diff --git a/datahub-web-react/src/app/search/filters/AdvancedFilters.tsx b/datahub-web-react/src/app/search/filters/AdvancedFilters.tsx index 19787fe98f..27df5f970c 100644 --- a/datahub-web-react/src/app/search/filters/AdvancedFilters.tsx +++ b/datahub-web-react/src/app/search/filters/AdvancedFilters.tsx @@ -1,18 +1,20 @@ import React from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { useUserContext } from '../../context/useUserContext'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { AdvancedFilterSelectValueModal } from '../AdvancedFilterSelectValueModal'; -import { AdvancedSearchAddFilterSelect } from '../AdvancedSearchAddFilterSelect'; -import { AdvancedSearchFilter } from '../AdvancedSearchFilter'; -import { AdvancedSearchFilterOverallUnionTypeSelect } from '../AdvancedSearchFilterOverallUnionTypeSelect'; -import useAdvancedSearchSelectFilters from '../useAdvancedSearchSelectFilters'; -import { UnionType } from '../utils/constants'; -import { FilterButtonsWrapper, FlexSpacer, FlexWrapper } from './BasicFilters'; -import SaveViewButton from './SaveViewButton'; -import { TextButton } from './styledComponents'; -import { hasAdvancedFilters } from '../utils/hasAdvancedFilters'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { AdvancedFilterSelectValueModal } from '@app/search/AdvancedFilterSelectValueModal'; +import { AdvancedSearchAddFilterSelect } from '@app/search/AdvancedSearchAddFilterSelect'; +import { AdvancedSearchFilter } from '@app/search/AdvancedSearchFilter'; +import { AdvancedSearchFilterOverallUnionTypeSelect } from '@app/search/AdvancedSearchFilterOverallUnionTypeSelect'; +import { FilterButtonsWrapper, FlexSpacer, FlexWrapper } from '@app/search/filters/BasicFilters'; +import SaveViewButton from '@app/search/filters/SaveViewButton'; +import { TextButton } from '@app/search/filters/styledComponents'; +import useAdvancedSearchSelectFilters from '@app/search/useAdvancedSearchSelectFilters'; +import { UnionType } from '@app/search/utils/constants'; +import { hasAdvancedFilters } from '@app/search/utils/hasAdvancedFilters'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const AnyAllToggle = styled.div` font-weight: 700; diff --git a/datahub-web-react/src/app/search/filters/BasicFilters.tsx b/datahub-web-react/src/app/search/filters/BasicFilters.tsx index 66401ba86b..3de32952d1 100644 --- a/datahub-web-react/src/app/search/filters/BasicFilters.tsx +++ b/datahub-web-react/src/app/search/filters/BasicFilters.tsx @@ -1,31 +1,33 @@ import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { useAppConfig } from '@src/app/useAppConfig'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { useUserContext } from '../../context/useUserContext'; -import { - ENTITY_INDEX_FILTER_NAME, - ORIGIN_FILTER_NAME, - TYPE_NAMES_FILTER_NAME, - UnionType, - LEGACY_ENTITY_FILTER_NAME, - BROWSE_PATH_V2_FILTER_NAME, -} from '../utils/constants'; -import ActiveFilter from './ActiveFilter'; -import { SORTED_FILTERS } from './constants'; -import MoreFilters from './MoreFilters'; -import SaveViewButton from './SaveViewButton'; -import SearchFilter from './SearchFilter'; -import { TextButton } from './styledComponents'; -import { sortFacets } from './utils'; + +import { useUserContext } from '@app/context/useUserContext'; import { SEARCH_RESULTS_ADVANCED_SEARCH_ID, SEARCH_RESULTS_FILTERS_ID, -} from '../../onboarding/config/SearchOnboardingConfig'; -import { useFilterRendererRegistry } from './render/useFilterRenderer'; -import { FilterScenarioType } from './render/types'; -import BasicFiltersLoadingSection from './BasicFiltersLoadingSection'; +} from '@app/onboarding/config/SearchOnboardingConfig'; +import ActiveFilter from '@app/search/filters/ActiveFilter'; +import BasicFiltersLoadingSection from '@app/search/filters/BasicFiltersLoadingSection'; +import MoreFilters from '@app/search/filters/MoreFilters'; +import SaveViewButton from '@app/search/filters/SaveViewButton'; +import SearchFilter from '@app/search/filters/SearchFilter'; +import { SORTED_FILTERS } from '@app/search/filters/constants'; +import { FilterScenarioType } from '@app/search/filters/render/types'; +import { useFilterRendererRegistry } from '@app/search/filters/render/useFilterRenderer'; +import { TextButton } from '@app/search/filters/styledComponents'; +import { sortFacets } from '@app/search/filters/utils'; +import { + BROWSE_PATH_V2_FILTER_NAME, + ENTITY_INDEX_FILTER_NAME, + LEGACY_ENTITY_FILTER_NAME, + ORIGIN_FILTER_NAME, + TYPE_NAMES_FILTER_NAME, + UnionType, +} from '@app/search/utils/constants'; +import { useAppConfig } from '@src/app/useAppConfig'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const NUM_VISIBLE_FILTER_DROPDOWNS = 5; diff --git a/datahub-web-react/src/app/search/filters/BasicFiltersLoadingSection.tsx b/datahub-web-react/src/app/search/filters/BasicFiltersLoadingSection.tsx index f82a66d4f0..d586152c21 100644 --- a/datahub-web-react/src/app/search/filters/BasicFiltersLoadingSection.tsx +++ b/datahub-web-react/src/app/search/filters/BasicFiltersLoadingSection.tsx @@ -1,5 +1,5 @@ -import * as React from 'react'; import { Skeleton } from 'antd'; +import * as React from 'react'; import styled from 'styled-components'; const Container = styled.div` diff --git a/datahub-web-react/src/app/search/filters/DateRangeMenu/DateRangeMenu.tsx b/datahub-web-react/src/app/search/filters/DateRangeMenu/DateRangeMenu.tsx index aace8dcb97..802fb3ce41 100644 --- a/datahub-web-react/src/app/search/filters/DateRangeMenu/DateRangeMenu.tsx +++ b/datahub-web-react/src/app/search/filters/DateRangeMenu/DateRangeMenu.tsx @@ -1,18 +1,22 @@ -import moment from 'moment'; -import { Text } from '@src/alchemy-components'; -import React, { useCallback, useRef, useState } from 'react'; import { DatePicker } from 'antd'; +import moment from 'moment'; +import React, { useCallback, useRef, useState } from 'react'; import styled from 'styled-components'; + +import useDateRangeFilterValues, { Datetime } from '@app/search/filters/DateRangeMenu/useDateRangeFilterValues'; +import { useFilterDisplayName } from '@app/search/filters/utils'; +import { Text } from '@src/alchemy-components'; import { FacetFilterInput, FacetMetadata, FilterOperator } from '@src/types.generated'; -import { useFilterDisplayName } from '../utils'; -import useDateRangeFilterValues, { Datetime } from './useDateRangeFilterValues'; const { RangePicker } = DatePicker; const Container = styled.div` padding: 16px; background-color: #ffffff; - box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05); + box-shadow: + 0 3px 6px -4px rgba(0, 0, 0, 0.12), + 0 6px 16px 0 rgba(0, 0, 0, 0.08), + 0 9px 28px 8px rgba(0, 0, 0, 0.05); border-radius: 8px; min-width: 225px; `; diff --git a/datahub-web-react/src/app/search/filters/DateRangeMenu/useDateRangeFilterValues.ts b/datahub-web-react/src/app/search/filters/DateRangeMenu/useDateRangeFilterValues.ts index ce1810c860..c876183424 100644 --- a/datahub-web-react/src/app/search/filters/DateRangeMenu/useDateRangeFilterValues.ts +++ b/datahub-web-react/src/app/search/filters/DateRangeMenu/useDateRangeFilterValues.ts @@ -1,7 +1,8 @@ -import { useEffect, useMemo } from 'react'; -import { FilterOperator } from '@src/types.generated'; import moment from 'moment'; -import useGetSearchQueryInputs from '../../useGetSearchQueryInputs'; +import { useEffect, useMemo } from 'react'; + +import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs'; +import { FilterOperator } from '@src/types.generated'; export type Datetime = moment.Moment | null; diff --git a/datahub-web-react/src/app/search/filters/EntityTypeFilter/EntityTypeFilter.tsx b/datahub-web-react/src/app/search/filters/EntityTypeFilter/EntityTypeFilter.tsx index 1d6a6483a6..2c3aa67321 100644 --- a/datahub-web-react/src/app/search/filters/EntityTypeFilter/EntityTypeFilter.tsx +++ b/datahub-web-react/src/app/search/filters/EntityTypeFilter/EntityTypeFilter.tsx @@ -1,18 +1,24 @@ import React, { useEffect, useState } from 'react'; -import { FacetFilterInput, FacetMetadata } from '../../../../types.generated'; -import { useAggregateAcrossEntitiesLazyQuery } from '../../../../graphql/search.generated'; -import useGetSearchQueryInputs from '../../useGetSearchQueryInputs'; + +import { + getDisplayedFilterOptions, + getInitialSelectedOptions, + getNumActiveFilters, +} from '@app/search/filters/EntityTypeFilter/entityTypeFilterUtils'; +import SearchFilterView from '@app/search/filters/SearchFilterView'; +import { FilterOptionType } from '@app/search/filters/types'; +import { getFilterDropdownIcon, getNewFilters } from '@app/search/filters/utils'; +import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs'; import { ENTITY_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_FIELDS, ENTITY_SUB_TYPE_FILTER_NAME, LEGACY_ENTITY_FILTER_FIELDS, -} from '../../utils/constants'; -import { getFilterDropdownIcon, getNewFilters } from '../utils'; -import { FilterOptionType } from '../types'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { getDisplayedFilterOptions, getInitialSelectedOptions, getNumActiveFilters } from './entityTypeFilterUtils'; -import SearchFilterView from '../SearchFilterView'; +} from '@app/search/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useAggregateAcrossEntitiesLazyQuery } from '@graphql/search.generated'; +import { FacetFilterInput, FacetMetadata } from '@types'; interface Props { filter: FacetMetadata; diff --git a/datahub-web-react/src/app/search/filters/EntityTypeFilter/entityTypeFilterUtils.ts b/datahub-web-react/src/app/search/filters/EntityTypeFilter/entityTypeFilterUtils.ts index 87c85a4e39..08663f4f4f 100644 --- a/datahub-web-react/src/app/search/filters/EntityTypeFilter/entityTypeFilterUtils.ts +++ b/datahub-web-react/src/app/search/filters/EntityTypeFilter/entityTypeFilterUtils.ts @@ -1,15 +1,16 @@ -import { AggregateAcrossEntitiesQuery } from '../../../../graphql/search.generated'; -import { AggregationMetadata, FacetFilterInput, FacetMetadata } from '../../../../types.generated'; -import EntityRegistry from '../../../entity/EntityRegistry'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { mapFilterOption } from '@app/search/filters/mapFilterOption'; +import { FilterOptionType } from '@app/search/filters/types'; +import { filterOptionsWithSearch, getFilterIconAndLabel, getFilterOptions } from '@app/search/filters/utils'; import { - LEGACY_ENTITY_FILTER_FIELDS, - ENTITY_SUB_TYPE_FILTER_NAME, ENTITY_FILTER_NAME, + ENTITY_SUB_TYPE_FILTER_NAME, FILTER_DELIMITER, -} from '../../utils/constants'; -import { mapFilterOption } from '../mapFilterOption'; -import { FilterOptionType } from '../types'; -import { filterOptionsWithSearch, getFilterIconAndLabel, getFilterOptions } from '../utils'; + LEGACY_ENTITY_FILTER_FIELDS, +} from '@app/search/utils/constants'; + +import { AggregateAcrossEntitiesQuery } from '@graphql/search.generated'; +import { AggregationMetadata, FacetFilterInput, FacetMetadata } from '@types'; const BACKWARDS_COMPATIBLE_FILTER_FIELDS = [ENTITY_SUB_TYPE_FILTER_NAME, ...LEGACY_ENTITY_FILTER_FIELDS]; @@ -91,7 +92,7 @@ export function getDisplayedFilterOptions( .filter( (option) => option.value.includes(FILTER_DELIMITER) && option.value.includes(filterOption.value), ) - .map((option) => ({ field: ENTITY_SUB_TYPE_FILTER_NAME, ...option } as FilterOptionType)) + .map((option) => ({ field: ENTITY_SUB_TYPE_FILTER_NAME, ...option }) as FilterOptionType) .filter((o) => filterNestedOptions(o, entityRegistry, searchQuery)); return mapFilterOption({ filterOption, diff --git a/datahub-web-react/src/app/search/filters/FilterOption.tsx b/datahub-web-react/src/app/search/filters/FilterOption.tsx index 15851eb915..589cdc7c3a 100644 --- a/datahub-web-react/src/app/search/filters/FilterOption.tsx +++ b/datahub-web-react/src/app/search/filters/FilterOption.tsx @@ -2,11 +2,18 @@ import { CaretUpOutlined } from '@ant-design/icons'; import { Button, Checkbox } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { FilterOptionType } from './types'; -import { Entity, EntityType, Tag } from '../../../types.generated'; -import { generateColor } from '../../entity/shared/components/styled/StyledTag'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { generateColor } from '@app/entity/shared/components/styled/StyledTag'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import ParentEntities from '@app/search/filters/ParentEntities'; +import { IconSpacer, Label } from '@app/search/filters/styledComponents'; +import { FilterOptionType } from '@app/search/filters/types'; +import { + getFilterIconAndLabel, + getParentEntities, + isAnyOptionSelected, + isFilterOptionSelected, +} from '@app/search/filters/utils'; import { CONTAINER_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, @@ -14,12 +21,12 @@ import { PLATFORM_FILTER_NAME, TAGS_FILTER_NAME, TYPE_NAMES_FILTER_NAME, -} from '../utils/constants'; -import { IconSpacer, Label } from './styledComponents'; -import { isFilterOptionSelected, getFilterIconAndLabel, isAnyOptionSelected, getParentEntities } from './utils'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import ParentEntities from './ParentEntities'; -import { formatNumber } from '../../shared/formatNumber'; +} from '@app/search/utils/constants'; +import { formatNumber } from '@app/shared/formatNumber'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, EntityType, Tag } from '@types'; const FilterOptionWrapper = styled.div<{ centerAlign?: boolean; addPadding?: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/search/filters/MoreFilterOption.tsx b/datahub-web-react/src/app/search/filters/MoreFilterOption.tsx index 41df6b86c0..78b8bc609c 100644 --- a/datahub-web-react/src/app/search/filters/MoreFilterOption.tsx +++ b/datahub-web-react/src/app/search/filters/MoreFilterOption.tsx @@ -2,12 +2,14 @@ import { RightOutlined } from '@ant-design/icons'; import { Dropdown } from 'antd'; import React, { useRef } from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import OptionsDropdownMenu from './OptionsDropdownMenu'; -import { IconWrapper } from './SearchFilterView'; -import { MoreFilterOptionLabel } from './styledComponents'; -import useSearchFilterDropdown from './useSearchFilterDropdown'; -import { getFilterDropdownIcon, useElementDimensions, useFilterDisplayName } from './utils'; + +import OptionsDropdownMenu from '@app/search/filters/OptionsDropdownMenu'; +import { IconWrapper } from '@app/search/filters/SearchFilterView'; +import { MoreFilterOptionLabel } from '@app/search/filters/styledComponents'; +import useSearchFilterDropdown from '@app/search/filters/useSearchFilterDropdown'; +import { getFilterDropdownIcon, useElementDimensions, useFilterDisplayName } from '@app/search/filters/utils'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const IconNameWrapper = styled.span` display: flex; diff --git a/datahub-web-react/src/app/search/filters/MoreFilters.tsx b/datahub-web-react/src/app/search/filters/MoreFilters.tsx index 43f69355ba..5389343a59 100644 --- a/datahub-web-react/src/app/search/filters/MoreFilters.tsx +++ b/datahub-web-react/src/app/search/filters/MoreFilters.tsx @@ -2,14 +2,16 @@ import { PlusOutlined } from '@ant-design/icons'; import { Dropdown } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; + +import MoreFilterOption from '@app/search/filters/MoreFilterOption'; +import { FilterScenarioType } from '@app/search/filters/render/types'; +import { useFilterRendererRegistry } from '@app/search/filters/render/useFilterRenderer'; +import { SearchFilterLabel } from '@app/search/filters/styledComponents'; +import useSearchFilterAnalytics from '@app/search/filters/useSearchFilterAnalytics'; +import { getNumActiveFiltersForGroupOfFilters } from '@app/search/filters/utils'; import { useAppConfig } from '@src/app/useAppConfig'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import MoreFilterOption from './MoreFilterOption'; -import { getNumActiveFiltersForGroupOfFilters } from './utils'; -import { SearchFilterLabel } from './styledComponents'; -import useSearchFilterAnalytics from './useSearchFilterAnalytics'; -import { useFilterRendererRegistry } from './render/useFilterRenderer'; -import { FilterScenarioType } from './render/types'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const StyledPlus = styled(PlusOutlined)` svg { diff --git a/datahub-web-react/src/app/search/filters/OptionsDropdownMenu.tsx b/datahub-web-react/src/app/search/filters/OptionsDropdownMenu.tsx index f1c806671a..f9883a152b 100644 --- a/datahub-web-react/src/app/search/filters/OptionsDropdownMenu.tsx +++ b/datahub-web-react/src/app/search/filters/OptionsDropdownMenu.tsx @@ -2,12 +2,13 @@ import { LoadingOutlined } from '@ant-design/icons'; import { Button } from 'antd'; import React, { CSSProperties } from 'react'; import styled from 'styled-components/macro'; + +import { SearchBar } from '@app/search/SearchBar'; +import DateRangeMenu from '@app/search/filters/DateRangeMenu/DateRangeMenu'; +import { getIsDateRangeFilter } from '@app/search/filters/utils'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { FacetFilterInput, FacetMetadata } from '@src/types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { SearchBar } from '../SearchBar'; -import { useEnterKeyListener } from '../../shared/useEnterKeyListener'; -import { getIsDateRangeFilter } from './utils'; -import DateRangeMenu from './DateRangeMenu/DateRangeMenu'; const StyledButton = styled(Button)` width: 100%; @@ -20,7 +21,10 @@ const StyledButton = styled(Button)` export const DropdownMenu = styled.div` background-color: white; border-radius: 5px; - box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05); + box-shadow: + 0 3px 6px -4px rgba(0, 0, 0, 0.12), + 0 6px 16px 0 rgba(0, 0, 0, 0.08), + 0 9px 28px 8px rgba(0, 0, 0, 0.05); overflow: hidden; min-width: 200px; diff --git a/datahub-web-react/src/app/search/filters/ParentEntities.tsx b/datahub-web-react/src/app/search/filters/ParentEntities.tsx index 2504d5f0ff..35f4c3d4d6 100644 --- a/datahub-web-react/src/app/search/filters/ParentEntities.tsx +++ b/datahub-web-react/src/app/search/filters/ParentEntities.tsx @@ -2,9 +2,11 @@ import { FolderOpenOutlined } from '@ant-design/icons'; import { Tooltip, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Entity } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity } from '@types'; const ParentNodesWrapper = styled.div` font-size: 12px; diff --git a/datahub-web-react/src/app/search/filters/SaveViewButton.tsx b/datahub-web-react/src/app/search/filters/SaveViewButton.tsx index 5d61702b01..49fe68cfdc 100644 --- a/datahub-web-react/src/app/search/filters/SaveViewButton.tsx +++ b/datahub-web-react/src/app/search/filters/SaveViewButton.tsx @@ -1,14 +1,16 @@ import { Tooltip } from 'antd'; import React, { useMemo, useState } from 'react'; import styled from 'styled-components'; -import { ViewBuilderMode } from '../../entity/view/builder/types'; -import { ViewBuilder } from '../../entity/view/builder/ViewBuilder'; -import { buildInitialViewState, fromUnionType } from '../../entity/view/builder/utils'; -import { FacetFilterInput } from '../../../types.generated'; -import { UnionType } from '../utils/constants'; -import { TextButton } from './styledComponents'; -import { Message } from '../../shared/Message'; -import { canCreateViewFromFilters } from './utils'; + +import { ViewBuilder } from '@app/entity/view/builder/ViewBuilder'; +import { ViewBuilderMode } from '@app/entity/view/builder/types'; +import { buildInitialViewState, fromUnionType } from '@app/entity/view/builder/utils'; +import { TextButton } from '@app/search/filters/styledComponents'; +import { canCreateViewFromFilters } from '@app/search/filters/utils'; +import { UnionType } from '@app/search/utils/constants'; +import { Message } from '@app/shared/Message'; + +import { FacetFilterInput } from '@types'; const ToolTipHeader = styled.div` margin-bottom: 12px; diff --git a/datahub-web-react/src/app/search/filters/SearchFilter.tsx b/datahub-web-react/src/app/search/filters/SearchFilter.tsx index 9a69c4ec07..32142343f4 100644 --- a/datahub-web-react/src/app/search/filters/SearchFilter.tsx +++ b/datahub-web-react/src/app/search/filters/SearchFilter.tsx @@ -1,10 +1,12 @@ import React from 'react'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import useSearchFilterDropdown from './useSearchFilterDropdown'; -import { getFilterDropdownIcon, useFilterDisplayName } from './utils'; -import SearchFilterView from './SearchFilterView'; -import { ENTITY_FILTER_NAME } from '../utils/constants'; -import EntityTypeFilter from './EntityTypeFilter/EntityTypeFilter'; + +import EntityTypeFilter from '@app/search/filters/EntityTypeFilter/EntityTypeFilter'; +import SearchFilterView from '@app/search/filters/SearchFilterView'; +import useSearchFilterDropdown from '@app/search/filters/useSearchFilterDropdown'; +import { getFilterDropdownIcon, useFilterDisplayName } from '@app/search/filters/utils'; +import { ENTITY_FILTER_NAME } from '@app/search/utils/constants'; + +import { FacetFilterInput, FacetMetadata } from '@types'; interface Props { filter: FacetMetadata; diff --git a/datahub-web-react/src/app/search/filters/SearchFilterView.tsx b/datahub-web-react/src/app/search/filters/SearchFilterView.tsx index c8c629d373..caae7f934d 100644 --- a/datahub-web-react/src/app/search/filters/SearchFilterView.tsx +++ b/datahub-web-react/src/app/search/filters/SearchFilterView.tsx @@ -2,10 +2,11 @@ import { CaretDownFilled } from '@ant-design/icons'; import { Dropdown } from 'antd'; import React from 'react'; import styled from 'styled-components'; + +import OptionsDropdownMenu from '@app/search/filters/OptionsDropdownMenu'; +import { DisplayedFilterOption } from '@app/search/filters/mapFilterOption'; +import { SearchFilterLabel } from '@app/search/filters/styledComponents'; import { FacetFilterInput, FacetMetadata } from '@src/types.generated'; -import OptionsDropdownMenu from './OptionsDropdownMenu'; -import { DisplayedFilterOption } from './mapFilterOption'; -import { SearchFilterLabel } from './styledComponents'; export const IconWrapper = styled.div` margin-right: 8px; diff --git a/datahub-web-react/src/app/search/filters/SearchFilters.tsx b/datahub-web-react/src/app/search/filters/SearchFilters.tsx index bcc987159e..20bc4c7db2 100644 --- a/datahub-web-react/src/app/search/filters/SearchFilters.tsx +++ b/datahub-web-react/src/app/search/filters/SearchFilters.tsx @@ -1,11 +1,13 @@ import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { FilterMode, FilterModes, UnionType } from '../utils/constants'; -import AdvancedFilters from './AdvancedFilters'; -import BasicFilters from './BasicFilters'; -import { SEARCH_RESULTS_FILTERS_V2_INTRO } from '../../onboarding/config/SearchOnboardingConfig'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { SEARCH_RESULTS_FILTERS_V2_INTRO } from '@app/onboarding/config/SearchOnboardingConfig'; +import AdvancedFilters from '@app/search/filters/AdvancedFilters'; +import BasicFilters from '@app/search/filters/BasicFilters'; +import { FilterMode, FilterModes, UnionType } from '@app/search/utils/constants'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const SearchFiltersWrapper = styled.div<{ removePadding: boolean }>` border-bottom: 1px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/search/filters/__tests__/entityTypeFilterUtils.test.tsx b/datahub-web-react/src/app/search/filters/__tests__/entityTypeFilterUtils.test.tsx index b12a52518d..786d2d9db5 100644 --- a/datahub-web-react/src/app/search/filters/__tests__/entityTypeFilterUtils.test.tsx +++ b/datahub-web-react/src/app/search/filters/__tests__/entityTypeFilterUtils.test.tsx @@ -1,18 +1,19 @@ import React from 'react'; -import { getTestEntityRegistry } from '../../../../utils/test-utils/TestPageContainer'; -import { - LEGACY_ENTITY_FILTER_NAME, - ENTITY_SUB_TYPE_FILTER_NAME, - ENTITY_FILTER_NAME, - TAGS_FILTER_NAME, -} from '../../utils/constants'; + import { getDisplayedFilterOptions, getInitialSelectedOptions, getInitialSelectedOptionsFromAggregations, getNumActiveFilters, -} from '../EntityTypeFilter/entityTypeFilterUtils'; -import FilterOption from '../FilterOption'; +} from '@app/search/filters/EntityTypeFilter/entityTypeFilterUtils'; +import FilterOption from '@app/search/filters/FilterOption'; +import { + ENTITY_FILTER_NAME, + ENTITY_SUB_TYPE_FILTER_NAME, + LEGACY_ENTITY_FILTER_NAME, + TAGS_FILTER_NAME, +} from '@app/search/utils/constants'; +import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer'; const mockData = { aggregateAcrossEntities: { diff --git a/datahub-web-react/src/app/search/filters/__tests__/utils.test.tsx b/datahub-web-react/src/app/search/filters/__tests__/utils.test.tsx index 948b50fa1f..c3f586dbca 100644 --- a/datahub-web-react/src/app/search/filters/__tests__/utils.test.tsx +++ b/datahub-web-react/src/app/search/filters/__tests__/utils.test.tsx @@ -1,26 +1,28 @@ import { FolderFilled } from '@ant-design/icons'; import React from 'react'; -import { dataPlatform, dataPlatformInstance, dataset1, glossaryTerm1, user1 } from '../../../../Mocks'; -import { EntityType } from '../../../../types.generated'; -import { getTestEntityRegistry } from '../../../../utils/test-utils/TestPageContainer'; -import { IconStyleType } from '../../../entity/Entity'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; import { - getFilterEntity, - getNewFilters, - isFilterOptionSelected, - getFilterIconAndLabel, PlatformIcon, - getNumActiveFiltersForFilter, - getNumActiveFiltersForGroupOfFilters, + canCreateViewFromFilters, combineAggregations, filterEmptyAggregations, - getFilterOptions, filterOptionsWithSearch, - canCreateViewFromFilters, + getFilterEntity, + getFilterIconAndLabel, + getFilterOptions, + getNewFilters, + getNumActiveFiltersForFilter, + getNumActiveFiltersForGroupOfFilters, isAnyOptionSelected, -} from '../utils'; -import { ENTITY_SUB_TYPE_FILTER_NAME } from '../../utils/constants'; + isFilterOptionSelected, +} from '@app/search/filters/utils'; +import { ENTITY_SUB_TYPE_FILTER_NAME } from '@app/search/utils/constants'; +import { dataPlatform, dataPlatformInstance, dataset1, glossaryTerm1, user1 } from '@src/Mocks'; +import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer'; + +import { EntityType } from '@types'; describe('filter utils - getNewFilters', () => { it('should get the correct list of filters when adding filters where the filter field did not already exist', () => { diff --git a/datahub-web-react/src/app/search/filters/constants.ts b/datahub-web-react/src/app/search/filters/constants.ts index 0f3a7fd8c0..2de80d5e1d 100644 --- a/datahub-web-react/src/app/search/filters/constants.ts +++ b/datahub-web-react/src/app/search/filters/constants.ts @@ -1,4 +1,3 @@ -import { EntityType } from '../../../types.generated'; import { CONTAINER_FILTER_NAME, DOMAINS_FILTER_NAME, @@ -9,7 +8,9 @@ import { PLATFORM_FILTER_NAME, TAGS_FILTER_NAME, TYPE_NAMES_FILTER_NAME, -} from '../utils/constants'; +} from '@app/search/utils/constants'; + +import { EntityType } from '@types'; export const SORTED_FILTERS = [ PLATFORM_FILTER_NAME, diff --git a/datahub-web-react/src/app/search/filters/mapFilterOption.tsx b/datahub-web-react/src/app/search/filters/mapFilterOption.tsx index 6abc3505fe..e8a1a571c0 100644 --- a/datahub-web-react/src/app/search/filters/mapFilterOption.tsx +++ b/datahub-web-react/src/app/search/filters/mapFilterOption.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import EntityRegistry from '../../entity/EntityRegistry'; -import FilterOption from './FilterOption'; -import { FilterOptionType } from './types'; -import { getFilterIconAndLabel } from './utils'; + +import EntityRegistry from '@app/entity/EntityRegistry'; +import FilterOption from '@app/search/filters/FilterOption'; +import { FilterOptionType } from '@app/search/filters/types'; +import { getFilterIconAndLabel } from '@app/search/filters/utils'; export interface DisplayedFilterOption { key: string; diff --git a/datahub-web-react/src/app/search/filters/render/FilterRenderer.tsx b/datahub-web-react/src/app/search/filters/render/FilterRenderer.tsx index bf1aa347f9..288ac7c5ce 100644 --- a/datahub-web-react/src/app/search/filters/render/FilterRenderer.tsx +++ b/datahub-web-react/src/app/search/filters/render/FilterRenderer.tsx @@ -1,4 +1,4 @@ -import { FilterRenderProps } from './types'; +import { FilterRenderProps } from '@app/search/filters/render/types'; /** * Base interface used for custom search filter renderers diff --git a/datahub-web-react/src/app/search/filters/render/FilterRendererRegistry.tsx b/datahub-web-react/src/app/search/filters/render/FilterRendererRegistry.tsx index 0ceed3af25..95f8438828 100644 --- a/datahub-web-react/src/app/search/filters/render/FilterRendererRegistry.tsx +++ b/datahub-web-react/src/app/search/filters/render/FilterRendererRegistry.tsx @@ -1,5 +1,5 @@ -import { FilterRenderer } from './FilterRenderer'; -import { FilterRenderProps } from './types'; +import { FilterRenderer } from '@app/search/filters/render/FilterRenderer'; +import { FilterRenderProps } from '@app/search/filters/render/types'; function validatedGet(key: K, map: Map): V { if (map.has(key)) { diff --git a/datahub-web-react/src/app/search/filters/render/__tests__/FilterRendererRegistry.test.tsx b/datahub-web-react/src/app/search/filters/render/__tests__/FilterRendererRegistry.test.tsx index 757ef444dc..eda33b3d57 100644 --- a/datahub-web-react/src/app/search/filters/render/__tests__/FilterRendererRegistry.test.tsx +++ b/datahub-web-react/src/app/search/filters/render/__tests__/FilterRendererRegistry.test.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import FilterRendererRegistry from '../FilterRendererRegistry'; + +import FilterRendererRegistry from '@app/search/filters/render/FilterRendererRegistry'; describe('FilterRendererRegistry', () => { let registry; diff --git a/datahub-web-react/src/app/search/filters/render/incident/HasActiveIncidentsFilter.tsx b/datahub-web-react/src/app/search/filters/render/incident/HasActiveIncidentsFilter.tsx index a2a6bc3068..1d9f6021f2 100644 --- a/datahub-web-react/src/app/search/filters/render/incident/HasActiveIncidentsFilter.tsx +++ b/datahub-web-react/src/app/search/filters/render/incident/HasActiveIncidentsFilter.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { FilterScenarioType } from '../types'; -import { BooleanSimpleSearchFilter } from '../shared/BooleanSimpleSearchFilter'; -import BooleanMoreFilter from '../shared/BooleanMoreFilter'; -import { FacetFilterInput, FacetMetadata, FacetFilter } from '../../../../../types.generated'; -import BooleanSearchFilter from '../shared/BooleanSearchFilter'; + +import BooleanMoreFilter from '@app/search/filters/render/shared/BooleanMoreFilter'; +import BooleanSearchFilter from '@app/search/filters/render/shared/BooleanSearchFilter'; +import { BooleanSimpleSearchFilter } from '@app/search/filters/render/shared/BooleanSimpleSearchFilter'; +import { FilterScenarioType } from '@app/search/filters/render/types'; + +import { FacetFilter, FacetFilterInput, FacetMetadata } from '@types'; export interface Props { scenario: FilterScenarioType; diff --git a/datahub-web-react/src/app/search/filters/render/incident/HasActiveIncidentsRenderer.tsx b/datahub-web-react/src/app/search/filters/render/incident/HasActiveIncidentsRenderer.tsx index cc2e373b25..63927a9256 100644 --- a/datahub-web-react/src/app/search/filters/render/incident/HasActiveIncidentsRenderer.tsx +++ b/datahub-web-react/src/app/search/filters/render/incident/HasActiveIncidentsRenderer.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { WarningOutlined } from '@ant-design/icons'; -import { FilterRenderer } from '../FilterRenderer'; -import { FilterRenderProps } from '../types'; -import { HasActiveIncidentsFilter } from './HasActiveIncidentsFilter'; +import React from 'react'; + +import { FilterRenderer } from '@app/search/filters/render/FilterRenderer'; +import { HasActiveIncidentsFilter } from '@app/search/filters/render/incident/HasActiveIncidentsFilter'; +import { FilterRenderProps } from '@app/search/filters/render/types'; export class HasActiveIncidentsRenderer implements FilterRenderer { field = 'hasActiveIncidents'; diff --git a/datahub-web-react/src/app/search/filters/render/shared/BooleanMoreFilter.tsx b/datahub-web-react/src/app/search/filters/render/shared/BooleanMoreFilter.tsx index 7551052b2d..07910b69f3 100644 --- a/datahub-web-react/src/app/search/filters/render/shared/BooleanMoreFilter.tsx +++ b/datahub-web-react/src/app/search/filters/render/shared/BooleanMoreFilter.tsx @@ -1,11 +1,12 @@ -import React, { useRef, useState } from 'react'; -import styled from 'styled-components'; import { RightOutlined } from '@ant-design/icons'; import { Dropdown } from 'antd'; -import { MoreFilterOptionLabel } from '../../styledComponents'; -import BooleanSearchFilterMenu from './BooleanMoreFilterMenu'; -import FilterOption from '../../FilterOption'; -import { useElementDimensions } from '../../utils'; +import React, { useRef, useState } from 'react'; +import styled from 'styled-components'; + +import FilterOption from '@app/search/filters/FilterOption'; +import BooleanSearchFilterMenu from '@app/search/filters/render/shared/BooleanMoreFilterMenu'; +import { MoreFilterOptionLabel } from '@app/search/filters/styledComponents'; +import { useElementDimensions } from '@app/search/filters/utils'; const IconNameWrapper = styled.span` display: flex; diff --git a/datahub-web-react/src/app/search/filters/render/shared/BooleanMoreFilterMenu.tsx b/datahub-web-react/src/app/search/filters/render/shared/BooleanMoreFilterMenu.tsx index 72309cecdc..9643d5079c 100644 --- a/datahub-web-react/src/app/search/filters/render/shared/BooleanMoreFilterMenu.tsx +++ b/datahub-web-react/src/app/search/filters/render/shared/BooleanMoreFilterMenu.tsx @@ -1,5 +1,5 @@ -import React, { CSSProperties } from 'react'; import { Button } from 'antd'; +import React, { CSSProperties } from 'react'; import styled from 'styled-components/macro'; const StyledButton = styled(Button)` @@ -13,7 +13,10 @@ const StyledButton = styled(Button)` export const DropdownMenu = styled.div` background-color: white; border-radius: 5px; - box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05); + box-shadow: + 0 3px 6px -4px rgba(0, 0, 0, 0.12), + 0 6px 16px 0 rgba(0, 0, 0, 0.08), + 0 9px 28px 8px rgba(0, 0, 0, 0.05); overflow: hidden; min-width: 200px; diff --git a/datahub-web-react/src/app/search/filters/render/shared/BooleanSearchFilter.tsx b/datahub-web-react/src/app/search/filters/render/shared/BooleanSearchFilter.tsx index 642938c0a0..87e27e34e8 100644 --- a/datahub-web-react/src/app/search/filters/render/shared/BooleanSearchFilter.tsx +++ b/datahub-web-react/src/app/search/filters/render/shared/BooleanSearchFilter.tsx @@ -1,10 +1,11 @@ -import React, { useState } from 'react'; -import styled from 'styled-components'; import { CaretDownFilled } from '@ant-design/icons'; import { Dropdown } from 'antd'; -import { SearchFilterLabel } from '../../styledComponents'; -import BooleanSearchFilterMenu from './BooleanMoreFilterMenu'; -import FilterOption from '../../FilterOption'; +import React, { useState } from 'react'; +import styled from 'styled-components'; + +import FilterOption from '@app/search/filters/FilterOption'; +import BooleanSearchFilterMenu from '@app/search/filters/render/shared/BooleanMoreFilterMenu'; +import { SearchFilterLabel } from '@app/search/filters/styledComponents'; const IconNameWrapper = styled.span` display: flex; diff --git a/datahub-web-react/src/app/search/filters/render/shared/BooleanSimpleSearchFilter.tsx b/datahub-web-react/src/app/search/filters/render/shared/BooleanSimpleSearchFilter.tsx index f252409e13..547e55f400 100644 --- a/datahub-web-react/src/app/search/filters/render/shared/BooleanSimpleSearchFilter.tsx +++ b/datahub-web-react/src/app/search/filters/render/shared/BooleanSimpleSearchFilter.tsx @@ -1,9 +1,10 @@ -import * as React from 'react'; import { DownOutlined, UpOutlined } from '@ant-design/icons'; import { Checkbox } from 'antd'; -import { useState, useEffect } from 'react'; +import * as React from 'react'; +import { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { SearchFilterLabel } from '../../../SearchFilterLabel'; + +import { SearchFilterLabel } from '@app/search/SearchFilterLabel'; const SearchFilterWrapper = styled.div` padding: 0 25px 15px 25px; diff --git a/datahub-web-react/src/app/search/filters/render/shared/styledComponents.tsx b/datahub-web-react/src/app/search/filters/render/shared/styledComponents.tsx index ea18d1f846..4a8616e06f 100644 --- a/datahub-web-react/src/app/search/filters/render/shared/styledComponents.tsx +++ b/datahub-web-react/src/app/search/filters/render/shared/styledComponents.tsx @@ -1,5 +1,6 @@ import styled from 'styled-components'; -import { MoreFilterOptionLabel } from '../../styledComponents'; + +import { MoreFilterOptionLabel } from '@app/search/filters/styledComponents'; export const SearchFilterWrapper = styled.div` padding: 0 25px 15px 25px; diff --git a/datahub-web-react/src/app/search/filters/render/siblings/HasSiblingsFilter.tsx b/datahub-web-react/src/app/search/filters/render/siblings/HasSiblingsFilter.tsx index 063f26b3bb..2a6e0ce51a 100644 --- a/datahub-web-react/src/app/search/filters/render/siblings/HasSiblingsFilter.tsx +++ b/datahub-web-react/src/app/search/filters/render/siblings/HasSiblingsFilter.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { FilterScenarioType } from '../types'; -import { BooleanSimpleSearchFilter } from '../shared/BooleanSimpleSearchFilter'; -import BooleanMoreFilter from '../shared/BooleanMoreFilter'; -import { FacetFilterInput, FacetMetadata, FacetFilter } from '../../../../../types.generated'; -import BooleanSearchFilter from '../shared/BooleanSearchFilter'; + +import BooleanMoreFilter from '@app/search/filters/render/shared/BooleanMoreFilter'; +import BooleanSearchFilter from '@app/search/filters/render/shared/BooleanSearchFilter'; +import { BooleanSimpleSearchFilter } from '@app/search/filters/render/shared/BooleanSimpleSearchFilter'; +import { FilterScenarioType } from '@app/search/filters/render/types'; + +import { FacetFilter, FacetFilterInput, FacetMetadata } from '@types'; export interface Props { scenario: FilterScenarioType; diff --git a/datahub-web-react/src/app/search/filters/render/siblings/HasSiblingsRenderer.tsx b/datahub-web-react/src/app/search/filters/render/siblings/HasSiblingsRenderer.tsx index 84c8b8f842..ec053663e6 100644 --- a/datahub-web-react/src/app/search/filters/render/siblings/HasSiblingsRenderer.tsx +++ b/datahub-web-react/src/app/search/filters/render/siblings/HasSiblingsRenderer.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { BuildOutlined } from '@ant-design/icons'; -import { FilterRenderer } from '../FilterRenderer'; -import { FilterRenderProps } from '../types'; -import { HasSiblingsFilter } from './HasSiblingsFilter'; +import React from 'react'; + +import { FilterRenderer } from '@app/search/filters/render/FilterRenderer'; +import { HasSiblingsFilter } from '@app/search/filters/render/siblings/HasSiblingsFilter'; +import { FilterRenderProps } from '@app/search/filters/render/types'; export class HasSiblingsRenderer implements FilterRenderer { field = 'hasSiblings'; diff --git a/datahub-web-react/src/app/search/filters/render/types.ts b/datahub-web-react/src/app/search/filters/render/types.ts index 3089f35855..e60f73098c 100644 --- a/datahub-web-react/src/app/search/filters/render/types.ts +++ b/datahub-web-react/src/app/search/filters/render/types.ts @@ -1,4 +1,4 @@ -import { AppConfig, FacetFilter, FacetFilterInput, FacetMetadata } from '../../../../types.generated'; +import { AppConfig, FacetFilter, FacetFilterInput, FacetMetadata } from '@types'; /** * The scenario in which filter rendering is required. diff --git a/datahub-web-react/src/app/search/filters/render/useFilterRenderer.tsx b/datahub-web-react/src/app/search/filters/render/useFilterRenderer.tsx index c811c177d0..dfbe59d64f 100644 --- a/datahub-web-react/src/app/search/filters/render/useFilterRenderer.tsx +++ b/datahub-web-react/src/app/search/filters/render/useFilterRenderer.tsx @@ -1,6 +1,6 @@ -import FilterRendererRegistry from './FilterRendererRegistry'; -import { HasActiveIncidentsRenderer } from './incident/HasActiveIncidentsRenderer'; -import { HasSiblingsRenderer } from './siblings/HasSiblingsRenderer'; +import FilterRendererRegistry from '@app/search/filters/render/FilterRendererRegistry'; +import { HasActiveIncidentsRenderer } from '@app/search/filters/render/incident/HasActiveIncidentsRenderer'; +import { HasSiblingsRenderer } from '@app/search/filters/render/siblings/HasSiblingsRenderer'; /** * Configure the render registry. diff --git a/datahub-web-react/src/app/search/filters/styledComponents.ts b/datahub-web-react/src/app/search/filters/styledComponents.ts index 5c809adf3a..e6a0372671 100644 --- a/datahub-web-react/src/app/search/filters/styledComponents.ts +++ b/datahub-web-react/src/app/search/filters/styledComponents.ts @@ -1,6 +1,7 @@ import { Button, Typography } from 'antd'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export const SearchFilterLabel = styled(Button)<{ isActive: boolean }>` font-size: 14px; diff --git a/datahub-web-react/src/app/search/filters/types.ts b/datahub-web-react/src/app/search/filters/types.ts index 6704c7fa01..635cfa1b84 100644 --- a/datahub-web-react/src/app/search/filters/types.ts +++ b/datahub-web-react/src/app/search/filters/types.ts @@ -1,4 +1,4 @@ -import { Entity } from '../../../types.generated'; +import { Entity } from '@types'; export interface FilterOptionType { field: string; diff --git a/datahub-web-react/src/app/search/filters/useFilterMode.ts b/datahub-web-react/src/app/search/filters/useFilterMode.ts index 994bd06c87..176e8d67de 100644 --- a/datahub-web-react/src/app/search/filters/useFilterMode.ts +++ b/datahub-web-react/src/app/search/filters/useFilterMode.ts @@ -1,8 +1,10 @@ import { useState } from 'react'; -import { FacetFilterInput } from '../../../types.generated'; -import { FilterMode, FilterModes, UnionType } from '../utils/constants'; -import { hasAdvancedFilters } from '../utils/hasAdvancedFilters'; -import useLatest from '../../shared/useLatest'; + +import { FilterMode, FilterModes, UnionType } from '@app/search/utils/constants'; +import { hasAdvancedFilters } from '@app/search/utils/hasAdvancedFilters'; +import useLatest from '@app/shared/useLatest'; + +import { FacetFilterInput } from '@types'; const useFilterMode = (filters: Array, unionType: UnionType) => { const onlyShowAdvancedFilters = hasAdvancedFilters(filters, unionType); diff --git a/datahub-web-react/src/app/search/filters/useGetBrowseV2LabelOverride.ts b/datahub-web-react/src/app/search/filters/useGetBrowseV2LabelOverride.ts index b7a57e8765..33f9185225 100644 --- a/datahub-web-react/src/app/search/filters/useGetBrowseV2LabelOverride.ts +++ b/datahub-web-react/src/app/search/filters/useGetBrowseV2LabelOverride.ts @@ -1,8 +1,10 @@ import { useEffect } from 'react'; -import { useGetEntityDisplayNameLazyQuery } from '../../../graphql/search.generated'; -import { getLastBrowseEntryFromFilterValue } from './utils'; -import { BROWSE_PATH_V2_FILTER_NAME } from '../utils/constants'; -import EntityRegistry from '../../entity/EntityRegistry'; + +import EntityRegistry from '@app/entity/EntityRegistry'; +import { getLastBrowseEntryFromFilterValue } from '@app/search/filters/utils'; +import { BROWSE_PATH_V2_FILTER_NAME } from '@app/search/utils/constants'; + +import { useGetEntityDisplayNameLazyQuery } from '@graphql/search.generated'; function isEntityUrn(string: string) { return string.includes('urn:li:'); diff --git a/datahub-web-react/src/app/search/filters/useSearchFilterAnalytics.ts b/datahub-web-react/src/app/search/filters/useSearchFilterAnalytics.ts index f696d61cb8..5d10460b6c 100644 --- a/datahub-web-react/src/app/search/filters/useSearchFilterAnalytics.ts +++ b/datahub-web-react/src/app/search/filters/useSearchFilterAnalytics.ts @@ -1,5 +1,5 @@ -import { EventType } from '../../analytics'; -import analytics from '../../analytics/analytics'; +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; const useSearchFilterAnalytics = () => { const trackClearAllFiltersEvent = (total: number) => { diff --git a/datahub-web-react/src/app/search/filters/useSearchFilterDropdown.tsx b/datahub-web-react/src/app/search/filters/useSearchFilterDropdown.tsx index a614ae8e7f..82428bf551 100644 --- a/datahub-web-react/src/app/search/filters/useSearchFilterDropdown.tsx +++ b/datahub-web-react/src/app/search/filters/useSearchFilterDropdown.tsx @@ -1,16 +1,8 @@ import { useMemo, useState } from 'react'; -import { - GetAutoCompleteMultipleResultsQuery, - useAggregateAcrossEntitiesLazyQuery, - useGetAutoCompleteMultipleResultsLazyQuery, -} from '../../../graphql/search.generated'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import useGetSearchQueryInputs from '../useGetSearchQueryInputs'; -import { ENTITY_FILTER_NAME } from '../utils/constants'; -import { FACETS_TO_ENTITY_TYPES } from './constants'; -import { mapFilterOption } from './mapFilterOption'; -import { FilterOptionType } from './types'; + +import { FACETS_TO_ENTITY_TYPES } from '@app/search/filters/constants'; +import { mapFilterOption } from '@app/search/filters/mapFilterOption'; +import { FilterOptionType } from '@app/search/filters/types'; import { combineAggregations, filterEmptyAggregations, @@ -18,7 +10,17 @@ import { getFilterOptions, getNewFilters, getNumActiveFiltersForFilter, -} from './utils'; +} from '@app/search/filters/utils'; +import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs'; +import { ENTITY_FILTER_NAME } from '@app/search/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { + GetAutoCompleteMultipleResultsQuery, + useAggregateAcrossEntitiesLazyQuery, + useGetAutoCompleteMultipleResultsLazyQuery, +} from '@graphql/search.generated'; +import { FacetFilterInput, FacetMetadata } from '@types'; interface Props { filter: FacetMetadata; diff --git a/datahub-web-react/src/app/search/filters/utils.tsx b/datahub-web-react/src/app/search/filters/utils.tsx index 7300ed2218..b1e4b72cc3 100644 --- a/datahub-web-react/src/app/search/filters/utils.tsx +++ b/datahub-web-react/src/app/search/filters/utils.tsx @@ -1,7 +1,3 @@ -import moment from 'moment-timezone'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import Icon from '@ant-design/icons/lib/components/Icon'; -import TableIcon from '@src/images/table-icon.svg?react'; import { BookOutlined, DatabaseOutlined, @@ -11,11 +7,16 @@ import { TagOutlined, UserOutlined, } from '@ant-design/icons'; -import { removeMarkdown } from '@src/app/entity/shared/components/styled/StripMarkdownText'; -import { DATE_TYPE_URN } from '@src/app/shared/constants'; -import styled from 'styled-components'; -import { STRUCTURED_PROPERTY_FILTER } from '@src/app/searchV2/filters/field/fields'; +import Icon from '@ant-design/icons/lib/components/Icon'; +import moment from 'moment-timezone'; import React, { useLayoutEffect, useState } from 'react'; +import styled from 'styled-components'; + +import { IconStyleType } from '@app/entity/Entity'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { FACETS_TO_ENTITY_TYPES } from '@app/search/filters/constants'; +import { FilterOptionType } from '@app/search/filters/types'; import { BROWSE_PATH_V2_FILTER_NAME, CONTAINER_FILTER_NAME, @@ -31,10 +32,18 @@ import { TAGS_FILTER_NAME, TYPE_NAMES_FILTER_NAME, UNIT_SEPARATOR, -} from '../utils/constants'; +} from '@app/search/utils/constants'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { removeMarkdown } from '@src/app/entity/shared/components/styled/StripMarkdownText'; +import { STRUCTURED_PROPERTY_FILTER } from '@src/app/searchV2/filters/field/fields'; +import { DATE_TYPE_URN } from '@src/app/shared/constants'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import TableIcon from '@src/images/table-icon.svg?react'; +import { GetAutoCompleteMultipleResultsQuery } from '@graphql/search.generated'; import { AggregationMetadata, + Container, DataPlatform, DataPlatformInstance, Domain, @@ -43,17 +52,10 @@ import { FacetFilterInput, FacetMetadata, GlossaryTerm, - Container, StructuredPropertyEntity, -} from '../../../types.generated'; -import { IconStyleType } from '../../entity/Entity'; -import EntityRegistry from '../../entity/EntityRegistry'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import DomainsIcon from '../../../images/domain.svg?react'; -import { GetAutoCompleteMultipleResultsQuery } from '../../../graphql/search.generated'; -import { FACETS_TO_ENTITY_TYPES } from './constants'; -import { FilterOptionType } from './types'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; +} from '@types'; + +import DomainsIcon from '@images/domain.svg?react'; // either adds or removes selectedFilterValues to/from activeFilters for a given filterField export function getNewFilters(filterField: string, activeFilters: FacetFilterInput[], selectedFilterValues: string[]) { diff --git a/datahub-web-react/src/app/search/matches/MatchedFieldList.tsx b/datahub-web-react/src/app/search/matches/MatchedFieldList.tsx index 9d77d446ff..83b1427dda 100644 --- a/datahub-web-react/src/app/search/matches/MatchedFieldList.tsx +++ b/datahub-web-react/src/app/search/matches/MatchedFieldList.tsx @@ -1,14 +1,15 @@ -import React from 'react'; - import { Tooltip, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { useMatchedFieldLabel, useMatchedFieldsForList } from '../context/SearchResultContext'; -import { MatchedField } from '../../../types.generated'; -import { ANTD_GRAY_V2 } from '../../entity/shared/constants'; -import { useSearchQuery } from '../context/SearchContext'; -import { MatchesGroupedByFieldName } from './constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { getDescriptionSlice, isDescriptionField, isHighlightableEntityField } from './utils'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { useSearchQuery } from '@app/search/context/SearchContext'; +import { useMatchedFieldLabel, useMatchedFieldsForList } from '@app/search/context/SearchResultContext'; +import { MatchesGroupedByFieldName } from '@app/search/matches/constants'; +import { getDescriptionSlice, isDescriptionField, isHighlightableEntityField } from '@app/search/matches/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { MatchedField } from '@types'; const MatchesContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/search/matches/SearchTextHighlighter.tsx b/datahub-web-react/src/app/search/matches/SearchTextHighlighter.tsx index 7a0a0e1e41..2bf9f1c649 100644 --- a/datahub-web-react/src/app/search/matches/SearchTextHighlighter.tsx +++ b/datahub-web-react/src/app/search/matches/SearchTextHighlighter.tsx @@ -1,10 +1,11 @@ import React from 'react'; import Highlight from 'react-highlighter'; import styled from 'styled-components'; -import { useMatchedFieldsByGroup } from '../context/SearchResultContext'; -import { useSearchQuery } from '../context/SearchContext'; -import { MatchedFieldName } from './constants'; -import { useAppConfig } from '../../useAppConfig'; + +import { useSearchQuery } from '@app/search/context/SearchContext'; +import { useMatchedFieldsByGroup } from '@app/search/context/SearchResultContext'; +import { MatchedFieldName } from '@app/search/matches/constants'; +import { useAppConfig } from '@app/useAppConfig'; type Props = { field: MatchedFieldName; diff --git a/datahub-web-react/src/app/search/matches/constants.ts b/datahub-web-react/src/app/search/matches/constants.ts index 25ca82eef9..9892ba33fe 100644 --- a/datahub-web-react/src/app/search/matches/constants.ts +++ b/datahub-web-react/src/app/search/matches/constants.ts @@ -1,4 +1,4 @@ -import { EntityType, MatchedField } from '../../../types.generated'; +import { EntityType, MatchedField } from '@types'; export type MatchedFieldName = | 'urn' diff --git a/datahub-web-react/src/app/search/matches/matchedFieldPathsRenderer.tsx b/datahub-web-react/src/app/search/matches/matchedFieldPathsRenderer.tsx index 0a33530552..a962d0bbf5 100644 --- a/datahub-web-react/src/app/search/matches/matchedFieldPathsRenderer.tsx +++ b/datahub-web-react/src/app/search/matches/matchedFieldPathsRenderer.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { MatchedField } from '../../../types.generated'; -import { downgradeV2FieldPath } from '../../entity/dataset/profile/schema/utils/utils'; +import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils'; + +import { MatchedField } from '@types'; export const matchedFieldPathsRenderer = (matchedField: MatchedField) => { return matchedField?.name === 'fieldPaths' ? {downgradeV2FieldPath(matchedField.value)} : null; diff --git a/datahub-web-react/src/app/search/matches/matchedInputFieldRenderer.tsx b/datahub-web-react/src/app/search/matches/matchedInputFieldRenderer.tsx index 25634c9e8b..2a30484613 100644 --- a/datahub-web-react/src/app/search/matches/matchedInputFieldRenderer.tsx +++ b/datahub-web-react/src/app/search/matches/matchedInputFieldRenderer.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { Chart, Dashboard, EntityType, GlossaryTerm, MatchedField } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Chart, Dashboard, EntityType, GlossaryTerm, MatchedField } from '@types'; const LABEL_INDEX_NAME = 'fieldLabels'; const TYPE_PROPERTY_KEY_NAME = 'type'; diff --git a/datahub-web-react/src/app/search/matches/utils.test.ts b/datahub-web-react/src/app/search/matches/utils.test.ts index 8b5ed27f5c..4ca0b43921 100644 --- a/datahub-web-react/src/app/search/matches/utils.test.ts +++ b/datahub-web-react/src/app/search/matches/utils.test.ts @@ -1,5 +1,6 @@ -import { EntityType } from '../../../types.generated'; -import { getMatchesPrioritized } from './utils'; +import { getMatchesPrioritized } from '@app/search/matches/utils'; + +import { EntityType } from '@types'; const mapping = new Map(); mapping.set('fieldPaths', 'column'); diff --git a/datahub-web-react/src/app/search/matches/utils.ts b/datahub-web-react/src/app/search/matches/utils.ts index 78c62f7eef..22488cbf68 100644 --- a/datahub-web-react/src/app/search/matches/utils.ts +++ b/datahub-web-react/src/app/search/matches/utils.ts @@ -1,12 +1,14 @@ import * as QueryString from 'query-string'; -import { EntityType, MatchedField } from '../../../types.generated'; + import { HIGHLIGHTABLE_ENTITY_TYPES, MATCHED_FIELD_CONFIG, MatchedFieldConfig, MatchedFieldName, MatchesGroupedByFieldName, -} from './constants'; +} from '@app/search/matches/constants'; + +import { EntityType, MatchedField } from '@types'; const getFieldConfigsByEntityType = (entityType: EntityType | undefined): Array => { return entityType && entityType in MATCHED_FIELD_CONFIG diff --git a/datahub-web-react/src/app/search/sidebar/BrowseContext.tsx b/datahub-web-react/src/app/search/sidebar/BrowseContext.tsx index 487ff8715d..d6d5aad5e9 100644 --- a/datahub-web-react/src/app/search/sidebar/BrowseContext.tsx +++ b/datahub-web-react/src/app/search/sidebar/BrowseContext.tsx @@ -1,22 +1,18 @@ import React, { ReactNode, createContext, useContext, useMemo } from 'react'; -import { - AggregationMetadata, - BrowseResultGroupV2, - EntityType, - FacetFilterInput, - FilterOperator, -} from '../../../types.generated'; -import { createBrowseV2SearchFilter } from '../filters/utils'; + +import { createBrowseV2SearchFilter } from '@app/search/filters/utils'; +import { useHasFilterValue, useOnChangeFilters, useSelectedFilters } from '@app/search/sidebar/SidebarContext'; +import { getEntitySubtypeFiltersForEntity } from '@app/search/sidebar/browseContextUtils'; +import { applyFacetFilterOverrides } from '@app/search/utils/applyFilterOverrides'; import { BROWSE_PATH_V2_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME, -} from '../utils/constants'; -import { useHasFilterValue, useOnChangeFilters, useSelectedFilters } from './SidebarContext'; -import { applyFacetFilterOverrides } from '../utils/applyFilterOverrides'; -import { getEntitySubtypeFiltersForEntity } from './browseContextUtils'; -import { useEntityRegistry } from '../../useEntityRegistry'; +} from '@app/search/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { AggregationMetadata, BrowseResultGroupV2, EntityType, FacetFilterInput, FilterOperator } from '@types'; type BrowseContextValue = { entityAggregation?: AggregationMetadata; diff --git a/datahub-web-react/src/app/search/sidebar/BrowseNode.tsx b/datahub-web-react/src/app/search/sidebar/BrowseNode.tsx index e8c13ed585..bd6b361e86 100644 --- a/datahub-web-react/src/app/search/sidebar/BrowseNode.tsx +++ b/datahub-web-react/src/app/search/sidebar/BrowseNode.tsx @@ -1,28 +1,30 @@ +import { FolderOutlined } from '@ant-design/icons'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { FolderOutlined } from '@ant-design/icons'; -import { formatNumber } from '../../shared/formatNumber'; -import ExpandableNode from './ExpandableNode'; -import useBrowsePagination from './useBrowsePagination'; -import SidebarLoadingError from './SidebarLoadingError'; -import useToggle from '../../shared/useToggle'; + import { BrowseProvider, + useBrowseDisplayName, + useBrowsePathLength, useBrowseResultGroup, + useEntityAggregation, + useIsBrowsePathPrefix, + useIsBrowsePathSelected, useMaybeEnvironmentAggregation, useOnSelectBrowsePath, usePlatformAggregation, - useEntityAggregation, - useIsBrowsePathSelected, - useIsBrowsePathPrefix, - useBrowsePathLength, - useBrowseDisplayName, -} from './BrowseContext'; -import useSidebarAnalytics from './useSidebarAnalytics'; -import EntityLink from './EntityLink'; -import { EntityType } from '../../../types.generated'; -import { SortBy, useSort } from './useSort'; +} from '@app/search/sidebar/BrowseContext'; +import EntityLink from '@app/search/sidebar/EntityLink'; +import ExpandableNode from '@app/search/sidebar/ExpandableNode'; +import SidebarLoadingError from '@app/search/sidebar/SidebarLoadingError'; +import useBrowsePagination from '@app/search/sidebar/useBrowsePagination'; +import useSidebarAnalytics from '@app/search/sidebar/useSidebarAnalytics'; +import { SortBy, useSort } from '@app/search/sidebar/useSort'; +import { formatNumber } from '@app/shared/formatNumber'; +import useToggle from '@app/shared/useToggle'; + +import { EntityType } from '@types'; const FolderStyled = styled(FolderOutlined)` font-size: 16px; diff --git a/datahub-web-react/src/app/search/sidebar/BrowseSidebar.tsx b/datahub-web-react/src/app/search/sidebar/BrowseSidebar.tsx index 27df8033c3..a8ddf219cb 100644 --- a/datahub-web-react/src/app/search/sidebar/BrowseSidebar.tsx +++ b/datahub-web-react/src/app/search/sidebar/BrowseSidebar.tsx @@ -1,15 +1,17 @@ +import Icon, { CaretDownFilled } from '@ant-design/icons'; +import { Select, Tooltip, Typography } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Select, Tooltip, Typography } from 'antd'; -import Icon, { CaretDownFilled } from '@ant-design/icons'; -import EntityNode from './EntityNode'; -import { BrowseProvider } from './BrowseContext'; -import SidebarLoadingError from './SidebarLoadingError'; -import { SEARCH_RESULTS_BROWSE_SIDEBAR_ID } from '../../onboarding/config/SearchOnboardingConfig'; -import useSidebarEntities from './useSidebarEntities'; -import { ANTD_GRAY, ANTD_GRAY_V2 } from '../../entity/shared/constants'; -import { ProfileSidebarResizer } from '../../entity/shared/containers/profile/sidebar/ProfileSidebarResizer'; -import SortIcon from '../../../images/sort.svg?react'; + +import { ANTD_GRAY, ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { ProfileSidebarResizer } from '@app/entity/shared/containers/profile/sidebar/ProfileSidebarResizer'; +import { SEARCH_RESULTS_BROWSE_SIDEBAR_ID } from '@app/onboarding/config/SearchOnboardingConfig'; +import { BrowseProvider } from '@app/search/sidebar/BrowseContext'; +import EntityNode from '@app/search/sidebar/EntityNode'; +import SidebarLoadingError from '@app/search/sidebar/SidebarLoadingError'; +import useSidebarEntities from '@app/search/sidebar/useSidebarEntities'; + +import SortIcon from '@images/sort.svg?react'; export const MAX_BROWSER_WIDTH = 500; export const MIN_BROWSWER_WIDTH = 200; diff --git a/datahub-web-react/src/app/search/sidebar/EntityLink.tsx b/datahub-web-react/src/app/search/sidebar/EntityLink.tsx index 08b22b04c2..2638467a64 100644 --- a/datahub-web-react/src/app/search/sidebar/EntityLink.tsx +++ b/datahub-web-react/src/app/search/sidebar/EntityLink.tsx @@ -1,15 +1,18 @@ +import Icon from '@ant-design/icons/lib/components/Icon'; import { Tooltip } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import Icon from '@ant-design/icons/lib/components/Icon'; -import { useBrowseDisplayName, useIsBrowsePathSelected } from './BrowseContext'; -import ExpandableNode from './ExpandableNode'; -import ExternalLink from '../../../images/link-out.svg?react'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { Entity, Maybe } from '../../../types.generated'; -import useSidebarAnalytics from './useSidebarAnalytics'; -import { BrowseV2EntityLinkClickEvent } from '../../analytics'; + +import { BrowseV2EntityLinkClickEvent } from '@app/analytics'; +import { useBrowseDisplayName, useIsBrowsePathSelected } from '@app/search/sidebar/BrowseContext'; +import ExpandableNode from '@app/search/sidebar/ExpandableNode'; +import useSidebarAnalytics from '@app/search/sidebar/useSidebarAnalytics'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, Maybe } from '@types'; + +import ExternalLink from '@images/link-out.svg?react'; const Linkicon = styled(Icon)<{ isSelected: boolean }>` && { diff --git a/datahub-web-react/src/app/search/sidebar/EntityNode.tsx b/datahub-web-react/src/app/search/sidebar/EntityNode.tsx index 1b44d9dd83..6527ac926e 100644 --- a/datahub-web-react/src/app/search/sidebar/EntityNode.tsx +++ b/datahub-web-react/src/app/search/sidebar/EntityNode.tsx @@ -1,20 +1,26 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { IconStyleType } from '../../entity/Entity'; -import { formatNumber } from '../../shared/formatNumber'; -import ExpandableNode from './ExpandableNode'; -import EnvironmentNode from './EnvironmentNode'; -import useAggregationsQuery from './useAggregationsQuery'; -import { MAX_COUNT_VAL, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '../utils/constants'; -import PlatformNode from './PlatformNode'; -import SidebarLoadingError from './SidebarLoadingError'; -import useToggle from '../../shared/useToggle'; -import { BrowseProvider, useEntityAggregation, useEntityType, useIsEntitySelected } from './BrowseContext'; -import useSidebarAnalytics from './useSidebarAnalytics'; -import { useHasFilterField } from './SidebarContext'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { + BrowseProvider, + useEntityAggregation, + useEntityType, + useIsEntitySelected, +} from '@app/search/sidebar/BrowseContext'; +import EnvironmentNode from '@app/search/sidebar/EnvironmentNode'; +import ExpandableNode from '@app/search/sidebar/ExpandableNode'; +import PlatformNode from '@app/search/sidebar/PlatformNode'; +import { useHasFilterField } from '@app/search/sidebar/SidebarContext'; +import SidebarLoadingError from '@app/search/sidebar/SidebarLoadingError'; +import useAggregationsQuery from '@app/search/sidebar/useAggregationsQuery'; +import useSidebarAnalytics from '@app/search/sidebar/useSidebarAnalytics'; +import { MAX_COUNT_VAL, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/search/utils/constants'; +import { formatNumber } from '@app/shared/formatNumber'; +import useToggle from '@app/shared/useToggle'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const Count = styled(Typography.Text)` font-size: 12px; diff --git a/datahub-web-react/src/app/search/sidebar/EnvironmentNode.tsx b/datahub-web-react/src/app/search/sidebar/EnvironmentNode.tsx index 2ffb514425..a91c544a73 100644 --- a/datahub-web-react/src/app/search/sidebar/EnvironmentNode.tsx +++ b/datahub-web-react/src/app/search/sidebar/EnvironmentNode.tsx @@ -1,20 +1,21 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { formatNumber } from '../../shared/formatNumber'; -import ExpandableNode from './ExpandableNode'; -import useAggregationsQuery from './useAggregationsQuery'; -import { PLATFORM_FILTER_NAME } from '../utils/constants'; -import PlatformNode from './PlatformNode'; -import SidebarLoadingError from './SidebarLoadingError'; -import useToggle from '../../shared/useToggle'; + import { BrowseProvider, useEntityAggregation, useEnvironmentAggregation, useIsEnvironmentSelected, -} from './BrowseContext'; -import useSidebarAnalytics from './useSidebarAnalytics'; +} from '@app/search/sidebar/BrowseContext'; +import ExpandableNode from '@app/search/sidebar/ExpandableNode'; +import PlatformNode from '@app/search/sidebar/PlatformNode'; +import SidebarLoadingError from '@app/search/sidebar/SidebarLoadingError'; +import useAggregationsQuery from '@app/search/sidebar/useAggregationsQuery'; +import useSidebarAnalytics from '@app/search/sidebar/useSidebarAnalytics'; +import { PLATFORM_FILTER_NAME } from '@app/search/utils/constants'; +import { formatNumber } from '@app/shared/formatNumber'; +import useToggle from '@app/shared/useToggle'; const Count = styled(Typography.Text)` font-size: 12px; diff --git a/datahub-web-react/src/app/search/sidebar/ExpandableNode.tsx b/datahub-web-react/src/app/search/sidebar/ExpandableNode.tsx index ba93cf94fb..ceaa233bbf 100644 --- a/datahub-web-react/src/app/search/sidebar/ExpandableNode.tsx +++ b/datahub-web-react/src/app/search/sidebar/ExpandableNode.tsx @@ -1,10 +1,11 @@ -import React, { MouseEventHandler, ReactNode } from 'react'; -import styled from 'styled-components'; -import { VscTriangleRight } from 'react-icons/vsc'; -import { Typography } from 'antd'; import { UpCircleOutlined } from '@ant-design/icons'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { BaseButton, BodyContainer, BodyGridExpander, RotatingButton } from '../../shared/components'; +import { Typography } from 'antd'; +import React, { MouseEventHandler, ReactNode } from 'react'; +import { VscTriangleRight } from 'react-icons/vsc'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { BaseButton, BodyContainer, BodyGridExpander, RotatingButton } from '@app/shared/components'; const Layout = styled.div` margin-left: 8px; diff --git a/datahub-web-react/src/app/search/sidebar/PlatformNode.tsx b/datahub-web-react/src/app/search/sidebar/PlatformNode.tsx index c8ee37541d..b32883e462 100644 --- a/datahub-web-react/src/app/search/sidebar/PlatformNode.tsx +++ b/datahub-web-react/src/app/search/sidebar/PlatformNode.tsx @@ -1,15 +1,8 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { formatNumber } from '../../shared/formatNumber'; -import ExpandableNode from './ExpandableNode'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { getFilterIconAndLabel } from '../filters/utils'; -import { BROWSE_PATH_V2_FILTER_NAME, PLATFORM_FILTER_NAME } from '../utils/constants'; -import useBrowsePagination from './useBrowsePagination'; -import BrowseNode from './BrowseNode'; -import SidebarLoadingError from './SidebarLoadingError'; -import useToggle from '../../shared/useToggle'; + +import { getFilterIconAndLabel } from '@app/search/filters/utils'; import { BrowseProvider, useEntityAggregation, @@ -17,10 +10,18 @@ import { useMaybeEnvironmentAggregation, useOnSelectBrowsePath, usePlatformAggregation, -} from './BrowseContext'; -import useSidebarAnalytics from './useSidebarAnalytics'; -import { useHasFilterField } from './SidebarContext'; -import { SortBy, useSort } from './useSort'; +} from '@app/search/sidebar/BrowseContext'; +import BrowseNode from '@app/search/sidebar/BrowseNode'; +import ExpandableNode from '@app/search/sidebar/ExpandableNode'; +import { useHasFilterField } from '@app/search/sidebar/SidebarContext'; +import SidebarLoadingError from '@app/search/sidebar/SidebarLoadingError'; +import useBrowsePagination from '@app/search/sidebar/useBrowsePagination'; +import useSidebarAnalytics from '@app/search/sidebar/useSidebarAnalytics'; +import { SortBy, useSort } from '@app/search/sidebar/useSort'; +import { BROWSE_PATH_V2_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/search/utils/constants'; +import { formatNumber } from '@app/shared/formatNumber'; +import useToggle from '@app/shared/useToggle'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const PlatformIconContainer = styled.div` width: 16px; diff --git a/datahub-web-react/src/app/search/sidebar/SidebarContext.tsx b/datahub-web-react/src/app/search/sidebar/SidebarContext.tsx index 924f954b5f..4c7ba30077 100644 --- a/datahub-web-react/src/app/search/sidebar/SidebarContext.tsx +++ b/datahub-web-react/src/app/search/sidebar/SidebarContext.tsx @@ -1,5 +1,6 @@ import React, { ReactNode, createContext, useContext } from 'react'; -import { FacetFilterInput, FilterOperator } from '../../../types.generated'; + +import { FacetFilterInput, FilterOperator } from '@types'; type SidebarContextValue = { selectedFilters: Array; diff --git a/datahub-web-react/src/app/search/sidebar/SidebarLoadingError.tsx b/datahub-web-react/src/app/search/sidebar/SidebarLoadingError.tsx index 412332ce5f..6b762b03a5 100644 --- a/datahub-web-react/src/app/search/sidebar/SidebarLoadingError.tsx +++ b/datahub-web-react/src/app/search/sidebar/SidebarLoadingError.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Alert, Button } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const StyledAlert = styled(Alert)` diff --git a/datahub-web-react/src/app/search/sidebar/__tests__/browseContextUtils.test.ts b/datahub-web-react/src/app/search/sidebar/__tests__/browseContextUtils.test.ts index efabe1b137..de0667d6d1 100644 --- a/datahub-web-react/src/app/search/sidebar/__tests__/browseContextUtils.test.ts +++ b/datahub-web-react/src/app/search/sidebar/__tests__/browseContextUtils.test.ts @@ -1,5 +1,5 @@ -import { ENTITY_SUB_TYPE_FILTER_NAME, TAGS_FILTER_NAME } from '../../utils/constants'; -import { getEntitySubtypeFiltersForEntity } from '../browseContextUtils'; +import { getEntitySubtypeFiltersForEntity } from '@app/search/sidebar/browseContextUtils'; +import { ENTITY_SUB_TYPE_FILTER_NAME, TAGS_FILTER_NAME } from '@app/search/utils/constants'; describe('browseContextUtils', () => { it('should remove any different entity types from the filter and keep anything related to our given entityType', () => { diff --git a/datahub-web-react/src/app/search/sidebar/browseContextUtils.ts b/datahub-web-react/src/app/search/sidebar/browseContextUtils.ts index 1fcda04063..9b5f9a804c 100644 --- a/datahub-web-react/src/app/search/sidebar/browseContextUtils.ts +++ b/datahub-web-react/src/app/search/sidebar/browseContextUtils.ts @@ -1,5 +1,6 @@ -import { FacetFilterInput } from '../../../types.generated'; -import { ENTITY_SUB_TYPE_FILTER_NAME } from '../utils/constants'; +import { ENTITY_SUB_TYPE_FILTER_NAME } from '@app/search/utils/constants'; + +import { FacetFilterInput } from '@types'; export function getEntitySubtypeFiltersForEntity(entityType: string, existingFilters: FacetFilterInput[]) { return existingFilters diff --git a/datahub-web-react/src/app/search/sidebar/index.tsx b/datahub-web-react/src/app/search/sidebar/index.tsx index 552f7a89a4..c2812c73ae 100644 --- a/datahub-web-react/src/app/search/sidebar/index.tsx +++ b/datahub-web-react/src/app/search/sidebar/index.tsx @@ -1,3 +1,3 @@ -import BrowseSidebar from './BrowseSidebar'; +import BrowseSidebar from '@app/search/sidebar/BrowseSidebar'; export default BrowseSidebar; diff --git a/datahub-web-react/src/app/search/sidebar/types.ts b/datahub-web-react/src/app/search/sidebar/types.ts index cff0bf5a37..6a108cded6 100644 --- a/datahub-web-react/src/app/search/sidebar/types.ts +++ b/datahub-web-react/src/app/search/sidebar/types.ts @@ -1,4 +1,4 @@ -import useGetSearchQueryInputs from '../useGetSearchQueryInputs'; +import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs'; export type SidebarFilters = Pick< ReturnType, diff --git a/datahub-web-react/src/app/search/sidebar/useAggregationsQuery.ts b/datahub-web-react/src/app/search/sidebar/useAggregationsQuery.ts index bd9ac540b0..428aa40763 100644 --- a/datahub-web-react/src/app/search/sidebar/useAggregationsQuery.ts +++ b/datahub-web-react/src/app/search/sidebar/useAggregationsQuery.ts @@ -1,10 +1,11 @@ -import { useAggregateAcrossEntitiesQuery } from '../../../graphql/search.generated'; -import { EntityType } from '../../../types.generated'; -import { GLOSSARY_ENTITY_TYPES } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '../utils/constants'; -import { MAX_AGGREGATION_VALUES } from './constants'; -import { useSidebarFilters } from './useSidebarFilters'; +import { GLOSSARY_ENTITY_TYPES } from '@app/entity/shared/constants'; +import { MAX_AGGREGATION_VALUES } from '@app/search/sidebar/constants'; +import { useSidebarFilters } from '@app/search/sidebar/useSidebarFilters'; +import { ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/search/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useAggregateAcrossEntitiesQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; type Props = { facets: string[]; @@ -44,7 +45,7 @@ const useAggregationsQuery = ({ facets, excludeFilters = false, skip }: Props) = }; // This approach of falling back to previousData is needed to avoid a full re-mount of the sidebar entities - const data = error ? null : newData ?? previousData; + const data = error ? null : (newData ?? previousData); const loaded = !!data || !!error; const entityAggregations = data?.aggregateAcrossEntities?.facets diff --git a/datahub-web-react/src/app/search/sidebar/useBrowsePagination.tsx b/datahub-web-react/src/app/search/sidebar/useBrowsePagination.tsx index cadecdb318..b5e510c02a 100644 --- a/datahub-web-react/src/app/search/sidebar/useBrowsePagination.tsx +++ b/datahub-web-react/src/app/search/sidebar/useBrowsePagination.tsx @@ -1,9 +1,11 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; -import useIntersect from '../../shared/useIntersect'; -import { BROWSE_LOAD_MORE_MARGIN, BROWSE_PAGE_SIZE } from './constants'; -import { GetBrowseResultsV2Query, useGetBrowseResultsV2LazyQuery } from '../../../graphql/browseV2.generated'; -import { useSidebarFilters } from './useSidebarFilters'; -import { useBrowsePath, useEntityType } from './BrowseContext'; + +import { useBrowsePath, useEntityType } from '@app/search/sidebar/BrowseContext'; +import { BROWSE_LOAD_MORE_MARGIN, BROWSE_PAGE_SIZE } from '@app/search/sidebar/constants'; +import { useSidebarFilters } from '@app/search/sidebar/useSidebarFilters'; +import useIntersect from '@app/shared/useIntersect'; + +import { GetBrowseResultsV2Query, useGetBrowseResultsV2LazyQuery } from '@graphql/browseV2.generated'; type Props = { skip: boolean; diff --git a/datahub-web-react/src/app/search/sidebar/useSidebarAnalytics.ts b/datahub-web-react/src/app/search/sidebar/useSidebarAnalytics.ts index ee690f421a..317a3efc76 100644 --- a/datahub-web-react/src/app/search/sidebar/useSidebarAnalytics.ts +++ b/datahub-web-react/src/app/search/sidebar/useSidebarAnalytics.ts @@ -1,18 +1,19 @@ -import { EntityType } from '../../../types.generated'; import { BrowseV2EntityLinkClickEvent, BrowseV2SelectNodeEvent, BrowseV2ToggleNodeEvent, EventType, -} from '../../analytics'; -import analytics from '../../analytics/analytics'; -import { useEntityRegistry } from '../../useEntityRegistry'; +} from '@app/analytics'; +import analytics from '@app/analytics/analytics'; import { useBrowsePathLength, useEntityType, useMaybeEnvironmentAggregation, useMaybePlatformAggregation, -} from './BrowseContext'; +} from '@app/search/sidebar/BrowseContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const useSidebarAnalytics = () => { const registry = useEntityRegistry(); diff --git a/datahub-web-react/src/app/search/sidebar/useSidebarEntities.ts b/datahub-web-react/src/app/search/sidebar/useSidebarEntities.ts index 08150a671a..c605eed940 100644 --- a/datahub-web-react/src/app/search/sidebar/useSidebarEntities.ts +++ b/datahub-web-react/src/app/search/sidebar/useSidebarEntities.ts @@ -1,6 +1,7 @@ import { useMemo } from 'react'; -import { ENTITY_FILTER_NAME } from '../utils/constants'; -import useAggregationsQuery from './useAggregationsQuery'; + +import useAggregationsQuery from '@app/search/sidebar/useAggregationsQuery'; +import { ENTITY_FILTER_NAME } from '@app/search/utils/constants'; type Props = { skip: boolean; diff --git a/datahub-web-react/src/app/search/sidebar/useSidebarFilters.ts b/datahub-web-react/src/app/search/sidebar/useSidebarFilters.ts index 7a471f35e6..d51e9bdad3 100644 --- a/datahub-web-react/src/app/search/sidebar/useSidebarFilters.ts +++ b/datahub-web-react/src/app/search/sidebar/useSidebarFilters.ts @@ -1,15 +1,20 @@ import isEqual from 'lodash/isEqual'; import { useEffect, useMemo, useState } from 'react'; -import useGetSearchQueryInputs from '../useGetSearchQueryInputs'; + +import { + useMaybeEntityType, + useMaybeEnvironmentAggregation, + useMaybePlatformAggregation, +} from '@app/search/sidebar/BrowseContext'; +import { SidebarFilters } from '@app/search/sidebar/types'; +import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs'; +import { applyOrFilterOverrides } from '@app/search/utils/applyFilterOverrides'; import { BROWSE_PATH_V2_FILTER_NAME, ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME, -} from '../utils/constants'; -import { useMaybeEntityType, useMaybeEnvironmentAggregation, useMaybePlatformAggregation } from './BrowseContext'; -import { applyOrFilterOverrides } from '../utils/applyFilterOverrides'; -import { SidebarFilters } from './types'; +} from '@app/search/utils/constants'; export const useSidebarFilters = (): SidebarFilters => { const entityType = useMaybeEntityType(); diff --git a/datahub-web-react/src/app/search/sorting/SearchSortSelect.tsx b/datahub-web-react/src/app/search/sorting/SearchSortSelect.tsx index 0338f2f29b..50dba06086 100644 --- a/datahub-web-react/src/app/search/sorting/SearchSortSelect.tsx +++ b/datahub-web-react/src/app/search/sorting/SearchSortSelect.tsx @@ -2,10 +2,12 @@ import Icon, { CaretDownFilled } from '@ant-design/icons'; import { Select, Tooltip } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import SortIcon from '../../../images/sort.svg?react'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { DEFAULT_SORT_OPTION, SORT_OPTIONS } from '../context/constants'; -import { useSearchContext } from '../context/SearchContext'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useSearchContext } from '@app/search/context/SearchContext'; +import { DEFAULT_SORT_OPTION, SORT_OPTIONS } from '@app/search/context/constants'; + +import SortIcon from '@images/sort.svg?react'; const SelectWrapper = styled.span` display: inline-flex; diff --git a/datahub-web-react/src/app/search/sorting/useSortInput.ts b/datahub-web-react/src/app/search/sorting/useSortInput.ts index 08eb857bc3..0d5a4b77dc 100644 --- a/datahub-web-react/src/app/search/sorting/useSortInput.ts +++ b/datahub-web-react/src/app/search/sorting/useSortInput.ts @@ -1,5 +1,5 @@ -import { useSelectedSortOption } from '../context/SearchContext'; -import { RELEVANCE, SORT_OPTIONS } from '../context/constants'; +import { useSelectedSortOption } from '@app/search/context/SearchContext'; +import { RELEVANCE, SORT_OPTIONS } from '@app/search/context/constants'; export default function useSortInput() { const selectedSortOption = useSelectedSortOption(); diff --git a/datahub-web-react/src/app/search/suggestions/SearchQuerySugggester.tsx b/datahub-web-react/src/app/search/suggestions/SearchQuerySugggester.tsx index 9dbd67883b..46225d99a0 100644 --- a/datahub-web-react/src/app/search/suggestions/SearchQuerySugggester.tsx +++ b/datahub-web-react/src/app/search/suggestions/SearchQuerySugggester.tsx @@ -1,9 +1,11 @@ -import styled from 'styled-components'; import React from 'react'; import { useHistory } from 'react-router'; -import { SearchSuggestion } from '../../../types.generated'; -import { navigateToSearchUrl } from '../utils/navigateToSearchUrl'; -import { ANTD_GRAY_V2 } from '../../entity/shared/constants'; +import styled from 'styled-components'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; + +import { SearchSuggestion } from '@types'; const TextWrapper = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/search/useAdvancedSearchSelectFilters.tsx b/datahub-web-react/src/app/search/useAdvancedSearchSelectFilters.tsx index a3e5e6ba0a..f514738619 100644 --- a/datahub-web-react/src/app/search/useAdvancedSearchSelectFilters.tsx +++ b/datahub-web-react/src/app/search/useAdvancedSearchSelectFilters.tsx @@ -1,6 +1,8 @@ import { useState } from 'react'; -import { FacetFilterInput, FilterOperator } from '../../types.generated'; -import { FIELDS_THAT_USE_CONTAINS_OPERATOR } from './utils/constants'; + +import { FIELDS_THAT_USE_CONTAINS_OPERATOR } from '@app/search/utils/constants'; + +import { FacetFilterInput, FilterOperator } from '@types'; interface Props { selectedFilters: FacetFilterInput[]; diff --git a/datahub-web-react/src/app/search/useGetSearchQueryInputs.ts b/datahub-web-react/src/app/search/useGetSearchQueryInputs.ts index 9a3af8fb8d..ffbdb3fc44 100644 --- a/datahub-web-react/src/app/search/useGetSearchQueryInputs.ts +++ b/datahub-web-react/src/app/search/useGetSearchQueryInputs.ts @@ -1,13 +1,15 @@ import * as QueryString from 'query-string'; -import { useLocation, useParams } from 'react-router'; import { useMemo } from 'react'; -import { FacetFilterInput, EntityType } from '../../types.generated'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { ENTITY_FILTER_NAME, UnionType } from './utils/constants'; -import { useUserContext } from '../context/useUserContext'; -import useFilters from './utils/useFilters'; -import { generateOrFilters } from './utils/generateOrFilters'; -import useSortInput from './sorting/useSortInput'; +import { useLocation, useParams } from 'react-router'; + +import { useUserContext } from '@app/context/useUserContext'; +import useSortInput from '@app/search/sorting/useSortInput'; +import { ENTITY_FILTER_NAME, UnionType } from '@app/search/utils/constants'; +import { generateOrFilters } from '@app/search/utils/generateOrFilters'; +import useFilters from '@app/search/utils/useFilters'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, FacetFilterInput } from '@types'; type SearchPageParams = { type?: string; diff --git a/datahub-web-react/src/app/search/useSearchAndBrowseVersion.ts b/datahub-web-react/src/app/search/useSearchAndBrowseVersion.ts index b785821e61..6f3782f4b2 100644 --- a/datahub-web-react/src/app/search/useSearchAndBrowseVersion.ts +++ b/datahub-web-react/src/app/search/useSearchAndBrowseVersion.ts @@ -1,4 +1,4 @@ -import { useAppConfig } from '../useAppConfig'; +import { useAppConfig } from '@app/useAppConfig'; const useSearchAndBrowseVersion = () => { const appConfig = useAppConfig(); diff --git a/datahub-web-react/src/app/search/useToggleSidebar.ts b/datahub-web-react/src/app/search/useToggleSidebar.ts index dfe3f68f6c..c7f692343e 100644 --- a/datahub-web-react/src/app/search/useToggleSidebar.ts +++ b/datahub-web-react/src/app/search/useToggleSidebar.ts @@ -1,7 +1,7 @@ -import { EventType } from '../analytics'; -import analytics from '../analytics/analytics'; -import { useUserContext } from '../context/useUserContext'; -import useToggle from '../shared/useToggle'; +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import useToggle from '@app/shared/useToggle'; const useToggleSidebar = () => { const { localState, updateLocalState } = useUserContext(); diff --git a/datahub-web-react/src/app/search/utils/__tests__/applyFilterOverrides.test.ts b/datahub-web-react/src/app/search/utils/__tests__/applyFilterOverrides.test.ts index 1baf4c3248..dafae9a5dd 100644 --- a/datahub-web-react/src/app/search/utils/__tests__/applyFilterOverrides.test.ts +++ b/datahub-web-react/src/app/search/utils/__tests__/applyFilterOverrides.test.ts @@ -1,6 +1,11 @@ -import { applyFacetFilterOverrides, applyOrFilterOverrides } from '../applyFilterOverrides'; -import { CONTAINER_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME, UnionType } from '../constants'; -import { generateOrFilters } from '../generateOrFilters'; +import { applyFacetFilterOverrides, applyOrFilterOverrides } from '@app/search/utils/applyFilterOverrides'; +import { + CONTAINER_FILTER_NAME, + ORIGIN_FILTER_NAME, + PLATFORM_FILTER_NAME, + UnionType, +} from '@app/search/utils/constants'; +import { generateOrFilters } from '@app/search/utils/generateOrFilters'; describe('applyFacetFilterOverrides', () => { it('should concatenate overrides to an empty list', () => { diff --git a/datahub-web-react/src/app/search/utils/__tests__/filterUtils.test.ts b/datahub-web-react/src/app/search/utils/__tests__/filterUtils.test.ts index b32adfe30e..40b8e1c7da 100644 --- a/datahub-web-react/src/app/search/utils/__tests__/filterUtils.test.ts +++ b/datahub-web-react/src/app/search/utils/__tests__/filterUtils.test.ts @@ -1,5 +1,5 @@ -import { QuickFilterField } from '../../autoComplete/quickFilters/utils'; -import { getAutoCompleteInputFromQuickFilter, getFiltersWithQuickFilter } from '../filterUtils'; +import { QuickFilterField } from '@app/search/autoComplete/quickFilters/utils'; +import { getAutoCompleteInputFromQuickFilter, getFiltersWithQuickFilter } from '@app/search/utils/filterUtils'; describe('getAutoCompleteInputFromQuickFilter', () => { it('should create a platform filter if the selected quick filter is a platform', () => { diff --git a/datahub-web-react/src/app/search/utils/__tests__/generateOrFilters.test.ts b/datahub-web-react/src/app/search/utils/__tests__/generateOrFilters.test.ts index fd5a5691b4..54f08bd7dc 100644 --- a/datahub-web-react/src/app/search/utils/__tests__/generateOrFilters.test.ts +++ b/datahub-web-react/src/app/search/utils/__tests__/generateOrFilters.test.ts @@ -1,11 +1,11 @@ import { DOMAINS_FILTER_NAME, - ENTITY_SUB_TYPE_FILTER_NAME, ENTITY_FILTER_NAME, + ENTITY_SUB_TYPE_FILTER_NAME, TAGS_FILTER_NAME, UnionType, -} from '../constants'; -import { generateOrFilters } from '../generateOrFilters'; +} from '@app/search/utils/constants'; +import { generateOrFilters } from '@app/search/utils/generateOrFilters'; describe('generateOrFilters', () => { it('should generate orFilters with UnionType.AND', () => { diff --git a/datahub-web-react/src/app/search/utils/applyFilterOverrides.ts b/datahub-web-react/src/app/search/utils/applyFilterOverrides.ts index 035a272328..ffda478cfa 100644 --- a/datahub-web-react/src/app/search/utils/applyFilterOverrides.ts +++ b/datahub-web-react/src/app/search/utils/applyFilterOverrides.ts @@ -1,6 +1,7 @@ -import { AndFilterInput, FacetFilterInput } from '../../../types.generated'; -import { UnionType } from './constants'; -import { generateOrFilters } from './generateOrFilters'; +import { UnionType } from '@app/search/utils/constants'; +import { generateOrFilters } from '@app/search/utils/generateOrFilters'; + +import { AndFilterInput, FacetFilterInput } from '@types'; // Swap in new overrides at the same filter positions, with the remainder at the end // Assumes we find matches just by field name, so if multiple filters for the same field were passed, we replace those diff --git a/datahub-web-react/src/app/search/utils/combineSiblingsInAutoComplete.ts b/datahub-web-react/src/app/search/utils/combineSiblingsInAutoComplete.ts index e8e64559e6..f752f40da6 100644 --- a/datahub-web-react/src/app/search/utils/combineSiblingsInAutoComplete.ts +++ b/datahub-web-react/src/app/search/utils/combineSiblingsInAutoComplete.ts @@ -1,5 +1,6 @@ -import { AutoCompleteResultForEntity, EntityType } from '../../../types.generated'; -import { CombinedEntity, createSiblingEntityCombiner } from '../../entity/shared/siblingUtils'; +import { CombinedEntity, createSiblingEntityCombiner } from '@app/entity/shared/siblingUtils'; + +import { AutoCompleteResultForEntity, EntityType } from '@types'; export type CombinedSuggestion = { type: EntityType; diff --git a/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.test.ts b/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.test.ts index 5c1ad3263d..31e4b85232 100644 --- a/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.test.ts +++ b/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.test.ts @@ -1,4 +1,4 @@ -import { combineSiblingsInSearchResults } from './combineSiblingsInSearchResults'; +import { combineSiblingsInSearchResults } from '@app/search/utils/combineSiblingsInSearchResults'; const searchResultWithSiblings = [ { diff --git a/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.ts b/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.ts index ae0470eede..a8f3554b9a 100644 --- a/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.ts +++ b/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.ts @@ -1,5 +1,6 @@ -import { Entity, MatchedField } from '../../../types.generated'; -import { CombinedEntity, createSiblingEntityCombiner } from '../../entity/shared/siblingUtils'; +import { CombinedEntity, createSiblingEntityCombiner } from '@app/entity/shared/siblingUtils'; + +import { Entity, MatchedField } from '@types'; type UncombinedSeaerchResults = { entity: Entity; diff --git a/datahub-web-react/src/app/search/utils/filterSearchQuery.ts b/datahub-web-react/src/app/search/utils/filterSearchQuery.ts index 48df97dc77..4b228bf295 100644 --- a/datahub-web-react/src/app/search/utils/filterSearchQuery.ts +++ b/datahub-web-react/src/app/search/utils/filterSearchQuery.ts @@ -1,4 +1,4 @@ -import { SEARCH_FOR_ENTITY_PREFIX, EXACT_SEARCH_PREFIX } from './constants'; +import { EXACT_SEARCH_PREFIX, SEARCH_FOR_ENTITY_PREFIX } from '@app/search/utils/constants'; export default function filterSearchQuery(v: string) { return (v && v.startsWith(SEARCH_FOR_ENTITY_PREFIX)) || v.startsWith(EXACT_SEARCH_PREFIX) ? v.split('__')[1] : v; diff --git a/datahub-web-react/src/app/search/utils/filterUtils.ts b/datahub-web-react/src/app/search/utils/filterUtils.ts index 712df7af41..01a70879bd 100644 --- a/datahub-web-react/src/app/search/utils/filterUtils.ts +++ b/datahub-web-react/src/app/search/utils/filterUtils.ts @@ -1,7 +1,8 @@ -import { FacetFilterInput, AndFilterInput, QuickFilter, EntityType } from '../../../types.generated'; -import { FilterSet } from '../../entity/shared/components/styled/search/types'; -import { QuickFilterField } from '../autoComplete/quickFilters/utils'; -import { UnionType } from './constants'; +import { FilterSet } from '@app/entity/shared/components/styled/search/types'; +import { QuickFilterField } from '@app/search/autoComplete/quickFilters/utils'; +import { UnionType } from '@app/search/utils/constants'; + +import { AndFilterInput, EntityType, FacetFilterInput, QuickFilter } from '@types'; /** * Combines 2 sets of conjunctive filters in Disjunctive Normal Form diff --git a/datahub-web-react/src/app/search/utils/filtersToQueryStringParams.ts b/datahub-web-react/src/app/search/utils/filtersToQueryStringParams.ts index fc34dad146..0f3b3bda19 100644 --- a/datahub-web-react/src/app/search/utils/filtersToQueryStringParams.ts +++ b/datahub-web-react/src/app/search/utils/filtersToQueryStringParams.ts @@ -1,6 +1,7 @@ -import { FacetFilterInput, FilterOperator } from '../../../types.generated'; -import { encodeComma } from '../../entity/shared/utils'; -import { DEGREE_FILTER_NAME, FILTER_URL_PREFIX } from './constants'; +import { encodeComma } from '@app/entity/shared/utils'; +import { DEGREE_FILTER_NAME, FILTER_URL_PREFIX } from '@app/search/utils/constants'; + +import { FacetFilterInput, FilterOperator } from '@types'; export const URL_PARAM_SEPARATOR = '___'; diff --git a/datahub-web-react/src/app/search/utils/generateOrFilters.ts b/datahub-web-react/src/app/search/utils/generateOrFilters.ts index fa2939b343..00c64c35bc 100644 --- a/datahub-web-react/src/app/search/utils/generateOrFilters.ts +++ b/datahub-web-react/src/app/search/utils/generateOrFilters.ts @@ -1,5 +1,6 @@ -import { FacetFilterInput, AndFilterInput } from '../../../types.generated'; -import { FILTER_DELIMITER, UnionType } from './constants'; +import { FILTER_DELIMITER, UnionType } from '@app/search/utils/constants'; + +import { AndFilterInput, FacetFilterInput } from '@types'; // Generates a list of AND filter inputs to be combined in orFilters. This is used when unionType is OR or AND. // When unionType = OR, pass in empty `filters` so the nested filters live alone in their AND statement. diff --git a/datahub-web-react/src/app/search/utils/hasAdvancedFilters.ts b/datahub-web-react/src/app/search/utils/hasAdvancedFilters.ts index e1b7c104b9..0d42d6387e 100644 --- a/datahub-web-react/src/app/search/utils/hasAdvancedFilters.ts +++ b/datahub-web-react/src/app/search/utils/hasAdvancedFilters.ts @@ -1,5 +1,6 @@ -import { FacetFilterInput } from '../../../types.generated'; -import { ADVANCED_SEARCH_ONLY_FILTERS, UnionType } from './constants'; +import { ADVANCED_SEARCH_ONLY_FILTERS, UnionType } from '@app/search/utils/constants'; + +import { FacetFilterInput } from '@types'; // utility method that looks at the set of filters and determines if the filters can be represented by simple search export const hasAdvancedFilters = (filters: FacetFilterInput[], unionType: UnionType) => { diff --git a/datahub-web-react/src/app/search/utils/navigateToSearchUrl.ts b/datahub-web-react/src/app/search/utils/navigateToSearchUrl.ts index 7576e5cbdb..63f0b08bb0 100644 --- a/datahub-web-react/src/app/search/utils/navigateToSearchUrl.ts +++ b/datahub-web-react/src/app/search/utils/navigateToSearchUrl.ts @@ -1,9 +1,11 @@ import * as QueryString from 'query-string'; import { RouteComponentProps } from 'react-router-dom'; -import filtersToQueryStringParams from './filtersToQueryStringParams'; -import { EntityType, FacetFilterInput } from '../../../types.generated'; -import { PageRoutes } from '../../../conf/Global'; -import { UnionType } from './constants'; + +import { UnionType } from '@app/search/utils/constants'; +import filtersToQueryStringParams from '@app/search/utils/filtersToQueryStringParams'; +import { PageRoutes } from '@conf/Global'; + +import { EntityType, FacetFilterInput } from '@types'; export const navigateToSearchUrl = ({ type: newType, diff --git a/datahub-web-react/src/app/search/utils/types.ts b/datahub-web-react/src/app/search/utils/types.ts index 7631bf095a..6afad0c4aa 100644 --- a/datahub-web-react/src/app/search/utils/types.ts +++ b/datahub-web-react/src/app/search/utils/types.ts @@ -1,5 +1,6 @@ -import { AndFilterInput, EntityType, FacetMetadata, SearchFlags } from '../../../types.generated'; -import { SearchResultInterface } from '../../entity/shared/components/styled/search/types'; +import { SearchResultInterface } from '@app/entity/shared/components/styled/search/types'; + +import { AndFilterInput, EntityType, FacetMetadata, SearchFlags } from '@types'; /** * Input required to download a specific page of search results. diff --git a/datahub-web-react/src/app/search/utils/useDownloadScrollAcrossEntitiesSearchResults.ts b/datahub-web-react/src/app/search/utils/useDownloadScrollAcrossEntitiesSearchResults.ts index dd71834b29..4be3b42157 100644 --- a/datahub-web-react/src/app/search/utils/useDownloadScrollAcrossEntitiesSearchResults.ts +++ b/datahub-web-react/src/app/search/utils/useDownloadScrollAcrossEntitiesSearchResults.ts @@ -1,5 +1,10 @@ -import { useGetDownloadScrollResultsQuery } from '../../../graphql/scroll.generated'; -import { DownloadSearchResults, DownloadSearchResultsInput, DownloadSearchResultsParams } from './types'; +import { + DownloadSearchResults, + DownloadSearchResultsInput, + DownloadSearchResultsParams, +} from '@app/search/utils/types'; + +import { useGetDownloadScrollResultsQuery } from '@graphql/scroll.generated'; /** * Hook for use in downloading a single page of search results via the Scroll API. diff --git a/datahub-web-react/src/app/search/utils/useFilters.ts b/datahub-web-react/src/app/search/utils/useFilters.ts index 31ff653c9d..6586aedda6 100644 --- a/datahub-web-react/src/app/search/utils/useFilters.ts +++ b/datahub-web-react/src/app/search/utils/useFilters.ts @@ -1,10 +1,11 @@ -import { useMemo } from 'react'; import * as QueryString from 'query-string'; +import { useMemo } from 'react'; -import { ENTITY_FILTER_NAME, FILTER_URL_PREFIX, LEGACY_ENTITY_FILTER_NAME } from './constants'; -import { FacetFilterInput, FilterOperator } from '../../../types.generated'; -import { decodeComma } from '../../entity/shared/utils'; -import { URL_PARAM_SEPARATOR } from './filtersToQueryStringParams'; +import { decodeComma } from '@app/entity/shared/utils'; +import { ENTITY_FILTER_NAME, FILTER_URL_PREFIX, LEGACY_ENTITY_FILTER_NAME } from '@app/search/utils/constants'; +import { URL_PARAM_SEPARATOR } from '@app/search/utils/filtersToQueryStringParams'; + +import { FacetFilterInput, FilterOperator } from '@types'; function ifLegacyFieldNameTranslate(fieldName) { if (fieldName === LEGACY_ENTITY_FILTER_NAME) { diff --git a/datahub-web-react/src/app/searchV2/AdvancedSearchFilterOverallUnionTypeSelect.tsx b/datahub-web-react/src/app/searchV2/AdvancedSearchFilterOverallUnionTypeSelect.tsx index a37605182f..34056b3e79 100644 --- a/datahub-web-react/src/app/searchV2/AdvancedSearchFilterOverallUnionTypeSelect.tsx +++ b/datahub-web-react/src/app/searchV2/AdvancedSearchFilterOverallUnionTypeSelect.tsx @@ -2,8 +2,8 @@ import { Select } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { UnionType } from './utils/constants'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { UnionType } from '@app/searchV2/utils/constants'; type Props = { unionType: UnionType; diff --git a/datahub-web-react/src/app/searchV2/AnalyticsLink.tsx b/datahub-web-react/src/app/searchV2/AnalyticsLink.tsx index fc675b4da9..65cad7f1da 100644 --- a/datahub-web-react/src/app/searchV2/AnalyticsLink.tsx +++ b/datahub-web-react/src/app/searchV2/AnalyticsLink.tsx @@ -1,5 +1,5 @@ -import * as React from 'react'; import { Typography } from 'antd'; +import * as React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; diff --git a/datahub-web-react/src/app/searchV2/BrowseEntityCard.tsx b/datahub-web-react/src/app/searchV2/BrowseEntityCard.tsx index 50abfc0621..0f4b6f1da6 100644 --- a/datahub-web-react/src/app/searchV2/BrowseEntityCard.tsx +++ b/datahub-web-react/src/app/searchV2/BrowseEntityCard.tsx @@ -1,16 +1,18 @@ -import styled from 'styled-components'; import React from 'react'; import { useHistory } from 'react-router-dom'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { PageRoutes } from '../../conf/Global'; -import { IconStyleType } from '../entity/Entity'; -import { EntityType } from '../../types.generated'; -import { LogoCountCard } from '../shared/LogoCountCard'; -import { EventType } from '../analytics/event'; -import analytics from '../analytics'; -import { navigateToSearchUrl } from './utils/navigateToSearchUrl'; -import { ENTITY_SUB_TYPE_FILTER_NAME } from './utils/constants'; -import { useIsBrowseV2 } from './useSearchAndBrowseVersion'; +import styled from 'styled-components'; + +import analytics from '@app/analytics'; +import { EventType } from '@app/analytics/event'; +import { IconStyleType } from '@app/entity/Entity'; +import { useIsBrowseV2 } from '@app/searchV2/useSearchAndBrowseVersion'; +import { ENTITY_SUB_TYPE_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { navigateToSearchUrl } from '@app/searchV2/utils/navigateToSearchUrl'; +import { LogoCountCard } from '@app/shared/LogoCountCard'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { PageRoutes } from '@conf/Global'; + +import { EntityType } from '@types'; const BrowseEntityCardWrapper = styled.div``; diff --git a/datahub-web-react/src/app/searchV2/ChooseEntityTypeModal.tsx b/datahub-web-react/src/app/searchV2/ChooseEntityTypeModal.tsx index 1e31bd74ee..877d5c1243 100644 --- a/datahub-web-react/src/app/searchV2/ChooseEntityTypeModal.tsx +++ b/datahub-web-react/src/app/searchV2/ChooseEntityTypeModal.tsx @@ -1,7 +1,9 @@ import { Button, Modal, Select } from 'antd'; import React, { useState } from 'react'; -import { EntityType } from '../../types.generated'; -import { useEntityRegistry } from '../useEntityRegistry'; + +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; type Props = { onCloseModal: () => void; diff --git a/datahub-web-react/src/app/searchV2/CommandK.tsx b/datahub-web-react/src/app/searchV2/CommandK.tsx index 69d749fed6..070e5147c0 100644 --- a/datahub-web-react/src/app/searchV2/CommandK.tsx +++ b/datahub-web-react/src/app/searchV2/CommandK.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; + +import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign'; import { colors } from '@src/alchemy-components'; -import { useShowNavBarRedesign } from '../useShowNavBarRedesign'; const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>` color: ${(props) => (props.$isShowNavBarRedesign ? colors.gray[1700] : '#dcdcdc')}; diff --git a/datahub-web-react/src/app/searchV2/EmbeddedSearchBar.tsx b/datahub-web-react/src/app/searchV2/EmbeddedSearchBar.tsx index 0de4f67d12..2bfd4cdc52 100644 --- a/datahub-web-react/src/app/searchV2/EmbeddedSearchBar.tsx +++ b/datahub-web-react/src/app/searchV2/EmbeddedSearchBar.tsx @@ -1,11 +1,12 @@ -import React, { useEffect, useState } from 'react'; -import { Input } from 'antd'; -import styled from 'styled-components/macro'; -import * as QueryString from 'query-string'; -import { useHistory, useLocation } from 'react-router'; import { SearchOutlined } from '@ant-design/icons'; -import filterSearchQuery from './utils/filterSearchQuery'; -import useGetSearchQueryInputs from './useGetSearchQueryInputs'; +import { Input } from 'antd'; +import * as QueryString from 'query-string'; +import React, { useEffect, useState } from 'react'; +import { useHistory, useLocation } from 'react-router'; +import styled from 'styled-components/macro'; + +import useGetSearchQueryInputs from '@app/searchV2/useGetSearchQueryInputs'; +import filterSearchQuery from '@app/searchV2/utils/filterSearchQuery'; const SearchIcon = styled(SearchOutlined)` color: #8088a3; diff --git a/datahub-web-react/src/app/searchV2/EmptySearchResults.tsx b/datahub-web-react/src/app/searchV2/EmptySearchResults.tsx index cde61f746d..f38b22b9ae 100644 --- a/datahub-web-react/src/app/searchV2/EmptySearchResults.tsx +++ b/datahub-web-react/src/app/searchV2/EmptySearchResults.tsx @@ -1,15 +1,17 @@ import { RocketOutlined } from '@ant-design/icons'; -import { useHistory } from 'react-router'; import { Button } from 'antd'; import React, { useCallback } from 'react'; +import { useHistory } from 'react-router'; import styled from 'styled-components'; -import { ANTD_GRAY_V2 } from '../entity/shared/constants'; -import { navigateToSearchUrl } from './utils/navigateToSearchUrl'; -import analytics, { EventType } from '../analytics'; -import { SuggestedText } from './suggestions/SearchQuerySugggester'; -import useGetSearchQueryInputs from './useGetSearchQueryInputs'; -import { FacetFilterInput, SearchSuggestion } from '../../types.generated'; -import { useUserContext } from '../context/useUserContext'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { SuggestedText } from '@app/searchV2/suggestions/SearchQuerySugggester'; +import useGetSearchQueryInputs from '@app/searchV2/useGetSearchQueryInputs'; +import { navigateToSearchUrl } from '@app/searchV2/utils/navigateToSearchUrl'; + +import { FacetFilterInput, SearchSuggestion } from '@types'; const NoDataContainer = styled.div` margin: 40px auto; diff --git a/datahub-web-react/src/app/searchV2/SaveAsViewButton.tsx b/datahub-web-react/src/app/searchV2/SaveAsViewButton.tsx index 15d328bdf1..b2b44fa8eb 100644 --- a/datahub-web-react/src/app/searchV2/SaveAsViewButton.tsx +++ b/datahub-web-react/src/app/searchV2/SaveAsViewButton.tsx @@ -1,6 +1,6 @@ import { FilterOutlined } from '@ant-design/icons'; -import { Button } from 'antd'; import { Tooltip } from '@components'; +import { Button } from 'antd'; import React from 'react'; import styled from 'styled-components'; diff --git a/datahub-web-react/src/app/searchV2/SearchBar.tsx b/datahub-web-react/src/app/searchV2/SearchBar.tsx index c472f52b9a..a976be6abc 100644 --- a/datahub-web-react/src/app/searchV2/SearchBar.tsx +++ b/datahub-web-react/src/app/searchV2/SearchBar.tsx @@ -1,35 +1,37 @@ -import React, { useEffect, useMemo, useState, useRef, useCallback } from 'react'; -import { Input, AutoComplete, Skeleton } from 'antd'; import { CloseCircleFilled, SearchOutlined } from '@ant-design/icons'; -import styled from 'styled-components/macro'; +import { AutoComplete, Input, Skeleton } from 'antd'; +import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { useHistory } from 'react-router'; +import styled from 'styled-components/macro'; + +import analytics, { Event, EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { getEntityPath } from '@app/entity/shared/containers/profile/utils'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { ViewSelect } from '@app/entityV2/view/select/ViewSelect'; +import { V2_SEARCH_BAR_VIEWS } from '@app/onboarding/configV2/HomePageOnboardingConfig'; +import { CommandK } from '@app/searchV2/CommandK'; +import ViewAllSearchItem from '@app/searchV2/ViewAllSearchItem'; +import AutoCompleteItem from '@app/searchV2/autoComplete/AutoCompleteItem'; +import RecommendedOption from '@app/searchV2/autoComplete/RecommendedOption'; +import SectionHeader, { EntityTypeLabel } from '@app/searchV2/autoComplete/SectionHeader'; +import QuickFilters from '@app/searchV2/autoComplete/quickFilters/QuickFilters'; +import { FiltersAppliedHandler } from '@app/searchV2/filtersV2/types'; +import useFocusElementByCommandK from '@app/searchV2/searchBarV2/hooks/useFocusSearchBarByCommandK'; +import useSearchViewAll from '@app/searchV2/useSearchViewAll'; +import { combineSiblingsInAutoComplete } from '@app/searchV2/utils/combineSiblingsInAutoComplete'; +import { EXACT_SEARCH_PREFIX } from '@app/searchV2/utils/constants'; +import filterSearchQuery from '@app/searchV2/utils/filterSearchQuery'; +import { getFiltersWithQuickFilter } from '@app/searchV2/utils/filterUtils'; +import usePrevious from '@app/shared/usePrevious'; +import { useAppConfig, useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig'; +import { useQuickFiltersContext } from '@providers/QuickFiltersContext'; import { Button, colors } from '@src/alchemy-components'; -import { AutoCompleteResultForEntity, FacetFilterInput, ScenarioType } from '../../types.generated'; -import { EntityRegistry } from '../../entityRegistryContext'; -import filterSearchQuery from './utils/filterSearchQuery'; -import { ANTD_GRAY_V2 } from '../entity/shared/constants'; -import { getEntityPath } from '../entity/shared/containers/profile/utils'; -import { EXACT_SEARCH_PREFIX } from './utils/constants'; -import { useListRecommendationsQuery } from '../../graphql/recommendations.generated'; -import AutoCompleteItem from './autoComplete/AutoCompleteItem'; -import { useQuickFiltersContext } from '../../providers/QuickFiltersContext'; -import QuickFilters from './autoComplete/quickFilters/QuickFilters'; -import { getFiltersWithQuickFilter } from './utils/filterUtils'; -import usePrevious from '../shared/usePrevious'; -import analytics, { Event, EventType } from '../analytics'; -import RecommendedOption from './autoComplete/RecommendedOption'; -import SectionHeader, { EntityTypeLabel } from './autoComplete/SectionHeader'; -import { useUserContext } from '../context/useUserContext'; -import ViewAllSearchItem from './ViewAllSearchItem'; -import { ViewSelect } from '../entityV2/view/select/ViewSelect'; -import { combineSiblingsInAutoComplete } from './utils/combineSiblingsInAutoComplete'; -import { CommandK } from './CommandK'; -import { V2_SEARCH_BAR_VIEWS } from '../onboarding/configV2/HomePageOnboardingConfig'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; -import useSearchViewAll from './useSearchViewAll'; -import { useAppConfig, useIsShowSeparateSiblingsEnabled } from '../useAppConfig'; -import useFocusElementByCommandK from './searchBarV2/hooks/useFocusSearchBarByCommandK'; -import { FiltersAppliedHandler } from './filtersV2/types'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { useListRecommendationsQuery } from '@graphql/recommendations.generated'; +import { AutoCompleteResultForEntity, FacetFilterInput, ScenarioType } from '@types'; const StyledAutoComplete = styled(AutoComplete)<{ $isShowNavBarRedesign?: boolean }>` width: 100%; diff --git a/datahub-web-react/src/app/searchV2/SearchEntitySidebarContainer.tsx b/datahub-web-react/src/app/searchV2/SearchEntitySidebarContainer.tsx index 009dc33f21..ae4bcc26f6 100644 --- a/datahub-web-react/src/app/searchV2/SearchEntitySidebarContainer.tsx +++ b/datahub-web-react/src/app/searchV2/SearchEntitySidebarContainer.tsx @@ -1,10 +1,11 @@ import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { EntityAndType } from '../entity/shared/types'; -import CompactContext from '../shared/CompactContext'; -import EntitySidebarContext from '../sharedV2/EntitySidebarContext'; -import useSidebarWidth from '../sharedV2/sidebar/useSidebarWidth'; -import { useEntityRegistry } from '../useEntityRegistry'; + +import { EntityAndType } from '@app/entity/shared/types'; +import CompactContext from '@app/shared/CompactContext'; +import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext'; +import useSidebarWidth from '@app/sharedV2/sidebar/useSidebarWidth'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const SidebarContainer = styled.div<{ height: string }>` max-height: ${(props) => props.height}; diff --git a/datahub-web-react/src/app/searchV2/SearchFilterLabel.tsx b/datahub-web-react/src/app/searchV2/SearchFilterLabel.tsx index 6a74abf831..341f537812 100644 --- a/datahub-web-react/src/app/searchV2/SearchFilterLabel.tsx +++ b/datahub-web-react/src/app/searchV2/SearchFilterLabel.tsx @@ -1,29 +1,31 @@ -import * as React from 'react'; -import { Tag } from 'antd'; import { Tooltip } from '@components'; -import styled from 'styled-components'; import { BookmarkSimple } from '@phosphor-icons/react'; +import { Tag } from 'antd'; +import * as React from 'react'; +import styled from 'styled-components'; + +import { IconStyleType } from '@app/entity/Entity'; +import { StyledTag } from '@app/entityV2/shared/components/styled/StyledTag'; +import useGetBrowseV2LabelOverride from '@app/searchV2/filters/useGetBrowseV2LabelOverride'; +import { BROWSE_PATH_V2_FILTER_NAME, ENTITY_FILTER_NAME, MAX_COUNT_VAL } from '@app/searchV2/utils/constants'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; +import { formatNumber } from '@app/shared/formatNumber'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { DomainLink } from '@app/sharedV2/tags/DomainLink'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + import { - Domain, Container, + CorpGroup, + CorpUser, DataPlatform, + DataPlatformInstance, + Domain, + Entity, EntityType, GlossaryTerm, Tag as TagType, - CorpUser, - CorpGroup, - DataPlatformInstance, - Entity, -} from '../../types.generated'; -import { StyledTag } from '../entityV2/shared/components/styled/StyledTag'; -import { capitalizeFirstLetterOnly } from '../shared/textUtil'; -import { DomainLink } from '../sharedV2/tags/DomainLink'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { BROWSE_PATH_V2_FILTER_NAME, ENTITY_FILTER_NAME, MAX_COUNT_VAL } from './utils/constants'; -import CustomAvatar from '../shared/avatar/CustomAvatar'; -import { IconStyleType } from '../entity/Entity'; -import { formatNumber } from '../shared/formatNumber'; -import useGetBrowseV2LabelOverride from './filters/useGetBrowseV2LabelOverride'; +} from '@types'; type Props = { field: string; diff --git a/datahub-web-react/src/app/searchV2/SearchHeader.tsx b/datahub-web-react/src/app/searchV2/SearchHeader.tsx index 9f4729996b..41e2916c94 100644 --- a/datahub-web-react/src/app/searchV2/SearchHeader.tsx +++ b/datahub-web-react/src/app/searchV2/SearchHeader.tsx @@ -1,20 +1,22 @@ -import React, { useContext, useState } from 'react'; -import { Button, Layout } from 'antd'; -import styled from 'styled-components'; import { ArrowRight } from '@phosphor-icons/react'; -import { V2_SEARCH_BAR_ID } from '../onboarding/configV2/HomePageOnboardingConfig'; -import { SearchBar } from './SearchBar'; -import { AutoCompleteResultForEntity } from '../../types.generated'; -import { EntityRegistry } from '../../entityRegistryContext'; -import { useAppConfig } from '../useAppConfig'; -import OnboardingContext from '../onboarding/OnboardingContext'; -import { useNavBarContext } from '../homeV2/layout/navBarRedesign/NavBarContext'; -import NavBarToggler from '../homeV2/layout/navBarRedesign/NavBarToggler'; -import { REDESIGN_COLORS } from '../entityV2/shared/constants'; -import useSearchViewAll from './useSearchViewAll'; -import { useShowNavBarRedesign } from '../useShowNavBarRedesign'; -import { FiltersAppliedHandler } from './filtersV2/types'; -import { SearchBarV2 } from './searchBarV2/SearchBarV2'; +import { Button, Layout } from 'antd'; +import React, { useContext, useState } from 'react'; +import styled from 'styled-components'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { useNavBarContext } from '@app/homeV2/layout/navBarRedesign/NavBarContext'; +import NavBarToggler from '@app/homeV2/layout/navBarRedesign/NavBarToggler'; +import OnboardingContext from '@app/onboarding/OnboardingContext'; +import { V2_SEARCH_BAR_ID } from '@app/onboarding/configV2/HomePageOnboardingConfig'; +import { SearchBar } from '@app/searchV2/SearchBar'; +import { FiltersAppliedHandler } from '@app/searchV2/filtersV2/types'; +import { SearchBarV2 } from '@app/searchV2/searchBarV2/SearchBarV2'; +import useSearchViewAll from '@app/searchV2/useSearchViewAll'; +import { useAppConfig } from '@app/useAppConfig'; +import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { AutoCompleteResultForEntity } from '@types'; const getStyles = ($isShowNavBarRedesign?: boolean) => { return { diff --git a/datahub-web-react/src/app/searchV2/SearchPage.tsx b/datahub-web-react/src/app/searchV2/SearchPage.tsx index e5b68374d1..2ebf74de15 100644 --- a/datahub-web-react/src/app/searchV2/SearchPage.tsx +++ b/datahub-web-react/src/app/searchV2/SearchPage.tsx @@ -1,37 +1,39 @@ import React, { useEffect, useState } from 'react'; import { useHistory } from 'react-router'; import styled from 'styled-components'; -import { FacetFilterInput } from '../../types.generated'; -import { navigateToSearchUrl } from './utils/navigateToSearchUrl'; -import { SearchResults } from './SearchResults'; -import analytics, { EventType } from '../analytics'; -import { useGetSearchResultsForMultipleQuery } from '../../graphql/search.generated'; -import { SearchCfg } from '../../conf'; -import { ENTITY_SUB_TYPE_FILTER_FIELDS, UnionType } from './utils/constants'; -import { EntityAndType } from '../entity/shared/types'; -import { scrollToTop } from '../shared/searchUtils'; -import { OnboardingTour } from '../onboarding/OnboardingTour'; + +import analytics, { EventType } from '@app/analytics'; +import { EntityAndType } from '@app/entity/shared/types'; +import { OnboardingTour } from '@app/onboarding/OnboardingTour'; +import { ENTITY_PROFILE_V2_SIDEBAR_ID } from '@app/onboarding/config/EntityProfileOnboardingConfig'; import { SEARCH_RESULTS_BROWSE_SIDEBAR_ID, SEARCH_RESULTS_FILTERS_ID, SEARCH_RESULTS_FILTERS_V2_INTRO, -} from '../onboarding/config/SearchOnboardingConfig'; -import { useDownloadScrollAcrossEntitiesSearchResults } from './utils/useDownloadScrollAcrossEntitiesSearchResults'; -import { DownloadSearchResults, DownloadSearchResultsInput } from './utils/types'; -import SearchFiltersSection from './filters/SearchFiltersSection'; -import useGetSearchQueryInputs from './useGetSearchQueryInputs'; -import useSearchFilterAnalytics from './filters/useSearchFilterAnalytics'; -import { useIsBrowseV2, useIsSearchV2, useSearchVersion } from './useSearchAndBrowseVersion'; -import useFilterMode from './filters/useFilterMode'; -import { useSelectedSortOption } from '../search/context/SearchContext'; -import { useUpdateEducationStepsAllowList } from '../onboarding/useUpdateEducationStepsAllowList'; -import { ENTITY_PROFILE_V2_SIDEBAR_ID } from '../onboarding/config/EntityProfileOnboardingConfig'; +} from '@app/onboarding/config/SearchOnboardingConfig'; import { ENTITY_SIDEBAR_V2_ABOUT_TAB_ID, ENTITY_SIDEBAR_V2_COLUMNS_TAB_ID, ENTITY_SIDEBAR_V2_LINEAGE_TAB_ID, ENTITY_SIDEBAR_V2_PROPERTIES_ID, -} from '../onboarding/configV2/EntityProfileOnboardingConfig'; +} from '@app/onboarding/configV2/EntityProfileOnboardingConfig'; +import { useUpdateEducationStepsAllowList } from '@app/onboarding/useUpdateEducationStepsAllowList'; +import { useSelectedSortOption } from '@app/search/context/SearchContext'; +import { SearchResults } from '@app/searchV2/SearchResults'; +import SearchFiltersSection from '@app/searchV2/filters/SearchFiltersSection'; +import useFilterMode from '@app/searchV2/filters/useFilterMode'; +import useSearchFilterAnalytics from '@app/searchV2/filters/useSearchFilterAnalytics'; +import useGetSearchQueryInputs from '@app/searchV2/useGetSearchQueryInputs'; +import { useIsBrowseV2, useIsSearchV2, useSearchVersion } from '@app/searchV2/useSearchAndBrowseVersion'; +import { ENTITY_SUB_TYPE_FILTER_FIELDS, UnionType } from '@app/searchV2/utils/constants'; +import { navigateToSearchUrl } from '@app/searchV2/utils/navigateToSearchUrl'; +import { DownloadSearchResults, DownloadSearchResultsInput } from '@app/searchV2/utils/types'; +import { useDownloadScrollAcrossEntitiesSearchResults } from '@app/searchV2/utils/useDownloadScrollAcrossEntitiesSearchResults'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { SearchCfg } from '@src/conf'; + +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { FacetFilterInput } from '@types'; const Container = styled.span` display: flex; diff --git a/datahub-web-react/src/app/searchV2/SearchResultList.tsx b/datahub-web-react/src/app/searchV2/SearchResultList.tsx index bb84c4e094..2d2ad7a2bb 100644 --- a/datahub-web-react/src/app/searchV2/SearchResultList.tsx +++ b/datahub-web-react/src/app/searchV2/SearchResultList.tsx @@ -1,21 +1,23 @@ import { Checkbox, Divider, List, ListProps } from 'antd'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import styled from 'styled-components'; -import { SearchResult, SearchSuggestion } from '../../types.generated'; -import analytics, { EventType } from '../analytics'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { EntityAndType } from '../entity/shared/types'; -import { SEARCH_COLORS } from '../entityV2/shared/constants'; -import { PreviewSection } from '../shared/MatchesContext'; -import { useEntityRegistry } from '../useEntityRegistry'; -import EmptySearchResults from './EmptySearchResults'; -import { MatchContextContainer } from './matches/MatchContextContainer'; -import { useIsSearchV2 } from './useSearchAndBrowseVersion'; -import { CombinedSearchResult } from './utils/combineSiblingsInSearchResults'; -import { PreviewType } from '../entity/Entity'; -import { useInitializeSearchResultCards } from '../entityV2/shared/components/styled/search/useInitializeSearchResultCards'; -import { useSearchContext } from '../search/context/SearchContext'; -import { useShowNavBarRedesign } from '../useShowNavBarRedesign'; + +import analytics, { EventType } from '@app/analytics'; +import { PreviewType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { EntityAndType } from '@app/entity/shared/types'; +import { useInitializeSearchResultCards } from '@app/entityV2/shared/components/styled/search/useInitializeSearchResultCards'; +import { SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { useSearchContext } from '@app/search/context/SearchContext'; +import EmptySearchResults from '@app/searchV2/EmptySearchResults'; +import { MatchContextContainer } from '@app/searchV2/matches/MatchContextContainer'; +import { useIsSearchV2 } from '@app/searchV2/useSearchAndBrowseVersion'; +import { CombinedSearchResult } from '@app/searchV2/utils/combineSiblingsInSearchResults'; +import { PreviewSection } from '@app/shared/MatchesContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign'; + +import { SearchResult, SearchSuggestion } from '@types'; export const MATCHES_CONTAINER_HEIGHT = 52; diff --git a/datahub-web-react/src/app/searchV2/SearchResults.tsx b/datahub-web-react/src/app/searchV2/SearchResults.tsx index 30eceba3fa..d59a5632ff 100644 --- a/datahub-web-react/src/app/searchV2/SearchResults.tsx +++ b/datahub-web-react/src/app/searchV2/SearchResults.tsx @@ -1,36 +1,38 @@ -import React, { useState } from 'react'; -import { Pagination, Typography } from 'antd'; import { Tooltip } from '@components'; -import ViewHeadlineOutlinedIcon from '@mui/icons-material/ViewHeadlineOutlined'; import ViewDayOutlinedIcon from '@mui/icons-material/ViewDayOutlined'; +import ViewHeadlineOutlinedIcon from '@mui/icons-material/ViewHeadlineOutlined'; +import { Pagination, Typography } from 'antd'; +import React, { useState } from 'react'; import styled from 'styled-components/macro'; -import { Entity, FacetFilterInput, MatchedField, SearchSuggestion, FacetMetadata } from '../../types.generated'; -import { SearchCfg } from '../../conf'; -import { SearchSelectBar } from '../entityV2/shared/components/styled/search/SearchSelectBar'; -import { SearchResultList } from './SearchResultList'; -import { isListSubset } from '../entity/shared/utils'; -import { EntityAndType } from '../entity/shared/types'; -import { ErrorSection } from '../shared/error/ErrorSection'; -import { UnionType } from './utils/constants'; -import { generateOrFilters } from './utils/generateOrFilters'; -import { DownloadSearchResults, DownloadSearchResultsInput } from './utils/types'; -import { SidebarProvider } from './sidebar/SidebarContext'; -import { BrowseProvider } from './sidebar/BrowseContext'; -import { useIsBrowseV2, useIsSearchV2 } from './useSearchAndBrowseVersion'; -import SearchSortSelect from './sorting/SearchSortSelect'; -import { combineSiblingsInSearchResults } from './utils/combineSiblingsInSearchResults'; -import SearchQuerySuggester from './suggestions/SearchQuerySugggester'; -import { formatNumberWithoutAbbreviation } from '../shared/formatNumber'; -import BrowseSidebar from './sidebar'; -import SearchResultsLoadingSection from './SearchResultsLoadingSection'; -import { SearchEntitySidebarContainer } from './SearchEntitySidebarContainer'; -import SearchMenuItems from '../sharedV2/search/SearchMenuItems'; -import { RecommendedFilters } from './recommendation/RecommendedFilters'; -import { ANTD_GRAY, REDESIGN_COLORS } from '../entityV2/shared/constants'; -import { PreviewType } from '../entity/Entity'; -import { useSearchContext } from '../search/context/SearchContext'; -import { useIsShowSeparateSiblingsEnabled } from '../useAppConfig'; -import { useShowNavBarRedesign } from '../useShowNavBarRedesign'; + +import { PreviewType } from '@app/entity/Entity'; +import { EntityAndType } from '@app/entity/shared/types'; +import { isListSubset } from '@app/entity/shared/utils'; +import { SearchSelectBar } from '@app/entityV2/shared/components/styled/search/SearchSelectBar'; +import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { useSearchContext } from '@app/search/context/SearchContext'; +import { SearchEntitySidebarContainer } from '@app/searchV2/SearchEntitySidebarContainer'; +import { SearchResultList } from '@app/searchV2/SearchResultList'; +import SearchResultsLoadingSection from '@app/searchV2/SearchResultsLoadingSection'; +import { RecommendedFilters } from '@app/searchV2/recommendation/RecommendedFilters'; +import BrowseSidebar from '@app/searchV2/sidebar'; +import { BrowseProvider } from '@app/searchV2/sidebar/BrowseContext'; +import { SidebarProvider } from '@app/searchV2/sidebar/SidebarContext'; +import SearchSortSelect from '@app/searchV2/sorting/SearchSortSelect'; +import SearchQuerySuggester from '@app/searchV2/suggestions/SearchQuerySugggester'; +import { useIsBrowseV2, useIsSearchV2 } from '@app/searchV2/useSearchAndBrowseVersion'; +import { combineSiblingsInSearchResults } from '@app/searchV2/utils/combineSiblingsInSearchResults'; +import { UnionType } from '@app/searchV2/utils/constants'; +import { generateOrFilters } from '@app/searchV2/utils/generateOrFilters'; +import { DownloadSearchResults, DownloadSearchResultsInput } from '@app/searchV2/utils/types'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; +import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; +import SearchMenuItems from '@app/sharedV2/search/SearchMenuItems'; +import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig'; +import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign'; +import { SearchCfg } from '@src/conf'; + +import { Entity, FacetFilterInput, FacetMetadata, MatchedField, SearchSuggestion } from '@types'; const SearchResultsWrapper = styled.div<{ v2Styles: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/searchV2/SearchResultsLoadingSection.tsx b/datahub-web-react/src/app/searchV2/SearchResultsLoadingSection.tsx index d669044b7c..3706e3d2a6 100644 --- a/datahub-web-react/src/app/searchV2/SearchResultsLoadingSection.tsx +++ b/datahub-web-react/src/app/searchV2/SearchResultsLoadingSection.tsx @@ -1,7 +1,8 @@ -import * as React from 'react'; import { Skeleton } from 'antd'; +import * as React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Container = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/searchV2/SearchResultsRecommendations.tsx b/datahub-web-react/src/app/searchV2/SearchResultsRecommendations.tsx index 617e2adefd..b12dd9c98f 100644 --- a/datahub-web-react/src/app/searchV2/SearchResultsRecommendations.tsx +++ b/datahub-web-react/src/app/searchV2/SearchResultsRecommendations.tsx @@ -1,14 +1,12 @@ +import { Divider, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Divider, Typography } from 'antd'; -import { - FacetFilterInput, - RecommendationModule as RecommendationModuleType, - ScenarioType, -} from '../../types.generated'; -import { useListRecommendationsQuery } from '../../graphql/recommendations.generated'; -import { RecommendationModule } from '../recommendations/RecommendationModule'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { RecommendationModule } from '@app/recommendations/RecommendationModule'; + +import { useListRecommendationsQuery } from '@graphql/recommendations.generated'; +import { FacetFilterInput, RecommendationModule as RecommendationModuleType, ScenarioType } from '@types'; const RecommendationsContainer = styled.div` margin-left: 40px; diff --git a/datahub-web-react/src/app/searchV2/SearchablePage.tsx b/datahub-web-react/src/app/searchV2/SearchablePage.tsx index 880f8469aa..d73d267c2f 100644 --- a/datahub-web-react/src/app/searchV2/SearchablePage.tsx +++ b/datahub-web-react/src/app/searchV2/SearchablePage.tsx @@ -1,34 +1,36 @@ -import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; -import React, { useCallback, useEffect, useState } from 'react'; -import { useHistory, useLocation } from 'react-router'; import { debounce } from 'lodash'; import * as QueryString from 'query-string'; -import styled, { useTheme } from 'styled-components'; -import { colors } from '@src/alchemy-components'; +import React, { useCallback, useEffect, useState } from 'react'; +import { useHistory, useLocation } from 'react-router'; import { useDebounce } from 'react-use'; -import { SearchHeader } from './SearchHeader'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { FacetFilterInput } from '../../types.generated'; +import styled, { useTheme } from 'styled-components'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { NavSidebar } from '@app/homeV2/layout/NavSidebar'; +import { NavSidebar as NavSidebarRedesign } from '@app/homeV2/layout/navBarRedesign/NavSidebar'; +import { useSelectedSortOption } from '@app/search/context/SearchContext'; +import { SearchHeader } from '@app/searchV2/SearchHeader'; +import { FieldToAppliedFieldFiltersMap } from '@app/searchV2/filtersV2/types'; +import { convertFiltersMapToFilters } from '@app/searchV2/filtersV2/utils'; +import { UnionType } from '@app/searchV2/utils/constants'; +import { getAutoCompleteInputFromQuickFilter } from '@app/searchV2/utils/filterUtils'; +import { generateOrFilters } from '@app/searchV2/utils/generateOrFilters'; +import { navigateToSearchUrl } from '@app/searchV2/utils/navigateToSearchUrl'; +import useFilters from '@app/searchV2/utils/useFilters'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign'; +import { PageRoutes } from '@conf/Global'; +import { useQuickFiltersContext } from '@providers/QuickFiltersContext'; +import { colors } from '@src/alchemy-components'; + import { GetAutoCompleteMultipleResultsQuery, useGetAutoCompleteMultipleResultsLazyQuery, -} from '../../graphql/search.generated'; -import { navigateToSearchUrl } from './utils/navigateToSearchUrl'; -import analytics, { EventType } from '../analytics'; -import useFilters from './utils/useFilters'; -import { PageRoutes } from '../../conf/Global'; -import { getAutoCompleteInputFromQuickFilter } from './utils/filterUtils'; -import { useQuickFiltersContext } from '../../providers/QuickFiltersContext'; -import { useUserContext } from '../context/useUserContext'; -import { useSelectedSortOption } from '../search/context/SearchContext'; -import { NavSidebar as NavSidebarRedesign } from '../homeV2/layout/navBarRedesign/NavSidebar'; -import { NavSidebar } from '../homeV2/layout/NavSidebar'; -import { useShowNavBarRedesign } from '../useShowNavBarRedesign'; -import { FieldToAppliedFieldFiltersMap } from './filtersV2/types'; -import { generateOrFilters } from './utils/generateOrFilters'; -import { UnionType } from './utils/constants'; -import { useAppConfig } from '../useAppConfig'; -import { convertFiltersMapToFilters } from './filtersV2/utils'; +} from '@graphql/search.generated'; +import { FacetFilterInput } from '@types'; const Body = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/SimpleSearchFilter.tsx b/datahub-web-react/src/app/searchV2/SimpleSearchFilter.tsx index e8ed79f340..062a931f57 100644 --- a/datahub-web-react/src/app/searchV2/SimpleSearchFilter.tsx +++ b/datahub-web-react/src/app/searchV2/SimpleSearchFilter.tsx @@ -2,12 +2,13 @@ import { DownOutlined, UpOutlined } from '@ant-design/icons'; import { Button, Checkbox } from 'antd'; import { CheckboxChangeEvent } from 'antd/lib/checkbox'; import * as React from 'react'; -import { useState, useEffect } from 'react'; +import { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata } from '../../types.generated'; -import { SearchFilterLabel } from './SearchFilterLabel'; -import { TRUNCATED_FILTER_LENGTH } from './utils/constants'; +import { SearchFilterLabel } from '@app/searchV2/SearchFilterLabel'; +import { TRUNCATED_FILTER_LENGTH } from '@app/searchV2/utils/constants'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const GRAPH_DEGREE_FILTER_FIELD = 'degree'; diff --git a/datahub-web-react/src/app/searchV2/SimpleSearchFilters.tsx b/datahub-web-react/src/app/searchV2/SimpleSearchFilters.tsx index 691bd86496..84c9aef48f 100644 --- a/datahub-web-react/src/app/searchV2/SimpleSearchFilters.tsx +++ b/datahub-web-react/src/app/searchV2/SimpleSearchFilters.tsx @@ -1,18 +1,20 @@ import * as React from 'react'; import { useEffect, useState } from 'react'; -import { FacetFilterInput, FacetMetadata } from '../../types.generated'; -import { FilterScenarioType } from './filters/render/types'; -import { useFilterRendererRegistry } from './filters/render/useFilterRenderer'; -import { SimpleSearchFilter } from './SimpleSearchFilter'; + +import { SCHEMA_FIELD_ALIASES_FILTER_NAME } from '@app/search/utils/constants'; +import { SimpleSearchFilter } from '@app/searchV2/SimpleSearchFilter'; +import { FilterScenarioType } from '@app/searchV2/filters/render/types'; +import { useFilterRendererRegistry } from '@app/searchV2/filters/render/useFilterRenderer'; import { + DEGREE_FILTER_NAME, ENTITY_FILTER_NAME, ENTITY_INDEX_FILTER_NAME, - LEGACY_ENTITY_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, - DEGREE_FILTER_NAME, -} from './utils/constants'; -import { useAppConfig } from '../useAppConfig'; -import { SCHEMA_FIELD_ALIASES_FILTER_NAME } from '../search/utils/constants'; + LEGACY_ENTITY_FILTER_NAME, +} from '@app/searchV2/utils/constants'; +import { useAppConfig } from '@app/useAppConfig'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const TOP_FILTERS = ['degree', ENTITY_FILTER_NAME, 'platform', 'tags', 'glossaryTerms', 'domains', 'owners']; diff --git a/datahub-web-react/src/app/searchV2/ToggleSidebarButton.tsx b/datahub-web-react/src/app/searchV2/ToggleSidebarButton.tsx index 8a8a528557..d6b581def4 100644 --- a/datahub-web-react/src/app/searchV2/ToggleSidebarButton.tsx +++ b/datahub-web-react/src/app/searchV2/ToggleSidebarButton.tsx @@ -1,10 +1,11 @@ -import React, { memo, useState } from 'react'; import Icon from '@ant-design/icons/lib/components/Icon'; -import { Button } from 'antd'; import { Tooltip } from '@components'; +import { Button } from 'antd'; +import React, { memo, useState } from 'react'; import styled from 'styled-components'; -import ExpandIcon from '../../images/expand.svg?react'; -import CollapseIcon from '../../images/collapse.svg?react'; + +import CollapseIcon from '@images/collapse.svg?react'; +import ExpandIcon from '@images/expand.svg?react'; const ToggleIcon = styled(Icon)` color: ${(props) => props.theme.styles['primary-color']}; diff --git a/datahub-web-react/src/app/searchV2/ViewAllSearchItem.tsx b/datahub-web-react/src/app/searchV2/ViewAllSearchItem.tsx index cbf438c3f5..f1f60c2d8c 100644 --- a/datahub-web-react/src/app/searchV2/ViewAllSearchItem.tsx +++ b/datahub-web-react/src/app/searchV2/ViewAllSearchItem.tsx @@ -1,7 +1,7 @@ import { Icon } from '@components'; +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Typography } from 'antd'; const ExploreForEntity = styled.span` font-weight: light; diff --git a/datahub-web-react/src/app/searchV2/__tests__/SearchPage.test.tsx b/datahub-web-react/src/app/searchV2/__tests__/SearchPage.test.tsx index 222d4cc56c..3b0c060f04 100644 --- a/datahub-web-react/src/app/searchV2/__tests__/SearchPage.test.tsx +++ b/datahub-web-react/src/app/searchV2/__tests__/SearchPage.test.tsx @@ -1,13 +1,14 @@ -import React from 'react'; -import { render, waitFor } from '@testing-library/react'; import { InMemoryCache } from '@apollo/client'; import { MockedProvider } from '@apollo/client/testing'; +import { render, waitFor } from '@testing-library/react'; +import React from 'react'; import { Route } from 'react-router'; -import { SearchPage } from '../SearchPage'; -import TestPageContainer from '../../../utils/test-utils/TestPageContainer'; -import { mocksWithSearchFlagsOff } from '../../../Mocks'; -import { PageRoutes } from '../../../conf/Global'; -import possibleTypesResult from '../../../possibleTypes.generated'; + +import { SearchPage } from '@app/searchV2/SearchPage'; +import { PageRoutes } from '@conf/Global'; +import { mocksWithSearchFlagsOff } from '@src/Mocks'; +import possibleTypesResult from '@src/possibleTypes.generated'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; const cache = new InMemoryCache({ // need to define possibleTypes to allow us to use Apollo cache with union types diff --git a/datahub-web-react/src/app/searchV2/__tests__/constants.test.tsx b/datahub-web-react/src/app/searchV2/__tests__/constants.test.tsx index ad5f38e944..bdc8aec0a9 100644 --- a/datahub-web-react/src/app/searchV2/__tests__/constants.test.tsx +++ b/datahub-web-react/src/app/searchV2/__tests__/constants.test.tsx @@ -1,4 +1,4 @@ -import { FIELD_TO_LABEL, ORDERED_FIELDS } from '../utils/constants'; +import { FIELD_TO_LABEL, ORDERED_FIELDS } from '@app/searchV2/utils/constants'; describe('constants', () => { it('ensure that all ordered fields have a corresponding label', () => { diff --git a/datahub-web-react/src/app/searchV2/__tests__/filterUtils.test.tsx b/datahub-web-react/src/app/searchV2/__tests__/filterUtils.test.tsx index e71bace738..62225bfbdf 100644 --- a/datahub-web-react/src/app/searchV2/__tests__/filterUtils.test.tsx +++ b/datahub-web-react/src/app/searchV2/__tests__/filterUtils.test.tsx @@ -1,6 +1,6 @@ +import { UnionType } from '@app/searchV2/utils/constants'; +import { combineOrFilters, mergeFilterSets } from '@app/searchV2/utils/filterUtils'; import { FilterOperator } from '@src/types.generated'; -import { UnionType } from '../utils/constants'; -import { combineOrFilters, mergeFilterSets } from '../utils/filterUtils'; describe('filterUtils', () => { describe('mergeFilterSets', () => { diff --git a/datahub-web-react/src/app/searchV2/advanced/EntitySubTypeAdvancedFilterLabel.tsx b/datahub-web-react/src/app/searchV2/advanced/EntitySubTypeAdvancedFilterLabel.tsx index 1f07af03a6..4c24588455 100644 --- a/datahub-web-react/src/app/searchV2/advanced/EntitySubTypeAdvancedFilterLabel.tsx +++ b/datahub-web-react/src/app/searchV2/advanced/EntitySubTypeAdvancedFilterLabel.tsx @@ -1,12 +1,14 @@ import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { FILTER_DELIMITER } from '../utils/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { EntityType, FacetFilterInput } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import AdvancedFilterCloseButton from './AdvancedFilterCloseButton'; -import { FilterContainer } from './styles'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import AdvancedFilterCloseButton from '@app/searchV2/advanced/AdvancedFilterCloseButton'; +import { FilterContainer } from '@app/searchV2/advanced/styles'; +import { FILTER_DELIMITER } from '@app/searchV2/utils/constants'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, FacetFilterInput } from '@types'; const FilterFieldLabel = styled.span` font-weight: 600; diff --git a/datahub-web-react/src/app/searchV2/advanced/styles.ts b/datahub-web-react/src/app/searchV2/advanced/styles.ts index 8109f5c5d8..ef7bfe570a 100644 --- a/datahub-web-react/src/app/searchV2/advanced/styles.ts +++ b/datahub-web-react/src/app/searchV2/advanced/styles.ts @@ -1,5 +1,6 @@ import styled from 'styled-components'; -import { ANTD_GRAY } from '../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export const FilterContainer = styled.div<{ $isCompact: boolean; isDisabled?: boolean }>` box-shadow: 0px 0px 4px 0px #00000010; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntity.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntity.tsx index f859869696..f3cb514b80 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntity.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntity.tsx @@ -1,16 +1,18 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { Entity, EntityType } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { getAutoCompleteEntityText } from './utils'; -import { ANTD_GRAY_V2 } from '../../entity/shared/constants'; -import AutoCompleteEntityIcon from './AutoCompleteEntityIcon'; -import { SuggestionText } from './styledComponents'; -import AutoCompletePlatformNames from './AutoCompletePlatformNames'; -import { getPlatformName } from '../../entity/shared/utils'; -import { getParentEntities } from '../filters/utils'; -import ParentEntities from '../filters/ParentEntities'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { getPlatformName } from '@app/entity/shared/utils'; +import AutoCompleteEntityIcon from '@app/searchV2/autoComplete/AutoCompleteEntityIcon'; +import AutoCompletePlatformNames from '@app/searchV2/autoComplete/AutoCompletePlatformNames'; +import { SuggestionText } from '@app/searchV2/autoComplete/styledComponents'; +import { getAutoCompleteEntityText } from '@app/searchV2/autoComplete/utils'; +import ParentEntities from '@app/searchV2/filters/ParentEntities'; +import { getParentEntities } from '@app/searchV2/filters/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, EntityType } from '@types'; const AutoCompleteEntityWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntityIcon.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntityIcon.tsx index da37106a9d..eedabbfb4d 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntityIcon.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntityIcon.tsx @@ -1,10 +1,12 @@ +import { Image } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Image } from 'antd'; -import { Entity } from '../../../types.generated'; -import { getPlatformName } from '../../entity/shared/utils'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { IconStyleType } from '../../entity/Entity'; + +import { IconStyleType } from '@app/entity/Entity'; +import { getPlatformName } from '@app/entity/shared/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity } from '@types'; const PreviewImage = styled(Image)` height: 16px; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteItem.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteItem.tsx index 6486f6df19..acc19a62a3 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteItem.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteItem.tsx @@ -1,13 +1,15 @@ import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components/macro'; -import { CorpUser, Entity, EntityType, Tag } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import AutoCompleteEntity from './AutoCompleteEntity'; -import AutoCompleteTag from './AutoCompleteTag'; -import AutoCompleteTooltipContent from './AutoCompleteTooltipContent'; -import AutoCompleteUser from './AutoCompleteUser'; -import { getShouldDisplayTooltip } from './utils'; + +import AutoCompleteEntity from '@app/searchV2/autoComplete/AutoCompleteEntity'; +import AutoCompleteTag from '@app/searchV2/autoComplete/AutoCompleteTag'; +import AutoCompleteTooltipContent from '@app/searchV2/autoComplete/AutoCompleteTooltipContent'; +import AutoCompleteUser from '@app/searchV2/autoComplete/AutoCompleteUser'; +import { getShouldDisplayTooltip } from '@app/searchV2/autoComplete/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, Entity, EntityType, Tag } from '@types'; export const SuggestionContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompletePlatformNames.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompletePlatformNames.tsx index 61fe6bcae7..9c878b179f 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompletePlatformNames.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompletePlatformNames.tsx @@ -1,7 +1,8 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY_V2 } from '../../entity/shared/constants'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; const PlatformText = styled(Typography.Text)` font-size: 12px; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTag.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTag.tsx index b58a58c7ff..13ed399421 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTag.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTag.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import { EntityType, Tag } from '../../../types.generated'; -import { StyledTag } from '../../entityV2/shared/components/styled/StyledTag'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { StyledTag } from '@app/entityV2/shared/components/styled/StyledTag'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, Tag } from '@types'; interface Props { tag: Tag; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTooltipContent.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTooltipContent.tsx index dfe32c7805..ca65c15ccb 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTooltipContent.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTooltipContent.tsx @@ -1,10 +1,12 @@ import { FolderOpenOutlined } from '@ant-design/icons'; import React from 'react'; import styled from 'styled-components'; -import { Dataset, Entity, EntityType } from '../../../types.generated'; -import { DatasetStatsSummary } from '../../entity/dataset/shared/DatasetStatsSummary'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ArrowWrapper } from './ParentContainers'; + +import { DatasetStatsSummary } from '@app/entity/dataset/shared/DatasetStatsSummary'; +import { ArrowWrapper } from '@app/searchV2/autoComplete/ParentContainers'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Dataset, Entity, EntityType } from '@types'; const ContentWrapper = styled.div` font-size: 12px; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteUser.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteUser.tsx index 53b4d53ef4..417096e35e 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteUser.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteUser.tsx @@ -1,10 +1,12 @@ import { Typography } from 'antd'; import React from 'react'; -import { CorpUser, EntityType } from '../../../types.generated'; -import { CustomAvatar } from '../../shared/avatar'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { getAutoCompleteEntityText } from './utils'; -import { SuggestionText } from './styledComponents'; + +import { SuggestionText } from '@app/searchV2/autoComplete/styledComponents'; +import { getAutoCompleteEntityText } from '@app/searchV2/autoComplete/utils'; +import { CustomAvatar } from '@app/shared/avatar'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { CorpUser, EntityType } from '@types'; interface Props { query: string; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/ParentContainers.tsx b/datahub-web-react/src/app/searchV2/autoComplete/ParentContainers.tsx index 98a4f5aa21..f32f08b99b 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/ParentContainers.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/ParentContainers.tsx @@ -2,9 +2,11 @@ import { FolderOpenOutlined } from '@ant-design/icons'; import { Typography } from 'antd'; import React, { Fragment } from 'react'; import styled from 'styled-components/macro'; -import { Container, EntityType } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ANTD_GRAY_V2 } from '../../entity/shared/constants'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Container, EntityType } from '@types'; const NUM_VISIBLE_CONTAINERS = 2; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/RecommendedOption.tsx b/datahub-web-react/src/app/searchV2/autoComplete/RecommendedOption.tsx index 9a63f9e67f..f494d9133d 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/RecommendedOption.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/RecommendedOption.tsx @@ -1,7 +1,8 @@ import { Icon } from '@components'; import React from 'react'; import styled from 'styled-components/macro'; -import { SuggestionText } from './styledComponents'; + +import { SuggestionText } from '@app/searchV2/autoComplete/styledComponents'; const TextWrapper = styled.span``; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/SectionHeader.tsx b/datahub-web-react/src/app/searchV2/autoComplete/SectionHeader.tsx index 2f20f130bf..816b29a0c2 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/SectionHeader.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/SectionHeader.tsx @@ -1,8 +1,10 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { EntityType } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; export const EntityTypeLabel = styled.div<{ showBorder?: boolean }>` font-size: 14px; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/__tests__/utils.test.ts b/datahub-web-react/src/app/searchV2/autoComplete/__tests__/utils.test.ts index 05ac92bd84..71eb70f05d 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/__tests__/utils.test.ts +++ b/datahub-web-react/src/app/searchV2/autoComplete/__tests__/utils.test.ts @@ -1,4 +1,4 @@ -import { getAutoCompleteEntityText } from '../utils'; +import { getAutoCompleteEntityText } from '@app/searchV2/autoComplete/utils'; describe('utils tests', () => { it('should return matched and unmatched text when the name begins with the query', () => { diff --git a/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilter.tsx b/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilter.tsx index 24381bfd1c..f800f0c2ad 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilter.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilter.tsx @@ -1,14 +1,16 @@ import { Button } from 'antd'; import React from 'react'; -import styled from 'styled-components'; import { useHistory } from 'react-router'; -import { useQuickFiltersContext } from '../../../../providers/QuickFiltersContext'; -import { QuickFilter as QuickFilterType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { getQuickFilterDetails } from './utils'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; -import analytics, { Event, EventType } from '../../../analytics'; -import { navigateToSearchUrl } from '../../utils/navigateToSearchUrl'; +import styled from 'styled-components'; + +import analytics, { Event, EventType } from '@app/analytics'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { getQuickFilterDetails } from '@app/searchV2/autoComplete/quickFilters/utils'; +import { navigateToSearchUrl } from '@app/searchV2/utils/navigateToSearchUrl'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { useQuickFiltersContext } from '@providers/QuickFiltersContext'; + +import { QuickFilter as QuickFilterType } from '@types'; const QuickFilterWrapper = styled(Button)<{ selected: boolean }>` border: 1px solid ${ANTD_GRAY[4]}; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilters.tsx b/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilters.tsx index d67e248459..e041a3bf8f 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilters.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilters.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { useQuickFiltersContext } from '../../../../providers/QuickFiltersContext'; -import QuickFilter from './QuickFilter'; + +import QuickFilter from '@app/searchV2/autoComplete/quickFilters/QuickFilter'; +import { useQuickFiltersContext } from '@providers/QuickFiltersContext'; const QuickFiltersWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/utils.tsx b/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/utils.tsx index 928db12d26..6648316612 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/utils.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/utils.tsx @@ -1,8 +1,10 @@ import React from 'react'; import styled from 'styled-components'; -import { EntityType, QuickFilter } from '../../../../types.generated'; -import { IconStyleType } from '../../../entity/Entity'; -import { EntityRegistry } from '../../../../entityRegistryContext'; + +import { IconStyleType } from '@app/entity/Entity'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { EntityType, QuickFilter } from '@types'; const StyledIcon = styled.img` width: 14px; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/styledComponents.tsx b/datahub-web-react/src/app/searchV2/autoComplete/styledComponents.tsx index 9e4b084ab3..6e9d8f0302 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/styledComponents.tsx +++ b/datahub-web-react/src/app/searchV2/autoComplete/styledComponents.tsx @@ -1,5 +1,6 @@ import styled from 'styled-components'; -import { ANTD_GRAY } from '../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export const SuggestionText = styled.div` margin-left: 12px; diff --git a/datahub-web-react/src/app/searchV2/autoComplete/utils.ts b/datahub-web-react/src/app/searchV2/autoComplete/utils.ts index c85f7990fb..d34159d897 100644 --- a/datahub-web-react/src/app/searchV2/autoComplete/utils.ts +++ b/datahub-web-react/src/app/searchV2/autoComplete/utils.ts @@ -1,5 +1,6 @@ -import { Entity } from '../../../types.generated'; -import { EntityRegistry } from '../../../entityRegistryContext'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { Entity } from '@types'; export function getAutoCompleteEntityText(displayName: string, query: string) { const isPrefixMatch = displayName.toLowerCase().startsWith(query.toLowerCase()); diff --git a/datahub-web-react/src/app/searchV2/autoCompleteV2/AutoCompleteEntityItem.tsx b/datahub-web-react/src/app/searchV2/autoCompleteV2/AutoCompleteEntityItem.tsx index 9715127a72..37fb575174 100644 --- a/datahub-web-react/src/app/searchV2/autoCompleteV2/AutoCompleteEntityItem.tsx +++ b/datahub-web-react/src/app/searchV2/autoCompleteV2/AutoCompleteEntityItem.tsx @@ -1,12 +1,13 @@ +import React from 'react'; +import styled from 'styled-components'; + +import EntityIcon from '@app/searchV2/autoCompleteV2/components/icon/EntityIcon'; +import EntitySubtitle from '@app/searchV2/autoCompleteV2/components/subtitle/EntitySubtitle'; +import { getEntityDisplayType } from '@app/searchV2/autoCompleteV2/utils'; import { Text } from '@src/alchemy-components'; import { MatchText } from '@src/alchemy-components/components/MatchText'; -import { Entity } from '@src/types.generated'; -import styled from 'styled-components'; -import React from 'react'; import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; -import EntityIcon from './components/icon/EntityIcon'; -import EntitySubtitle from './components/subtitle/EntitySubtitle'; -import { getEntityDisplayType } from './utils'; +import { Entity } from '@src/types.generated'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/DefaultEntityIcon.tsx b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/DefaultEntityIcon.tsx index 5ff41c00af..936cb05306 100644 --- a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/DefaultEntityIcon.tsx +++ b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/DefaultEntityIcon.tsx @@ -1,8 +1,9 @@ import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { EntityIconProps } from './types'; -import { SingleEntityIcon } from './SingleEntityIcon'; -import useUniqueEntitiesByPlatformUrn from './useUniqueEntitiesByPlatformUrn'; + +import { SingleEntityIcon } from '@app/searchV2/autoCompleteV2/components/icon/SingleEntityIcon'; +import { EntityIconProps } from '@app/searchV2/autoCompleteV2/components/icon/types'; +import useUniqueEntitiesByPlatformUrn from '@app/searchV2/autoCompleteV2/components/icon/useUniqueEntitiesByPlatformUrn'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/EntityIcon.tsx b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/EntityIcon.tsx index 1cf8c19346..43c58dfc95 100644 --- a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/EntityIcon.tsx +++ b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/EntityIcon.tsx @@ -1,8 +1,9 @@ import React from 'react'; + +import DefaultEntityIcon from '@app/searchV2/autoCompleteV2/components/icon/DefaultEntityIcon'; +import UserEntityIcon from '@app/searchV2/autoCompleteV2/components/icon/UserEntityIcon'; +import { EntityIconProps } from '@app/searchV2/autoCompleteV2/components/icon/types'; import { EntityType } from '@src/types.generated'; -import { EntityIconProps } from './types'; -import UserEntityIcon from './UserEntityIcon'; -import DefaultEntityIcon from './DefaultEntityIcon'; export default function EntityIcon(props: EntityIconProps) { const { entity } = props; diff --git a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/SingleEntityIcon.tsx b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/SingleEntityIcon.tsx index 0fd79f10be..fda643a42d 100644 --- a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/SingleEntityIcon.tsx +++ b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/SingleEntityIcon.tsx @@ -1,10 +1,11 @@ +import { Image } from 'antd'; +import React, { useState } from 'react'; +import styled from 'styled-components'; + import { IconStyleType } from '@src/app/entityV2/Entity'; import { getPlatformName } from '@src/app/entityV2/shared/utils'; import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; import { Entity } from '@src/types.generated'; -import { Image } from 'antd'; -import React, { useState } from 'react'; -import styled from 'styled-components'; const ImageIcon = styled(Image)<{ $size: number }>` height: ${(props) => props.$size}px; diff --git a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/UserEntityIcon.tsx b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/UserEntityIcon.tsx index da5dcf19d1..7bb7bb9e1b 100644 --- a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/UserEntityIcon.tsx +++ b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/UserEntityIcon.tsx @@ -1,8 +1,9 @@ import React from 'react'; + +import { EntityIconProps } from '@app/searchV2/autoCompleteV2/components/icon/types'; import { Avatar } from '@src/alchemy-components'; import { isCorpUser } from '@src/app/entityV2/user/utils'; import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; -import { EntityIconProps } from './types'; export default function UserEntityIcon({ entity }: EntityIconProps) { const entityRegistry = useEntityRegistryV2(); diff --git a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/useUniqueEntitiesByPlatformUrn.ts b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/useUniqueEntitiesByPlatformUrn.ts index d89a266a1c..e5f576d888 100644 --- a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/useUniqueEntitiesByPlatformUrn.ts +++ b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/icon/useUniqueEntitiesByPlatformUrn.ts @@ -1,6 +1,7 @@ +import { useMemo } from 'react'; + import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; import { Entity } from '@src/types.generated'; -import { useMemo } from 'react'; export default function useUniqueEntitiesByPlatformUrn(entities: Entity[] | undefined): Entity[] { const entityRegistry = useEntityRegistryV2(); diff --git a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/subtitle/DefaultEntitySubtitle.tsx b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/subtitle/DefaultEntitySubtitle.tsx index 0971a0436a..3160f9da8f 100644 --- a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/subtitle/DefaultEntitySubtitle.tsx +++ b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/subtitle/DefaultEntitySubtitle.tsx @@ -1,9 +1,10 @@ import React from 'react'; + +import { EntitySubtitleProps } from '@app/searchV2/autoCompleteV2/components/subtitle/types'; import { getContextPath } from '@src/app/entityV2/shared/containers/profile/header/getContextPath'; import ContextPath from '@src/app/previewV2/ContextPath'; import useContentTruncation from '@src/app/shared/useContentTruncation'; import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; -import { EntitySubtitleProps } from './types'; export default function DefaultEntitySubtitle({ entity }: EntitySubtitleProps) { const entityRegistry = useEntityRegistryV2(); diff --git a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/subtitle/EntitySubtitle.tsx b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/subtitle/EntitySubtitle.tsx index 3ffd89f171..110850350f 100644 --- a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/subtitle/EntitySubtitle.tsx +++ b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/subtitle/EntitySubtitle.tsx @@ -1,8 +1,9 @@ import React from 'react'; + +import { EntityIconProps } from '@app/searchV2/autoCompleteV2/components/icon/types'; +import DefaultEntitySubtitle from '@app/searchV2/autoCompleteV2/components/subtitle/DefaultEntitySubtitle'; +import UserEntitySubtitle from '@app/searchV2/autoCompleteV2/components/subtitle/UserEntitySubtitle'; import { EntityType } from '@src/types.generated'; -import { EntityIconProps } from '../icon/types'; -import UserEntitySubtitle from './UserEntitySubtitle'; -import DefaultEntitySubtitle from './DefaultEntitySubtitle'; export default function EntitySubtitle(props: EntityIconProps) { const { entity } = props; diff --git a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/subtitle/UserEntitySubtitle.tsx b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/subtitle/UserEntitySubtitle.tsx index ec4605f366..ae76e3e435 100644 --- a/datahub-web-react/src/app/searchV2/autoCompleteV2/components/subtitle/UserEntitySubtitle.tsx +++ b/datahub-web-react/src/app/searchV2/autoCompleteV2/components/subtitle/UserEntitySubtitle.tsx @@ -1,7 +1,8 @@ import React from 'react'; + +import { EntitySubtitleProps } from '@app/searchV2/autoCompleteV2/components/subtitle/types'; import { Text } from '@src/alchemy-components'; import { isCorpUser } from '@src/app/entityV2/user/utils'; -import { EntitySubtitleProps } from './types'; export default function UserEntitySubtitle({ entity }: EntitySubtitleProps) { if (!isCorpUser(entity)) return null; diff --git a/datahub-web-react/src/app/searchV2/context/constants.ts b/datahub-web-react/src/app/searchV2/context/constants.ts index 0f06129b58..c4ee8fa9a4 100644 --- a/datahub-web-react/src/app/searchV2/context/constants.ts +++ b/datahub-web-react/src/app/searchV2/context/constants.ts @@ -1,4 +1,4 @@ -import { SortOrder } from '../../../types.generated'; +import { SortOrder } from '@types'; export const RELEVANCE = 'relevance'; export const ENTITY_NAME_FIELD = '_entityName'; diff --git a/datahub-web-react/src/app/searchV2/filters/ActiveFilter.tsx b/datahub-web-react/src/app/searchV2/filters/ActiveFilter.tsx index 29789f872e..b983591504 100644 --- a/datahub-web-react/src/app/searchV2/filters/ActiveFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filters/ActiveFilter.tsx @@ -2,13 +2,15 @@ import { CloseCircleOutlined } from '@ant-design/icons'; import { Button } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { getFilterEntity, getFilterIconAndLabel, getNewFilters } from './utils'; -import useGetBrowseV2LabelOverride from './useGetBrowseV2LabelOverride'; -import { useFilterRendererRegistry } from './render/useFilterRenderer'; -import { IconSpacer, Label } from './styledComponents'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useFilterRendererRegistry } from '@app/searchV2/filters/render/useFilterRenderer'; +import { IconSpacer, Label } from '@app/searchV2/filters/styledComponents'; +import useGetBrowseV2LabelOverride from '@app/searchV2/filters/useGetBrowseV2LabelOverride'; +import { getFilterEntity, getFilterIconAndLabel, getNewFilters } from '@app/searchV2/filters/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const ActiveFilterWrapper = styled.div` border: 1px solid ${ANTD_GRAY[5]}; diff --git a/datahub-web-react/src/app/searchV2/filters/AddFilterDropdown.tsx b/datahub-web-react/src/app/searchV2/filters/AddFilterDropdown.tsx index 7a8dc0f873..6c5c0147a6 100644 --- a/datahub-web-react/src/app/searchV2/filters/AddFilterDropdown.tsx +++ b/datahub-web-react/src/app/searchV2/filters/AddFilterDropdown.tsx @@ -1,16 +1,17 @@ /* eslint-disable import/no-cycle */ import { PlusOutlined } from '@ant-design/icons'; -import { Dropdown, Menu } from 'antd'; import { Button, Popover } from '@components'; +import { Dropdown, Menu } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { IconStyleType } from '../../entity/Entity'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { DEFAULT_FILTER_FIELDS } from './field/fields'; -import { FieldType, FilterField, FilterPredicate } from './types'; -import { getDefaultFieldOperatorType } from './value/utils'; -import ValueMenu from './value/ValueMenu'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DEFAULT_FILTER_FIELDS } from '@app/searchV2/filters/field/fields'; +import { FieldType, FilterField, FilterPredicate } from '@app/searchV2/filters/types'; +import ValueMenu from '@app/searchV2/filters/value/ValueMenu'; +import { getDefaultFieldOperatorType } from '@app/searchV2/filters/value/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const StyledPlusOutlined = styled(PlusOutlined)` && { diff --git a/datahub-web-react/src/app/searchV2/filters/FilterOption.tsx b/datahub-web-react/src/app/searchV2/filters/FilterOption.tsx index 9134c9d53c..a72fd557d1 100644 --- a/datahub-web-react/src/app/searchV2/filters/FilterOption.tsx +++ b/datahub-web-react/src/app/searchV2/filters/FilterOption.tsx @@ -2,29 +2,31 @@ import { CaretUpOutlined } from '@ant-design/icons'; import { Button, Checkbox } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Entity, EntityType } from '../../../types.generated'; -import { generateColor } from '../../entityV2/shared/components/styled/StyledTag'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { SEARCH_COLORS } from '../../entityV2/shared/constants'; -import { formatNumber } from '../../shared/formatNumber'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { - DOMAINS_FILTER_NAME, - ENTITY_SUB_TYPE_FILTER_NAME, - MAX_COUNT_VAL, - TYPE_NAMES_FILTER_NAME, -} from '../utils/constants'; -import ParentEntities from './ParentEntities'; -import { Label } from './styledComponents'; -import { FilterOptionType } from './types'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { generateColor } from '@app/entityV2/shared/components/styled/StyledTag'; +import { SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import ParentEntities from '@app/searchV2/filters/ParentEntities'; +import { Label } from '@app/searchV2/filters/styledComponents'; +import { FilterOptionType } from '@app/searchV2/filters/types'; import { FilterEntityIcon, getFilterIconAndLabel, getParentEntities, isAnyOptionSelected, isFilterOptionSelected, -} from './utils'; +} from '@app/searchV2/filters/utils'; +import { + DOMAINS_FILTER_NAME, + ENTITY_SUB_TYPE_FILTER_NAME, + MAX_COUNT_VAL, + TYPE_NAMES_FILTER_NAME, +} from '@app/searchV2/utils/constants'; +import { formatNumber } from '@app/shared/formatNumber'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, EntityType } from '@types'; const FilterOptionWrapper = styled.div<{ addPadding?: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/searchV2/filters/MoreFilterOption.tsx b/datahub-web-react/src/app/searchV2/filters/MoreFilterOption.tsx index d5fa2cb71d..e804c6ddcf 100644 --- a/datahub-web-react/src/app/searchV2/filters/MoreFilterOption.tsx +++ b/datahub-web-react/src/app/searchV2/filters/MoreFilterOption.tsx @@ -1,13 +1,15 @@ import { RightOutlined } from '@ant-design/icons'; import React, { useRef } from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { IconWrapper } from './SearchFilterView'; -import { MoreFilterOptionLabel } from './styledComponents'; -import { FilterPredicate } from './types'; -import useSearchFilterDropdown from './useSearchFilterDropdown'; -import { getFilterDropdownIcon, useElementDimensions, useFilterDisplayName } from './utils'; -import ValueSelector from './value/ValueSelector'; + +import { IconWrapper } from '@app/searchV2/filters/SearchFilterView'; +import { MoreFilterOptionLabel } from '@app/searchV2/filters/styledComponents'; +import { FilterPredicate } from '@app/searchV2/filters/types'; +import useSearchFilterDropdown from '@app/searchV2/filters/useSearchFilterDropdown'; +import { getFilterDropdownIcon, useElementDimensions, useFilterDisplayName } from '@app/searchV2/filters/utils'; +import ValueSelector from '@app/searchV2/filters/value/ValueSelector'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const IconNameWrapper = styled.span` display: flex; diff --git a/datahub-web-react/src/app/searchV2/filters/MoreFilters.tsx b/datahub-web-react/src/app/searchV2/filters/MoreFilters.tsx index 2d2e26b249..6cdd9bf8b8 100644 --- a/datahub-web-react/src/app/searchV2/filters/MoreFilters.tsx +++ b/datahub-web-react/src/app/searchV2/filters/MoreFilters.tsx @@ -2,15 +2,17 @@ import { CaretDownFilled } from '@ant-design/icons'; import { Dropdown } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; + +import MoreFilterOption from '@app/searchV2/filters/MoreFilterOption'; +import { FilterScenarioType } from '@app/searchV2/filters/render/types'; +import { useFilterRendererRegistry } from '@app/searchV2/filters/render/useFilterRenderer'; +import { SearchFilterLabel } from '@app/searchV2/filters/styledComponents'; +import { FilterPredicate } from '@app/searchV2/filters/types'; +import useSearchFilterAnalytics from '@app/searchV2/filters/useSearchFilterAnalytics'; +import { getNumActiveFiltersForGroupOfFilters } from '@app/searchV2/filters/utils'; import { useAppConfig } from '@src/app/useAppConfig'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import MoreFilterOption from './MoreFilterOption'; -import { getNumActiveFiltersForGroupOfFilters } from './utils'; -import { SearchFilterLabel } from './styledComponents'; -import useSearchFilterAnalytics from './useSearchFilterAnalytics'; -import { useFilterRendererRegistry } from './render/useFilterRenderer'; -import { FilterScenarioType } from './render/types'; -import { FilterPredicate } from './types'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const DropdownMenu = styled.div<{ padding?: string }>` background-color: white; diff --git a/datahub-web-react/src/app/searchV2/filters/OperatorSelector.tsx b/datahub-web-react/src/app/searchV2/filters/OperatorSelector.tsx index f405346928..590379d656 100644 --- a/datahub-web-react/src/app/searchV2/filters/OperatorSelector.tsx +++ b/datahub-web-react/src/app/searchV2/filters/OperatorSelector.tsx @@ -1,9 +1,13 @@ import { Dropdown } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { SEARCH_COLORS } from '../../entityV2/shared/constants'; -import { SEARCH_FILTER_CONDITION_TYPE_TO_INFO, getOperatorOptionsForPredicate } from './operator/operator'; -import { FilterOperatorType, FilterPredicate } from './types'; + +import { SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { + SEARCH_FILTER_CONDITION_TYPE_TO_INFO, + getOperatorOptionsForPredicate, +} from '@app/searchV2/filters/operator/operator'; +import { FilterOperatorType, FilterPredicate } from '@app/searchV2/filters/types'; const OptionContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/filters/OptionsDropdownMenu.tsx b/datahub-web-react/src/app/searchV2/filters/OptionsDropdownMenu.tsx index ffdcaa4019..e8dc5045d9 100644 --- a/datahub-web-react/src/app/searchV2/filters/OptionsDropdownMenu.tsx +++ b/datahub-web-react/src/app/searchV2/filters/OptionsDropdownMenu.tsx @@ -2,10 +2,11 @@ import { LoadingOutlined } from '@ant-design/icons'; import { Button } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { ANTD_GRAY, SEARCH_COLORS } from '../../entityV2/shared/constants'; -import { useEnterKeyListener } from '../../shared/useEnterKeyListener'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { SearchBar } from '../SearchBar'; + +import { ANTD_GRAY, SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { SearchBar } from '@app/searchV2/SearchBar'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const StyledButton = styled(Button)` width: 100%; diff --git a/datahub-web-react/src/app/searchV2/filters/ParentEntities.tsx b/datahub-web-react/src/app/searchV2/filters/ParentEntities.tsx index b7b0530da5..6abe1290d8 100644 --- a/datahub-web-react/src/app/searchV2/filters/ParentEntities.tsx +++ b/datahub-web-react/src/app/searchV2/filters/ParentEntities.tsx @@ -1,12 +1,14 @@ -import React from 'react'; -import styled from 'styled-components'; import { FolderOpenOutlined } from '@ant-design/icons'; import { Tooltip } from '@components'; -import { ContextPathSeparator } from '@src/app/previewV2/ContextPathSeparator'; +import React from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import ContextPathEntityLink from '@src/app/previewV2/ContextPathEntityLink'; -import { Entity } from '../../../types.generated'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; +import { ContextPathSeparator } from '@src/app/previewV2/ContextPathSeparator'; + +import { Entity } from '@types'; const ParentNodesWrapper = styled.div` font-size: 12px; diff --git a/datahub-web-react/src/app/searchV2/filters/SaveViewButton.tsx b/datahub-web-react/src/app/searchV2/filters/SaveViewButton.tsx index a302ea6738..0e16ac494b 100644 --- a/datahub-web-react/src/app/searchV2/filters/SaveViewButton.tsx +++ b/datahub-web-react/src/app/searchV2/filters/SaveViewButton.tsx @@ -1,14 +1,16 @@ import { Tooltip } from '@components'; import React, { useMemo, useState } from 'react'; import styled from 'styled-components'; -import { ViewBuilderMode } from '../../entityV2/view/builder/types'; -import { ViewBuilder } from '../../entityV2/view/builder/ViewBuilder'; -import { buildInitialViewState, fromUnionType } from '../../entity/view/builder/utils'; -import { FacetFilterInput } from '../../../types.generated'; -import { UnionType } from '../utils/constants'; -import { TextButton } from './styledComponents'; -import { Message } from '../../shared/Message'; -import { canCreateViewFromFilters } from './utils'; + +import { buildInitialViewState, fromUnionType } from '@app/entity/view/builder/utils'; +import { ViewBuilder } from '@app/entityV2/view/builder/ViewBuilder'; +import { ViewBuilderMode } from '@app/entityV2/view/builder/types'; +import { TextButton } from '@app/searchV2/filters/styledComponents'; +import { canCreateViewFromFilters } from '@app/searchV2/filters/utils'; +import { UnionType } from '@app/searchV2/utils/constants'; +import { Message } from '@app/shared/Message'; + +import { FacetFilterInput } from '@types'; const ToolTipHeader = styled.div` margin-bottom: 12px; diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFilter.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFilter.tsx index 79ee382574..c0dacb5af1 100644 --- a/datahub-web-react/src/app/searchV2/filters/SearchFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filters/SearchFilter.tsx @@ -1,10 +1,12 @@ import React from 'react'; import { CSSProperties } from 'styled-components'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import useSearchFilterDropdown from './useSearchFilterDropdown'; -import { getFilterDropdownIcon, useFilterDisplayName } from './utils'; -import SearchFilterView from './SearchFilterView'; -import { FilterPredicate } from './types'; + +import SearchFilterView from '@app/searchV2/filters/SearchFilterView'; +import { FilterPredicate } from '@app/searchV2/filters/types'; +import useSearchFilterDropdown from '@app/searchV2/filters/useSearchFilterDropdown'; +import { getFilterDropdownIcon, useFilterDisplayName } from '@app/searchV2/filters/utils'; + +import { FacetFilterInput, FacetMetadata } from '@types'; interface Props { filter: FacetMetadata; diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFilterOptions.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFilterOptions.tsx index 21bc6a8744..193b49b2c7 100644 --- a/datahub-web-react/src/app/searchV2/filters/SearchFilterOptions.tsx +++ b/datahub-web-react/src/app/searchV2/filters/SearchFilterOptions.tsx @@ -1,21 +1,23 @@ +import { SlidersOutlined } from '@ant-design/icons'; +import { Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Divider } from 'antd'; -import { SlidersOutlined } from '@ant-design/icons'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import MoreFilters from '@app/searchV2/filters/MoreFilters'; +import SaveViewButton from '@app/searchV2/filters/SaveViewButton'; +import SearchFilter from '@app/searchV2/filters/SearchFilter'; +import SearchFiltersLoadingSection from '@app/searchV2/filters/SearchFiltersLoadingSection'; +import { FILTERS_TO_REMOVE, NON_FACET_FILTER_FIELDS, SORTED_FILTERS } from '@app/searchV2/filters/constants'; +import { FilterScenarioType } from '@app/searchV2/filters/render/types'; +import { useFilterRendererRegistry } from '@app/searchV2/filters/render/useFilterRenderer'; +import { FilterPredicate } from '@app/searchV2/filters/types'; +import { convertToAvailableFilterPredictes, sortFacets } from '@app/searchV2/filters/utils'; +import { ORIGIN_FILTER_NAME, UnionType } from '@app/searchV2/utils/constants'; import { useAppConfig } from '@src/app/useAppConfig'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { useUserContext } from '../../context/useUserContext'; -import { ORIGIN_FILTER_NAME, UnionType } from '../utils/constants'; -import { FILTERS_TO_REMOVE, NON_FACET_FILTER_FIELDS, SORTED_FILTERS } from './constants'; -import MoreFilters from './MoreFilters'; -import SaveViewButton from './SaveViewButton'; -import SearchFilter from './SearchFilter'; -import { convertToAvailableFilterPredictes, sortFacets } from './utils'; -import { useFilterRendererRegistry } from './render/useFilterRenderer'; -import { FilterScenarioType } from './render/types'; -import SearchFiltersLoadingSection from './SearchFiltersLoadingSection'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { FilterPredicate } from './types'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const NUM_VISIBLE_FILTER_DROPDOWNS = 6; diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFilterView.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFilterView.tsx index f178a85164..f0d7df1364 100644 --- a/datahub-web-react/src/app/searchV2/filters/SearchFilterView.tsx +++ b/datahub-web-react/src/app/searchV2/filters/SearchFilterView.tsx @@ -1,10 +1,11 @@ -import { FacetFilterInput, AggregationMetadata } from '@src/types.generated'; import { CaretDownFilled } from '@ant-design/icons'; import React from 'react'; import styled, { CSSProperties } from 'styled-components'; -import { SearchFilterLabel } from './styledComponents'; -import { FilterPredicate, FilterValue } from './types'; -import ValueSelector from './value/ValueSelector'; + +import { SearchFilterLabel } from '@app/searchV2/filters/styledComponents'; +import { FilterPredicate, FilterValue } from '@app/searchV2/filters/types'; +import ValueSelector from '@app/searchV2/filters/value/ValueSelector'; +import { AggregationMetadata, FacetFilterInput } from '@src/types.generated'; export const IconWrapper = styled.div` margin-right: 8px; diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFilters.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFilters.tsx index 7d1a4b3fa2..ce4e0e51f6 100644 --- a/datahub-web-react/src/app/searchV2/filters/SearchFilters.tsx +++ b/datahub-web-react/src/app/searchV2/filters/SearchFilters.tsx @@ -1,26 +1,28 @@ import React from 'react'; import styled from 'styled-components'; -import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { SEARCH_RESULTS_FILTERS_ID } from '../../onboarding/config/SearchOnboardingConfig'; -import SearchFilterOptions from './SearchFilterOptions'; -import SelectedSearchFilters from './SelectedSearchFilters'; + +import { SEARCH_RESULTS_FILTERS_ID } from '@app/onboarding/config/SearchOnboardingConfig'; +import SearchFilterOptions from '@app/searchV2/filters/SearchFilterOptions'; +import SelectedSearchFilters from '@app/searchV2/filters/SelectedSearchFilters'; import { - ENTITY_INDEX_FILTER_NAME, - TYPE_NAMES_FILTER_NAME, - UnionType, - LEGACY_ENTITY_FILTER_NAME, BROWSE_PATH_V2_FILTER_NAME, - COMPLETED_FORMS_FILTER_NAME, - INCOMPLETE_FORMS_FILTER_NAME, - VERIFIED_FORMS_FILTER_NAME, COMPLETED_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME, - INCOMPLETE_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME, + COMPLETED_FORMS_FILTER_NAME, + ENTITY_INDEX_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, + INCOMPLETE_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME, + INCOMPLETE_FORMS_FILTER_NAME, + LEGACY_ENTITY_FILTER_NAME, PROPOSED_GLOSSARY_TERMS_FILTER_NAME, PROPOSED_SCHEMA_GLOSSARY_TERMS_FILTER_NAME, PROPOSED_SCHEMA_TAGS_FILTER_NAME, -} from '../utils/constants'; + TYPE_NAMES_FILTER_NAME, + UnionType, + VERIFIED_FORMS_FILTER_NAME, +} from '@app/searchV2/utils/constants'; +import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>` background-color: #ffffff; diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFiltersBuilder.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFiltersBuilder.tsx index 3f4f16fdec..78714294a2 100644 --- a/datahub-web-react/src/app/searchV2/filters/SearchFiltersBuilder.tsx +++ b/datahub-web-react/src/app/searchV2/filters/SearchFiltersBuilder.tsx @@ -1,13 +1,14 @@ import React from 'react'; import styled from 'styled-components'; -import { Button } from '@src/alchemy-components'; + +import { AdvancedSearchFilterOverallUnionTypeSelect } from '@app/searchV2/AdvancedSearchFilterOverallUnionTypeSelect'; +import AddFilterDropdown from '@app/searchV2/filters/AddFilterDropdown'; // eslint-disable-next-line import/no-cycle -import SelectedFilter from './SelectedFilter'; -import { FilterField, FilterPredicate } from './types'; -import AddFilterDropdown from './AddFilterDropdown'; -import { useHydrateFilters } from './useHydrateFilters'; -import { AdvancedSearchFilterOverallUnionTypeSelect } from '../AdvancedSearchFilterOverallUnionTypeSelect'; -import { UnionType } from '../utils/constants'; +import SelectedFilter from '@app/searchV2/filters/SelectedFilter'; +import { FilterField, FilterPredicate } from '@app/searchV2/filters/types'; +import { useHydrateFilters } from '@app/searchV2/filters/useHydrateFilters'; +import { UnionType } from '@app/searchV2/utils/constants'; +import { Button } from '@src/alchemy-components'; const Container = styled.div``; diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFiltersLoadingSection.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFiltersLoadingSection.tsx index 59b4fb433e..8f812ac4c7 100644 --- a/datahub-web-react/src/app/searchV2/filters/SearchFiltersLoadingSection.tsx +++ b/datahub-web-react/src/app/searchV2/filters/SearchFiltersLoadingSection.tsx @@ -1,5 +1,5 @@ -import * as React from 'react'; import { Skeleton } from 'antd'; +import * as React from 'react'; import styled from 'styled-components'; const Container = styled.div` diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFiltersSection.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFiltersSection.tsx index 0a3b8d03c5..bc78b547d1 100644 --- a/datahub-web-react/src/app/searchV2/filters/SearchFiltersSection.tsx +++ b/datahub-web-react/src/app/searchV2/filters/SearchFiltersSection.tsx @@ -1,10 +1,12 @@ import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; + +import { SEARCH_RESULTS_FILTERS_V2_INTRO } from '@app/onboarding/config/SearchOnboardingConfig'; +import SearchFilters from '@app/searchV2/filters/SearchFilters'; +import { UnionType } from '@app/searchV2/utils/constants'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { UnionType } from '../utils/constants'; -import { SEARCH_RESULTS_FILTERS_V2_INTRO } from '../../onboarding/config/SearchOnboardingConfig'; -import SearchFilters from './SearchFilters'; + +import { FacetFilterInput, FacetMetadata } from '@types'; const Section = styled.div<{ removePadding?: boolean; $isShowNavBarRedesign?: boolean }>` padding: ${(props) => { diff --git a/datahub-web-react/src/app/searchV2/filters/SelectedFilter.tsx b/datahub-web-react/src/app/searchV2/filters/SelectedFilter.tsx index 70bc33b69d..82cb3d79c9 100644 --- a/datahub-web-react/src/app/searchV2/filters/SelectedFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filters/SelectedFilter.tsx @@ -4,13 +4,14 @@ import { Button, DatePicker } from 'antd'; import moment from 'moment'; import React from 'react'; import styled from 'styled-components/macro'; -import { SEARCH_COLORS } from '../../entityV2/shared/constants'; -import OperatorSelector from './OperatorSelector'; -import { operatorRequiresValues } from './operator/operator'; -import { FilterOperatorType, FilterPredicate, FilterValue } from './types'; -import ValueSelector from './value/ValueSelector'; -import ValueName from './value/ValueName'; -import { getIsDateRangeFilter, useFilterDisplayName } from './utils'; + +import { SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import OperatorSelector from '@app/searchV2/filters/OperatorSelector'; +import { operatorRequiresValues } from '@app/searchV2/filters/operator/operator'; +import { FilterOperatorType, FilterPredicate, FilterValue } from '@app/searchV2/filters/types'; +import { getIsDateRangeFilter, useFilterDisplayName } from '@app/searchV2/filters/utils'; +import ValueName from '@app/searchV2/filters/value/ValueName'; +import ValueSelector from '@app/searchV2/filters/value/ValueSelector'; const Values = styled.div` border: 1.5px solid transparent; diff --git a/datahub-web-react/src/app/searchV2/filters/SelectedSearchFilters.tsx b/datahub-web-react/src/app/searchV2/filters/SelectedSearchFilters.tsx index 4968a44bcd..43e877bc16 100644 --- a/datahub-web-react/src/app/searchV2/filters/SelectedSearchFilters.tsx +++ b/datahub-web-react/src/app/searchV2/filters/SelectedSearchFilters.tsx @@ -1,11 +1,13 @@ import React from 'react'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { FilterPredicate } from './types'; -import { convertToSelectedFilterPredictes } from './utils'; -import { convertFrontendToBackendOperatorType } from './operator/operator'; -import SearchFiltersBuilder from './SearchFiltersBuilder'; -import { UnionType } from '../utils/constants'; -import { EXCLUDED_ACTIVE_FILTERS } from './constants'; + +import SearchFiltersBuilder from '@app/searchV2/filters/SearchFiltersBuilder'; +import { EXCLUDED_ACTIVE_FILTERS } from '@app/searchV2/filters/constants'; +import { convertFrontendToBackendOperatorType } from '@app/searchV2/filters/operator/operator'; +import { FilterPredicate } from '@app/searchV2/filters/types'; +import { convertToSelectedFilterPredictes } from '@app/searchV2/filters/utils'; +import { UnionType } from '@app/searchV2/utils/constants'; + +import { FacetFilterInput, FacetMetadata } from '@types'; interface Props { availableFilters: FacetMetadata[]; diff --git a/datahub-web-react/src/app/searchV2/filters/__tests__/operator.test.tsx b/datahub-web-react/src/app/searchV2/filters/__tests__/operator.test.tsx index a70a1b5dd5..7988842a68 100644 --- a/datahub-web-react/src/app/searchV2/filters/__tests__/operator.test.tsx +++ b/datahub-web-react/src/app/searchV2/filters/__tests__/operator.test.tsx @@ -1,14 +1,14 @@ -import { EntityType } from '@src/types.generated'; -import { ENTITY_SUB_TYPE_FILTER_NAME } from '@src/app/search/utils/constants'; import { ALL_EQUALS_OPERATOR, EQUALS_OPERATOR, EXISTS_OPERATOR, - getOperatorOptionsForPredicate, NOT_EQUALS_OPERATOR, NOT_EXISTS_OPERATOR, -} from '../operator/operator'; -import { FieldType, FilterOperatorType, FilterPredicate } from '../types'; + getOperatorOptionsForPredicate, +} from '@app/searchV2/filters/operator/operator'; +import { FieldType, FilterOperatorType, FilterPredicate } from '@app/searchV2/filters/types'; +import { ENTITY_SUB_TYPE_FILTER_NAME } from '@src/app/search/utils/constants'; +import { EntityType } from '@src/types.generated'; describe('operator', () => { const tagPredicate = { diff --git a/datahub-web-react/src/app/searchV2/filters/__tests__/utils.test.tsx b/datahub-web-react/src/app/searchV2/filters/__tests__/utils.test.tsx index 0f53644a59..faeda571c8 100644 --- a/datahub-web-react/src/app/searchV2/filters/__tests__/utils.test.tsx +++ b/datahub-web-react/src/app/searchV2/filters/__tests__/utils.test.tsx @@ -1,30 +1,32 @@ import { FolderFilled } from '@ant-design/icons'; -import { DATE_TYPE_URN } from '@src/app/shared/constants'; import React from 'react'; -import { dataPlatform, dataPlatformInstance, dataset1, glossaryTerm1, user1 } from '../../../../Mocks'; -import { EntityType } from '../../../../types.generated'; -import { getTestEntityRegistry } from '../../../../utils/test-utils/TestPageContainer'; -import { IconStyleType } from '../../../entity/Entity'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { FieldType, FilterField } from '@app/searchV2/filters/types'; import { - getFilterEntity, - getNewFilters, - isFilterOptionSelected, - getFilterIconAndLabel, PlatformIcon, - getNumActiveFiltersForFilter, - getNumActiveFiltersForGroupOfFilters, + canCreateViewFromFilters, combineAggregations, filterEmptyAggregations, - getFilterOptions, filterOptionsWithSearch, - canCreateViewFromFilters, - isAnyOptionSelected, - getStructuredPropFilterDisplayName, getFilterDisplayName, -} from '../utils'; -import { ENTITY_SUB_TYPE_FILTER_NAME } from '../../utils/constants'; -import { FieldType, FilterField } from '../types'; + getFilterEntity, + getFilterIconAndLabel, + getFilterOptions, + getNewFilters, + getNumActiveFiltersForFilter, + getNumActiveFiltersForGroupOfFilters, + getStructuredPropFilterDisplayName, + isAnyOptionSelected, + isFilterOptionSelected, +} from '@app/searchV2/filters/utils'; +import { ENTITY_SUB_TYPE_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { dataPlatform, dataPlatformInstance, dataset1, glossaryTerm1, user1 } from '@src/Mocks'; +import { DATE_TYPE_URN } from '@src/app/shared/constants'; +import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer'; + +import { EntityType } from '@types'; describe('filter utils - getNewFilters', () => { it('should get the correct list of filters when adding filters where the filter field did not already exist', () => { diff --git a/datahub-web-react/src/app/searchV2/filters/constants.ts b/datahub-web-react/src/app/searchV2/filters/constants.ts index c78390964b..ab928963e2 100644 --- a/datahub-web-react/src/app/searchV2/filters/constants.ts +++ b/datahub-web-react/src/app/searchV2/filters/constants.ts @@ -1,6 +1,5 @@ import { LAST_MODIFIED_FILTER } from '@app/searchV2/filters/field/fields'; import { FilterField } from '@app/searchV2/filters/types'; -import { EntityType } from '../../../types.generated'; import { BROWSE_PATH_V2_FILTER_NAME, CHART_TYPE_FILTER_NAME, @@ -17,7 +16,9 @@ import { PLATFORM_FILTER_NAME, TAGS_FILTER_NAME, TYPE_NAMES_FILTER_NAME, -} from '../utils/constants'; +} from '@app/searchV2/utils/constants'; + +import { EntityType } from '@types'; export const SORTED_FILTERS = [ ENTITY_SUB_TYPE_FILTER_NAME, diff --git a/datahub-web-react/src/app/searchV2/filters/field/fields.tsx b/datahub-web-react/src/app/searchV2/filters/field/fields.tsx index fdc43fc1a8..b2498bc4e8 100644 --- a/datahub-web-react/src/app/searchV2/filters/field/fields.tsx +++ b/datahub-web-react/src/app/searchV2/filters/field/fields.tsx @@ -1,12 +1,9 @@ -import Icon from '@ant-design/icons/lib/components/Icon'; -import { TimerOutlined } from '@mui/icons-material'; -import TableIcon from '@src/images/table-icon.svg?react'; -import React from 'react'; import { + BuildOutlined, CloseCircleOutlined, - EnvironmentOutlined, DatabaseOutlined, DeleteOutlined, + EnvironmentOutlined, FileOutlined, FileTextOutlined, FolderOutlined, @@ -14,10 +11,13 @@ import { TagOutlined, UserOutlined, WarningOutlined, - BuildOutlined, } from '@ant-design/icons'; +import Icon from '@ant-design/icons/lib/components/Icon'; +import { TimerOutlined } from '@mui/icons-material'; import { BookmarkSimple, Globe } from '@phosphor-icons/react'; -import { EntityType } from '../../../../types.generated'; +import React from 'react'; + +import { FieldType, FilterField } from '@app/searchV2/filters/types'; import { BROWSE_PATH_V2_FILTER_NAME, CONTAINER_FILTER_NAME, @@ -35,6 +35,7 @@ import { GLOSSARY_TERMS_FILTER_NAME, HAS_ACTIVE_INCIDENTS_FILTER_NAME, HAS_FAILING_ASSERTIONS_FILTER_NAME, + HAS_SIBLINGS_FILTER_NAME, LAST_MODIFIED_FILTER_NAME, ORIGIN_FILTER_NAME, OWNERS_FILTER_NAME, @@ -43,9 +44,10 @@ import { STRUCTURED_PROPERTIES_FILTER_NAME, TAGS_FILTER_NAME, TYPE_NAMES_FILTER_NAME, - HAS_SIBLINGS_FILTER_NAME, -} from '../../utils/constants'; -import { FieldType, FilterField } from '../types'; +} from '@app/searchV2/utils/constants'; +import TableIcon from '@src/images/table-icon.svg?react'; + +import { EntityType } from '@types'; export const ENTITY_SUB_TYPE_FILTER: FilterField = { field: ENTITY_SUB_TYPE_FILTER_NAME, diff --git a/datahub-web-react/src/app/searchV2/filters/mapFilterOption.tsx b/datahub-web-react/src/app/searchV2/filters/mapFilterOption.tsx index f8456a9dea..ee58ec2316 100644 --- a/datahub-web-react/src/app/searchV2/filters/mapFilterOption.tsx +++ b/datahub-web-react/src/app/searchV2/filters/mapFilterOption.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import { EntityRegistry } from '../../../entityRegistryContext'; -import FilterOption from './FilterOption'; -import { FilterOptionType } from './types'; -import { getFilterIconAndLabel } from './utils'; + +import FilterOption from '@app/searchV2/filters/FilterOption'; +import { FilterOptionType } from '@app/searchV2/filters/types'; +import { getFilterIconAndLabel } from '@app/searchV2/filters/utils'; +import { EntityRegistry } from '@src/entityRegistryContext'; export interface DisplayedFilterOption { key: string; diff --git a/datahub-web-react/src/app/searchV2/filters/operator/operator.tsx b/datahub-web-react/src/app/searchV2/filters/operator/operator.tsx index fe537acece..1e72bf6ccc 100644 --- a/datahub-web-react/src/app/searchV2/filters/operator/operator.tsx +++ b/datahub-web-react/src/app/searchV2/filters/operator/operator.tsx @@ -1,9 +1,17 @@ -import React from 'react'; import { CheckCircleOutlined, PlusCircleOutlined, PlusOutlined, StopOutlined } from '@ant-design/icons'; +import React from 'react'; + +import { + FieldType, + FilterOperatorInfo, + FilterOperatorType, + FilterPredicate, + FrontendFilterOperator, +} from '@app/searchV2/filters/types'; +import { getIsDateRangeFilter } from '@app/searchV2/filters/utils'; import { ENTITY_SUB_TYPE_FILTER_NAME, PLATFORM_FILTER_NAME } from '@src/app/search/utils/constants'; -import { FilterOperator } from '../../../../types.generated'; -import { FieldType, FilterOperatorInfo, FilterOperatorType, FilterPredicate, FrontendFilterOperator } from '../types'; -import { getIsDateRangeFilter } from '../utils'; + +import { FilterOperator } from '@types'; /** * This is a flat version of the supported search filtering operations that can be applied diff --git a/datahub-web-react/src/app/searchV2/filters/render/FilterRenderer.tsx b/datahub-web-react/src/app/searchV2/filters/render/FilterRenderer.tsx index bf1aa347f9..5b82cbd164 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/FilterRenderer.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/FilterRenderer.tsx @@ -1,4 +1,4 @@ -import { FilterRenderProps } from './types'; +import { FilterRenderProps } from '@app/searchV2/filters/render/types'; /** * Base interface used for custom search filter renderers diff --git a/datahub-web-react/src/app/searchV2/filters/render/FilterRendererRegistry.tsx b/datahub-web-react/src/app/searchV2/filters/render/FilterRendererRegistry.tsx index 0ceed3af25..1e5b6f4959 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/FilterRendererRegistry.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/FilterRendererRegistry.tsx @@ -1,5 +1,5 @@ -import { FilterRenderer } from './FilterRenderer'; -import { FilterRenderProps } from './types'; +import { FilterRenderer } from '@app/searchV2/filters/render/FilterRenderer'; +import { FilterRenderProps } from '@app/searchV2/filters/render/types'; function validatedGet(key: K, map: Map): V { if (map.has(key)) { diff --git a/datahub-web-react/src/app/searchV2/filters/render/__tests__/FilterRendererRegistry.test.tsx b/datahub-web-react/src/app/searchV2/filters/render/__tests__/FilterRendererRegistry.test.tsx index 757ef444dc..bbd7f575fd 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/__tests__/FilterRendererRegistry.test.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/__tests__/FilterRendererRegistry.test.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import FilterRendererRegistry from '../FilterRendererRegistry'; + +import FilterRendererRegistry from '@app/searchV2/filters/render/FilterRendererRegistry'; describe('FilterRendererRegistry', () => { let registry; diff --git a/datahub-web-react/src/app/searchV2/filters/render/acrylRenderers.ts b/datahub-web-react/src/app/searchV2/filters/render/acrylRenderers.ts index baf14999e7..c50cf8214b 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/acrylRenderers.ts +++ b/datahub-web-react/src/app/searchV2/filters/render/acrylRenderers.ts @@ -1,8 +1,8 @@ -import { HasFailingAssertionsRenderer } from './assertion/HasFailingAssertionsRenderer'; -import { DeprecationRenderer } from './deprecation/DeprecationRenderer'; -import { FilterRenderer } from './FilterRenderer'; -import { HasActiveIncidentsRenderer } from './incident/HasActiveIncidentsRenderer'; -import { HasSiblingsRenderer } from './siblings/HasSiblingsRenderer'; +import { FilterRenderer } from '@app/searchV2/filters/render/FilterRenderer'; +import { HasFailingAssertionsRenderer } from '@app/searchV2/filters/render/assertion/HasFailingAssertionsRenderer'; +import { DeprecationRenderer } from '@app/searchV2/filters/render/deprecation/DeprecationRenderer'; +import { HasActiveIncidentsRenderer } from '@app/searchV2/filters/render/incident/HasActiveIncidentsRenderer'; +import { HasSiblingsRenderer } from '@app/searchV2/filters/render/siblings/HasSiblingsRenderer'; export const renderers: Array = [ new HasFailingAssertionsRenderer(), diff --git a/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsFilter.tsx index 9f6c6c26fa..d331f3930c 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsFilter.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { FilterScenarioType } from '../types'; -import { BooleanSimpleSearchFilter } from '../shared/BooleanSimpleSearchFilter'; -import BooleanMoreFilter from '../shared/BooleanMoreFilter'; -import { FacetFilterInput, FacetMetadata, FacetFilter } from '../../../../../types.generated'; -import BooleanSearchFilter from '../shared/BooleanSearchFilter'; + +import BooleanMoreFilter from '@app/searchV2/filters/render/shared/BooleanMoreFilter'; +import BooleanSearchFilter from '@app/searchV2/filters/render/shared/BooleanSearchFilter'; +import { BooleanSimpleSearchFilter } from '@app/searchV2/filters/render/shared/BooleanSimpleSearchFilter'; +import { FilterScenarioType } from '@app/searchV2/filters/render/types'; + +import { FacetFilter, FacetFilterInput, FacetMetadata } from '@types'; export interface Props { scenario: FilterScenarioType; diff --git a/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsRenderer.tsx b/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsRenderer.tsx index eb94d77ff1..aa99715ed7 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsRenderer.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsRenderer.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { CloseCircleOutlined } from '@ant-design/icons'; -import { FilterRenderer } from '../FilterRenderer'; -import { FilterRenderProps } from '../types'; -import { HasFailingAssertionsFilter } from './HasFailingAssertionsFilter'; +import React from 'react'; + +import { FilterRenderer } from '@app/searchV2/filters/render/FilterRenderer'; +import { HasFailingAssertionsFilter } from '@app/searchV2/filters/render/assertion/HasFailingAssertionsFilter'; +import { FilterRenderProps } from '@app/searchV2/filters/render/types'; export class HasFailingAssertionsRenderer implements FilterRenderer { field = 'hasFailingAssertions'; diff --git a/datahub-web-react/src/app/searchV2/filters/render/deprecation/DeprecationFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/deprecation/DeprecationFilter.tsx index ead759268e..f724304529 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/deprecation/DeprecationFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/deprecation/DeprecationFilter.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { FilterScenarioType } from '../types'; -import { BooleanSimpleSearchFilter } from '../shared/BooleanSimpleSearchFilter'; -import BooleanMoreFilter from '../shared/BooleanMoreFilter'; -import { FacetFilterInput, FacetMetadata, FacetFilter } from '../../../../../types.generated'; -import BooleanSearchFilter from '../shared/BooleanSearchFilter'; + +import BooleanMoreFilter from '@app/searchV2/filters/render/shared/BooleanMoreFilter'; +import BooleanSearchFilter from '@app/searchV2/filters/render/shared/BooleanSearchFilter'; +import { BooleanSimpleSearchFilter } from '@app/searchV2/filters/render/shared/BooleanSimpleSearchFilter'; +import { FilterScenarioType } from '@app/searchV2/filters/render/types'; + +import { FacetFilter, FacetFilterInput, FacetMetadata } from '@types'; export interface Props { scenario: FilterScenarioType; diff --git a/datahub-web-react/src/app/searchV2/filters/render/deprecation/DeprecationRenderer.tsx b/datahub-web-react/src/app/searchV2/filters/render/deprecation/DeprecationRenderer.tsx index 0c6017dd80..8f4fd4a7e3 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/deprecation/DeprecationRenderer.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/deprecation/DeprecationRenderer.tsx @@ -1,9 +1,11 @@ import React from 'react'; import styled from 'styled-components'; -import DeprecatedIcon from '../../../../../images/deprecated-status.svg?react'; -import { FilterRenderer } from '../FilterRenderer'; -import { FilterRenderProps } from '../types'; -import { DeprecationFilter } from './DeprecationFilter'; + +import { FilterRenderer } from '@app/searchV2/filters/render/FilterRenderer'; +import { DeprecationFilter } from '@app/searchV2/filters/render/deprecation/DeprecationFilter'; +import { FilterRenderProps } from '@app/searchV2/filters/render/types'; + +import DeprecatedIcon from '@images/deprecated-status.svg?react'; const StyledDeprecatedIcon = styled(DeprecatedIcon)` color: inherit; diff --git a/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsFilter.tsx index a2a6bc3068..10fc659b29 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsFilter.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { FilterScenarioType } from '../types'; -import { BooleanSimpleSearchFilter } from '../shared/BooleanSimpleSearchFilter'; -import BooleanMoreFilter from '../shared/BooleanMoreFilter'; -import { FacetFilterInput, FacetMetadata, FacetFilter } from '../../../../../types.generated'; -import BooleanSearchFilter from '../shared/BooleanSearchFilter'; + +import BooleanMoreFilter from '@app/searchV2/filters/render/shared/BooleanMoreFilter'; +import BooleanSearchFilter from '@app/searchV2/filters/render/shared/BooleanSearchFilter'; +import { BooleanSimpleSearchFilter } from '@app/searchV2/filters/render/shared/BooleanSimpleSearchFilter'; +import { FilterScenarioType } from '@app/searchV2/filters/render/types'; + +import { FacetFilter, FacetFilterInput, FacetMetadata } from '@types'; export interface Props { scenario: FilterScenarioType; diff --git a/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsRenderer.tsx b/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsRenderer.tsx index cc2e373b25..0888e680d1 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsRenderer.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsRenderer.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { WarningOutlined } from '@ant-design/icons'; -import { FilterRenderer } from '../FilterRenderer'; -import { FilterRenderProps } from '../types'; -import { HasActiveIncidentsFilter } from './HasActiveIncidentsFilter'; +import React from 'react'; + +import { FilterRenderer } from '@app/searchV2/filters/render/FilterRenderer'; +import { HasActiveIncidentsFilter } from '@app/searchV2/filters/render/incident/HasActiveIncidentsFilter'; +import { FilterRenderProps } from '@app/searchV2/filters/render/types'; export class HasActiveIncidentsRenderer implements FilterRenderer { field = 'hasActiveIncidents'; diff --git a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilter.tsx index c3d6e05176..0e27a271af 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilter.tsx @@ -2,10 +2,11 @@ import { RightOutlined } from '@ant-design/icons'; import { Dropdown } from 'antd'; import React, { useRef, useState } from 'react'; import styled from 'styled-components'; -import FilterOption from '../../FilterOption'; -import { MoreFilterOptionLabel } from '../../styledComponents'; -import { useElementDimensions } from '../../utils'; -import BooleanSearchFilterMenu from './BooleanMoreFilterMenu'; + +import FilterOption from '@app/searchV2/filters/FilterOption'; +import BooleanSearchFilterMenu from '@app/searchV2/filters/render/shared/BooleanMoreFilterMenu'; +import { MoreFilterOptionLabel } from '@app/searchV2/filters/styledComponents'; +import { useElementDimensions } from '@app/searchV2/filters/utils'; const IconNameWrapper = styled.span` display: flex; diff --git a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilterMenu.tsx b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilterMenu.tsx index b12e1ddce4..f63d4fbd38 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilterMenu.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilterMenu.tsx @@ -1,5 +1,5 @@ -import React, { CSSProperties } from 'react'; import { Button } from 'antd'; +import React, { CSSProperties } from 'react'; import styled from 'styled-components/macro'; const StyledButton = styled(Button)` @@ -13,7 +13,10 @@ const StyledButton = styled(Button)` export const DropdownMenu = styled.div` background-color: white; border-radius: 5px; - box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05); + box-shadow: + 0 3px 6px -4px rgba(0, 0, 0, 0.12), + 0 6px 16px 0 rgba(0, 0, 0, 0.08), + 0 9px 28px 8px rgba(0, 0, 0, 0.05); overflow: hidden; min-width: 200px; diff --git a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSearchFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSearchFilter.tsx index 888770f26b..8e55b6e58a 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSearchFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSearchFilter.tsx @@ -2,9 +2,10 @@ import { CaretDownFilled } from '@ant-design/icons'; import { Dropdown } from 'antd'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import FilterOption from '../../FilterOption'; -import { SearchFilterLabel } from '../../styledComponents'; -import BooleanSearchFilterMenu from './BooleanMoreFilterMenu'; + +import FilterOption from '@app/searchV2/filters/FilterOption'; +import BooleanSearchFilterMenu from '@app/searchV2/filters/render/shared/BooleanMoreFilterMenu'; +import { SearchFilterLabel } from '@app/searchV2/filters/styledComponents'; const IconNameWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSimpleSearchFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSimpleSearchFilter.tsx index f252409e13..3ad0b88477 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSimpleSearchFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSimpleSearchFilter.tsx @@ -1,9 +1,10 @@ -import * as React from 'react'; import { DownOutlined, UpOutlined } from '@ant-design/icons'; import { Checkbox } from 'antd'; -import { useState, useEffect } from 'react'; +import * as React from 'react'; +import { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { SearchFilterLabel } from '../../../SearchFilterLabel'; + +import { SearchFilterLabel } from '@app/searchV2/SearchFilterLabel'; const SearchFilterWrapper = styled.div` padding: 0 25px 15px 25px; diff --git a/datahub-web-react/src/app/searchV2/filters/render/shared/styledComponents.tsx b/datahub-web-react/src/app/searchV2/filters/render/shared/styledComponents.tsx index ea18d1f846..b9bb894728 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/shared/styledComponents.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/shared/styledComponents.tsx @@ -1,5 +1,6 @@ import styled from 'styled-components'; -import { MoreFilterOptionLabel } from '../../styledComponents'; + +import { MoreFilterOptionLabel } from '@app/searchV2/filters/styledComponents'; export const SearchFilterWrapper = styled.div` padding: 0 25px 15px 25px; diff --git a/datahub-web-react/src/app/searchV2/filters/render/siblings/HasSiblingsFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/siblings/HasSiblingsFilter.tsx index 063f26b3bb..a9dda633a2 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/siblings/HasSiblingsFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/siblings/HasSiblingsFilter.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { FilterScenarioType } from '../types'; -import { BooleanSimpleSearchFilter } from '../shared/BooleanSimpleSearchFilter'; -import BooleanMoreFilter from '../shared/BooleanMoreFilter'; -import { FacetFilterInput, FacetMetadata, FacetFilter } from '../../../../../types.generated'; -import BooleanSearchFilter from '../shared/BooleanSearchFilter'; + +import BooleanMoreFilter from '@app/searchV2/filters/render/shared/BooleanMoreFilter'; +import BooleanSearchFilter from '@app/searchV2/filters/render/shared/BooleanSearchFilter'; +import { BooleanSimpleSearchFilter } from '@app/searchV2/filters/render/shared/BooleanSimpleSearchFilter'; +import { FilterScenarioType } from '@app/searchV2/filters/render/types'; + +import { FacetFilter, FacetFilterInput, FacetMetadata } from '@types'; export interface Props { scenario: FilterScenarioType; diff --git a/datahub-web-react/src/app/searchV2/filters/render/siblings/HasSiblingsRenderer.tsx b/datahub-web-react/src/app/searchV2/filters/render/siblings/HasSiblingsRenderer.tsx index 84c8b8f842..23c43aa0c9 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/siblings/HasSiblingsRenderer.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/siblings/HasSiblingsRenderer.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { BuildOutlined } from '@ant-design/icons'; -import { FilterRenderer } from '../FilterRenderer'; -import { FilterRenderProps } from '../types'; -import { HasSiblingsFilter } from './HasSiblingsFilter'; +import React from 'react'; + +import { FilterRenderer } from '@app/searchV2/filters/render/FilterRenderer'; +import { HasSiblingsFilter } from '@app/searchV2/filters/render/siblings/HasSiblingsFilter'; +import { FilterRenderProps } from '@app/searchV2/filters/render/types'; export class HasSiblingsRenderer implements FilterRenderer { field = 'hasSiblings'; diff --git a/datahub-web-react/src/app/searchV2/filters/render/types.ts b/datahub-web-react/src/app/searchV2/filters/render/types.ts index 3089f35855..e60f73098c 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/types.ts +++ b/datahub-web-react/src/app/searchV2/filters/render/types.ts @@ -1,4 +1,4 @@ -import { AppConfig, FacetFilter, FacetFilterInput, FacetMetadata } from '../../../../types.generated'; +import { AppConfig, FacetFilter, FacetFilterInput, FacetMetadata } from '@types'; /** * The scenario in which filter rendering is required. diff --git a/datahub-web-react/src/app/searchV2/filters/render/useFilterRenderer.tsx b/datahub-web-react/src/app/searchV2/filters/render/useFilterRenderer.tsx index 74f8de9514..05815886e7 100644 --- a/datahub-web-react/src/app/searchV2/filters/render/useFilterRenderer.tsx +++ b/datahub-web-react/src/app/searchV2/filters/render/useFilterRenderer.tsx @@ -1,5 +1,5 @@ -import { renderers as acrylRenderers } from './acrylRenderers'; -import FilterRendererRegistry from './FilterRendererRegistry'; +import FilterRendererRegistry from '@app/searchV2/filters/render/FilterRendererRegistry'; +import { renderers as acrylRenderers } from '@app/searchV2/filters/render/acrylRenderers'; /** * Configure the render registry. diff --git a/datahub-web-react/src/app/searchV2/filters/styledComponents.ts b/datahub-web-react/src/app/searchV2/filters/styledComponents.ts index b17b4f79cc..2b14e12200 100644 --- a/datahub-web-react/src/app/searchV2/filters/styledComponents.ts +++ b/datahub-web-react/src/app/searchV2/filters/styledComponents.ts @@ -1,7 +1,8 @@ import { Button, Typography } from 'antd'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { REDESIGN_COLORS, SEARCH_COLORS } from '../../entityV2/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { REDESIGN_COLORS, SEARCH_COLORS } from '@app/entityV2/shared/constants'; export const SearchFilterLabel = styled(Button)<{ $isActive: boolean }>` font-size: 14px; diff --git a/datahub-web-react/src/app/searchV2/filters/types.ts b/datahub-web-react/src/app/searchV2/filters/types.ts index 54d8f1e150..f565bfb071 100644 --- a/datahub-web-react/src/app/searchV2/filters/types.ts +++ b/datahub-web-react/src/app/searchV2/filters/types.ts @@ -1,4 +1,4 @@ -import { Entity, EntityType, FacetFilterInput, FilterOperator } from '../../../types.generated'; +import { Entity, EntityType, FacetFilterInput, FilterOperator } from '@types'; export interface FilterOptionType { field: string; diff --git a/datahub-web-react/src/app/searchV2/filters/useFilterMode.ts b/datahub-web-react/src/app/searchV2/filters/useFilterMode.ts index 994bd06c87..81c469dd93 100644 --- a/datahub-web-react/src/app/searchV2/filters/useFilterMode.ts +++ b/datahub-web-react/src/app/searchV2/filters/useFilterMode.ts @@ -1,8 +1,10 @@ import { useState } from 'react'; -import { FacetFilterInput } from '../../../types.generated'; -import { FilterMode, FilterModes, UnionType } from '../utils/constants'; -import { hasAdvancedFilters } from '../utils/hasAdvancedFilters'; -import useLatest from '../../shared/useLatest'; + +import { FilterMode, FilterModes, UnionType } from '@app/searchV2/utils/constants'; +import { hasAdvancedFilters } from '@app/searchV2/utils/hasAdvancedFilters'; +import useLatest from '@app/shared/useLatest'; + +import { FacetFilterInput } from '@types'; const useFilterMode = (filters: Array, unionType: UnionType) => { const onlyShowAdvancedFilters = hasAdvancedFilters(filters, unionType); diff --git a/datahub-web-react/src/app/searchV2/filters/useGetBrowseV2LabelOverride.ts b/datahub-web-react/src/app/searchV2/filters/useGetBrowseV2LabelOverride.ts index 574c55ff02..808d7d1fa5 100644 --- a/datahub-web-react/src/app/searchV2/filters/useGetBrowseV2LabelOverride.ts +++ b/datahub-web-react/src/app/searchV2/filters/useGetBrowseV2LabelOverride.ts @@ -1,8 +1,10 @@ import { useEffect } from 'react'; -import { useGetEntityDisplayNameLazyQuery } from '../../../graphql/search.generated'; -import { getLastBrowseEntryFromFilterValue } from './utils'; -import { BROWSE_PATH_V2_FILTER_NAME } from '../utils/constants'; -import { EntityRegistry } from '../../../entityRegistryContext'; + +import { getLastBrowseEntryFromFilterValue } from '@app/searchV2/filters/utils'; +import { BROWSE_PATH_V2_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { useGetEntityDisplayNameLazyQuery } from '@graphql/search.generated'; function isEntityUrn(string: string) { return string.includes('urn:li:'); diff --git a/datahub-web-react/src/app/searchV2/filters/useHydrateFilters.tsx b/datahub-web-react/src/app/searchV2/filters/useHydrateFilters.tsx index 5ddb0c96ee..8b9495726d 100644 --- a/datahub-web-react/src/app/searchV2/filters/useHydrateFilters.tsx +++ b/datahub-web-react/src/app/searchV2/filters/useHydrateFilters.tsx @@ -1,8 +1,10 @@ import { useEffect, useMemo, useState } from 'react'; -import { FieldType, FilterPredicate } from './types'; -import { Entity } from '../../../types.generated'; -import { useGetEntitiesLazyQuery } from '../../../graphql/entity.generated'; -import { buildEntityCache, isResolutionRequired } from '../../entityV2/view/builder/utils'; + +import { buildEntityCache, isResolutionRequired } from '@app/entityV2/view/builder/utils'; +import { FieldType, FilterPredicate } from '@app/searchV2/filters/types'; + +import { useGetEntitiesLazyQuery } from '@graphql/entity.generated'; +import { Entity } from '@types'; export const useHydrateFilters = (filters: FilterPredicate[]): FilterPredicate[] => { // Stores an URN to the resolved entity. diff --git a/datahub-web-react/src/app/searchV2/filters/useSearchFilterAnalytics.ts b/datahub-web-react/src/app/searchV2/filters/useSearchFilterAnalytics.ts index f696d61cb8..5d10460b6c 100644 --- a/datahub-web-react/src/app/searchV2/filters/useSearchFilterAnalytics.ts +++ b/datahub-web-react/src/app/searchV2/filters/useSearchFilterAnalytics.ts @@ -1,5 +1,5 @@ -import { EventType } from '../../analytics'; -import analytics from '../../analytics/analytics'; +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; const useSearchFilterAnalytics = () => { const trackClearAllFiltersEvent = (total: number) => { diff --git a/datahub-web-react/src/app/searchV2/filters/useSearchFilterDropdown.tsx b/datahub-web-react/src/app/searchV2/filters/useSearchFilterDropdown.tsx index 7df3f8eafc..1e75311251 100644 --- a/datahub-web-react/src/app/searchV2/filters/useSearchFilterDropdown.tsx +++ b/datahub-web-react/src/app/searchV2/filters/useSearchFilterDropdown.tsx @@ -1,9 +1,11 @@ import { useEffect, useMemo } from 'react'; + +import { filterEmptyAggregations, getNewFilters, getNumActiveFiltersForFilter } from '@app/searchV2/filters/utils'; +import useGetSearchQueryInputs from '@app/searchV2/useGetSearchQueryInputs'; +import { ENTITY_FILTER_NAME } from '@app/searchV2/utils/constants'; import { useAggregateAcrossEntitiesLazyQuery } from '@src/graphql/search.generated'; -import { FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { filterEmptyAggregations, getNewFilters, getNumActiveFiltersForFilter } from './utils'; -import useGetSearchQueryInputs from '../useGetSearchQueryInputs'; -import { ENTITY_FILTER_NAME } from '../utils/constants'; + +import { FacetFilterInput, FacetMetadata } from '@types'; interface Props { filter: FacetMetadata; diff --git a/datahub-web-react/src/app/searchV2/filters/utils.tsx b/datahub-web-react/src/app/searchV2/filters/utils.tsx index b435b016e9..92e1d8d344 100644 --- a/datahub-web-react/src/app/searchV2/filters/utils.tsx +++ b/datahub-web-react/src/app/searchV2/filters/utils.tsx @@ -1,10 +1,60 @@ -import moment from 'moment-timezone'; -import { removeMarkdown } from '@src/app/entity/shared/components/styled/StripMarkdownText'; -import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; import { FolderFilled } from '@ant-design/icons'; -import { DATE_TYPE_URN } from '@src/app/shared/constants'; +import moment from 'moment-timezone'; import React, { useLayoutEffect, useState } from 'react'; import styled from 'styled-components'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { getSubTypeIcon } from '@app/entityV2/shared/components/subtypes'; +import { DomainColoredIcon } from '@app/entityV2/shared/links/DomainColoredIcon'; +import { TagColor } from '@app/searchV2/filters/FilterOption'; +import { FACETS_TO_ENTITY_TYPES } from '@app/searchV2/filters/constants'; +import { ALL_FILTER_FIELDS, STRUCTURED_PROPERTY_FILTER } from '@app/searchV2/filters/field/fields'; +import { convertBackendToFrontendOperatorType } from '@app/searchV2/filters/operator/operator'; +import { + FieldType, + FilterField, + FilterOperatorType, + FilterOptionType, + FilterPredicate, + FilterValueOption, +} from '@app/searchV2/filters/types'; +import { + BOOLEAN_FIELDS, + BROWSE_PATH_V2_FILTER_NAME, + CONTAINER_FILTER_NAME, + DATA_PLATFORM_INSTANCE_FILTER_NAME, + DOMAINS_FILTER_NAME, + ENTITY_FIELDS, + ENTITY_FILTER_NAME, + ENTITY_SUB_TYPE_FILTER_NAME, + ENTITY_TYPE_FIELDS, + FIELD_GLOSSARY_TERMS_FILTER_NAME, + FIELD_TAGS_FILTER_NAME, + FILTER_DELIMITER, + GLOSSARY_TERMS_FILTER_NAME, + LAST_MODIFIED_FILTER_NAME, + LEGACY_ENTITY_FILTER_NAME, + OWNERS_FILTER_NAME, + PLATFORM_FILTER_NAME, + PROPOSED_GLOSSARY_TERMS_FILTER_NAME, + PROPOSED_SCHEMA_GLOSSARY_TERMS_FILTER_NAME, + PROPOSED_SCHEMA_TAGS_FILTER_NAME, + PROPOSED_TAGS_FILTER_NAME, + STRUCTURED_PROPERTIES_FILTER_NAME, + TAGS_FILTER_NAME, + TEXT_FIELDS, + TYPE_NAMES_FILTER_NAME, + UNIT_SEPARATOR, +} from '@app/searchV2/utils/constants'; +import { capitalizeFirstLetterOnly, forcePluralize, pluralizeIfIrregular } from '@app/shared/textUtil'; +import getTypeIcon from '@app/sharedV2/icons/getTypeIcon'; +import { removeMarkdown } from '@src/app/entity/shared/components/styled/StripMarkdownText'; +import { DATE_TYPE_URN } from '@src/app/shared/constants'; +import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { GetAutoCompleteMultipleResultsQuery } from '@graphql/search.generated'; import { AggregationMetadata, DataPlatform, @@ -18,55 +68,7 @@ import { GlossaryTerm, StructuredPropertyEntity, Tag, -} from '../../../types.generated'; -import { IconStyleType } from '../../entity/Entity'; -import { - BOOLEAN_FIELDS, - BROWSE_PATH_V2_FILTER_NAME, - CONTAINER_FILTER_NAME, - DOMAINS_FILTER_NAME, - ENTITY_FIELDS, - ENTITY_FILTER_NAME, - ENTITY_SUB_TYPE_FILTER_NAME, - FILTER_DELIMITER, - GLOSSARY_TERMS_FILTER_NAME, - LEGACY_ENTITY_FILTER_NAME, - OWNERS_FILTER_NAME, - PLATFORM_FILTER_NAME, - TEXT_FIELDS, - TAGS_FILTER_NAME, - TYPE_NAMES_FILTER_NAME, - UNIT_SEPARATOR, - ENTITY_TYPE_FIELDS, - DATA_PLATFORM_INSTANCE_FILTER_NAME, - FIELD_TAGS_FILTER_NAME, - FIELD_GLOSSARY_TERMS_FILTER_NAME, - PROPOSED_TAGS_FILTER_NAME, - PROPOSED_SCHEMA_TAGS_FILTER_NAME, - PROPOSED_GLOSSARY_TERMS_FILTER_NAME, - PROPOSED_SCHEMA_GLOSSARY_TERMS_FILTER_NAME, - LAST_MODIFIED_FILTER_NAME, - STRUCTURED_PROPERTIES_FILTER_NAME, -} from '../utils/constants'; -import { EntityRegistry } from '../../../entityRegistryContext'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { GetAutoCompleteMultipleResultsQuery } from '../../../graphql/search.generated'; -import { FACETS_TO_ENTITY_TYPES } from './constants'; -import { - FieldType, - FilterField, - FilterOperatorType, - FilterOptionType, - FilterPredicate, - FilterValueOption, -} from './types'; -import { capitalizeFirstLetterOnly, forcePluralize, pluralizeIfIrregular } from '../../shared/textUtil'; -import { convertBackendToFrontendOperatorType } from './operator/operator'; -import { ALL_FILTER_FIELDS, STRUCTURED_PROPERTY_FILTER } from './field/fields'; -import { getSubTypeIcon } from '../../entityV2/shared/components/subtypes'; -import getTypeIcon from '../../sharedV2/icons/getTypeIcon'; -import { DomainColoredIcon } from '../../entityV2/shared/links/DomainColoredIcon'; -import { TagColor } from './FilterOption'; +} from '@types'; // either adds or removes selectedFilterValues to/from activeFilters for a given filterField export function getNewFilters( diff --git a/datahub-web-react/src/app/searchV2/filters/value/BooleanValueMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/BooleanValueMenu.tsx index 2f1ae7f648..35fd53ca63 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/BooleanValueMenu.tsx +++ b/datahub-web-react/src/app/searchV2/filters/value/BooleanValueMenu.tsx @@ -1,9 +1,10 @@ import React, { useState } from 'react'; -import { FilterField, FilterValue } from '../types'; -import { mapFilterOption } from '../mapFilterOption'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import OptionsDropdownMenu from '../OptionsDropdownMenu'; -import { OptionMenu } from './styledComponents'; + +import OptionsDropdownMenu from '@app/searchV2/filters/OptionsDropdownMenu'; +import { mapFilterOption } from '@app/searchV2/filters/mapFilterOption'; +import { FilterField, FilterValue } from '@app/searchV2/filters/types'; +import { OptionMenu } from '@app/searchV2/filters/value/styledComponents'; +import { useEntityRegistry } from '@app/useEntityRegistry'; // Since we are working with a boolean field, always simply have the base options. const OPTIONS = [ diff --git a/datahub-web-react/src/app/searchV2/filters/value/DateRangeMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/DateRangeMenu.tsx index 3d3fc864df..13514f2f51 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/DateRangeMenu.tsx +++ b/datahub-web-react/src/app/searchV2/filters/value/DateRangeMenu.tsx @@ -1,20 +1,24 @@ -import moment from 'moment'; -import { Text } from '@src/alchemy-components'; -import React, { useCallback, useRef, useState } from 'react'; import { DatePicker } from 'antd'; +import moment from 'moment'; +import React, { useCallback, useRef, useState } from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata, FilterOperator } from '@src/types.generated'; + +import { FilterField } from '@app/searchV2/filters/types'; +import { useFilterDisplayName } from '@app/searchV2/filters/utils'; +import useDateRangeFilterValues from '@app/searchV2/filters/value/useDateRangeFilterValues'; +import { Text } from '@src/alchemy-components'; import { Datetime } from '@src/app/lineageV2/LineageTimeSelector'; -import { FilterField } from '../types'; -import { useFilterDisplayName } from '../utils'; -import useDateRangeFilterValues from './useDateRangeFilterValues'; +import { FacetFilterInput, FacetMetadata, FilterOperator } from '@src/types.generated'; const { RangePicker } = DatePicker; const Container = styled.div` padding: 16px; background-color: #ffffff; - box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05); + box-shadow: + 0 3px 6px -4px rgba(0, 0, 0, 0.12), + 0 6px 16px 0 rgba(0, 0, 0, 0.08), + 0 9px 28px 8px rgba(0, 0, 0, 0.05); border-radius: 8px; min-width: 225px; `; diff --git a/datahub-web-react/src/app/searchV2/filters/value/EntityTypeMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/EntityTypeMenu.tsx index 31394ccc2d..15780a3b0f 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/EntityTypeMenu.tsx +++ b/datahub-web-react/src/app/searchV2/filters/value/EntityTypeMenu.tsx @@ -1,12 +1,17 @@ /* eslint-disable import/no-cycle */ import React, { useState } from 'react'; -import { FilterField, FilterValue, FilterValueOption } from '../types'; -import { mapFilterOption } from '../mapFilterOption'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import OptionsDropdownMenu from '../OptionsDropdownMenu'; -import { deduplicateOptions, useFilterOptionsBySearchQuery, useLoadAggregationOptions } from './utils'; -import { ENTITY_SUB_TYPE_FILTER_NAME, FILTER_DELIMITER } from '../../utils/constants'; -import { OptionMenu } from './styledComponents'; + +import OptionsDropdownMenu from '@app/searchV2/filters/OptionsDropdownMenu'; +import { mapFilterOption } from '@app/searchV2/filters/mapFilterOption'; +import { FilterField, FilterValue, FilterValueOption } from '@app/searchV2/filters/types'; +import { OptionMenu } from '@app/searchV2/filters/value/styledComponents'; +import { + deduplicateOptions, + useFilterOptionsBySearchQuery, + useLoadAggregationOptions, +} from '@app/searchV2/filters/value/utils'; +import { ENTITY_SUB_TYPE_FILTER_NAME, FILTER_DELIMITER } from '@app/searchV2/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; interface Props { field: FilterField; diff --git a/datahub-web-react/src/app/searchV2/filters/value/EntityValueMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/EntityValueMenu.tsx index 763c77bb34..ce8defa826 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/EntityValueMenu.tsx +++ b/datahub-web-react/src/app/searchV2/filters/value/EntityValueMenu.tsx @@ -1,10 +1,15 @@ import React, { useState } from 'react'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import OptionsDropdownMenu from '../OptionsDropdownMenu'; -import { mapFilterOption } from '../mapFilterOption'; -import { EntityFilterField, FilterValue, FilterValueOption } from '../types'; -import { OptionMenu } from './styledComponents'; -import { deduplicateOptions, useFilterOptionsBySearchQuery, useLoadSearchOptions } from './utils'; + +import OptionsDropdownMenu from '@app/searchV2/filters/OptionsDropdownMenu'; +import { mapFilterOption } from '@app/searchV2/filters/mapFilterOption'; +import { EntityFilterField, FilterValue, FilterValueOption } from '@app/searchV2/filters/types'; +import { OptionMenu } from '@app/searchV2/filters/value/styledComponents'; +import { + deduplicateOptions, + useFilterOptionsBySearchQuery, + useLoadSearchOptions, +} from '@app/searchV2/filters/value/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; interface Props { field: EntityFilterField; diff --git a/datahub-web-react/src/app/searchV2/filters/value/EnumValueMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/EnumValueMenu.tsx index 958512a67b..f0a70b6e9b 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/EnumValueMenu.tsx +++ b/datahub-web-react/src/app/searchV2/filters/value/EnumValueMenu.tsx @@ -1,11 +1,16 @@ import React, { useState } from 'react'; -import { FilterField, FilterValue, FilterValueOption } from '../types'; -import { mapFilterOption } from '../mapFilterOption'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import OptionsDropdownMenu from '../OptionsDropdownMenu'; -import { deduplicateOptions, useFilterOptionsBySearchQuery, useLoadAggregationOptions } from './utils'; -import { OptionMenu } from './styledComponents'; -import { getFilterDisplayName, useFilterDisplayName } from '../utils'; + +import OptionsDropdownMenu from '@app/searchV2/filters/OptionsDropdownMenu'; +import { mapFilterOption } from '@app/searchV2/filters/mapFilterOption'; +import { FilterField, FilterValue, FilterValueOption } from '@app/searchV2/filters/types'; +import { getFilterDisplayName, useFilterDisplayName } from '@app/searchV2/filters/utils'; +import { OptionMenu } from '@app/searchV2/filters/value/styledComponents'; +import { + deduplicateOptions, + useFilterOptionsBySearchQuery, + useLoadAggregationOptions, +} from '@app/searchV2/filters/value/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; interface Props { field: FilterField; diff --git a/datahub-web-react/src/app/searchV2/filters/value/TextValueInput.tsx b/datahub-web-react/src/app/searchV2/filters/value/TextValueInput.tsx index 087250cda8..7b46b8aa73 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/TextValueInput.tsx +++ b/datahub-web-react/src/app/searchV2/filters/value/TextValueInput.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Input } from 'antd'; +import React from 'react'; interface Props { name: string; diff --git a/datahub-web-react/src/app/searchV2/filters/value/TextValueMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/TextValueMenu.tsx index 3e55fb82c3..d94b9c295b 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/TextValueMenu.tsx +++ b/datahub-web-react/src/app/searchV2/filters/value/TextValueMenu.tsx @@ -1,13 +1,17 @@ -import React from 'react'; import { Button, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { FilterField, FilterValue } from '../types'; -import TextValueInput from './TextValueInput'; + +import { FilterField, FilterValue } from '@app/searchV2/filters/types'; +import TextValueInput from '@app/searchV2/filters/value/TextValueInput'; const Container = styled.div` padding: 16px; background-color: #ffffff; - box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05); + box-shadow: + 0 3px 6px -4px rgba(0, 0, 0, 0.12), + 0 6px 16px 0 rgba(0, 0, 0, 0.08), + 0 9px 28px 8px rgba(0, 0, 0, 0.05); border-radius: 8px; `; diff --git a/datahub-web-react/src/app/searchV2/filters/value/TimeBucketMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/TimeBucketMenu.tsx index 1a93fa2b73..2125c0adbe 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/TimeBucketMenu.tsx +++ b/datahub-web-react/src/app/searchV2/filters/value/TimeBucketMenu.tsx @@ -1,12 +1,13 @@ -import { ANTD_GRAY } from '@app/entity/shared/constants'; -import OptionsDropdownMenu from '@app/searchV2/filters/OptionsDropdownMenu'; -import { FilterValue, TimeBucketFilterField } from '@app/searchV2/filters/types'; -import { OptionMenu } from '@app/searchV2/filters/value/styledComponents'; import type { ItemType } from 'antd/lib/menu/hooks/useItems'; import moment from 'moment'; import React, { useMemo } from 'react'; import styled from 'styled-components'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import OptionsDropdownMenu from '@app/searchV2/filters/OptionsDropdownMenu'; +import { FilterValue, TimeBucketFilterField } from '@app/searchV2/filters/types'; +import { OptionMenu } from '@app/searchV2/filters/value/styledComponents'; + const FilterOptionWrapper = styled.div` display: flex; align-items: center; diff --git a/datahub-web-react/src/app/searchV2/filters/value/ValueMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/ValueMenu.tsx index 792bc2ef3a..23388442e0 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/ValueMenu.tsx +++ b/datahub-web-react/src/app/searchV2/filters/value/ValueMenu.tsx @@ -1,15 +1,16 @@ /* eslint-disable import/no-cycle */ +import React, { useEffect, useRef, useState } from 'react'; + +import { FieldType, FilterField, FilterValue, FilterValueOption } from '@app/searchV2/filters/types'; +import { getIsDateRangeFilter } from '@app/searchV2/filters/utils'; +import BooleanValueMenu from '@app/searchV2/filters/value/BooleanValueMenu'; +import DateRangeMenu from '@app/searchV2/filters/value/DateRangeMenu'; +import EntityTypeMenu from '@app/searchV2/filters/value/EntityTypeMenu'; +import EntityValueMenu from '@app/searchV2/filters/value/EntityValueMenu'; +import EnumValueMenu from '@app/searchV2/filters/value/EnumValueMenu'; +import TextValueMenu from '@app/searchV2/filters/value/TextValueMenu'; import TimeBucketMenu from '@app/searchV2/filters/value/TimeBucketMenu'; import { FacetFilterInput } from '@src/types.generated'; -import React, { useEffect, useRef, useState } from 'react'; -import { FilterField, FilterValueOption, FilterValue, FieldType } from '../types'; -import TextValueMenu from './TextValueMenu'; -import BooleanValueMenu from './BooleanValueMenu'; -import EntityValueMenu from './EntityValueMenu'; -import EntityTypeMenu from './EntityTypeMenu'; -import EnumValueMenu from './EnumValueMenu'; -import DateRangeMenu from './DateRangeMenu'; -import { getIsDateRangeFilter } from '../utils'; interface Props { field: FilterField; diff --git a/datahub-web-react/src/app/searchV2/filters/value/ValueName.tsx b/datahub-web-react/src/app/searchV2/filters/value/ValueName.tsx index 0d69537af3..a8ebb15f5e 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/ValueName.tsx +++ b/datahub-web-react/src/app/searchV2/filters/value/ValueName.tsx @@ -1,12 +1,13 @@ +import { Typography } from 'antd'; import moment from 'moment'; import React from 'react'; -import { Typography } from 'antd'; -import { FilterField, FilterValue, FieldType } from '../types'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { getEntityTypeFilterValueDisplayName } from './utils'; -import { UNIT_SEPARATOR } from '../../utils/constants'; -import { getV1FieldPathFromSchemaFieldUrn } from '../../../lineageV2/lineageUtils'; -import { getStructuredPropFilterDisplayName } from '../utils'; + +import { getV1FieldPathFromSchemaFieldUrn } from '@app/lineageV2/lineageUtils'; +import { FieldType, FilterField, FilterValue } from '@app/searchV2/filters/types'; +import { getStructuredPropFilterDisplayName } from '@app/searchV2/filters/utils'; +import { getEntityTypeFilterValueDisplayName } from '@app/searchV2/filters/value/utils'; +import { UNIT_SEPARATOR } from '@app/searchV2/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; function getTextFieldName(field: FilterField, value: FilterValue) { let textFieldName = value.displayName || value.value; diff --git a/datahub-web-react/src/app/searchV2/filters/value/ValueSelector.tsx b/datahub-web-react/src/app/searchV2/filters/value/ValueSelector.tsx index faed298a47..6482130e5b 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/ValueSelector.tsx +++ b/datahub-web-react/src/app/searchV2/filters/value/ValueSelector.tsx @@ -1,9 +1,10 @@ /* eslint-disable import/no-cycle */ import { Dropdown } from 'antd'; import React, { useState } from 'react'; + +import { FilterField, FilterValue, FilterValueOption } from '@app/searchV2/filters/types'; +import ValueMenu from '@app/searchV2/filters/value/ValueMenu'; import { FacetFilterInput } from '@src/types.generated'; -import { FilterField, FilterValue, FilterValueOption } from '../types'; -import ValueMenu from './ValueMenu'; interface Props { field: FilterField; diff --git a/datahub-web-react/src/app/searchV2/filters/value/useDateRangeFilterValues.ts b/datahub-web-react/src/app/searchV2/filters/value/useDateRangeFilterValues.ts index 5360be4f2c..eb64021f9b 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/useDateRangeFilterValues.ts +++ b/datahub-web-react/src/app/searchV2/filters/value/useDateRangeFilterValues.ts @@ -1,8 +1,9 @@ -import { useEffect, useMemo } from 'react'; -import { FilterOperator } from '@src/types.generated'; import moment from 'moment'; +import { useEffect, useMemo } from 'react'; + +import useGetSearchQueryInputs from '@app/searchV2/useGetSearchQueryInputs'; import { Datetime } from '@src/app/lineageV2/LineageTimeSelector'; -import useGetSearchQueryInputs from '../../useGetSearchQueryInputs'; +import { FilterOperator } from '@src/types.generated'; interface Props { filterField: string; diff --git a/datahub-web-react/src/app/searchV2/filters/value/utils.tsx b/datahub-web-react/src/app/searchV2/filters/value/utils.tsx index da49e28e5b..b67e82191e 100644 --- a/datahub-web-react/src/app/searchV2/filters/value/utils.tsx +++ b/datahub-web-react/src/app/searchV2/filters/value/utils.tsx @@ -1,18 +1,26 @@ import { useMemo } from 'react'; -import { ENTITY_FILTER_NAME } from '@src/app/search/utils/constants'; + +import { + EntityFilterField, + FieldType, + FilterField, + FilterOperatorType, + FilterValueOption, +} from '@app/searchV2/filters/types'; +import { filterOptionsWithSearch, getStructuredPropFilterDisplayName } from '@app/searchV2/filters/utils'; +import { FILTER_DELIMITER } from '@app/searchV2/utils/constants'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import useGetSearchQueryInputs from '@src/app/search/useGetSearchQueryInputs'; -import { EntityRegistry } from '../../../../entityRegistryContext'; +import { ENTITY_FILTER_NAME } from '@src/app/search/utils/constants'; +import { EntityRegistry } from '@src/entityRegistryContext'; + import { useAggregateAcrossEntitiesQuery, useGetAutoCompleteMultipleResultsQuery, useGetSearchResultsForMultipleQuery, -} from '../../../../graphql/search.generated'; -import { EntityType } from '../../../../types.generated'; -import { capitalizeFirstLetterOnly } from '../../../shared/textUtil'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { FILTER_DELIMITER } from '../../utils/constants'; -import { EntityFilterField, FieldType, FilterField, FilterOperatorType, FilterValueOption } from '../types'; -import { filterOptionsWithSearch, getStructuredPropFilterDisplayName } from '../utils'; +} from '@graphql/search.generated'; +import { EntityType } from '@types'; const MAX_AGGREGATION_COUNT = 40; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/FiltersRenderingRunner.tsx b/datahub-web-react/src/app/searchV2/filtersV2/FiltersRenderingRunner.tsx index b93ebe0b1a..16d4457afc 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/FiltersRenderingRunner.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/FiltersRenderingRunner.tsx @@ -1,6 +1,7 @@ import React, { useMemo } from 'react'; -import { useSearchFiltersContext } from './context'; -import { FieldName, Filter } from './types'; + +import { useSearchFiltersContext } from '@app/searchV2/filtersV2/context'; +import { FieldName, Filter } from '@app/searchV2/filtersV2/types'; interface Props { fieldNames: FieldName[]; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/SearchFilters.tsx b/datahub-web-react/src/app/searchV2/filtersV2/SearchFilters.tsx index dab43fb1b8..6dcf22b6a6 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/SearchFilters.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/SearchFilters.tsx @@ -1,6 +1,10 @@ import React, { useCallback, useMemo, useState } from 'react'; -import DynamicFacetsUpdater from './defaults/DefaultFacetsUpdater/DefaultFacetsUpdater'; -import FiltersRenderingRunner from './FiltersRenderingRunner'; + +import FiltersRenderingRunner from '@app/searchV2/filtersV2/FiltersRenderingRunner'; +import { SearchFiltersProvider } from '@app/searchV2/filtersV2/context'; +import DynamicFacetsUpdater from '@app/searchV2/filtersV2/defaults/DefaultFacetsUpdater/DefaultFacetsUpdater'; +import DefaultFiltersRenderer from '@app/searchV2/filtersV2/defaults/DefaultFiltersRenderer'; +import defaultFiltersRegistry from '@app/searchV2/filtersV2/defaults/defaultFiltersRegistry'; import { AppliedFieldFilterUpdater, FieldName, @@ -8,10 +12,7 @@ import { FieldToFacetStateMap, FiltersAppliedHandler, FiltersRenderer, -} from './types'; -import { SearchFiltersProvider } from './context'; -import defaultFiltersRegistry from './defaults/defaultFiltersRegistry'; -import DefaultFiltersRenderer from './defaults/DefaultFiltersRenderer'; +} from '@app/searchV2/filtersV2/types'; interface Props { query: string; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/__tests__/convertFiltersMapToFilters.test.ts b/datahub-web-react/src/app/searchV2/filtersV2/__tests__/convertFiltersMapToFilters.test.ts index a1ab800a12..e81a1bd23d 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/__tests__/convertFiltersMapToFilters.test.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/__tests__/convertFiltersMapToFilters.test.ts @@ -1,4 +1,4 @@ -import { convertFiltersMapToFilters } from '../utils'; +import { convertFiltersMapToFilters } from '@app/searchV2/filtersV2/utils'; describe('convertFiltersMapToFilters', () => { const mockFiltersMap = new Map([ diff --git a/datahub-web-react/src/app/searchV2/filtersV2/__tests__/getUniqueItemsByKey.test.ts b/datahub-web-react/src/app/searchV2/filtersV2/__tests__/getUniqueItemsByKey.test.ts index fb68b878c1..a9d02407b3 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/__tests__/getUniqueItemsByKey.test.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/__tests__/getUniqueItemsByKey.test.ts @@ -1,4 +1,4 @@ -import { getUniqueItemsByKey } from '../utils'; +import { getUniqueItemsByKey } from '@app/searchV2/filtersV2/utils'; describe('getUniqueItemsByKey', () => { it('returns unique items based on a keyAccessor function', () => { diff --git a/datahub-web-react/src/app/searchV2/filtersV2/__tests__/getUniqueItemsByKeyFromArrrays.test.ts b/datahub-web-react/src/app/searchV2/filtersV2/__tests__/getUniqueItemsByKeyFromArrrays.test.ts index c7a99249f0..97d3894f3e 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/__tests__/getUniqueItemsByKeyFromArrrays.test.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/__tests__/getUniqueItemsByKeyFromArrrays.test.ts @@ -1,4 +1,4 @@ -import { getUniqueItemsByKeyFromArrrays } from '../utils'; +import { getUniqueItemsByKeyFromArrrays } from '@app/searchV2/filtersV2/utils'; describe('getUniqueItemsByKeyFromArrrays', () => { it('deduplicates items across multiple arrays based on a keyAccessor', () => { diff --git a/datahub-web-react/src/app/searchV2/filtersV2/__tests__/itemsToMap.test.ts b/datahub-web-react/src/app/searchV2/filtersV2/__tests__/itemsToMap.test.ts index ffb8f13dbb..4b2d0b719b 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/__tests__/itemsToMap.test.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/__tests__/itemsToMap.test.ts @@ -1,4 +1,4 @@ -import { itemsToMap } from '../utils'; +import { itemsToMap } from '@app/searchV2/filtersV2/utils'; describe('itemsToMap', () => { it('creates a map without a keyAccessor (uses item as key)', () => { diff --git a/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersContext.tsx b/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersContext.tsx index 850dd3e13f..febbad4ea7 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersContext.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersContext.tsx @@ -1,14 +1,15 @@ import React from 'react'; -import DefaultFiltersRenderer from '../defaults/DefaultFiltersRenderer'; + +import DefaultFiltersRenderer from '@app/searchV2/filtersV2/defaults/DefaultFiltersRenderer'; +import defaultFiltersRegistry from '@app/searchV2/filtersV2/defaults/defaultFiltersRegistry'; +import FiltersRegistry from '@app/searchV2/filtersV2/filtersRegistry/filtersRegistry'; import { AppliedFieldFilterUpdater, FieldName, FieldToAppliedFieldFiltersMap, FieldToFacetStateMap, FiltersRenderer, -} from '../types'; -import FiltersRegistry from '../filtersRegistry/filtersRegistry'; -import defaultFiltersRegistry from '../defaults/defaultFiltersRegistry'; +} from '@app/searchV2/filtersV2/types'; export type SearchFiltersContextType = { // Fields to show in filters diff --git a/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersProvider.tsx b/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersProvider.tsx index 63d278bd93..273ea930fb 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersProvider.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersProvider.tsx @@ -1,5 +1,9 @@ import React, { useEffect } from 'react'; -import DefaultFiltersRenderer from '../defaults/DefaultFiltersRenderer'; + +import SearchFiltersContext from '@app/searchV2/filtersV2/context/SearchFiltersContext'; +import DefaultFiltersRenderer from '@app/searchV2/filtersV2/defaults/DefaultFiltersRenderer'; +import defaultFiltersRegistry from '@app/searchV2/filtersV2/defaults/defaultFiltersRegistry'; +import FiltersRegistry from '@app/searchV2/filtersV2/filtersRegistry/filtersRegistry'; import { AppliedFieldFilterUpdater, FieldName, @@ -7,10 +11,7 @@ import { FieldToFacetStateMap, FiltersAppliedHandler, FiltersRenderer, -} from '../types'; -import SearchFiltersContext from './SearchFiltersContext'; -import FiltersRegistry from '../filtersRegistry/filtersRegistry'; -import defaultFiltersRegistry from '../defaults/defaultFiltersRegistry'; +} from '@app/searchV2/filtersV2/types'; export interface Props { fields: FieldName[]; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/context/index.ts b/datahub-web-react/src/app/searchV2/filtersV2/context/index.ts index fc9d2ca044..8931633ba3 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/context/index.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/context/index.ts @@ -1,5 +1,5 @@ -import SearchFiltersContext from './SearchFiltersContext'; -import useSearchFiltersContext from './useSearchFiltersContext'; -import SearchFiltersProvider from './SearchFiltersProvider'; +import SearchFiltersContext from '@app/searchV2/filtersV2/context/SearchFiltersContext'; +import SearchFiltersProvider from '@app/searchV2/filtersV2/context/SearchFiltersProvider'; +import useSearchFiltersContext from '@app/searchV2/filtersV2/context/useSearchFiltersContext'; export { SearchFiltersContext, useSearchFiltersContext, SearchFiltersProvider }; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/context/useAppliedFilters.ts b/datahub-web-react/src/app/searchV2/filtersV2/context/useAppliedFilters.ts index 9b07a69b50..e1f7589b6b 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/context/useAppliedFilters.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/context/useAppliedFilters.ts @@ -1,5 +1,6 @@ import { useCallback, useMemo, useState } from 'react'; -import { AppliedFieldFilterUpdater, FieldToAppliedFieldFiltersMap } from '../types'; + +import { AppliedFieldFilterUpdater, FieldToAppliedFieldFiltersMap } from '@app/searchV2/filtersV2/types'; export default function useAppliedFilters(defaultAppliedFilters?: FieldToAppliedFieldFiltersMap) { const [appliedFilters, setAppliedFilters] = useState( diff --git a/datahub-web-react/src/app/searchV2/filtersV2/context/useSearchFiltersContext.ts b/datahub-web-react/src/app/searchV2/filtersV2/context/useSearchFiltersContext.ts index c7e0f39f4f..7f57168f19 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/context/useSearchFiltersContext.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/context/useSearchFiltersContext.ts @@ -1,5 +1,6 @@ import { useContext } from 'react'; -import SearchFiltersContext from './SearchFiltersContext'; + +import SearchFiltersContext from '@app/searchV2/filtersV2/context/SearchFiltersContext'; export default function useSearchFiltersContext() { return useContext(SearchFiltersContext); diff --git a/datahub-web-react/src/app/searchV2/filtersV2/defaults/DefaultFacetsUpdater/DefaultFacetsUpdater.tsx b/datahub-web-react/src/app/searchV2/filtersV2/defaults/DefaultFacetsUpdater/DefaultFacetsUpdater.tsx index 5701b320c1..6421ed8c19 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/defaults/DefaultFacetsUpdater/DefaultFacetsUpdater.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/defaults/DefaultFacetsUpdater/DefaultFacetsUpdater.tsx @@ -1,7 +1,8 @@ import React, { useMemo } from 'react'; -import { useSearchFiltersContext } from '../../context'; -import { FieldName, FieldToFacetStateMap } from '../../types'; -import { FacetsUpdater } from './FacetsUpdater'; + +import { useSearchFiltersContext } from '@app/searchV2/filtersV2/context'; +import { FacetsUpdater } from '@app/searchV2/filtersV2/defaults/DefaultFacetsUpdater/FacetsUpdater'; +import { FieldName, FieldToFacetStateMap } from '@app/searchV2/filtersV2/types'; interface DynamicFacetsUpdaterProps { fieldNames: FieldName[]; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/defaults/DefaultFacetsUpdater/FacetsUpdater.tsx b/datahub-web-react/src/app/searchV2/filtersV2/defaults/DefaultFacetsUpdater/FacetsUpdater.tsx index 808b9294ad..d01d418d9c 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/defaults/DefaultFacetsUpdater/FacetsUpdater.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/defaults/DefaultFacetsUpdater/FacetsUpdater.tsx @@ -1,12 +1,13 @@ -import { useAggregateAcrossEntitiesLazyQuery } from '@src/graphql/search.generated'; -import { FacetMetadata } from '@src/types.generated'; import { useEffect, useMemo, useState } from 'react'; import { useDebounce } from 'react-use'; + +import { useSearchFiltersContext } from '@app/searchV2/filtersV2/context'; +import { FieldName, FieldToFacetStateMap } from '@app/searchV2/filtersV2/types'; +import { convertFiltersMapToFilters } from '@app/searchV2/filtersV2/utils'; +import { UnionType } from '@app/searchV2/utils/constants'; import { generateOrFilters } from '@src/app/searchV2/utils/generateOrFilters'; -import { UnionType } from '../../../utils/constants'; -import { useSearchFiltersContext } from '../../context'; -import { FieldName, FieldToFacetStateMap } from '../../types'; -import { convertFiltersMapToFilters } from '../../utils'; +import { useAggregateAcrossEntitiesLazyQuery } from '@src/graphql/search.generated'; +import { FacetMetadata } from '@src/types.generated'; const DEBOUNCE_MS = 100; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/defaults/DefaultFiltersRenderer.tsx b/datahub-web-react/src/app/searchV2/filtersV2/defaults/DefaultFiltersRenderer.tsx index 2c6842888a..013fcae954 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/defaults/DefaultFiltersRenderer.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/defaults/DefaultFiltersRenderer.tsx @@ -1,6 +1,7 @@ import React, { memo } from 'react'; import styled from 'styled-components'; -import { FiltersRendererProps } from '../types'; + +import { FiltersRendererProps } from '@app/searchV2/filtersV2/types'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/defaults/defaultFiltersRegistry.tsx b/datahub-web-react/src/app/searchV2/filtersV2/defaults/defaultFiltersRegistry.tsx index d7e7d0d264..8e466594ef 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/defaults/defaultFiltersRegistry.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/defaults/defaultFiltersRegistry.tsx @@ -1,12 +1,18 @@ +import { + DomainFilter, + EntityTypeFilter, + OwnerFilter, + PlatformEntityFilter, + TagFilter, +} from '@app/searchV2/filtersV2/filters'; +import FiltersRegistry from '@app/searchV2/filtersV2/filtersRegistry/filtersRegistry'; import { DOMAINS_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, OWNERS_FILTER_NAME, PLATFORM_FILTER_NAME, TAGS_FILTER_NAME, -} from '../../utils/constants'; -import FiltersRegistry from '../filtersRegistry/filtersRegistry'; -import { DomainFilter, EntityTypeFilter, OwnerFilter, PlatformEntityFilter, TagFilter } from '../filters'; +} from '@app/searchV2/utils/constants'; const defaultFiltersRegistry = new FiltersRegistry(); diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/BaseEntityFilter.tsx b/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/BaseEntityFilter.tsx index b2307e935e..09fbd9e60d 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/BaseEntityFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/BaseEntityFilter.tsx @@ -1,12 +1,13 @@ -import { Select } from '@src/alchemy-components'; -import { Entity, EntityType, FilterOperator } from '@src/types.generated'; import { debounce } from 'lodash'; import React, { useCallback, useState } from 'react'; -import { FilterComponentProps } from '../../types'; -import { DEBOUNCE_ON_SEARCH_TIMEOUT_MS } from '../constants'; -import useValues from '../hooks/useValues'; -import useOptions from './hooks/useOptions'; -import { BaseEntitySelectOption } from './types'; + +import useOptions from '@app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useOptions'; +import { BaseEntitySelectOption } from '@app/searchV2/filtersV2/filters/BaseEntityFilter/types'; +import { DEBOUNCE_ON_SEARCH_TIMEOUT_MS } from '@app/searchV2/filtersV2/filters/constants'; +import useValues from '@app/searchV2/filtersV2/filters/hooks/useValues'; +import { FilterComponentProps } from '@app/searchV2/filtersV2/types'; +import { Select } from '@src/alchemy-components'; +import { Entity, EntityType, FilterOperator } from '@src/types.generated'; interface BaseEntityFilterProps extends FilterComponentProps { filterName: string; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/components/EntityIconWithName.tsx b/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/components/EntityIconWithName.tsx index 03d05bfec8..4de5efd4db 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/components/EntityIconWithName.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/components/EntityIconWithName.tsx @@ -1,9 +1,10 @@ import React from 'react'; +import styled from 'styled-components'; + import { Text } from '@src/alchemy-components'; import { SingleEntityIcon } from '@src/app/searchV2/autoCompleteV2/components/icon/SingleEntityIcon'; import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; import { Entity } from '@src/types.generated'; -import styled from 'styled-components'; const Container = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useAutocompleteResults.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useAutocompleteResults.ts index c2b33df102..589e90d2c0 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useAutocompleteResults.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useAutocompleteResults.ts @@ -1,9 +1,10 @@ +import { useEffect, useState } from 'react'; + import { GetAutoCompleteMultipleResultsQuery, useGetAutoCompleteMultipleResultsLazyQuery, } from '@src/graphql/search.generated'; import { EntityType } from '@src/types.generated'; -import { useEffect, useState } from 'react'; const LIMIT_OF_SUGGESTIONS = 20; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useEntitiesToOptions.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useEntitiesToOptions.ts index c719c16578..dfde57b1e9 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useEntitiesToOptions.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useEntitiesToOptions.ts @@ -1,7 +1,8 @@ +import { useCallback } from 'react'; + +import { BaseEntitySelectOption } from '@app/searchV2/filtersV2/filters/BaseEntityFilter/types'; import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; import { Entity } from '@src/types.generated'; -import { useCallback } from 'react'; -import { BaseEntitySelectOption } from '../types'; export default function useConvertEntitiesToOptions() { const entityRegistry = useEntityRegistryV2(); diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useOptions.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useOptions.ts index 8a9df34a76..a14a314c8e 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useOptions.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useOptions.ts @@ -1,9 +1,10 @@ +import { useMemo } from 'react'; + +import useAutocompleteResults from '@app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useAutocompleteResults'; +import useConvertEntitiesToOptions from '@app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useEntitiesToOptions'; +import { BaseEntitySelectOption } from '@app/searchV2/filtersV2/filters/BaseEntityFilter/types'; import { FeildFacetState } from '@src/app/searchV2/filtersV2/types'; import { Entity, EntityType } from '@src/types.generated'; -import { useMemo } from 'react'; -import { BaseEntitySelectOption } from '../types'; -import useConvertEntitiesToOptions from './useEntitiesToOptions'; -import useAutocompleteResults from './useAutocompleteResults'; const mergeEntityArrays = (arrayA: Entity[], arrayB: Entity[]): Entity[] => { const urnsFromArrayB = arrayB.map((entity) => entity.urn); diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/DomainFilter.tsx b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/DomainFilter.tsx index 99b8afb550..c8ea50f950 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/DomainFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/DomainFilter.tsx @@ -1,16 +1,17 @@ +import { debounce } from 'lodash'; +import React, { useMemo, useState } from 'react'; + +import { EntityIconWithName } from '@app/searchV2/filtersV2/filters/BaseEntityFilter/components/EntityIconWithName'; +import useDomainsFromAggregations from '@app/searchV2/filtersV2/filters/DomainFilter/hooks/useDomainsFromAggregations'; +import useDomainsFromSuggestions from '@app/searchV2/filtersV2/filters/DomainFilter/hooks/useDomainsFromSuggestions'; +import useMergedDomains from '@app/searchV2/filtersV2/filters/DomainFilter/hooks/useMergedDomains'; +import useOptionsFromDomains from '@app/searchV2/filtersV2/filters/DomainFilter/hooks/useOptionsFromDomains'; +import { DEBOUNCE_ON_SEARCH_TIMEOUT_MS } from '@app/searchV2/filtersV2/filters/constants'; +import useValues from '@app/searchV2/filtersV2/filters/hooks/useValues'; +import { FilterComponentProps } from '@app/searchV2/filtersV2/types'; import { NestedSelect } from '@src/alchemy-components/components/Select/Nested/NestedSelect'; import { NestedSelectOption } from '@src/alchemy-components/components/Select/Nested/types'; import { Domain, EntityType, FilterOperator } from '@src/types.generated'; -import React, { useMemo, useState } from 'react'; -import { debounce } from 'lodash'; -import { FilterComponentProps } from '../../types'; -import { EntityIconWithName } from '../BaseEntityFilter/components/EntityIconWithName'; -import useValues from '../hooks/useValues'; -import useDomainsFromAggregations from './hooks/useDomainsFromAggregations'; -import useDomainsFromSuggestions from './hooks/useDomainsFromSuggestions'; -import useMergedDomains from './hooks/useMergedDomains'; -import useOptionsFromDomains from './hooks/useOptionsFromDomains'; -import { DEBOUNCE_ON_SEARCH_TIMEOUT_MS } from '../constants'; export default function DomainFilter({ fieldName, facetState, appliedFilters, onUpdate }: FilterComponentProps) { const [entities, setEntities] = useState([]); diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/__tests__/useDomainsFromAggregations.test.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/__tests__/useDomainsFromAggregations.test.ts index cce8bf54d3..421cc8c8c5 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/__tests__/useDomainsFromAggregations.test.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/__tests__/useDomainsFromAggregations.test.ts @@ -1,6 +1,7 @@ -import { EntityType } from '@src/types.generated'; import { renderHook } from '@testing-library/react-hooks'; -import useDomainsFromAggregations from '../useDomainsFromAggregations'; + +import useDomainsFromAggregations from '@app/searchV2/filtersV2/filters/DomainFilter/hooks/useDomainsFromAggregations'; +import { EntityType } from '@src/types.generated'; describe('useDomainsFromAggregations', () => { it('should return domains from aggregations', () => { diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/__tests__/useOptionsFromDomains.test.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/__tests__/useOptionsFromDomains.test.ts index 11e85cf4ab..217470b662 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/__tests__/useOptionsFromDomains.test.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/__tests__/useOptionsFromDomains.test.ts @@ -1,6 +1,7 @@ -import { Domain, EntityType } from '@src/types.generated'; import { renderHook } from '@testing-library/react-hooks'; -import useOptionsFromDomains from '../useOptionsFromDomains'; + +import useOptionsFromDomains from '@app/searchV2/filtersV2/filters/DomainFilter/hooks/useOptionsFromDomains'; +import { Domain, EntityType } from '@src/types.generated'; function getSampleDomain(urn: string, parents: Domain[] = []): Domain { return { diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useDomainsFromAggregations.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useDomainsFromAggregations.ts index feac936f72..05ae8234c6 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useDomainsFromAggregations.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useDomainsFromAggregations.ts @@ -1,6 +1,7 @@ -import { AggregationMetadata } from '@src/types.generated'; import { useMemo } from 'react'; + import { isDomain } from '@src/app/entityV2/domain/utils'; +import { AggregationMetadata } from '@src/types.generated'; export default function useDomainsFromAggregations(aggregations: Array | undefined) { return useMemo(() => { diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useDomainsFromSuggestions.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useDomainsFromSuggestions.ts index 59f1f3fa60..6fdf349c67 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useDomainsFromSuggestions.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useDomainsFromSuggestions.ts @@ -1,7 +1,8 @@ -import { EntityType } from '@src/types.generated'; import { useMemo } from 'react'; + +import useAutocompleteResults from '@app/searchV2/filtersV2/filters/BaseEntityFilter/hooks/useAutocompleteResults'; import { isDomain } from '@src/app/entityV2/domain/utils'; -import useAutocompleteResults from '../../BaseEntityFilter/hooks/useAutocompleteResults'; +import { EntityType } from '@src/types.generated'; const ENTITY_TYPES = [EntityType.Domain]; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useMergedDomains.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useMergedDomains.ts index 4c7aa6a099..d14029b220 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useMergedDomains.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useMergedDomains.ts @@ -1,7 +1,8 @@ -import { Domain } from '@src/types.generated'; import { useMemo } from 'react'; -import { getUniqueItemsByKeyFromArrrays } from '../../../utils'; -import { domainKeyAccessor } from '../utils'; + +import { domainKeyAccessor } from '@app/searchV2/filtersV2/filters/DomainFilter/utils'; +import { getUniqueItemsByKeyFromArrrays } from '@app/searchV2/filtersV2/utils'; +import { Domain } from '@src/types.generated'; export default function useMergedDomains( domainsFromAppliedFilters: Domain[], diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useOptionsFromDomains.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useOptionsFromDomains.ts index 6766f25b2b..538a280f05 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useOptionsFromDomains.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/hooks/useOptionsFromDomains.ts @@ -1,8 +1,9 @@ -import { Domain } from '@src/types.generated'; import { useMemo } from 'react'; + +import { domainKeyAccessor, extractParentDomains } from '@app/searchV2/filtersV2/filters/DomainFilter/utils'; +import { getUniqueItemsByKeyFromArrrays } from '@app/searchV2/filtersV2/utils'; import { NestedSelectOption } from '@src/alchemy-components/components/Select/Nested/types'; -import { domainKeyAccessor, extractParentDomains } from '../utils'; -import { getUniqueItemsByKeyFromArrrays } from '../../../utils'; +import { Domain } from '@src/types.generated'; export default function useOptionsFromDomains(domains: Domain[]): NestedSelectOption[] { return useMemo(() => { diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/utils.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/utils.ts index 94881011a6..7af60b5fae 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/utils.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/utils.ts @@ -1,7 +1,7 @@ +import { getUniqueItemsByKey } from '@app/searchV2/filtersV2/utils'; import { NestedSelectOption } from '@src/alchemy-components/components/Select/Nested/types'; import { isDomain } from '@src/app/entityV2/domain/utils'; import { Domain } from '@src/types.generated'; -import { getUniqueItemsByKey } from '../../utils'; export function domainKeyAccessor(domain: Domain) { return domain.urn; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/EntityTypeFilter/EntityTypeFilter.tsx b/datahub-web-react/src/app/searchV2/filtersV2/filters/EntityTypeFilter/EntityTypeFilter.tsx index 98b3b7b79d..a4f71df3e8 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/EntityTypeFilter/EntityTypeFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/EntityTypeFilter/EntityTypeFilter.tsx @@ -1,10 +1,11 @@ +import React, { useMemo } from 'react'; + +import useOptions from '@app/searchV2/filtersV2/filters/EntityTypeFilter/hooks/useOptions'; +import useValues from '@app/searchV2/filtersV2/filters/hooks/useValues'; +import { FilterComponentProps } from '@app/searchV2/filtersV2/types'; import { NestedSelect } from '@src/alchemy-components/components/Select/Nested/NestedSelect'; import { NestedSelectOption } from '@src/alchemy-components/components/Select/Nested/types'; import { FilterOperator } from '@src/types.generated'; -import React, { useMemo } from 'react'; -import { FilterComponentProps } from '../../types'; -import useValues from '../hooks/useValues'; -import useOptions from './hooks/useOptions'; export default function EntityTypeFilter({ fieldName, facetState, appliedFilters, onUpdate }: FilterComponentProps) { const values = useValues(appliedFilters); diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/EntityTypeFilter/hooks/useOptions.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/EntityTypeFilter/hooks/useOptions.ts index 7294395f4c..7e06e9f68f 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/EntityTypeFilter/hooks/useOptions.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/EntityTypeFilter/hooks/useOptions.ts @@ -1,10 +1,11 @@ +import { useMemo } from 'react'; + +import { EntityTypeOption } from '@app/searchV2/filtersV2/filters/EntityTypeFilter/types'; +import { getUniqueItemsByKeyFromArrrays } from '@app/searchV2/filtersV2/utils'; import { isEntityType } from '@src/app/entityV2/shared/utils'; import { FILTER_DELIMITER } from '@src/app/search/utils/constants'; import { FeildFacetState } from '@src/app/searchV2/filtersV2/types'; import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; -import { useMemo } from 'react'; -import { getUniqueItemsByKeyFromArrrays } from '../../../utils'; -import { EntityTypeOption } from '../types'; export default function useOptions(facetState: FeildFacetState | undefined, values: string[]) { const entityRegistry = useEntityRegistryV2(); diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/OwnerFilter/OwnerFilter.tsx b/datahub-web-react/src/app/searchV2/filtersV2/filters/OwnerFilter/OwnerFilter.tsx index 165c8bd718..f7a5104c83 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/OwnerFilter/OwnerFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/OwnerFilter/OwnerFilter.tsx @@ -1,11 +1,12 @@ -import { Text } from '@src/alchemy-components'; -import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; -import { CorpUser, Entity, EntityType } from '@src/types.generated'; import React, { useCallback } from 'react'; import styled from 'styled-components'; + +import BaseEntityFilter from '@app/searchV2/filtersV2/filters/BaseEntityFilter/BaseEntityFilter'; +import { FilterComponentProps } from '@app/searchV2/filtersV2/types'; +import { Text } from '@src/alchemy-components'; import EntityIcon from '@src/app/searchV2/autoCompleteV2/components/icon/EntityIcon'; -import { FilterComponentProps } from '../../types'; -import BaseEntityFilter from '../BaseEntityFilter/BaseEntityFilter'; +import { useEntityRegistryV2 } from '@src/app/useEntityRegistry'; +import { CorpUser, Entity, EntityType } from '@src/types.generated'; interface PlatformLabelProps { entity: Entity; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/PlatformFilter/PlatformFilter.tsx b/datahub-web-react/src/app/searchV2/filtersV2/filters/PlatformFilter/PlatformFilter.tsx index 7525d99d3d..000a2a905d 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/PlatformFilter/PlatformFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/PlatformFilter/PlatformFilter.tsx @@ -1,8 +1,9 @@ -import { Entity, EntityType } from '@src/types.generated'; import React, { useCallback } from 'react'; -import { FilterComponentProps } from '../../types'; -import BaseEntityFilter from '../BaseEntityFilter/BaseEntityFilter'; -import { EntityIconWithName } from '../BaseEntityFilter/components/EntityIconWithName'; + +import BaseEntityFilter from '@app/searchV2/filtersV2/filters/BaseEntityFilter/BaseEntityFilter'; +import { EntityIconWithName } from '@app/searchV2/filtersV2/filters/BaseEntityFilter/components/EntityIconWithName'; +import { FilterComponentProps } from '@app/searchV2/filtersV2/types'; +import { Entity, EntityType } from '@src/types.generated'; export default function PlatformEntityFilter(props: FilterComponentProps) { const renderEntity = useCallback((entity: Entity) => , []); diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/TagFilter/TagFilter.tsx b/datahub-web-react/src/app/searchV2/filtersV2/filters/TagFilter/TagFilter.tsx index cb386fa247..4bfd39e93b 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/TagFilter/TagFilter.tsx +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/TagFilter/TagFilter.tsx @@ -1,9 +1,10 @@ +import React, { useCallback } from 'react'; + +import BaseEntityFilter from '@app/searchV2/filtersV2/filters/BaseEntityFilter/BaseEntityFilter'; +import { FilterComponentProps } from '@app/searchV2/filtersV2/types'; import { isTag } from '@src/app/entityV2/tag/utils'; import TagLink from '@src/app/sharedV2/tags/TagLink'; import { Entity, EntityType } from '@src/types.generated'; -import React, { useCallback } from 'react'; -import { FilterComponentProps } from '../../types'; -import BaseEntityFilter from '../BaseEntityFilter/BaseEntityFilter'; interface PlatformLabelProps { entity: Entity; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/hooks/useValues.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/hooks/useValues.ts index a7f33a1513..fc7100668a 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/hooks/useValues.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/hooks/useValues.ts @@ -1,6 +1,7 @@ -import { AppliedFieldFilterValue } from '@src/app/searchV2/filtersV2/types'; import { useMemo } from 'react'; +import { AppliedFieldFilterValue } from '@src/app/searchV2/filtersV2/types'; + export default function useValues(appliedFilters: AppliedFieldFilterValue | undefined): string[] { const values = useMemo( () => diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/index.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/index.ts index fd69228432..6261e8d296 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filters/index.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/index.ts @@ -1,7 +1,7 @@ -import DomainFilter from './DomainFilter/DomainFilter'; -import EntityTypeFilter from './EntityTypeFilter/EntityTypeFilter'; -import OwnerFilter from './OwnerFilter/OwnerFilter'; -import PlatformEntityFilter from './PlatformFilter/PlatformFilter'; -import TagFilter from './TagFilter/TagFilter'; +import DomainFilter from '@app/searchV2/filtersV2/filters/DomainFilter/DomainFilter'; +import EntityTypeFilter from '@app/searchV2/filtersV2/filters/EntityTypeFilter/EntityTypeFilter'; +import OwnerFilter from '@app/searchV2/filtersV2/filters/OwnerFilter/OwnerFilter'; +import PlatformEntityFilter from '@app/searchV2/filtersV2/filters/PlatformFilter/PlatformFilter'; +import TagFilter from '@app/searchV2/filtersV2/filters/TagFilter/TagFilter'; export { PlatformEntityFilter, EntityTypeFilter, OwnerFilter, TagFilter, DomainFilter }; diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filtersRegistry/filtersRegistry.ts b/datahub-web-react/src/app/searchV2/filtersV2/filtersRegistry/filtersRegistry.ts index c28ae6568d..8354141e69 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/filtersRegistry/filtersRegistry.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/filtersRegistry/filtersRegistry.ts @@ -1,4 +1,4 @@ -import { FilterComponent, FieldName } from '../types'; +import { FieldName, FilterComponent } from '@app/searchV2/filtersV2/types'; export default class FiltersRegistry { registry: Map = new Map(); diff --git a/datahub-web-react/src/app/searchV2/filtersV2/types.ts b/datahub-web-react/src/app/searchV2/filtersV2/types.ts index d0cd60af64..685b65ca61 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/types.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/types.ts @@ -1,6 +1,7 @@ -import { FacetFilterInput, FacetMetadata } from '@src/types.generated'; import React from 'react'; +import { FacetFilterInput, FacetMetadata } from '@src/types.generated'; + export type FieldName = string; export type FacetsGetterResponse = { diff --git a/datahub-web-react/src/app/searchV2/filtersV2/utils.ts b/datahub-web-react/src/app/searchV2/filtersV2/utils.ts index e1e8a045c7..21b05adece 100644 --- a/datahub-web-react/src/app/searchV2/filtersV2/utils.ts +++ b/datahub-web-react/src/app/searchV2/filtersV2/utils.ts @@ -1,4 +1,4 @@ -import { FieldName, FieldToAppliedFieldFiltersMap } from './types'; +import { FieldName, FieldToAppliedFieldFiltersMap } from '@app/searchV2/filtersV2/types'; export function itemsToMap(items: Array, keyAccessor?: (item: T) => K | T) { const accessor = (item: T) => (keyAccessor ? keyAccessor(item) : item); diff --git a/datahub-web-react/src/app/searchV2/matches/GroupedMatch.tsx b/datahub-web-react/src/app/searchV2/matches/GroupedMatch.tsx index 401fe76205..c2d0706a4a 100644 --- a/datahub-web-react/src/app/searchV2/matches/GroupedMatch.tsx +++ b/datahub-web-react/src/app/searchV2/matches/GroupedMatch.tsx @@ -1,13 +1,12 @@ import React, { useState } from 'react'; - import styled from 'styled-components'; -import { MatchedField } from '../../../types.generated'; -import { useSearchQuery } from '../../search/context/SearchContext'; -import { useEntityRegistry } from '../../useEntityRegistry'; +import { useSearchQuery } from '@app/search/context/SearchContext'; +import { MatchesGroupedByFieldName } from '@app/searchV2/matches/constants'; +import { getDescriptionSlice, isDescriptionField, isHighlightableEntityField } from '@app/searchV2/matches/utils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; -import { MatchesGroupedByFieldName } from './constants'; -import { getDescriptionSlice, isDescriptionField, isHighlightableEntityField } from './utils'; +import { MatchedField } from '@types'; const FieldWrapper = styled.div<{ $isClickable: boolean; $color?: string }>` border-radius: 50px; diff --git a/datahub-web-react/src/app/searchV2/matches/MatchContextContainer.tsx b/datahub-web-react/src/app/searchV2/matches/MatchContextContainer.tsx index cc1d858363..9f84113b23 100644 --- a/datahub-web-react/src/app/searchV2/matches/MatchContextContainer.tsx +++ b/datahub-web-react/src/app/searchV2/matches/MatchContextContainer.tsx @@ -1,11 +1,12 @@ import React from 'react'; import styled from 'styled-components'; -import { SEARCH_COLORS } from '../../entityV2/shared/constants'; -import MatchContext, { PreviewSection } from '../../shared/MatchesContext'; -import { SearchCardSlideoutContent } from '../searchSlideout/SearchCardSlideoutContent'; -import { CombinedSearchResult } from '../utils/combineSiblingsInSearchResults'; -import HorizontalScroller from '../../sharedV2/carousel/HorizontalScroller'; -import { useSearchContext } from '../../search/context/SearchContext'; + +import { SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { useSearchContext } from '@app/search/context/SearchContext'; +import { SearchCardSlideoutContent } from '@app/searchV2/searchSlideout/SearchCardSlideoutContent'; +import { CombinedSearchResult } from '@app/searchV2/utils/combineSiblingsInSearchResults'; +import MatchContext, { PreviewSection } from '@app/shared/MatchesContext'; +import HorizontalScroller from '@app/sharedV2/carousel/HorizontalScroller'; const MATCHES_CONTAINER_HEIGHT = 52; diff --git a/datahub-web-react/src/app/searchV2/matches/MatchedFieldList.tsx b/datahub-web-react/src/app/searchV2/matches/MatchedFieldList.tsx index c87aa1e649..e8beff9fbb 100644 --- a/datahub-web-react/src/app/searchV2/matches/MatchedFieldList.tsx +++ b/datahub-web-react/src/app/searchV2/matches/MatchedFieldList.tsx @@ -1,20 +1,19 @@ -import React from 'react'; - -import { Typography } from 'antd'; import { Tooltip } from '@components'; -import styled from 'styled-components'; +import { Typography } from 'antd'; import * as QueryString from 'query-string'; +import React from 'react'; import { useHistory } from 'react-router'; +import styled from 'styled-components'; -import { useEntityType, useMatchedFieldsForList, useSearchResult } from '../../search/context/SearchResultContext'; -import { MatchedField } from '../../../types.generated'; -import { useSearchContext } from '../../search/context/SearchContext'; -import { useEntityRegistry } from '../../useEntityRegistry'; +import { SchemaFilterType } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows'; +import { useSearchContext } from '@app/search/context/SearchContext'; +import { useEntityType, useMatchedFieldsForList, useSearchResult } from '@app/search/context/SearchResultContext'; +import { GroupedMatch } from '@app/searchV2/matches/GroupedMatch'; +import { getColumnsTabUrlPath, getMatchedFieldLabel } from '@app/searchV2/matches/utils'; +import { pluralize } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; -import { getColumnsTabUrlPath, getMatchedFieldLabel } from './utils'; -import { pluralize } from '../../shared/textUtil'; -import { SchemaFilterType } from '../../entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows'; -import { GroupedMatch } from './GroupedMatch'; +import { MatchedField } from '@types'; const MatchesContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/matches/SearchTextHighlighter.tsx b/datahub-web-react/src/app/searchV2/matches/SearchTextHighlighter.tsx index 5fdf4f6e54..42f9687258 100644 --- a/datahub-web-react/src/app/searchV2/matches/SearchTextHighlighter.tsx +++ b/datahub-web-react/src/app/searchV2/matches/SearchTextHighlighter.tsx @@ -1,10 +1,11 @@ import React from 'react'; import Highlight from 'react-highlighter'; import styled from 'styled-components'; -import { MatchedFieldName } from './constants'; -import { useAppConfig } from '../../useAppConfig'; -import { useMatchedFieldsByGroup } from '../../search/context/SearchResultContext'; -import { useSearchQuery } from '../../search/context/SearchContext'; + +import { useSearchQuery } from '@app/search/context/SearchContext'; +import { useMatchedFieldsByGroup } from '@app/search/context/SearchResultContext'; +import { MatchedFieldName } from '@app/searchV2/matches/constants'; +import { useAppConfig } from '@app/useAppConfig'; type Props = { field: MatchedFieldName; diff --git a/datahub-web-react/src/app/searchV2/matches/constants.ts b/datahub-web-react/src/app/searchV2/matches/constants.ts index 25ca82eef9..9892ba33fe 100644 --- a/datahub-web-react/src/app/searchV2/matches/constants.ts +++ b/datahub-web-react/src/app/searchV2/matches/constants.ts @@ -1,4 +1,4 @@ -import { EntityType, MatchedField } from '../../../types.generated'; +import { EntityType, MatchedField } from '@types'; export type MatchedFieldName = | 'urn' diff --git a/datahub-web-react/src/app/searchV2/matches/matchedFieldPathsRenderer.tsx b/datahub-web-react/src/app/searchV2/matches/matchedFieldPathsRenderer.tsx index e14b9d6107..4504520c34 100644 --- a/datahub-web-react/src/app/searchV2/matches/matchedFieldPathsRenderer.tsx +++ b/datahub-web-react/src/app/searchV2/matches/matchedFieldPathsRenderer.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { MatchedField } from '../../../types.generated'; -import { downgradeV2FieldPath } from '../../entityV2/dataset/profile/schema/utils/utils'; +import { downgradeV2FieldPath } from '@app/entityV2/dataset/profile/schema/utils/utils'; + +import { MatchedField } from '@types'; export const matchedFieldPathsRenderer = (matchedField: MatchedField) => { return matchedField?.name === 'fieldPaths' ? <>{downgradeV2FieldPath(matchedField.value)} : null; diff --git a/datahub-web-react/src/app/searchV2/matches/matchedInputFieldRenderer.tsx b/datahub-web-react/src/app/searchV2/matches/matchedInputFieldRenderer.tsx index 25634c9e8b..2a30484613 100644 --- a/datahub-web-react/src/app/searchV2/matches/matchedInputFieldRenderer.tsx +++ b/datahub-web-react/src/app/searchV2/matches/matchedInputFieldRenderer.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { Chart, Dashboard, EntityType, GlossaryTerm, MatchedField } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Chart, Dashboard, EntityType, GlossaryTerm, MatchedField } from '@types'; const LABEL_INDEX_NAME = 'fieldLabels'; const TYPE_PROPERTY_KEY_NAME = 'type'; diff --git a/datahub-web-react/src/app/searchV2/matches/utils.test.ts b/datahub-web-react/src/app/searchV2/matches/utils.test.ts index bc1843b44f..1d445fe133 100644 --- a/datahub-web-react/src/app/searchV2/matches/utils.test.ts +++ b/datahub-web-react/src/app/searchV2/matches/utils.test.ts @@ -1,4 +1,3 @@ -import { EntityType } from '../../../types.generated'; import { getDescriptionSlice, getGroupedFieldName, @@ -10,7 +9,9 @@ import { isDescriptionField, isHighlightableEntityField, shouldShowInMatchedFieldList, -} from './utils'; +} from '@app/searchV2/matches/utils'; + +import { EntityType } from '@types'; const mapping = new Map(); mapping.set('fieldPaths', 'column'); diff --git a/datahub-web-react/src/app/searchV2/matches/utils.ts b/datahub-web-react/src/app/searchV2/matches/utils.ts index e7796bddff..b9b4bddb93 100644 --- a/datahub-web-react/src/app/searchV2/matches/utils.ts +++ b/datahub-web-react/src/app/searchV2/matches/utils.ts @@ -1,12 +1,14 @@ import * as QueryString from 'query-string'; -import { EntityType, MatchedField } from '../../../types.generated'; + import { HIGHLIGHTABLE_ENTITY_TYPES, MATCHED_FIELD_CONFIG, MatchedFieldConfig, MatchedFieldName, MatchesGroupedByFieldName, -} from './constants'; +} from '@app/searchV2/matches/constants'; + +import { EntityType, MatchedField } from '@types'; const getFieldConfigsByEntityType = (entityType: EntityType | undefined): Array => { return entityType && entityType in MATCHED_FIELD_CONFIG diff --git a/datahub-web-react/src/app/searchV2/recommendation/FilterPill.tsx b/datahub-web-react/src/app/searchV2/recommendation/FilterPill.tsx index f4e564e388..b71ffb4d71 100644 --- a/datahub-web-react/src/app/searchV2/recommendation/FilterPill.tsx +++ b/datahub-web-react/src/app/searchV2/recommendation/FilterPill.tsx @@ -1,8 +1,9 @@ +import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; -import { RecommendedFilter } from './types'; -import { getFilterColor } from './utils'; + +import { RecommendedFilter } from '@app/searchV2/recommendation/types'; +import { getFilterColor } from '@app/searchV2/recommendation/utils'; const Pill = styled.div<{ color: string }>` border-radius: 20px; diff --git a/datahub-web-react/src/app/searchV2/recommendation/RecommendedFilters.tsx b/datahub-web-react/src/app/searchV2/recommendation/RecommendedFilters.tsx index 0e9ab9b363..3f169e0378 100644 --- a/datahub-web-react/src/app/searchV2/recommendation/RecommendedFilters.tsx +++ b/datahub-web-react/src/app/searchV2/recommendation/RecommendedFilters.tsx @@ -1,9 +1,11 @@ import React from 'react'; import styled from 'styled-components'; -import { FacetFilterInput, FacetMetadata, FilterOperator } from '../../../types.generated'; -import { FilterPill } from './FilterPill'; -import { useGetRecommendedFilters } from './useGetRecommendedFilters'; -import { RecommendedFilter } from './types'; + +import { FilterPill } from '@app/searchV2/recommendation/FilterPill'; +import { RecommendedFilter } from '@app/searchV2/recommendation/types'; +import { useGetRecommendedFilters } from '@app/searchV2/recommendation/useGetRecommendedFilters'; + +import { FacetFilterInput, FacetMetadata, FilterOperator } from '@types'; const FilterPills = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/recommendation/useGetRecommendedFilters.tsx b/datahub-web-react/src/app/searchV2/recommendation/useGetRecommendedFilters.tsx index 45427eb0f0..3dfe588094 100644 --- a/datahub-web-react/src/app/searchV2/recommendation/useGetRecommendedFilters.tsx +++ b/datahub-web-react/src/app/searchV2/recommendation/useGetRecommendedFilters.tsx @@ -1,15 +1,16 @@ -import { AggregationMetadata, FacetFilterInput, FacetMetadata } from '../../../types.generated'; -import { EntityRegistry } from '../../../entityRegistryContext'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { getFilterIconAndLabel } from '../filters/utils'; import { DOMAINS_FILTER_NAME, ENTITY_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_FIELDS, PLATFORM_FILTER_NAME, -} from '../../search/utils/constants'; -import { RecommendedFilter } from './types'; -import { ENTITY_SUB_TYPE_FILTER_NAME, FILTER_DELIMITER } from '../utils/constants'; +} from '@app/search/utils/constants'; +import { getFilterIconAndLabel } from '@app/searchV2/filters/utils'; +import { RecommendedFilter } from '@app/searchV2/recommendation/types'; +import { ENTITY_SUB_TYPE_FILTER_NAME, FILTER_DELIMITER } from '@app/searchV2/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { AggregationMetadata, FacetFilterInput, FacetMetadata } from '@types'; // Maximum number of recommended filters to show. const MAX_FILTERS = 6; diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/SearchBarV2.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/SearchBarV2.tsx index 1e1fcee98c..14c9f840ac 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/SearchBarV2.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/SearchBarV2.tsx @@ -1,36 +1,37 @@ import { CloseCircleFilled, SearchOutlined } from '@ant-design/icons'; -import { colors, radius, spacing, transition } from '@src/alchemy-components'; -import { AutoComplete } from '@src/alchemy-components/components/AutoComplete'; import { Input, Skeleton } from 'antd'; import { debounce } from 'lodash'; import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { useHistory } from 'react-router'; import styled from 'styled-components/macro'; -import analytics, { Event, EventType } from '../../analytics'; -import { ANTD_GRAY_V2 } from '../../entity/shared/constants'; -import { getEntityPath } from '../../entity/shared/containers/profile/utils'; -import { REDESIGN_COLORS } from '../../entityV2/shared/constants'; -import { ViewSelect } from '../../entityV2/view/select/ViewSelect'; -import { V2_SEARCH_BAR_VIEWS } from '../../onboarding/configV2/HomePageOnboardingConfig'; -import { useAppConfig, useIsShowSeparateSiblingsEnabled } from '../../useAppConfig'; -import { CommandK } from '../CommandK'; -import useAppliedFilters from '../filtersV2/context/useAppliedFilters'; -import filterSearchQuery from '../utils/filterSearchQuery'; -import AutocompleteFooter from './components/AutocompleteFooter'; -import AutocompletePlaceholder from './components/AutocompletePlaceholder'; -import Filters from './components/Filters'; + +import analytics, { Event, EventType } from '@app/analytics'; +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { getEntityPath } from '@app/entity/shared/containers/profile/utils'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { ViewSelect } from '@app/entityV2/view/select/ViewSelect'; +import { V2_SEARCH_BAR_VIEWS } from '@app/onboarding/configV2/HomePageOnboardingConfig'; +import { CommandK } from '@app/searchV2/CommandK'; +import { SearchBarProps } from '@app/searchV2/SearchBar'; +import useAppliedFilters from '@app/searchV2/filtersV2/context/useAppliedFilters'; +import AutocompleteFooter from '@app/searchV2/searchBarV2/components/AutocompleteFooter'; +import AutocompletePlaceholder from '@app/searchV2/searchBarV2/components/AutocompletePlaceholder'; +import Filters from '@app/searchV2/searchBarV2/components/Filters'; import { AUTOCOMPLETE_DROPDOWN_ALIGN_WITH_NEW_NAV_BAR, DEBOUNCE_ON_SEARCH_TIMEOUT_MS, EXACT_AUTOCOMPLETE_OPTION_TYPE, RELEVANCE_QUERY_OPTION_TYPE, -} from './constants'; -import useAutocompleteSuggestionsOptions from './hooks/useAutocompleteSuggestionsOptions'; -import useFocusElementByCommandK from './hooks/useFocusSearchBarByCommandK'; -import useRecentlySearchedQueriesOptions from './hooks/useRecentlySearchedQueriesOptions'; -import useRecentlyViewedEntitiesOptions from './hooks/useRecentlyViewedEntitiesOptions'; -import useViewAllResultsOptions from './hooks/useViewAllResultsOptions'; -import { SearchBarProps } from '../SearchBar'; +} from '@app/searchV2/searchBarV2/constants'; +import useAutocompleteSuggestionsOptions from '@app/searchV2/searchBarV2/hooks/useAutocompleteSuggestionsOptions'; +import useFocusElementByCommandK from '@app/searchV2/searchBarV2/hooks/useFocusSearchBarByCommandK'; +import useRecentlySearchedQueriesOptions from '@app/searchV2/searchBarV2/hooks/useRecentlySearchedQueriesOptions'; +import useRecentlyViewedEntitiesOptions from '@app/searchV2/searchBarV2/hooks/useRecentlyViewedEntitiesOptions'; +import useViewAllResultsOptions from '@app/searchV2/searchBarV2/hooks/useViewAllResultsOptions'; +import filterSearchQuery from '@app/searchV2/utils/filterSearchQuery'; +import { useAppConfig, useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig'; +import { colors, radius, spacing, transition } from '@src/alchemy-components'; +import { AutoComplete } from '@src/alchemy-components/components/AutoComplete'; const BOX_SHADOW = `0px -3px 12px 0px rgba(236, 240, 248, 0.5) inset, 0px 3px 12px 0px rgba(255, 255, 255, 0.5) inset, diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/components/AutocompleteFooter.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/components/AutocompleteFooter.tsx index fc431e9aa5..60df7adb9a 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/components/AutocompleteFooter.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/components/AutocompleteFooter.tsx @@ -1,8 +1,9 @@ -import React from 'react'; -import { colors, Text } from '@src/alchemy-components'; import { ArrowDown, ArrowElbowDownLeft, ArrowUp } from 'phosphor-react'; +import React from 'react'; import styled from 'styled-components'; -import KeyIcon from './KeyIcon'; + +import KeyIcon from '@app/searchV2/searchBarV2/components/KeyIcon'; +import { Text, colors } from '@src/alchemy-components'; const Container = styled.div` position: sticky; diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/components/AutocompletePlaceholder.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/components/AutocompletePlaceholder.tsx index ead448269f..57334f08a6 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/components/AutocompletePlaceholder.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/components/AutocompletePlaceholder.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import NoResultsFoundPlaceholder from './NoResultsFoundPlaceholder'; -import NoSearchingPlaceholder from './NoSearchingPlaceholder'; + +import NoResultsFoundPlaceholder from '@app/searchV2/searchBarV2/components/NoResultsFoundPlaceholder'; +import NoSearchingPlaceholder from '@app/searchV2/searchBarV2/components/NoSearchingPlaceholder'; interface Props { isSearching?: boolean; diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/components/Filters.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/components/Filters.tsx index 40295ecd22..4f572bf1e4 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/components/Filters.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/components/Filters.tsx @@ -1,15 +1,20 @@ -import styled from 'styled-components'; import React, { memo } from 'react'; -import SearchFilters from '../../filtersV2/SearchFilters'; -import { AppliedFieldFilterUpdater, FieldToAppliedFieldFiltersMap, FiltersRendererProps } from '../../filtersV2/types'; +import styled from 'styled-components'; + +import SearchFilters from '@app/searchV2/filtersV2/SearchFilters'; +import DefaultFiltersRenderer from '@app/searchV2/filtersV2/defaults/DefaultFiltersRenderer'; +import { + AppliedFieldFilterUpdater, + FieldToAppliedFieldFiltersMap, + FiltersRendererProps, +} from '@app/searchV2/filtersV2/types'; import { DOMAINS_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, OWNERS_FILTER_NAME, PLATFORM_FILTER_NAME, TAGS_FILTER_NAME, -} from '../../utils/constants'; -import DefaultFiltersRenderer from '../../filtersV2/defaults/DefaultFiltersRenderer'; +} from '@app/searchV2/utils/constants'; const FILTER_FIELDS = [ PLATFORM_FILTER_NAME, diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/components/KeyIcon.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/components/KeyIcon.tsx index 7c0f8affed..04e0eb9409 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/components/KeyIcon.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/components/KeyIcon.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { Icon } from '@phosphor-icons/react'; -import { colors } from '@src/alchemy-components'; +import React from 'react'; import styled from 'styled-components'; +import { colors } from '@src/alchemy-components'; + const IconContainer = styled.div` height: 24px; width: 32px; diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/components/NoResultsFoundPlaceholder.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/components/NoResultsFoundPlaceholder.tsx index a81d5cf238..a382c565b9 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/components/NoResultsFoundPlaceholder.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/components/NoResultsFoundPlaceholder.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { Button, Text } from '@src/alchemy-components'; import styled from 'styled-components'; +import { Button, Text } from '@src/alchemy-components'; + const Container = styled.div` display: flex; flex-direction: column; diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/components/NoSearchingPlaceholder.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/components/NoSearchingPlaceholder.tsx index 2ad7c37bd1..9b07d1bef1 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/components/NoSearchingPlaceholder.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/components/NoSearchingPlaceholder.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { Text } from '@src/alchemy-components'; import styled from 'styled-components'; +import { Text } from '@src/alchemy-components'; + const Container = styled.div` display: flex; flex-direction: column; diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/components/RecentSearch.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/components/RecentSearch.tsx index 416ca91360..ece1a967c3 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/components/RecentSearch.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/components/RecentSearch.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { MagnifyingGlass } from '@phosphor-icons/react'; +import React from 'react'; +import styled from 'styled-components/macro'; + import { Text } from '@src/alchemy-components'; import colors from '@src/alchemy-components/theme/foundations/colors'; -import styled from 'styled-components/macro'; const RecommendedOptionWrapper = styled.div` margin-left: 0; diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/components/SectionHeader.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/components/SectionHeader.tsx index 955aae4e5e..9bf919dc8f 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/components/SectionHeader.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/components/SectionHeader.tsx @@ -1,4 +1,5 @@ import React from 'react'; + import { Text } from '@src/alchemy-components'; interface Props { diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/components/ViewAllResults.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/components/ViewAllResults.tsx index 8d1562f8e9..9f0e0dfc0e 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/components/ViewAllResults.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/components/ViewAllResults.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import { ArrowElbowDownLeft, MagnifyingGlass } from '@phosphor-icons/react'; -import { colors, Text } from '@src/alchemy-components'; +import React from 'react'; import styled from 'styled-components/macro'; -import KeyIcon from './KeyIcon'; + +import KeyIcon from '@app/searchV2/searchBarV2/components/KeyIcon'; +import { Text, colors } from '@src/alchemy-components'; const LeftInternalContainer = styled.span` display: flex; diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useAutocompleteSuggestionsOptions.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useAutocompleteSuggestionsOptions.tsx index c59c890791..6f238c4cb9 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useAutocompleteSuggestionsOptions.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useAutocompleteSuggestionsOptions.tsx @@ -1,9 +1,10 @@ +import React, { useMemo } from 'react'; + +import AutoCompleteEntityItem from '@app/searchV2/autoCompleteV2/AutoCompleteEntityItem'; +import SectionHeader from '@app/searchV2/searchBarV2/components/SectionHeader'; +import { combineSiblingsInAutoComplete } from '@app/searchV2/utils/combineSiblingsInAutoComplete'; import { Loader } from '@src/alchemy-components'; import { AutoCompleteResultForEntity } from '@src/types.generated'; -import React, { useMemo } from 'react'; -import SectionHeader from '../components/SectionHeader'; -import { combineSiblingsInAutoComplete } from '../../utils/combineSiblingsInAutoComplete'; -import AutoCompleteEntityItem from '../../autoCompleteV2/AutoCompleteEntityItem'; export default function useAutocompleteSuggestionsOptions( suggestions: AutoCompleteResultForEntity[], diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useRecentlySearchedQueries.ts b/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useRecentlySearchedQueries.ts index b1544db4e5..f37a45e5f3 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useRecentlySearchedQueries.ts +++ b/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useRecentlySearchedQueries.ts @@ -1,8 +1,9 @@ +import { useMemo } from 'react'; + import { useUserContext } from '@src/app/context/useUserContext'; import { RECOMMENDATION_MODULE_ID_RECENT_SEARCHES } from '@src/app/entityV2/shared/constants'; import { useListRecommendationsQuery } from '@src/graphql/recommendations.generated'; import { ScenarioType } from '@src/types.generated'; -import { useMemo } from 'react'; export default function useRecentlySearchedQueries(skip?: boolean) { const { user, loaded } = useUserContext(); diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useRecentlySearchedQueriesOptions.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useRecentlySearchedQueriesOptions.tsx index a372b28ef0..73b3937bb9 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useRecentlySearchedQueriesOptions.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useRecentlySearchedQueriesOptions.tsx @@ -1,8 +1,9 @@ import React, { useMemo } from 'react'; -import useRecentlySearchedQueries from './useRecentlySearchedQueries'; -import SectionHeader from '../components/SectionHeader'; -import RecentSearch from '../components/RecentSearch'; -import { RELEVANCE_QUERY_OPTION_TYPE } from '../constants'; + +import RecentSearch from '@app/searchV2/searchBarV2/components/RecentSearch'; +import SectionHeader from '@app/searchV2/searchBarV2/components/SectionHeader'; +import { RELEVANCE_QUERY_OPTION_TYPE } from '@app/searchV2/searchBarV2/constants'; +import useRecentlySearchedQueries from '@app/searchV2/searchBarV2/hooks/useRecentlySearchedQueries'; export default function useRecentlySearchedQueriesOptions() { const { recentlySearchedQueries } = useRecentlySearchedQueries(); diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useRecentlyViewedEntitiesOptions.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useRecentlyViewedEntitiesOptions.tsx index 44e2057029..f6877e3d33 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useRecentlyViewedEntitiesOptions.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useRecentlyViewedEntitiesOptions.tsx @@ -1,7 +1,8 @@ import React, { useMemo } from 'react'; -import SectionHeader from '../components/SectionHeader'; -import useRecentlyViewedEntities from './useRecentlyViewedEntities'; -import AutoCompleteEntityItem from '../../autoCompleteV2/AutoCompleteEntityItem'; + +import AutoCompleteEntityItem from '@app/searchV2/autoCompleteV2/AutoCompleteEntityItem'; +import SectionHeader from '@app/searchV2/searchBarV2/components/SectionHeader'; +import useRecentlyViewedEntities from '@app/searchV2/searchBarV2/hooks/useRecentlyViewedEntities'; export default function useRecentlyViewedEntitiesOptions() { const { entities: recentlyViewedEntities } = useRecentlyViewedEntities(); diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useViewAllResultsOptions.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useViewAllResultsOptions.tsx index 5f66093f9c..4f69bcf00c 100644 --- a/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useViewAllResultsOptions.tsx +++ b/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useViewAllResultsOptions.tsx @@ -1,7 +1,8 @@ import React, { useMemo } from 'react'; -import { EXACT_SEARCH_PREFIX } from '../../utils/constants'; -import ViewAllResults from '../components/ViewAllResults'; -import { EXACT_AUTOCOMPLETE_OPTION_TYPE } from '../constants'; + +import ViewAllResults from '@app/searchV2/searchBarV2/components/ViewAllResults'; +import { EXACT_AUTOCOMPLETE_OPTION_TYPE } from '@app/searchV2/searchBarV2/constants'; +import { EXACT_SEARCH_PREFIX } from '@app/searchV2/utils/constants'; export default function useViewAllResultsOptions(query: string, shouldShow?: boolean) { return useMemo(() => { diff --git a/datahub-web-react/src/app/searchV2/searchSlideout/SearchCardSlideoutContent.tsx b/datahub-web-react/src/app/searchV2/searchSlideout/SearchCardSlideoutContent.tsx index e1912cded7..b00e9513b9 100644 --- a/datahub-web-react/src/app/searchV2/searchSlideout/SearchCardSlideoutContent.tsx +++ b/datahub-web-react/src/app/searchV2/searchSlideout/SearchCardSlideoutContent.tsx @@ -1,13 +1,13 @@ import React, { useEffect, useState } from 'react'; - import styled from 'styled-components'; -import { ExpandedOwner } from '../../entity/shared/components/styled/ExpandedOwner/ExpandedOwner'; -import { PreviewSection } from '../../shared/MatchesContext'; -import TagTermGroup from '../../sharedV2/tags/TagTermGroup'; -import { useEntityRegistryV2 } from '../../useEntityRegistry'; -import { CombinedSearchResult } from '../utils/combineSiblingsInSearchResults'; -import EntityPaths from '../../previewV2/EntityPaths/EntityPaths'; -import { useSearchContext } from '../../search/context/SearchContext'; + +import { ExpandedOwner } from '@app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner'; +import EntityPaths from '@app/previewV2/EntityPaths/EntityPaths'; +import { useSearchContext } from '@app/search/context/SearchContext'; +import { CombinedSearchResult } from '@app/searchV2/utils/combineSiblingsInSearchResults'; +import { PreviewSection } from '@app/shared/MatchesContext'; +import TagTermGroup from '@app/sharedV2/tags/TagTermGroup'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; type Props = { item?: CombinedSearchResult | null; diff --git a/datahub-web-react/src/app/searchV2/sidebar/BrowseContext.tsx b/datahub-web-react/src/app/searchV2/sidebar/BrowseContext.tsx index 7556a6da37..31174dd353 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/BrowseContext.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/BrowseContext.tsx @@ -1,24 +1,20 @@ import React, { ReactNode, createContext, useContext, useMemo } from 'react'; -import { - AggregationMetadata, - BrowseResultGroupV2, - EntityType, - FacetFilterInput, - FilterOperator, -} from '../../../types.generated'; -import { createBrowseV2SearchFilter } from '../filters/utils'; + +import { createBrowseV2SearchFilter } from '@app/searchV2/filters/utils'; +import { useHasFilterValue, useOnChangeFilters, useSelectedFilters } from '@app/searchV2/sidebar/SidebarContext'; +import { getEntitySubtypeFiltersForEntity } from '@app/searchV2/sidebar/browseContextUtils'; +import { BrowseMode } from '@app/searchV2/sidebar/types'; +import { useIsPlatformBrowseV2 } from '@app/searchV2/useSearchAndBrowseVersion'; +import { applyFacetFilterOverrides } from '@app/searchV2/utils/applyFilterOverrides'; import { BROWSE_PATH_V2_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME, -} from '../utils/constants'; -import { useHasFilterValue, useOnChangeFilters, useSelectedFilters } from './SidebarContext'; -import { applyFacetFilterOverrides } from '../utils/applyFilterOverrides'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { BrowseMode } from './types'; -import { getEntitySubtypeFiltersForEntity } from './browseContextUtils'; -import { useIsPlatformBrowseV2 } from '../useSearchAndBrowseVersion'; +} from '@app/searchV2/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { AggregationMetadata, BrowseResultGroupV2, EntityType, FacetFilterInput, FilterOperator } from '@types'; type BrowseContextValue = { entityAggregation?: AggregationMetadata; diff --git a/datahub-web-react/src/app/searchV2/sidebar/BrowseNode.tsx b/datahub-web-react/src/app/searchV2/sidebar/BrowseNode.tsx index 9f55538a73..635ff6722d 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/BrowseNode.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/BrowseNode.tsx @@ -2,9 +2,8 @@ import { FolderOutlined } from '@ant-design/icons'; import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { EntityType } from '../../../types.generated'; -import { formatNumber } from '../../shared/formatNumber'; -import useToggle from '../../shared/useToggle'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; import { BrowseProvider, useBrowseDisplayName, @@ -15,13 +14,16 @@ import { useMaybeEnvironmentAggregation, useOnSelectBrowsePath, usePlatformAggregation, -} from './BrowseContext'; -import EntityLink from './EntityLink'; -import ExpandableNode from './ExpandableNode'; -import SidebarLoadingError from './SidebarLoadingError'; -import useBrowsePagination from './useBrowsePagination'; -import useSidebarAnalytics from './useSidebarAnalytics'; -import { ANTD_GRAY } from '../../entity/shared/constants'; +} from '@app/searchV2/sidebar/BrowseContext'; +import EntityLink from '@app/searchV2/sidebar/EntityLink'; +import ExpandableNode from '@app/searchV2/sidebar/ExpandableNode'; +import SidebarLoadingError from '@app/searchV2/sidebar/SidebarLoadingError'; +import useBrowsePagination from '@app/searchV2/sidebar/useBrowsePagination'; +import useSidebarAnalytics from '@app/searchV2/sidebar/useSidebarAnalytics'; +import { formatNumber } from '@app/shared/formatNumber'; +import useToggle from '@app/shared/useToggle'; + +import { EntityType } from '@types'; const FolderStyled = styled(FolderOutlined)` font-size: 16px; diff --git a/datahub-web-react/src/app/searchV2/sidebar/BrowseSidebar.tsx b/datahub-web-react/src/app/searchV2/sidebar/BrowseSidebar.tsx index 68d55c8049..c1cf1f70fc 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/BrowseSidebar.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/BrowseSidebar.tsx @@ -1,13 +1,14 @@ +import { Button, colors } from '@components'; +import { Divider, Typography } from 'antd'; import React, { useCallback, useState } from 'react'; import styled from 'styled-components'; -import { Divider, Typography } from 'antd'; -import { colors, Button } from '@components'; + +import { SEARCH_RESULTS_BROWSE_SIDEBAR_ID } from '@app/onboarding/config/SearchOnboardingConfig'; +import { useIsPlatformBrowseMode } from '@app/searchV2/sidebar/BrowseContext'; +import EntityBrowse from '@app/searchV2/sidebar/EntityBrowse'; +import PlatformBrowse from '@app/searchV2/sidebar/PlatformBrowse'; import { ProfileSidebarResizer } from '@src/app/entityV2/shared/containers/profile/sidebar/ProfileSidebarResizer'; import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import EntityBrowse from './EntityBrowse'; -import PlatformBrowse from './PlatformBrowse'; -import { useIsPlatformBrowseMode } from './BrowseContext'; -import { SEARCH_RESULTS_BROWSE_SIDEBAR_ID } from '../../onboarding/config/SearchOnboardingConfig'; const PLATFORM_BROWSE_TRANSITION_MS = 200; export const MAX_BROWSER_WIDTH = 500; @@ -36,7 +37,8 @@ const StyledEntitySidebarContainer = styled.div<{ } return props.isCollapsed ? '12px' : '12px 0 12px 12px'; }}; - transition: max-width ${PLATFORM_BROWSE_TRANSITION_MS}ms ease-in-out, + transition: + max-width ${PLATFORM_BROWSE_TRANSITION_MS}ms ease-in-out, min-width ${PLATFORM_BROWSE_TRANSITION_MS}ms ease-in-out; background-color: #ffffff; diff --git a/datahub-web-react/src/app/searchV2/sidebar/EntityBrowse.tsx b/datahub-web-react/src/app/searchV2/sidebar/EntityBrowse.tsx index 961e761fd4..09ca590142 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/EntityBrowse.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/EntityBrowse.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import EntityNode from './EntityNode'; -import { BrowseProvider } from './BrowseContext'; -import SidebarLoadingError from './SidebarLoadingError'; -import useSidebarEntities from './useSidebarEntities'; + +import { BrowseProvider } from '@app/searchV2/sidebar/BrowseContext'; +import EntityNode from '@app/searchV2/sidebar/EntityNode'; +import SidebarLoadingError from '@app/searchV2/sidebar/SidebarLoadingError'; +import useSidebarEntities from '@app/searchV2/sidebar/useSidebarEntities'; type Props = { visible: boolean; diff --git a/datahub-web-react/src/app/searchV2/sidebar/EntityLink.tsx b/datahub-web-react/src/app/searchV2/sidebar/EntityLink.tsx index afed5e5f1d..7b26785f34 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/EntityLink.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/EntityLink.tsx @@ -1,15 +1,18 @@ +import Icon from '@ant-design/icons/lib/components/Icon'; import { Tooltip } from '@components'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import Icon from '@ant-design/icons/lib/components/Icon'; -import { useBrowseDisplayName, useIsBrowsePathSelected } from './BrowseContext'; -import ExpandableNode from './ExpandableNode'; -import ExternalLink from '../../../images/link-out.svg?react'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { Entity, Maybe } from '../../../types.generated'; -import useSidebarAnalytics from './useSidebarAnalytics'; -import { BrowseV2EntityLinkClickEvent } from '../../analytics'; + +import { BrowseV2EntityLinkClickEvent } from '@app/analytics'; +import { useBrowseDisplayName, useIsBrowsePathSelected } from '@app/searchV2/sidebar/BrowseContext'; +import ExpandableNode from '@app/searchV2/sidebar/ExpandableNode'; +import useSidebarAnalytics from '@app/searchV2/sidebar/useSidebarAnalytics'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, Maybe } from '@types'; + +import ExternalLink from '@images/link-out.svg?react'; const Linkicon = styled(Icon)<{ $isSelected: boolean }>` && { diff --git a/datahub-web-react/src/app/searchV2/sidebar/EntityNode.tsx b/datahub-web-react/src/app/searchV2/sidebar/EntityNode.tsx index 50358a2f22..f3b89f4660 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/EntityNode.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/EntityNode.tsx @@ -1,20 +1,26 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { IconStyleType } from '../../entity/Entity'; -import { formatNumber } from '../../shared/formatNumber'; -import ExpandableNode from './ExpandableNode'; -import EnvironmentNode from './EnvironmentNode'; -import useAggregationsQuery from './useAggregationsQuery'; -import { MAX_COUNT_VAL, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '../utils/constants'; -import PlatformNode from './PlatformNode'; -import SidebarLoadingError from './SidebarLoadingError'; -import useToggle from '../../shared/useToggle'; -import { BrowseProvider, useEntityAggregation, useEntityType, useIsEntitySelected } from './BrowseContext'; -import useSidebarAnalytics from './useSidebarAnalytics'; -import { useHasFilterField } from './SidebarContext'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { + BrowseProvider, + useEntityAggregation, + useEntityType, + useIsEntitySelected, +} from '@app/searchV2/sidebar/BrowseContext'; +import EnvironmentNode from '@app/searchV2/sidebar/EnvironmentNode'; +import ExpandableNode from '@app/searchV2/sidebar/ExpandableNode'; +import PlatformNode from '@app/searchV2/sidebar/PlatformNode'; +import { useHasFilterField } from '@app/searchV2/sidebar/SidebarContext'; +import SidebarLoadingError from '@app/searchV2/sidebar/SidebarLoadingError'; +import useAggregationsQuery from '@app/searchV2/sidebar/useAggregationsQuery'; +import useSidebarAnalytics from '@app/searchV2/sidebar/useSidebarAnalytics'; +import { MAX_COUNT_VAL, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { formatNumber } from '@app/shared/formatNumber'; +import useToggle from '@app/shared/useToggle'; +import { useEntityRegistry } from '@app/useEntityRegistry'; const Count = styled(Typography.Text)` font-size: 12px; diff --git a/datahub-web-react/src/app/searchV2/sidebar/EnvironmentNode.tsx b/datahub-web-react/src/app/searchV2/sidebar/EnvironmentNode.tsx index 1673f49769..6a4d61c63b 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/EnvironmentNode.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/EnvironmentNode.tsx @@ -1,20 +1,21 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { formatNumber } from '../../shared/formatNumber'; -import ExpandableNode from './ExpandableNode'; -import useAggregationsQuery from './useAggregationsQuery'; -import { PLATFORM_FILTER_NAME } from '../utils/constants'; -import PlatformNode from './PlatformNode'; -import SidebarLoadingError from './SidebarLoadingError'; -import useToggle from '../../shared/useToggle'; + import { BrowseProvider, useEntityAggregation, useEnvironmentAggregation, useIsEnvironmentSelected, -} from './BrowseContext'; -import useSidebarAnalytics from './useSidebarAnalytics'; +} from '@app/searchV2/sidebar/BrowseContext'; +import ExpandableNode from '@app/searchV2/sidebar/ExpandableNode'; +import PlatformNode from '@app/searchV2/sidebar/PlatformNode'; +import SidebarLoadingError from '@app/searchV2/sidebar/SidebarLoadingError'; +import useAggregationsQuery from '@app/searchV2/sidebar/useAggregationsQuery'; +import useSidebarAnalytics from '@app/searchV2/sidebar/useSidebarAnalytics'; +import { PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { formatNumber } from '@app/shared/formatNumber'; +import useToggle from '@app/shared/useToggle'; const Count = styled(Typography.Text)` font-size: 12px; diff --git a/datahub-web-react/src/app/searchV2/sidebar/ExpandableNode.tsx b/datahub-web-react/src/app/searchV2/sidebar/ExpandableNode.tsx index 8f99d134f7..be420217e3 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/ExpandableNode.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/ExpandableNode.tsx @@ -1,11 +1,12 @@ import { UpCircleOutlined } from '@ant-design/icons'; +import ChevronRightIcon from '@mui/icons-material/ChevronRight'; import { Typography } from 'antd'; import React, { MouseEventHandler, ReactNode } from 'react'; -import ChevronRightIcon from '@mui/icons-material/ChevronRight'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { SEARCH_COLORS } from '../../entityV2/shared/constants'; -import { BaseButton, BodyContainer, BodyGridExpander, RotatingButton } from '../../shared/components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { BaseButton, BodyContainer, BodyGridExpander, RotatingButton } from '@app/shared/components'; const Layout = styled.div` margin-left: 8px; diff --git a/datahub-web-react/src/app/searchV2/sidebar/PlatformBrowse.tsx b/datahub-web-react/src/app/searchV2/sidebar/PlatformBrowse.tsx index c65affe572..8e486f5fed 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/PlatformBrowse.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/PlatformBrowse.tsx @@ -1,10 +1,11 @@ +import { Divider, Empty } from 'antd'; import React, { useEffect } from 'react'; import styled from 'styled-components'; -import { Divider, Empty } from 'antd'; -import { BrowseProvider } from './BrowseContext'; -import SidebarLoadingError from './SidebarLoadingError'; -import useSidebarPlatforms from './useSidebarPlatforms'; -import PlatformNode from './PlatformNode'; + +import { BrowseProvider } from '@app/searchV2/sidebar/BrowseContext'; +import PlatformNode from '@app/searchV2/sidebar/PlatformNode'; +import SidebarLoadingError from '@app/searchV2/sidebar/SidebarLoadingError'; +import useSidebarPlatforms from '@app/searchV2/sidebar/useSidebarPlatforms'; const BrowsePlatformIcons = styled.div` display: flex; diff --git a/datahub-web-react/src/app/searchV2/sidebar/PlatformNode.tsx b/datahub-web-react/src/app/searchV2/sidebar/PlatformNode.tsx index d52fe14b4c..6ab8d8ce7b 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/PlatformNode.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/PlatformNode.tsx @@ -1,30 +1,32 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; -import { REDESIGN_COLORS } from '../../entityV2/shared/constants'; -import { formatNumber } from '../../shared/formatNumber'; -import ExpandableNode from './ExpandableNode'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { getFilterIconAndLabel } from '../filters/utils'; -import { BROWSE_PATH_V2_FILTER_NAME, PLATFORM_FILTER_NAME } from '../utils/constants'; -import useBrowsePagination from './useBrowsePagination'; -import BrowseNode from './BrowseNode'; -import SidebarLoadingError from './SidebarLoadingError'; -import useToggle from '../../shared/useToggle'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getFilterIconAndLabel } from '@app/searchV2/filters/utils'; import { BrowseProvider, useEntityAggregation, + useIsPlatformBrowseMode, useIsPlatformSelected, useMaybeEnvironmentAggregation, useOnSelectBrowsePath, usePlatformAggregation, - useIsPlatformBrowseMode, -} from './BrowseContext'; -import useSidebarAnalytics from './useSidebarAnalytics'; -import { useHasFilterField } from './SidebarContext'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import PlatformIcon from '../../sharedV2/icons/PlatformIcon'; -import { DataPlatform } from '../../../types.generated'; +} from '@app/searchV2/sidebar/BrowseContext'; +import BrowseNode from '@app/searchV2/sidebar/BrowseNode'; +import ExpandableNode from '@app/searchV2/sidebar/ExpandableNode'; +import { useHasFilterField } from '@app/searchV2/sidebar/SidebarContext'; +import SidebarLoadingError from '@app/searchV2/sidebar/SidebarLoadingError'; +import useBrowsePagination from '@app/searchV2/sidebar/useBrowsePagination'; +import useSidebarAnalytics from '@app/searchV2/sidebar/useSidebarAnalytics'; +import { BROWSE_PATH_V2_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { formatNumber } from '@app/shared/formatNumber'; +import useToggle from '@app/shared/useToggle'; +import PlatformIcon from '@app/sharedV2/icons/PlatformIcon'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DataPlatform } from '@types'; const Count = styled(Typography.Text)<{ $isPlatformBrowse: boolean; isOpen: boolean }>` font-size: 10px; diff --git a/datahub-web-react/src/app/searchV2/sidebar/SidebarContext.tsx b/datahub-web-react/src/app/searchV2/sidebar/SidebarContext.tsx index 924f954b5f..4c7ba30077 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/SidebarContext.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/SidebarContext.tsx @@ -1,5 +1,6 @@ import React, { ReactNode, createContext, useContext } from 'react'; -import { FacetFilterInput, FilterOperator } from '../../../types.generated'; + +import { FacetFilterInput, FilterOperator } from '@types'; type SidebarContextValue = { selectedFilters: Array; diff --git a/datahub-web-react/src/app/searchV2/sidebar/SidebarLoadingError.tsx b/datahub-web-react/src/app/searchV2/sidebar/SidebarLoadingError.tsx index 412332ce5f..6b762b03a5 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/SidebarLoadingError.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/SidebarLoadingError.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { Alert, Button } from 'antd'; +import React from 'react'; import styled from 'styled-components'; const StyledAlert = styled(Alert)` diff --git a/datahub-web-react/src/app/searchV2/sidebar/__tests__/browseContextUtils.test.ts b/datahub-web-react/src/app/searchV2/sidebar/__tests__/browseContextUtils.test.ts index efabe1b137..6a94214e2a 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/__tests__/browseContextUtils.test.ts +++ b/datahub-web-react/src/app/searchV2/sidebar/__tests__/browseContextUtils.test.ts @@ -1,5 +1,5 @@ -import { ENTITY_SUB_TYPE_FILTER_NAME, TAGS_FILTER_NAME } from '../../utils/constants'; -import { getEntitySubtypeFiltersForEntity } from '../browseContextUtils'; +import { getEntitySubtypeFiltersForEntity } from '@app/searchV2/sidebar/browseContextUtils'; +import { ENTITY_SUB_TYPE_FILTER_NAME, TAGS_FILTER_NAME } from '@app/searchV2/utils/constants'; describe('browseContextUtils', () => { it('should remove any different entity types from the filter and keep anything related to our given entityType', () => { diff --git a/datahub-web-react/src/app/searchV2/sidebar/browseContextUtils.ts b/datahub-web-react/src/app/searchV2/sidebar/browseContextUtils.ts index 1fcda04063..ea41aba742 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/browseContextUtils.ts +++ b/datahub-web-react/src/app/searchV2/sidebar/browseContextUtils.ts @@ -1,5 +1,6 @@ -import { FacetFilterInput } from '../../../types.generated'; -import { ENTITY_SUB_TYPE_FILTER_NAME } from '../utils/constants'; +import { ENTITY_SUB_TYPE_FILTER_NAME } from '@app/searchV2/utils/constants'; + +import { FacetFilterInput } from '@types'; export function getEntitySubtypeFiltersForEntity(entityType: string, existingFilters: FacetFilterInput[]) { return existingFilters diff --git a/datahub-web-react/src/app/searchV2/sidebar/index.tsx b/datahub-web-react/src/app/searchV2/sidebar/index.tsx index 552f7a89a4..e0c7ce147d 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/index.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/index.tsx @@ -1,3 +1,3 @@ -import BrowseSidebar from './BrowseSidebar'; +import BrowseSidebar from '@app/searchV2/sidebar/BrowseSidebar'; export default BrowseSidebar; diff --git a/datahub-web-react/src/app/searchV2/sidebar/types.ts b/datahub-web-react/src/app/searchV2/sidebar/types.ts index 91abd9d295..eaff0fff56 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/types.ts +++ b/datahub-web-react/src/app/searchV2/sidebar/types.ts @@ -1,4 +1,4 @@ -import useGetSearchQueryInputs from '../useGetSearchQueryInputs'; +import useGetSearchQueryInputs from '@app/searchV2/useGetSearchQueryInputs'; export type SidebarFilters = Pick< ReturnType, diff --git a/datahub-web-react/src/app/searchV2/sidebar/useAggregationsQuery.ts b/datahub-web-react/src/app/searchV2/sidebar/useAggregationsQuery.ts index 47e8ba33e2..0f0be3ac65 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/useAggregationsQuery.ts +++ b/datahub-web-react/src/app/searchV2/sidebar/useAggregationsQuery.ts @@ -1,10 +1,11 @@ -import { useAggregateAcrossEntitiesQuery } from '../../../graphql/search.generated'; -import { EntityType } from '../../../types.generated'; -import { GLOSSARY_ENTITY_TYPES } from '../../entity/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '../utils/constants'; -import { MAX_AGGREGATION_VALUES } from './constants'; -import { useSidebarFilters } from './useSidebarFilters'; +import { GLOSSARY_ENTITY_TYPES } from '@app/entity/shared/constants'; +import { MAX_AGGREGATION_VALUES } from '@app/searchV2/sidebar/constants'; +import { useSidebarFilters } from '@app/searchV2/sidebar/useSidebarFilters'; +import { ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useAggregateAcrossEntitiesQuery } from '@graphql/search.generated'; +import { EntityType } from '@types'; type Props = { facets: string[]; @@ -44,7 +45,7 @@ const useAggregationsQuery = ({ facets, excludeFilters = false, skip }: Props) = }; // This approach of falling back to previousData is needed to avoid a full re-mount of the sidebar entities - const data = error ? null : newData ?? previousData; + const data = error ? null : (newData ?? previousData); const loaded = !!data || !!error; const entityAggregations = data?.aggregateAcrossEntities?.facets diff --git a/datahub-web-react/src/app/searchV2/sidebar/useBrowsePagination.tsx b/datahub-web-react/src/app/searchV2/sidebar/useBrowsePagination.tsx index cadecdb318..879b083161 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/useBrowsePagination.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/useBrowsePagination.tsx @@ -1,9 +1,11 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; -import useIntersect from '../../shared/useIntersect'; -import { BROWSE_LOAD_MORE_MARGIN, BROWSE_PAGE_SIZE } from './constants'; -import { GetBrowseResultsV2Query, useGetBrowseResultsV2LazyQuery } from '../../../graphql/browseV2.generated'; -import { useSidebarFilters } from './useSidebarFilters'; -import { useBrowsePath, useEntityType } from './BrowseContext'; + +import { useBrowsePath, useEntityType } from '@app/searchV2/sidebar/BrowseContext'; +import { BROWSE_LOAD_MORE_MARGIN, BROWSE_PAGE_SIZE } from '@app/searchV2/sidebar/constants'; +import { useSidebarFilters } from '@app/searchV2/sidebar/useSidebarFilters'; +import useIntersect from '@app/shared/useIntersect'; + +import { GetBrowseResultsV2Query, useGetBrowseResultsV2LazyQuery } from '@graphql/browseV2.generated'; type Props = { skip: boolean; diff --git a/datahub-web-react/src/app/searchV2/sidebar/useSidebarAnalytics.ts b/datahub-web-react/src/app/searchV2/sidebar/useSidebarAnalytics.ts index 5e0b7e9c26..4ae35096c7 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/useSidebarAnalytics.ts +++ b/datahub-web-react/src/app/searchV2/sidebar/useSidebarAnalytics.ts @@ -1,18 +1,19 @@ -import { EntityType } from '../../../types.generated'; import { BrowseV2EntityLinkClickEvent, BrowseV2SelectNodeEvent, BrowseV2ToggleNodeEvent, EventType, -} from '../../analytics'; -import analytics from '../../analytics/analytics'; -import { useEntityRegistry } from '../../useEntityRegistry'; +} from '@app/analytics'; +import analytics from '@app/analytics/analytics'; import { useBrowsePathLength, useEntityType, useMaybeEnvironmentAggregation, useMaybePlatformAggregation, -} from './BrowseContext'; +} from '@app/searchV2/sidebar/BrowseContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; const useSidebarAnalytics = () => { const registry = useEntityRegistry(); diff --git a/datahub-web-react/src/app/searchV2/sidebar/useSidebarEntities.ts b/datahub-web-react/src/app/searchV2/sidebar/useSidebarEntities.ts index 08150a671a..2fbf58225e 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/useSidebarEntities.ts +++ b/datahub-web-react/src/app/searchV2/sidebar/useSidebarEntities.ts @@ -1,6 +1,7 @@ import { useMemo } from 'react'; -import { ENTITY_FILTER_NAME } from '../utils/constants'; -import useAggregationsQuery from './useAggregationsQuery'; + +import useAggregationsQuery from '@app/searchV2/sidebar/useAggregationsQuery'; +import { ENTITY_FILTER_NAME } from '@app/searchV2/utils/constants'; type Props = { skip: boolean; diff --git a/datahub-web-react/src/app/searchV2/sidebar/useSidebarFilters.ts b/datahub-web-react/src/app/searchV2/sidebar/useSidebarFilters.ts index 17aecc5edf..4e58571699 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/useSidebarFilters.ts +++ b/datahub-web-react/src/app/searchV2/sidebar/useSidebarFilters.ts @@ -1,10 +1,15 @@ import isEqual from 'lodash/isEqual'; import { useEffect, useMemo, useState } from 'react'; -import useGetSearchQueryInputs from '../useGetSearchQueryInputs'; -import { ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '../utils/constants'; -import { useMaybeEntityType, useMaybeEnvironmentAggregation, useMaybePlatformAggregation } from './BrowseContext'; -import { applyOrFilterOverrides } from '../utils/applyFilterOverrides'; -import { SidebarFilters } from './types'; + +import { + useMaybeEntityType, + useMaybeEnvironmentAggregation, + useMaybePlatformAggregation, +} from '@app/searchV2/sidebar/BrowseContext'; +import { SidebarFilters } from '@app/searchV2/sidebar/types'; +import useGetSearchQueryInputs from '@app/searchV2/useGetSearchQueryInputs'; +import { applyOrFilterOverrides } from '@app/searchV2/utils/applyFilterOverrides'; +import { ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants'; export const useSidebarFilters = (): SidebarFilters => { const entityType = useMaybeEntityType(); diff --git a/datahub-web-react/src/app/searchV2/sidebar/useSidebarPlatforms.tsx b/datahub-web-react/src/app/searchV2/sidebar/useSidebarPlatforms.tsx index 30795701da..dcedd657ef 100644 --- a/datahub-web-react/src/app/searchV2/sidebar/useSidebarPlatforms.tsx +++ b/datahub-web-react/src/app/searchV2/sidebar/useSidebarPlatforms.tsx @@ -1,6 +1,7 @@ import { useMemo } from 'react'; -import { PLATFORM_FILTER_NAME } from '../utils/constants'; -import useAggregationsQuery from './useAggregationsQuery'; + +import useAggregationsQuery from '@app/searchV2/sidebar/useAggregationsQuery'; +import { PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants'; type Props = { skip: boolean; diff --git a/datahub-web-react/src/app/searchV2/sorting/SearchSortSelect.tsx b/datahub-web-react/src/app/searchV2/sorting/SearchSortSelect.tsx index 5414105500..2acb3d74c3 100644 --- a/datahub-web-react/src/app/searchV2/sorting/SearchSortSelect.tsx +++ b/datahub-web-react/src/app/searchV2/sorting/SearchSortSelect.tsx @@ -1,11 +1,12 @@ -import React from 'react'; import { CaretDownFilled } from '@ant-design/icons'; -import { Select } from 'antd'; import { Tooltip } from '@components'; +import { Select } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { DEFAULT_SORT_OPTION } from '../context/constants'; -import useGetSortOptions from './useGetSortOptions'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DEFAULT_SORT_OPTION } from '@app/searchV2/context/constants'; +import useGetSortOptions from '@app/searchV2/sorting/useGetSortOptions'; const SelectWrapper = styled.span` display: inline-flex; diff --git a/datahub-web-react/src/app/searchV2/sorting/useGetSortOptions.tsx b/datahub-web-react/src/app/searchV2/sorting/useGetSortOptions.tsx index edeb31fda8..5a5b59ac80 100644 --- a/datahub-web-react/src/app/searchV2/sorting/useGetSortOptions.tsx +++ b/datahub-web-react/src/app/searchV2/sorting/useGetSortOptions.tsx @@ -1,4 +1,4 @@ -import { SORT_OPTIONS } from '../context/constants'; +import { SORT_OPTIONS } from '@app/searchV2/context/constants'; export default function useGetSortOptions() { // TODO: Add a new endpoint showSortFields() that passes the list of potential sort fields, and verifies diff --git a/datahub-web-react/src/app/searchV2/sorting/useSortInput.ts b/datahub-web-react/src/app/searchV2/sorting/useSortInput.ts index 69ba53d60a..2526043025 100644 --- a/datahub-web-react/src/app/searchV2/sorting/useSortInput.ts +++ b/datahub-web-react/src/app/searchV2/sorting/useSortInput.ts @@ -1,5 +1,5 @@ -import { RELEVANCE } from '../context/constants'; -import useGetSortOptions from './useGetSortOptions'; +import { RELEVANCE } from '@app/searchV2/context/constants'; +import useGetSortOptions from '@app/searchV2/sorting/useGetSortOptions'; export default function useSortInput(selectedSortOption: string | undefined) { const sortOptions = useGetSortOptions(); diff --git a/datahub-web-react/src/app/searchV2/suggestions/SearchQuerySugggester.tsx b/datahub-web-react/src/app/searchV2/suggestions/SearchQuerySugggester.tsx index 4f14b8ed34..69cd436da4 100644 --- a/datahub-web-react/src/app/searchV2/suggestions/SearchQuerySugggester.tsx +++ b/datahub-web-react/src/app/searchV2/suggestions/SearchQuerySugggester.tsx @@ -1,9 +1,11 @@ -import styled from 'styled-components'; import React from 'react'; import { useHistory } from 'react-router'; -import { SearchSuggestion } from '../../../types.generated'; -import { navigateToSearchUrl } from '../utils/navigateToSearchUrl'; -import { ANTD_GRAY_V2 } from '../../entity/shared/constants'; +import styled from 'styled-components'; + +import { ANTD_GRAY_V2 } from '@app/entity/shared/constants'; +import { navigateToSearchUrl } from '@app/searchV2/utils/navigateToSearchUrl'; + +import { SearchSuggestion } from '@types'; const TextWrapper = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/searchV2/useAdvancedSearchSelectFilters.tsx b/datahub-web-react/src/app/searchV2/useAdvancedSearchSelectFilters.tsx index 886d83cf5c..184c5a6af6 100644 --- a/datahub-web-react/src/app/searchV2/useAdvancedSearchSelectFilters.tsx +++ b/datahub-web-react/src/app/searchV2/useAdvancedSearchSelectFilters.tsx @@ -1,6 +1,8 @@ import { useState } from 'react'; -import { FacetFilterInput, FilterOperator } from '../../types.generated'; -import { TEXT_FIELDS } from './utils/constants'; + +import { TEXT_FIELDS } from '@app/searchV2/utils/constants'; + +import { FacetFilterInput, FilterOperator } from '@types'; interface Props { selectedFilters: FacetFilterInput[]; diff --git a/datahub-web-react/src/app/searchV2/useGetSearchQueryInputs.ts b/datahub-web-react/src/app/searchV2/useGetSearchQueryInputs.ts index 81657a3ce5..2b340e8ad6 100644 --- a/datahub-web-react/src/app/searchV2/useGetSearchQueryInputs.ts +++ b/datahub-web-react/src/app/searchV2/useGetSearchQueryInputs.ts @@ -1,13 +1,15 @@ import * as QueryString from 'query-string'; -import { useLocation } from 'react-router'; import { useMemo } from 'react'; -import { FacetFilterInput, EntityType } from '../../types.generated'; -import { ENTITY_FILTER_NAME, UnionType } from './utils/constants'; -import { useUserContext } from '../context/useUserContext'; -import useFilters from './utils/useFilters'; -import { generateOrFilters } from './utils/generateOrFilters'; -import useSortInput from './sorting/useSortInput'; -import { useSelectedSortOption } from '../search/context/SearchContext'; +import { useLocation } from 'react-router'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useSelectedSortOption } from '@app/search/context/SearchContext'; +import useSortInput from '@app/searchV2/sorting/useSortInput'; +import { ENTITY_FILTER_NAME, UnionType } from '@app/searchV2/utils/constants'; +import { generateOrFilters } from '@app/searchV2/utils/generateOrFilters'; +import useFilters from '@app/searchV2/utils/useFilters'; + +import { EntityType, FacetFilterInput } from '@types'; export default function useGetSearchQueryInputs(excludedFilterFields?: Array) { const userContext = useUserContext(); diff --git a/datahub-web-react/src/app/searchV2/useSearchAndBrowseVersion.ts b/datahub-web-react/src/app/searchV2/useSearchAndBrowseVersion.ts index bd7db84f51..0245b8a8dc 100644 --- a/datahub-web-react/src/app/searchV2/useSearchAndBrowseVersion.ts +++ b/datahub-web-react/src/app/searchV2/useSearchAndBrowseVersion.ts @@ -1,4 +1,4 @@ -import { useAppConfig } from '../useAppConfig'; +import { useAppConfig } from '@app/useAppConfig'; const useSearchAndBrowseVersion = () => { const appConfig = useAppConfig(); diff --git a/datahub-web-react/src/app/searchV2/useSearchViewAll.ts b/datahub-web-react/src/app/searchV2/useSearchViewAll.ts index 9c6eb563a2..8bd85df15e 100644 --- a/datahub-web-react/src/app/searchV2/useSearchViewAll.ts +++ b/datahub-web-react/src/app/searchV2/useSearchViewAll.ts @@ -1,8 +1,9 @@ -import { useQuickFiltersContext } from '@src/providers/QuickFiltersContext'; import { useCallback } from 'react'; import { useHistory } from 'react-router'; -import analytics, { EventType } from '../analytics'; -import { navigateToSearchUrl } from './utils/navigateToSearchUrl'; + +import analytics, { EventType } from '@app/analytics'; +import { navigateToSearchUrl } from '@app/searchV2/utils/navigateToSearchUrl'; +import { useQuickFiltersContext } from '@src/providers/QuickFiltersContext'; export default function useSearchViewAll() { const history = useHistory(); diff --git a/datahub-web-react/src/app/searchV2/useToggleSidebar.ts b/datahub-web-react/src/app/searchV2/useToggleSidebar.ts index dfe3f68f6c..c7f692343e 100644 --- a/datahub-web-react/src/app/searchV2/useToggleSidebar.ts +++ b/datahub-web-react/src/app/searchV2/useToggleSidebar.ts @@ -1,7 +1,7 @@ -import { EventType } from '../analytics'; -import analytics from '../analytics/analytics'; -import { useUserContext } from '../context/useUserContext'; -import useToggle from '../shared/useToggle'; +import { EventType } from '@app/analytics'; +import analytics from '@app/analytics/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import useToggle from '@app/shared/useToggle'; const useToggleSidebar = () => { const { localState, updateLocalState } = useUserContext(); diff --git a/datahub-web-react/src/app/searchV2/utils/__tests__/applyFilterOverrides.test.ts b/datahub-web-react/src/app/searchV2/utils/__tests__/applyFilterOverrides.test.ts index 1baf4c3248..83581f49d8 100644 --- a/datahub-web-react/src/app/searchV2/utils/__tests__/applyFilterOverrides.test.ts +++ b/datahub-web-react/src/app/searchV2/utils/__tests__/applyFilterOverrides.test.ts @@ -1,6 +1,11 @@ -import { applyFacetFilterOverrides, applyOrFilterOverrides } from '../applyFilterOverrides'; -import { CONTAINER_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME, UnionType } from '../constants'; -import { generateOrFilters } from '../generateOrFilters'; +import { applyFacetFilterOverrides, applyOrFilterOverrides } from '@app/searchV2/utils/applyFilterOverrides'; +import { + CONTAINER_FILTER_NAME, + ORIGIN_FILTER_NAME, + PLATFORM_FILTER_NAME, + UnionType, +} from '@app/searchV2/utils/constants'; +import { generateOrFilters } from '@app/searchV2/utils/generateOrFilters'; describe('applyFacetFilterOverrides', () => { it('should concatenate overrides to an empty list', () => { diff --git a/datahub-web-react/src/app/searchV2/utils/__tests__/filterUtils.test.ts b/datahub-web-react/src/app/searchV2/utils/__tests__/filterUtils.test.ts index b32adfe30e..0edd997f2e 100644 --- a/datahub-web-react/src/app/searchV2/utils/__tests__/filterUtils.test.ts +++ b/datahub-web-react/src/app/searchV2/utils/__tests__/filterUtils.test.ts @@ -1,5 +1,5 @@ -import { QuickFilterField } from '../../autoComplete/quickFilters/utils'; -import { getAutoCompleteInputFromQuickFilter, getFiltersWithQuickFilter } from '../filterUtils'; +import { QuickFilterField } from '@app/searchV2/autoComplete/quickFilters/utils'; +import { getAutoCompleteInputFromQuickFilter, getFiltersWithQuickFilter } from '@app/searchV2/utils/filterUtils'; describe('getAutoCompleteInputFromQuickFilter', () => { it('should create a platform filter if the selected quick filter is a platform', () => { diff --git a/datahub-web-react/src/app/searchV2/utils/__tests__/generateOrFilters.test.ts b/datahub-web-react/src/app/searchV2/utils/__tests__/generateOrFilters.test.ts index a5d3389f1a..5f10580219 100644 --- a/datahub-web-react/src/app/searchV2/utils/__tests__/generateOrFilters.test.ts +++ b/datahub-web-react/src/app/searchV2/utils/__tests__/generateOrFilters.test.ts @@ -1,13 +1,13 @@ -import { FilterOperator } from '@src/types.generated'; -import { FrontendFilterOperator } from '../../filters/types'; +import { FrontendFilterOperator } from '@app/searchV2/filters/types'; import { DOMAINS_FILTER_NAME, - ENTITY_SUB_TYPE_FILTER_NAME, ENTITY_FILTER_NAME, + ENTITY_SUB_TYPE_FILTER_NAME, TAGS_FILTER_NAME, UnionType, -} from '../constants'; -import { generateOrFilters } from '../generateOrFilters'; +} from '@app/searchV2/utils/constants'; +import { generateOrFilters } from '@app/searchV2/utils/generateOrFilters'; +import { FilterOperator } from '@src/types.generated'; describe('generateOrFilters', () => { it('should generate orFilters with UnionType.AND', () => { diff --git a/datahub-web-react/src/app/searchV2/utils/applyFilterOverrides.ts b/datahub-web-react/src/app/searchV2/utils/applyFilterOverrides.ts index 035a272328..eef6b7df61 100644 --- a/datahub-web-react/src/app/searchV2/utils/applyFilterOverrides.ts +++ b/datahub-web-react/src/app/searchV2/utils/applyFilterOverrides.ts @@ -1,6 +1,7 @@ -import { AndFilterInput, FacetFilterInput } from '../../../types.generated'; -import { UnionType } from './constants'; -import { generateOrFilters } from './generateOrFilters'; +import { UnionType } from '@app/searchV2/utils/constants'; +import { generateOrFilters } from '@app/searchV2/utils/generateOrFilters'; + +import { AndFilterInput, FacetFilterInput } from '@types'; // Swap in new overrides at the same filter positions, with the remainder at the end // Assumes we find matches just by field name, so if multiple filters for the same field were passed, we replace those diff --git a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInAutoComplete.ts b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInAutoComplete.ts index e8e64559e6..f752f40da6 100644 --- a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInAutoComplete.ts +++ b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInAutoComplete.ts @@ -1,5 +1,6 @@ -import { AutoCompleteResultForEntity, EntityType } from '../../../types.generated'; -import { CombinedEntity, createSiblingEntityCombiner } from '../../entity/shared/siblingUtils'; +import { CombinedEntity, createSiblingEntityCombiner } from '@app/entity/shared/siblingUtils'; + +import { AutoCompleteResultForEntity, EntityType } from '@types'; export type CombinedSuggestion = { type: EntityType; diff --git a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.test.ts b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.test.ts index 5c1ad3263d..17c6045f4e 100644 --- a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.test.ts +++ b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.test.ts @@ -1,4 +1,4 @@ -import { combineSiblingsInSearchResults } from './combineSiblingsInSearchResults'; +import { combineSiblingsInSearchResults } from '@app/searchV2/utils/combineSiblingsInSearchResults'; const searchResultWithSiblings = [ { diff --git a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.ts b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.ts index 14c5cb8efe..353794e798 100644 --- a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.ts +++ b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.ts @@ -1,5 +1,6 @@ -import { Entity, EntityPath, MatchedField } from '../../../types.generated'; -import { CombinedEntity, createSiblingEntityCombiner } from '../../entity/shared/siblingUtils'; +import { CombinedEntity, createSiblingEntityCombiner } from '@app/entity/shared/siblingUtils'; + +import { Entity, EntityPath, MatchedField } from '@types'; type UncombinedSeaerchResults = { entity: Entity; diff --git a/datahub-web-react/src/app/searchV2/utils/constants.ts b/datahub-web-react/src/app/searchV2/utils/constants.ts index 5835881a2d..8b8f6929ea 100644 --- a/datahub-web-react/src/app/searchV2/utils/constants.ts +++ b/datahub-web-react/src/app/searchV2/utils/constants.ts @@ -1,4 +1,4 @@ -import { EntityType } from '../../../types.generated'; +import { EntityType } from '@types'; export const FILTER_URL_PREFIX = 'filter_'; export const SEARCH_FOR_ENTITY_PREFIX = 'SEARCH__'; diff --git a/datahub-web-react/src/app/searchV2/utils/filterSearchQuery.ts b/datahub-web-react/src/app/searchV2/utils/filterSearchQuery.ts index 48df97dc77..ecbfb4ee86 100644 --- a/datahub-web-react/src/app/searchV2/utils/filterSearchQuery.ts +++ b/datahub-web-react/src/app/searchV2/utils/filterSearchQuery.ts @@ -1,4 +1,4 @@ -import { SEARCH_FOR_ENTITY_PREFIX, EXACT_SEARCH_PREFIX } from './constants'; +import { EXACT_SEARCH_PREFIX, SEARCH_FOR_ENTITY_PREFIX } from '@app/searchV2/utils/constants'; export default function filterSearchQuery(v: string) { return (v && v.startsWith(SEARCH_FOR_ENTITY_PREFIX)) || v.startsWith(EXACT_SEARCH_PREFIX) ? v.split('__')[1] : v; diff --git a/datahub-web-react/src/app/searchV2/utils/filterUtils.ts b/datahub-web-react/src/app/searchV2/utils/filterUtils.ts index 9633788218..e2e5054283 100644 --- a/datahub-web-react/src/app/searchV2/utils/filterUtils.ts +++ b/datahub-web-react/src/app/searchV2/utils/filterUtils.ts @@ -1,7 +1,8 @@ -import { FacetFilterInput, AndFilterInput, QuickFilter, EntityType } from '../../../types.generated'; -import { FilterSet } from '../../entity/shared/components/styled/search/types'; -import { QuickFilterField } from '../autoComplete/quickFilters/utils'; -import { UnionType } from './constants'; +import { FilterSet } from '@app/entity/shared/components/styled/search/types'; +import { QuickFilterField } from '@app/searchV2/autoComplete/quickFilters/utils'; +import { UnionType } from '@app/searchV2/utils/constants'; + +import { AndFilterInput, EntityType, FacetFilterInput, QuickFilter } from '@types'; /** * Combines 2 sets of conjunctive filters in Disjunctive Normal Form diff --git a/datahub-web-react/src/app/searchV2/utils/filtersToQueryStringParams.ts b/datahub-web-react/src/app/searchV2/utils/filtersToQueryStringParams.ts index fc34dad146..40663561b0 100644 --- a/datahub-web-react/src/app/searchV2/utils/filtersToQueryStringParams.ts +++ b/datahub-web-react/src/app/searchV2/utils/filtersToQueryStringParams.ts @@ -1,6 +1,7 @@ -import { FacetFilterInput, FilterOperator } from '../../../types.generated'; -import { encodeComma } from '../../entity/shared/utils'; -import { DEGREE_FILTER_NAME, FILTER_URL_PREFIX } from './constants'; +import { encodeComma } from '@app/entity/shared/utils'; +import { DEGREE_FILTER_NAME, FILTER_URL_PREFIX } from '@app/searchV2/utils/constants'; + +import { FacetFilterInput, FilterOperator } from '@types'; export const URL_PARAM_SEPARATOR = '___'; diff --git a/datahub-web-react/src/app/searchV2/utils/generateOrFilters.ts b/datahub-web-react/src/app/searchV2/utils/generateOrFilters.ts index f8cf754fcb..8120d0d076 100644 --- a/datahub-web-react/src/app/searchV2/utils/generateOrFilters.ts +++ b/datahub-web-react/src/app/searchV2/utils/generateOrFilters.ts @@ -1,6 +1,7 @@ -import { FacetFilterInput, AndFilterInput, FilterOperator } from '../../../types.generated'; -import { FrontendFacetFilterInput, FrontendFilterOperator } from '../filters/types'; -import { FILTER_DELIMITER, UnionType } from './constants'; +import { FrontendFacetFilterInput, FrontendFilterOperator } from '@app/searchV2/filters/types'; +import { FILTER_DELIMITER, UnionType } from '@app/searchV2/utils/constants'; + +import { AndFilterInput, FacetFilterInput, FilterOperator } from '@types'; // Generates a list of AND filter inputs to be combined in orFilters. This is used when unionType is OR or AND. // When unionType = OR, pass in empty `filters` so the nested filters live alone in their AND statement. diff --git a/datahub-web-react/src/app/searchV2/utils/hasAdvancedFilters.ts b/datahub-web-react/src/app/searchV2/utils/hasAdvancedFilters.ts index e1b7c104b9..f6c7cfc274 100644 --- a/datahub-web-react/src/app/searchV2/utils/hasAdvancedFilters.ts +++ b/datahub-web-react/src/app/searchV2/utils/hasAdvancedFilters.ts @@ -1,5 +1,6 @@ -import { FacetFilterInput } from '../../../types.generated'; -import { ADVANCED_SEARCH_ONLY_FILTERS, UnionType } from './constants'; +import { ADVANCED_SEARCH_ONLY_FILTERS, UnionType } from '@app/searchV2/utils/constants'; + +import { FacetFilterInput } from '@types'; // utility method that looks at the set of filters and determines if the filters can be represented by simple search export const hasAdvancedFilters = (filters: FacetFilterInput[], unionType: UnionType) => { diff --git a/datahub-web-react/src/app/searchV2/utils/navigateToSearchUrl.ts b/datahub-web-react/src/app/searchV2/utils/navigateToSearchUrl.ts index ad5536ff04..67b4fc0ded 100644 --- a/datahub-web-react/src/app/searchV2/utils/navigateToSearchUrl.ts +++ b/datahub-web-react/src/app/searchV2/utils/navigateToSearchUrl.ts @@ -1,9 +1,11 @@ import * as QueryString from 'query-string'; import { RouteComponentProps } from 'react-router-dom'; -import filtersToQueryStringParams from './filtersToQueryStringParams'; -import { FacetFilterInput } from '../../../types.generated'; -import { PageRoutes } from '../../../conf/Global'; -import { UnionType } from './constants'; + +import { UnionType } from '@app/searchV2/utils/constants'; +import filtersToQueryStringParams from '@app/searchV2/utils/filtersToQueryStringParams'; +import { PageRoutes } from '@conf/Global'; + +import { FacetFilterInput } from '@types'; export const navigateToSearchUrl = ({ query, diff --git a/datahub-web-react/src/app/searchV2/utils/types.ts b/datahub-web-react/src/app/searchV2/utils/types.ts index 7631bf095a..6afad0c4aa 100644 --- a/datahub-web-react/src/app/searchV2/utils/types.ts +++ b/datahub-web-react/src/app/searchV2/utils/types.ts @@ -1,5 +1,6 @@ -import { AndFilterInput, EntityType, FacetMetadata, SearchFlags } from '../../../types.generated'; -import { SearchResultInterface } from '../../entity/shared/components/styled/search/types'; +import { SearchResultInterface } from '@app/entity/shared/components/styled/search/types'; + +import { AndFilterInput, EntityType, FacetMetadata, SearchFlags } from '@types'; /** * Input required to download a specific page of search results. diff --git a/datahub-web-react/src/app/searchV2/utils/useDownloadScrollAcrossEntitiesSearchResults.ts b/datahub-web-react/src/app/searchV2/utils/useDownloadScrollAcrossEntitiesSearchResults.ts index dd71834b29..226b91a03c 100644 --- a/datahub-web-react/src/app/searchV2/utils/useDownloadScrollAcrossEntitiesSearchResults.ts +++ b/datahub-web-react/src/app/searchV2/utils/useDownloadScrollAcrossEntitiesSearchResults.ts @@ -1,5 +1,10 @@ -import { useGetDownloadScrollResultsQuery } from '../../../graphql/scroll.generated'; -import { DownloadSearchResults, DownloadSearchResultsInput, DownloadSearchResultsParams } from './types'; +import { + DownloadSearchResults, + DownloadSearchResultsInput, + DownloadSearchResultsParams, +} from '@app/searchV2/utils/types'; + +import { useGetDownloadScrollResultsQuery } from '@graphql/scroll.generated'; /** * Hook for use in downloading a single page of search results via the Scroll API. diff --git a/datahub-web-react/src/app/searchV2/utils/useFilters.ts b/datahub-web-react/src/app/searchV2/utils/useFilters.ts index 31ff653c9d..ef38276d6e 100644 --- a/datahub-web-react/src/app/searchV2/utils/useFilters.ts +++ b/datahub-web-react/src/app/searchV2/utils/useFilters.ts @@ -1,10 +1,11 @@ -import { useMemo } from 'react'; import * as QueryString from 'query-string'; +import { useMemo } from 'react'; -import { ENTITY_FILTER_NAME, FILTER_URL_PREFIX, LEGACY_ENTITY_FILTER_NAME } from './constants'; -import { FacetFilterInput, FilterOperator } from '../../../types.generated'; -import { decodeComma } from '../../entity/shared/utils'; -import { URL_PARAM_SEPARATOR } from './filtersToQueryStringParams'; +import { decodeComma } from '@app/entity/shared/utils'; +import { ENTITY_FILTER_NAME, FILTER_URL_PREFIX, LEGACY_ENTITY_FILTER_NAME } from '@app/searchV2/utils/constants'; +import { URL_PARAM_SEPARATOR } from '@app/searchV2/utils/filtersToQueryStringParams'; + +import { FacetFilterInput, FilterOperator } from '@types'; function ifLegacyFieldNameTranslate(fieldName) { if (fieldName === LEGACY_ENTITY_FILTER_NAME) { diff --git a/datahub-web-react/src/app/settings/AccessTokenModal.tsx b/datahub-web-react/src/app/settings/AccessTokenModal.tsx index 008cf7999d..69491d21e1 100644 --- a/datahub-web-react/src/app/settings/AccessTokenModal.tsx +++ b/datahub-web-react/src/app/settings/AccessTokenModal.tsx @@ -1,7 +1,7 @@ -import React from 'react'; -import { Alert, Button, Modal, Typography } from 'antd'; -import styled from 'styled-components'; import { InfoCircleOutlined } from '@ant-design/icons'; +import { Alert, Button, Modal, Typography } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; const ModalSection = styled.div` display: flex; diff --git a/datahub-web-react/src/app/settings/AccessTokens.tsx b/datahub-web-react/src/app/settings/AccessTokens.tsx index 507224ed4d..5fa333b9d7 100644 --- a/datahub-web-react/src/app/settings/AccessTokens.tsx +++ b/datahub-web-react/src/app/settings/AccessTokens.tsx @@ -1,22 +1,24 @@ -import React, { useState, useMemo, useEffect } from 'react'; -import styled from 'styled-components'; -import { Alert, Button, Divider, Empty, message, Modal, Pagination, Select, Typography } from 'antd'; -import { DeleteOutlined, InfoCircleOutlined, PlusOutlined } from '@ant-design/icons'; import { red } from '@ant-design/colors'; -import { EntityType, FacetFilterInput } from '../../types.generated'; -import { useListAccessTokensQuery, useRevokeAccessTokenMutation } from '../../graphql/auth.generated'; -import { Message } from '../shared/Message'; -import TabToolbar from '../entity/shared/components/styled/TabToolbar'; -import { StyledTable } from '../entity/shared/components/styled/StyledTable'; -import CreateTokenModal from './CreateTokenModal'; -import { getLocaleTimezone } from '../shared/time/timeUtils'; -import { scrollToTop } from '../shared/searchUtils'; -import analytics, { EventType } from '../analytics'; -import { useUserContext } from '../context/useUserContext'; -import { useAppConfig } from '../useAppConfig'; -import { useListUsersQuery } from '../../graphql/user.generated'; -import { OwnerLabel } from '../shared/OwnerLabel'; -import { useEntityRegistry } from '../useEntityRegistry'; +import { DeleteOutlined, InfoCircleOutlined, PlusOutlined } from '@ant-design/icons'; +import { Alert, Button, Divider, Empty, Modal, Pagination, Select, Typography, message } from 'antd'; +import React, { useEffect, useMemo, useState } from 'react'; +import styled from 'styled-components'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import CreateTokenModal from '@app/settings/CreateTokenModal'; +import { Message } from '@app/shared/Message'; +import { OwnerLabel } from '@app/shared/OwnerLabel'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { getLocaleTimezone } from '@app/shared/time/timeUtils'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListAccessTokensQuery, useRevokeAccessTokenMutation } from '@graphql/auth.generated'; +import { useListUsersQuery } from '@graphql/user.generated'; +import { EntityType, FacetFilterInput } from '@types'; const SourceContainer = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/settings/CreateTokenModal.tsx b/datahub-web-react/src/app/settings/CreateTokenModal.tsx index e53de77b54..8045315b42 100644 --- a/datahub-web-react/src/app/settings/CreateTokenModal.tsx +++ b/datahub-web-react/src/app/settings/CreateTokenModal.tsx @@ -1,14 +1,15 @@ -import React, { useState, useEffect } from 'react'; -import { message, Button, Input, Modal, Typography, Form, Select } from 'antd'; -import styled from 'styled-components'; import { red } from '@ant-design/colors'; +import { Button, Form, Input, Modal, Select, Typography, message } from 'antd'; +import React, { useEffect, useState } from 'react'; +import styled from 'styled-components'; -import { useEnterKeyListener } from '../shared/useEnterKeyListener'; -import { ACCESS_TOKEN_DURATIONS, getTokenExpireDate } from './utils'; -import { useCreateAccessTokenMutation } from '../../graphql/auth.generated'; -import { AccessTokenDuration, AccessTokenType, CreateAccessTokenInput } from '../../types.generated'; -import { AccessTokenModal } from './AccessTokenModal'; -import analytics, { EventType } from '../analytics'; +import analytics, { EventType } from '@app/analytics'; +import { AccessTokenModal } from '@app/settings/AccessTokenModal'; +import { ACCESS_TOKEN_DURATIONS, getTokenExpireDate } from '@app/settings/utils'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; + +import { useCreateAccessTokenMutation } from '@graphql/auth.generated'; +import { AccessTokenDuration, AccessTokenType, CreateAccessTokenInput } from '@types'; type Props = { currentUserUrn: string; diff --git a/datahub-web-react/src/app/settings/Preferences.tsx b/datahub-web-react/src/app/settings/Preferences.tsx index 728958629b..05691499f9 100644 --- a/datahub-web-react/src/app/settings/Preferences.tsx +++ b/datahub-web-react/src/app/settings/Preferences.tsx @@ -1,12 +1,14 @@ -import { Card, Divider, message, Switch, Typography } from 'antd'; +import { Card, Divider, Switch, Typography, message } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { useUpdateUserSettingMutation } from '../../graphql/me.generated'; -import { UserSetting } from '../../types.generated'; -import analytics, { EventType } from '../analytics'; -import { useUserContext } from '../context/useUserContext'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { useIsThemeV2, useIsThemeV2EnabledForUser, useIsThemeV2Toggleable } from '../useIsThemeV2'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { useIsThemeV2, useIsThemeV2EnabledForUser, useIsThemeV2Toggleable } from '@app/useIsThemeV2'; + +import { useUpdateUserSettingMutation } from '@graphql/me.generated'; +import { UserSetting } from '@types'; const Page = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/settings/SettingsPage.tsx b/datahub-web-react/src/app/settings/SettingsPage.tsx index 5ef13c538f..ef5a2274a8 100644 --- a/datahub-web-react/src/app/settings/SettingsPage.tsx +++ b/datahub-web-react/src/app/settings/SettingsPage.tsx @@ -1,28 +1,29 @@ -import React from 'react'; -import { Menu, Typography, Divider } from 'antd'; import { BankOutlined, - SafetyCertificateOutlined, - UsergroupAddOutlined, - ToolOutlined, - FilterOutlined, - TeamOutlined, - PushpinOutlined, ControlOutlined, + FilterOutlined, + PushpinOutlined, + SafetyCertificateOutlined, + TeamOutlined, + ToolOutlined, + UsergroupAddOutlined, } from '@ant-design/icons'; -import { Redirect, Route, useHistory, useLocation, useRouteMatch, Switch } from 'react-router'; +import { Divider, Menu, Typography } from 'antd'; +import React from 'react'; +import { Redirect, Route, Switch, useHistory, useLocation, useRouteMatch } from 'react-router'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { ManageIdentities } from '../identity/ManageIdentities'; -import { ManagePermissions } from '../permissions/ManagePermissions'; -import { useAppConfig } from '../useAppConfig'; -import { AccessTokens } from './AccessTokens'; -import { Preferences } from './Preferences'; -import { Features } from './features/Features'; -import { ManageViews } from '../entity/view/ManageViews'; -import { useUserContext } from '../context/useUserContext'; -import { ManageOwnership } from '../entity/ownership/ManageOwnership'; -import ManagePosts from './posts/ManagePosts'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ManageOwnership } from '@app/entity/ownership/ManageOwnership'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { ManageViews } from '@app/entity/view/ManageViews'; +import { ManageIdentities } from '@app/identity/ManageIdentities'; +import { ManagePermissions } from '@app/permissions/ManagePermissions'; +import { AccessTokens } from '@app/settings/AccessTokens'; +import { Preferences } from '@app/settings/Preferences'; +import { Features } from '@app/settings/features/Features'; +import ManagePosts from '@app/settings/posts/ManagePosts'; +import { useAppConfig } from '@app/useAppConfig'; const MenuItem = styled(Menu.Item)` display: flex; diff --git a/datahub-web-react/src/app/settings/features/Feature.tsx b/datahub-web-react/src/app/settings/features/Feature.tsx index 13453cf8f7..da8fab6574 100644 --- a/datahub-web-react/src/app/settings/features/Feature.tsx +++ b/datahub-web-react/src/app/settings/features/Feature.tsx @@ -1,10 +1,9 @@ +import { ArrowRightOutlined } from '@ant-design/icons'; +import { Button, Card, Divider, Switch, Tooltip, Typography } from 'antd'; import React from 'react'; - import styled from 'styled-components'; -import { Divider, Typography, Switch, Card, Button, Tooltip } from 'antd'; -import { ArrowRightOutlined } from '@ant-design/icons'; -import { ANTD_GRAY } from '../../entity/shared/constants'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; const Title = styled(Typography.Title)` && { diff --git a/datahub-web-react/src/app/settings/features/Features.tsx b/datahub-web-react/src/app/settings/features/Features.tsx index 7f39fcc6d7..fdc0210f6c 100644 --- a/datahub-web-react/src/app/settings/features/Features.tsx +++ b/datahub-web-react/src/app/settings/features/Features.tsx @@ -1,13 +1,13 @@ -import React from 'react'; - -import styled from 'styled-components'; - import { Divider, Typography } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; import { v4 as uuidv4 } from 'uuid'; -import { Feature, FeatureType } from './Feature'; - -import { useGetDocPropagationSettings, useUpdateDocPropagationSettings } from './useDocPropagationSettings'; +import { Feature, FeatureType } from '@app/settings/features/Feature'; +import { + useGetDocPropagationSettings, + useUpdateDocPropagationSettings, +} from '@app/settings/features/useDocPropagationSettings'; const Page = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/settings/features/useDocPropagationSettings.ts b/datahub-web-react/src/app/settings/features/useDocPropagationSettings.ts index c93b610cff..b5aa4123f9 100644 --- a/datahub-web-react/src/app/settings/features/useDocPropagationSettings.ts +++ b/datahub-web-react/src/app/settings/features/useDocPropagationSettings.ts @@ -1,11 +1,7 @@ +import { message } from 'antd'; import { useEffect, useState } from 'react'; -import { message } from 'antd'; - -import { - useGetDocPropagationSettingsQuery, - useUpdateDocPropagationSettingsMutation, -} from '../../../graphql/app.generated'; +import { useGetDocPropagationSettingsQuery, useUpdateDocPropagationSettingsMutation } from '@graphql/app.generated'; // Hook to get the document propagation settings & manage state export const useGetDocPropagationSettings = () => { diff --git a/datahub-web-react/src/app/settings/posts/CreatePostForm.tsx b/datahub-web-react/src/app/settings/posts/CreatePostForm.tsx index ee7f50a058..841a872b32 100644 --- a/datahub-web-react/src/app/settings/posts/CreatePostForm.tsx +++ b/datahub-web-react/src/app/settings/posts/CreatePostForm.tsx @@ -1,14 +1,16 @@ +import { Form, FormInstance, Input, Radio, Typography } from 'antd'; import React, { useEffect, useState } from 'react'; -import { Form, Input, Typography, FormInstance, Radio } from 'antd'; import styled from 'styled-components'; + import { DESCRIPTION_FIELD_NAME, LINK_FIELD_NAME, LOCATION_FIELD_NAME, TITLE_FIELD_NAME, TYPE_FIELD_NAME, -} from './constants'; -import { PostContentType } from '../../../types.generated'; +} from '@app/settings/posts/constants'; + +import { PostContentType } from '@types'; const TopFormItem = styled(Form.Item)` margin-bottom: 24px; diff --git a/datahub-web-react/src/app/settings/posts/CreatePostModal.tsx b/datahub-web-react/src/app/settings/posts/CreatePostModal.tsx index 2a3e2204f2..7a7f5a5ba1 100644 --- a/datahub-web-react/src/app/settings/posts/CreatePostModal.tsx +++ b/datahub-web-react/src/app/settings/posts/CreatePostModal.tsx @@ -1,19 +1,21 @@ +import { Button, Form, Modal, message } from 'antd'; import React, { useEffect, useState } from 'react'; -import { Button, Form, message, Modal } from 'antd'; -import CreatePostForm from './CreatePostForm'; + +import CreatePostForm from '@app/settings/posts/CreatePostForm'; +import { PostEntry } from '@app/settings/posts/PostsListColumns'; import { CREATE_POST_BUTTON_ID, DESCRIPTION_FIELD_NAME, LINK_FIELD_NAME, LOCATION_FIELD_NAME, - TYPE_FIELD_NAME, TITLE_FIELD_NAME, -} from './constants'; -import { useEnterKeyListener } from '../../shared/useEnterKeyListener'; -import { MediaType, PostContentType, PostType } from '../../../types.generated'; -import { useCreatePostMutation, useUpdatePostMutation } from '../../../graphql/mutations.generated'; -import { PostEntry } from './PostsListColumns'; -import handleGraphQLError from '../../shared/handleGraphQLError'; + TYPE_FIELD_NAME, +} from '@app/settings/posts/constants'; +import handleGraphQLError from '@app/shared/handleGraphQLError'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; + +import { useCreatePostMutation, useUpdatePostMutation } from '@graphql/mutations.generated'; +import { MediaType, PostContentType, PostType } from '@types'; type Props = { editData: PostEntry; diff --git a/datahub-web-react/src/app/settings/posts/ManagePosts.tsx b/datahub-web-react/src/app/settings/posts/ManagePosts.tsx index 0c9e9a7a59..c97a54b675 100644 --- a/datahub-web-react/src/app/settings/posts/ManagePosts.tsx +++ b/datahub-web-react/src/app/settings/posts/ManagePosts.tsx @@ -1,7 +1,8 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { PostList } from './PostsList'; + +import { PostList } from '@app/settings/posts/PostsList'; const PageContainer = styled.div` padding-top: 20px; diff --git a/datahub-web-react/src/app/settings/posts/PostItemMenu.tsx b/datahub-web-react/src/app/settings/posts/PostItemMenu.tsx index 2ae3bef0fb..def9f61813 100644 --- a/datahub-web-react/src/app/settings/posts/PostItemMenu.tsx +++ b/datahub-web-react/src/app/settings/posts/PostItemMenu.tsx @@ -1,10 +1,12 @@ -import React from 'react'; import { DeleteOutlined, EditOutlined } from '@ant-design/icons'; -import { Dropdown, message, Modal } from 'antd'; -import { MenuIcon } from '../../entity/shared/EntityDropdown/EntityDropdown'; -import { useDeletePostMutation } from '../../../graphql/post.generated'; -import handleGraphQLError from '../../shared/handleGraphQLError'; -import { MenuItemStyle } from '../../entity/view/menu/item/styledComponent'; +import { Dropdown, Modal, message } from 'antd'; +import React from 'react'; + +import { MenuIcon } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; +import handleGraphQLError from '@app/shared/handleGraphQLError'; + +import { useDeletePostMutation } from '@graphql/post.generated'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/settings/posts/PostsList.tsx b/datahub-web-react/src/app/settings/posts/PostsList.tsx index ae9835359d..b1505d5821 100644 --- a/datahub-web-react/src/app/settings/posts/PostsList.tsx +++ b/datahub-web-react/src/app/settings/posts/PostsList.tsx @@ -1,22 +1,24 @@ -import React, { useEffect, useState } from 'react'; +import { PlusOutlined } from '@ant-design/icons'; import { Button, Empty, Pagination, Typography } from 'antd'; +import * as QueryString from 'query-string'; +import { AlignType } from 'rc-table/lib/interface'; +import React, { useEffect, useState } from 'react'; import { useLocation } from 'react-router'; import styled from 'styled-components'; -import * as QueryString from 'query-string'; -import { PlusOutlined } from '@ant-design/icons'; -import { AlignType } from 'rc-table/lib/interface'; + +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { SearchBar } from '@app/search/SearchBar'; +import CreatePostModal from '@app/settings/posts/CreatePostModal'; +import { PostColumn, PostEntry, PostListMenuColumn } from '@app/settings/posts/PostsListColumns'; +import { POST_TYPE_TO_DISPLAY_TEXT } from '@app/settings/posts/constants'; +import { addToListPostCache, removeFromListPostCache } from '@app/settings/posts/utils'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { getHomePagePostsFilters } from '@app/utils/queryUtils'; -import CreatePostModal from './CreatePostModal'; -import { PostColumn, PostEntry, PostListMenuColumn } from './PostsListColumns'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { useListPostsQuery } from '../../../graphql/post.generated'; -import { scrollToTop } from '../../shared/searchUtils'; -import { addToListPostCache, removeFromListPostCache } from './utils'; -import { Message } from '../../shared/Message'; -import TabToolbar from '../../entity/shared/components/styled/TabToolbar'; -import { SearchBar } from '../../search/SearchBar'; -import { StyledTable } from '../../entity/shared/components/styled/StyledTable'; -import { POST_TYPE_TO_DISPLAY_TEXT } from './constants'; + +import { useListPostsQuery } from '@graphql/post.generated'; const PostsContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/settings/posts/PostsListColumns.tsx b/datahub-web-react/src/app/settings/posts/PostsListColumns.tsx index 17c56b8413..d5ce06289d 100644 --- a/datahub-web-react/src/app/settings/posts/PostsListColumns.tsx +++ b/datahub-web-react/src/app/settings/posts/PostsListColumns.tsx @@ -1,7 +1,8 @@ +import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import styled from 'styled-components/macro'; -import { Maybe } from 'graphql/jsutils/Maybe'; -import PostItemMenu from './PostItemMenu'; + +import PostItemMenu from '@app/settings/posts/PostItemMenu'; export interface PostEntry { urn: string; diff --git a/datahub-web-react/src/app/settings/posts/constants.ts b/datahub-web-react/src/app/settings/posts/constants.ts index 5a164019fe..e99cc3239f 100644 --- a/datahub-web-react/src/app/settings/posts/constants.ts +++ b/datahub-web-react/src/app/settings/posts/constants.ts @@ -1,4 +1,4 @@ -import { PostContentType } from '../../../types.generated'; +import { PostContentType } from '@types'; export const TITLE_FIELD_NAME = 'title'; export const DESCRIPTION_FIELD_NAME = 'description'; diff --git a/datahub-web-react/src/app/settings/posts/utils.ts b/datahub-web-react/src/app/settings/posts/utils.ts index 9958a0e8d9..b43e4b14f8 100644 --- a/datahub-web-react/src/app/settings/posts/utils.ts +++ b/datahub-web-react/src/app/settings/posts/utils.ts @@ -1,4 +1,4 @@ -import { ListPostsDocument, ListPostsQuery } from '../../../graphql/post.generated'; +import { ListPostsDocument, ListPostsQuery } from '@graphql/post.generated'; /** * Add an entry to the list posts cache. diff --git a/datahub-web-react/src/app/settings/utils.ts b/datahub-web-react/src/app/settings/utils.ts index a017f8ed6d..dd0d4763e8 100644 --- a/datahub-web-react/src/app/settings/utils.ts +++ b/datahub-web-react/src/app/settings/utils.ts @@ -1,4 +1,4 @@ -import { AccessTokenDuration, AccessTokenType } from '../../types.generated'; +import { AccessTokenDuration, AccessTokenType } from '@types'; /** A type of DataHub Access Token. */ export const ACCESS_TOKEN_TYPES = [{ text: 'Personal', type: AccessTokenType.Personal }]; diff --git a/datahub-web-react/src/app/settingsV2/AccessTokenModal.tsx b/datahub-web-react/src/app/settingsV2/AccessTokenModal.tsx index 10427210d0..5976675951 100644 --- a/datahub-web-react/src/app/settingsV2/AccessTokenModal.tsx +++ b/datahub-web-react/src/app/settingsV2/AccessTokenModal.tsx @@ -1,7 +1,7 @@ -import React from 'react'; -import { Alert, Button, Modal, Typography } from 'antd'; -import styled from 'styled-components'; import { InfoCircleOutlined } from '@ant-design/icons'; +import { Alert, Button, Modal, Typography } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; const ModalSection = styled.div` display: flex; diff --git a/datahub-web-react/src/app/settingsV2/AccessTokens.tsx b/datahub-web-react/src/app/settingsV2/AccessTokens.tsx index 33f03be270..88d019f95b 100644 --- a/datahub-web-react/src/app/settingsV2/AccessTokens.tsx +++ b/datahub-web-react/src/app/settingsV2/AccessTokens.tsx @@ -1,22 +1,24 @@ -import React, { useState, useMemo, useEffect } from 'react'; -import styled from 'styled-components'; -import { Alert, Button, Divider, Dropdown, Empty, message, Modal, Pagination, Select, Typography } from 'antd'; -import { DeleteOutlined, InfoCircleOutlined, PlusOutlined } from '@ant-design/icons'; import { red } from '@ant-design/colors'; -import { EntityType, FacetFilterInput } from '../../types.generated'; -import { useListAccessTokensQuery, useRevokeAccessTokenMutation } from '../../graphql/auth.generated'; -import { Message } from '../shared/Message'; -import TabToolbar from '../entity/shared/components/styled/TabToolbar'; -import { StyledTable } from '../entity/shared/components/styled/StyledTable'; -import CreateTokenModal from './CreateTokenModal'; -import { getLocaleTimezone } from '../shared/time/timeUtils'; -import { scrollToTop } from '../shared/searchUtils'; -import analytics, { EventType } from '../analytics'; -import { useUserContext } from '../context/useUserContext'; -import { useAppConfig } from '../useAppConfig'; -import { useListUsersQuery } from '../../graphql/user.generated'; -import { OwnerLabel } from '../shared/OwnerLabel'; -import { useEntityRegistry } from '../useEntityRegistry'; +import { DeleteOutlined, InfoCircleOutlined, PlusOutlined } from '@ant-design/icons'; +import { Alert, Button, Divider, Dropdown, Empty, Modal, Pagination, Select, Typography, message } from 'antd'; +import React, { useEffect, useMemo, useState } from 'react'; +import styled from 'styled-components'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import CreateTokenModal from '@app/settingsV2/CreateTokenModal'; +import { Message } from '@app/shared/Message'; +import { OwnerLabel } from '@app/shared/OwnerLabel'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { getLocaleTimezone } from '@app/shared/time/timeUtils'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListAccessTokensQuery, useRevokeAccessTokenMutation } from '@graphql/auth.generated'; +import { useListUsersQuery } from '@graphql/user.generated'; +import { EntityType, FacetFilterInput } from '@types'; const SourceContainer = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/settingsV2/CreateTokenModal.tsx b/datahub-web-react/src/app/settingsV2/CreateTokenModal.tsx index 734d3d72fc..c56479b9e9 100644 --- a/datahub-web-react/src/app/settingsV2/CreateTokenModal.tsx +++ b/datahub-web-react/src/app/settingsV2/CreateTokenModal.tsx @@ -1,16 +1,17 @@ -import React, { useState, useEffect } from 'react'; -import { message, Input, Modal, Typography, Form, Select } from 'antd'; -import styled from 'styled-components'; import { red } from '@ant-design/colors'; +import { Form, Input, Modal, Select, Typography, message } from 'antd'; +import React, { useEffect, useState } from 'react'; +import styled from 'styled-components'; + +import analytics, { EventType } from '@app/analytics'; +import { AccessTokenModal } from '@app/settingsV2/AccessTokenModal'; +import { ACCESS_TOKEN_DURATIONS, getTokenExpireDate } from '@app/settingsV2/utils'; +import { ModalButtonContainer } from '@app/shared/button/styledComponents'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; import { Button } from '@src/alchemy-components'; -import { useEnterKeyListener } from '../shared/useEnterKeyListener'; -import { ACCESS_TOKEN_DURATIONS, getTokenExpireDate } from './utils'; -import { useCreateAccessTokenMutation } from '../../graphql/auth.generated'; -import { AccessTokenDuration, AccessTokenType, CreateAccessTokenInput } from '../../types.generated'; -import { AccessTokenModal } from './AccessTokenModal'; -import analytics, { EventType } from '../analytics'; -import { ModalButtonContainer } from '../shared/button/styledComponents'; +import { useCreateAccessTokenMutation } from '@graphql/auth.generated'; +import { AccessTokenDuration, AccessTokenType, CreateAccessTokenInput } from '@types'; type Props = { currentUserUrn: string; diff --git a/datahub-web-react/src/app/settingsV2/Preferences.tsx b/datahub-web-react/src/app/settingsV2/Preferences.tsx index 524a1b5c6c..fb0ee76b7c 100644 --- a/datahub-web-react/src/app/settingsV2/Preferences.tsx +++ b/datahub-web-react/src/app/settingsV2/Preferences.tsx @@ -1,12 +1,14 @@ -import React from 'react'; +import { PageTitle, Switch, colors } from '@components'; import { message } from 'antd'; -import { Switch, PageTitle, colors } from '@components'; +import React from 'react'; import styled from 'styled-components'; -import { useUpdateUserSettingMutation } from '../../graphql/me.generated'; -import { UserSetting } from '../../types.generated'; -import analytics, { EventType } from '../analytics'; -import { useUserContext } from '../context/useUserContext'; -import { useIsThemeV2, useIsThemeV2EnabledForUser, useIsThemeV2Toggleable } from '../useIsThemeV2'; + +import analytics, { EventType } from '@app/analytics'; +import { useUserContext } from '@app/context/useUserContext'; +import { useIsThemeV2, useIsThemeV2EnabledForUser, useIsThemeV2Toggleable } from '@app/useIsThemeV2'; + +import { useUpdateUserSettingMutation } from '@graphql/me.generated'; +import { UserSetting } from '@types'; const Page = styled.div` width: 100%; diff --git a/datahub-web-react/src/app/settingsV2/SettingsPage.tsx b/datahub-web-react/src/app/settingsV2/SettingsPage.tsx index 17ad047854..eced8802c0 100644 --- a/datahub-web-react/src/app/settingsV2/SettingsPage.tsx +++ b/datahub-web-react/src/app/settingsV2/SettingsPage.tsx @@ -1,6 +1,3 @@ -import React from 'react'; -import { useHistory, useLocation, useRouteMatch, Redirect, Route, Switch } from 'react-router'; -import { Button, colors } from '@src/alchemy-components'; import { Bank, Bell, @@ -10,18 +7,22 @@ import { Star, ToggleRight, Users, - Wrench, UsersThree, + Wrench, } from '@phosphor-icons/react'; +import React from 'react'; +import { Redirect, Route, Switch, useHistory, useLocation, useRouteMatch } from 'react-router'; import styled from 'styled-components'; -import { useUserContext } from '../context/useUserContext'; -import { PATHS, DEFAULT_PATH } from './settingsPaths'; -import { NavBarMenuItems, NavBarMenuItemTypes } from '../homeV2/layout/navBarRedesign/types'; -import NavBarMenu from '../homeV2/layout/navBarRedesign/NavBarMenu'; -import { useIsThemeV2 } from '../useIsThemeV2'; -import { useShowNavBarRedesign } from '../useShowNavBarRedesign'; -import useGetLogoutHandler from '../auth/useGetLogoutHandler'; -import { useAppConfig } from '../useAppConfig'; + +import useGetLogoutHandler from '@app/auth/useGetLogoutHandler'; +import { useUserContext } from '@app/context/useUserContext'; +import NavBarMenu from '@app/homeV2/layout/navBarRedesign/NavBarMenu'; +import { NavBarMenuItemTypes, NavBarMenuItems } from '@app/homeV2/layout/navBarRedesign/types'; +import { DEFAULT_PATH, PATHS } from '@app/settingsV2/settingsPaths'; +import { useAppConfig } from '@app/useAppConfig'; +import { useIsThemeV2 } from '@app/useIsThemeV2'; +import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign'; +import { Button, colors } from '@src/alchemy-components'; const PageContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/settingsV2/features/Feature.tsx b/datahub-web-react/src/app/settingsV2/features/Feature.tsx index 3495eea6d3..dd57ac84cf 100644 --- a/datahub-web-react/src/app/settingsV2/features/Feature.tsx +++ b/datahub-web-react/src/app/settingsV2/features/Feature.tsx @@ -1,7 +1,8 @@ +import { Button, Pill, Switch, Tooltip2 } from '@components'; +import { Card, Divider } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Pill, Button, Tooltip2, Switch } from '@components'; -import { Card, Divider } from 'antd'; + import { colors } from '@components/theme'; const StyledCard = styled(Card)` diff --git a/datahub-web-react/src/app/settingsV2/features/Features.tsx b/datahub-web-react/src/app/settingsV2/features/Features.tsx index 8962840fac..4b50f08871 100644 --- a/datahub-web-react/src/app/settingsV2/features/Features.tsx +++ b/datahub-web-react/src/app/settingsV2/features/Features.tsx @@ -1,9 +1,13 @@ import React from 'react'; import styled from 'styled-components'; -import { PageTitle } from '@src/alchemy-components'; import { v4 as uuidv4 } from 'uuid'; -import { Feature, FeatureType } from './Feature'; -import { useGetDocPropagationSettings, useUpdateDocPropagationSettings } from './useDocPropagationSettings'; + +import { Feature, FeatureType } from '@app/settingsV2/features/Feature'; +import { + useGetDocPropagationSettings, + useUpdateDocPropagationSettings, +} from '@app/settingsV2/features/useDocPropagationSettings'; +import { PageTitle } from '@src/alchemy-components'; const Page = styled.div` display: flex; diff --git a/datahub-web-react/src/app/settingsV2/features/useDocPropagationSettings.ts b/datahub-web-react/src/app/settingsV2/features/useDocPropagationSettings.ts index c93b610cff..b5aa4123f9 100644 --- a/datahub-web-react/src/app/settingsV2/features/useDocPropagationSettings.ts +++ b/datahub-web-react/src/app/settingsV2/features/useDocPropagationSettings.ts @@ -1,11 +1,7 @@ +import { message } from 'antd'; import { useEffect, useState } from 'react'; -import { message } from 'antd'; - -import { - useGetDocPropagationSettingsQuery, - useUpdateDocPropagationSettingsMutation, -} from '../../../graphql/app.generated'; +import { useGetDocPropagationSettingsQuery, useUpdateDocPropagationSettingsMutation } from '@graphql/app.generated'; // Hook to get the document propagation settings & manage state export const useGetDocPropagationSettings = () => { diff --git a/datahub-web-react/src/app/settingsV2/personal/utils.tsx b/datahub-web-react/src/app/settingsV2/personal/utils.tsx index 6c8d32a183..3a3f9ed39e 100644 --- a/datahub-web-react/src/app/settingsV2/personal/utils.tsx +++ b/datahub-web-react/src/app/settingsV2/personal/utils.tsx @@ -1,7 +1,9 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { Entity, EntityType } from '../../../types.generated'; -import EntityRegistry from '../../entity/EntityRegistry'; + +import EntityRegistry from '@app/entity/EntityRegistry'; + +import { Entity, EntityType } from '@types'; const StyledIcon = styled.img` width: 28px; diff --git a/datahub-web-react/src/app/settingsV2/posts/CreatePostForm.tsx b/datahub-web-react/src/app/settingsV2/posts/CreatePostForm.tsx index d5565f2519..53484b0fe2 100644 --- a/datahub-web-react/src/app/settingsV2/posts/CreatePostForm.tsx +++ b/datahub-web-react/src/app/settingsV2/posts/CreatePostForm.tsx @@ -1,17 +1,19 @@ +import { Form, FormInstance, Input, Radio, Typography } from 'antd'; import React, { useEffect, useState } from 'react'; -import { Form, Input, Typography, FormInstance, Radio } from 'antd'; import styled from 'styled-components'; -import { Editor } from '@src/app/entity/shared/tabs/Documentation/components/editor/Editor'; -import { ANTD_GRAY } from '@src/app/entity/shared/constants'; + +import { PostEntry } from '@app/settingsV2/posts/PostsListColumns'; import { DESCRIPTION_FIELD_NAME, LINK_FIELD_NAME, LOCATION_FIELD_NAME, TITLE_FIELD_NAME, TYPE_FIELD_NAME, -} from './constants'; -import { PostContentType } from '../../../types.generated'; -import { PostEntry } from './PostsListColumns'; +} from '@app/settingsV2/posts/constants'; +import { ANTD_GRAY } from '@src/app/entity/shared/constants'; +import { Editor } from '@src/app/entity/shared/tabs/Documentation/components/editor/Editor'; + +import { PostContentType } from '@types'; const TopFormItem = styled(Form.Item)` margin-bottom: 24px; diff --git a/datahub-web-react/src/app/settingsV2/posts/CreatePostModal.tsx b/datahub-web-react/src/app/settingsV2/posts/CreatePostModal.tsx index 3010d5fa3d..bfb8983654 100644 --- a/datahub-web-react/src/app/settingsV2/posts/CreatePostModal.tsx +++ b/datahub-web-react/src/app/settingsV2/posts/CreatePostModal.tsx @@ -1,21 +1,23 @@ +import { Form, Modal, message } from 'antd'; import React, { useEffect, useState } from 'react'; -import { Form, message, Modal } from 'antd'; -import { Button } from '@src/alchemy-components'; -import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; -import CreatePostForm from './CreatePostForm'; + +import CreatePostForm from '@app/settingsV2/posts/CreatePostForm'; +import { PostEntry } from '@app/settingsV2/posts/PostsListColumns'; import { CREATE_POST_BUTTON_ID, DESCRIPTION_FIELD_NAME, LINK_FIELD_NAME, LOCATION_FIELD_NAME, - TYPE_FIELD_NAME, TITLE_FIELD_NAME, -} from './constants'; -import { useEnterKeyListener } from '../../shared/useEnterKeyListener'; -import { MediaType, PostContentType, PostType } from '../../../types.generated'; -import { useCreatePostMutation, useUpdatePostMutation } from '../../../graphql/mutations.generated'; -import { PostEntry } from './PostsListColumns'; -import handleGraphQLError from '../../shared/handleGraphQLError'; + TYPE_FIELD_NAME, +} from '@app/settingsV2/posts/constants'; +import handleGraphQLError from '@app/shared/handleGraphQLError'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { Button } from '@src/alchemy-components'; +import { ModalButtonContainer } from '@src/app/shared/button/styledComponents'; + +import { useCreatePostMutation, useUpdatePostMutation } from '@graphql/mutations.generated'; +import { MediaType, PostContentType, PostType } from '@types'; type Props = { editData: PostEntry; diff --git a/datahub-web-react/src/app/settingsV2/posts/ManagePosts.tsx b/datahub-web-react/src/app/settingsV2/posts/ManagePosts.tsx index 41b4ea68e9..efba445323 100644 --- a/datahub-web-react/src/app/settingsV2/posts/ManagePosts.tsx +++ b/datahub-web-react/src/app/settingsV2/posts/ManagePosts.tsx @@ -1,7 +1,8 @@ import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components/macro'; -import { PostList } from './PostsList'; + +import { PostList } from '@app/settingsV2/posts/PostsList'; export const PageContainer = styled.div` padding-top: 20px; diff --git a/datahub-web-react/src/app/settingsV2/posts/PostItemMenu.tsx b/datahub-web-react/src/app/settingsV2/posts/PostItemMenu.tsx index 10e2996c36..347b870fb5 100644 --- a/datahub-web-react/src/app/settingsV2/posts/PostItemMenu.tsx +++ b/datahub-web-react/src/app/settingsV2/posts/PostItemMenu.tsx @@ -1,9 +1,11 @@ -import React from 'react'; import { DeleteOutlined, EditOutlined } from '@ant-design/icons'; -import { Dropdown, Menu, message, Modal } from 'antd'; -import { MenuIcon } from '../../entity/shared/EntityDropdown/EntityDropdown'; -import { useDeletePostMutation } from '../../../graphql/post.generated'; -import handleGraphQLError from '../../shared/handleGraphQLError'; +import { Dropdown, Menu, Modal, message } from 'antd'; +import React from 'react'; + +import { MenuIcon } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import handleGraphQLError from '@app/shared/handleGraphQLError'; + +import { useDeletePostMutation } from '@graphql/post.generated'; type Props = { urn: string; diff --git a/datahub-web-react/src/app/settingsV2/posts/PostsList.tsx b/datahub-web-react/src/app/settingsV2/posts/PostsList.tsx index 597323f01e..341fab80e1 100644 --- a/datahub-web-react/src/app/settingsV2/posts/PostsList.tsx +++ b/datahub-web-react/src/app/settingsV2/posts/PostsList.tsx @@ -1,22 +1,24 @@ -import React, { useEffect, useState } from 'react'; +import { PlusOutlined } from '@ant-design/icons'; import { Button, Empty, Pagination, Typography } from 'antd'; +import * as QueryString from 'query-string'; +import { AlignType } from 'rc-table/lib/interface'; +import React, { useEffect, useState } from 'react'; import { useLocation } from 'react-router'; import styled from 'styled-components'; -import * as QueryString from 'query-string'; -import { PlusOutlined } from '@ant-design/icons'; -import { AlignType } from 'rc-table/lib/interface'; + +import { StyledTable } from '@app/entity/shared/components/styled/StyledTable'; +import TabToolbar from '@app/entity/shared/components/styled/TabToolbar'; +import { SearchBar } from '@app/search/SearchBar'; +import CreatePostModal from '@app/settingsV2/posts/CreatePostModal'; +import { PostColumn, PostEntry, PostListMenuColumn } from '@app/settingsV2/posts/PostsListColumns'; +import { POST_TYPE_TO_DISPLAY_TEXT } from '@app/settingsV2/posts/constants'; +import { addToListPostCache, removeFromListPostCache } from '@app/settingsV2/posts/utils'; +import { Message } from '@app/shared/Message'; +import { scrollToTop } from '@app/shared/searchUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { getHomePagePostsFilters } from '@app/utils/queryUtils'; -import CreatePostModal from './CreatePostModal'; -import { PostColumn, PostEntry, PostListMenuColumn } from './PostsListColumns'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { useListPostsQuery } from '../../../graphql/post.generated'; -import { scrollToTop } from '../../shared/searchUtils'; -import { addToListPostCache, removeFromListPostCache } from './utils'; -import { Message } from '../../shared/Message'; -import TabToolbar from '../../entity/shared/components/styled/TabToolbar'; -import { SearchBar } from '../../search/SearchBar'; -import { StyledTable } from '../../entity/shared/components/styled/StyledTable'; -import { POST_TYPE_TO_DISPLAY_TEXT } from './constants'; + +import { useListPostsQuery } from '@graphql/post.generated'; const PostsContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/settingsV2/posts/PostsListColumns.tsx b/datahub-web-react/src/app/settingsV2/posts/PostsListColumns.tsx index 17c56b8413..ff55972d8f 100644 --- a/datahub-web-react/src/app/settingsV2/posts/PostsListColumns.tsx +++ b/datahub-web-react/src/app/settingsV2/posts/PostsListColumns.tsx @@ -1,7 +1,8 @@ +import { Maybe } from 'graphql/jsutils/Maybe'; import React from 'react'; import styled from 'styled-components/macro'; -import { Maybe } from 'graphql/jsutils/Maybe'; -import PostItemMenu from './PostItemMenu'; + +import PostItemMenu from '@app/settingsV2/posts/PostItemMenu'; export interface PostEntry { urn: string; diff --git a/datahub-web-react/src/app/settingsV2/posts/constants.ts b/datahub-web-react/src/app/settingsV2/posts/constants.ts index 5a164019fe..e99cc3239f 100644 --- a/datahub-web-react/src/app/settingsV2/posts/constants.ts +++ b/datahub-web-react/src/app/settingsV2/posts/constants.ts @@ -1,4 +1,4 @@ -import { PostContentType } from '../../../types.generated'; +import { PostContentType } from '@types'; export const TITLE_FIELD_NAME = 'title'; export const DESCRIPTION_FIELD_NAME = 'description'; diff --git a/datahub-web-react/src/app/settingsV2/posts/utils.ts b/datahub-web-react/src/app/settingsV2/posts/utils.ts index 9958a0e8d9..b43e4b14f8 100644 --- a/datahub-web-react/src/app/settingsV2/posts/utils.ts +++ b/datahub-web-react/src/app/settingsV2/posts/utils.ts @@ -1,4 +1,4 @@ -import { ListPostsDocument, ListPostsQuery } from '../../../graphql/post.generated'; +import { ListPostsDocument, ListPostsQuery } from '@graphql/post.generated'; /** * Add an entry to the list posts cache. diff --git a/datahub-web-react/src/app/settingsV2/settingsPaths.tsx b/datahub-web-react/src/app/settingsV2/settingsPaths.tsx index 05e6d82968..463acd75f7 100644 --- a/datahub-web-react/src/app/settingsV2/settingsPaths.tsx +++ b/datahub-web-react/src/app/settingsV2/settingsPaths.tsx @@ -1,13 +1,14 @@ import React from 'react'; -import { ManageIdentities } from '../identity/ManageIdentities'; -import { ManagePermissions } from '../permissions/ManagePermissions'; -import { AccessTokens } from './AccessTokens'; -import { Preferences } from './Preferences'; -import { ManagePolicies } from '../permissions/policy/ManagePolicies'; -import { ManageViews } from '../entity/view/ManageViews'; -import { ManageOwnership } from '../entityV2/ownership/ManageOwnership'; -import ManagePosts from './posts/ManagePosts'; -import { Features } from './features/Features'; + +import { ManageViews } from '@app/entity/view/ManageViews'; +import { ManageOwnership } from '@app/entityV2/ownership/ManageOwnership'; +import { ManageIdentities } from '@app/identity/ManageIdentities'; +import { ManagePermissions } from '@app/permissions/ManagePermissions'; +import { ManagePolicies } from '@app/permissions/policy/ManagePolicies'; +import { AccessTokens } from '@app/settingsV2/AccessTokens'; +import { Preferences } from '@app/settingsV2/Preferences'; +import { Features } from '@app/settingsV2/features/Features'; +import ManagePosts from '@app/settingsV2/posts/ManagePosts'; /** * URL Paths for each settings page. diff --git a/datahub-web-react/src/app/settingsV2/utils.ts b/datahub-web-react/src/app/settingsV2/utils.ts index a017f8ed6d..dd0d4763e8 100644 --- a/datahub-web-react/src/app/settingsV2/utils.ts +++ b/datahub-web-react/src/app/settingsV2/utils.ts @@ -1,4 +1,4 @@ -import { AccessTokenDuration, AccessTokenType } from '../../types.generated'; +import { AccessTokenDuration, AccessTokenType } from '@types'; /** A type of DataHub Access Token. */ export const ACCESS_TOKEN_TYPES = [{ text: 'Personal', type: AccessTokenType.Personal }]; diff --git a/datahub-web-react/src/app/shared/AppLogoLink.tsx b/datahub-web-react/src/app/shared/AppLogoLink.tsx index 7d647194b0..19b23ea1bb 100644 --- a/datahub-web-react/src/app/shared/AppLogoLink.tsx +++ b/datahub-web-react/src/app/shared/AppLogoLink.tsx @@ -2,8 +2,9 @@ import { Image } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled, { useTheme } from 'styled-components'; -import { useAppConfig } from '../useAppConfig'; -import { DEFAULT_APP_CONFIG } from '../../appConfigContext'; + +import { useAppConfig } from '@app/useAppConfig'; +import { DEFAULT_APP_CONFIG } from '@src/appConfigContext'; const LogoImage = styled(Image)` display: inline-block; diff --git a/datahub-web-react/src/app/shared/BrowserTabTitleContext.tsx b/datahub-web-react/src/app/shared/BrowserTabTitleContext.tsx index 61321d41f9..abc6bddeed 100644 --- a/datahub-web-react/src/app/shared/BrowserTabTitleContext.tsx +++ b/datahub-web-react/src/app/shared/BrowserTabTitleContext.tsx @@ -1,4 +1,4 @@ -import React, { createContext, ReactNode, useContext } from 'react'; +import React, { ReactNode, createContext, useContext } from 'react'; interface BrowserTitleContextProps { title: string; diff --git a/datahub-web-react/src/app/shared/EntityHead.tsx b/datahub-web-react/src/app/shared/EntityHead.tsx index 5724469e6e..93b1708958 100644 --- a/datahub-web-react/src/app/shared/EntityHead.tsx +++ b/datahub-web-react/src/app/shared/EntityHead.tsx @@ -1,8 +1,9 @@ import React from 'react'; import { Helmet } from 'react-helmet-async'; -import { useEntityData } from '../entity/shared/EntityContext'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { capitalizeFirstLetterOnly } from './textUtil'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { useEntityRegistry } from '@app/useEntityRegistry'; export const EntityHead = () => { const entityRegistry = useEntityRegistry(); diff --git a/datahub-web-react/src/app/shared/LastUpdated.tsx b/datahub-web-react/src/app/shared/LastUpdated.tsx index c0890aca37..2c23eb042c 100644 --- a/datahub-web-react/src/app/shared/LastUpdated.tsx +++ b/datahub-web-react/src/app/shared/LastUpdated.tsx @@ -1,12 +1,13 @@ import { green, orange, red } from '@ant-design/colors'; import { ClockCircleOutlined } from '@ant-design/icons'; -import { Image } from 'antd'; import { Popover } from '@components'; +import { Image } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { getLastIngestedColor } from '../entity/shared/containers/profile/sidebar/LastIngested'; -import { toRelativeTimeString } from './time/timeUtils'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { getLastIngestedColor } from '@app/entity/shared/containers/profile/sidebar/LastIngested'; +import { toRelativeTimeString } from '@app/shared/time/timeUtils'; const LastUpdatedContainer = styled.div` align-items: center; diff --git a/datahub-web-react/src/app/shared/LegacyEntityProfile.tsx b/datahub-web-react/src/app/shared/LegacyEntityProfile.tsx index 46efa48147..74e13c3854 100644 --- a/datahub-web-react/src/app/shared/LegacyEntityProfile.tsx +++ b/datahub-web-react/src/app/shared/LegacyEntityProfile.tsx @@ -1,13 +1,12 @@ -import * as React from 'react'; - -import { Col, Row, Divider, Layout, Card, Typography } from 'antd'; -import { LayoutProps } from 'antd/lib/layout'; -import styled from 'styled-components'; import { TagOutlined } from '@ant-design/icons'; +import { Card, Col, Divider, Layout, Row, Typography } from 'antd'; +import { LayoutProps } from 'antd/lib/layout'; +import * as React from 'react'; import { Link } from 'react-router-dom'; +import styled from 'styled-components'; -import { RoutedTabs } from './RoutedTabs'; -import CompactContext from './CompactContext'; +import CompactContext from '@app/shared/CompactContext'; +import { RoutedTabs } from '@app/shared/RoutedTabs'; export interface EntityProfileProps { title: string; diff --git a/datahub-web-react/src/app/shared/LogoCountCard.tsx b/datahub-web-react/src/app/shared/LogoCountCard.tsx index e67898520e..bb4b4f1d0d 100644 --- a/datahub-web-react/src/app/shared/LogoCountCard.tsx +++ b/datahub-web-react/src/app/shared/LogoCountCard.tsx @@ -1,9 +1,10 @@ -import React from 'react'; import { Image, Typography } from 'antd'; +import React from 'react'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { formatNumber } from './formatNumber'; -import { HomePageButton } from './components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { HomePageButton } from '@app/shared/components'; +import { formatNumber } from '@app/shared/formatNumber'; const PlatformLogo = styled(Image)` max-height: 32px; diff --git a/datahub-web-react/src/app/shared/ManageAccount.tsx b/datahub-web-react/src/app/shared/ManageAccount.tsx index 359a7d77dd..5e7ccfbc7b 100644 --- a/datahub-web-react/src/app/shared/ManageAccount.tsx +++ b/datahub-web-react/src/app/shared/ManageAccount.tsx @@ -1,18 +1,20 @@ -import React from 'react'; -import Cookies from 'js-cookie'; -import { Dropdown } from 'antd'; import { CaretDownOutlined } from '@ant-design/icons'; +import { Dropdown } from 'antd'; +import Cookies from 'js-cookie'; +import React from 'react'; import styled, { useTheme } from 'styled-components'; -import { EntityType } from '../../types.generated'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { GlobalCfg } from '../../conf'; -import { isLoggedInVar } from '../auth/checkAuthStatus'; -import CustomAvatar from './avatar/CustomAvatar'; -import analytics, { EventType } from '../analytics'; -import { ANTD_GRAY } from '../entity/shared/constants'; -import { useAppConfig } from '../useAppConfig'; -import { useUserContext } from '../context/useUserContext'; -import { MenuItemStyle } from '../entity/view/menu/item/styledComponent'; + +import analytics, { EventType } from '@app/analytics'; +import { isLoggedInVar } from '@app/auth/checkAuthStatus'; +import { useUserContext } from '@app/context/useUserContext'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; +import { useAppConfig } from '@app/useAppConfig'; +import { useEntityRegistry } from '@app/useEntityRegistry'; +import { GlobalCfg } from '@src/conf'; + +import { EntityType } from '@types'; const DownArrow = styled(CaretDownOutlined)` vertical-align: -1px; diff --git a/datahub-web-react/src/app/shared/Message.tsx b/datahub-web-react/src/app/shared/Message.tsx index e07a60a33a..5373a19b19 100644 --- a/datahub-web-react/src/app/shared/Message.tsx +++ b/datahub-web-react/src/app/shared/Message.tsx @@ -1,5 +1,5 @@ -import React, { ReactNode, useEffect, useMemo } from 'react'; import { message } from 'antd'; +import React, { ReactNode, useEffect, useMemo } from 'react'; type MessageType = 'loading' | 'info' | 'error' | 'warning' | 'success'; export type MessageProps = { diff --git a/datahub-web-react/src/app/shared/NoPageFound.tsx b/datahub-web-react/src/app/shared/NoPageFound.tsx index 8d0d9883ea..a2c74b2049 100644 --- a/datahub-web-react/src/app/shared/NoPageFound.tsx +++ b/datahub-web-react/src/app/shared/NoPageFound.tsx @@ -1,7 +1,7 @@ -import React from 'react'; import { Button } from 'antd'; -import styled from 'styled-components'; +import React from 'react'; import { useHistory } from 'react-router'; +import styled from 'styled-components'; const MainContainer = styled.div` height: 100vh; diff --git a/datahub-web-react/src/app/shared/OwnerLabel.tsx b/datahub-web-react/src/app/shared/OwnerLabel.tsx index fb670aa56d..b6f18363de 100644 --- a/datahub-web-react/src/app/shared/OwnerLabel.tsx +++ b/datahub-web-react/src/app/shared/OwnerLabel.tsx @@ -1,7 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import { EntityType } from '../../types.generated'; -import { CustomAvatar } from './avatar'; + +import { CustomAvatar } from '@app/shared/avatar'; + +import { EntityType } from '@types'; const OwnerContainerWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/shared/RoutedTabs.tsx b/datahub-web-react/src/app/shared/RoutedTabs.tsx index 574f372e53..2c565dc6f8 100644 --- a/datahub-web-react/src/app/shared/RoutedTabs.tsx +++ b/datahub-web-react/src/app/shared/RoutedTabs.tsx @@ -1,8 +1,8 @@ -import * as React from 'react'; -import { Route, Switch, useRouteMatch, useLocation } from 'react-router-dom'; -import { Redirect, useHistory } from 'react-router'; import { Tabs } from 'antd'; import { TabsProps } from 'antd/lib/tabs'; +import * as React from 'react'; +import { Redirect, useHistory } from 'react-router'; +import { Route, Switch, useLocation, useRouteMatch } from 'react-router-dom'; import styled from 'styled-components'; const { TabPane } = Tabs; diff --git a/datahub-web-react/src/app/shared/ShowMoreSection.tsx b/datahub-web-react/src/app/shared/ShowMoreSection.tsx index d9e690d25e..f427be206d 100644 --- a/datahub-web-react/src/app/shared/ShowMoreSection.tsx +++ b/datahub-web-react/src/app/shared/ShowMoreSection.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import colors from '@src/alchemy-components/theme/foundations/colors'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import colors from '@src/alchemy-components/theme/foundations/colors'; export const ShowMoreButton = styled.div` padding: 4px; diff --git a/datahub-web-react/src/app/shared/TagLabel.tsx b/datahub-web-react/src/app/shared/TagLabel.tsx index 83bc55a184..93ba6c7cb4 100644 --- a/datahub-web-react/src/app/shared/TagLabel.tsx +++ b/datahub-web-react/src/app/shared/TagLabel.tsx @@ -1,6 +1,6 @@ +import ColorHash from 'color-hash'; import React from 'react'; import styled, { css } from 'styled-components'; -import ColorHash from 'color-hash'; type Props = { name: string; diff --git a/datahub-web-react/src/app/shared/TagStyleEntity.tsx b/datahub-web-react/src/app/shared/TagStyleEntity.tsx index cbaa29d097..efe1d484bd 100644 --- a/datahub-web-react/src/app/shared/TagStyleEntity.tsx +++ b/datahub-web-react/src/app/shared/TagStyleEntity.tsx @@ -1,29 +1,31 @@ -import React, { useCallback, useEffect, useRef, useState } from 'react'; import { grey } from '@ant-design/colors'; -import { Button, Divider, message, Typography } from 'antd'; -import { useHistory } from 'react-router'; -import { ApolloError } from '@apollo/client'; -import styled from 'styled-components'; -import { ChromePicker } from 'react-color'; -import ColorHash from 'color-hash'; import { PlusOutlined } from '@ant-design/icons'; -import { useGetTagQuery } from '../../graphql/tag.generated'; -import { EntityType, FacetMetadata, Maybe, Scalars } from '../../types.generated'; -import { ExpandedOwner } from '../entity/shared/components/styled/ExpandedOwner/ExpandedOwner'; -import { EMPTY_MESSAGES } from '../entity/shared/constants'; -import { navigateToSearchUrl } from '../search/utils/navigateToSearchUrl'; -import { useEntityRegistry } from '../useEntityRegistry'; -import { useUpdateDescriptionMutation, useSetTagColorMutation } from '../../graphql/mutations.generated'; -import { useGetSearchResultsForMultipleQuery } from '../../graphql/search.generated'; -import analytics, { EventType, EntityActionType } from '../analytics'; -import { GetSearchResultsParams, SearchResultInterface } from '../entity/shared/components/styled/search/types'; -import { EditOwnersModal } from '../entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal'; -import CopyUrn from './CopyUrn'; -import EntityDropdown from '../entity/shared/EntityDropdown'; -import { EntityMenuItems } from '../entity/shared/EntityDropdown/EntityDropdown'; -import { ErrorSection } from './error/ErrorSection'; -import { generateOrFilters } from '../search/utils/generateOrFilters'; -import { ENTITY_FILTER_NAME, UnionType } from '../search/utils/constants'; +import { ApolloError } from '@apollo/client'; +import { Button, Divider, Typography, message } from 'antd'; +import ColorHash from 'color-hash'; +import React, { useCallback, useEffect, useRef, useState } from 'react'; +import { ChromePicker } from 'react-color'; +import { useHistory } from 'react-router'; +import styled from 'styled-components'; + +import analytics, { EntityActionType, EventType } from '@app/analytics'; +import EntityDropdown from '@app/entity/shared/EntityDropdown'; +import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown'; +import { ExpandedOwner } from '@app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner'; +import { GetSearchResultsParams, SearchResultInterface } from '@app/entity/shared/components/styled/search/types'; +import { EMPTY_MESSAGES } from '@app/entity/shared/constants'; +import { EditOwnersModal } from '@app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal'; +import { ENTITY_FILTER_NAME, UnionType } from '@app/search/utils/constants'; +import { generateOrFilters } from '@app/search/utils/generateOrFilters'; +import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl'; +import CopyUrn from '@app/shared/CopyUrn'; +import { ErrorSection } from '@app/shared/error/ErrorSection'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useSetTagColorMutation, useUpdateDescriptionMutation } from '@graphql/mutations.generated'; +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { useGetTagQuery } from '@graphql/tag.generated'; +import { EntityType, FacetMetadata, Maybe, Scalars } from '@types'; function useWrappedSearchResults(params: GetSearchResultsParams) { const { data, loading, error } = useGetSearchResultsForMultipleQuery(params); diff --git a/datahub-web-react/src/app/shared/TermLabel.tsx b/datahub-web-react/src/app/shared/TermLabel.tsx index 80df0a8c47..a7825c374b 100644 --- a/datahub-web-react/src/app/shared/TermLabel.tsx +++ b/datahub-web-react/src/app/shared/TermLabel.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { BookOutlined } from '@ant-design/icons'; +import React from 'react'; import styled from 'styled-components'; type Props = { diff --git a/datahub-web-react/src/app/shared/TruncatedTextWithTooltip.tsx b/datahub-web-react/src/app/shared/TruncatedTextWithTooltip.tsx index edb91d35a3..85a40ffbfd 100644 --- a/datahub-web-react/src/app/shared/TruncatedTextWithTooltip.tsx +++ b/datahub-web-react/src/app/shared/TruncatedTextWithTooltip.tsx @@ -1,10 +1,9 @@ /** * Generic Component that truncates text and shows a tooltip with the full text when hovered over using Ant Design's Tooltip component */ - -import React from 'react'; -import { TooltipProps, Typography } from 'antd'; import { Tooltip } from '@components'; +import { TooltipProps, Typography } from 'antd'; +import React from 'react'; type Props = { text: string; diff --git a/datahub-web-react/src/app/shared/VirtualScrollChild.tsx b/datahub-web-react/src/app/shared/VirtualScrollChild.tsx index 4cd539e094..2910a1b121 100644 --- a/datahub-web-react/src/app/shared/VirtualScrollChild.tsx +++ b/datahub-web-react/src/app/shared/VirtualScrollChild.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import styled from 'styled-components'; import { useInView } from 'react-intersection-observer'; +import styled from 'styled-components'; const VirtualChildWrapper = styled.div<{ $inView: boolean; $height: number }>` height: ${(props) => (props.$inView ? 'auto' : `${props.$height}px`)}; diff --git a/datahub-web-react/src/app/shared/__tests__/LinkWrapper.test.tsx b/datahub-web-react/src/app/shared/__tests__/LinkWrapper.test.tsx index 6d48bf8d55..cd8e0d8f45 100644 --- a/datahub-web-react/src/app/shared/__tests__/LinkWrapper.test.tsx +++ b/datahub-web-react/src/app/shared/__tests__/LinkWrapper.test.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import { render } from '@testing-library/react'; +import React from 'react'; import { BrowserRouter } from 'react-router-dom'; -import { LinkWrapper } from '../LinkWrapper'; + +import { LinkWrapper } from '@app/shared/LinkWrapper'; describe('LinkWrapper', () => { it('renders absolute URLs', () => { diff --git a/datahub-web-react/src/app/shared/__tests__/TruncatedTextWithTooltip.test.tsx b/datahub-web-react/src/app/shared/__tests__/TruncatedTextWithTooltip.test.tsx index 8848084304..7e5e7487cf 100644 --- a/datahub-web-react/src/app/shared/__tests__/TruncatedTextWithTooltip.test.tsx +++ b/datahub-web-react/src/app/shared/__tests__/TruncatedTextWithTooltip.test.tsx @@ -1,6 +1,7 @@ -import React from 'react'; import { render } from '@testing-library/react'; -import { TruncatedTextWithTooltip } from '../TruncatedTextWithTooltip'; +import React from 'react'; + +import { TruncatedTextWithTooltip } from '@app/shared/TruncatedTextWithTooltip'; describe('TruncatedTextWithTooltip', () => { it('renders truncated text when text is longer than maxLength', () => { diff --git a/datahub-web-react/src/app/shared/__tests__/formatNumber.test.ts b/datahub-web-react/src/app/shared/__tests__/formatNumber.test.ts index 2f09c1c46e..a63289cd19 100644 --- a/datahub-web-react/src/app/shared/__tests__/formatNumber.test.ts +++ b/datahub-web-react/src/app/shared/__tests__/formatNumber.test.ts @@ -1,4 +1,4 @@ -import { formatBytes } from '../formatNumber'; +import { formatBytes } from '@app/shared/formatNumber'; describe('formatBytes', () => { it('should property format bytes counts', () => { diff --git a/datahub-web-react/src/app/shared/__tests__/pluralize.test.ts b/datahub-web-react/src/app/shared/__tests__/pluralize.test.ts index a3c366addf..05d142d527 100644 --- a/datahub-web-react/src/app/shared/__tests__/pluralize.test.ts +++ b/datahub-web-react/src/app/shared/__tests__/pluralize.test.ts @@ -1,4 +1,4 @@ -import { pluralize } from '../textUtil'; +import { pluralize } from '@app/shared/textUtil'; describe('pluralize text based on the count', () => { it('pluralize regular word with count greater than 1', () => { diff --git a/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx b/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx index 64e12cf23b..0cd6e308a3 100644 --- a/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx +++ b/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx @@ -1,24 +1,25 @@ -import styled from 'styled-components/macro'; -import * as React from 'react'; import { ApiOutlined, BarChartOutlined, BookOutlined, - SettingOutlined, - SolutionOutlined, DownOutlined, GlobalOutlined, + SettingOutlined, + SolutionOutlined, UnorderedListOutlined, } from '@ant-design/icons'; -import { Link } from 'react-router-dom'; import { Button, Dropdown, Tooltip } from 'antd'; -import { useAppConfig, useBusinessAttributesFlag } from '../../useAppConfig'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { HOME_PAGE_INGESTION_ID } from '../../onboarding/config/HomePageOnboardingConfig'; -import { useToggleEducationStepIdsAllowList } from '../../onboarding/useToggleEducationStepIdsAllowList'; -import { PageRoutes } from '../../../conf/Global'; -import { useUserContext } from '../../context/useUserContext'; -import DomainIcon from '../../domain/DomainIcon'; +import * as React from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components/macro'; + +import { useUserContext } from '@app/context/useUserContext'; +import DomainIcon from '@app/domain/DomainIcon'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { HOME_PAGE_INGESTION_ID } from '@app/onboarding/config/HomePageOnboardingConfig'; +import { useToggleEducationStepIdsAllowList } from '@app/onboarding/useToggleEducationStepIdsAllowList'; +import { useAppConfig, useBusinessAttributesFlag } from '@app/useAppConfig'; +import { PageRoutes } from '@conf/Global'; const LinkWrapper = styled.span` margin-right: 0px; diff --git a/datahub-web-react/src/app/shared/avatar/AvatarsGroup.tsx b/datahub-web-react/src/app/shared/avatar/AvatarsGroup.tsx index 262cd7cecd..a493270f1b 100644 --- a/datahub-web-react/src/app/shared/avatar/AvatarsGroup.tsx +++ b/datahub-web-react/src/app/shared/avatar/AvatarsGroup.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { EntityType, Owner } from '../../../types.generated'; -import CustomAvatar from './CustomAvatar'; -import EntityRegistry from '../../entity/EntityRegistry'; -import { SpacedAvatarGroup } from './SpaceAvatarGroup'; + +import EntityRegistry from '@app/entity/EntityRegistry'; +import CustomAvatar from '@app/shared/avatar/CustomAvatar'; +import { SpacedAvatarGroup } from '@app/shared/avatar/SpaceAvatarGroup'; + +import { EntityType, Owner } from '@types'; type Props = { owners?: Array | null; diff --git a/datahub-web-react/src/app/shared/avatar/CustomAvatar.tsx b/datahub-web-react/src/app/shared/avatar/CustomAvatar.tsx index 994012d2ed..156f89b801 100644 --- a/datahub-web-react/src/app/shared/avatar/CustomAvatar.tsx +++ b/datahub-web-react/src/app/shared/avatar/CustomAvatar.tsx @@ -4,8 +4,9 @@ import React, { useState } from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import defaultAvatar from '../../../images/default_avatar.png'; -import getAvatarColor from './getAvatarColor'; +import getAvatarColor from '@app/shared/avatar/getAvatarColor'; + +import defaultAvatar from '@images/default_avatar.png'; const AvatarStyled = styled(Avatar)<{ size?: number; $backgroundColor?: string }>` color: #fff; diff --git a/datahub-web-react/src/app/shared/avatar/getAvatarColor.ts b/datahub-web-react/src/app/shared/avatar/getAvatarColor.ts index 4cc1bdc8ff..d954faf46a 100644 --- a/datahub-web-react/src/app/shared/avatar/getAvatarColor.ts +++ b/datahub-web-react/src/app/shared/avatar/getAvatarColor.ts @@ -1,5 +1,5 @@ -import { lineColors } from '../../analyticsDashboard/components/lineColors'; -import { ANTD_GRAY } from '../../entity/shared/constants'; +import { lineColors } from '@app/analyticsDashboard/components/lineColors'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; export function hashString(str: string) { let hash = 0; diff --git a/datahub-web-react/src/app/shared/avatar/index.tsx b/datahub-web-react/src/app/shared/avatar/index.tsx index 5e5de0d2a4..0559f40554 100644 --- a/datahub-web-react/src/app/shared/avatar/index.tsx +++ b/datahub-web-react/src/app/shared/avatar/index.tsx @@ -1,5 +1,5 @@ -import AvatarsGroupComp from './AvatarsGroup'; -import CustomAvatarComp from './CustomAvatar'; +import AvatarsGroupComp from '@app/shared/avatar/AvatarsGroup'; +import CustomAvatarComp from '@app/shared/avatar/CustomAvatar'; export const AvatarsGroup = AvatarsGroupComp; export const CustomAvatar = CustomAvatarComp; diff --git a/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx b/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx index 885ce756b2..f6c49af774 100644 --- a/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx +++ b/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx @@ -1,21 +1,20 @@ -import React, { useRef, useState } from 'react'; -import { Button, message, Modal, Select, Tag as CustomTag } from 'antd'; -import styled from 'styled-components'; import { GlobalOutlined } from '@ant-design/icons'; -import { Entity, EntityType, ResourceRefInput } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { handleBatchError } from '../../entity/shared/utils'; -import { - useAddBusinessAttributeMutation, - useRemoveBusinessAttributeMutation, -} from '../../../graphql/mutations.generated'; -import { useGetSearchResultsLazyQuery } from '../../../graphql/search.generated'; -import ClickOutside from '../ClickOutside'; -import { useGetRecommendations } from '../recommendation'; -import { useEnterKeyListener } from '../useEnterKeyListener'; -import { ENTER_KEY_CODE } from '../constants'; -import AttributeBrowser from '../../businessAttribute/AttributeBrowser'; -import { useListBusinessAttributesQuery } from '../../../graphql/businessAttribute.generated'; +import { Button, Tag as CustomTag, Modal, Select, message } from 'antd'; +import React, { useRef, useState } from 'react'; +import styled from 'styled-components'; + +import AttributeBrowser from '@app/businessAttribute/AttributeBrowser'; +import { handleBatchError } from '@app/entity/shared/utils'; +import ClickOutside from '@app/shared/ClickOutside'; +import { ENTER_KEY_CODE } from '@app/shared/constants'; +import { useGetRecommendations } from '@app/shared/recommendation'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListBusinessAttributesQuery } from '@graphql/businessAttribute.generated'; +import { useAddBusinessAttributeMutation, useRemoveBusinessAttributeMutation } from '@graphql/mutations.generated'; +import { useGetSearchResultsLazyQuery } from '@graphql/search.generated'; +import { Entity, EntityType, ResourceRefInput } from '@types'; export enum OperationType { ADD, @@ -46,7 +45,10 @@ const StyleTag = styled(CustomTag)` export const BrowserWrapper = styled.div<{ isHidden: boolean; width?: string; maxHeight?: number }>` background-color: white; border-radius: 5px; - box-shadow: 0 3px 6px -4px rgb(0 0 0 / 12%), 0 6px 16px 0 rgb(0 0 0 / 8%), 0 9px 28px 8px rgb(0 0 0 / 5%); + box-shadow: + 0 3px 6px -4px rgb(0 0 0 / 12%), + 0 6px 16px 0 rgb(0 0 0 / 8%), + 0 9px 28px 8px rgb(0 0 0 / 5%); max-height: ${(props) => (props.maxHeight ? props.maxHeight : '380')}px; overflow: auto; position: absolute; diff --git a/datahub-web-react/src/app/shared/businessAttribute/AttributeContent.tsx b/datahub-web-react/src/app/shared/businessAttribute/AttributeContent.tsx index 41ecbe69b5..e2d1fd7c27 100644 --- a/datahub-web-react/src/app/shared/businessAttribute/AttributeContent.tsx +++ b/datahub-web-react/src/app/shared/businessAttribute/AttributeContent.tsx @@ -1,13 +1,15 @@ -import styled from 'styled-components'; -import { message, Modal, Tag } from 'antd'; import { GlobalOutlined } from '@ant-design/icons'; +import { Modal, Tag, message } from 'antd'; import React from 'react'; import Highlight from 'react-highlighter'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { BusinessAttributeAssociation, EntityType } from '../../../types.generated'; -import { useHasMatchedFieldByUrn } from '../../search/context/SearchResultContext'; -import { MatchedFieldName } from '../../search/matches/constants'; -import { useRemoveBusinessAttributeMutation } from '../../../graphql/mutations.generated'; +import styled from 'styled-components'; + +import { useHasMatchedFieldByUrn } from '@app/search/context/SearchResultContext'; +import { MatchedFieldName } from '@app/search/matches/constants'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useRemoveBusinessAttributeMutation } from '@graphql/mutations.generated'; +import { BusinessAttributeAssociation, EntityType } from '@types'; const highlightMatchStyle = { background: '#ffe58f', padding: '0' }; diff --git a/datahub-web-react/src/app/shared/businessAttribute/BusinessAttributeGroup.tsx b/datahub-web-react/src/app/shared/businessAttribute/BusinessAttributeGroup.tsx index a8958b028e..2069d29137 100644 --- a/datahub-web-react/src/app/shared/businessAttribute/BusinessAttributeGroup.tsx +++ b/datahub-web-react/src/app/shared/businessAttribute/BusinessAttributeGroup.tsx @@ -1,11 +1,13 @@ -import styled from 'styled-components'; +import { PlusOutlined } from '@ant-design/icons'; import { Button, Typography } from 'antd'; import React, { useState } from 'react'; -import { PlusOutlined } from '@ant-design/icons'; -import { EMPTY_MESSAGES } from '../../entity/shared/constants'; -import { BusinessAttributeAssociation, EntityType } from '../../../types.generated'; -import EditBusinessAttributeModal from './AddBusinessAttributeModal'; -import StyledAttribute from './StyledAttribute'; +import styled from 'styled-components'; + +import { EMPTY_MESSAGES } from '@app/entity/shared/constants'; +import EditBusinessAttributeModal from '@app/shared/businessAttribute/AddBusinessAttributeModal'; +import StyledAttribute from '@app/shared/businessAttribute/StyledAttribute'; + +import { BusinessAttributeAssociation, EntityType } from '@types'; type Props = { businessAttribute?: BusinessAttributeAssociation; diff --git a/datahub-web-react/src/app/shared/businessAttribute/StyledAttribute.tsx b/datahub-web-react/src/app/shared/businessAttribute/StyledAttribute.tsx index 1a69ed23b2..f253ce9d49 100644 --- a/datahub-web-react/src/app/shared/businessAttribute/StyledAttribute.tsx +++ b/datahub-web-react/src/app/shared/businessAttribute/StyledAttribute.tsx @@ -1,10 +1,12 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { BusinessAttributeAssociation, EntityType } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { HoverEntityTooltip } from '../../recommendations/renderer/component/HoverEntityTooltip'; -import AttributeContent from './AttributeContent'; + +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import AttributeContent from '@app/shared/businessAttribute/AttributeContent'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { BusinessAttributeAssociation, EntityType } from '@types'; const AttributeLink = styled(Link)` display: inline-block; diff --git a/datahub-web-react/src/app/shared/components.tsx b/datahub-web-react/src/app/shared/components.tsx index 3977a9c36b..e67aed9e4d 100644 --- a/datahub-web-react/src/app/shared/components.tsx +++ b/datahub-web-react/src/app/shared/components.tsx @@ -1,6 +1,7 @@ import { Button } from 'antd'; import styled from 'styled-components'; -import { ANTD_GRAY } from '../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; export const HomePageButton = styled(Button)` margin-right: 12px; diff --git a/datahub-web-react/src/app/shared/deleteUtils.ts b/datahub-web-react/src/app/shared/deleteUtils.ts index a831f9338a..5f178c2d0c 100644 --- a/datahub-web-react/src/app/shared/deleteUtils.ts +++ b/datahub-web-react/src/app/shared/deleteUtils.ts @@ -1,14 +1,15 @@ -import { PageRoutes } from '../../conf/Global'; -import { useDeleteAssertionMutation } from '../../graphql/assertion.generated'; -import { useDeleteDataProductMutation } from '../../graphql/dataProduct.generated'; -import { useDeleteDomainMutation } from '../../graphql/domain.generated'; -import { useDeleteGlossaryEntityMutation } from '../../graphql/glossary.generated'; -import { useDeleteBusinessAttributeMutation } from '../../graphql/businessAttribute.generated'; -import { useRemoveGroupMutation } from '../../graphql/group.generated'; -import { useDeleteTagMutation } from '../../graphql/tag.generated'; -import { useRemoveUserMutation } from '../../graphql/user.generated'; -import { EntityType } from '../../types.generated'; -import { GenericEntityProperties } from '../entity/shared/types'; +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { PageRoutes } from '@conf/Global'; + +import { useDeleteAssertionMutation } from '@graphql/assertion.generated'; +import { useDeleteBusinessAttributeMutation } from '@graphql/businessAttribute.generated'; +import { useDeleteDataProductMutation } from '@graphql/dataProduct.generated'; +import { useDeleteDomainMutation } from '@graphql/domain.generated'; +import { useDeleteGlossaryEntityMutation } from '@graphql/glossary.generated'; +import { useRemoveGroupMutation } from '@graphql/group.generated'; +import { useDeleteTagMutation } from '@graphql/tag.generated'; +import { useRemoveUserMutation } from '@graphql/user.generated'; +import { EntityType } from '@types'; /** * Returns a relative redirect path which is used after an Entity has been deleted from it's profile page. diff --git a/datahub-web-react/src/app/shared/entitySearch/RelatedEntity.tsx b/datahub-web-react/src/app/shared/entitySearch/RelatedEntity.tsx index 5df55426a1..ed74d69997 100644 --- a/datahub-web-react/src/app/shared/entitySearch/RelatedEntity.tsx +++ b/datahub-web-react/src/app/shared/entitySearch/RelatedEntity.tsx @@ -1,9 +1,11 @@ +import { Divider, List, Typography } from 'antd'; import React from 'react'; -import { List, Typography, Divider } from 'antd'; import styled from 'styled-components'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { PreviewType } from '../../entity/Entity'; -import { EntityType, SearchResult } from '../../../types.generated'; + +import { PreviewType } from '@app/entity/Entity'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, SearchResult } from '@types'; type Props = { searchResult: { diff --git a/datahub-web-react/src/app/shared/entitySearch/__tests__/RelatedEntity.test.tsx b/datahub-web-react/src/app/shared/entitySearch/__tests__/RelatedEntity.test.tsx index 16d05f9894..aed3d36bc4 100644 --- a/datahub-web-react/src/app/shared/entitySearch/__tests__/RelatedEntity.test.tsx +++ b/datahub-web-react/src/app/shared/entitySearch/__tests__/RelatedEntity.test.tsx @@ -1,11 +1,12 @@ -import React from 'react'; -import { render } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; +import { render } from '@testing-library/react'; +import React from 'react'; -import { EntityType, PlatformNativeType, SearchResult } from '../../../../types.generated'; -import TestPageContainer from '../../../../utils/test-utils/TestPageContainer'; -import RelatedEntity from '../RelatedEntity'; -import { mocks } from '../../../../Mocks'; +import RelatedEntity from '@app/shared/entitySearch/RelatedEntity'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { EntityType, PlatformNativeType, SearchResult } from '@types'; const searchResult: { [key in EntityType]?: Array; diff --git a/datahub-web-react/src/app/shared/entitySearch/routingUtils/useUserParams.ts b/datahub-web-react/src/app/shared/entitySearch/routingUtils/useUserParams.ts index 5837ed86f3..41c849ee10 100644 --- a/datahub-web-react/src/app/shared/entitySearch/routingUtils/useUserParams.ts +++ b/datahub-web-react/src/app/shared/entitySearch/routingUtils/useUserParams.ts @@ -1,5 +1,4 @@ import { useMemo } from 'react'; - import { useLocation, useParams } from 'react-router'; type UserPageParams = { diff --git a/datahub-web-react/src/app/shared/error/ErrorSection.tsx b/datahub-web-react/src/app/shared/error/ErrorSection.tsx index d5e5ace945..d2ebffb631 100644 --- a/datahub-web-react/src/app/shared/error/ErrorSection.tsx +++ b/datahub-web-react/src/app/shared/error/ErrorSection.tsx @@ -1,8 +1,10 @@ import { Image, Typography } from 'antd'; import React from 'react'; import styled, { useTheme } from 'styled-components'; -import dataHubLogo from '../../../images/datahublogo.png'; -import { ANTD_GRAY } from '../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; + +import dataHubLogo from '@images/datahublogo.png'; const Section = styled.div` width: auto; diff --git a/datahub-web-react/src/app/shared/handleGraphQLError.ts b/datahub-web-react/src/app/shared/handleGraphQLError.ts index f129fef34c..2578e85851 100644 --- a/datahub-web-react/src/app/shared/handleGraphQLError.ts +++ b/datahub-web-react/src/app/shared/handleGraphQLError.ts @@ -1,6 +1,7 @@ import { ErrorResponse } from '@apollo/client/link/error'; import { message } from 'antd'; -import { ErrorCodes } from './constants'; + +import { ErrorCodes } from '@app/shared/constants'; interface Props { error: ErrorResponse; diff --git a/datahub-web-react/src/app/shared/health/healthUtils.tsx b/datahub-web-react/src/app/shared/health/healthUtils.tsx index c1408c06a2..29be05455a 100644 --- a/datahub-web-react/src/app/shared/health/healthUtils.tsx +++ b/datahub-web-react/src/app/shared/health/healthUtils.tsx @@ -9,9 +9,11 @@ import { } from '@ant-design/icons'; import React from 'react'; import styled from 'styled-components'; + +import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@app/entity/shared/tabs/Incident/incidentUtils'; import { GenericEntityProperties } from '@src/app/entity/shared/types'; -import { HealthStatus, HealthStatusType, Health } from '../../../types.generated'; -import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '../../entity/shared/tabs/Incident/incidentUtils'; + +import { Health, HealthStatus, HealthStatusType } from '@types'; const HEALTH_INDICATOR_COLOR = '#d48806'; diff --git a/datahub-web-react/src/app/shared/recommendation.tsx b/datahub-web-react/src/app/shared/recommendation.tsx index e616b5da04..66678929cb 100644 --- a/datahub-web-react/src/app/shared/recommendation.tsx +++ b/datahub-web-react/src/app/shared/recommendation.tsx @@ -1,5 +1,5 @@ -import { useGetSearchResultsForMultipleQuery } from '../../graphql/search.generated'; -import { Entity, EntityType } from '../../types.generated'; +import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated'; +import { Entity, EntityType } from '@types'; export const useGetRecommendations = (types: Array) => { const { data, loading } = useGetSearchResultsForMultipleQuery({ diff --git a/datahub-web-react/src/app/shared/share/ShareButton.tsx b/datahub-web-react/src/app/shared/share/ShareButton.tsx index 342d367ecf..d6e6c1460f 100644 --- a/datahub-web-react/src/app/shared/share/ShareButton.tsx +++ b/datahub-web-react/src/app/shared/share/ShareButton.tsx @@ -1,9 +1,11 @@ +import { ShareAltOutlined } from '@ant-design/icons'; +import { Button, Dropdown } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Button, Dropdown } from 'antd'; -import { ShareAltOutlined } from '@ant-design/icons'; -import { EntityType } from '../../../types.generated'; -import useShareButtonMenu from './useShareButtonMenu'; + +import useShareButtonMenu from '@app/shared/share/useShareButtonMenu'; + +import { EntityType } from '@types'; interface ShareButtonProps { urn: string; diff --git a/datahub-web-react/src/app/shared/share/items/CopyLinkMenuItem.tsx b/datahub-web-react/src/app/shared/share/items/CopyLinkMenuItem.tsx index 86345a4ca3..6b7663162c 100644 --- a/datahub-web-react/src/app/shared/share/items/CopyLinkMenuItem.tsx +++ b/datahub-web-react/src/app/shared/share/items/CopyLinkMenuItem.tsx @@ -1,8 +1,9 @@ -import React, { useState } from 'react'; -import styled from 'styled-components/macro'; import { CheckOutlined, LinkOutlined } from '@ant-design/icons'; import { Tooltip } from 'antd'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; +import React, { useState } from 'react'; +import styled from 'styled-components/macro'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; const StyledMenuItem = styled.div` && { diff --git a/datahub-web-react/src/app/shared/share/items/CopyUrnMenuItem.tsx b/datahub-web-react/src/app/shared/share/items/CopyUrnMenuItem.tsx index 9b0d1237c3..27ba51a47e 100644 --- a/datahub-web-react/src/app/shared/share/items/CopyUrnMenuItem.tsx +++ b/datahub-web-react/src/app/shared/share/items/CopyUrnMenuItem.tsx @@ -1,8 +1,9 @@ -import React, { useState } from 'react'; -import styled from 'styled-components'; import { CheckOutlined, CopyOutlined } from '@ant-design/icons'; import { Tooltip } from 'antd'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; +import React, { useState } from 'react'; +import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; interface CopyUrnMenuItemProps { urn: string; diff --git a/datahub-web-react/src/app/shared/share/items/EmailMenuItem.tsx b/datahub-web-react/src/app/shared/share/items/EmailMenuItem.tsx index 56829e403f..12cd6eb13e 100644 --- a/datahub-web-react/src/app/shared/share/items/EmailMenuItem.tsx +++ b/datahub-web-react/src/app/shared/share/items/EmailMenuItem.tsx @@ -1,9 +1,10 @@ +import { CheckOutlined, MailOutlined } from '@ant-design/icons'; +import { Tooltip } from 'antd'; +import qs from 'query-string'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Tooltip } from 'antd'; -import { CheckOutlined, MailOutlined } from '@ant-design/icons'; -import qs from 'query-string'; -import { ANTD_GRAY } from '../../../entity/shared/constants'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; interface EmailMenuItemProps { urn: string; diff --git a/datahub-web-react/src/app/shared/share/useShareButtonMenu.tsx b/datahub-web-react/src/app/shared/share/useShareButtonMenu.tsx index 7c53eb5109..9f1ee4f66f 100644 --- a/datahub-web-react/src/app/shared/share/useShareButtonMenu.tsx +++ b/datahub-web-react/src/app/shared/share/useShareButtonMenu.tsx @@ -1,10 +1,12 @@ -import React from 'react'; import { MenuProps } from 'antd'; -import { EntityType } from '../../../types.generated'; -import CopyLinkMenuItem from './items/CopyLinkMenuItem'; -import CopyUrnMenuItem from './items/CopyUrnMenuItem'; -import EmailMenuItem from './items/EmailMenuItem'; -import { useEntityRegistry } from '../../useEntityRegistry'; +import React from 'react'; + +import CopyLinkMenuItem from '@app/shared/share/items/CopyLinkMenuItem'; +import CopyUrnMenuItem from '@app/shared/share/items/CopyUrnMenuItem'; +import EmailMenuItem from '@app/shared/share/items/EmailMenuItem'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; interface ShareButtonMenuProps { urn: string; diff --git a/datahub-web-react/src/app/shared/share/v2/ShareButtonMenu.tsx b/datahub-web-react/src/app/shared/share/v2/ShareButtonMenu.tsx index 332451c38d..ca755474c9 100644 --- a/datahub-web-react/src/app/shared/share/v2/ShareButtonMenu.tsx +++ b/datahub-web-react/src/app/shared/share/v2/ShareButtonMenu.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import { EntityType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import CopyLinkMenuItem from './items/CopyLinkMenuItem'; -import CopyUrnMenuItem from './items/CopyUrnMenuItem'; -import EmailMenuItem from './items/EmailMenuItem'; + +import CopyLinkMenuItem from '@app/shared/share/v2/items/CopyLinkMenuItem'; +import CopyUrnMenuItem from '@app/shared/share/v2/items/CopyUrnMenuItem'; +import EmailMenuItem from '@app/shared/share/v2/items/EmailMenuItem'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; interface ShareButtonMenuProps { urn: string; diff --git a/datahub-web-react/src/app/shared/share/v2/ShareMenuAction.tsx b/datahub-web-react/src/app/shared/share/v2/ShareMenuAction.tsx index 5610ab124a..62434b75f4 100644 --- a/datahub-web-react/src/app/shared/share/v2/ShareMenuAction.tsx +++ b/datahub-web-react/src/app/shared/share/v2/ShareMenuAction.tsx @@ -1,10 +1,11 @@ -import React from 'react'; -import { Dropdown } from 'antd'; import { ShareAltOutlined } from '@ant-design/icons'; -import { ActionMenuItem } from '../../../entityV2/shared/EntityDropdown/styledComponents'; -import { useEntityData } from '../../../entity/shared/EntityContext'; -import ShareButtonMenu from './ShareButtonMenu'; -import { StyledMenu } from './styledComponents'; +import { Dropdown } from 'antd'; +import React from 'react'; + +import { useEntityData } from '@app/entity/shared/EntityContext'; +import { ActionMenuItem } from '@app/entityV2/shared/EntityDropdown/styledComponents'; +import ShareButtonMenu from '@app/shared/share/v2/ShareButtonMenu'; +import { StyledMenu } from '@app/shared/share/v2/styledComponents'; export default function ShareMenuAction() { const { urn, entityType, entityData } = useEntityData(); diff --git a/datahub-web-react/src/app/shared/share/v2/items/CopyLinkMenuItem.tsx b/datahub-web-react/src/app/shared/share/v2/items/CopyLinkMenuItem.tsx index ec1646c9a5..8e51f1b09a 100644 --- a/datahub-web-react/src/app/shared/share/v2/items/CopyLinkMenuItem.tsx +++ b/datahub-web-react/src/app/shared/share/v2/items/CopyLinkMenuItem.tsx @@ -1,10 +1,12 @@ -import React, { useState } from 'react'; -import styled from 'styled-components/macro'; import { CheckOutlined, LinkOutlined } from '@ant-design/icons'; import { Text, Tooltip } from '@components'; -import { StyledMenuItem } from '../styledComponents'; -import { EntityType } from '../../../../../types.generated'; -import { useEntityRegistryV2 } from '../../../../useEntityRegistry'; +import React, { useState } from 'react'; +import styled from 'styled-components/macro'; + +import { StyledMenuItem } from '@app/shared/share/v2/styledComponents'; +import { useEntityRegistryV2 } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; interface CopyLinkMenuItemProps { key: string; diff --git a/datahub-web-react/src/app/shared/share/v2/items/CopyUrnMenuItem.tsx b/datahub-web-react/src/app/shared/share/v2/items/CopyUrnMenuItem.tsx index c5f2d172ec..5ae0573ce1 100644 --- a/datahub-web-react/src/app/shared/share/v2/items/CopyUrnMenuItem.tsx +++ b/datahub-web-react/src/app/shared/share/v2/items/CopyUrnMenuItem.tsx @@ -1,8 +1,9 @@ -import React, { useState } from 'react'; -import styled from 'styled-components'; import { CheckOutlined, CopyOutlined } from '@ant-design/icons'; import { Tooltip } from '@components'; -import { StyledMenuItem } from '../styledComponents'; +import React, { useState } from 'react'; +import styled from 'styled-components'; + +import { StyledMenuItem } from '@app/shared/share/v2/styledComponents'; interface CopyUrnMenuItemProps { urn: string; diff --git a/datahub-web-react/src/app/shared/share/v2/items/EmailMenuItem.tsx b/datahub-web-react/src/app/shared/share/v2/items/EmailMenuItem.tsx index 2b8e3da047..a876aef627 100644 --- a/datahub-web-react/src/app/shared/share/v2/items/EmailMenuItem.tsx +++ b/datahub-web-react/src/app/shared/share/v2/items/EmailMenuItem.tsx @@ -1,9 +1,10 @@ +import { CheckOutlined, MailOutlined } from '@ant-design/icons'; +import { Tooltip } from '@components'; +import qs from 'query-string'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Tooltip } from '@components'; -import { CheckOutlined, MailOutlined } from '@ant-design/icons'; -import qs from 'query-string'; -import { StyledMenuItem } from '../styledComponents'; + +import { StyledMenuItem } from '@app/shared/share/v2/styledComponents'; interface EmailMenuItemProps { urn: string; diff --git a/datahub-web-react/src/app/shared/share/v2/styledComponents.tsx b/datahub-web-react/src/app/shared/share/v2/styledComponents.tsx index e0661833a6..976d0194cb 100644 --- a/datahub-web-react/src/app/shared/share/v2/styledComponents.tsx +++ b/datahub-web-react/src/app/shared/share/v2/styledComponents.tsx @@ -1,6 +1,7 @@ import { Button, Checkbox, Form, Menu, Modal, Typography } from 'antd'; import styled from 'styled-components'; -import { REDESIGN_COLORS } from '../../../entityV2/shared/constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; export const StyledMenuItem = styled(Menu.Item)` min-width: 120px; @@ -72,7 +73,9 @@ export const StyledModal = styled(Modal)` max-width: 680px; &&& .ant-modal-content { - box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25), 0px 4px 8px 3px rgba(0, 0, 0, 0.15); + box-shadow: + 0px 4px 4px 0px rgba(0, 0, 0, 0.25), + 0px 4px 8px 3px rgba(0, 0, 0, 0.15); border-radius: 12px; } diff --git a/datahub-web-react/src/app/shared/sidebar/EmptySectionText.tsx b/datahub-web-react/src/app/shared/sidebar/EmptySectionText.tsx index 10236261fd..232d4a8b5c 100644 --- a/datahub-web-react/src/app/shared/sidebar/EmptySectionText.tsx +++ b/datahub-web-react/src/app/shared/sidebar/EmptySectionText.tsx @@ -1,6 +1,6 @@ +import { Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Typography } from 'antd'; const EmptyContentMessage = styled(Typography.Text)` font-size: 12px; diff --git a/datahub-web-react/src/app/shared/sidebar/components.tsx b/datahub-web-react/src/app/shared/sidebar/components.tsx index c413680398..86529b3d80 100644 --- a/datahub-web-react/src/app/shared/sidebar/components.tsx +++ b/datahub-web-react/src/app/shared/sidebar/components.tsx @@ -1,8 +1,9 @@ +import { RightOutlined } from '@ant-design/icons'; import { countries } from 'country-data-list'; import React from 'react'; -import { RightOutlined } from '@ant-design/icons'; import styled from 'styled-components'; -import { RotatingButton } from '../components'; + +import { RotatingButton } from '@app/shared/components'; export const SidebarWrapper = styled.div<{ width: number }>` max-height: 100%; diff --git a/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx b/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx index bfa84bf971..a3df038833 100644 --- a/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx +++ b/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx @@ -1,30 +1,32 @@ -import React, { useRef, useState } from 'react'; -import { message, Modal, Select, Typography, Tag as CustomTag, Form, Empty } from 'antd'; import { LoadingOutlined } from '@ant-design/icons'; +import { Tag as CustomTag, Empty, Form, Modal, Select, Typography, message } from 'antd'; +import React, { useRef, useState } from 'react'; import styled from 'styled-components'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { FORBIDDEN_URN_CHARS_REGEX, handleBatchError } from '@app/entity/shared/utils'; +import GlossaryBrowser from '@app/glossary/GlossaryBrowser/GlossaryBrowser'; +import ParentEntities from '@app/search/filters/ParentEntities'; +import { getParentEntities } from '@app/search/filters/utils'; +import ClickOutside from '@app/shared/ClickOutside'; +import { ModalButtonContainer } from '@app/shared/button/styledComponents'; +import { ENTER_KEY_CODE } from '@app/shared/constants'; +import { useGetRecommendations } from '@app/shared/recommendation'; +import CreateTagModal from '@app/shared/tags/CreateTagModal'; +import { TagTermLabel } from '@app/shared/tags/TagTermLabel'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { Button } from '@src/alchemy-components'; -import { useGetAutoCompleteResultsLazyQuery } from '../../../graphql/search.generated'; -import { EntityType, Tag, Entity, ResourceRefInput } from '../../../types.generated'; -import CreateTagModal from './CreateTagModal'; +import { getModalDomContainer } from '@utils/focus'; + import { useBatchAddTagsMutation, useBatchAddTermsMutation, useBatchRemoveTagsMutation, useBatchRemoveTermsMutation, -} from '../../../graphql/mutations.generated'; -import { useEnterKeyListener } from '../useEnterKeyListener'; -import GlossaryBrowser from '../../glossary/GlossaryBrowser/GlossaryBrowser'; -import ClickOutside from '../ClickOutside'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { useGetRecommendations } from '../recommendation'; -import { FORBIDDEN_URN_CHARS_REGEX, handleBatchError } from '../../entity/shared/utils'; -import { TagTermLabel } from './TagTermLabel'; -import { ENTER_KEY_CODE } from '../constants'; -import { getModalDomContainer } from '../../../utils/focus'; -import ParentEntities from '../../search/filters/ParentEntities'; -import { getParentEntities } from '../../search/filters/utils'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { ModalButtonContainer } from '../button/styledComponents'; +} from '@graphql/mutations.generated'; +import { useGetAutoCompleteResultsLazyQuery } from '@graphql/search.generated'; +import { Entity, EntityType, ResourceRefInput, Tag } from '@types'; export enum OperationType { ADD, @@ -61,7 +63,10 @@ export const BrowserWrapper = styled.div<{ }>` background-color: white; border-radius: 5px; - box-shadow: 0 3px 6px -4px rgb(0 0 0 / 12%), 0 6px 16px 0 rgb(0 0 0 / 8%), 0 9px 28px 8px rgb(0 0 0 / 5%); + box-shadow: + 0 3px 6px -4px rgb(0 0 0 / 12%), + 0 6px 16px 0 rgb(0 0 0 / 8%), + 0 9px 28px 8px rgb(0 0 0 / 5%); max-height: ${(props) => (props.maxHeight ? props.maxHeight : '380')}px; overflow: auto; position: absolute; diff --git a/datahub-web-react/src/app/shared/tags/CreateTagModal.tsx b/datahub-web-react/src/app/shared/tags/CreateTagModal.tsx index 7c20f9a2d1..9818f28659 100644 --- a/datahub-web-react/src/app/shared/tags/CreateTagModal.tsx +++ b/datahub-web-react/src/app/shared/tags/CreateTagModal.tsx @@ -1,11 +1,13 @@ +import { Button, Input, Modal, Space, message } from 'antd'; import React, { useState } from 'react'; -import { message, Button, Input, Modal, Space } from 'antd'; import styled from 'styled-components'; -import { useBatchAddTagsMutation } from '../../../graphql/mutations.generated'; -import { useCreateTagMutation } from '../../../graphql/tag.generated'; -import { ResourceRefInput } from '../../../types.generated'; -import { useEnterKeyListener } from '../useEnterKeyListener'; -import { handleBatchError } from '../../entity/shared/utils'; + +import { handleBatchError } from '@app/entity/shared/utils'; +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; + +import { useBatchAddTagsMutation } from '@graphql/mutations.generated'; +import { useCreateTagMutation } from '@graphql/tag.generated'; +import { ResourceRefInput } from '@types'; type CreateTagModalProps = { open: boolean; diff --git a/datahub-web-react/src/app/shared/tags/DataProductLink.tsx b/datahub-web-react/src/app/shared/tags/DataProductLink.tsx index 7d31048e62..666d4ba7b4 100644 --- a/datahub-web-react/src/app/shared/tags/DataProductLink.tsx +++ b/datahub-web-react/src/app/shared/tags/DataProductLink.tsx @@ -2,11 +2,13 @@ import { Tag } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { DataProduct, EntityType } from '../../../types.generated'; -import { IconStyleType } from '../../entity/Entity'; -import { HoverEntityTooltip } from '../../recommendations/renderer/component/HoverEntityTooltip'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ANTD_GRAY } from '../../entity/shared/constants'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DataProduct, EntityType } from '@types'; const DomainLinkContainer = styled(Link)` display: inline-block; diff --git a/datahub-web-react/src/app/shared/tags/DomainLink.tsx b/datahub-web-react/src/app/shared/tags/DomainLink.tsx index a14114ce43..0180e3887b 100644 --- a/datahub-web-react/src/app/shared/tags/DomainLink.tsx +++ b/datahub-web-react/src/app/shared/tags/DomainLink.tsx @@ -2,11 +2,13 @@ import { Tag } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { Domain, EntityType } from '../../../types.generated'; -import { HoverEntityTooltip } from '../../recommendations/renderer/component/HoverEntityTooltip'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import DomainIcon from '../../domain/DomainIcon'; + +import DomainIcon from '@app/domain/DomainIcon'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Domain, EntityType } from '@types'; const DomainLinkContainer = styled(Link)` display: inline-block; diff --git a/datahub-web-react/src/app/shared/tags/TagProfileDrawer.tsx b/datahub-web-react/src/app/shared/tags/TagProfileDrawer.tsx index bebbdea027..827f4734ba 100644 --- a/datahub-web-react/src/app/shared/tags/TagProfileDrawer.tsx +++ b/datahub-web-react/src/app/shared/tags/TagProfileDrawer.tsx @@ -1,11 +1,12 @@ -import React from 'react'; -import { Drawer, Button, Space } from 'antd'; -import styled from 'styled-components'; import { InfoCircleOutlined } from '@ant-design/icons'; +import { Button, Drawer, Space } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; -import TagStyleEntity from '../TagStyleEntity'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { EntityType } from '../../../types.generated'; +import TagStyleEntity from '@app/shared/TagStyleEntity'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType } from '@types'; type Props = { closeTagProfileDrawer?: () => void; diff --git a/datahub-web-react/src/app/shared/tags/TagTermGroup.tsx b/datahub-web-react/src/app/shared/tags/TagTermGroup.tsx index 70d29cd8be..57dc2d0b2b 100644 --- a/datahub-web-react/src/app/shared/tags/TagTermGroup.tsx +++ b/datahub-web-react/src/app/shared/tags/TagTermGroup.tsx @@ -1,16 +1,17 @@ -import { Typography, Button } from 'antd'; -import React, { useState } from 'react'; -import styled from 'styled-components'; import { PlusOutlined } from '@ant-design/icons'; +import { Button, Typography } from 'antd'; +import React, { useState } from 'react'; import Highlight from 'react-highlighter'; +import styled from 'styled-components'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { Domain, EntityType, GlobalTags, GlossaryTerms, SubResourceType } from '../../../types.generated'; -import { EMPTY_MESSAGES, ANTD_GRAY } from '../../entity/shared/constants'; -import { DomainLink } from './DomainLink'; -import EditTagTermsModal from './AddTagsTermsModal'; -import StyledTerm from './term/StyledTerm'; -import Tag from './tag/Tag'; +import { ANTD_GRAY, EMPTY_MESSAGES } from '@app/entity/shared/constants'; +import EditTagTermsModal from '@app/shared/tags/AddTagsTermsModal'; +import { DomainLink } from '@app/shared/tags/DomainLink'; +import Tag from '@app/shared/tags/tag/Tag'; +import StyledTerm from '@app/shared/tags/term/StyledTerm'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Domain, EntityType, GlobalTags, GlossaryTerms, SubResourceType } from '@types'; type Props = { uneditableTags?: GlobalTags | null; diff --git a/datahub-web-react/src/app/shared/tags/TagTermLabel.tsx b/datahub-web-react/src/app/shared/tags/TagTermLabel.tsx index b48000c6df..bcc187eaa4 100644 --- a/datahub-web-react/src/app/shared/tags/TagTermLabel.tsx +++ b/datahub-web-react/src/app/shared/tags/TagTermLabel.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import { Entity, EntityType, Tag } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import TagLabel from '../TagLabel'; -import TermLabel from '../TermLabel'; + +import TagLabel from '@app/shared/TagLabel'; +import TermLabel from '@app/shared/TermLabel'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, EntityType, Tag } from '@types'; type Props = { // default behavior is to accept an entity and render label based on that diff --git a/datahub-web-react/src/app/shared/tags/__tests__/TagTermGroup.test.tsx b/datahub-web-react/src/app/shared/tags/__tests__/TagTermGroup.test.tsx index 8d9f92b281..5fd361e097 100644 --- a/datahub-web-react/src/app/shared/tags/__tests__/TagTermGroup.test.tsx +++ b/datahub-web-react/src/app/shared/tags/__tests__/TagTermGroup.test.tsx @@ -1,11 +1,12 @@ -import React from 'react'; -import { fireEvent, render, waitFor } from '@testing-library/react'; import { MockedProvider } from '@apollo/client/testing'; +import { fireEvent, render, waitFor } from '@testing-library/react'; +import React from 'react'; -import TagTermGroup from '../TagTermGroup'; -import TestPageContainer from '../../../../utils/test-utils/TestPageContainer'; -import { EntityType, GlobalTags, GlossaryTerms } from '../../../../types.generated'; -import { mocks } from '../../../../Mocks'; +import TagTermGroup from '@app/shared/tags/TagTermGroup'; +import { mocks } from '@src/Mocks'; +import TestPageContainer from '@utils/test-utils/TestPageContainer'; + +import { EntityType, GlobalTags, GlossaryTerms } from '@types'; const legacyTag = { urn: 'urn:li:tag:legacy', diff --git a/datahub-web-react/src/app/shared/tags/tag/Tag.tsx b/datahub-web-react/src/app/shared/tags/tag/Tag.tsx index ed2460b6ee..2b32663e43 100644 --- a/datahub-web-react/src/app/shared/tags/tag/Tag.tsx +++ b/datahub-web-react/src/app/shared/tags/tag/Tag.tsx @@ -1,14 +1,16 @@ -import { message, Modal } from 'antd'; -import styled from 'styled-components'; +import { Modal, message } from 'antd'; import React, { useState } from 'react'; import Highlight from 'react-highlighter'; -import { useRemoveTagMutation } from '../../../../graphql/mutations.generated'; -import { EntityType, SubResourceType, TagAssociation } from '../../../../types.generated'; -import { StyledTag } from '../../../entity/shared/components/styled/StyledTag'; -import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { TagProfileDrawer } from '../TagProfileDrawer'; -import { useHasMatchedFieldByUrn } from '../../../search/context/SearchResultContext'; +import styled from 'styled-components'; + +import { StyledTag } from '@app/entity/shared/components/styled/StyledTag'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useHasMatchedFieldByUrn } from '@app/search/context/SearchResultContext'; +import { TagProfileDrawer } from '@app/shared/tags/TagProfileDrawer'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useRemoveTagMutation } from '@graphql/mutations.generated'; +import { EntityType, SubResourceType, TagAssociation } from '@types'; const TagLink = styled.span` display: inline-block; diff --git a/datahub-web-react/src/app/shared/tags/term/StyledTerm.tsx b/datahub-web-react/src/app/shared/tags/term/StyledTerm.tsx index 464dc17ac6..e56f4bf913 100644 --- a/datahub-web-react/src/app/shared/tags/term/StyledTerm.tsx +++ b/datahub-web-react/src/app/shared/tags/term/StyledTerm.tsx @@ -1,10 +1,12 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { EntityType, GlossaryTermAssociation } from '../../../../types.generated'; -import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import TermContent from './TermContent'; + +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import TermContent from '@app/shared/tags/term/TermContent'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, GlossaryTermAssociation } from '@types'; const TermLink = styled(Link)` display: inline-block; diff --git a/datahub-web-react/src/app/shared/tags/term/TermContent.tsx b/datahub-web-react/src/app/shared/tags/term/TermContent.tsx index fe90e2f284..1789142f4f 100644 --- a/datahub-web-react/src/app/shared/tags/term/TermContent.tsx +++ b/datahub-web-react/src/app/shared/tags/term/TermContent.tsx @@ -1,12 +1,14 @@ import { BookOutlined } from '@ant-design/icons'; -import { message, Modal, Tag } from 'antd'; +import { Modal, Tag, message } from 'antd'; import React from 'react'; -import styled from 'styled-components'; import Highlight from 'react-highlighter'; -import { useRemoveTermMutation } from '../../../../graphql/mutations.generated'; -import { EntityType, GlossaryTermAssociation, SubResourceType } from '../../../../types.generated'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { useHasMatchedFieldByUrn } from '../../../search/context/SearchResultContext'; +import styled from 'styled-components'; + +import { useHasMatchedFieldByUrn } from '@app/search/context/SearchResultContext'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useRemoveTermMutation } from '@graphql/mutations.generated'; +import { EntityType, GlossaryTermAssociation, SubResourceType } from '@types'; const highlightMatchStyle = { background: '#ffe58f', padding: '0' }; diff --git a/datahub-web-react/src/app/shared/tags/utils/convertTagsForUpdate.ts b/datahub-web-react/src/app/shared/tags/utils/convertTagsForUpdate.ts index c40f3a4244..2c29333149 100644 --- a/datahub-web-react/src/app/shared/tags/utils/convertTagsForUpdate.ts +++ b/datahub-web-react/src/app/shared/tags/utils/convertTagsForUpdate.ts @@ -1,4 +1,4 @@ -import { TagAssociation, TagAssociationUpdate } from '../../../../types.generated'; +import { TagAssociation, TagAssociationUpdate } from '@types'; export function convertTagsForUpdate(tags: TagAssociation[]): TagAssociationUpdate[] { return tags.map((tag) => ({ diff --git a/datahub-web-react/src/app/shared/time/__tests__/timeUtils.test.tsx b/datahub-web-react/src/app/shared/time/__tests__/timeUtils.test.tsx index 26a459ab3b..7d699f3e5c 100644 --- a/datahub-web-react/src/app/shared/time/__tests__/timeUtils.test.tsx +++ b/datahub-web-react/src/app/shared/time/__tests__/timeUtils.test.tsx @@ -1,5 +1,6 @@ -import { addInterval } from '../timeUtils'; -import { DateInterval } from '../../../../types.generated'; +import { addInterval } from '@app/shared/time/timeUtils'; + +import { DateInterval } from '@types'; describe('timeUtils', () => { describe('addInterval', () => { diff --git a/datahub-web-react/src/app/shared/time/timeUtils.tsx b/datahub-web-react/src/app/shared/time/timeUtils.tsx index 7dee14cdf1..4e7e2176da 100644 --- a/datahub-web-react/src/app/shared/time/timeUtils.tsx +++ b/datahub-web-react/src/app/shared/time/timeUtils.tsx @@ -1,7 +1,8 @@ import dayjs from 'dayjs'; import relativeTime from 'dayjs/plugin/relativeTime'; import moment from 'moment'; -import { DateInterval } from '../../../types.generated'; + +import { DateInterval } from '@types'; dayjs.extend(relativeTime); diff --git a/datahub-web-react/src/app/shared/updateQueryParams.ts b/datahub-web-react/src/app/shared/updateQueryParams.ts index 52b654075f..8a10e60a8a 100644 --- a/datahub-web-react/src/app/shared/updateQueryParams.ts +++ b/datahub-web-react/src/app/shared/updateQueryParams.ts @@ -1,5 +1,5 @@ +import { History, Location } from 'history'; import * as QueryString from 'query-string'; -import { Location, History } from 'history'; type QueryParam = { [key: string]: string | undefined; diff --git a/datahub-web-react/src/app/shared/useEmbeddedProfileLinkProps.tsx b/datahub-web-react/src/app/shared/useEmbeddedProfileLinkProps.tsx index 4917b64c18..2e3ac7c0be 100644 --- a/datahub-web-react/src/app/shared/useEmbeddedProfileLinkProps.tsx +++ b/datahub-web-react/src/app/shared/useEmbeddedProfileLinkProps.tsx @@ -1,5 +1,6 @@ import { useMemo } from 'react'; -import { PageRoutes } from '../../conf/Global'; + +import { PageRoutes } from '@conf/Global'; // Function to check if the current page is an embedded profile const isEmbeddedProfile = () => window.location.pathname.startsWith(PageRoutes.EMBED); diff --git a/datahub-web-react/src/app/sharedV2/TimestampPopover.tsx b/datahub-web-react/src/app/sharedV2/TimestampPopover.tsx index 09c740c033..e51c17a244 100644 --- a/datahub-web-react/src/app/sharedV2/TimestampPopover.tsx +++ b/datahub-web-react/src/app/sharedV2/TimestampPopover.tsx @@ -1,8 +1,9 @@ +import { Popover } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Popover } from '@components'; + import colors from '@src/alchemy-components/theme/foundations/colors'; -import { toRelativeTimeString, toLocalDateTimeString } from '@src/app/shared/time/timeUtils'; +import { toLocalDateTimeString, toRelativeTimeString } from '@src/app/shared/time/timeUtils'; const PopoverContent = styled.div` color: ${colors.gray[500]}; diff --git a/datahub-web-react/src/app/sharedV2/__tests__/utils.test.tsx b/datahub-web-react/src/app/sharedV2/__tests__/utils.test.tsx index 8fc178933a..a808040f96 100644 --- a/datahub-web-react/src/app/sharedV2/__tests__/utils.test.tsx +++ b/datahub-web-react/src/app/sharedV2/__tests__/utils.test.tsx @@ -1,6 +1,8 @@ import { render } from '@testing-library/react'; -import { ColumnTypeIcon, TypeTooltipTitle } from '../utils'; -import { SchemaFieldDataType } from '../../../types.generated'; + +import { ColumnTypeIcon, TypeTooltipTitle } from '@app/sharedV2/utils'; + +import { SchemaFieldDataType } from '@types'; describe('ColumnTypeIcon', () => { it('should return FontColorsOutlined for String type', () => { diff --git a/datahub-web-react/src/app/sharedV2/buttons/BackButton.tsx b/datahub-web-react/src/app/sharedV2/buttons/BackButton.tsx index 704914f008..7f22896629 100644 --- a/datahub-web-react/src/app/sharedV2/buttons/BackButton.tsx +++ b/datahub-web-react/src/app/sharedV2/buttons/BackButton.tsx @@ -1,9 +1,10 @@ -import React from 'react'; -import styled from 'styled-components'; -import { Button } from 'antd'; import { Tooltip } from '@components'; import KeyboardBackspaceIcon from '@mui/icons-material/KeyboardBackspace'; -import { REDESIGN_COLORS } from '../../entityV2/shared/constants'; +import { Button } from 'antd'; +import React from 'react'; +import styled from 'styled-components'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; const StyledButton = styled(Button)` height: 25px; diff --git a/datahub-web-react/src/app/sharedV2/cards/EntityCountCard.tsx b/datahub-web-react/src/app/sharedV2/cards/EntityCountCard.tsx index 7355bfb55b..9167ee905d 100644 --- a/datahub-web-react/src/app/sharedV2/cards/EntityCountCard.tsx +++ b/datahub-web-react/src/app/sharedV2/cards/EntityCountCard.tsx @@ -1,10 +1,11 @@ -import React from 'react'; -import styled from 'styled-components/macro'; -import { Link } from 'react-router-dom'; import { Tooltip } from '@components'; -import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../../entityV2/shared/constants'; -import { formatNumber, formatNumberWithoutAbbreviation } from '../../shared/formatNumber'; -import { generateColor } from '../../entityV2/shared/components/styled/StyledTag'; +import React from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components/macro'; + +import { generateColor } from '@app/entityV2/shared/components/styled/StyledTag'; +import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { formatNumber, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber'; const Card = styled(Link)` align-items: center; diff --git a/datahub-web-react/src/app/sharedV2/cards/SummaryEntityCard.tsx b/datahub-web-react/src/app/sharedV2/cards/SummaryEntityCard.tsx index c434d77898..4e1c6232d9 100644 --- a/datahub-web-react/src/app/sharedV2/cards/SummaryEntityCard.tsx +++ b/datahub-web-react/src/app/sharedV2/cards/SummaryEntityCard.tsx @@ -1,7 +1,9 @@ import React from 'react'; import styled from 'styled-components/macro'; -import { EntityCard } from '../../homeV2/content/recent/EntityCard'; -import { Entity } from '../../../types.generated'; + +import { EntityCard } from '@app/homeV2/content/recent/EntityCard'; + +import { Entity } from '@types'; const StyledEntityCard = styled(EntityCard)` min-width: 150px; diff --git a/datahub-web-react/src/app/sharedV2/cards/components.tsx b/datahub-web-react/src/app/sharedV2/cards/components.tsx index b1ef4b4feb..168c9d21e5 100644 --- a/datahub-web-react/src/app/sharedV2/cards/components.tsx +++ b/datahub-web-react/src/app/sharedV2/cards/components.tsx @@ -1,5 +1,6 @@ import styled from 'styled-components'; -import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../../entity/shared/constants'; + +import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '@app/entity/shared/constants'; export const Card = styled.div` background-color: ${ANTD_GRAY[1]}; diff --git a/datahub-web-react/src/app/sharedV2/cards/filterFromHex.ts b/datahub-web-react/src/app/sharedV2/cards/filterFromHex.ts index 9c2612dad4..53172d0619 100644 --- a/datahub-web-react/src/app/sharedV2/cards/filterFromHex.ts +++ b/datahub-web-react/src/app/sharedV2/cards/filterFromHex.ts @@ -1,5 +1,5 @@ // eslint-disable-next-line max-classes-per-file -import { hexToRgb } from '../colors/colorUtils'; +import { hexToRgb } from '@app/sharedV2/colors/colorUtils'; // Taken from https://stackoverflow.com/questions/42966641/how-to-transform-black-into-any-given-color-using-only-css-filters/43960991#43960991 export default function getFilterFromHex(hex): string { diff --git a/datahub-web-react/src/app/sharedV2/carousel/Carousel.tsx b/datahub-web-react/src/app/sharedV2/carousel/Carousel.tsx index 8788e08158..d4f4c415b5 100644 --- a/datahub-web-react/src/app/sharedV2/carousel/Carousel.tsx +++ b/datahub-web-react/src/app/sharedV2/carousel/Carousel.tsx @@ -1,9 +1,10 @@ -import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; -import NavigateNextOutlinedIcon from '@mui/icons-material/NavigateNextOutlined'; import NavigateBeforeOutlinedIcon from '@mui/icons-material/NavigateBeforeOutlined'; +import NavigateNextOutlinedIcon from '@mui/icons-material/NavigateNextOutlined'; +import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import styled from 'styled-components'; -import { REDESIGN_COLORS, SEARCH_COLORS } from '../../entityV2/shared/constants'; -import { HorizontalList } from '../../entityV2/shared/summary/ListComponents'; + +import { REDESIGN_COLORS, SEARCH_COLORS } from '@app/entityV2/shared/constants'; +import { HorizontalList } from '@app/entityV2/shared/summary/ListComponents'; const Wrapper = styled.div` position: relative; diff --git a/datahub-web-react/src/app/sharedV2/carousel/HorizontalScroller.tsx b/datahub-web-react/src/app/sharedV2/carousel/HorizontalScroller.tsx index 1f57d8f20a..867a942d1a 100644 --- a/datahub-web-react/src/app/sharedV2/carousel/HorizontalScroller.tsx +++ b/datahub-web-react/src/app/sharedV2/carousel/HorizontalScroller.tsx @@ -1,8 +1,9 @@ +import NavigateBeforeOutlinedIcon from '@mui/icons-material/NavigateBeforeOutlined'; +import NavigateNextOutlinedIcon from '@mui/icons-material/NavigateNextOutlined'; import React, { useCallback, useEffect, useRef, useState } from 'react'; import styled from 'styled-components/macro'; -import NavigateNextOutlinedIcon from '@mui/icons-material/NavigateNextOutlined'; -import NavigateBeforeOutlinedIcon from '@mui/icons-material/NavigateBeforeOutlined'; -import { REDESIGN_COLORS } from '../../entityV2/shared/constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; const ScrollButton = styled.button<{ alwaysVisible: boolean; @@ -29,7 +30,9 @@ const ScrollButton = styled.button<{ border-radius: 50%; color: ${REDESIGN_COLORS.BLACK}; background-color: ${REDESIGN_COLORS.WHITE}; - transition: background-color 0.3s ease-in-out, color 0.3s ease-in-out; + transition: + background-color 0.3s ease-in-out, + color 0.3s ease-in-out; box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.3); &:hover { diff --git a/datahub-web-react/src/app/sharedV2/icons/CompactFieldIcon.tsx b/datahub-web-react/src/app/sharedV2/icons/CompactFieldIcon.tsx index 7137dafa60..2b0af76c05 100644 --- a/datahub-web-react/src/app/sharedV2/icons/CompactFieldIcon.tsx +++ b/datahub-web-react/src/app/sharedV2/icons/CompactFieldIcon.tsx @@ -1,5 +1,3 @@ -import React from 'react'; -import { Tooltip } from '@components'; import { BoldOutlined, CalendarOutlined, @@ -9,7 +7,10 @@ import { NumberOutlined, ProfileOutlined, } from '@ant-design/icons'; -import { SchemaFieldDataType } from '../../../types.generated'; +import { Tooltip } from '@components'; +import React from 'react'; + +import { SchemaFieldDataType } from '@types'; export default function CompactFieldIcon(type?: SchemaFieldDataType): JSX.Element | null { if (type === SchemaFieldDataType.Number) { diff --git a/datahub-web-react/src/app/sharedV2/icons/ImageColoredBackground.tsx b/datahub-web-react/src/app/sharedV2/icons/ImageColoredBackground.tsx index 37881ac26d..7715b62c05 100644 --- a/datahub-web-react/src/app/sharedV2/icons/ImageColoredBackground.tsx +++ b/datahub-web-react/src/app/sharedV2/icons/ImageColoredBackground.tsx @@ -1,7 +1,8 @@ +import ColorThief from 'colorthief'; import React, { useCallback } from 'react'; import styled from 'styled-components'; -import ColorThief from 'colorthief'; -import { REDESIGN_COLORS } from '../../entityV2/shared/constants'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; const Wrapper = styled.div<{ background?: string }>` align-items: center; diff --git a/datahub-web-react/src/app/sharedV2/icons/InfoPopover.tsx b/datahub-web-react/src/app/sharedV2/icons/InfoPopover.tsx index 4f5a7c1e75..fc8efa1513 100644 --- a/datahub-web-react/src/app/sharedV2/icons/InfoPopover.tsx +++ b/datahub-web-react/src/app/sharedV2/icons/InfoPopover.tsx @@ -1,9 +1,10 @@ import { InfoCircleFilled, InfoCircleOutlined } from '@ant-design/icons'; -import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; import { Popover } from '@components'; import React, { useState } from 'react'; import styled from 'styled-components'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; + const InfoWrapper = styled.div` color: ${REDESIGN_COLORS.TITLE_PURPLE}; `; diff --git a/datahub-web-react/src/app/sharedV2/icons/InfoTooltip.tsx b/datahub-web-react/src/app/sharedV2/icons/InfoTooltip.tsx index d0afef1e76..324d3dd11e 100644 --- a/datahub-web-react/src/app/sharedV2/icons/InfoTooltip.tsx +++ b/datahub-web-react/src/app/sharedV2/icons/InfoTooltip.tsx @@ -1,9 +1,10 @@ import { InfoCircleFilled, InfoCircleOutlined } from '@ant-design/icons'; -import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; import { Tooltip } from '@components'; import React, { useState } from 'react'; import styled from 'styled-components'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; + const InfoWrapper = styled.div` color: ${REDESIGN_COLORS.TITLE_PURPLE}; `; diff --git a/datahub-web-react/src/app/sharedV2/icons/PlatformIcon.tsx b/datahub-web-react/src/app/sharedV2/icons/PlatformIcon.tsx index cde4da172f..97742780fe 100644 --- a/datahub-web-react/src/app/sharedV2/icons/PlatformIcon.tsx +++ b/datahub-web-react/src/app/sharedV2/icons/PlatformIcon.tsx @@ -1,11 +1,13 @@ -import React, { useCallback, useRef, useState } from 'react'; -import styled, { css, CSSObject } from 'styled-components/macro'; import ColorThief from 'colorthief'; -import { DataPlatform, EntityType } from '../../../types.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { IconStyleType } from '../../entityV2/Entity'; -import { getLighterRGBColor } from './colorUtils'; -import { REDESIGN_COLORS } from '../../entityV2/shared/constants'; +import React, { useCallback, useRef, useState } from 'react'; +import styled, { CSSObject, css } from 'styled-components/macro'; + +import { IconStyleType } from '@app/entityV2/Entity'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { getLighterRGBColor } from '@app/sharedV2/icons/colorUtils'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DataPlatform, EntityType } from '@types'; type PlatformIconProps = { platform: DataPlatform | null | undefined; diff --git a/datahub-web-react/src/app/sharedV2/icons/getTypeIcon.tsx b/datahub-web-react/src/app/sharedV2/icons/getTypeIcon.tsx index f29f863d26..13a648d466 100644 --- a/datahub-web-react/src/app/sharedV2/icons/getTypeIcon.tsx +++ b/datahub-web-react/src/app/sharedV2/icons/getTypeIcon.tsx @@ -1,11 +1,13 @@ -import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; import { Tooltip } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { EntityType } from '../../../types.generated'; -import { getSubTypeIcon } from '../../entityV2/shared/components/subtypes'; -import { EntityRegistry } from '../../../entityRegistryContext'; -import { capitalizeFirstLetterOnly } from '../../shared/textUtil'; + +import { getSubTypeIcon } from '@app/entityV2/shared/components/subtypes'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { capitalizeFirstLetterOnly } from '@app/shared/textUtil'; +import { EntityRegistry } from '@src/entityRegistryContext'; + +import { EntityType } from '@types'; const StyledTooltip = styled(Tooltip)` color: ${REDESIGN_COLORS.TEXT_GREY}; diff --git a/datahub-web-react/src/app/sharedV2/propagation/DocumentationPropagationDetails.tsx b/datahub-web-react/src/app/sharedV2/propagation/DocumentationPropagationDetails.tsx index 2ab714c6eb..cfdde66b52 100644 --- a/datahub-web-react/src/app/sharedV2/propagation/DocumentationPropagationDetails.tsx +++ b/datahub-web-react/src/app/sharedV2/propagation/DocumentationPropagationDetails.tsx @@ -1,10 +1,12 @@ +import { Popover } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Popover } from '@components'; -import PropagationEntityLink from './PropagationEntityLink'; -import { usePropagationDetails } from './utils'; -import { PropagateThunderbolt, PropagateThunderboltFilled } from './PropagationIcon'; -import { StringMapEntry } from '../../../types.generated'; + +import PropagationEntityLink from '@app/sharedV2/propagation/PropagationEntityLink'; +import { PropagateThunderbolt, PropagateThunderboltFilled } from '@app/sharedV2/propagation/PropagationIcon'; +import { usePropagationDetails } from '@app/sharedV2/propagation/utils'; + +import { StringMapEntry } from '@types'; const PopoverWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/sharedV2/propagation/LabelPropagationDetails.tsx b/datahub-web-react/src/app/sharedV2/propagation/LabelPropagationDetails.tsx index 4253c3eb1a..865e3df459 100644 --- a/datahub-web-react/src/app/sharedV2/propagation/LabelPropagationDetails.tsx +++ b/datahub-web-react/src/app/sharedV2/propagation/LabelPropagationDetails.tsx @@ -1,11 +1,12 @@ import { Popover } from '@components'; import React from 'react'; import styled from 'styled-components'; + +import PropagationEntityLink from '@app/sharedV2/propagation/PropagationEntityLink'; +import { PropagateThunderbolt, PropagateThunderboltFilled } from '@app/sharedV2/propagation/PropagationIcon'; +import { PropagationRelationshipType } from '@app/sharedV2/propagation/utils'; +import { PropagationContext, usePropagationContextEntities } from '@app/sharedV2/tags/usePropagationContextEntities'; import { EntityType } from '@src/types.generated'; -import { usePropagationContextEntities, PropagationContext } from '../tags/usePropagationContextEntities'; -import PropagationEntityLink from './PropagationEntityLink'; -import { PropagateThunderbolt, PropagateThunderboltFilled } from './PropagationIcon'; -import { PropagationRelationshipType } from './utils'; const PopoverWrapper = styled.div` display: flex; diff --git a/datahub-web-react/src/app/sharedV2/propagation/PropagationEntityLink.tsx b/datahub-web-react/src/app/sharedV2/propagation/PropagationEntityLink.tsx index 09c5173d43..2f5401bf23 100644 --- a/datahub-web-react/src/app/sharedV2/propagation/PropagationEntityLink.tsx +++ b/datahub-web-react/src/app/sharedV2/propagation/PropagationEntityLink.tsx @@ -1,9 +1,11 @@ import React from 'react'; -import styled from 'styled-components'; import { Link } from 'react-router-dom'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { Entity, EntityType, SchemaFieldEntity } from '../../../types.generated'; -import { GenericEntityProperties } from '../../entity/shared/types'; +import styled from 'styled-components'; + +import { GenericEntityProperties } from '@app/entity/shared/types'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Entity, EntityType, SchemaFieldEntity } from '@types'; const PreviewImage = styled.img<{ size: number }>` height: ${(props) => props.size}px; diff --git a/datahub-web-react/src/app/sharedV2/propagation/PropagationIcon.tsx b/datahub-web-react/src/app/sharedV2/propagation/PropagationIcon.tsx index f3acdd910a..27eba42447 100644 --- a/datahub-web-react/src/app/sharedV2/propagation/PropagationIcon.tsx +++ b/datahub-web-react/src/app/sharedV2/propagation/PropagationIcon.tsx @@ -1,6 +1,7 @@ -import styled from 'styled-components'; import { ThunderboltFilled } from '@ant-design/icons'; -import { REDESIGN_COLORS } from '../../entityV2/shared/constants'; +import styled from 'styled-components'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; export const PropagateThunderbolt = styled(ThunderboltFilled)<{ fontSize?: number }>` && { diff --git a/datahub-web-react/src/app/sharedV2/propagation/utils.ts b/datahub-web-react/src/app/sharedV2/propagation/utils.ts index 8d667127c2..4895f5b0ae 100644 --- a/datahub-web-react/src/app/sharedV2/propagation/utils.ts +++ b/datahub-web-react/src/app/sharedV2/propagation/utils.ts @@ -1,5 +1,6 @@ -import { StringMapEntry } from '../../../types.generated'; -import { useGetEntities } from '../useGetEntities'; +import { useGetEntities } from '@app/sharedV2/useGetEntities'; + +import { StringMapEntry } from '@types'; export enum PropagationRelationshipType { LINEAGE = 'lineage', diff --git a/datahub-web-react/src/app/sharedV2/search/EditButton.tsx b/datahub-web-react/src/app/sharedV2/search/EditButton.tsx index 5ca368eca7..22de955d2b 100644 --- a/datahub-web-react/src/app/sharedV2/search/EditButton.tsx +++ b/datahub-web-react/src/app/sharedV2/search/EditButton.tsx @@ -1,6 +1,6 @@ -import React from 'react'; import { EditOutlined } from '@ant-design/icons'; import { Button, Tooltip } from '@components'; +import React from 'react'; import styled from 'styled-components'; const StyledButton = styled(Button)` diff --git a/datahub-web-react/src/app/sharedV2/search/SearchMenuItems.tsx b/datahub-web-react/src/app/sharedV2/search/SearchMenuItems.tsx index 0745868985..5a452f40c3 100644 --- a/datahub-web-react/src/app/sharedV2/search/SearchMenuItems.tsx +++ b/datahub-web-react/src/app/sharedV2/search/SearchMenuItems.tsx @@ -1,9 +1,11 @@ import React, { useState } from 'react'; -import { AndFilterInput } from '../../../types.generated'; -import { DownloadSearchResults, DownloadSearchResultsInput } from '../../searchV2/utils/types'; -import DownloadAsCsvModal from '../../entityV2/shared/components/styled/search/DownloadAsCsvModal'; -import EditButton from './EditButton'; -import DownloadButton from './DownloadButton'; + +import DownloadAsCsvModal from '@app/entityV2/shared/components/styled/search/DownloadAsCsvModal'; +import { DownloadSearchResults, DownloadSearchResultsInput } from '@app/searchV2/utils/types'; +import DownloadButton from '@app/sharedV2/search/DownloadButton'; +import EditButton from '@app/sharedV2/search/EditButton'; + +import { AndFilterInput } from '@types'; type Props = { filters: AndFilterInput[]; diff --git a/datahub-web-react/src/app/sharedV2/sidebar/components.tsx b/datahub-web-react/src/app/sharedV2/sidebar/components.tsx index 3b42abcc31..44ccfcbf2b 100644 --- a/datahub-web-react/src/app/sharedV2/sidebar/components.tsx +++ b/datahub-web-react/src/app/sharedV2/sidebar/components.tsx @@ -1,7 +1,8 @@ -import React from 'react'; import ChevronRightIcon from '@mui/icons-material/ChevronRight'; +import React from 'react'; import styled from 'styled-components'; -import { RotatingButton } from '../../shared/components'; + +import { RotatingButton } from '@app/shared/components'; export const SidebarWrapper = styled.div<{ width: number; $isShowNavBarRedesign?: boolean }>` max-height: 100%; diff --git a/datahub-web-react/src/app/sharedV2/sorting/useSorting.ts b/datahub-web-react/src/app/sharedV2/sorting/useSorting.ts index ab8cc5f25a..d8f8b36d14 100644 --- a/datahub-web-react/src/app/sharedV2/sorting/useSorting.ts +++ b/datahub-web-react/src/app/sharedV2/sorting/useSorting.ts @@ -1,5 +1,6 @@ import { useState } from 'react'; -import { SortOrder } from '../../../types.generated'; + +import { SortOrder } from '@types'; export interface Sorting { sortField: string | null; diff --git a/datahub-web-react/src/app/sharedV2/tags/AddTagTerm.tsx b/datahub-web-react/src/app/sharedV2/tags/AddTagTerm.tsx index 395de9ec71..d6caa7ba84 100644 --- a/datahub-web-react/src/app/sharedV2/tags/AddTagTerm.tsx +++ b/datahub-web-react/src/app/sharedV2/tags/AddTagTerm.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { EntityType, SubResourceType } from '../../../types.generated'; +import EditTagTermsModal from '@app/shared/tags/AddTagsTermsModal'; -import EditTagTermsModal from '../../shared/tags/AddTagsTermsModal'; +import { EntityType, SubResourceType } from '@types'; type Props = { onOpenModal?: () => void; diff --git a/datahub-web-react/src/app/sharedV2/tags/DataProductLink.tsx b/datahub-web-react/src/app/sharedV2/tags/DataProductLink.tsx index 1589720294..5c11279f4a 100644 --- a/datahub-web-react/src/app/sharedV2/tags/DataProductLink.tsx +++ b/datahub-web-react/src/app/sharedV2/tags/DataProductLink.tsx @@ -1,13 +1,15 @@ +import { CloseOutlined } from '@ant-design/icons'; import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { CloseOutlined } from '@ant-design/icons'; -import { DataProduct as DataProductEntity, EntityType } from '../../../types.generated'; -import { IconStyleType } from '../../entity/Entity'; -import { HoverEntityTooltip } from '../../recommendations/renderer/component/HoverEntityTooltip'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { useEmbeddedProfileLinkProps } from '../../shared/useEmbeddedProfileLinkProps'; + +import { IconStyleType } from '@app/entity/Entity'; +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEmbeddedProfileLinkProps } from '@app/shared/useEmbeddedProfileLinkProps'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { DataProduct as DataProductEntity, EntityType } from '@types'; const DataProductLinkContainer = styled(Link)` display: inline-block; diff --git a/datahub-web-react/src/app/sharedV2/tags/DomainLink.tsx b/datahub-web-react/src/app/sharedV2/tags/DomainLink.tsx index 9368784544..5ef3f2761f 100644 --- a/datahub-web-react/src/app/sharedV2/tags/DomainLink.tsx +++ b/datahub-web-react/src/app/sharedV2/tags/DomainLink.tsx @@ -1,13 +1,15 @@ +import { CloseOutlined } from '@ant-design/icons'; import React from 'react'; import { Link } from 'react-router-dom'; -import { CloseOutlined } from '@ant-design/icons'; import styled from 'styled-components'; -import { Domain as DomainEntity, EntityType } from '../../../types.generated'; -import { HoverEntityTooltip } from '../../recommendations/renderer/component/HoverEntityTooltip'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { ANTD_GRAY } from '../../entity/shared/constants'; -import { DomainColoredIcon } from '../../entityV2/shared/links/DomainColoredIcon'; -import { useEmbeddedProfileLinkProps } from '../../shared/useEmbeddedProfileLinkProps'; + +import { ANTD_GRAY } from '@app/entity/shared/constants'; +import { DomainColoredIcon } from '@app/entityV2/shared/links/DomainColoredIcon'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEmbeddedProfileLinkProps } from '@app/shared/useEmbeddedProfileLinkProps'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Domain as DomainEntity, EntityType } from '@types'; const DomainLinkContainer = styled(Link)` display: inline-block; diff --git a/datahub-web-react/src/app/sharedV2/tags/TagLink.tsx b/datahub-web-react/src/app/sharedV2/tags/TagLink.tsx index b045c8456f..4198ecea6a 100644 --- a/datahub-web-react/src/app/sharedV2/tags/TagLink.tsx +++ b/datahub-web-react/src/app/sharedV2/tags/TagLink.tsx @@ -1,10 +1,12 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import { EntityType, Tag } from '../../../types.generated'; -import { StyledTag } from '../../entityV2/shared/components/styled/StyledTag'; -import { HoverEntityTooltip } from '../../recommendations/renderer/component/HoverEntityTooltip'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { TagProfileDrawer } from '../../shared/tags/TagProfileDrawer'; + +import { StyledTag } from '@app/entityV2/shared/components/styled/StyledTag'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { TagProfileDrawer } from '@app/shared/tags/TagProfileDrawer'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, Tag } from '@types'; const Container = styled.span` display: block; diff --git a/datahub-web-react/src/app/sharedV2/tags/TagTermGroup.tsx b/datahub-web-react/src/app/sharedV2/tags/TagTermGroup.tsx index f3c5e5fb61..1ce72111df 100644 --- a/datahub-web-react/src/app/sharedV2/tags/TagTermGroup.tsx +++ b/datahub-web-react/src/app/sharedV2/tags/TagTermGroup.tsx @@ -3,14 +3,16 @@ import { Typography } from 'antd'; import React, { useState } from 'react'; import Highlight from 'react-highlighter'; import styled from 'styled-components'; -import { Domain as DomainEntity, EntityType, GlobalTags, GlossaryTerms } from '../../../types.generated'; -import { EMPTY_MESSAGES } from '../../entity/shared/constants'; -import { REDESIGN_COLORS } from '../../entityV2/shared/constants'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { DomainLink } from './DomainLink'; -import Tag from './tag/Tag'; -import Term from './term/Term'; -import AddTagTerm from './AddTagTerm'; + +import { EMPTY_MESSAGES } from '@app/entity/shared/constants'; +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import AddTagTerm from '@app/sharedV2/tags/AddTagTerm'; +import { DomainLink } from '@app/sharedV2/tags/DomainLink'; +import Tag from '@app/sharedV2/tags/tag/Tag'; +import Term from '@app/sharedV2/tags/term/Term'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { Domain as DomainEntity, EntityType, GlobalTags, GlossaryTerms } from '@types'; type Props = { uneditableTags?: GlobalTags | null; diff --git a/datahub-web-react/src/app/sharedV2/tags/tag/Tag.tsx b/datahub-web-react/src/app/sharedV2/tags/tag/Tag.tsx index 931173dff8..74f5f9e402 100644 --- a/datahub-web-react/src/app/sharedV2/tags/tag/Tag.tsx +++ b/datahub-web-react/src/app/sharedV2/tags/tag/Tag.tsx @@ -1,16 +1,18 @@ -import { message, Modal } from 'antd'; -import styled from 'styled-components'; +import { Modal, message } from 'antd'; import React, { useState } from 'react'; import Highlight from 'react-highlighter'; +import styled from 'styled-components'; + +import { StyledTag } from '@app/entityV2/shared/components/styled/StyledTag'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useHasMatchedFieldByUrn } from '@app/search/context/SearchResultContext'; +import { TagProfileDrawer } from '@app/shared/tags/TagProfileDrawer'; +import LabelPropagationDetails from '@app/sharedV2/propagation/LabelPropagationDetails'; +import { useEntityRegistry } from '@app/useEntityRegistry'; import { useIsEmbeddedProfile } from '@src/app/shared/useEmbeddedProfileLinkProps'; -import { useRemoveTagMutation } from '../../../../graphql/mutations.generated'; -import { EntityType, SubResourceType, TagAssociation } from '../../../../types.generated'; -import { StyledTag } from '../../../entityV2/shared/components/styled/StyledTag'; -import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { TagProfileDrawer } from '../../../shared/tags/TagProfileDrawer'; -import { useHasMatchedFieldByUrn } from '../../../search/context/SearchResultContext'; -import LabelPropagationDetails from '../../propagation/LabelPropagationDetails'; + +import { useRemoveTagMutation } from '@graphql/mutations.generated'; +import { EntityType, SubResourceType, TagAssociation } from '@types'; const TagLink = styled.span<{ $showOneAndCount?: boolean; $shouldNotAddBottomMargin?: boolean }>` display: flex; diff --git a/datahub-web-react/src/app/sharedV2/tags/term/Term.tsx b/datahub-web-react/src/app/sharedV2/tags/term/Term.tsx index 7c7698f457..f33893fe2c 100644 --- a/datahub-web-react/src/app/sharedV2/tags/term/Term.tsx +++ b/datahub-web-react/src/app/sharedV2/tags/term/Term.tsx @@ -2,11 +2,12 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import { EntityType, GlossaryTermAssociation } from '../../../../types.generated'; -import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import TermContent from './TermContent'; -import { useEmbeddedProfileLinkProps } from '../../../shared/useEmbeddedProfileLinkProps'; +import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip'; +import { useEmbeddedProfileLinkProps } from '@app/shared/useEmbeddedProfileLinkProps'; +import TermContent from '@app/sharedV2/tags/term/TermContent'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { EntityType, GlossaryTermAssociation } from '@types'; const TermLink = styled(Link)<{ $showOneAndCount?: boolean }>` display: inline-block; diff --git a/datahub-web-react/src/app/sharedV2/tags/term/TermContent.tsx b/datahub-web-react/src/app/sharedV2/tags/term/TermContent.tsx index 4c241d7417..5fe0bfe4e6 100644 --- a/datahub-web-react/src/app/sharedV2/tags/term/TermContent.tsx +++ b/datahub-web-react/src/app/sharedV2/tags/term/TermContent.tsx @@ -1,16 +1,18 @@ import { ThunderboltOutlined } from '@ant-design/icons'; -import { message, Modal, Tag } from 'antd'; +import CloseIcon from '@mui/icons-material/Close'; +import { Modal, Tag, message } from 'antd'; import React from 'react'; import Highlight from 'react-highlighter'; import styled from 'styled-components'; -import CloseIcon from '@mui/icons-material/Close'; -import { useRemoveTermMutation } from '../../../../graphql/mutations.generated'; -import { EntityType, GlossaryTermAssociation, SubResourceType } from '../../../../types.generated'; -import { REDESIGN_COLORS } from '../../../entityV2/shared/constants'; -import { useHasMatchedFieldByUrn } from '../../../search/context/SearchResultContext'; -import { useEntityRegistry } from '../../../useEntityRegistry'; -import { generateColorFromPalette } from '../../../glossaryV2/colorUtils'; -import LabelPropagationDetails from '../../propagation/LabelPropagationDetails'; + +import { REDESIGN_COLORS } from '@app/entityV2/shared/constants'; +import { generateColorFromPalette } from '@app/glossaryV2/colorUtils'; +import { useHasMatchedFieldByUrn } from '@app/search/context/SearchResultContext'; +import LabelPropagationDetails from '@app/sharedV2/propagation/LabelPropagationDetails'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useRemoveTermMutation } from '@graphql/mutations.generated'; +import { EntityType, GlossaryTermAssociation, SubResourceType } from '@types'; const PROPAGATOR_URN = 'urn:li:corpuser:__datahub_propagator'; diff --git a/datahub-web-react/src/app/sharedV2/tags/usePropagationContextEntities.ts b/datahub-web-react/src/app/sharedV2/tags/usePropagationContextEntities.ts index 197408da4c..7d47ffd81a 100644 --- a/datahub-web-react/src/app/sharedV2/tags/usePropagationContextEntities.ts +++ b/datahub-web-react/src/app/sharedV2/tags/usePropagationContextEntities.ts @@ -1,5 +1,6 @@ import { useEffect, useState } from 'react'; -import { useGetEntitiesQuery } from '../../../graphql/entity.generated'; + +import { useGetEntitiesQuery } from '@graphql/entity.generated'; export interface PropagationContext { propagated?: boolean; diff --git a/datahub-web-react/src/app/sharedV2/text/OverflowTitle.tsx b/datahub-web-react/src/app/sharedV2/text/OverflowTitle.tsx index b9e563b6e1..d09f6e2ad6 100644 --- a/datahub-web-react/src/app/sharedV2/text/OverflowTitle.tsx +++ b/datahub-web-react/src/app/sharedV2/text/OverflowTitle.tsx @@ -1,8 +1,9 @@ -import OptionalTooltip from '@app/sharedV2/ant/OptionalTooltip'; import { TooltipProps } from 'antd'; import React, { useEffect } from 'react'; -import styled from 'styled-components'; import Highlight from 'react-highlighter'; +import styled from 'styled-components'; + +import OptionalTooltip from '@app/sharedV2/ant/OptionalTooltip'; const Wrapper = styled.div<{ scale: number; computedRatio: boolean }>` // Wrap up to two lines, shrinking text as needed diff --git a/datahub-web-react/src/app/sharedV2/useGetEntities.ts b/datahub-web-react/src/app/sharedV2/useGetEntities.ts index a19b36b3a4..8250693ffc 100644 --- a/datahub-web-react/src/app/sharedV2/useGetEntities.ts +++ b/datahub-web-react/src/app/sharedV2/useGetEntities.ts @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; -import { useGetEntitiesQuery } from '../../graphql/entity.generated'; -import { Entity } from '../../types.generated'; + +import { useGetEntitiesQuery } from '@graphql/entity.generated'; +import { Entity } from '@types'; export function useGetEntities(urns: string[]): Entity[] { const [verifiedUrns, setVerifiedUrns] = useState([]); diff --git a/datahub-web-react/src/app/sharedV2/utils.tsx b/datahub-web-react/src/app/sharedV2/utils.tsx index e92496c87c..793978782f 100644 --- a/datahub-web-react/src/app/sharedV2/utils.tsx +++ b/datahub-web-react/src/app/sharedV2/utils.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { BoldOutlined, CalendarOutlined, @@ -8,7 +7,9 @@ import { NumberOutlined, ProfileOutlined, } from '@ant-design/icons'; -import { SchemaFieldDataType } from '../../types.generated'; +import React from 'react'; + +import { SchemaFieldDataType } from '@types'; export function ColumnTypeIcon(type?: SchemaFieldDataType): JSX.Element | null { if (type === SchemaFieldDataType.Number) { diff --git a/datahub-web-react/src/app/tags/CreateNewTagModal/CreateNewTagModal.tsx b/datahub-web-react/src/app/tags/CreateNewTagModal/CreateNewTagModal.tsx index cb7c08ab4b..03788878d0 100644 --- a/datahub-web-react/src/app/tags/CreateNewTagModal/CreateNewTagModal.tsx +++ b/datahub-web-react/src/app/tags/CreateNewTagModal/CreateNewTagModal.tsx @@ -1,12 +1,14 @@ -import React, { useState } from 'react'; -import { message } from 'antd'; import { Modal } from '@components'; -import { useCreateTagMutation } from '../../../graphql/tag.generated'; -import { useEnterKeyListener } from '../../shared/useEnterKeyListener'; -import { useBatchAddOwnersMutation, useSetTagColorMutation } from '../../../graphql/mutations.generated'; -import { ModalButton } from './types'; -import TagDetailsSection from './TagDetailsSection'; -import OwnersSection, { PendingOwner } from './OwnersSection'; +import { message } from 'antd'; +import React, { useState } from 'react'; + +import { useEnterKeyListener } from '@app/shared/useEnterKeyListener'; +import OwnersSection, { PendingOwner } from '@app/tags/CreateNewTagModal/OwnersSection'; +import TagDetailsSection from '@app/tags/CreateNewTagModal/TagDetailsSection'; +import { ModalButton } from '@app/tags/CreateNewTagModal/types'; + +import { useBatchAddOwnersMutation, useSetTagColorMutation } from '@graphql/mutations.generated'; +import { useCreateTagMutation } from '@graphql/tag.generated'; type CreateNewTagModalProps = { open: boolean; diff --git a/datahub-web-react/src/app/tags/CreateNewTagModal/OwnersSection.tsx b/datahub-web-react/src/app/tags/CreateNewTagModal/OwnersSection.tsx index 5a9460dbfa..4a11a254a1 100644 --- a/datahub-web-react/src/app/tags/CreateNewTagModal/OwnersSection.tsx +++ b/datahub-web-react/src/app/tags/CreateNewTagModal/OwnersSection.tsx @@ -1,12 +1,14 @@ +import { Text } from '@components'; +import { Select } from 'antd'; import React, { useState } from 'react'; import styled from 'styled-components'; -import { Select } from 'antd'; -import { Text } from '@components'; -import { EntityType, OwnerEntityType } from '../../../types.generated'; -import { useGetSearchResultsForMultipleLazyQuery } from '../../../graphql/search.generated'; -import { useEntityRegistry } from '../../useEntityRegistry'; -import { useListOwnershipTypesQuery } from '../../../graphql/ownership.generated'; -import { OwnerLabel } from '../../shared/OwnerLabel'; + +import { OwnerLabel } from '@app/shared/OwnerLabel'; +import { useEntityRegistry } from '@app/useEntityRegistry'; + +import { useListOwnershipTypesQuery } from '@graphql/ownership.generated'; +import { useGetSearchResultsForMultipleLazyQuery } from '@graphql/search.generated'; +import { EntityType, OwnerEntityType } from '@types'; // Interface for pending owner export interface PendingOwner { diff --git a/datahub-web-react/src/app/tags/CreateNewTagModal/TagDetailsSection.tsx b/datahub-web-react/src/app/tags/CreateNewTagModal/TagDetailsSection.tsx index 9691cdf9e8..e802b2a9f0 100644 --- a/datahub-web-react/src/app/tags/CreateNewTagModal/TagDetailsSection.tsx +++ b/datahub-web-react/src/app/tags/CreateNewTagModal/TagDetailsSection.tsx @@ -1,6 +1,6 @@ +import { ColorPicker, Input } from '@components'; import React from 'react'; import styled from 'styled-components'; -import { Input, ColorPicker } from '@components'; // Tag details section props export interface TagDetailsProps { diff --git a/datahub-web-react/src/app/tags/EmptyTags.tsx b/datahub-web-react/src/app/tags/EmptyTags.tsx index a98e160ddb..7d2f70e04c 100644 --- a/datahub-web-react/src/app/tags/EmptyTags.tsx +++ b/datahub-web-react/src/app/tags/EmptyTags.tsx @@ -1,6 +1,6 @@ +import { Empty, Typography } from 'antd'; import React from 'react'; import styled from 'styled-components'; -import { Empty, Typography } from 'antd'; type Props = { isEmptySearch: boolean; diff --git a/datahub-web-react/src/app/tags/ManageTag.tsx b/datahub-web-react/src/app/tags/ManageTag.tsx index ea2828e48b..4e330af956 100644 --- a/datahub-web-react/src/app/tags/ManageTag.tsx +++ b/datahub-web-react/src/app/tags/ManageTag.tsx @@ -1,19 +1,20 @@ -import React, { useState, useEffect } from 'react'; +import { ButtonProps, ColorPicker, Input, Modal, Text } from '@components'; import { Select, message } from 'antd'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { useGetTagQuery } from '@src/graphql/tag.generated'; + +import { ExpandedOwner } from '@src/app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner'; +import { OwnerLabel } from '@src/app/shared/OwnerLabel'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; import { + useBatchAddOwnersMutation, useSetTagColorMutation, useUpdateDescriptionMutation, - useBatchAddOwnersMutation, } from '@src/graphql/mutations.generated'; -import { Modal, ButtonProps, ColorPicker, Input, Text } from '@components'; -import { ExpandedOwner } from '@src/app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import { useGetSearchResultsLazyQuery } from '@src/graphql/search.generated'; import { useListOwnershipTypesQuery } from '@src/graphql/ownership.generated'; +import { useGetSearchResultsLazyQuery } from '@src/graphql/search.generated'; +import { useGetTagQuery } from '@src/graphql/tag.generated'; import { EntityType, OwnerEntityType } from '@src/types.generated'; -import { OwnerLabel } from '@src/app/shared/OwnerLabel'; const FormSection = styled.div` margin-bottom: 16px; diff --git a/datahub-web-react/src/app/tags/ManageTags.tsx b/datahub-web-react/src/app/tags/ManageTags.tsx index 990022dcd8..424324d45c 100644 --- a/datahub-web-react/src/app/tags/ManageTags.tsx +++ b/datahub-web-react/src/app/tags/ManageTags.tsx @@ -1,16 +1,17 @@ -import React, { useState, useEffect, useMemo } from 'react'; -import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; -import { SearchBar, PageTitle, Pagination, Button, Tooltip2 } from '@components'; -import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated'; -import { EntityType } from '@src/types.generated'; +import { Button, PageTitle, Pagination, SearchBar, Tooltip2 } from '@components'; +import React, { useEffect, useMemo, useState } from 'react'; +import styled from 'styled-components'; + +import { useUserContext } from '@app/context/useUserContext'; +import { PageContainer } from '@app/govern/structuredProperties/styledComponents'; +import CreateNewTagModal from '@app/tags/CreateNewTagModal/CreateNewTagModal'; +import EmptyTags from '@app/tags/EmptyTags'; +import TagsTable from '@app/tags/TagsTable'; import { Message } from '@src/app/shared/Message'; import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import styled from 'styled-components'; -import { PageContainer } from '../govern/structuredProperties/styledComponents'; -import EmptyTags from './EmptyTags'; -import TagsTable from './TagsTable'; -import CreateNewTagModal from './CreateNewTagModal/CreateNewTagModal'; -import { useUserContext } from '../context/useUserContext'; +import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign'; +import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated'; +import { EntityType } from '@src/types.generated'; const HeaderContainer = styled.div` display: flex; diff --git a/datahub-web-react/src/app/tags/TagsTable.tsx b/datahub-web-react/src/app/tags/TagsTable.tsx index 717240bbf0..eca9df34d5 100644 --- a/datahub-web-react/src/app/tags/TagsTable.tsx +++ b/datahub-web-react/src/app/tags/TagsTable.tsx @@ -1,14 +1,10 @@ -import React, { useState, useMemo, useCallback } from 'react'; import { NetworkStatus } from '@apollo/client'; -import { Table, Modal } from '@components'; +import { Modal, Table } from '@components'; import { message } from 'antd'; -import { AlignmentOptions } from '@src/alchemy-components/theme/config'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import { GetSearchResultsForMultipleQuery } from '@src/graphql/search.generated'; -import { EntityType } from '@src/types.generated'; -import { useDeleteTagMutation } from '../../graphql/tag.generated'; -import { useUserContext } from '../context/useUserContext'; -import { ManageTag } from './ManageTag'; +import React, { useCallback, useMemo, useState } from 'react'; + +import { useUserContext } from '@app/context/useUserContext'; +import { ManageTag } from '@app/tags/ManageTag'; import { TagActionsColumn, TagAppliedToColumn, @@ -16,7 +12,13 @@ import { TagDescriptionColumn, TagNameColumn, TagOwnersColumn, -} from './TagsTableColumns'; +} from '@app/tags/TagsTableColumns'; +import { AlignmentOptions } from '@src/alchemy-components/theme/config'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { GetSearchResultsForMultipleQuery } from '@src/graphql/search.generated'; +import { EntityType } from '@src/types.generated'; + +import { useDeleteTagMutation } from '@graphql/tag.generated'; interface Props { searchQuery: string; diff --git a/datahub-web-react/src/app/tags/TagsTableColumns.tsx b/datahub-web-react/src/app/tags/TagsTableColumns.tsx index 46a61e7213..e9444865b2 100644 --- a/datahub-web-react/src/app/tags/TagsTableColumns.tsx +++ b/datahub-web-react/src/app/tags/TagsTableColumns.tsx @@ -1,19 +1,20 @@ -import React from 'react'; +import { Icon, Text, colors, typography } from '@components'; import { Dropdown } from 'antd'; -import { colors, Text, Icon, typography } from '@components'; -import { useEntityRegistry } from '@src/app/useEntityRegistry'; -import { useGetTagQuery } from '@src/graphql/tag.generated'; -import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated'; -import { navigateToSearchUrl } from '@src/app/search/utils/navigateToSearchUrl'; -import { Entity, EntityType } from '@src/types.generated'; +import React from 'react'; +import Highlight from 'react-highlighter'; import { useHistory } from 'react-router'; import styled from 'styled-components'; -import Highlight from 'react-highlighter'; -import { generateOrFilters } from '@src/app/search/utils/generateOrFilters'; -import { UnionType } from '@src/app/search/utils/constants'; + +import { CardIcons } from '@app/govern/structuredProperties/styledComponents'; +import { getTagColor } from '@app/tags/utils'; import { ExpandedOwner } from '@src/app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner'; -import { CardIcons } from '../govern/structuredProperties/styledComponents'; -import { getTagColor } from './utils'; +import { UnionType } from '@src/app/search/utils/constants'; +import { generateOrFilters } from '@src/app/search/utils/generateOrFilters'; +import { navigateToSearchUrl } from '@src/app/search/utils/navigateToSearchUrl'; +import { useEntityRegistry } from '@src/app/useEntityRegistry'; +import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated'; +import { useGetTagQuery } from '@src/graphql/tag.generated'; +import { Entity, EntityType } from '@src/types.generated'; const TagName = styled.div` font-size: 14px; diff --git a/datahub-web-react/src/app/useAppConfig.ts b/datahub-web-react/src/app/useAppConfig.ts index 3b7e89166c..e86631cfa9 100644 --- a/datahub-web-react/src/app/useAppConfig.ts +++ b/datahub-web-react/src/app/useAppConfig.ts @@ -1,5 +1,6 @@ import { useContext } from 'react'; -import { AppConfigContext } from '../appConfigContext'; + +import { AppConfigContext } from '@src/appConfigContext'; /** * Fetch an instance of AppConfig from the React context. diff --git a/datahub-web-react/src/app/useBuildEntityRegistry.ts b/datahub-web-react/src/app/useBuildEntityRegistry.ts index 974dca57a6..1c9449cbd5 100644 --- a/datahub-web-react/src/app/useBuildEntityRegistry.ts +++ b/datahub-web-react/src/app/useBuildEntityRegistry.ts @@ -1,7 +1,8 @@ import { useMemo } from 'react'; -import buildEntityRegistry from './buildEntityRegistry'; -import buildEntityRegistryV2 from './buildEntityRegistryV2'; -import { useIsThemeV2 } from './useIsThemeV2'; + +import buildEntityRegistry from '@app/buildEntityRegistry'; +import buildEntityRegistryV2 from '@app/buildEntityRegistryV2'; +import { useIsThemeV2 } from '@app/useIsThemeV2'; export default function useBuildEntityRegistry() { const isThemeV2Enabled = useIsThemeV2(); diff --git a/datahub-web-react/src/app/useEntityRegistry.ts b/datahub-web-react/src/app/useEntityRegistry.ts index 888ca858a9..f6bd7a9c27 100644 --- a/datahub-web-react/src/app/useEntityRegistry.ts +++ b/datahub-web-react/src/app/useEntityRegistry.ts @@ -1,6 +1,7 @@ import { useContext } from 'react'; -import { EntityRegistryContext } from '../entityRegistryContext'; -import EntityRegistryV2 from './entityV2/EntityRegistry'; + +import EntityRegistryV2 from '@app/entityV2/EntityRegistry'; +import { EntityRegistryContext } from '@src/entityRegistryContext'; /** * Fetch an instance of EntityRegistry from the React context. diff --git a/datahub-web-react/src/app/useGetAuthenticatedUser.tsx b/datahub-web-react/src/app/useGetAuthenticatedUser.tsx index aaacd98060..78c713beb4 100644 --- a/datahub-web-react/src/app/useGetAuthenticatedUser.tsx +++ b/datahub-web-react/src/app/useGetAuthenticatedUser.tsx @@ -1,6 +1,8 @@ import Cookies from 'js-cookie'; -import { CLIENT_AUTH_COOKIE } from '../conf/Global'; -import { useGetMeQuery } from '../graphql/me.generated'; + +import { CLIENT_AUTH_COOKIE } from '@conf/Global'; + +import { useGetMeQuery } from '@graphql/me.generated'; /** * Fetch a CorpUser object corresponding to the currently authenticated user. diff --git a/datahub-web-react/src/app/useIsThemeV2.tsx b/datahub-web-react/src/app/useIsThemeV2.tsx index a126a84862..9db63f08c1 100644 --- a/datahub-web-react/src/app/useIsThemeV2.tsx +++ b/datahub-web-react/src/app/useIsThemeV2.tsx @@ -1,7 +1,8 @@ import { useEffect } from 'react'; -import { useCustomTheme } from '../customThemeContext'; -import { useAppConfig } from './useAppConfig'; -import { useUserContext } from './context/useUserContext'; + +import { useUserContext } from '@app/context/useUserContext'; +import { useAppConfig } from '@app/useAppConfig'; +import { useCustomTheme } from '@src/customThemeContext'; /** * Returns true if theme v2 should be enabled. diff --git a/datahub-web-react/src/app/useShowNavBarRedesign.tsx b/datahub-web-react/src/app/useShowNavBarRedesign.tsx index 2fb1a23ea5..db33c2c2d3 100644 --- a/datahub-web-react/src/app/useShowNavBarRedesign.tsx +++ b/datahub-web-react/src/app/useShowNavBarRedesign.tsx @@ -1,6 +1,7 @@ import { useEffect } from 'react'; -import { useAppConfig } from './useAppConfig'; -import { useIsThemeV2 } from './useIsThemeV2'; + +import { useAppConfig } from '@app/useAppConfig'; +import { useIsThemeV2 } from '@app/useIsThemeV2'; export function useShowNavBarRedesign() { const appConfig = useAppConfig(); diff --git a/datahub-web-react/src/app/utils/queryUtils.ts b/datahub-web-react/src/app/utils/queryUtils.ts index dc2b51c910..fc6edf8716 100644 --- a/datahub-web-react/src/app/utils/queryUtils.ts +++ b/datahub-web-react/src/app/utils/queryUtils.ts @@ -1,4 +1,4 @@ -import { FilterOperator } from '../../types.generated'; +import { FilterOperator } from '@types'; export function getHomePagePostsFilters() { return [ diff --git a/datahub-web-react/src/appConfigContext.tsx b/datahub-web-react/src/appConfigContext.tsx index 6ee34cef0e..d9a7648300 100644 --- a/datahub-web-react/src/appConfigContext.tsx +++ b/datahub-web-react/src/appConfigContext.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { AppConfig } from './types.generated'; + +import { AppConfig } from '@types'; export const DEFAULT_APP_CONFIG = { analyticsConfig: { diff --git a/datahub-web-react/src/conf/index.ts b/datahub-web-react/src/conf/index.ts index 796f5773e4..bfa7592f58 100644 --- a/datahub-web-react/src/conf/index.ts +++ b/datahub-web-react/src/conf/index.ts @@ -3,13 +3,13 @@ import dayjs from 'dayjs'; import advancedFormat from 'dayjs/plugin/advancedFormat'; import customParseFormat from 'dayjs/plugin/customParseFormat'; import localeData from 'dayjs/plugin/localeData'; -import weekday from 'dayjs/plugin/weekday'; import weekOfYear from 'dayjs/plugin/weekOfYear'; import weekYear from 'dayjs/plugin/weekYear'; +import weekday from 'dayjs/plugin/weekday'; -import * as Browse from './Browse'; -import * as Global from './Global'; -import * as Search from './Search'; +import * as Browse from '@conf/Browse'; +import * as Global from '@conf/Global'; +import * as Search from '@conf/Search'; dayjs.extend(customParseFormat); dayjs.extend(advancedFormat); diff --git a/datahub-web-react/src/conf/theme/global-variables-v2.less b/datahub-web-react/src/conf/theme/global-variables-v2.less index ae8573d259..8206bde2e9 100644 --- a/datahub-web-react/src/conf/theme/global-variables-v2.less +++ b/datahub-web-react/src/conf/theme/global-variables-v2.less @@ -1,2 +1,14 @@ -@font-family-v2: 'Mulish', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', - sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; +@font-family-v2: + 'Mulish', + -apple-system, + BlinkMacSystemFont, + 'Segoe UI', + Roboto, + 'Helvetica Neue', + Arial, + 'Noto Sans', + sans-serif, + 'Apple Color Emoji', + 'Segoe UI Emoji', + 'Segoe UI Symbol', + 'Noto Color Emoji'; diff --git a/datahub-web-react/src/conf/theme/global-variables.less b/datahub-web-react/src/conf/theme/global-variables.less index 7453e20898..98c1d016f3 100644 --- a/datahub-web-react/src/conf/theme/global-variables.less +++ b/datahub-web-react/src/conf/theme/global-variables.less @@ -13,8 +13,20 @@ @gray-12: #141414; @gray-13: #000000; -@font-family: 'Manrope', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', - sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; +@font-family: + 'Manrope', + -apple-system, + BlinkMacSystemFont, + 'Segoe UI', + Roboto, + 'Helvetica Neue', + Arial, + 'Noto Sans', + sans-serif, + 'Apple Color Emoji', + 'Segoe UI Emoji', + 'Segoe UI Symbol', + 'Noto Color Emoji'; @code-family: 'Roboto Mono', Consolas, 'Liberation Mono', Menlo, Courier, monospace; @border-radius-base: 5px; diff --git a/datahub-web-react/src/conf/theme/styled-components.d.ts b/datahub-web-react/src/conf/theme/styled-components.d.ts index 3f9c7c4a83..c2df1e9a7d 100644 --- a/datahub-web-react/src/conf/theme/styled-components.d.ts +++ b/datahub-web-react/src/conf/theme/styled-components.d.ts @@ -1,4 +1,4 @@ -import { Theme } from './types'; +import { Theme } from '@conf/theme/types'; declare module 'styled-components' { // eslint-disable-next-line @typescript-eslint/no-empty-interface diff --git a/datahub-web-react/src/entityRegistryContext.tsx b/datahub-web-react/src/entityRegistryContext.tsx index 84d16a9fdc..c09e4a8bd5 100644 --- a/datahub-web-react/src/entityRegistryContext.tsx +++ b/datahub-web-react/src/entityRegistryContext.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import EntityRegistryV1 from './app/entity/EntityRegistry'; -import EntityRegistryV2 from './app/entityV2/EntityRegistry'; + +import EntityRegistryV1 from '@app/entity/EntityRegistry'; +import EntityRegistryV2 from '@app/entityV2/EntityRegistry'; export type EntityRegistry = EntityRegistryV1 | EntityRegistryV2; diff --git a/datahub-web-react/src/graphql-mock/fixtures/browseChart/index.ts b/datahub-web-react/src/graphql-mock/fixtures/browseChart/index.ts index c567e36734..5d0c9bf499 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/browseChart/index.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/browseChart/index.ts @@ -1,6 +1,6 @@ -import { EntityType } from '../../../types.generated'; -import { BrowsePathResolver } from '../browsePathHelper'; -import { chartBrowsePaths, filterChartByPath } from '../searchResult/chartSearchResult'; +import { BrowsePathResolver } from '@graphql-mock/fixtures/browsePathHelper'; +import { chartBrowsePaths, filterChartByPath } from '@graphql-mock/fixtures/searchResult/chartSearchResult'; +import { EntityType } from '@types'; const browsePathResolver = new BrowsePathResolver({ entityType: EntityType.Chart, diff --git a/datahub-web-react/src/graphql-mock/fixtures/browseDashboard/index.ts b/datahub-web-react/src/graphql-mock/fixtures/browseDashboard/index.ts index 165c896542..76c1f436ad 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/browseDashboard/index.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/browseDashboard/index.ts @@ -1,6 +1,6 @@ -import { EntityType } from '../../../types.generated'; -import { BrowsePathResolver } from '../browsePathHelper'; -import { dashboardBrowsePaths, filterDashboardByPath } from '../searchResult/dashboardSearchResult'; +import { BrowsePathResolver } from '@graphql-mock/fixtures/browsePathHelper'; +import { dashboardBrowsePaths, filterDashboardByPath } from '@graphql-mock/fixtures/searchResult/dashboardSearchResult'; +import { EntityType } from '@types'; const browsePathResolver = new BrowsePathResolver({ entityType: EntityType.Dashboard, diff --git a/datahub-web-react/src/graphql-mock/fixtures/browseDataFlow/index.ts b/datahub-web-react/src/graphql-mock/fixtures/browseDataFlow/index.ts index c3f05e6935..8a827f74e3 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/browseDataFlow/index.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/browseDataFlow/index.ts @@ -1,6 +1,6 @@ -import { EntityType } from '../../../types.generated'; -import { BrowsePathResolver } from '../browsePathHelper'; -import { dataFlowBrowsePaths, filterDataFlowByPath } from '../searchResult/dataFlowSearchResult'; +import { BrowsePathResolver } from '@graphql-mock/fixtures/browsePathHelper'; +import { dataFlowBrowsePaths, filterDataFlowByPath } from '@graphql-mock/fixtures/searchResult/dataFlowSearchResult'; +import { EntityType } from '@types'; const browsePathResolver = new BrowsePathResolver({ entityType: EntityType.DataFlow, diff --git a/datahub-web-react/src/graphql-mock/fixtures/browseDataset/index.ts b/datahub-web-react/src/graphql-mock/fixtures/browseDataset/index.ts index 2a9f593917..f674fdb31a 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/browseDataset/index.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/browseDataset/index.ts @@ -1,6 +1,6 @@ -import { EntityType } from '../../../types.generated'; -import { BrowsePathResolver } from '../browsePathHelper'; -import { datasetBrowsePaths, filterDatasetByPath } from '../searchResult/datasetSearchResult'; +import { BrowsePathResolver } from '@graphql-mock/fixtures/browsePathHelper'; +import { datasetBrowsePaths, filterDatasetByPath } from '@graphql-mock/fixtures/searchResult/datasetSearchResult'; +import { EntityType } from '@types'; const browsePathResolver = new BrowsePathResolver({ entityType: EntityType.Dataset, diff --git a/datahub-web-react/src/graphql-mock/fixtures/browsePathHelper.ts b/datahub-web-react/src/graphql-mock/fixtures/browsePathHelper.ts index 412324af08..38536c9a60 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/browsePathHelper.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/browsePathHelper.ts @@ -1,6 +1,6 @@ -import { BrowseInput, BrowseResultGroup, BrowseResults, Entity, EntityType, SearchResult } from '../../types.generated'; -import { toLowerCaseEntityType, toTitleCase } from '../helper'; -import { EntityBrowseFn, EntityBrowsePath, GetBrowseResults, StringNumber } from '../types'; +import { toLowerCaseEntityType, toTitleCase } from '@graphql-mock/helper'; +import { EntityBrowseFn, EntityBrowsePath, GetBrowseResults, StringNumber } from '@graphql-mock/types'; +import { BrowseInput, BrowseResultGroup, BrowseResults, Entity, EntityType, SearchResult } from '@types'; type ToFlatPathsArg = { flatPaths: StringNumber[][]; diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/chartEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/chartEntity.ts index 3fa3f2b2be..783ef4fb67 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/entity/chartEntity.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/entity/chartEntity.ts @@ -1,11 +1,13 @@ import * as faker from 'faker'; + +import { findUserByUsername } from '@graphql-mock/fixtures/searchResult/userSearchResult'; // import { generatePlatform } from 'generateDataPlatform'; -import { Chart, ChartType, DataPlatform, EntityType, OwnershipType, PlatformType } from '../../../types.generated'; -import kafkaLogo from '../../../images/kafkalogo.png'; -import s3Logo from '../../../images/s3.png'; -import snowflakeLogo from '../../../images/snowflakelogo.png'; -import bigqueryLogo from '../../../images/bigquerylogo.png'; -import { findUserByUsername } from '../searchResult/userSearchResult'; +import { Chart, ChartType, DataPlatform, EntityType, OwnershipType, PlatformType } from '@types'; + +import bigqueryLogo from '@images/bigquerylogo.png'; +import kafkaLogo from '@images/kafkalogo.png'; +import s3Logo from '@images/s3.png'; +import snowflakeLogo from '@images/snowflakelogo.png'; export const platformLogo = { kafka: kafkaLogo, diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/dashboardEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/dashboardEntity.ts index d2d5643af1..00b79b048e 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/entity/dashboardEntity.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/entity/dashboardEntity.ts @@ -1,12 +1,14 @@ import * as faker from 'faker'; + +import { findUserByUsername } from '@graphql-mock/fixtures/searchResult/userSearchResult'; +import { generateTag } from '@graphql-mock/fixtures/tag'; +import { Dashboard, DataPlatform, EntityType, Ownership, OwnershipType, PlatformType } from '@types'; + +import bigqueryLogo from '@images/bigquerylogo.png'; // import { generatePlatform } from 'generateDataPlatform'; -import kafkaLogo from '../../../images/kafkalogo.png'; -import s3Logo from '../../../images/s3.png'; -import snowflakeLogo from '../../../images/snowflakelogo.png'; -import bigqueryLogo from '../../../images/bigquerylogo.png'; -import { generateTag } from '../tag'; -import { Dashboard, DataPlatform, EntityType, Ownership, OwnershipType, PlatformType } from '../../../types.generated'; -import { findUserByUsername } from '../searchResult/userSearchResult'; +import kafkaLogo from '@images/kafkalogo.png'; +import s3Logo from '@images/s3.png'; +import snowflakeLogo from '@images/snowflakelogo.png'; export const platformLogo = { kafka: kafkaLogo, diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/dataFlowEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/dataFlowEntity.ts index 1f5e3d6daa..e5a7a4443b 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/entity/dataFlowEntity.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/entity/dataFlowEntity.ts @@ -1,11 +1,13 @@ import * as faker from 'faker'; + +import { findUserByUsername } from '@graphql-mock/fixtures/searchResult/userSearchResult'; +import { DataFlow, DataPlatform, EntityType, OwnershipType, PlatformType } from '@types'; + +import bigqueryLogo from '@images/bigquerylogo.png'; // import { generatePlatform } from 'generateDataPlatform'; -import kafkaLogo from '../../../images/kafkalogo.png'; -import s3Logo from '../../../images/s3.png'; -import snowflakeLogo from '../../../images/snowflakelogo.png'; -import bigqueryLogo from '../../../images/bigquerylogo.png'; -import { DataFlow, DataPlatform, EntityType, OwnershipType, PlatformType } from '../../../types.generated'; -import { findUserByUsername } from '../searchResult/userSearchResult'; +import kafkaLogo from '@images/kafkalogo.png'; +import s3Logo from '@images/s3.png'; +import snowflakeLogo from '@images/snowflakelogo.png'; export type DataFlowEntityArg = { orchestrator: string; diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/dataJobEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/dataJobEntity.ts index 8f740d4e2d..a759011f53 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/entity/dataJobEntity.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/entity/dataJobEntity.ts @@ -1,10 +1,12 @@ import * as faker from 'faker'; -import kafkaLogo from '../../../images/kafkalogo.png'; -import s3Logo from '../../../images/s3.png'; -import snowflakeLogo from '../../../images/snowflakelogo.png'; -import bigqueryLogo from '../../../images/bigquerylogo.png'; -import { DataJob, DataPlatform, EntityType, OwnershipType, PlatformType } from '../../../types.generated'; -import { findUserByUsername } from '../searchResult/userSearchResult'; + +import { findUserByUsername } from '@graphql-mock/fixtures/searchResult/userSearchResult'; +import { DataJob, DataPlatform, EntityType, OwnershipType, PlatformType } from '@types'; + +import bigqueryLogo from '@images/bigquerylogo.png'; +import kafkaLogo from '@images/kafkalogo.png'; +import s3Logo from '@images/s3.png'; +import snowflakeLogo from '@images/snowflakelogo.png'; export const platformLogo = { kafka: kafkaLogo, diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/datasetEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/datasetEntity.ts index d7476f6c44..d24bb42dbb 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/entity/datasetEntity.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/entity/datasetEntity.ts @@ -1,11 +1,13 @@ import * as faker from 'faker'; + +import { findUserByUsername } from '@graphql-mock/fixtures/searchResult/userSearchResult'; +import { DataPlatform, Dataset, EntityType, FabricType, OwnershipType, PlatformType } from '@types'; + +import bigqueryLogo from '@images/bigquerylogo.png'; // import { generatePlatform } from 'generateDataPlatform'; -import kafkaLogo from '../../../images/kafkalogo.png'; -import s3Logo from '../../../images/s3.png'; -import snowflakeLogo from '../../../images/snowflakelogo.png'; -import bigqueryLogo from '../../../images/bigquerylogo.png'; -import { DataPlatform, Dataset, EntityType, FabricType, OwnershipType, PlatformType } from '../../../types.generated'; -import { findUserByUsername } from '../searchResult/userSearchResult'; +import kafkaLogo from '@images/kafkalogo.png'; +import s3Logo from '@images/s3.png'; +import snowflakeLogo from '@images/snowflakelogo.png'; export const platformLogo = { kafka: kafkaLogo, diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/generateDataPlatform.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/generateDataPlatform.ts index 2de0d364a2..b3b39fbc39 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/entity/generateDataPlatform.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/entity/generateDataPlatform.ts @@ -1,8 +1,9 @@ -import kafkaLogo from '../../../images/kafkalogo.png'; -import s3Logo from '../../../images/s3.png'; -import snowflakeLogo from '../../../images/snowflakelogo.png'; -import bigqueryLogo from '../../../images/bigquerylogo.png'; -import { DataPlatform, EntityType, PlatformType } from '../../../types.generated'; +import { DataPlatform, EntityType, PlatformType } from '@types'; + +import bigqueryLogo from '@images/bigquerylogo.png'; +import kafkaLogo from '@images/kafkalogo.png'; +import s3Logo from '@images/s3.png'; +import snowflakeLogo from '@images/snowflakelogo.png'; export const platformLogo = { kafka: kafkaLogo, diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/userEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/userEntity.ts index ec09ed2de7..4f04dba605 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/entity/userEntity.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/entity/userEntity.ts @@ -1,5 +1,6 @@ import * as faker from 'faker'; -import { CorpUser, EntityType } from '../../../types.generated'; + +import { CorpUser, EntityType } from '@types'; export type UserEntityArg = { username: string; diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/chartSearchResult.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/chartSearchResult.ts index 6eaafc1f46..bd3d75a885 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/chartSearchResult.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/searchResult/chartSearchResult.ts @@ -1,8 +1,8 @@ -import { Chart, SearchResult, SearchResults } from '../../../types.generated'; -import { EntityBrowsePath } from '../../types'; -import { filterEntityByPath } from '../browsePathHelper'; -import { chartEntity } from '../entity/chartEntity'; -import { generateData } from './dataGenerator'; +import { filterEntityByPath } from '@graphql-mock/fixtures/browsePathHelper'; +import { chartEntity } from '@graphql-mock/fixtures/entity/chartEntity'; +import { generateData } from '@graphql-mock/fixtures/searchResult/dataGenerator'; +import { EntityBrowsePath } from '@graphql-mock/types'; +import { Chart, SearchResult, SearchResults } from '@types'; const searchResult = (tool: string) => (): SearchResult => { return { diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dashboardSearchResult.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/dashboardSearchResult.ts index d4e2a4dae1..1c504d0964 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dashboardSearchResult.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/searchResult/dashboardSearchResult.ts @@ -1,8 +1,8 @@ -import { Dashboard, SearchResult, SearchResults } from '../../../types.generated'; -import { EntityBrowsePath } from '../../types'; -import { filterEntityByPath } from '../browsePathHelper'; -import { dashboardEntity } from '../entity/dashboardEntity'; -import { generateData } from './dataGenerator'; +import { filterEntityByPath } from '@graphql-mock/fixtures/browsePathHelper'; +import { dashboardEntity } from '@graphql-mock/fixtures/entity/dashboardEntity'; +import { generateData } from '@graphql-mock/fixtures/searchResult/dataGenerator'; +import { EntityBrowsePath } from '@graphql-mock/types'; +import { Dashboard, SearchResult, SearchResults } from '@types'; const searchResult = (tool: string) => (): SearchResult => { return { diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataFlowSearchResult.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataFlowSearchResult.ts index 20a836df42..867868f2ee 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataFlowSearchResult.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataFlowSearchResult.ts @@ -1,8 +1,8 @@ -import { DataFlow, SearchResult, SearchResults } from '../../../types.generated'; -import { EntityBrowsePath } from '../../types'; -import { filterEntityByPath } from '../browsePathHelper'; -import { dataFlowEntity, DataFlowEntityArg } from '../entity/dataFlowEntity'; -import { generateData } from './dataGenerator'; +import { filterEntityByPath } from '@graphql-mock/fixtures/browsePathHelper'; +import { DataFlowEntityArg, dataFlowEntity } from '@graphql-mock/fixtures/entity/dataFlowEntity'; +import { generateData } from '@graphql-mock/fixtures/searchResult/dataGenerator'; +import { EntityBrowsePath } from '@graphql-mock/types'; +import { DataFlow, SearchResult, SearchResults } from '@types'; type SearchResultArg = DataFlowEntityArg; diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataGenerator.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataGenerator.ts index d952281791..2d818edd60 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataGenerator.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataGenerator.ts @@ -1,4 +1,4 @@ -import { AnyRecord } from '../../types'; +import { AnyRecord } from '@graphql-mock/types'; type GenerateDataArg = { generator(): T; diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataJobSearchResult.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataJobSearchResult.ts index dbe9b84e1c..26b03c030a 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataJobSearchResult.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataJobSearchResult.ts @@ -1,6 +1,6 @@ -import { DataJob, SearchResult, SearchResults } from '../../../types.generated'; -import { dataJobEntity } from '../entity/dataJobEntity'; -import { generateData } from './dataGenerator'; +import { dataJobEntity } from '@graphql-mock/fixtures/entity/dataJobEntity'; +import { generateData } from '@graphql-mock/fixtures/searchResult/dataGenerator'; +import { DataJob, SearchResult, SearchResults } from '@types'; const searchResult = (): SearchResult => { return { diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/datasetSearchResult.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/datasetSearchResult.ts index 2b80e08f5e..bd3c25abb1 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/datasetSearchResult.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/searchResult/datasetSearchResult.ts @@ -1,8 +1,8 @@ -import { generateData } from './dataGenerator'; -import { datasetEntity, DatasetEntityArg } from '../entity/datasetEntity'; -import { Dataset, FabricType, SearchResult, SearchResults } from '../../../types.generated'; -import { EntityBrowsePath, StringNumber } from '../../types'; -import { filterEntityByPath, toFlatPaths } from '../browsePathHelper'; +import { filterEntityByPath, toFlatPaths } from '@graphql-mock/fixtures/browsePathHelper'; +import { DatasetEntityArg, datasetEntity } from '@graphql-mock/fixtures/entity/datasetEntity'; +import { generateData } from '@graphql-mock/fixtures/searchResult/dataGenerator'; +import { EntityBrowsePath, StringNumber } from '@graphql-mock/types'; +import { Dataset, FabricType, SearchResult, SearchResults } from '@types'; type SearchResultArg = DatasetEntityArg; diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/userSearchResult.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/userSearchResult.ts index 68680e79c6..1ed752ee84 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/userSearchResult.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/searchResult/userSearchResult.ts @@ -1,7 +1,7 @@ /* eslint-disable prefer-object-spread */ -import { CorpUser, SearchResult, SearchResults } from '../../../types.generated'; -import { userEntity, UserEntityArg } from '../entity/userEntity'; -import { generateData } from './dataGenerator'; +import { UserEntityArg, userEntity } from '@graphql-mock/fixtures/entity/userEntity'; +import { generateData } from '@graphql-mock/fixtures/searchResult/dataGenerator'; +import { CorpUser, SearchResult, SearchResults } from '@types'; // login with one of these usernames const usernames = ['kafka', 'looker', 'datahub']; diff --git a/datahub-web-react/src/graphql-mock/fixtures/tag.ts b/datahub-web-react/src/graphql-mock/fixtures/tag.ts index a681e421b1..adde2f1043 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/tag.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/tag.ts @@ -1,7 +1,8 @@ import * as faker from 'faker'; -import { EntityType, Ownership, OwnershipType, Tag, TagUpdateInput } from '../../types.generated'; -import { getActor } from '../helper'; -import { findUserByURN } from './searchResult/userSearchResult'; + +import { findUserByURN } from '@graphql-mock/fixtures/searchResult/userSearchResult'; +import { getActor } from '@graphql-mock/helper'; +import { EntityType, Ownership, OwnershipType, Tag, TagUpdateInput } from '@types'; export const tagDb: Tag[] = []; diff --git a/datahub-web-react/src/graphql-mock/fixtures/user.ts b/datahub-web-react/src/graphql-mock/fixtures/user.ts index d931876260..4d6a00f4d6 100644 --- a/datahub-web-react/src/graphql-mock/fixtures/user.ts +++ b/datahub-web-react/src/graphql-mock/fixtures/user.ts @@ -1,4 +1,4 @@ -import { getUsers } from './searchResult/userSearchResult'; +import { getUsers } from '@graphql-mock/fixtures/searchResult/userSearchResult'; const createCorpUserSchema = ({ server, user }) => { const { info, editableInfo } = user; diff --git a/datahub-web-react/src/graphql-mock/helper.ts b/datahub-web-react/src/graphql-mock/helper.ts index d6dbb24afd..3e6d5f3296 100644 --- a/datahub-web-react/src/graphql-mock/helper.ts +++ b/datahub-web-react/src/graphql-mock/helper.ts @@ -1,4 +1,4 @@ -import { EntityType } from '../types.generated'; +import { EntityType } from '@types'; /** * Common helpers diff --git a/datahub-web-react/src/graphql-mock/mutationHelper.ts b/datahub-web-react/src/graphql-mock/mutationHelper.ts index 0cf4f5f87f..30cd4daa07 100644 --- a/datahub-web-react/src/graphql-mock/mutationHelper.ts +++ b/datahub-web-react/src/graphql-mock/mutationHelper.ts @@ -1,3 +1,6 @@ +import { findUserByURN } from '@graphql-mock/fixtures/searchResult/userSearchResult'; +import { tagDb } from '@graphql-mock/fixtures/tag'; +import { getActor } from '@graphql-mock/helper'; import { Chart, Dashboard, @@ -14,10 +17,7 @@ import { Owner, OwnerUpdate, TagAssociation, -} from '../types.generated'; -import { findUserByURN } from './fixtures/searchResult/userSearchResult'; -import { tagDb } from './fixtures/tag'; -import { getActor } from './helper'; +} from '@types'; type UpdateEntityOwnersArg = { entity?: Entity; diff --git a/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteAllResultsResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteAllResultsResolver.ts index 52c4845302..79736cee3f 100644 --- a/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteAllResultsResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteAllResultsResolver.ts @@ -1,6 +1,8 @@ +import * as fixtures from '@graphql-mock/fixtures'; +import { tagDb } from '@graphql-mock/fixtures/tag'; import { - AutoCompleteMultipleResults, AutoCompleteInput, + AutoCompleteMultipleResults, AutoCompleteResultForEntity, Chart, CorpUser, @@ -10,9 +12,7 @@ import { Dataset, EntityType, Maybe, -} from '../../types.generated'; -import * as fixtures from '../fixtures'; -import { tagDb } from '../fixtures/tag'; +} from '@types'; type GetAutoCompleteAllResults = { data: { diff --git a/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteResultsResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteResultsResolver.ts index 68354c4398..a97a0014c3 100644 --- a/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteResultsResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteResultsResolver.ts @@ -1,3 +1,5 @@ +import * as fixtures from '@graphql-mock/fixtures'; +import { tagDb } from '@graphql-mock/fixtures/tag'; import { AutoCompleteInput, AutoCompleteResults, @@ -8,9 +10,7 @@ import { DataJob, Dataset, EntityType, -} from '../../types.generated'; -import * as fixtures from '../fixtures'; -import { tagDb } from '../fixtures/tag'; +} from '@types'; type GetAutoCompleteResults = { data: { diff --git a/datahub-web-react/src/graphql-mock/resolver/getBrowsePathsResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getBrowsePathsResolver.ts index 2e438b93a7..ad836a207b 100644 --- a/datahub-web-react/src/graphql-mock/resolver/getBrowsePathsResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/getBrowsePathsResolver.ts @@ -1,4 +1,4 @@ -import { BrowsePath, BrowsePathsInput, EntityType } from '../../types.generated'; +import { BrowsePath, BrowsePathsInput, EntityType } from '@types'; const paths = { [EntityType.Dataset](urn) { diff --git a/datahub-web-react/src/graphql-mock/resolver/getBrowseResultsResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getBrowseResultsResolver.ts index c62c65dffa..f4856a36d9 100644 --- a/datahub-web-react/src/graphql-mock/resolver/getBrowseResultsResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/getBrowseResultsResolver.ts @@ -1,7 +1,7 @@ -import * as fixtures from '../fixtures'; -import { BrowseInput } from '../../types.generated'; -import { EntityBrowseFn, GetBrowseResults } from '../types'; -import { toLowerCaseEntityType, toTitleCase } from '../helper'; +import * as fixtures from '@graphql-mock/fixtures'; +import { toLowerCaseEntityType, toTitleCase } from '@graphql-mock/helper'; +import { EntityBrowseFn, GetBrowseResults } from '@graphql-mock/types'; +import { BrowseInput } from '@types'; const toPathTitle = (paths: string[]): string => { return paths?.map((p) => toTitleCase(p)).join(''); diff --git a/datahub-web-react/src/graphql-mock/resolver/getChartResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getChartResolver.ts index 2be8be4469..975d24f753 100644 --- a/datahub-web-react/src/graphql-mock/resolver/getChartResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/getChartResolver.ts @@ -1,5 +1,5 @@ -import { Chart } from '../../types.generated'; -import { findChartByURN } from '../fixtures/searchResult/chartSearchResult'; +import { findChartByURN } from '@graphql-mock/fixtures/searchResult/chartSearchResult'; +import { Chart } from '@types'; type GetChart = { data: { diff --git a/datahub-web-react/src/graphql-mock/resolver/getDashboardResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getDashboardResolver.ts index 1cd571ede1..20a2cfe71e 100644 --- a/datahub-web-react/src/graphql-mock/resolver/getDashboardResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/getDashboardResolver.ts @@ -1,5 +1,5 @@ -import { Dashboard } from '../../types.generated'; -import { findDashboardByURN } from '../fixtures/searchResult/dashboardSearchResult'; +import { findDashboardByURN } from '@graphql-mock/fixtures/searchResult/dashboardSearchResult'; +import { Dashboard } from '@types'; type GetDashboard = { data: { dashboard: Dashboard }; diff --git a/datahub-web-react/src/graphql-mock/resolver/getDataFlowResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getDataFlowResolver.ts index c677c48ef9..e4a9b274c0 100644 --- a/datahub-web-react/src/graphql-mock/resolver/getDataFlowResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/getDataFlowResolver.ts @@ -1,5 +1,5 @@ -import { DataFlow } from '../../types.generated'; -import { findDataFlowByURN } from '../fixtures/searchResult/dataFlowSearchResult'; +import { findDataFlowByURN } from '@graphql-mock/fixtures/searchResult/dataFlowSearchResult'; +import { DataFlow } from '@types'; type GetDataFlow = { data: { dataFlow: DataFlow }; diff --git a/datahub-web-react/src/graphql-mock/resolver/getDataJobResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getDataJobResolver.ts index 584abcaf20..140ecb1fda 100644 --- a/datahub-web-react/src/graphql-mock/resolver/getDataJobResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/getDataJobResolver.ts @@ -1,5 +1,5 @@ -import { DataJob } from '../../types.generated'; -import { findDataJobByURN } from '../fixtures/searchResult/dataJobSearchResult'; +import { findDataJobByURN } from '@graphql-mock/fixtures/searchResult/dataJobSearchResult'; +import { DataJob } from '@types'; type GetJobFlow = { data: { dataJob: DataJob }; diff --git a/datahub-web-react/src/graphql-mock/resolver/getDatasetResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getDatasetResolver.ts index ffdf3920c9..ec4e0957ff 100644 --- a/datahub-web-react/src/graphql-mock/resolver/getDatasetResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/getDatasetResolver.ts @@ -1,5 +1,5 @@ -import { Dataset, InstitutionalMemory, InstitutionalMemoryMetadata } from '../../types.generated'; -import { findDatasetByURN } from '../fixtures/searchResult/datasetSearchResult'; +import { findDatasetByURN } from '@graphql-mock/fixtures/searchResult/datasetSearchResult'; +import { Dataset, InstitutionalMemory, InstitutionalMemoryMetadata } from '@types'; type GetDataset = { data: { dataset: Dataset }; diff --git a/datahub-web-react/src/graphql-mock/resolver/getSearchResultsResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getSearchResultsResolver.ts index 7634cb4c9a..8093c5f395 100644 --- a/datahub-web-react/src/graphql-mock/resolver/getSearchResultsResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/getSearchResultsResolver.ts @@ -1,4 +1,4 @@ -import * as fixtures from '../fixtures'; +import * as fixtures from '@graphql-mock/fixtures'; import { Chart, CorpUser, @@ -10,7 +10,7 @@ import { SearchInput, SearchResult, SearchResults, -} from '../../types.generated'; +} from '@types'; const entitySearchResults = { [EntityType.Dataset]: fixtures.datasetSearchResult, diff --git a/datahub-web-react/src/graphql-mock/resolver/getTagResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getTagResolver.ts index 2c72292ae6..375872fe93 100644 --- a/datahub-web-react/src/graphql-mock/resolver/getTagResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/getTagResolver.ts @@ -1,5 +1,5 @@ -import { Tag } from '../../types.generated'; -import { tagDb } from '../fixtures/tag'; +import { tagDb } from '@graphql-mock/fixtures/tag'; +import { Tag } from '@types'; type GetTag = { data: { tag: Tag | undefined }; diff --git a/datahub-web-react/src/graphql-mock/resolver/index.ts b/datahub-web-react/src/graphql-mock/resolver/index.ts index 519629d9ea..8e631d73c2 100644 --- a/datahub-web-react/src/graphql-mock/resolver/index.ts +++ b/datahub-web-react/src/graphql-mock/resolver/index.ts @@ -1,21 +1,21 @@ -import { getBrowseResultsResolver } from './getBrowseResultsResolver'; -import { getSearchResultsResolver } from './getSearchResultsResolver'; -import { getAutoCompleteAllResultsResolver } from './getAutoCompleteAllResultsResolver'; -import { getAutoCompleteResultsResolver } from './getAutoCompleteResultsResolver'; -import { getBrowsePathsResolver } from './getBrowsePathsResolver'; -import { getDatasetResolver } from './getDatasetResolver'; -import { getDashboardResolver } from './getDashboardResolver'; -import { getChartResolver } from './getChartResolver'; -import { getDataFlowResolver } from './getDataFlowResolver'; -import { getDataJobResolver } from './getDataJobResolver'; -import { getTagResolver } from './getTagResolver'; -import { isAnalyticsEnabledResolver } from './isAnalyticsEnabledResolver'; -import { updateDatasetResolver } from './updateDatasetResolver'; -import { updateDashboardResolver } from './updateDashboardResolver'; -import { updateChartResolver } from './updateChartResolver'; -import { updateDataFlowResolver } from './updateDataFlowResolver'; -import { updateDataJobResolver } from './updateDataJobResolver'; -import { updateTagResolver } from './updateTagResolver'; +import { getAutoCompleteAllResultsResolver } from '@graphql-mock/resolver/getAutoCompleteAllResultsResolver'; +import { getAutoCompleteResultsResolver } from '@graphql-mock/resolver/getAutoCompleteResultsResolver'; +import { getBrowsePathsResolver } from '@graphql-mock/resolver/getBrowsePathsResolver'; +import { getBrowseResultsResolver } from '@graphql-mock/resolver/getBrowseResultsResolver'; +import { getChartResolver } from '@graphql-mock/resolver/getChartResolver'; +import { getDashboardResolver } from '@graphql-mock/resolver/getDashboardResolver'; +import { getDataFlowResolver } from '@graphql-mock/resolver/getDataFlowResolver'; +import { getDataJobResolver } from '@graphql-mock/resolver/getDataJobResolver'; +import { getDatasetResolver } from '@graphql-mock/resolver/getDatasetResolver'; +import { getSearchResultsResolver } from '@graphql-mock/resolver/getSearchResultsResolver'; +import { getTagResolver } from '@graphql-mock/resolver/getTagResolver'; +import { isAnalyticsEnabledResolver } from '@graphql-mock/resolver/isAnalyticsEnabledResolver'; +import { updateChartResolver } from '@graphql-mock/resolver/updateChartResolver'; +import { updateDashboardResolver } from '@graphql-mock/resolver/updateDashboardResolver'; +import { updateDataFlowResolver } from '@graphql-mock/resolver/updateDataFlowResolver'; +import { updateDataJobResolver } from '@graphql-mock/resolver/updateDataJobResolver'; +import { updateDatasetResolver } from '@graphql-mock/resolver/updateDatasetResolver'; +import { updateTagResolver } from '@graphql-mock/resolver/updateTagResolver'; const resolver = { ...getSearchResultsResolver, diff --git a/datahub-web-react/src/graphql-mock/resolver/updateChartResolver.ts b/datahub-web-react/src/graphql-mock/resolver/updateChartResolver.ts index 51119365f2..b44d3baeb7 100644 --- a/datahub-web-react/src/graphql-mock/resolver/updateChartResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/updateChartResolver.ts @@ -1,6 +1,6 @@ -import { Chart, ChartUpdateInput } from '../../types.generated'; -import { findChartByURN } from '../fixtures/searchResult/chartSearchResult'; -import { updateEntityOwners, updateEntityTag } from '../mutationHelper'; +import { findChartByURN } from '@graphql-mock/fixtures/searchResult/chartSearchResult'; +import { updateEntityOwners, updateEntityTag } from '@graphql-mock/mutationHelper'; +import { Chart, ChartUpdateInput } from '@types'; type UpdateChart = { data: { updateChart: Chart }; diff --git a/datahub-web-react/src/graphql-mock/resolver/updateDashboardResolver.ts b/datahub-web-react/src/graphql-mock/resolver/updateDashboardResolver.ts index ee0a634a34..68d1b3f47d 100644 --- a/datahub-web-react/src/graphql-mock/resolver/updateDashboardResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/updateDashboardResolver.ts @@ -1,6 +1,6 @@ -import { Dashboard, DashboardUpdateInput } from '../../types.generated'; -import { findDashboardByURN } from '../fixtures/searchResult/dashboardSearchResult'; -import { updateEntityOwners, updateEntityTag } from '../mutationHelper'; +import { findDashboardByURN } from '@graphql-mock/fixtures/searchResult/dashboardSearchResult'; +import { updateEntityOwners, updateEntityTag } from '@graphql-mock/mutationHelper'; +import { Dashboard, DashboardUpdateInput } from '@types'; type UpdateDashboard = { data: { updateDashboard: Dashboard }; diff --git a/datahub-web-react/src/graphql-mock/resolver/updateDataFlowResolver.ts b/datahub-web-react/src/graphql-mock/resolver/updateDataFlowResolver.ts index 4656a1e194..8f1dacfcbb 100644 --- a/datahub-web-react/src/graphql-mock/resolver/updateDataFlowResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/updateDataFlowResolver.ts @@ -1,6 +1,6 @@ -import { DataFlow, DataFlowUpdateInput } from '../../types.generated'; -import { findDataFlowByURN } from '../fixtures/searchResult/dataFlowSearchResult'; -import { updateEntityOwners, updateEntityTag } from '../mutationHelper'; +import { findDataFlowByURN } from '@graphql-mock/fixtures/searchResult/dataFlowSearchResult'; +import { updateEntityOwners, updateEntityTag } from '@graphql-mock/mutationHelper'; +import { DataFlow, DataFlowUpdateInput } from '@types'; type UpdateDataFlow = { data: { updateDataFlow: DataFlow }; diff --git a/datahub-web-react/src/graphql-mock/resolver/updateDataJobResolver.ts b/datahub-web-react/src/graphql-mock/resolver/updateDataJobResolver.ts index 3031a865ba..28df1cd96d 100644 --- a/datahub-web-react/src/graphql-mock/resolver/updateDataJobResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/updateDataJobResolver.ts @@ -1,6 +1,6 @@ -import { DataJob, DataJobUpdateInput } from '../../types.generated'; -import { findDataJobByURN } from '../fixtures/searchResult/dataJobSearchResult'; -import { updateEntityOwners, updateEntityTag } from '../mutationHelper'; +import { findDataJobByURN } from '@graphql-mock/fixtures/searchResult/dataJobSearchResult'; +import { updateEntityOwners, updateEntityTag } from '@graphql-mock/mutationHelper'; +import { DataJob, DataJobUpdateInput } from '@types'; type UpdateDataJob = { data: { updateDataJob: DataJob }; diff --git a/datahub-web-react/src/graphql-mock/resolver/updateDatasetResolver.ts b/datahub-web-react/src/graphql-mock/resolver/updateDatasetResolver.ts index 9f43c857e0..67700e59b5 100644 --- a/datahub-web-react/src/graphql-mock/resolver/updateDatasetResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/updateDatasetResolver.ts @@ -1,6 +1,6 @@ -import { Dataset, DatasetUpdateInput } from '../../types.generated'; -import { findDatasetByURN } from '../fixtures/searchResult/datasetSearchResult'; -import { updateEntityLink, updateEntityOwners, updateEntityTag } from '../mutationHelper'; +import { findDatasetByURN } from '@graphql-mock/fixtures/searchResult/datasetSearchResult'; +import { updateEntityLink, updateEntityOwners, updateEntityTag } from '@graphql-mock/mutationHelper'; +import { Dataset, DatasetUpdateInput } from '@types'; type UpdateDataset = { data: { updateDataset: Dataset }; diff --git a/datahub-web-react/src/graphql-mock/resolver/updateTagResolver.ts b/datahub-web-react/src/graphql-mock/resolver/updateTagResolver.ts index 0d9ad3d6a8..49b2136aca 100644 --- a/datahub-web-react/src/graphql-mock/resolver/updateTagResolver.ts +++ b/datahub-web-react/src/graphql-mock/resolver/updateTagResolver.ts @@ -1,5 +1,5 @@ -import { Tag } from '../../types.generated'; -import { createTag } from '../fixtures/tag'; +import { createTag } from '@graphql-mock/fixtures/tag'; +import { Tag } from '@types'; type UpdateTag = { data: { updateTag: Tag | undefined }; diff --git a/datahub-web-react/src/graphql-mock/schema.ts b/datahub-web-react/src/graphql-mock/schema.ts index aac6ab0988..058f714ac9 100644 --- a/datahub-web-react/src/graphql-mock/schema.ts +++ b/datahub-web-react/src/graphql-mock/schema.ts @@ -1,7 +1,6 @@ -import { loader } from 'graphql.macro'; - -import gql from 'graphql-tag'; import { buildASTSchema } from 'graphql'; +import gql from 'graphql-tag'; +import { loader } from 'graphql.macro'; const entitySchema = loader('../../../datahub-graphql-core/src/main/resources/entity.graphql'); const searchSchema = loader('../../../datahub-graphql-core/src/main/resources/search.graphql'); diff --git a/datahub-web-react/src/graphql-mock/types.ts b/datahub-web-react/src/graphql-mock/types.ts index f04ebfbf41..5486303daa 100644 --- a/datahub-web-react/src/graphql-mock/types.ts +++ b/datahub-web-react/src/graphql-mock/types.ts @@ -1,4 +1,4 @@ -import { BrowseResults } from '../types.generated'; +import { BrowseResults } from '@types'; export type DataSchema = { id?: string | undefined; diff --git a/datahub-web-react/src/index.tsx b/datahub-web-react/src/index.tsx index c3ef2105ed..e5e0f54840 100644 --- a/datahub-web-react/src/index.tsx +++ b/datahub-web-react/src/index.tsx @@ -1,7 +1,8 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import { App } from './App'; -import reportWebVitals from './reportWebVitals'; + +import { App } from '@src/App'; +import reportWebVitals from '@src/reportWebVitals'; ReactDOM.render( diff --git a/datahub-web-react/src/providers/EducationStepsContext.tsx b/datahub-web-react/src/providers/EducationStepsContext.tsx index aee0cebc66..f401c790d9 100644 --- a/datahub-web-react/src/providers/EducationStepsContext.tsx +++ b/datahub-web-react/src/providers/EducationStepsContext.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { StepStateResult } from '../types.generated'; + +import { StepStateResult } from '@types'; export const EducationStepsContext = React.createContext<{ educationSteps: StepStateResult[] | null; diff --git a/datahub-web-react/src/providers/EducationStepsProvider.tsx b/datahub-web-react/src/providers/EducationStepsProvider.tsx index 807d153222..ec4560e7ae 100644 --- a/datahub-web-react/src/providers/EducationStepsProvider.tsx +++ b/datahub-web-react/src/providers/EducationStepsProvider.tsx @@ -1,9 +1,11 @@ import React, { useEffect, useState } from 'react'; -import { getInitialAllowListIds, getStepIds } from '../app/onboarding/utils'; -import { useBatchGetStepStatesQuery } from '../graphql/step.generated'; -import { EducationStepsContext } from './EducationStepsContext'; -import { StepStateResult } from '../types.generated'; -import { useUserContext } from '../app/context/useUserContext'; + +import { useUserContext } from '@app/context/useUserContext'; +import { getInitialAllowListIds, getStepIds } from '@app/onboarding/utils'; +import { EducationStepsContext } from '@providers/EducationStepsContext'; + +import { useBatchGetStepStatesQuery } from '@graphql/step.generated'; +import { StepStateResult } from '@types'; export function EducationStepsProvider({ children }: { children: React.ReactNode }) { const userUrn = useUserContext()?.user?.urn; diff --git a/datahub-web-react/src/providers/QuickFiltersContext.tsx b/datahub-web-react/src/providers/QuickFiltersContext.tsx index 67ddedf02b..70c65716e0 100644 --- a/datahub-web-react/src/providers/QuickFiltersContext.tsx +++ b/datahub-web-react/src/providers/QuickFiltersContext.tsx @@ -1,5 +1,6 @@ import React, { useContext } from 'react'; -import { QuickFilter } from '../types.generated'; + +import { QuickFilter } from '@types'; interface AppStateType { quickFilters: QuickFilter[] | null; diff --git a/datahub-web-react/src/providers/QuickFiltersProvider.tsx b/datahub-web-react/src/providers/QuickFiltersProvider.tsx index 738d06e251..a44bc3817b 100644 --- a/datahub-web-react/src/providers/QuickFiltersProvider.tsx +++ b/datahub-web-react/src/providers/QuickFiltersProvider.tsx @@ -1,8 +1,10 @@ import React, { useEffect, useState } from 'react'; -import { QuickFiltersContext } from './QuickFiltersContext'; -import { QuickFilter } from '../types.generated'; -import { useGetQuickFiltersQuery } from '../graphql/quickFilters.generated'; -import { useUserContext } from '../app/context/useUserContext'; + +import { useUserContext } from '@app/context/useUserContext'; +import { QuickFiltersContext } from '@providers/QuickFiltersContext'; + +import { useGetQuickFiltersQuery } from '@graphql/quickFilters.generated'; +import { QuickFilter } from '@types'; export default function QuickFiltersProvider({ children }: { children: React.ReactNode }) { const userContext = useUserContext(); diff --git a/datahub-web-react/src/utils/sort/__tests__/topologicalSort.test.ts b/datahub-web-react/src/utils/sort/__tests__/topologicalSort.test.ts index fd3585d3c4..35f98435d2 100644 --- a/datahub-web-react/src/utils/sort/__tests__/topologicalSort.test.ts +++ b/datahub-web-react/src/utils/sort/__tests__/topologicalSort.test.ts @@ -1,5 +1,5 @@ -import { dataJob1, dataJob2, dataJob3 } from '../../../Mocks'; -import { topologicalSort } from '../topologicalSort'; +import { dataJob1, dataJob2, dataJob3 } from '@src/Mocks'; +import { topologicalSort } from '@utils/sort/topologicalSort'; describe('topologicalSort', () => { it('sorts a list in correct order', () => { diff --git a/datahub-web-react/src/utils/sort/topologicalSort.ts b/datahub-web-react/src/utils/sort/topologicalSort.ts index 04d33836fe..248b7e8dee 100644 --- a/datahub-web-react/src/utils/sort/topologicalSort.ts +++ b/datahub-web-react/src/utils/sort/topologicalSort.ts @@ -1,4 +1,4 @@ -import { DataJob } from '../../types.generated'; +import { DataJob } from '@types'; function topologicalSortVisit(nodeUrn: string, result: string[], visited: string[], nodes: DataJob[]) { if (result.indexOf(nodeUrn) !== -1 || visited.indexOf(nodeUrn) !== -1) { diff --git a/datahub-web-react/src/utils/test-utils/TestPageContainer.tsx b/datahub-web-react/src/utils/test-utils/TestPageContainer.tsx index 0f749de9a6..d7b9363e00 100644 --- a/datahub-web-react/src/utils/test-utils/TestPageContainer.tsx +++ b/datahub-web-react/src/utils/test-utils/TestPageContainer.tsx @@ -1,39 +1,37 @@ -import React, { useMemo } from 'react'; -import { MemoryRouter } from 'react-router'; - import { Remirror, useRemirror } from '@remirror/react'; +import React, { useMemo } from 'react'; +import { HelmetProvider } from 'react-helmet-async'; +import { MemoryRouter } from 'react-router'; import { ItalicExtension, UnderlineExtension } from 'remirror/extensions'; -import { HelmetProvider } from 'react-helmet-async'; -import EntityRegistry from '../../app/entity/EntityRegistry'; -import { DataFlowEntity } from '../../app/entity/dataFlow/DataFlowEntity'; -import { DataJobEntity } from '../../app/entity/dataJob/DataJobEntity'; -import { DatasetEntity } from '../../app/entity/dataset/DatasetEntity'; -import { GroupEntity } from '../../app/entity/group/Group'; -import { TagEntity } from '../../app/entity/tag/Tag'; -import { UserEntity } from '../../app/entity/user/User'; -import { CLIENT_AUTH_COOKIE } from '../../conf/Global'; -import { EntityRegistryContext } from '../../entityRegistryContext'; - -import AppConfigProvider from '../../AppConfigProvider'; -import CustomThemeProvider from '../../CustomThemeProvider'; -import UserContextProvider from '../../app/context/UserContextProvider'; -import { BusinessAttributeEntity } from '../../app/entity/businessAttribute/BusinessAttributeEntity'; -import { ChartEntity } from '../../app/entity/chart/ChartEntity'; -import { ContainerEntity } from '../../app/entity/container/ContainerEntity'; -import { DashboardEntity } from '../../app/entity/dashboard/DashboardEntity'; -import { DataPlatformEntity } from '../../app/entity/dataPlatform/DataPlatformEntity'; -import { DataPlatformInstanceEntity } from '../../app/entity/dataPlatformInstance/DataPlatformInstanceEntity'; -import { DataProductEntity } from '../../app/entity/dataProduct/DataProductEntity'; -import { DomainEntity } from '../../app/entity/domain/DomainEntity'; -import { GlossaryTermEntity } from '../../app/entity/glossaryTerm/GlossaryTermEntity'; -import { MLFeatureTableEntity } from '../../app/entity/mlFeatureTable/MLFeatureTableEntity'; -import { MLModelEntity } from '../../app/entity/mlModel/MLModelEntity'; -import { MLModelGroupEntity } from '../../app/entity/mlModelGroup/MLModelGroupEntity'; -import { QueryEntity } from '../../app/entity/query/QueryEntity'; -import { SchemaFieldPropertiesEntity } from '../../app/entity/schemaField/SchemaFieldPropertiesEntity'; -import { StructuredPropertyEntity } from '../../app/entity/structuredProperty/StructuredPropertyEntity'; -import { LineageExplorerContext } from '../../app/lineage/utils/LineageExplorerContext'; +import UserContextProvider from '@app/context/UserContextProvider'; +import EntityRegistry from '@app/entity/EntityRegistry'; +import { BusinessAttributeEntity } from '@app/entity/businessAttribute/BusinessAttributeEntity'; +import { ChartEntity } from '@app/entity/chart/ChartEntity'; +import { ContainerEntity } from '@app/entity/container/ContainerEntity'; +import { DashboardEntity } from '@app/entity/dashboard/DashboardEntity'; +import { DataFlowEntity } from '@app/entity/dataFlow/DataFlowEntity'; +import { DataJobEntity } from '@app/entity/dataJob/DataJobEntity'; +import { DataPlatformEntity } from '@app/entity/dataPlatform/DataPlatformEntity'; +import { DataPlatformInstanceEntity } from '@app/entity/dataPlatformInstance/DataPlatformInstanceEntity'; +import { DataProductEntity } from '@app/entity/dataProduct/DataProductEntity'; +import { DatasetEntity } from '@app/entity/dataset/DatasetEntity'; +import { DomainEntity } from '@app/entity/domain/DomainEntity'; +import { GlossaryTermEntity } from '@app/entity/glossaryTerm/GlossaryTermEntity'; +import { GroupEntity } from '@app/entity/group/Group'; +import { MLFeatureTableEntity } from '@app/entity/mlFeatureTable/MLFeatureTableEntity'; +import { MLModelEntity } from '@app/entity/mlModel/MLModelEntity'; +import { MLModelGroupEntity } from '@app/entity/mlModelGroup/MLModelGroupEntity'; +import { QueryEntity } from '@app/entity/query/QueryEntity'; +import { SchemaFieldPropertiesEntity } from '@app/entity/schemaField/SchemaFieldPropertiesEntity'; +import { StructuredPropertyEntity } from '@app/entity/structuredProperty/StructuredPropertyEntity'; +import { TagEntity } from '@app/entity/tag/Tag'; +import { UserEntity } from '@app/entity/user/User'; +import { LineageExplorerContext } from '@app/lineage/utils/LineageExplorerContext'; +import { CLIENT_AUTH_COOKIE } from '@conf/Global'; +import AppConfigProvider from '@src/AppConfigProvider'; +import CustomThemeProvider from '@src/CustomThemeProvider'; +import { EntityRegistryContext } from '@src/entityRegistryContext'; type Props = { children: React.ReactNode; diff --git a/datahub-web-react/tsconfig.json b/datahub-web-react/tsconfig.json index ebdff3429a..4eaadf421d 100644 --- a/datahub-web-react/tsconfig.json +++ b/datahub-web-react/tsconfig.json @@ -19,27 +19,19 @@ "jsx": "react-jsx", "types": ["vitest/globals"], "paths": { - "@src/*": ["./src/*"], - "@app/*": ["./src/app/*"], - "@conf/*": ["./src/conf/*"], "@components": ["./src/alchemy-components"], "@components/*": ["./src/alchemy-components/*"], + "@app/*": ["./src/app/*"], + "@conf": ["./src/conf"], + "@conf/*": ["./src/conf/*"], "@graphql/*": ["./src/graphql/*"], "@graphql-mock/*": ["./src/graphql-mock/*"], "@images/*": ["./src/images/*"], "@providers/*": ["./src/providers/*"], "@utils/*": ["./src/utils/*"], - "@app/entityV1/*": ["./src/app/entity/*"], - "@app/entityV2/*": ["./src/app/entityV2/*"], - "@app/searchV2/*": ["./src/app/searchV2/*"], - "@app/domainV2/*": ["./src/app/domainV2/*"], - "@app/glossaryV2/*": ["./src/app/glossaryV2/*"], - "@app/homeV2/*": ["./src/app/homeV2/*"], - "@app/lineageV2/*": ["./src/app/lineageV2/*"], - "@app/previewV2/*": ["./src/app/previewV2/*"], - "@app/sharedV2/*": ["./src/app/sharedV2/*"], "@types": ["./src/types.generated.ts"], - "@images": ["./src/images"] + "@images": ["./src/images"], + "@src/*": ["./src/*"] } }, "include": ["src", "src/conf/theme/styled-components.d.ts", "vite.config.ts", ".eslintrc.js", "functions"] diff --git a/datahub-web-react/vite.config.ts b/datahub-web-react/vite.config.ts index ad156c958a..b7e9115c37 100644 --- a/datahub-web-react/vite.config.ts +++ b/datahub-web-react/vite.config.ts @@ -1,9 +1,9 @@ +import react from '@vitejs/plugin-react'; import * as path from 'path'; import { defineConfig, loadEnv } from 'vite'; -import react from '@vitejs/plugin-react'; -import svgr from 'vite-plugin-svgr'; import macrosPlugin from 'vite-plugin-babel-macros'; import { viteStaticCopy } from 'vite-plugin-static-copy'; +import svgr from 'vite-plugin-svgr'; const injectMeticulous = () => { if (!process.env.REACT_APP_METICULOUS_PROJECT_TOKEN) { @@ -143,17 +143,6 @@ export default defineConfig(({ mode }) => { '@providers': path.resolve(__dirname, 'src/providers'), '@utils': path.resolve(__dirname, 'src/utils'), - // App Specific Directories - '@app/entityV1': path.resolve(__dirname, 'src/app/entity'), - '@app/entityV2': path.resolve(__dirname, 'src/app/entityV2'), - '@app/searchV2': path.resolve(__dirname, 'src/app/searchV2'), - '@app/domainV2': path.resolve(__dirname, 'src/app/domainV2'), - '@app/glossaryV2': path.resolve(__dirname, 'src/app/glossaryV2'), - '@app/homeV2': path.resolve(__dirname, 'src/app/homeV2'), - '@app/lineageV2': path.resolve(__dirname, 'src/app/lineageV2'), - '@app/previewV2': path.resolve(__dirname, 'src/app/previewV2'), - '@app/sharedV2': path.resolve(__dirname, 'src/app/sharedV2'), - // Specific Files '@types': path.resolve(__dirname, 'src/types.generated.ts'), }, diff --git a/datahub-web-react/yarn.lock b/datahub-web-react/yarn.lock index 20e22325be..fbe3cefb44 100644 --- a/datahub-web-react/yarn.lock +++ b/datahub-web-react/yarn.lock @@ -357,6 +357,17 @@ "@jridgewell/trace-mapping" "^0.3.25" jsesc "^3.0.2" +"@babel/generator@^7.26.5": + version "7.27.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.27.0.tgz#764382b5392e5b9aff93cadb190d0745866cbc2c" + integrity sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw== + dependencies: + "@babel/parser" "^7.27.0" + "@babel/types" "^7.27.0" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + jsesc "^3.0.2" + "@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" @@ -691,6 +702,13 @@ dependencies: "@babel/types" "^7.26.3" +"@babel/parser@^7.26.7", "@babel/parser@^7.27.0": + version "7.27.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.0.tgz#3d7d6ee268e41d2600091cbd4e145ffee85a44ec" + integrity sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg== + dependencies: + "@babel/types" "^7.27.0" + "@babel/plugin-proposal-class-properties@^7.0.0": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" @@ -974,7 +992,7 @@ "@babel/parser" "^7.25.9" "@babel/types" "^7.25.9" -"@babel/traverse@>=7.23.2", "@babel/traverse@^7.1.6", "@babel/traverse@^7.14.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.18.9", "@babel/traverse@^7.22.5", "@babel/traverse@^7.23.2", "@babel/traverse@^7.23.5", "@babel/traverse@^7.25.9", "@babel/traverse@^7.4.5": +"@babel/traverse@>=7.23.2", "@babel/traverse@^7.1.6", "@babel/traverse@^7.14.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.18.9", "@babel/traverse@^7.22.5", "@babel/traverse@^7.23.2", "@babel/traverse@^7.23.5", "@babel/traverse@^7.25.9", "@babel/traverse@^7.26.7", "@babel/traverse@^7.4.5": version "7.23.5" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.5.tgz#f546bf9aba9ef2b042c0e00d245990c15508e7ec" integrity sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w== @@ -1025,6 +1043,14 @@ "@babel/helper-validator-identifier" "^7.22.20" to-fast-properties "^2.0.0" +"@babel/types@^7.26.7", "@babel/types@^7.27.0": + version "7.27.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.0.tgz#ef9acb6b06c3173f6632d993ecb6d4ae470b4559" + integrity sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg== + dependencies: + "@babel/helper-string-parser" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -4019,6 +4045,18 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== +"@trivago/prettier-plugin-sort-imports@^5.2.2": + version "5.2.2" + resolved "https://registry.yarnpkg.com/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.2.tgz#38983f0b83490a0a7d974a6f1e409fb4bf678d02" + integrity sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA== + dependencies: + "@babel/generator" "^7.26.5" + "@babel/parser" "^7.26.7" + "@babel/traverse" "^7.26.7" + "@babel/types" "^7.26.7" + javascript-natural-sort "^0.7.1" + lodash "^4.17.21" + "@types/aria-query@^5.0.1": version "5.0.3" resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.3.tgz#07570ebd25f9b516c910a91f7244052c9b58eabc" @@ -7436,6 +7474,11 @@ eslint-module-utils@^2.7.4: dependencies: debug "^3.2.7" +eslint-plugin-import-alias@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-import-alias/-/eslint-plugin-import-alias-1.2.0.tgz#93bd701cea442e0807c099c385a9adfb074f1c37" + integrity sha512-hxhpWtaXgBTeCUmQa6EzjKI8vnrk7uej9e+ln2etTMPFAM7Q8xNPdBywSGrWf2mSB018D66sR1ZfdThonXCplg== + eslint-plugin-import@^2.25.3: version "2.27.5" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65" @@ -8990,6 +9033,11 @@ jake@^10.8.5: filelist "^1.0.4" minimatch "^3.1.2" +javascript-natural-sort@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" + integrity sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw== + jiti@^1.17.1: version "1.21.0" resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d" @@ -10316,10 +10364,10 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prettier@^2.8.8: - version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +prettier@^3.5.3: + version "3.5.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.3.tgz#4fc2ce0d657e7a02e602549f053b239cb7dfe1b5" + integrity sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw== pretty-format@^27.0.2: version "27.5.1" diff --git a/smoke-test/tests/cypress/cypress/e2e/homeV2/v2_home.js b/smoke-test/tests/cypress/cypress/e2e/homeV2/v2_home.js index 13547a41be..14538e5058 100644 --- a/smoke-test/tests/cypress/cypress/e2e/homeV2/v2_home.js +++ b/smoke-test/tests/cypress/cypress/e2e/homeV2/v2_home.js @@ -7,7 +7,6 @@ describe("home", () => { it("home page shows ", () => { cy.login(); cy.visit("/"); - console.log("Draft change to trigger CI cypress"); cy.get('[xmlns="http://www.w3.org/2000/svg"]').should("exist"); cy.get('[data-testid="home-page-content-container"').should("exist"); cy.get('[data-testid="nav-menu-links"').should("exist");