diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityList/EntityList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityList/EntityList.tsx index 0fd70e1bdfa..dec2f0d1804 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/EntityList/EntityList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityList/EntityList.tsx @@ -11,7 +11,7 @@ * limitations under the License. */ -import { Button, Card, Typography } from 'antd'; +import { Button, Card, Col, Row, Typography } from 'antd'; import React, { Fragment, FunctionComponent } from 'react'; import { Link } from 'react-router-dom'; import { getEntityName } from 'utils/EntityUtils'; @@ -90,14 +90,21 @@ export const EntityListWithAntd: FunctionComponent = ({ loading, }: AntdEntityListProp) => { return ( - + <> + + + + {headerTextLabel} + + + + {headerText} + + {entityList.length ? entityList.map((item, index) => { return ( 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 5b0030346be..19c4bbdbe2b 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 @@ -318,7 +318,7 @@ const Explore: React.FC = ({ leftPanel={ tabItems.length > 0 && ( = ({ ); return ( - +
<> + + {t('label.asset-plural')} + {Object.values(dataSummary).map((data, index) => (
= ({ ))} - +
); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx index e3dee94b22b..6c3bb028386 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx @@ -11,7 +11,7 @@ * limitations under the License. */ -import { Card } from 'antd'; +import { Card, Col, Divider, Row } from 'antd'; import { ELASTICSEARCH_ERROR_PLACEHOLDER_TYPE } from 'enums/common.enum'; import { observer } from 'mobx-react'; import React, { @@ -70,13 +70,25 @@ const MyData: React.FC = ({ const getLeftPanel = () => { return ( - <> - -
- -
- - + + + + + + + + + + + + + + + + + + + ); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/RecentSearchedTerms/RecentSearchedTermsAntd.tsx b/openmetadata-ui/src/main/resources/ui/src/components/RecentSearchedTerms/RecentSearchedTermsAntd.tsx index 9f2ce3e4063..50ec9bb5a87 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/RecentSearchedTerms/RecentSearchedTermsAntd.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/RecentSearchedTerms/RecentSearchedTermsAntd.tsx @@ -11,7 +11,7 @@ * limitations under the License. */ -import { Button, Card, Popover } from 'antd'; +import { Button, Popover, Typography } from 'antd'; import { RecentlySearchedData } from 'Models'; import React, { FunctionComponent, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; @@ -45,77 +45,75 @@ const RecentSearchedTermsAntd: FunctionComponent = () => { }, []); return ( - <> - - - <> - {recentlySearchedTerms.length ? ( - recentlySearchedTerms.map((item, index) => { - return ( -
-
+ + <> + + {t('label.recent-search-term-plural')} + + + {recentlySearchedTerms.length ? ( + recentlySearchedTerms.map((item, index) => { + return ( +
+
+ +
+ +
+ } + placement="top" + trigger="hover"> + {item.term.slice(0, 20)}... + + ) : ( + item.term + )} + + +
- } - placement="top" - trigger="hover"> - {item.term.slice(0, 20)}... - - ) : ( - item.term - )} - - - -
-
+
- ); - }) - ) : ( - <>{t('message.no-searched-terms')}. - )} - -
-
- +
+
+ ); + }) + ) : ( + <>{t('message.no-searched-terms')}. + )} + +
); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FacetFilter.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FacetFilter.tsx index 3556a8e06c5..654ab6bb5ee 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FacetFilter.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FacetFilter.tsx @@ -11,7 +11,7 @@ * limitations under the License. */ -import { Button, Divider } from 'antd'; +import { Button, Divider, Typography } from 'antd'; import classNames from 'classnames'; import { AggregationEntry } from 'interface/search.interface'; import { isEmpty, isNil } from 'lodash'; @@ -114,7 +114,7 @@ const FacetFilter: React.FC = ({ return (
-
+

= ({
-
+
{aggregationEntries.map( ( [aggregationKey, aggregation], @@ -158,13 +158,13 @@ const FacetFilter: React.FC = ({ { length: aggregationsLength } ) => (
-
-
+
+ {translateAggregationKeyToTitle(aggregationKey)} -
+
{aggregation.buckets .slice(0, aggregationsPageSize[aggregationKey]) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/recently-viewed/RecentlyViewed.tsx b/openmetadata-ui/src/main/resources/ui/src/components/recently-viewed/RecentlyViewed.tsx index c9ee5e72406..715c2cb007a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/recently-viewed/RecentlyViewed.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/recently-viewed/RecentlyViewed.tsx @@ -11,11 +11,15 @@ * limitations under the License. */ +import { Button, Typography } from 'antd'; +import EntityListSkeleton from 'components/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component'; import React, { FunctionComponent, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import { Link } from 'react-router-dom'; +import { getEntityName } from 'utils/EntityUtils'; +import { getEntityIcon, getEntityLink } from 'utils/TableUtils'; import { EntityReference } from '../../generated/type/entityReference'; import { getRecentlyViewedData, prepareLabel } from '../../utils/CommonUtils'; -import { EntityListWithAntd } from '../EntityList/EntityList'; const RecentlyViewed: FunctionComponent = () => { const { t } = useTranslation(); @@ -46,13 +50,50 @@ const RecentlyViewed: FunctionComponent = () => { }, []); return ( - {t('message.no-recently-viewed-date')}} - testIDText={t('label.recently-viewed')} - /> + + <> + + {t('label.recent-views')} + + {data.length + ? data.map((item, index) => { + return ( +
+
+ {getEntityIcon(item.type || '')} + + + +
+
+ ); + }) + : t('message.no-recently-viewed-date')} + +
); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/app.less b/openmetadata-ui/src/main/resources/ui/src/styles/app.less index 58fba22b837..61899f797fe 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/app.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/app.less @@ -362,3 +362,8 @@ .switch-field .ant-form-item { margin: 0; } + +.common-left-panel-card-heading { + color: @group-title-color; + font-size: 12px; +} diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/card.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/card.less index 4118e110265..f544cae5d98 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/components/card.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/card.less @@ -27,3 +27,9 @@ padding: 16px; } } + +.card-padding-0 { + .ant-card-body { + padding: 0; + } +} diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/menu.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/menu.less index d9a4d6e9ae4..736c9ecf57e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/components/menu.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/menu.less @@ -17,7 +17,6 @@ @left-panel-border-color: rgb(229, 231, 235); @box-shadow-color: rgba(0, 0, 0, 0.06); @icon-color: #515151; -@group-title-color: #76746f; .custom-menu.ant-menu-root.ant-menu-inline { background: @white; diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/variables.less b/openmetadata-ui/src/main/resources/ui/src/styles/variables.less index 5a7ebec6bdc..a4186d09baf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/variables.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/variables.less @@ -49,3 +49,4 @@ @announcement-background: #fffdf8; @announcement-border: #ffc143; @test-parameter-bg-color: #e7ebf0; +@group-title-color: #76746f;