diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/Domain.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/Domain.png deleted file mode 100644 index 2e7f03db39e..00000000000 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/Domain.png and /dev/null differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/References.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/References.png deleted file mode 100644 index 3c9b58f3a08..00000000000 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/References.png and /dev/null differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/RelatedTerms.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/RelatedTerms.png deleted file mode 100644 index 96aa7f08987..00000000000 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/RelatedTerms.png and /dev/null differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/Reviewers.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/Reviewers.png deleted file mode 100644 index 03792c55eda..00000000000 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/Reviewers.png and /dev/null differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/Synonyms.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/Synonyms.png deleted file mode 100644 index e47fdbc4f63..00000000000 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/Synonyms.png and /dev/null differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/api-endpoints.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/api-endpoints.png new file mode 100644 index 00000000000..f386cb3f23c Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/api-endpoints.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/api-schema.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/api-schema.png new file mode 100644 index 00000000000..81f7d88f34e Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/api-schema.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/container-children.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/container-children.png new file mode 100644 index 00000000000..744a0e67e43 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/container-children.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/container-schema.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/container-schema.png new file mode 100644 index 00000000000..106a414000b Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/container-schema.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/dashboard-charts.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/dashboard-charts.png new file mode 100644 index 00000000000..6d53e541916 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/dashboard-charts.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/dashboard-data-model.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/dashboard-data-model.png new file mode 100644 index 00000000000..e575c3519bb Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/dashboard-data-model.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/data-products.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/data-products.png index e01210f4a54..cf206c2622c 100644 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/data-products.png and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/data-products.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/database-schema-table.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/database-schema-table.png new file mode 100644 index 00000000000..8e0af5e2e1e Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/database-schema-table.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/description-large.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/description-large.png index 81535f37a21..f6a5ca6404a 100644 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/description-large.png and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/description-large.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/description.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/description.png index eec09a0900f..bc41b9bf97b 100644 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/description.png and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/description.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/domain-type.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/domain-type.png new file mode 100644 index 00000000000..185c2d527d9 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/domain-type.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/domain.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/domain.png new file mode 100644 index 00000000000..5748487a459 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/domain.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/experts.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/experts.png new file mode 100644 index 00000000000..39b881e78dd Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/experts.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/ml-features.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/ml-features.png new file mode 100644 index 00000000000..e818e44041f Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/ml-features.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/owners.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/owners.png index 0433944eaca..f927cb7e197 100644 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/owners.png and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/owners.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/pipeline-tasks.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/pipeline-tasks.png new file mode 100644 index 00000000000..335677a4d51 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/pipeline-tasks.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/references.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/references.png new file mode 100644 index 00000000000..afb99c12dfa Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/references.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/related-metrics.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/related-metrics.png new file mode 100644 index 00000000000..9aebe54d423 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/related-metrics.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/related-term.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/related-term.png new file mode 100644 index 00000000000..fbbf70a9134 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/related-term.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/reviewers.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/reviewers.png new file mode 100644 index 00000000000..8984820ad98 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/reviewers.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/schema-tables.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/schema-tables.png new file mode 100644 index 00000000000..af4f75633a9 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/schema-tables.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/search-index-fields.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/search-index-fields.png new file mode 100644 index 00000000000..c8daf55911d Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/search-index-fields.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/stored-procedure-code.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/stored-procedure-code.png new file mode 100644 index 00000000000..e5d0721428b Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/stored-procedure-code.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/synonyms.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/synonyms.png new file mode 100644 index 00000000000..24f33748ce7 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/synonyms.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/table-schema.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/table-schema.png deleted file mode 100644 index b81c47fd380..00000000000 Binary files a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/table-schema.png and /dev/null differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/tables-schema.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/tables-schema.png new file mode 100644 index 00000000000..c387917c32b Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/tables-schema.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/topic-schema.png b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/topic-schema.png new file mode 100644 index 00000000000..a8e32896359 Binary files /dev/null and b/openmetadata-ui/src/main/resources/ui/src/assets/img/widgets/topic-schema.png differ diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-expand-right.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-expand-right.svg new file mode 100644 index 00000000000..f26c7edb95f --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-expand-right.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/openmetadata-ui/src/main/resources/ui/src/components/APIEndpoint/APIEndpointDetails/APIEndpointDetails.tsx b/openmetadata-ui/src/main/resources/ui/src/components/APIEndpoint/APIEndpointDetails/APIEndpointDetails.tsx index 9eef33dbf2f..e2cb9c82a79 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/APIEndpoint/APIEndpointDetails/APIEndpointDetails.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/APIEndpoint/APIEndpointDetails/APIEndpointDetails.tsx @@ -288,7 +288,9 @@ const APIEndpointDetails: React.FC = ({ isExpandViewSupported && ( ) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Customization/CustomizeTabWidget/CustomizeTabWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Customization/CustomizeTabWidget/CustomizeTabWidget.tsx index 25d74de2983..ff77527cb16 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Customization/CustomizeTabWidget/CustomizeTabWidget.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Customization/CustomizeTabWidget/CustomizeTabWidget.tsx @@ -330,7 +330,6 @@ export const CustomizeTabWidget = () => { newWidgetData, placeholderWidgetKey, widgetSize, - TAB_GRID_MAX_COLUMNS, currentPageType as PageType ) ); @@ -382,7 +381,7 @@ export const CustomizeTabWidget = () => { } title={t('label.customize-tab-plural')}> - +
{items.map((item, index) => ( { ))} - +
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericTab/generic-tab.less b/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericTab/generic-tab.less index 737da8f584f..33e1c601e6e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericTab/generic-tab.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericTab/generic-tab.less @@ -37,7 +37,16 @@ border: 1px solid @blue-15; box-shadow: 0px 0px 0px 4px @grey-10; box-shadow: 0px 1px 2px 0px #0a0d120d; + } +} + +.ant-tabs.ant-tabs-top.tabs-new { + .grid-container > #KnowledgePanel\.LeftPanel { // Let it's content take the height height: initial !important; } + + .grid-container > #KnowledgePanel\.DomainType { + height: initial !important; + } } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardChartTable/DashboardChartTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardChartTable/DashboardChartTable.tsx index 4af2e05278a..fb4e9d59e3d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardChartTable/DashboardChartTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardChartTable/DashboardChartTable.tsx @@ -52,7 +52,11 @@ import TableTags from '../../Database/TableTags/TableTags.component'; import { ModalWithMarkdownEditor } from '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { ChartsPermissions } from '../DashboardDetails/DashboardDetails.interface'; -export const DashboardChartTable = () => { +export const DashboardChartTable = ({ + isCustomizationPage = false, +}: { + isCustomizationPage?: boolean; +}) => { const { t } = useTranslation(); const { getEntityPermission } = usePermissionProvider(); const { onThreadLinkSelect } = useGenericContext(); @@ -78,7 +82,7 @@ export const DashboardChartTable = () => { ); return chartPermission; - } catch (error) { + } catch { return DEFAULT_ENTITY_PERMISSION; } }, []); @@ -390,8 +394,14 @@ export const DashboardChartTable = () => { ); useEffect(() => { + if (isCustomizationPage) { + setCharts(listChartIds as unknown as ChartType[]); + + return; + } + initializeCharts(); - }, [listChartIds]); + }, [listChartIds, isCustomizationPage]); if (isEmpty(charts)) { return ; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.component.tsx index a90c66a8a24..98ee6f74243 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.component.tsx @@ -319,7 +319,9 @@ const DashboardDetails = ({ isExpandViewSupported && ( ) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.component.tsx index 8e0bb331b27..8d5295c6b3d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.component.tsx @@ -256,7 +256,9 @@ const DataModelDetails = ({ isExpandViewSupported && ( ) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx index ac0892d9d2a..dea330e3e0b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx @@ -538,7 +538,11 @@ export const DataAssetsHeader = ({ className="data-assets-header-container" data-testid="data-assets-header" gutter={[0, 20]}> - + diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/DatabaseSchema/DatabaseSchemaTable/DatabaseSchemaTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/DatabaseSchema/DatabaseSchemaTable/DatabaseSchemaTable.tsx index 4c70890d4ec..aa3cbee54df 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/DatabaseSchema/DatabaseSchemaTable/DatabaseSchemaTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/DatabaseSchema/DatabaseSchemaTable/DatabaseSchemaTable.tsx @@ -287,6 +287,7 @@ export const DatabaseSchemaTable = ({ useEffect(() => { if (isCustomizationPage) { setSchemas(DATABASE_SCHEMAS_DUMMY_DATA); + setIsLoading(false); return; } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx index 2e1e52d78cc..57785acbd53 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx @@ -730,7 +730,9 @@ const DomainDetailsPage = ({ isExpandViewSupported && ( ) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainExpertsWidget/DomainExpertWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainExpertsWidget/DomainExpertWidget.tsx index 49e17f41aee..c197ac176e6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainExpertsWidget/DomainExpertWidget.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainExpertsWidget/DomainExpertWidget.tsx @@ -10,18 +10,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Button, Card, Tooltip, Typography } from 'antd'; +import { Card, Typography } from 'antd'; import classNames from 'classnames'; import { t } from 'i18next'; import { cloneDeep, includes, isEqual } from 'lodash'; import { default as React, useMemo } from 'react'; -import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; import { ReactComponent as PlusIcon } from '../../../assets/svg/plus-primary.svg'; -import { DE_ACTIVE_COLOR } from '../../../constants/constants'; import { TabSpecificField } from '../../../enums/entity.enum'; import { Domain } from '../../../generated/entity/domains/domain'; import { EntityReference } from '../../../generated/tests/testCase'; import { getOwnerVersionLabel } from '../../../utils/EntityVersionUtils'; +import { EditIconButton } from '../../common/IconButtons/EditIconButton'; import TagButton from '../../common/TagButton/TagButton.component'; import { UserSelectableList } from '../../common/UserSelectableList/UserSelectableList.component'; import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider'; @@ -63,10 +62,7 @@ export const DomainExpertWidget = ({ newLook }: { newLook?: boolean }) => { }; const header = ( -
0 ? 'm-b-xss' : '' - }`}> +
{ popoverProps={{ placement: 'topLeft' }} selectedUsers={domain.experts ?? []} onUpdate={handleExpertsUpdate}> - -
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTypeWidget/DomainTypeWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTypeWidget/DomainTypeWidget.tsx index 75b218670ab..523eced83f5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTypeWidget/DomainTypeWidget.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTypeWidget/DomainTypeWidget.tsx @@ -10,16 +10,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Button, Card, Col, Space, Tooltip, Typography } from 'antd'; +import { Card, Col, Space, Typography } from 'antd'; import classNames from 'classnames'; import { t } from 'i18next'; import { cloneDeep } from 'lodash'; import React, { useMemo, useState } from 'react'; -import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; -import { DE_ACTIVE_COLOR } from '../../../constants/constants'; import { Domain, DomainType } from '../../../generated/entity/domains/domain'; import { domainTypeTooltipDataRender } from '../../../utils/DomainUtils'; import FormItemLabel from '../../common/Form/FormItemLabel'; +import { EditIconButton } from '../../common/IconButtons/EditIconButton'; import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider'; import DomainTypeSelectForm from '../DomainTypeSelectForm/DomainTypeSelectForm.component'; @@ -49,10 +48,7 @@ export const DomainTypeWidget = ({ }; const header = ( -
+
@@ -66,19 +62,15 @@ export const DomainTypeWidget = ({ {editAllPermission && domain.domainType && ( - -
); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx index f461a92d70f..7c12c760b8b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx @@ -176,7 +176,7 @@ const GlossaryDetails = ({ isExpandViewSupported && ( ) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.component.tsx index c1620f74477..6a8c1f87660 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.component.tsx @@ -386,7 +386,9 @@ const GlossaryTermsV1 = ({ isExpandViewSupported && ( ) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Metric/MetricDetails/MetricDetails.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Metric/MetricDetails/MetricDetails.tsx index 8cefc80bb48..e74ffb7fb3c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Metric/MetricDetails/MetricDetails.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Metric/MetricDetails/MetricDetails.tsx @@ -276,7 +276,9 @@ const MetricDetails: React.FC = ({ isExpandViewSupported && ( ) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Metric/RelatedMetrics/RelatedMetrics.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Metric/RelatedMetrics/RelatedMetrics.tsx index ac84929f814..cac42e78e5f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Metric/RelatedMetrics/RelatedMetrics.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Metric/RelatedMetrics/RelatedMetrics.tsx @@ -17,11 +17,7 @@ import { isEmpty } from 'lodash'; import React, { FC, useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; -import { - DE_ACTIVE_COLOR, - NO_DATA_PLACEHOLDER, -} from '../../../constants/constants'; +import { NO_DATA_PLACEHOLDER } from '../../../constants/constants'; import { TAG_CONSTANT, TAG_START_WITH } from '../../../constants/Tag.constants'; import { Metric } from '../../../generated/entity/data/metric'; import { EntityReference } from '../../../generated/type/entityReference'; @@ -29,6 +25,7 @@ import entityUtilClassBase from '../../../utils/EntityUtilClassBase'; import { getEntityName } from '../../../utils/EntityUtils'; import { getEntityIcon } from '../../../utils/TableUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; +import { EditIconButton } from '../../common/IconButtons/EditIconButton'; import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider'; import { DataAssetOption } from '../../DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.interface'; import TagsV1 from '../../Tag/TagsV1/TagsV1.component'; @@ -170,12 +167,10 @@ const RelatedMetrics: FC = ({ !isEmpty(relatedMetrics) && permissions.EditAll && !metricDetails.deleted && ( - setIsEdit(true)} /> )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.tsx index 874f314d52c..42f614271fa 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.tsx @@ -416,7 +416,9 @@ const MlModelDetail: FC = ({ isExpandViewSupported && ( ) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.tsx index 2b6ffd8afb6..9168e3fcd26 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.tsx @@ -25,6 +25,9 @@ import { } from 'antd'; import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import { PageType } from '../../../../generated/system/ui/page'; +import { useCustomizeStore } from '../../../../pages/CustomizablePage/CustomizeStore'; +import customizeDetailPageClassBase from '../../../../utils/CustomizeDetailPage/CustomizeDetailPageClassBase'; import customizePageClassBase from '../../../../utils/CustomizeMyDataPageClassBase'; import { AddWidgetTabContentProps } from './AddWidgetModal.interface'; @@ -38,20 +41,33 @@ function AddWidgetTabContent({ const [selectedWidgetSize, setSelectedWidgetSize] = useState( widgetSizeOptions[0].value ); + const { currentPageType } = useCustomizeStore(); const widgetAddable = useMemo( () => selectedWidgetSize <= maxGridSizeSupport, [selectedWidgetSize, maxGridSizeSupport] ); - const widgetImage = useMemo( - () => - customizePageClassBase.getWidgetImageFromKey( - widget.fullyQualifiedName, - selectedWidgetSize - ), - [widget, selectedWidgetSize] - ); + const widgetImage = useMemo(() => { + switch (currentPageType) { + case PageType.Glossary: + case PageType.GlossaryTerm: + return customizeDetailPageClassBase.getGlossaryWidgetImageFromKey( + widget.fullyQualifiedName, + selectedWidgetSize + ); + case PageType.LandingPage: + return customizePageClassBase.getWidgetImageFromKey( + widget.fullyQualifiedName, + selectedWidgetSize + ); + default: + return customizeDetailPageClassBase.getDetailPageWidgetImageFromKey( + widget.fullyQualifiedName, + selectedWidgetSize + ); + } + }, [widget, selectedWidgetSize, currentPageType]); const handleSizeChange = useCallback((e: RadioChangeEvent) => { setSelectedWidgetSize(e.target.value); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.component.tsx index 89f3f353a0f..bf741c56de6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.component.tsx @@ -358,7 +358,9 @@ const PipelineDetails = ({ isExpandViewSupported && ( ) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Persona/CustomizeUI/CustomizeUI.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Persona/CustomizeUI/CustomizeUI.tsx index 27c1538f5df..5fd97848e6b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Persona/CustomizeUI/CustomizeUI.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Persona/CustomizeUI/CustomizeUI.tsx @@ -61,7 +61,7 @@ export const CustomizeUI = () => { }, [activeCat]); return ( - + {items.map((value) => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx index 6ba71b84f16..3f189ff0b42 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx @@ -280,6 +280,7 @@ const TagsContainerV2 = ({ {!isEmpty(tags?.[tagType]) && !isEditTags && ( = ({ isExpandViewSupported && ( ) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/IconButtons/EditIconButton.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/IconButtons/EditIconButton.tsx index 2b98fd8d66e..c97dba61a8e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/IconButtons/EditIconButton.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/IconButtons/EditIconButton.tsx @@ -16,7 +16,7 @@ import classNames from 'classnames'; import React from 'react'; import { ReactComponent as CommentIcon } from '../../../assets/svg/comment.svg'; import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; -import { ReactComponent as AlignRightIcon } from '../../../assets/svg/ic-align-right.svg'; +import { ReactComponent as ExpandIcon } from '../../../assets/svg/ic-expand-right.svg'; import { ReactComponent as RequestIcon } from '../../../assets/svg/request-icon.svg'; import { DE_ACTIVE_COLOR } from '../../../constants/constants'; @@ -116,9 +116,10 @@ export const AlignRightIconButton = ({ return (