diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/search.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/search.svg new file mode 100644 index 00000000000..2a697ffe36a --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/search.svg @@ -0,0 +1,3 @@ + + + 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 7c2c35debd4..b388bf96876 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 @@ -131,7 +131,8 @@ const Appbar: React.FC = (): JSX.Element => { return ( - Welcome, {name?.split(' ')[0]} + {name} +
); }; @@ -165,7 +166,7 @@ const Appbar: React.FC = (): JSX.Element => { {isAuthenticatedRoute && isSignedIn ? (
-
+
-
- - { - setSearchValue(e.target.value); - }} - onKeyDown={(e: React.KeyboardEvent) => { - const target = e.target as HTMLInputElement; - if (e.key === 'Enter') { - setIsOpen(false); - addToRecentSearch(target.value); - history.push( - getExplorePathWithSearch( - target.value, - // this is for if user is searching from another page - location.pathname.startsWith(ROUTES.EXPLORE) - ? appState.explorePageTab - : 'tables' - ) - ); - } - }} - /> - {searchValue && - (isInPageSearchAllowed(location.pathname) ? ( - { - appState.inPageSearchText = text; - }} - setIsOpen={setIsOpen} - /> - ) : ( - - ))} -
-
+
{ />
- - {/* { + setSearchValue(e.target.value); + }} + onKeyDown={(e: React.KeyboardEvent) => { + const target = e.target as HTMLInputElement; + if (e.key === 'Enter') { + setIsOpen(false); + addToRecentSearch(target.value); + history.push( + getExplorePathWithSearch( + target.value, + // this is for if user is searching from another page + location.pathname.startsWith(ROUTES.EXPLORE) + ? appState.explorePageTab + : 'tables' + ) + ); + } + }} + /> + {searchValue && + (isInPageSearchAllowed(location.pathname) ? ( + { + appState.inPageSearchText = text; + }} + setIsOpen={setIsOpen} + /> + ) : ( + + ))} +
+
+ + {/* { /> Tour */} -
- - } - label="Need Help" - type="link" - /> +
+ + } + isDropDownIconVisible={false} + // label="Need Help" + type="link" + /> +
+ Signed in as + {getUserDisplayName()} +

+ ), + to: '', + disabled: false, + icon: <>, + isText: true, + }, { name: ( {`Version ${(version ? version : '?').split('-')[0]}`} -
+
), to: '', disabled: false, icon: <>, - isVersion: true, + isText: true, }, { name: 'Logout', @@ -326,7 +347,6 @@ const Appbar: React.FC = (): JSX.Element => { )} } - label={getUserDisplayName()} type="link" />
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 2d07986b6a2..97ebe5f808b 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 @@ -302,7 +302,7 @@ const Suggestions = ({ searchText, isOpen, setIsOpen }: SuggestionProp) => { aria-labelledby="menu-button" aria-orientation="vertical" className="tw-origin-top-right tw-absolute tw-z-10 - tw-w-60 tw-mt-1 tw-rounded-md tw-shadow-lg + tw-w-full tw-mt-1 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"> {getEntitiesSuggestions()} 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 e41200b0a7d..6362196cfc5 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 @@ -34,8 +34,8 @@ const AnchorDropDownList = ({ dropDownList, setIsOpen }: DropDownListProp) => {
{dropDownList.map((item: DropDownListItem, index: number) => (
- {item.isVersion ? ( -
+ {item.isText ? ( +
{item.name}
) : ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/dropdown/DropDown.tsx b/openmetadata-ui/src/main/resources/ui/src/components/dropdown/DropDown.tsx index 4102213a929..b2e17efe4d3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/dropdown/DropDown.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/dropdown/DropDown.tsx @@ -26,6 +26,7 @@ const DropDown: React.FC = ({ dropDownList, onSelect, selectedItems, + isDropDownIconVisible = true, }: DropDownProp) => { const [isOpen, setIsOpen] = useState(false); @@ -63,7 +64,7 @@ const DropDown: React.FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/dropdown/types.ts b/openmetadata-ui/src/main/resources/ui/src/components/dropdown/types.ts index c44d5bc3892..334edcfdc93 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/dropdown/types.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/dropdown/types.ts @@ -28,7 +28,7 @@ export type DropDownListItem = { method?: () => void; icon?: React.ReactElement; isOpenNewTab?: boolean; - isVersion?: boolean; + isText?: boolean; } & Record< string, string | number | boolean | undefined | Function | React.ReactElement @@ -58,4 +58,5 @@ export type DropDownProp = { label?: string | React.ReactElement; type: string; icon?: React.ReactElement | string; + isDropDownIconVisible?: boolean; } & DropDownListProp; diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/x-master.css b/openmetadata-ui/src/main/resources/ui/src/styles/x-master.css index b9512200e62..2dfd356b644 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/x-master.css +++ b/openmetadata-ui/src/main/resources/ui/src/styles/x-master.css @@ -164,8 +164,7 @@ a:focus { box-shadow: none; } .search-grey { - width: calc(300px - 60px); - min-width: 150px; + width: 600px; } .search-grey.has-search { @@ -755,27 +754,19 @@ body .profiler-graph .recharts-active-dot circle { } /* Hide scrollbar for Chrome, Safari and Opera */ -/* #center::-webkit-scrollbar, +#center::-webkit-scrollbar, #left-panel::-webkit-scrollbar, #right-panel::-webkit-scrollbar { display: none; - width: 4px; -} */ -/* #center::-webkit-scrollbar-track { - background: #f8f9fa; } -#center::-webkit-scrollbar-thumb { - background: #aaa; - border-radius: 12px; -} */ /* Hide scrollbar for IE, Edge and Firefox */ -/* #center, +#center, #left-panel, #right-panel { -ms-overflow-style: none; - scrollbar-width: 4px; -} */ + scrollbar-width: none; +} .page-layout-container { display: grid; 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 3948cfa75b6..2218865253c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx @@ -75,6 +75,7 @@ import IconPipeline from '../assets/svg/pipeline.svg'; import IconPlus from '../assets/svg/plus.svg'; import IconProfiler from '../assets/svg/profiler.svg'; import IconHelpCircle from '../assets/svg/question-circle.svg'; +import IconSearchV1 from '../assets/svg/search.svg'; import IconSetting from '../assets/svg/service.svg'; import IconSlackGrey from '../assets/svg/slack-grey.svg'; import IconSlack from '../assets/svg/slack.svg'; @@ -175,6 +176,7 @@ export const Icons = { ICON_MINUS: 'icon-minus', TAG: 'icon-tag', TIER: 'icon-tier', + SEARCHV1: 'icon-searchv1', }; const SVGIcons: FunctionComponent = ({ @@ -496,6 +498,10 @@ const SVGIcons: FunctionComponent = ({ case Icons.TIER: IconComponent = IconTier; + break; + case Icons.SEARCHV1: + IconComponent = IconSearchV1; + break; default: