diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx index 220d269b373..534e6963f64 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx @@ -245,40 +245,45 @@ export const CustomPropertyTable = ({ <> {!isEmpty(entityTypeDetail.customProperties) && ( <> -
- - {t('label.custom-property-plural')} - - {viewAllBtn} -
- {isRenderedInRightPanel ? ( -
- {dataSource.map((record, index) => ( - -
- -
- {index !== dataSource.length - 1 && ( - - )} -
- ))} -
+ <> +
+ + {t('label.custom-property-plural')} + + {viewAllBtn} +
+
+ {dataSource.map((record, index) => ( + +
+ +
+ {index !== dataSource.length - 1 && ( + + )} +
+ ))} +
+ ) : ( {dataSource.map((record) => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.test.tsx index 710697513b1..9b3f21183a7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.test.tsx @@ -317,7 +317,7 @@ describe('Test PropertyValue Component', () => { const iconElement = await screen.findByTestId('edit-icon'); expect(await screen.findByTestId('time-interval-value')).toHaveTextContent( - 'StartTime: 1736255200000EndTime: 1736255200020' + 'label.start-entity: 1736255200000label.end-entity: 1736255200020' ); await act(async () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.tsx index d8838d060da..ab23bfd442e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.tsx @@ -11,7 +11,7 @@ * limitations under the License. */ -import Icon, { DownOutlined, UpOutlined } from '@ant-design/icons'; +import Icon from '@ant-design/icons'; import { Button, Card, @@ -29,6 +29,7 @@ import { } from 'antd'; import { ColumnsType } from 'antd/lib/table'; import { AxiosError } from 'axios'; +import classNames from 'classnames'; import { t } from 'i18next'; import { isArray, @@ -50,6 +51,7 @@ import React, { useState, } from 'react'; import { Link } from 'react-router-dom'; +import { ReactComponent as ArrowIconComponent } from '../../../assets/svg/drop-down.svg'; import { ReactComponent as EditIconComponent } from '../../../assets/svg/edit-new.svg'; import { DE_ACTIVE_COLOR, @@ -865,7 +867,7 @@ export const PropertyValue: FC = ({ isTeam={item.type === 'team'} name={item.name ?? ''} type="circle" - width="20" + width="18" /> ) : ( searchClassBase.getEntityIcon(item.type) @@ -874,7 +876,7 @@ export const PropertyValue: FC = ({ } type="text"> {getEntityName(item)} @@ -916,7 +918,7 @@ export const PropertyValue: FC = ({ isTeam={item.type === 'team'} name={item.name ?? ''} type="circle" - width="20" + width="18" /> ) : ( searchClassBase.getEntityIcon(item.type) @@ -925,7 +927,7 @@ export const PropertyValue: FC = ({ } type="text"> {getEntityName(item)} @@ -947,13 +949,17 @@ export const PropertyValue: FC = ({ className="break-all" data-testid="time-interval-value"> - {`StartTime: `} - + {`${t('label.start-entity', { + entity: t('label.time'), + })}: `} + {timeInterval.start} - {`EndTime: `} - + {`${t('label.end-entity', { + entity: t('label.time'), + })}: `} + {timeInterval.end} @@ -973,7 +979,7 @@ export const PropertyValue: FC = ({ default: return ( {value} @@ -1012,10 +1018,10 @@ export const PropertyValue: FC = ({ const customPropertyInlineElement = (
-
+
{getEntityName(property)} @@ -1039,11 +1045,6 @@ export const PropertyValue: FC = ({ )}
-
); @@ -1051,9 +1052,9 @@ export const PropertyValue: FC = ({ - + {getEntityName(property)} @@ -1072,18 +1073,30 @@ export const PropertyValue: FC = ({ )} - - - + {!isRenderedInRightPanel && ( + + + + )} -
+
= ({ {showInput ? getPropertyInput() : getValueElement()}
{isOverflowing && !showInput && ( - + style={{ color: DE_ACTIVE_COLOR, ...ICON_DIMENSION }} + onClick={toggleExpand} + /> )}
@@ -1111,7 +1125,7 @@ export const PropertyValue: FC = ({ if (isRenderedInRightPanel) { return (
{isInlineProperty ? customPropertyInlineElement : customPropertyElement}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/property-value.less b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/property-value.less index 6dcbfa1f9cb..07e9881f0e0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/property-value.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/property-value.less @@ -31,14 +31,17 @@ } } -.ant-btn-text.custom-property-value-toggle-btn { - border-radius: 100%; - background: @btn-bg-color; - border-color: transparent; - height: 30px; - width: 30px; - .anticon { +.custom-property-value-toggle-btn { + svg { vertical-align: middle; + width: 14px; + transition: 0.3s ease-in-out; + } +} + +.custom-property-value-toggle-btn.active { + svg { + transform: rotate(180deg); } } @@ -59,6 +62,14 @@ .ant-card-body { overflow-x: scroll; } + + .property-name { + font-weight: 400; + } + + .property-value { + font-weight: 500; + } } .custom-property-card-right-panel { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx index a5c5af1d7e9..ad8263961a5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx @@ -111,7 +111,7 @@ const ResizablePanels: React.FC = ({ }}> {!hideSecondPanel && ( - {secondPanel.children} +
{secondPanel.children}
)} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditor.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditor.interface.ts index 3e60eb16063..9dddec599d8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditor.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditor.interface.ts @@ -37,6 +37,7 @@ export interface PreviewerProp { showReadMoreBtn?: boolean; isDescriptionExpanded?: boolean; textVariant?: TextVariant; + reducePreviewLineClass?: string; } export type PreviewStyle = 'tab' | 'vertical'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewer.tsx index edab1db6c92..a0cc205b987 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewer.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewer.tsx @@ -35,6 +35,7 @@ const RichTextEditorPreviewer = ({ showReadMoreBtn = true, maxLength = DESCRIPTION_MAX_PREVIEW_CHARACTERS, isDescriptionExpanded = false, + reducePreviewLineClass, }: PreviewerProp) => { const { t, i18n } = useTranslation(); const [content, setContent] = useState(''); @@ -110,7 +111,11 @@ const RichTextEditorPreviewer = ({ data-testid="viewer-container" dir={i18n.dir()}>