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 index 2501900a7f2..7d663ba7775 100644 --- a/openmetadata-ui/src/main/resources/ui/src/assets/svg/search.svg +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/search.svg @@ -1,3 +1,3 @@ - - + + diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityInfoDrawer/EntityInfoDrawer.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityInfoDrawer/EntityInfoDrawer.component.tsx index 1217a0b12f7..ab3319ce535 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/EntityInfoDrawer/EntityInfoDrawer.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityInfoDrawer/EntityInfoDrawer.component.tsx @@ -172,7 +172,7 @@ const EntityInfoDrawer = ({ -
+
{isLoading ? ( ) : ( @@ -209,7 +209,7 @@ const EntityInfoDrawer = ({ })} -
+
Tags
@@ -222,7 +222,7 @@ const EntityInfoDrawer = ({ )}
-
+
Description
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityInfoDrawer/EntityInfoDrawer.style.css b/openmetadata-ui/src/main/resources/ui/src/components/EntityInfoDrawer/EntityInfoDrawer.style.css index a7255e27225..2607bb6878b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/EntityInfoDrawer/EntityInfoDrawer.style.css +++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityInfoDrawer/EntityInfoDrawer.style.css @@ -19,12 +19,11 @@ right: 0; width: 325px; z-index: 200; - margin-right: -16px; overflow-y: auto; padding: 16px; transform: translateX(100%); display: none; - border-left: 1px solid #d9ceee; + border-left: 1px solid #dce3ec; transition: transform 0.3s ease-out; } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx index c7413541ef8..eef30536cf7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx @@ -624,7 +624,10 @@ const Entitylineage: FunctionComponent = ({ return ( {!deleted ? ( -
+
= ({ onNodeMouseLeave={onNodeMouseLeave} onNodeMouseMove={onNodeMouseMove}> {!deleted && ( @@ -353,7 +353,7 @@ const EntityTable = ({ {...row.getToggleRowExpandedProps({})} className="tw-mr-2 tw-cursor-pointer" style={{ - marginLeft: `${row.depth * 25}px`, + marginLeft: `${row.depth * 35}px`, }}> {row.isExpanded ? ( @@ -614,7 +614,7 @@ const EntityTable = ({ {getConstraintIcon(row.original.constraint)} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityVersionTimeLine/EntityVersionTimeLine.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityVersionTimeLine/EntityVersionTimeLine.tsx index e093525a56c..a8297ccb38b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/EntityVersionTimeLine/EntityVersionTimeLine.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityVersionTimeLine/EntityVersionTimeLine.tsx @@ -126,7 +126,14 @@ const EntityVersionTimeLine: React.FC = ({ ) : null}

-
+
{getSummary(currV?.changeDescription)}

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.component.tsx index 9e770b4f3f7..f4db15e9649 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.component.tsx @@ -61,7 +61,6 @@ import { formatDataResponse } from '../../utils/APIUtils'; import { getCountBadge } from '../../utils/CommonUtils'; import { getFilterCount, getFilterString } from '../../utils/FilterUtils'; import { dropdownIcon as DropDownIcon } from '../../utils/svgconstant'; -import SVGIcons from '../../utils/SvgUtils'; import PageLayout from '../containers/PageLayout'; import { ExploreProps } from './explore.interface'; @@ -317,7 +316,7 @@ const Explore: React.FC = ({ Sort by:

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 589a5feaaed..725a72d293b 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 @@ -127,6 +127,14 @@ const Appbar: React.FC = (): JSX.Element => { }, ]; + const getUserName = () => { + const currentUser = isAuthDisabled + ? appState.users[0] + : appState.userDetails; + + return currentUser?.displayName || currentUser?.name || 'User'; + }; + const getUserData = () => { const currentUser = isAuthDisabled ? appState.users[0] @@ -244,6 +252,7 @@ const Appbar: React.FC = (): JSX.Element => { searchValue={searchValue || ''} settingDropdown={navLinkSettings} supportDropdown={supportLinks} + username={getUserName()} /> ) : null} 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 1eac64796f4..fb301c6f388 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 @@ -256,15 +256,15 @@ const Suggestions = ({ searchText, isOpen, setIsOpen }: SuggestionProp) => { {options.length > 0 && isOpen ? ( <>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.interface.ts index 946d14420e0..0bc6803cc95 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.interface.ts @@ -22,6 +22,7 @@ export interface NavBarProps { isFeatureModalOpen: boolean; pathname: string; isSearchBoxOpen: boolean; + username: string; handleSearchBoxOpen: (value: boolean) => void; handleFeatureModal: (value: boolean) => void; handleSearchChange: (value: string) => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.tsx b/openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.tsx index 7df1e0ab68d..133ab9ca595 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.tsx @@ -23,10 +23,10 @@ import { activeLink, normalLink } from '../../utils/styleconstant'; import SVGIcons, { Icons } from '../../utils/SvgUtils'; import SearchOptions from '../app-bar/SearchOptions'; import Suggestions from '../app-bar/Suggestions'; +import Avatar from '../common/avatar/Avatar'; import PopOver from '../common/popover/PopOver'; import DropDown from '../dropdown/DropDown'; import { WhatsNewModal } from '../Modals/WhatsNewModal'; -import { ReactComponent as IconDefaultUserProfile } from './../../assets/svg/ic-default-profile.svg'; import { NavBarProps } from './NavBar.interface'; const NavBar = ({ @@ -37,6 +37,7 @@ const NavBar = ({ isFeatureModalOpen, isTourRoute = false, pathname, + username, isSearchBoxOpen, handleSearchBoxOpen, handleFeatureModal, @@ -86,7 +87,7 @@ const NavBar = ({ />
) : ( - + )} diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx index 44b7df0a8ef..8f2974efdba 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx @@ -376,7 +376,7 @@ const ServicesPage = () => { {getCountBadge( servicesCount[tab.name], - '', + 'tw-self-center', tab.name === serviceName )}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/tour-page/TourPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/tour-page/TourPage.component.tsx index 1a35a765ddb..c7416911bc6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/tour-page/TourPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/tour-page/TourPage.component.tsx @@ -224,6 +224,7 @@ const TourPage = () => { searchValue={searchValue} settingDropdown={[]} supportDropdown={[]} + username="User" /> {getCurrentPage(currentPage)} diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/temp.css b/openmetadata-ui/src/main/resources/ui/src/styles/temp.css index b5c9e714b98..f8218f6e218 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/temp.css +++ b/openmetadata-ui/src/main/resources/ui/src/styles/temp.css @@ -707,6 +707,9 @@ body .list-option.rdw-option-active { text-decoration: line-through; width: fit-content; } +.diff-description { + color: #008376; +} /* status style */ .tw-bg-status-success { diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx index c1533acf66d..86dd98e654c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx @@ -455,7 +455,7 @@ export const getInfoElements = (data: ExtraInfo) => { {data.key === 'Owner' ? ( 32 } )} title={displayVal as string}> diff --git a/openmetadata-ui/src/main/resources/ui/tailwind.config.js b/openmetadata-ui/src/main/resources/ui/tailwind.config.js index 9d894c46772..c2eb1e568f5 100644 --- a/openmetadata-ui/src/main/resources/ui/tailwind.config.js +++ b/openmetadata-ui/src/main/resources/ui/tailwind.config.js @@ -136,6 +136,7 @@ module.exports = { 'screen-lg': '992px', 'screen-xl': '1200px', 'screen-xxl': '1440px', + 600: '600px', }, minWidth: { badgeCount: '30px',