From 2bae858343841a96ec9ea2134ee5cb34d868d936 Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Thu, 8 Feb 2024 11:14:12 +0530 Subject: [PATCH 1/3] fix sso logo breaking due to antd icons component --- .../src/main/antlr4/org/openmetadata/schema/EntityLink.g4 | 1 + .../resources/ui/src/components/LoginButton/LoginButton.tsx | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openmetadata-spec/src/main/antlr4/org/openmetadata/schema/EntityLink.g4 b/openmetadata-spec/src/main/antlr4/org/openmetadata/schema/EntityLink.g4 index 5dafdd495893..c79665116bac 100644 --- a/openmetadata-spec/src/main/antlr4/org/openmetadata/schema/EntityLink.g4 +++ b/openmetadata-spec/src/main/antlr4/org/openmetadata/schema/EntityLink.g4 @@ -120,6 +120,7 @@ ENTITY_FIELD | 'testCaseResult' | 'tests' | 'pipelineStatus' + | 'dataProducts' ; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/LoginButton/LoginButton.tsx b/openmetadata-ui/src/main/resources/ui/src/components/LoginButton/LoginButton.tsx index e1f592d5d01f..13022cc6df70 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/LoginButton/LoginButton.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/LoginButton/LoginButton.tsx @@ -19,7 +19,7 @@ import './login-button.style.less'; interface LoginButtonProps { ssoBrandName: string; - ssoBrandLogo?: SvgComponent; + ssoBrandLogo?: string; onClick?: () => void; } @@ -32,8 +32,7 @@ const LoginButton = ({ } /> ) : null; From 8292ffc455110221ed0f85c36f4080034b8d510b Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Thu, 8 Feb 2024 12:22:25 +0530 Subject: [PATCH 2/3] fix sonar issue --- .../ui/src/components/LoginButton/LoginButton.tsx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/LoginButton/LoginButton.tsx b/openmetadata-ui/src/main/resources/ui/src/components/LoginButton/LoginButton.tsx index 13022cc6df70..5a8b2b4cde9a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/LoginButton/LoginButton.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/LoginButton/LoginButton.tsx @@ -28,17 +28,26 @@ const LoginButton = ({ ssoBrandLogo, onClick, }: LoginButtonProps) => { + const getImageElement = () => ( + {`${ssoBrandName} + ); + const svgIcon = ssoBrandLogo ? ( } + component={getImageElement} /> ) : null; return ( From 16741a46f236f326489e78412d5508d1e778949f Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Thu, 8 Feb 2024 14:55:46 +0530 Subject: [PATCH 3/3] fix deploy ingestion icon --- .../main/resources/ui/src/assets/svg/creating-ingestion.svg | 2 +- .../src/main/resources/ui/src/assets/svg/deploy-ingestion.svg | 2 +- .../DeployIngestionLoaderModal/DeployIngestionLoaderModal.tsx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/creating-ingestion.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/creating-ingestion.svg index 7b03a5271eba..2b8da57457e6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/assets/svg/creating-ingestion.svg +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/creating-ingestion.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/deploy-ingestion.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/deploy-ingestion.svg index a2b4c38ba139..56f329c0ae5c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/assets/svg/deploy-ingestion.svg +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/deploy-ingestion.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal.tsx index 31f0ab810b21..8d93ed64dadc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal.tsx @@ -64,7 +64,7 @@ const DeployIngestionLoaderModal = ({ @@ -79,7 +79,7 @@ const DeployIngestionLoaderModal = ({