diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/version-black.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/version-black.svg new file mode 100644 index 00000000000..7dece01f11c --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/version-black.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 997d2b25f65..9dfc8567d54 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 @@ -184,7 +184,7 @@ const DatasetDetails: React.FC = ({ ); return { - name: getPartialNameFromFQN(tableFQN, ['database', 'table']), + name: getPartialNameFromFQN(tableFQN, ['database', 'table'], '.'), fullyQualifiedName: tableFQN, joinCount: joinedCol.joinCount, }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx index b6c909738c8..940f9761000 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx @@ -652,7 +652,8 @@ const EntityTable = ({ )}> {getPartialNameFromFQN( columnJoin?.fullyQualifiedName as string, - ['database', 'table', 'column'] + ['database', 'table', 'column'], + '.' )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/RecentSearchedTerms/RecentSearchedTerms.tsx b/openmetadata-ui/src/main/resources/ui/src/components/RecentSearchedTerms/RecentSearchedTerms.tsx index 9095f02a15f..ab1d9ab97e3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/RecentSearchedTerms/RecentSearchedTerms.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/RecentSearchedTerms/RecentSearchedTerms.tsx @@ -15,6 +15,7 @@ import React, { FunctionComponent } from 'react'; import { Link } from 'react-router-dom'; import { getExplorePathWithSearch } from '../../constants/constants'; import { getRecentlySearchedData } from '../../utils/CommonUtils'; +import PopOver from '../common/popover/PopOver'; const RecentSearchedTerms: FunctionComponent = () => { const recentlySearchedTerms = getRecentlySearchedData(); @@ -32,12 +33,26 @@ const RecentSearchedTerms: FunctionComponent = () => { data-testid={`Recently-Search-${item.term}`} key={index}>
+
+ } + position="top" + size="regular" + trigger="mouseenter"> + {item.term.slice(0, 20)}... + + ) : ( + item.term + )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.component.tsx index 56eb23ee6b4..166969c52ae 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.component.tsx @@ -76,8 +76,10 @@ const SchemaTab: FunctionComponent = ({ const getToggleButtonClasses = (type: string): string => { return ( - 'tw-flex-1 tw-text-primary tw-font-medium tw-border tw-border-transparent tw-rounded tw-py-1 tw-px-2 focus:tw-outline-none' + - (type === checkedValue ? ' tw-bg-primary-hover-lite tw-border-main' : '') + 'tw-flex-1 tw-font-medium tw-border tw-border-transparent tw-rounded tw-py-1 tw-px-2 focus:tw-outline-none' + + (type === checkedValue + ? ' tw-bg-primary tw-text-white tw-border-main' + : '') ); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/app-bar/Appbar.tsx b/openmetadata-ui/src/main/resources/ui/src/components/app-bar/Appbar.tsx index 14be62a9a20..23003ff2288 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/app-bar/Appbar.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/app-bar/Appbar.tsx @@ -77,6 +77,25 @@ const Appbar: React.FC = (): JSX.Element => { }; const supportLinks = [ + { + name: ( + + {' '} + {`Version ${ + (version ? version : '?').split('-')[0] + }`} + + ), + to: '', + disabled: false, + icon: <>, + isText: true, + }, { name: `Docs`, to: urlGitbookDocs, @@ -130,7 +149,6 @@ const Appbar: React.FC = (): JSX.Element => { return ( {name} -
); }; @@ -296,24 +314,7 @@ const Appbar: React.FC = (): JSX.Element => { - Signed in as - {getUserDisplayName()} -

- ), - to: '', - disabled: false, - icon: <>, - isText: true, - }, - { - name: ( - - {`Version ${(version ? version : '?').split('-')[0]}`} -
-
- ), + name: getUserDisplayName(), to: '', disabled: false, icon: <>, @@ -347,6 +348,7 @@ const Appbar: React.FC = (): JSX.Element => { )} } + isDropDownIconVisible={false} type="link" /> diff --git a/openmetadata-ui/src/main/resources/ui/src/components/dropdown/AnchorDropDownList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/dropdown/AnchorDropDownList.tsx index 928bb6f1fc6..a51232f14d4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/dropdown/AnchorDropDownList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/dropdown/AnchorDropDownList.tsx @@ -31,7 +31,7 @@ const AnchorDropDownList = ({ dropDownList, setIsOpen }: DropDownListProp) => { aria-labelledby="menu-button" aria-orientation="vertical" className="tw-origin-top-right tw-absolute tw-z-10 - tw-right-0 tw-mt-2 tw-w-32 tw-rounded-md tw-shadow-lg + tw-right-0 tw-mt-2 tw-w-36 tw-rounded-md tw-shadow-lg tw-bg-white tw-ring-1 tw-ring-black tw-ring-opacity-5 focus:tw-outline-none" role="menu">
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 fe9305eff87..4873efbba41 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx @@ -88,6 +88,7 @@ import IconTier from '../assets/svg/tier.svg'; import IconTopicGrey from '../assets/svg/topic-grey.svg'; import IconTopic from '../assets/svg/topic.svg'; import IconUser from '../assets/svg/user.svg'; +import IconVersionBlack from '../assets/svg/version-black.svg'; import IconVersionWhite from '../assets/svg/version-white.svg'; import IconVersion from '../assets/svg/version.svg'; import IconWarning from '../assets/svg/warning.svg'; @@ -173,6 +174,7 @@ export const Icons = { DBTMODEL: 'dbtmodel', VERSION: 'icon-version', VERSION_WHITE: 'icon-version-white', + VERSION_BLACK: 'icon-version-black', ICON_DEPLOY: 'icon-deploy', ICON_PLUS: 'icon-plus', ICON_MINUS: 'icon-minus', @@ -472,6 +474,10 @@ const SVGIcons: FunctionComponent = ({ case Icons.VERSION_WHITE: IconComponent = IconVersionWhite; + break; + case Icons.VERSION_BLACK: + IconComponent = IconVersionBlack; + break; case Icons.ICON_DEPLOY: IconComponent = IconDeploy;