From 38b02a4bfb215a0fbe34a604e03feeb4669d5282 Mon Sep 17 00:00:00 2001 From: Sachin Chaurasiya Date: Mon, 29 Nov 2021 14:05:17 +0530 Subject: [PATCH] Fixed Column node text in lineage and suggestion index for dbt models. (#1454) * Fixed Column node text in lineage and suggestion index for dbt models. * Added icon for dbt models. * Minor fix --- .../resources/ui/src/assets/svg/dbt-model-grey.svg | 3 +++ .../main/resources/ui/src/assets/svg/dbt-model.svg | 3 +++ .../src/main/resources/ui/src/axiosAPIs/miscAPI.ts | 2 +- .../EntityLineage/CustomNode.component.jsx | 2 +- .../ui/src/components/app-bar/Suggestions.tsx | 2 +- .../resources/ui/src/constants/explore.constants.ts | 2 +- .../src/main/resources/ui/src/utils/SvgUtils.tsx | 12 ++++++++++++ .../src/main/resources/ui/src/utils/TableUtils.tsx | 4 ++++ 8 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model-grey.svg create mode 100644 openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model.svg diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model-grey.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model-grey.svg new file mode 100644 index 00000000000..da26fb1408c --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model-grey.svg @@ -0,0 +1,3 @@ + + + diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model.svg new file mode 100644 index 00000000000..523a821802b --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model.svg @@ -0,0 +1,3 @@ + + + diff --git a/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/miscAPI.ts b/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/miscAPI.ts index 49e87b82cb4..20338a73a74 100644 --- a/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/miscAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/miscAPI.ts @@ -59,7 +59,7 @@ export const getSuggestions: Function = ( queryString: string ): Promise => { return APIClient.get( - `/search/suggest?q=${queryString}&index=${SearchIndex.DASHBOARD},${SearchIndex.TABLE},${SearchIndex.TOPIC},${SearchIndex.PIPELINE} + `/search/suggest?q=${queryString}&index=${SearchIndex.DASHBOARD},${SearchIndex.TABLE},${SearchIndex.TOPIC},${SearchIndex.PIPELINE},${SearchIndex.DBT_MODEL} ` ); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/CustomNode.component.jsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/CustomNode.component.jsx index e09fcaf0040..ae4945c5178 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/CustomNode.component.jsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/CustomNode.component.jsx @@ -63,7 +63,7 @@ const CustomNode = (props) => {
{columns?.map((c) => (

{c.name}

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/app-bar/Suggestions.tsx b/openmetadata-ui/src/main/resources/ui/src/components/app-bar/Suggestions.tsx index 2fcfd723e65..3473bf1ffa4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/app-bar/Suggestions.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/app-bar/Suggestions.tsx @@ -134,7 +134,7 @@ const Suggestions = ({ searchText, isOpen, setIsOpen }: SuggestionProp) => { break; case SearchIndex.DBT_MODEL: label = 'DBT Models'; - icon = Icons.TABLE_GREY; + icon = Icons.DBTMODEL_GREY; break; case SearchIndex.TABLE: diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/explore.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/explore.constants.ts index 60481d70aa5..0cdcfc0ff50 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/explore.constants.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/explore.constants.ts @@ -195,6 +195,6 @@ export const tabsInfo = [ sortField: '', tab: 5, path: 'dbt_model', - icon: Icons.PIPELINE_GREY, + icon: Icons.DBTMODEL_GREY, }, ]; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx index 4825223a46c..32cb8731c0d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx @@ -10,6 +10,8 @@ import IconConfig from '../assets/svg/config.svg'; import IconDashboardGrey from '../assets/svg/dashboard-grey.svg'; import IconDashboard from '../assets/svg/dashboard.svg'; import IconAsstest from '../assets/svg/data-assets.svg'; +import IconDBTModel from '../assets/svg/dbt-model-grey.svg'; +import IconDBTModelGrey from '../assets/svg/dbt-model.svg'; import IconDeploy from '../assets/svg/deploy-icon.svg'; import IconDoc from '../assets/svg/doc.svg'; import IconError from '../assets/svg/error.svg'; @@ -149,6 +151,8 @@ export const Icons = { PROFILER: 'icon-profiler', PIPELINE: 'pipeline', PIPELINE_GREY: 'pipeline-grey', + DBTMODEL_GREY: 'dbtmodel-grey', + DBTMODEL: 'dbtmodel', VERSION: 'icon-version', VERSION_WHITE: 'icon-version-white', ICON_DEPLOY: 'icon-deploy', @@ -459,6 +463,14 @@ const SVGIcons: FunctionComponent = ({ case Icons.ICON_MINUS: IconComponent = IconMinus; + break; + case Icons.DBTMODEL_GREY: + IconComponent = IconDBTModelGrey; + + break; + case Icons.DBTMODEL: + IconComponent = IconDBTModel; + break; default: diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx index 0f5a8157741..b128c414448 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx @@ -206,6 +206,10 @@ export const getEntityIcon = (indexType: string) => { case EntityType.PIPELINE: icon = 'pipeline'; + break; + case SearchIndex.DBT_MODEL: + icon = 'dbtmodel'; + break; case SearchIndex.TABLE: