diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx index 301f2e3bb92..470cc19cb1e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx @@ -109,27 +109,30 @@ const GlossaryTermTab = ({ title: t('label.term-plural'), dataIndex: 'name', key: 'name', - className: 'glossary-name-column w-max-400 truncate', + className: 'glossary-name-column', + ellipsis: true, + width: '40%', render: (_, record) => { const name = getEntityName(record); return ( - + <> {record.style?.iconURL && ( )} {name} - + > ); }, }, @@ -137,6 +140,7 @@ const GlossaryTermTab = ({ title: t('label.description'), dataIndex: 'description', key: 'description', + width: permissions.Create ? '21%' : '33%', render: (description: string) => description.trim() ? ( , }, { title: t('label.status'), dataIndex: 'status', key: 'status', + width: '12%', filterIcon: FilterIcon, filters: StatusFilters, render: (_, record) => { @@ -178,7 +184,7 @@ const GlossaryTermTab = ({ data.push({ title: t('label.action-plural'), key: 'new-term', - width: 80, + width: '12%', render: (_, record) => { const status = record.status ?? Status.Approved; const allowAddTerm = status === Status.Approved; @@ -396,9 +402,8 @@ const GlossaryTermTab = ({ loading={isTableLoading} pagination={false} rowKey="fullyQualifiedName" - scroll={{ x: true }} size="small" - tableLayout="auto" + tableLayout="fixed" onHeaderRow={onTableHeader} onRow={onTableRow} /> diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.component.tsx index 67395810d20..471827ec715 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.component.tsx @@ -344,7 +344,7 @@ const ExplorePageV1: FunctionComponent = () => { const counts: Record = {}; buckets.forEach((item) => { - if (item && TABS_SEARCH_INDEXES.includes(item.key)) { + if (item && TABS_SEARCH_INDEXES.includes(item.key as SearchIndex)) { counts[item.key ?? ''] = item.doc_count; } }); diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/size.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/size.less index 6e19b02ddc0..8a7e0e88680 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/components/size.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/size.less @@ -116,9 +116,6 @@ .w-max-fit-content { max-width: fit-content; } -.w-max-95 { - max-width: 95%; -} .w-300 { width: 300px; } diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/table.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/table.less index 8abc81f9e76..f9a166e3a25 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/components/table.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/table.less @@ -41,8 +41,8 @@ } .expand-cell-empty-icon-container { - width: 18px; - height: 16px; + width: 8px; + height: 12px; display: inline-flex; } } diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/position.less b/openmetadata-ui/src/main/resources/ui/src/styles/position.less index 7201fc518ed..ffd9d6cb345 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/position.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/position.less @@ -121,15 +121,9 @@ } // Alignment Items -.align-middle { - vertical-align: middle; -} .self-end { align-self: flex-end; } -.vertical-align-inherit { - vertical-align: inherit; -} .self-center { align-self: center; @@ -208,3 +202,11 @@ .vertical-baseline { vertical-align: baseline; } + +.align-middle { + vertical-align: middle; +} + +.vertical-align-inherit { + vertical-align: inherit; +} diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx index 14c6a2bd46d..d0c71115598 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx @@ -205,7 +205,6 @@ export const getGlobalSettingsMenuWithPermission = ( }, ], }, - { category: i18next.t('label.integration-plural'), key: 'integrations', diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx index 97ce6f65a78..d0a70425fb7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx @@ -505,23 +505,23 @@ export function getTableExpandableConfig( const expandableConfig: ExpandableConfig = { expandIcon: ({ expanded, onExpand, expandable, record }) => expandable ? ( - + <> {isDraggable && ( - + )} onExpand(record, e)} /> - + > ) : ( isDraggable && ( <> - - + + > ) ),