From 1b66d9f4b6f5d3e91d64a7c277be56a577f097fb Mon Sep 17 00:00:00 2001 From: Shailesh Parmar Date: Thu, 16 Dec 2021 00:34:52 +0530 Subject: [PATCH] Fix: icon change issue on click of dbtmodal tab (#1779) --- .../main/resources/ui/src/assets/svg/dbt-model-primery.svg | 3 +++ .../components/DatasetDetails/DatasetDetails.component.tsx | 2 +- .../components/Modals/UserDetailsModal/UserDetailsModal.tsx | 6 ++---- .../src/main/resources/ui/src/utils/SvgUtils.tsx | 6 ++++++ 4 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model-primery.svg diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model-primery.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model-primery.svg new file mode 100644 index 00000000000..da26fb1408c --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/dbt-model-primery.svg @@ -0,0 +1,3 @@ + + + diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx index 98d1e8f1c04..8a4416b6c66 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx @@ -157,7 +157,7 @@ const DatasetDetails: React.FC = ({ alt: 'dbt-model', name: 'dbtmodel-light-grey', title: 'DBT', - selectedName: 'icon-schemacolor', + selectedName: 'dbtmodel-primery', }, isProtected: false, isHidden: !dataModel?.sql, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/UserDetailsModal/UserDetailsModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/UserDetailsModal/UserDetailsModal.tsx index 96c2fcffaa8..18efa0b86ee 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/UserDetailsModal/UserDetailsModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/UserDetailsModal/UserDetailsModal.tsx @@ -78,9 +78,7 @@ const UserDetailsModal = ({ {userData.email}

- - {userData.isAdmin ? 'Admin' : 'User'} - + Role: {userData.isAdmin ? 'Admin' : 'User'}

{userData.teams &&
}

@@ -115,7 +113,7 @@ const UserDetailsModal = ({ type="submit" variant="contained" onClick={onSave}> - {userData.isAdmin ? 'Dismiss as admin' : 'Make admin'} + {userData.isAdmin ? 'Revoke Admin Privileges' : 'Make Admin'}

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 4f664d03c32..28265b46674 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx @@ -26,6 +26,7 @@ import IconDashboard from '../assets/svg/dashboard.svg'; import IconAsstest from '../assets/svg/data-assets.svg'; import IconDBTModelGrey from '../assets/svg/dbt-model-grey.svg'; import IconDBTModelLightGrey from '../assets/svg/dbt-model-light-grey.svg'; +import IconDBTModelPrimeryColor from '../assets/svg/dbt-model-primery.svg'; import IconDBTModel from '../assets/svg/dbt-model.svg'; import IconDeploy from '../assets/svg/deploy-icon.svg'; import IconDoc from '../assets/svg/doc.svg'; @@ -178,6 +179,7 @@ export const Icons = { PIPELINE_GREY: 'pipeline-grey', DBTMODEL_GREY: 'dbtmodel-grey', DBTMODEL_LIGHT_GREY: 'dbtmodel-light-grey', + DBTMODEL_PRIMERY: 'dbtmodel-primery', DBTMODEL: 'dbtmodel', VERSION: 'icon-version', VERSION_WHITE: 'icon-version-white', @@ -516,6 +518,10 @@ const SVGIcons: FunctionComponent = ({ case Icons.DBTMODEL: IconComponent = IconDBTModel; + break; + case Icons.DBTMODEL_PRIMERY: + IconComponent = IconDBTModelPrimeryColor; + break; case Icons.TAG: IconComponent = IconTag;