diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx index 3bb1d86b17d..4bd25c31afb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx @@ -97,7 +97,6 @@ const FeedHeader: FC = ({ }; const getUserData = () => { - const image = userData.profile?.images?.image512; const displayName = userData.displayName ?? ''; const name = userData.name ?? ''; const teams = userData.teams; @@ -115,11 +114,7 @@ const FeedHeader: FC = ({
- {image ? ( - - ) : ( - - )} +

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx index 2d5f54ebc90..9f40a544f25 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx @@ -141,7 +141,7 @@ const DashboardDetails = ({ position: 1, }, { - name: `Activity Feed (${feedCount})`, + name: 'Activity Feed', icon: { alt: 'activity_feed', name: 'activity_feed', @@ -150,6 +150,7 @@ const DashboardDetails = ({ }, isProtected: false, position: 2, + count: feedCount, }, { name: 'Lineage', 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 5ff3d054967..567ace1625a 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 @@ -183,7 +183,7 @@ const DatasetDetails: React.FC = ({ position: 1, }, { - name: `Activity Feed (${feedCount})`, + name: 'Activity Feed', icon: { alt: 'activity_feed', name: 'activity_feed', @@ -192,6 +192,7 @@ const DatasetDetails: React.FC = ({ }, isProtected: false, position: 2, + count: feedCount, }, { name: 'Sample Data', diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/CustomNode.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/CustomNode.component.tsx index ca3ec53f80d..a7af1e2022f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/CustomNode.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/CustomNode.component.tsx @@ -91,7 +91,7 @@ const CustomNode = (props: any) => { 'tw-h-36 tw-overflow-y-auto': columns?.length, })} id="table-columns"> -

+
{columns?.map( (c: { name: string; constraint: string }, i: number) => ( 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 f4db15e9649..c4897e0ab5e 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 @@ -316,7 +316,7 @@ const Explore: React.FC = ({ Sort by: {parseFloat(version).toFixed(1)} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FilterContainer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FilterContainer.tsx index 9baa2780b24..26ef990e11b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FilterContainer.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FilterContainer.tsx @@ -38,8 +38,8 @@ const FilterContainer: FunctionComponent = ({ }; return ( -
= ({
{!isNil(count) && getCountBadge(count, classNames('tw-py-0 tw-px-0'), isSelected)} -
+ ); }; 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 4475f1c07aa..18756229eb2 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 @@ -130,47 +130,35 @@ const NavBar = ({ className="tw-nav focus:tw-no-underline hover:tw-underline tw-flex-shrink-0" data-testid="whatsnew-modal" onClick={() => handleFeatureModal(true)}> - - - +
- - + } isDropDownIconVisible={false} isLableVisible={false} diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatasetDetailsPage/DatasetDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatasetDetailsPage/DatasetDetailsPage.component.tsx index 7a065c54322..754de8c7dc8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DatasetDetailsPage/DatasetDetailsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatasetDetailsPage/DatasetDetailsPage.component.tsx @@ -202,9 +202,11 @@ const DatasetDetailsPage: FunctionComponent = () => { columnName?: string ) => { activeTabHandler(tabValue); - setTestMode(testMode as DatasetTestModeType); - setSelectedColumn(columnName); - setShowTestForm(true); + if (testMode && columnName) { + setTestMode(testMode as DatasetTestModeType); + setSelectedColumn(columnName); + setShowTestForm(true); + } }; const getLineageData = () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesPage.component.tsx index f505a91edb5..ebb4040ddc3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesPage.component.tsx @@ -910,7 +910,7 @@ const RolesPage = () => { {defaultRole?.displayName ?? defaultRole?.name} {' '} - role.` + role. } cancelText="Cancel" diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx index aa9e4fd3674..060bec02083 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx @@ -136,7 +136,7 @@ const DatabaseDetails: FunctionComponent = () => { position: 1, }, { - name: `Activity Feed (${feedCount})`, + name: 'Activity Feed', icon: { alt: 'activity_feed', name: 'activity_feed', @@ -145,6 +145,7 @@ const DatabaseDetails: FunctionComponent = () => { }, isProtected: false, position: 2, + count: feedCount, }, { name: 'Manage', diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx index 0592679095d..3728f6d1127 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx @@ -186,7 +186,7 @@ const ServicePage: FunctionComponent = () => { count: instanceCount, }, { - name: `Activity Feed (${feedCount})`, + name: 'Activity Feed', icon: { alt: 'activity_feed', name: 'activity_feed', @@ -195,6 +195,7 @@ const ServicePage: FunctionComponent = () => { }, isProtected: false, position: 2, + count: feedCount, }, { name: 'Ingestions', 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 58ce6026bdd..3a34e02e251 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx @@ -426,16 +426,18 @@ export const getInfoElements = (data: ExtraInfo) => { {data.isLink ? ( <> 32, - })} + className={classNames( + 'tw-mr-1 tw-inline-block tw-truncate link-text', + { + 'tw-w-52': (displayVal as string).length > 32, + } + )} title={displayVal as string}> {displayVal}