@@ -37,13 +48,22 @@ jest.mock('../../../common/ResizablePanels/ResizablePanels', () => {
));
});
-describe.skip('GlossaryOverviewTab', () => {
+const onUpdate = jest.fn();
+
+describe('GlossaryOverviewTab', () => {
+ const selectedData = MOCKED_GLOSSARY_TERMS[0];
+ const permissions = MOCK_PERMISSIONS;
+
it('renders the component', async () => {
const { findByText } = render(
,
{ wrapper: MemoryRouter }
);
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermReferences.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermReferences.test.tsx
index 96517ebdfbd1..a38bbdb3af6d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermReferences.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermReferences.test.tsx
@@ -18,23 +18,19 @@ import {
} from '../../../../mocks/Glossary.mock';
import GlossaryTermReferences from './GlossaryTermReferences';
-const [mockGlossaryTerm1, mockGlossaryTerm2] = MOCKED_GLOSSARY_TERMS;
-
-const mockContext = {
- data: mockGlossaryTerm1,
- onUpdate: jest.fn(),
- isVersionView: false,
- permissions: MOCK_PERMISSIONS,
-};
-
-jest.mock('../../../GenericProvider/GenericProvider', () => ({
- useGenericContext: jest.fn().mockImplementation(() => mockContext),
-}));
+const mockOnGlossaryTermUpdate = jest.fn();
describe('GlossaryTermReferences', () => {
it('renders glossary term references', async () => {
- mockContext.data = mockGlossaryTerm2;
- const { getByText, getByTestId } = render(
);
+ const mockGlossaryTerm = MOCKED_GLOSSARY_TERMS[1];
+ const mockPermissions = MOCK_PERMISSIONS;
+ const { getByText, getByTestId } = render(
+
+ );
const sectionTitle = getByTestId('section-label.reference-plural');
const editBtn = getByTestId('edit-button');
@@ -57,18 +53,29 @@ describe('GlossaryTermReferences', () => {
});
it('renders add button', async () => {
- mockContext.data = mockGlossaryTerm1;
-
- const { getByTestId } = render(
);
+ const mockGlossaryTerm = MOCKED_GLOSSARY_TERMS[0];
+ const mockPermissions = MOCK_PERMISSIONS;
+ const { getByTestId } = render(
+
+ );
expect(getByTestId('term-references-add-button')).toBeInTheDocument();
});
it('should not render add button if no permission', async () => {
- mockContext.data = mockGlossaryTerm1;
- mockContext.permissions = { ...MOCK_PERMISSIONS, EditAll: false };
-
- const { queryByTestId, findByText } = render(
);
+ const mockGlossaryTerm = MOCKED_GLOSSARY_TERMS[0];
+ const mockPermissions = { ...MOCK_PERMISSIONS, EditAll: false };
+ const { queryByTestId, findByText } = render(
+
+ );
expect(queryByTestId('term-references-add-button')).toBeNull();
@@ -78,7 +85,15 @@ describe('GlossaryTermReferences', () => {
});
it('should not render edit button if no permission', async () => {
- const { queryByTestId } = render(
);
+ const mockGlossaryTerm = MOCKED_GLOSSARY_TERMS[1];
+ const mockPermissions = { ...MOCK_PERMISSIONS, EditAll: false };
+ const { queryByTestId } = render(
+
+ );
expect(queryByTestId('edit-button')).toBeNull();
});
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermReferences.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermReferences.tsx
index a72a5a1a5a92..8f0dff3c8b71 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermReferences.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermReferences.tsx
@@ -11,18 +11,26 @@
* limitations under the License.
*/
-import { Button, Space, Tooltip, Typography } from 'antd';
+import Icon from '@ant-design/icons/lib/components/Icon';
+import { Button, Space, Tag, Tooltip, Typography } from 'antd';
+import classNames from 'classnames';
import { t } from 'i18next';
import { cloneDeep, isEmpty, isEqual } from 'lodash';
import React, { useCallback, useEffect, useState } from 'react';
import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg';
+import { ReactComponent as ExternalLinkIcon } from '../../../../assets/svg/external-links.svg';
import { ReactComponent as PlusIcon } from '../../../../assets/svg/plus-primary.svg';
import {
DE_ACTIVE_COLOR,
+ ICON_DIMENSION,
NO_DATA_PLACEHOLDER,
+ SUCCESS_COLOR,
+ TEXT_BODY_COLOR,
+ TEXT_GREY_MUTED,
} from '../../../../constants/constants';
import { EntityField } from '../../../../constants/Feeds.constants';
import { NO_PERMISSION_FOR_ACTION } from '../../../../constants/HelperTextUtil';
+import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface';
import {
GlossaryTerm,
TermReference,
@@ -33,20 +41,25 @@ import {
getChangedEntityOldValue,
getDiffByFieldName,
} from '../../../../utils/EntityVersionUtils';
-import { renderReferenceElement } from '../../../../utils/GlossaryUtils';
+import { VersionStatus } from '../../../../utils/EntityVersionUtils.interface';
import TagButton from '../../../common/TagButton/TagButton.component';
-import { useGenericContext } from '../../../GenericProvider/GenericProvider';
import GlossaryTermReferencesModal from '../GlossaryTermReferencesModal.component';
-const GlossaryTermReferences = () => {
+interface GlossaryTermReferencesProps {
+ isVersionView?: boolean;
+ glossaryTerm: GlossaryTerm;
+ permissions: OperationPermission;
+ onGlossaryTermUpdate: (glossaryTerm: GlossaryTerm) => Promise
;
+}
+
+const GlossaryTermReferences = ({
+ glossaryTerm,
+ permissions,
+ onGlossaryTermUpdate,
+ isVersionView,
+}: GlossaryTermReferencesProps) => {
const [references, setReferences] = useState([]);
const [isViewMode, setIsViewMode] = useState(true);
- const {
- data: glossaryTerm,
- onUpdate: onGlossaryTermUpdate,
- isVersionView,
- permissions,
- } = useGenericContext();
const handleReferencesSave = async (
newReferences: TermReference[],
@@ -78,6 +91,52 @@ const GlossaryTermReferences = () => {
setReferences(glossaryTerm.references ? glossaryTerm.references : []);
}, [glossaryTerm.references]);
+ const getReferenceElement = useCallback(
+ (ref: TermReference, versionStatus?: VersionStatus) => {
+ let iconColor: string;
+ let textClassName: string;
+ if (versionStatus?.added) {
+ iconColor = SUCCESS_COLOR;
+ textClassName = 'text-success';
+ } else if (versionStatus?.removed) {
+ iconColor = TEXT_GREY_MUTED;
+ textClassName = 'text-grey-muted';
+ } else {
+ iconColor = TEXT_BODY_COLOR;
+ textClassName = 'text-body';
+ }
+
+ return (
+
+
+
+
+ {ref.name}
+
+
+
+
+ );
+ },
+ []
+ );
+
const getVersionReferenceElements = useCallback(() => {
const changeDescription = glossaryTerm.changeDescription;
const referencesDiff = getDiffByFieldName(
@@ -113,14 +172,12 @@ const GlossaryTermReferences = () => {
return (
- {unchangedReferences.map((reference) =>
- renderReferenceElement(reference)
- )}
+ {unchangedReferences.map((reference) => getReferenceElement(reference))}
{addedReferences.map((reference) =>
- renderReferenceElement(reference, { added: true })
+ getReferenceElement(reference, { added: true })
)}
{deletedReferences.map((reference) =>
- renderReferenceElement(reference, { removed: true })
+ getReferenceElement(reference, { removed: true })
)}
);
@@ -163,7 +220,7 @@ const GlossaryTermReferences = () => {
getVersionReferenceElements()
) : (
- {references.map((ref) => renderReferenceElement(ref))}
+ {references.map((ref) => getReferenceElement(ref))}
{permissions.EditAll && references.length === 0 && (
({
- useGenericContext: jest.fn().mockImplementation(() => mockContext),
-}));
+const onGlossaryTermUpdate = jest.fn();
describe('GlossaryTermSynonyms', () => {
it('renders synonyms and edit button', () => {
- mockContext.data = mockGlossaryTerm2;
- const { getByTestId, getByText } = render(;
+}
+
+const GlossaryTermSynonyms = ({
+ permissions,
+ glossaryTerm,
+ onGlossaryTermUpdate,
+ isVersionView,
+}: GlossaryTermSynonymsProps) => {
const [isViewMode, setIsViewMode] = useState(true);
const [synonyms, setSynonyms] = useState([]);
const [saving, setSaving] = useState(false);
- const {
- data: glossaryTerm,
- onUpdate: onGlossaryTermUpdate,
- isVersionView,
- permissions,
- } = useGenericContext();
const getSynonyms = () => (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/RelatedTerms.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/RelatedTerms.test.tsx
index 02efd7c68c5e..23a3481a6a89 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/RelatedTerms.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/RelatedTerms.test.tsx
@@ -18,40 +18,57 @@ import {
} from '../../../../mocks/Glossary.mock';
import RelatedTerms from './RelatedTerms';
-const mockContext = {
- data: MOCKED_GLOSSARY_TERMS[2],
- onUpdate: jest.fn(),
- isVersionView: false,
- permissions: MOCK_PERMISSIONS,
-};
+const glossaryTerm = MOCKED_GLOSSARY_TERMS[2];
-jest.mock('../../../GenericProvider/GenericProvider', () => ({
- useGenericContext: jest.fn().mockImplementation(() => mockContext),
-}));
+const permissions = MOCK_PERMISSIONS;
+
+const onGlossaryTermUpdate = jest.fn();
describe('RelatedTerms', () => {
it('should render the component', () => {
- const { container } = render(
);
+ const { container } = render(
+
+ );
expect(container).toBeInTheDocument();
});
it('should show the related terms', () => {
- const { getByText } = render(
);
+ const { getByText } = render(
+
+ );
expect(getByText('Business Customer')).toBeInTheDocument();
});
it('should show the add button if there are no related terms and the user has edit permissions', () => {
- mockContext.data = { ...mockContext.data, relatedTerms: [] };
- const { getByTestId } = render(
);
+ const { getByTestId } = render(
+
+ );
expect(getByTestId('related-term-add-button')).toBeInTheDocument();
});
it('should not show the add button if there are no related terms and the user does not have edit permissions', async () => {
- mockContext.permissions = { ...mockContext.permissions, EditAll: false };
- const { queryByTestId, findByText } = render(
);
+ const { queryByTestId, findByText } = render(
+
+ );
expect(queryByTestId('related-term-add-button')).toBeNull();
@@ -61,16 +78,25 @@ describe('RelatedTerms', () => {
});
it('should show the edit button if there are related terms and the user has edit permissions', () => {
- mockContext.permissions = MOCK_PERMISSIONS;
- mockContext.data = { ...MOCKED_GLOSSARY_TERMS[2] };
- const { getByTestId } = render(
);
+ const { getByTestId } = render(
+
+ );
expect(getByTestId('edit-button')).toBeInTheDocument();
});
it('should not show the edit button if there are no related terms and the user has edit permissions', () => {
- mockContext.data = { ...MOCKED_GLOSSARY_TERMS[2], relatedTerms: [] };
- const { queryByTestId } = render(
);
+ const { queryByTestId } = render(
+
+ );
expect(queryByTestId('edit-button')).toBeNull();
});
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/RelatedTerms.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/RelatedTerms.tsx
index d9a528bb19e7..d0221548db31 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/RelatedTerms.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/RelatedTerms.tsx
@@ -27,6 +27,7 @@ import {
} from '../../../../constants/constants';
import { EntityField } from '../../../../constants/Feeds.constants';
import { NO_PERMISSION_FOR_ACTION } from '../../../../constants/HelperTextUtil';
+import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface';
import { EntityType } from '../../../../enums/entity.enum';
import { GlossaryTerm } from '../../../../generated/entity/data/glossaryTerm';
import {
@@ -46,17 +47,21 @@ import { VersionStatus } from '../../../../utils/EntityVersionUtils.interface';
import { getGlossaryPath } from '../../../../utils/RouterUtils';
import { SelectOption } from '../../../common/AsyncSelectList/AsyncSelectList.interface';
import TagButton from '../../../common/TagButton/TagButton.component';
-import { useGenericContext } from '../../../GenericProvider/GenericProvider';
-const RelatedTerms = () => {
- const history = useHistory();
- const {
- data: glossaryTerm,
- onUpdate,
- isVersionView,
- permissions,
- } = useGenericContext
();
+interface RelatedTermsProps {
+ isVersionView?: boolean;
+ permissions: OperationPermission;
+ glossaryTerm: GlossaryTerm;
+ onGlossaryTermUpdate: (data: GlossaryTerm) => Promise;
+}
+const RelatedTerms = ({
+ isVersionView,
+ glossaryTerm,
+ permissions,
+ onGlossaryTermUpdate,
+}: RelatedTermsProps) => {
+ const history = useHistory();
const [isIconVisible, setIsIconVisible] = useState(true);
const [selectedOption, setSelectedOption] = useState([]);
@@ -99,7 +104,7 @@ const RelatedTerms = () => {
relatedTerms: newOptions,
};
- await onUpdate(updatedGlossaryTerm);
+ await onGlossaryTermUpdate(updatedGlossaryTerm);
setIsIconVisible(true);
};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx
index 87ac05380160..c92528e87b93 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx
@@ -25,12 +25,11 @@ import {
OperationPermission,
ResourceEntity,
} from '../../context/PermissionProvider/PermissionProvider.interface';
-import { EntityAction, EntityTabs } from '../../enums/entity.enum';
+import { EntityAction } from '../../enums/entity.enum';
import {
CreateThread,
ThreadType,
} from '../../generated/api/feed/createThread';
-import { Glossary } from '../../generated/entity/data/glossary';
import { GlossaryTerm } from '../../generated/entity/data/glossaryTerm';
import { VERSION_VIEW_GLOSSARY_PERMISSION } from '../../mocks/Glossary.mock';
import { postThread } from '../../rest/feedsAPI';
@@ -263,7 +262,7 @@ const GlossaryV1 = ({
history.push(
getGlossaryTermDetailsPath(
selectedData.fullyQualifiedName || '',
- EntityTabs.TERMS
+ 'terms'
)
);
}
@@ -341,17 +340,6 @@ const GlossaryV1 = ({
}
};
- const handleGlossaryUpdate = async (newGlossary: Glossary) => {
- const jsonPatch = compare(selectedData, newGlossary);
-
- const shouldRefreshTerms = jsonPatch.some((patch) =>
- patch.path.startsWith('/owners')
- );
-
- await updateGlossary(newGlossary);
- shouldRefreshTerms && loadGlossaryTerms(true);
- };
-
const initPermissions = async () => {
setIsPermissionLoading(true);
const permissionFetch = isGlossaryActive
@@ -393,7 +381,7 @@ const GlossaryV1 = ({
permissions={glossaryPermission}
refreshGlossaryTerms={() => loadGlossaryTerms(true)}
termsLoading={isTermsLoading}
- updateGlossary={handleGlossaryUpdate}
+ updateGlossary={updateGlossary}
updateVote={updateVote}
onAddGlossaryTerm={(term) =>
handleGlossaryTermModalAction(false, term ?? null)
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/EntityNameModal/EntityNameModal.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/EntityNameModal/EntityNameModal.component.tsx
index ec9fd1069182..c983a2a6abdc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/EntityNameModal/EntityNameModal.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/EntityNameModal/EntityNameModal.component.tsx
@@ -15,9 +15,9 @@ import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ENTITY_NAME_REGEX } from '../../../constants/regex.constants';
import SanitizedInput from '../../common/SanitizedInput/SanitizedInput';
-import { EntityName, EntityNameModalProps } from './EntityNameModal.interface';
+import { EntityNameModalProps } from './EntityNameModal.interface';
-const EntityNameModal = ({
+const EntityNameModal: React.FC = ({
visible,
entity,
onCancel,
@@ -28,7 +28,7 @@ const EntityNameModal = ({
allowRename = false,
nameValidationRules = [],
additionalFields,
-}: EntityNameModalProps) => {
+}) => {
const { t } = useTranslation();
const [form] = Form.useForm();
const [isLoading, setIsLoading] = useState(false);
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/EntityNameModal/EntityNameModal.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Modals/EntityNameModal/EntityNameModal.interface.ts
index 2106081055e3..9d217278538e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/EntityNameModal/EntityNameModal.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/EntityNameModal/EntityNameModal.interface.ts
@@ -19,14 +19,12 @@ export type EntityNameWithAdditionFields = EntityName & {
constraint: Constraint;
};
-export interface EntityNameModalProps<
- T extends { name: string; displayName?: string }
-> {
+export interface EntityNameModalProps {
visible: boolean;
allowRename?: boolean;
onCancel: () => void;
- onSave: (obj: T) => void | Promise;
- entity: T;
+ onSave: (obj: EntityName) => void | Promise;
+ entity: Partial;
title: string;
nameValidationRules?: Rule[];
additionalFields?: React.ReactNode;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddDetailsPageWidgetModal/AddDetailsPageWidgetModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddDetailsPageWidgetModal/AddDetailsPageWidgetModal.tsx
deleted file mode 100644
index 0b19ee104540..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddDetailsPageWidgetModal/AddDetailsPageWidgetModal.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2023 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { CheckOutlined } from '@ant-design/icons';
-import { Modal, Space, Tabs, TabsProps } from 'antd';
-import { isEmpty, toString } from 'lodash';
-import { default as React, useCallback, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { LIGHT_GREEN_COLOR } from '../../../../constants/constants';
-import {
- CommonWidgetType,
- GridSizes,
-} from '../../../../constants/CustomizeWidgets.constants';
-import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum';
-import { WidgetWidths } from '../../../../enums/CustomizablePage.enum';
-import { Document } from '../../../../generated/entity/docStore/document';
-import { getWidgetWidthLabelFromKey } from '../../../../utils/CustomizableLandingPageUtils';
-import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
-import { WidgetSizeInfo } from '../AddWidgetModal/AddWidgetModal.interface';
-import AddWidgetTabContent from '../AddWidgetModal/AddWidgetTabContent';
-
-interface Props {
- open: boolean;
- maxGridSizeSupport: number;
- placeholderWidgetKey: string;
- addedWidgetsList: Array;
- handleCloseAddWidgetModal: () => void;
- handleAddWidget: (
- widget: CommonWidgetType,
- widgetKey: string,
- widgetSize: number
- ) => void;
- widgetsList: Array;
-}
-
-function AddDetailsPageWidgetModal({
- open,
- widgetsList,
- addedWidgetsList,
- handleCloseAddWidgetModal,
- handleAddWidget,
- maxGridSizeSupport,
- placeholderWidgetKey,
-}: Readonly) {
- const { t } = useTranslation();
-
- const getAddWidgetHandler = useCallback(
- (widget: Document, widgetSize: number) => () =>
- handleAddWidget(
- widget as unknown as CommonWidgetType,
- placeholderWidgetKey,
- widgetSize
- ),
- [handleAddWidget, placeholderWidgetKey]
- );
-
- const tabItems: TabsProps['items'] = useMemo(
- () =>
- widgetsList?.map((widget) => {
- const widgetSizeOptions: Array =
- widget.data.gridSizes.map((size: GridSizes) => ({
- label: (
-
- {getWidgetWidthLabelFromKey(toString(size))}
-
- ),
- value: WidgetWidths[size],
- }));
-
- return {
- label: (
-
- {widget.name}
- {addedWidgetsList.some(
- (w) =>
- w.startsWith(widget.fullyQualifiedName) &&
- !w.includes('EmptyWidgetPlaceholder')
- ) && (
-
- ),
- key: widget.fullyQualifiedName,
- children: (
-
- {t('message.no-widgets-to-add')}
-
- );
- }
-
- return (
-
- {widgetsInfo}
-
- );
-}
-
-export default AddDetailsPageWidgetModal;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx
index 276df5dba826..22fe5a7a5aa2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx
@@ -28,7 +28,7 @@ const mockProps: AddWidgetTabContentProps = {
widgetSizeOptions: mockWidgetSizes,
};
-jest.mock('../../../../utils/CustomizeMyDataPageClassBase', () => ({
+jest.mock('../../../../utils/CustomizePageClassBase', () => ({
getWidgetImageFromKey: jest.fn().mockImplementation(() => ''),
}));
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 50d44a2f95bb..2d02ad294156 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,7 +25,7 @@ import {
} from 'antd';
import React, { useCallback, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
-import customizePageClassBase from '../../../../utils/CustomizeMyDataPageClassBase';
+import customizePageClassBase from '../../../../utils/CustomizePageClassBase';
import { AddWidgetTabContentProps } from './AddWidgetModal.interface';
function AddWidgetTabContent({
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomiseGlossaryTermDetailPage/CustomiseGlossaryTermDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomiseGlossaryTermDetailPage/CustomiseGlossaryTermDetailPage.tsx
deleted file mode 100644
index 772fcfc3174b..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomiseGlossaryTermDetailPage/CustomiseGlossaryTermDetailPage.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2023 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import React, { useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import gridBgImg from '../../../../assets/img/grid-bg-img.png';
-import { Page } from '../../../../generated/system/ui/page';
-import { useGridLayoutDirection } from '../../../../hooks/useGridLayoutDirection';
-import { WidgetConfig } from '../../../../pages/CustomizablePage/CustomizablePage.interface';
-import { useCustomizeStore } from '../../../../pages/CustomizablePage/CustomizeStore';
-import '../../../../pages/MyDataPage/my-data.less';
-import customizeGlossaryTermPageClassBase from '../../../../utils/CustomiseGlossaryTermPage/CustomizeGlossaryTermPage';
-import {
- getLayoutWithEmptyWidgetPlaceholder,
- getUniqueFilteredLayout,
-} from '../../../../utils/CustomizableLandingPageUtils';
-import { getEntityName } from '../../../../utils/EntityUtils';
-import { CustomizeTabWidget } from '../../../Glossary/CustomiseWidgets/CustomizeTabWidget/CustomizeTabWidget';
-import { GlossaryHeaderWidget } from '../../../Glossary/GlossaryHeader/GlossaryHeaderWidget';
-import PageLayoutV1 from '../../../PageLayoutV1/PageLayoutV1';
-import { CustomizablePageHeader } from '../CustomizablePageHeader/CustomizablePageHeader';
-import { CustomizeMyDataProps } from '../CustomizeMyData/CustomizeMyData.interface';
-
-function CustomizeGlossaryTermDetailPage({
- personaDetails,
- onSaveLayout,
- isGlossary,
-}: Readonly) {
- const { t } = useTranslation();
- const { currentPage, currentPageType } = useCustomizeStore();
-
- const [layout, setLayout] = useState>(
- (currentPage?.layout as WidgetConfig[]) ??
- customizeGlossaryTermPageClassBase.defaultLayout
- );
-
- const handleReset = useCallback(async () => {
- // Get default layout with the empty widget added at the end
- const newMainPanelLayout = getLayoutWithEmptyWidgetPlaceholder(
- customizeGlossaryTermPageClassBase.defaultLayout,
- 2,
- 4
- );
- setLayout(newMainPanelLayout);
- await onSaveLayout();
- }, []);
-
- const handleSave = async () => {
- await onSaveLayout({
- ...(currentPage ?? ({ pageType: currentPageType } as Page)),
- layout: getUniqueFilteredLayout(layout),
- });
- };
-
- // call the hook to set the direction of the grid layout
- useGridLayoutDirection();
-
- return (
-
-
- );
-}
-
-export default CustomizeGlossaryTermDetailPage;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizablePageHeader/CustomizablePageHeader.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizablePageHeader/CustomizablePageHeader.tsx
deleted file mode 100644
index 2257b40ed277..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizablePageHeader/CustomizablePageHeader.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2024 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { Button, Col, Modal, Space, Typography } from 'antd';
-import { startCase } from 'lodash';
-import React, { useCallback, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Link, useHistory } from 'react-router-dom';
-import { useApplicationStore } from '../../../../hooks/useApplicationStore';
-import { useFqn } from '../../../../hooks/useFqn';
-import { useCustomizeStore } from '../../../../pages/CustomizablePage/CustomizeStore';
-import { Transi18next } from '../../../../utils/CommonUtils';
-import { getPersonaDetailsPath } from '../../../../utils/RouterUtils';
-
-export const CustomizablePageHeader = ({
- onReset,
- onSave,
- personaName,
-}: {
- onSave: () => Promise;
- onReset: () => void;
- personaName: string;
-}) => {
- const { t } = useTranslation();
- const { fqn: personaFqn } = useFqn();
- const { currentPageType } = useCustomizeStore();
- const history = useHistory();
- const [isResetModalOpen, setIsResetModalOpen] = React.useState(false);
- const [saving, setSaving] = React.useState(false);
- const { theme } = useApplicationStore();
-
- const handleCancel = () => {
- history.push(getPersonaDetailsPath(personaFqn));
- };
-
- const handleOpenResetModal = useCallback(() => {
- setIsResetModalOpen(true);
- }, []);
-
- const handleCloseResetModal = useCallback(() => {
- setIsResetModalOpen(false);
- }, []);
-
- const handleSave = useCallback(async () => {
- setSaving(true);
- await onSave();
- setSaving(false);
- }, [onSave]);
-
- const handleReset = useCallback(async () => {
- onReset();
- setIsResetModalOpen(false);
- }, [onReset]);
- const i18Values = useMemo(
- () => ({
- persona: personaName,
- pageName: startCase(currentPageType as string) ?? t('label.landing-page'),
- }),
- [personaName]
- );
-
- return (
-
-
-
-
-
-
- {t('label.cancel')}
-
-
- {t('label.reset')}
-
-
- {t('label.save')}
-
-
- {isResetModalOpen && (
-
- {t('message.reset-layout-confirmation')}
-
- )}
-
- );
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts
index b867f91d0da1..18d402af23a0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts
@@ -11,12 +11,13 @@
* limitations under the License.
*/
+import { Document } from '../../../../generated/entity/docStore/document';
import { Persona } from '../../../../generated/entity/teams/persona';
-import { Page } from '../../../../generated/system/ui/page';
export interface CustomizeMyDataProps {
personaDetails?: Persona;
- isGlossary?: boolean;
- initialPageData: Page | null;
- onSaveLayout: (page?: Page) => Promise;
+ initialPageData: Document;
+ onSaveLayout: () => Promise;
+ handlePageDataChange: (newPageData: Document) => void;
+ handleSaveCurrentPageLayout: (value: boolean) => void;
}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx
index 5a42979f77a9..1791575e2ebc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx
@@ -18,18 +18,22 @@ import { PageType } from '../../../../generated/system/ui/page';
import {
mockActiveAnnouncementData,
mockCustomizePageClassBase,
+ mockDefaultLayout,
mockDocumentData,
mockPersonaName,
mockUserData,
} from '../../../../mocks/MyDataPage.mock';
+import { WidgetConfig } from '../../../../pages/CustomizablePage/CustomizablePage.interface';
import CustomizeMyData from './CustomizeMyData';
import { CustomizeMyDataProps } from './CustomizeMyData.interface';
const mockPush = jest.fn();
const mockProps: CustomizeMyDataProps = {
- initialPageData: mockDocumentData.data.pages[0],
+ initialPageData: mockDocumentData,
onSaveLayout: jest.fn(),
+ handlePageDataChange: jest.fn(),
+ handleSaveCurrentPageLayout: jest.fn(),
};
jest.mock(
@@ -64,7 +68,7 @@ jest.mock(
}
);
-jest.mock('../../../../utils/CustomizeMyDataPageClassBase', () => {
+jest.mock('../../../../utils/CustomizePageClassBase', () => {
return mockCustomizePageClassBase;
});
@@ -161,7 +165,9 @@ describe('CustomizeMyData component', () => {
await act(async () => userEvent.click(cancelButton));
- expect(mockPush).toHaveBeenCalledWith('/settings/persona/testPersona');
+ expect(mockPush).toHaveBeenCalledWith(
+ '/settings/preferences/customizeLandingPage'
+ );
});
it('CustomizeMyData should display reset layout confirmation modal on click of reset button', async () => {
@@ -181,6 +187,9 @@ describe('CustomizeMyData component', () => {
render((mockDefaultLayout),
+ },
+ },
+ })
+ );
+
expect(screen.queryByTestId('reset-layout-modal')).toBeNull();
});
@@ -199,6 +221,9 @@ describe('CustomizeMyData component', () => {
render() {
const { t } = useTranslation();
- const { currentUser } = useApplicationStore();
-
+ const { currentUser, theme } = useApplicationStore();
+ const history = useHistory();
+ const { fqn: decodedPersonaFQN } = useFqn();
const [layout, setLayout] = useState>(
getLayoutWithEmptyWidgetPlaceholder(
- (initialPageData?.layout as WidgetConfig[]) ??
- customizeMyDataPageClassBase.defaultLayout,
+ initialPageData.data?.page?.layout ??
+ customizePageClassBase.defaultLayout,
2,
4
)
@@ -70,10 +82,11 @@ function CustomizeMyData({
LandingPageWidgetKeys.EMPTY_WIDGET_PLACEHOLDER
);
const [isWidgetModalOpen, setIsWidgetModalOpen] = useState(false);
-
+ const [isResetModalOpen, setIsResetModalOpen] = useState(false);
const [followedData, setFollowedData] = useState>([]);
const [followedDataCount, setFollowedDataCount] = useState(0);
const [isLoadingOwnedData, setIsLoadingOwnedData] = useState(false);
+ const [saving, setSaving] = useState(false);
const handlePlaceholderWidgetKey = useCallback((value: string) => {
setPlaceholderWidgetKey(value);
@@ -94,7 +107,7 @@ function CustomizeMyData({
newWidgetData,
placeholderWidgetKey,
widgetSize,
- customizeMyDataPageClassBase.landingPageMaxGridSize
+ customizePageClassBase.landingPageMaxGridSize
)
);
setIsWidgetModalOpen(false);
@@ -111,6 +124,14 @@ function CustomizeMyData({
[layout]
);
+ const handleOpenResetModal = useCallback(() => {
+ setIsResetModalOpen(true);
+ }, []);
+
+ const handleCloseResetModal = useCallback(() => {
+ setIsResetModalOpen(false);
+ }, []);
+
const handleOpenAddWidgetModal = useCallback(() => {
setIsWidgetModalOpen(true);
}, []);
@@ -176,15 +197,44 @@ function CustomizeMyData({
]
);
+ useEffect(() => {
+ handlePageDataChange({
+ ...initialPageData,
+ data: {
+ page: {
+ layout: getUniqueFilteredLayout(layout),
+ },
+ },
+ });
+ }, [layout]);
+
+ const handleCancel = useCallback(() => {
+ history.push(
+ getSettingPath(
+ GlobalSettingsMenuCategory.PREFERENCES,
+ GlobalSettingOptions.CUSTOMIZE_LANDING_PAGE
+ )
+ );
+ }, []);
+
const handleReset = useCallback(() => {
// Get default layout with the empty widget added at the end
const newMainPanelLayout = getLayoutWithEmptyWidgetPlaceholder(
- customizeMyDataPageClassBase.defaultLayout,
+ customizePageClassBase.defaultLayout,
2,
4
);
setLayout(newMainPanelLayout);
- onSaveLayout();
+ handlePageDataChange({
+ ...initialPageData,
+ data: {
+ page: {
+ layout: getUniqueFilteredLayout(newMainPanelLayout),
+ },
+ },
+ });
+ handleSaveCurrentPageLayout(true);
+ setIsResetModalOpen(false);
}, []);
useEffect(() => {
@@ -192,13 +242,10 @@ function CustomizeMyData({
}, []);
const handleSave = async () => {
- await onSaveLayout({
- ...(initialPageData ??
- ({
- pageType: PageType.LandingPage,
- } as Page)),
- layout: getUniqueFilteredLayout(layout),
- });
+ setSaving(true);
+ await onSaveLayout();
+
+ setSaving(false);
};
// call the hook to set the direction of the grid layout
@@ -207,6 +254,59 @@ function CustomizeMyData({
return (
+
+
+
+
+
+
+ {t('label.cancel')}
+
+
+ {t('label.reset')}
+
+
+ {t('label.save')}
+
+
+
+ }
+ headerClassName="m-0 p-0"
mainContainerClassName="p-t-0"
pageContainerStyle={{
backgroundImage: `url(${gridBgImg})`,
@@ -214,21 +314,16 @@ function CustomizeMyData({
pageTitle={t('label.customize-entity', {
entity: t('label.landing-page'),
})}>
-
{widgets}
@@ -239,13 +334,24 @@ function CustomizeMyData({
addedWidgetsList={addedWidgetsList}
handleAddWidget={handleMainPanelAddWidget}
handleCloseAddWidgetModal={handleCloseAddWidgetModal}
- maxGridSizeSupport={
- customizeMyDataPageClassBase.landingPageMaxGridSize
- }
+ maxGridSizeSupport={customizePageClassBase.landingPageMaxGridSize}
open={isWidgetModalOpen}
placeholderWidgetKey={placeholderWidgetKey}
/>
)}
+ {isResetModalOpen && (
+
+ {t('message.reset-layout-confirmation')}
+
+ )}
);
}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.component.tsx
index 78fc05cd0ec1..f08046d34e6c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.component.tsx
@@ -13,8 +13,8 @@
import { Button, Col, Menu, MenuProps, Row, Typography } from 'antd';
import Modal from 'antd/lib/modal/Modal';
import classNames from 'classnames';
-import { isEmpty, noop } from 'lodash';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { noop } from 'lodash';
+import React, { useCallback, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Link } from 'react-router-dom';
import {
@@ -25,15 +25,8 @@ import {
import { SidebarItem } from '../../../enums/sidebar.enum';
import leftSidebarClassBase from '../../../utils/LeftSidebarClassBase';
-import { EntityType } from '../../../enums/entity.enum';
import { useApplicationStore } from '../../../hooks/useApplicationStore';
import useCustomLocation from '../../../hooks/useCustomLocation/useCustomLocation';
-import { useCustomizeStore } from '../../../pages/CustomizablePage/CustomizeStore';
-import { getDocumentByFQN } from '../../../rest/DocStoreAPI';
-import {
- filterAndArrangeTreeByKeys,
- getNestedKeysFromNavigationItems,
-} from '../../../utils/CustomizaNavigation/CustomizeNavigation';
import BrandImage from '../../common/BrandImage/BrandImage';
import './left-sidebar.less';
import { LeftSidebarItem as LeftSidebarItemType } from './LeftSidebar.interface';
@@ -45,21 +38,8 @@ const LeftSidebar = () => {
const { onLogoutHandler } = useApplicationStore();
const [showConfirmLogoutModal, setShowConfirmLogoutModal] = useState(false);
const [isSidebarCollapsed, setIsSidebarCollapsed] = useState(true);
- const { selectedPersona } = useApplicationStore();
-
- const { currentPersonaDocStore, setCurrentPersonaDocStore } =
- useCustomizeStore();
-
- const navigationItems = useMemo(() => {
- return currentPersonaDocStore?.data?.navigation;
- }, [currentPersonaDocStore]);
- const sideBarItems = isEmpty(navigationItems)
- ? leftSidebarClassBase.getSidebarItems()
- : filterAndArrangeTreeByKeys(
- leftSidebarClassBase.getSidebarItems(),
- getNestedKeysFromNavigationItems(navigationItems)
- );
+ const sideBarItems = leftSidebarClassBase.getSidebarItems();
const selectedKeys = useMemo(() => {
const pathArray = location.pathname.split('/');
@@ -78,6 +58,23 @@ const LeftSidebar = () => {
setShowConfirmLogoutModal(false);
};
+ const TOP_SIDEBAR_MENU_ITEMS: MenuProps['items'] = useMemo(() => {
+ return [
+ ...sideBarItems.map((item) => {
+ return {
+ key: item.key,
+ label: {
{
- return {
- key: item.key,
- label:
-
{title}
+
{label}
{isBeta && (
{title}
+ {label}
);
};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.test.tsx
index d298dcaca2cb..dae6a2919924 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.test.tsx
@@ -48,9 +48,7 @@ describe('PersonaDetailsCard Component', () => {
});
expect(
- await screen.findByTestId(
- `persona-details-card-${personaWithDescription.name}`
- )
+ await screen.findByTestId('persona-details-card')
).toBeInTheDocument();
});
@@ -83,7 +81,7 @@ describe('PersonaDetailsCard Component', () => {
userEvent.click(personaCardTitle);
});
- expect(mockPush).toHaveBeenCalledWith('/settings/persona/john-doe');
+ expect(mockPush).toHaveBeenCalledWith('/settings/members/persona/john-doe');
});
it('should not navigate when persona.fullyQualifiedName is missing', async () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx
index e6153d7f14d2..adaa39a25b7b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx
@@ -37,7 +37,7 @@ export const PersonaDetailsCard = ({ persona }: PersonaDetailsCardProps) => {
{
- const history = useHistory();
- const { fqn: personaFQN } = useFqn();
-
- const [items, setItems] = React.useState(categories);
-
- const handleCustomizeItemClick = (category: string) => {
- const nestedItems = getCustomizePageOptions(category);
-
- if (isEmpty(nestedItems)) {
- history.push(getCustomizePagePath(personaFQN, category));
- } else {
- setItems(nestedItems);
- }
- };
-
- return (
-
- {items.map((value) => (
-
- );
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/ExtensionTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/ExtensionTable.tsx
index 374bc4549cf2..ebe0a1ed6d40 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/ExtensionTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/ExtensionTable.tsx
@@ -12,7 +12,6 @@
*/
import { Table, Typography } from 'antd';
import { ColumnsType } from 'antd/lib/table';
-import classNames from 'classnames';
import { isObject, isString, map } from 'lodash';
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
@@ -29,10 +28,8 @@ interface ExtensionDataSource {
export const ExtensionTable = ({
extension,
- tableClassName,
}: {
extension: ExtentionEntities[ExtentionEntitiesKeys]['extension'];
- tableClassName?: string;
}) => {
const { t } = useTranslation();
const dataSource: ExtensionDataSource[] = useMemo(() => {
@@ -72,7 +69,7 @@ export const ExtensionTable = ({
return (
{
- index: React.Key;
- moveNode: (dragIndex: React.Key, hoverIndex: React.Key) => void;
-}
-
-export const DraggableTabNode = ({
- index,
- children,
- moveNode,
-}: DraggableTabPaneProps) => {
- const ref = useRef(null);
- const [{ isOver, dropClassName }, drop] = useDrop({
- accept: type,
- collect: (monitor) => {
- const { index: dragIndex } = monitor.getItem<{ index: string }>() || {};
- if (dragIndex === index) {
- return {};
- }
-
- return {
- isOver: monitor.isOver(),
- dropClassName: 'dropping',
- };
- },
- drop: (item: { index: React.Key }) => {
- moveNode(item.index, index);
- },
- });
- const [, drag] = useDrag({
- type,
- item: { index },
- collect: (monitor) => ({
- isDragging: monitor.isDragging(),
- }),
- });
- drop(drag(ref));
-
- return (
-
- {children}
-
- );
-};
-
-export const DraggableTabs: React.FC<
- TabsProps & { onTabChange?: (newKeys: React.Key[]) => void }
-> = (props) => {
- const { items = [] } = props;
- const [order, setOrder] = useState([]);
-
- const moveTabNode = (dragKey: React.Key, hoverKey: React.Key) => {
- const newOrder = order.slice();
-
- items.forEach((item) => {
- if (item.key && newOrder.indexOf(item.key) === -1) {
- newOrder.push(item.key);
- }
- });
-
- const dragIndex = newOrder.indexOf(dragKey);
- const hoverIndex = newOrder.indexOf(hoverKey);
-
- newOrder.splice(dragIndex, 1);
- newOrder.splice(hoverIndex, 0, dragKey);
-
- props.onTabChange?.(newOrder);
- setOrder(newOrder);
- };
-
- const renderTabBar: TabsProps['renderTabBar'] = (
- tabBarProps,
- DefaultTabBar
- ) => (
-
- {(node) => (
-
- {node}
-
- )}
-
- );
-
- const orderItems = sortTabs(items, order as string[]);
-
- return (
-
-
- );
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/CustomizeWidgets.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/CustomizeWidgets.constants.ts
deleted file mode 100644
index 233d4e00a9d5..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/constants/CustomizeWidgets.constants.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2024 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { WidgetWidths } from '../enums/CustomizablePage.enum';
-import {
- DetailPageWidgetKeys,
- GlossaryTermDetailPageWidgetKeys,
-} from '../enums/CustomizeDetailPage.enum';
-import i18n from '../utils/i18next/LocalUtil';
-
-export type GridSizes = keyof typeof WidgetWidths;
-export interface CommonWidgetType {
- fullyQualifiedName: string;
- name: string;
- description?: string;
- data: {
- gridSizes: Array;
- };
-}
-
-export const DESCRIPTION_WIDGET: CommonWidgetType = {
- fullyQualifiedName: DetailPageWidgetKeys.DESCRIPTION,
- name: i18n.t('label.description'),
- data: {
- gridSizes: ['small', 'large'],
- },
-};
-
-export const TAGS_WIDGET: CommonWidgetType = {
- fullyQualifiedName: DetailPageWidgetKeys.TAGS,
- name: i18n.t('label.tag-plural'),
- data: { gridSizes: ['small'] },
-};
-
-export const GLOSSARY_TERMS_WIDGET: CommonWidgetType = {
- fullyQualifiedName: DetailPageWidgetKeys.GLOSSARY_TERMS,
- name: i18n.t('label.tag-plural'),
- data: { gridSizes: ['small'] },
-};
-
-export const CUSTOM_PROPERTIES_WIDGET: CommonWidgetType = {
- fullyQualifiedName: DetailPageWidgetKeys.CUSTOM_PROPERTIES,
- name: i18n.t('label.custom-property-plural'),
- data: { gridSizes: ['small'] },
-};
-
-export const DOMAIN_WIDGET: CommonWidgetType = {
- fullyQualifiedName: GlossaryTermDetailPageWidgetKeys.DOMAIN,
- name: i18n.t('label.domain'),
- data: { gridSizes: ['small'] },
-};
-
-export const OWNER_WIDGET: CommonWidgetType = {
- fullyQualifiedName: GlossaryTermDetailPageWidgetKeys.OWNER,
- name: i18n.t('label.owner'),
- data: { gridSizes: ['small'] },
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/GlobalSettings.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/GlobalSettings.constants.ts
index 2ba84c2ba0f1..04326e552960 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/GlobalSettings.constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/GlobalSettings.constants.ts
@@ -22,7 +22,6 @@ export enum GlobalSettingsMenuCategory {
SERVICES = 'services',
BOTS = 'bots',
APPLICATIONS = 'apps',
- PERSONA = 'persona',
}
export enum GlobalSettingOptions {
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/LeftSidebar.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/LeftSidebar.constants.ts
index 63bca174bc00..532be8e0af09 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/LeftSidebar.constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/LeftSidebar.constants.ts
@@ -38,34 +38,34 @@ export const SIDEBAR_NESTED_KEYS = {
export const SIDEBAR_LIST: Array = [
{
key: ROUTES.EXPLORE,
- title: i18next.t('label.explore'),
+ label: i18next.t('label.explore'),
redirect_url: ROUTES.EXPLORE,
icon: ExploreIcon,
dataTestId: `app-bar-item-${SidebarItem.EXPLORE}`,
},
{
key: ROUTES.OBSERVABILITY,
- title: i18next.t('label.observability'),
+ label: i18next.t('label.observability'),
icon: ObservabilityIcon,
dataTestId: SidebarItem.OBSERVABILITY,
children: [
{
key: ROUTES.DATA_QUALITY,
- title: i18next.t('label.data-quality'),
+ label: i18next.t('label.data-quality'),
redirect_url: ROUTES.DATA_QUALITY,
icon: DataQualityIcon,
dataTestId: `app-bar-item-${SidebarItem.DATA_QUALITY}`,
},
{
key: ROUTES.INCIDENT_MANAGER,
- title: i18next.t('label.incident-manager'),
+ label: i18next.t('label.incident-manager'),
redirect_url: ROUTES.INCIDENT_MANAGER,
icon: IncidentMangerIcon,
dataTestId: `app-bar-item-${SidebarItem.INCIDENT_MANAGER}`,
},
{
key: ROUTES.OBSERVABILITY_ALERTS,
- title: i18next.t('label.alert-plural'),
+ label: i18next.t('label.alert-plural'),
redirect_url: ROUTES.OBSERVABILITY_ALERTS,
icon: AlertIcon,
dataTestId: `app-bar-item-${SidebarItem.OBSERVABILITY_ALERT}`,
@@ -74,41 +74,41 @@ export const SIDEBAR_LIST: Array = [
},
{
key: ROUTES.DATA_INSIGHT,
- title: i18next.t('label.insight-plural'),
+ label: i18next.t('label.insight-plural'),
redirect_url: getDataInsightPathWithFqn(),
icon: InsightsIcon,
dataTestId: `app-bar-item-${SidebarItem.DATA_INSIGHT}`,
},
{
key: ROUTES.DOMAIN,
- title: i18next.t('label.domain-plural'),
+ label: i18next.t('label.domain-plural'),
redirect_url: ROUTES.DOMAIN,
icon: DomainsIcon,
dataTestId: `app-bar-item-${SidebarItem.DOMAIN}`,
},
{
key: 'governance',
- title: i18next.t('label.govern'),
+ label: i18next.t('label.govern'),
icon: GovernIcon,
dataTestId: SidebarItem.GOVERNANCE,
children: [
{
key: ROUTES.GLOSSARY,
- title: i18next.t('label.glossary'),
+ label: i18next.t('label.glossary'),
redirect_url: ROUTES.GLOSSARY,
icon: GlossaryIcon,
dataTestId: `app-bar-item-${SidebarItem.GLOSSARY}`,
},
{
key: ROUTES.TAGS,
- title: i18next.t('label.classification'),
+ label: i18next.t('label.classification'),
redirect_url: ROUTES.TAGS,
icon: ClassificationIcon,
dataTestId: `app-bar-item-${SidebarItem.TAGS}`,
},
{
key: ROUTES.METRICS,
- title: i18next.t('label.metric-plural'),
+ label: i18next.t('label.metric-plural'),
redirect_url: ROUTES.METRICS,
icon: MetricIcon,
dataTestId: `app-bar-item-${SidebarItem.METRICS}`,
@@ -119,7 +119,7 @@ export const SIDEBAR_LIST: Array = [
export const SETTING_ITEM = {
key: ROUTES.SETTINGS,
- title: i18next.t('label.setting-plural'),
+ label: i18next.t('label.setting-plural'),
redirect_url: ROUTES.SETTINGS,
icon: SettingsIcon,
dataTestId: `app-bar-item-${SidebarItem.SETTINGS}`,
@@ -127,7 +127,7 @@ export const SETTING_ITEM = {
export const LOGOUT_ITEM = {
key: SidebarItem.LOGOUT,
- title: i18next.t('label.logout'),
+ label: i18next.t('label.logout'),
icon: LogoutIcon,
dataTestId: `app-bar-item-${SidebarItem.LOGOUT}`,
};
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
index 1752e79f02f2..08c93373b05e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
@@ -271,7 +271,7 @@ export const ROUTES = {
SETTINGS_EDIT_CUSTOM_LOGIN_CONFIG: `/settings/OpenMetadata/loginConfiguration/edit-custom-login-configuration`,
- CUSTOMIZE_PAGE: `/customize-page/${PLACEHOLDER_ROUTE_FQN}/:pageFqn`,
+ CUSTOMIZE_PAGE: `/customize-page/:fqn/:pageFqn`,
ADD_CUSTOM_METRIC: `/add-custom-metric/${PLACEHOLDER_DASHBOARD_TYPE}/${PLACEHOLDER_ROUTE_FQN}`,
diff --git a/openmetadata-ui/src/main/resources/ui/src/enums/CustomizeDetailPage.enum.ts b/openmetadata-ui/src/main/resources/ui/src/enums/CustomizeDetailPage.enum.ts
deleted file mode 100644
index ee626b72d07a..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/enums/CustomizeDetailPage.enum.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2024 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-export enum WidgetWidths {
- large = 3,
- medium = 2,
- small = 1,
-}
-
-export enum DetailPageWidgetKeys {
- TABS = 'KnowledgePanel.Tabs',
- HEADER = 'KnowledgePanel.Header',
- ANNOUNCEMENTS = 'KnowledgePanel.Announcements',
- DESCRIPTION = 'KnowledgePanel.Description',
- TABLE_SCHEMA = 'KnowledgePanel.TableSchema',
- TOPIC_SCHEMA = 'KnowledgePanel.TopicSchema',
- FREQUENTLY_JOINED_TABLES = 'KnowledgePanel.FrequentlyJoinedTables',
- DATA_PRODUCTS = 'KnowledgePanel.DataProducts',
- TAGS = 'KnowledgePanel.Tags',
- DOMAIN = 'KnowledgePanel.Domain',
- GLOSSARY_TERMS = 'KnowledgePanel.GlossaryTerms',
- CUSTOM_PROPERTIES = 'KnowledgePanel.CustomProperties',
- EMPTY_WIDGET_PLACEHOLDER = 'ExtraWidget.EmptyWidgetPlaceholder',
-}
-
-export enum GlossaryTermDetailPageWidgetKeys {
- TABS = 'KnowledgePanel.Tabs',
- HEADER = 'KnowledgePanel.Header',
- DESCRIPTION = 'KnowledgePanel.Description',
- TAGS = 'KnowledgePanel.Tags',
- SYNONYMS = 'KnowledgePanel.Synonyms',
- RELATED_TERMS = 'KnowledgePanel.RelatedTerms',
- REFERENCES = 'KnowledgePanel.References',
- OWNER = 'KnowledgePanel.Owner',
- DOMAIN = 'KnowledgePanel.Domain',
- REVIEWER = 'KnowledgePanel.Reviewer',
- CUSTOM_PROPERTIES = 'KnowledgePanel.CustomProperties',
- EMPTY_WIDGET_PLACEHOLDER = 'ExtraWidget.EmptyWidgetPlaceholder',
- TERMS_TABLE = 'KnowledgePanel.TermsTable',
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/enums/entity.enum.ts b/openmetadata-ui/src/main/resources/ui/src/enums/entity.enum.ts
index 6ae69752d416..b265b68462a7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/enums/entity.enum.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/enums/entity.enum.ts
@@ -157,7 +157,6 @@ export enum TabSpecificField {
CUSTOM_PROPERTIES = 'customProperties',
LOCATION = 'location',
RELATED_METRICS = 'relatedMetrics',
- UI_CUSTOMIZATION = 'uiCustomization',
}
export enum FqnPart {
@@ -206,9 +205,6 @@ export enum EntityTabs {
API_ENDPOINT = 'apiEndpoint',
OVERVIEW = 'overview',
INCIDENTS = 'incidents',
- TERMS = 'terms',
- GLOSSARY_TERMS = 'glossary_terms',
- ASSETS = 'assets',
EXPRESSION = 'expression',
}
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
index ba02828eaee9..d9eb209b715a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
@@ -260,7 +260,6 @@
"custom-theme": "Custom Theme",
"customise": "Customise",
"customize-entity": "Customize {{entity}}",
- "customize-ui": "Customize UI",
"dag": "DAG",
"dag-view": "DAG-Ansicht",
"daily-active-users-on-the-platform": "Täglich aktive Benutzer auf der Plattform",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "Gelöschte {{entity}} verbergen",
"history": "History",
"home": "Startseite",
- "homepage": "Homepage",
"hour": "Stunde",
"http-config-source": "HTTP-Konfigurationsquelle",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "Meine Daten",
"name": "Name",
"name-lowercase": "name",
- "navigation": "Navigation",
"need-help": "Need Help",
"new": "Neu",
"new-password": "Neues Passwort",
@@ -1499,7 +1496,7 @@
"custom-properties-description": " Capture custom metadata to enrich your data assets by extending the attributes.",
"custom-property-is-set-to-message": "{{fieldName}} is set to",
"custom-property-name-validation": "Der Name muss mit Kleinbuchstaben beginnen und darf keine Leerzeichen, Unterstriche oder Punkte enthalten.",
- "customize-landing-page-header": "Customize {{pageName}} for Persona \"<0>{{persona}}\"",
+ "customize-landing-page-header": "Customize Landing Page for Persona \"<0>{{persona}}\"",
"customize-open-metadata-description": "Tailor the OpenMetadata UX to suit your organizational and team needs.",
"data-asset-has-been-action-type": "Der Datenvermögenswert wurde {{actionType}}",
"data-insight-alert-destination-description": "Senden Sie E-Mail-Benachrichtigungen an Administratoren oder Teams.",
@@ -1700,7 +1697,6 @@
"no-config-available": "Keine Verbindungskonfigurationen verfügbar.",
"no-config-plural": "No Configs.",
"no-custom-properties-entity": "Derzeit sind keine benutzerdefinierten Eigenschaften für das {{entity}} Data Asset definiert. Um zu erfahren, wie man benutzerdefinierte Eigenschaften hinzufügt, lesen Sie bitte <0>{{docs}}",
- "no-customization-available": "No customization available for this tab",
"no-data": "Keine Daten",
"no-data-assets": "Welcome to OpenMetadata! It looks like no data assets have been added yet. Check out our <0>How to Get Started guide to begin.",
"no-data-available": "Keine Daten verfügbar.",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
index 647cee71acb5..81a40b7d821d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
@@ -260,7 +260,6 @@
"custom-theme": "Custom Theme",
"customise": "Customise",
"customize-entity": "Customize {{entity}}",
- "customize-ui": "Customize UI",
"dag": "Dag",
"dag-view": "DAG view",
"daily-active-users-on-the-platform": "Daily Active Users on the Platform",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "Hide Deleted {{entity}}",
"history": "History",
"home": "Home",
- "homepage": "Homepage",
"hour": "Hour",
"http-config-source": "HTTP Config Source",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "My Data",
"name": "Name",
"name-lowercase": "name",
- "navigation": "Navigation",
"need-help": "Need Help",
"new": "New",
"new-password": "New Password",
@@ -1499,7 +1496,7 @@
"custom-properties-description": " Capture custom metadata to enrich your data assets by extending the attributes.",
"custom-property-is-set-to-message": "{{fieldName}} is set to",
"custom-property-name-validation": "Name must start with lower case with no space, underscore, or dots.",
- "customize-landing-page-header": "Customize {{pageName}} for Persona \"<0>{{persona}}\"",
+ "customize-landing-page-header": "Customize Landing Page for Persona \"<0>{{persona}}\"",
"customize-open-metadata-description": "Tailor the OpenMetadata UX to suit your organizational and team needs.",
"data-asset-has-been-action-type": "Data Asset has been {{actionType}}",
"data-insight-alert-destination-description": "Send email notifications to admins or teams.",
@@ -1700,7 +1697,6 @@
"no-config-available": "No Connection Configs available.",
"no-config-plural": "No Configs.",
"no-custom-properties-entity": "There are currently no Custom Properties defined for the {{entity}} Data Asset. To discover how to add Custom Properties, please refer to <0>{{docs}}",
- "no-customization-available": "No customization available for this tab",
"no-data": "No data",
"no-data-assets": "Welcome to OpenMetadata! It looks like no data assets have been added yet. Check out our <0>How to Get Started guide to begin.",
"no-data-available": "No data available.",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
index a971e536564b..1bf28882a2ca 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
@@ -260,7 +260,6 @@
"custom-theme": "Custom Theme",
"customise": "Personalizar",
"customize-entity": "Personalizar {{entity}}",
- "customize-ui": "Customize UI",
"dag": "DAG",
"dag-view": "Vista DAG",
"daily-active-users-on-the-platform": "Usuarios activos diarios en la plataforma",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "Ocultar {{entity}} eliminados",
"history": "Historia",
"home": "Inicio",
- "homepage": "Homepage",
"hour": "Hora",
"http-config-source": "Fuente de configuración HTTP",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "Mis Datos",
"name": "Nombre",
"name-lowercase": "nombre",
- "navigation": "Navigation",
"need-help": "necesita ayuda",
"new": "Nuevo",
"new-password": "Nueva Contraseña",
@@ -1499,7 +1496,7 @@
"custom-properties-description": "Captura metadatos personalizados para enriquecer tus activos de datos mediante la extensión de los atributos.",
"custom-property-is-set-to-message": "{{fieldName}} is set to",
"custom-property-name-validation": "El nombre debe comenzar con minúsculas sin espacios, guiones bajos o puntos.",
- "customize-landing-page-header": "Customize {{pageName}} for Persona \"<0>{{persona}}\"",
+ "customize-landing-page-header": "Personalizar la página de inicio para la persona \"<0>{{persona}}\"",
"customize-open-metadata-description": "Adapte la experiencia de usuario de OpenMetadata para satisfacer las necesidades de su organización y equipo.",
"data-asset-has-been-action-type": "El activo de datos ha sido {{actionType}}",
"data-insight-alert-destination-description": "Enviar notificaciones por correo electrónico a administradores o equipos.",
@@ -1700,7 +1697,6 @@
"no-config-available": "No hay configuraciones de conexión disponibles.",
"no-config-plural": "No hay configuraciones.",
"no-custom-properties-entity": "Actualmente no hay Propiedades Personalizadas definidas para el Activo de Datos {{entity}}. Para saber cómo añadir Propiedades Personalizadas, consulte <0>{{docs}}.",
- "no-customization-available": "No customization available for this tab",
"no-data": "No hay datos",
"no-data-assets": "Welcome to OpenMetadata! It looks like no data assets have been added yet. Check out our <0>How to Get Started guide to begin.",
"no-data-available": "No hay datos disponibles.",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
index 2951d8e6a600..173272d518b0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
@@ -260,7 +260,6 @@
"custom-theme": "Thème personnalisé",
"customise": "Personnaliser",
"customize-entity": "Personnaliser {{entity}}",
- "customize-ui": "Customize UI",
"dag": "DAG",
"dag-view": "Vue DAG",
"daily-active-users-on-the-platform": "Utilisateurs Actifs Quotidiens sur la Plateforme",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "Masquer les {{entity}} Supprimé·e·s",
"history": "History",
"home": "Accueil",
- "homepage": "Homepage",
"hour": "Heure",
"http-config-source": "Source de Configuration HTTP",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "Mes Données",
"name": "Nom",
"name-lowercase": "nom",
- "navigation": "Navigation",
"need-help": "Need Help",
"new": "Nouveau",
"new-password": "Nouveau mot de passe",
@@ -1499,7 +1496,7 @@
"custom-properties-description": " Capturer des métadonnées personnalisées pour enrichir vos actifs de données en étendant leurs attributs.",
"custom-property-is-set-to-message": "{{fieldName}} est réglé sur",
"custom-property-name-validation": "Le nom doit commencer par une lettre minuscule, sans espace, ni tiret bas ou point.",
- "customize-landing-page-header": "Customize {{pageName}} for Persona \"<0>{{persona}}\"",
+ "customize-landing-page-header": "Personnalisez la page d'accueil pour le Persona \"<0>{{persona}}\"",
"customize-open-metadata-description": "Ajustez l'expérience utilisateur d'OpenMetadata pour répondre à vos besoins d'équipe et d'organisation.",
"data-asset-has-been-action-type": "l'actif de données a été {{actionType}}",
"data-insight-alert-destination-description": "Envoyez des notifications par email aux administrateurs ou aux équipes.",
@@ -1700,7 +1697,6 @@
"no-config-available": "Aucun paramètre de connexion disponible.",
"no-config-plural": "Pas de Configs.",
"no-custom-properties-entity": "Aucune propriété personnalisée n'est actuellement définie pour l'actif de données {{entity}}. Pour découvrir comment ajouter des propriétés personnalisées, veuillez consulter <0>{{docs}}",
- "no-customization-available": "No customization available for this tab",
"no-data": "Aucune donnée",
"no-data-assets": "Bienvenue dans OpenMetadata! Il semble qu'auncun actif de données n'ai encore été ajouté. Consultez le guide <0>How to Get Started pour démarrer.",
"no-data-available": "Aucune donnée disponible",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json
index 97f03731d4ba..262e2fd22bad 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json
@@ -260,7 +260,6 @@
"custom-theme": "Tema personalizado",
"customise": "Personalizar",
"customize-entity": "Personalizar {{entity}}",
- "customize-ui": "Personalizar a interface",
"dag": "DAG",
"dag-view": "Vista de DAG",
"daily-active-users-on-the-platform": "Usuarios activos diarios na plataforma",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "Ocultar {{entity}} eliminado",
"history": "Historial",
"home": "Inicio",
- "homepage": "Homepage",
"hour": "Hora",
"http-config-source": "Fonte de configuración HTTP",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "Os meus datos",
"name": "Nome",
"name-lowercase": "nome",
- "navigation": "Navigation",
"need-help": "Necesitas axuda",
"new": "Novo",
"new-password": "Novo contrasinal",
@@ -1499,7 +1496,7 @@
"custom-properties-description": "Captura metadatos personalizados para enriquecer os teus activos de datos estendendo os atributos.",
"custom-property-is-set-to-message": "{{fieldName}} está configurado para",
"custom-property-name-validation": "O nome debe comezar en minúscula sen espazos, subliñados nin puntos.",
- "customize-landing-page-header": "Customize {{pageName}} for Persona \"<0>{{persona}}\"",
+ "customize-landing-page-header": "Personalizar a páxina de inicio para a persoa \"<0>{{persona}}\"",
"customize-open-metadata-description": "Adapta a experiencia de usuario de OpenMetadata ás necesidades da túa organización e equipo.",
"data-asset-has-been-action-type": "O activo de datos foi {{actionType}}",
"data-insight-alert-destination-description": "Envía notificacións por correo electrónico aos administradores ou equipos.",
@@ -1700,7 +1697,6 @@
"no-config-available": "Non hai configuracións de conexión dispoñibles.",
"no-config-plural": "Non hai configuracións.",
"no-custom-properties-entity": "Actualmente non hai Propiedades Personalizadas definidas para o Activo de Datos {{entity}}. Para descubrir como engadir Propiedades Personalizadas, consulte <0>{{docs}}",
- "no-customization-available": "No customization available for this tab",
"no-data": "Non hai datos",
"no-data-assets": "Benvido a OpenMetadata! Parece que aínda non se engadiron activos de datos. Consulta a nosa guía de <0>Como comezar para iniciar.",
"no-data-available": "Non hai datos dispoñibles.",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json
index 7ee8ad3bb546..f3806c469606 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json
@@ -260,7 +260,6 @@
"custom-theme": "Custom Theme",
"customise": "התאמה אישית",
"customize-entity": "התאם אישית את {{entity}}",
- "customize-ui": "Customize UI",
"dag": "גרף מופע",
"dag-view": "תצוגת גרף מופע",
"daily-active-users-on-the-platform": "משתמשים פעילים יומיים בפלטפורמה",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "הסתר ישות {{entity}} שנמחקה",
"history": "היסטוריה",
"home": "דף הבית",
- "homepage": "Homepage",
"hour": "שעה",
"http-config-source": "מקור תצורת HTTP",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "הנתונים שלי",
"name": "שם",
"name-lowercase": "שם",
- "navigation": "Navigation",
"need-help": "Need Help",
"new": "חדש",
"new-password": "סיסמה חדשה",
@@ -1499,7 +1496,7 @@
"custom-properties-description": " Capture custom metadata to enrich your data assets by extending the attributes.",
"custom-property-is-set-to-message": "{{fieldName}} is set to",
"custom-property-name-validation": "השם חייב להתחיל באות קטנה ללא רווח, קו תחתון או נקודות.",
- "customize-landing-page-header": "Customize {{pageName}} for Persona \"<0>{{persona}}\"",
+ "customize-landing-page-header": "התאמה אישית של עמוד הנחיתה עבור דמות \"<0>{{persona}}\"",
"customize-open-metadata-description": "Tailor the OpenMetadata UX to suit your organizational and team needs.",
"data-asset-has-been-action-type": "נכנס של {{actionType}} נתונים",
"data-insight-alert-destination-description": "שלח התראות בדואר אלקטרוני למנהלים או לצוותים.",
@@ -1700,7 +1697,6 @@
"no-config-available": "אין הגדרות חיבור זמינות.",
"no-config-plural": "אין הגדרות.",
"no-custom-properties-entity": "נכון לעכשיו לא מוגדרות תכונות מותאמות אישית עבור נכס הנתונים {{entity}}. כדי לגלות כיצד להוסיף תכונות מותאמות אישית, נא עיין ב-<0>{{docs}}",
- "no-customization-available": "No customization available for this tab",
"no-data": "אין נתונים",
"no-data-assets": "Welcome to OpenMetadata! It looks like no data assets have been added yet. Check out our <0>How to Get Started guide to begin.",
"no-data-available": "אין נתונים זמינים.",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
index 302afcc124a5..64b360352f1c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
@@ -260,7 +260,6 @@
"custom-theme": "Custom Theme",
"customise": "Customise",
"customize-entity": "Customize {{entity}}",
- "customize-ui": "Customize UI",
"dag": "Dag",
"dag-view": "DAGビュー",
"daily-active-users-on-the-platform": "このプラットフォームのアクティブなユーザー",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "Hide Deleted {{entity}}",
"history": "History",
"home": "ホーム",
- "homepage": "Homepage",
"hour": "時",
"http-config-source": "HTTP Config Source",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "マイデータ",
"name": "名前",
"name-lowercase": "名前",
- "navigation": "Navigation",
"need-help": "Need Help",
"new": "新しい",
"new-password": "新しいパスワード",
@@ -1499,7 +1496,7 @@
"custom-properties-description": " Capture custom metadata to enrich your data assets by extending the attributes.",
"custom-property-is-set-to-message": "{{fieldName}} is set to",
"custom-property-name-validation": "Name must start with lower case with no space, underscore, or dots.",
- "customize-landing-page-header": "Customize {{pageName}} for Persona \"<0>{{persona}}\"",
+ "customize-landing-page-header": "Customize Landing Page for Persona \"<0>{{persona}}\"",
"customize-open-metadata-description": "Tailor the OpenMetadata UX to suit your organizational and team needs.",
"data-asset-has-been-action-type": "データアセットが{{actionType}}されました",
"data-insight-alert-destination-description": "Send email notifications to admins or teams.",
@@ -1700,7 +1697,6 @@
"no-config-available": "利用可能な接続の設定はありません。",
"no-config-plural": "No Configs.",
"no-custom-properties-entity": "現在、{{entity}} データアセットにはカスタムプロパティが定義されていません。カスタムプロパティの追加方法については、<0>{{docs}} を参照してください。",
- "no-customization-available": "No customization available for this tab",
"no-data": "データがありません",
"no-data-assets": "Welcome to OpenMetadata! It looks like no data assets have been added yet. Check out our <0>How to Get Started guide to begin.",
"no-data-available": "利用できるデータがありません",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json
index e85a66c511c4..736db14c8319 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json
@@ -260,7 +260,6 @@
"custom-theme": "Custom Theme",
"customise": "Aanpassen",
"customize-entity": "{{entity}} aanpassen",
- "customize-ui": "Customize UI",
"dag": "Dag",
"dag-view": "DAG-weergave",
"daily-active-users-on-the-platform": "Dagelijks actieve gebruikers op het platform",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "Verwijderde {{entity}} verbergen",
"history": "Geschiedenis",
"home": "Home",
- "homepage": "Homepage",
"hour": "Uur",
"http-config-source": "HTTP Configuratiebron",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "Mijn data",
"name": "Naam",
"name-lowercase": "naam",
- "navigation": "Navigation",
"need-help": "Need Help",
"new": "Nieuw",
"new-password": "Nieuw wachtwoord",
@@ -1499,7 +1496,7 @@
"custom-properties-description": "Leg aangepaste metadata vast om uw data-assets te verrijken door het uitbreiden van de attributen.",
"custom-property-is-set-to-message": "{{fieldName}} is set to",
"custom-property-name-validation": "De naam moet beginnen met een kleine letter zonder spaties, underscores of punten.",
- "customize-landing-page-header": "Customize {{pageName}} for Persona \"<0>{{persona}}\"",
+ "customize-landing-page-header": "Pas de landingspagina aan voor Persona \"<0>{{persona}}\"",
"customize-open-metadata-description": "De OpenMetadata UX aanpassen aan de behoeften van uw organisatie en team.",
"data-asset-has-been-action-type": "Data-asset is {{actionType}}",
"data-insight-alert-destination-description": "Stuur e-mailmeldingen naar beheerders of teams.",
@@ -1700,7 +1697,6 @@
"no-config-available": "Geen connectieconfiguraties beschikbaar.",
"no-config-plural": "Geen configuraties.",
"no-custom-properties-entity": "Er zijn momenteel geen aangepaste eigenschappen gedefinieerd voor het {{entity}} Data Asset. Raadpleeg <0>{{docs}} voor meer informatie over het toevoegen van aangepaste eigenschappen.",
- "no-customization-available": "No customization available for this tab",
"no-data": "Geen data",
"no-data-assets": "Welcome to OpenMetadata! It looks like no data assets have been added yet. Check out our <0>How to Get Started guide to begin.",
"no-data-available": "Geen data beschikbaar.",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json
index dc1eb20ba9b5..5c56d7b58813 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json
@@ -260,7 +260,6 @@
"custom-theme": "تم سفارشی",
"customise": "سفارشیسازی",
"customize-entity": "سفارشیسازی {{entity}}",
- "customize-ui": "Customize UI",
"dag": "دگ",
"dag-view": "نمای دگ",
"daily-active-users-on-the-platform": "کاربران فعال روزانه در پلتفرم",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "مخفی کردن {{entity}} حذف شده",
"history": "تاریخچه",
"home": "خانه",
- "homepage": "Homepage",
"hour": "ساعت",
"http-config-source": "منبع پیکربندی HTTP",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "دادههای من",
"name": "نام",
"name-lowercase": "نام",
- "navigation": "Navigation",
"need-help": "نیاز به کمک",
"new": "جدید",
"new-password": "رمز عبور جدید",
@@ -1499,7 +1496,7 @@
"custom-properties-description": "متادیتای سفارشی را برای غنیسازی داراییهای دادهای خود با افزودن ویژگیهای اضافی ضبط کنید.",
"custom-property-is-set-to-message": "{{fieldName}} به مقدار",
"custom-property-name-validation": "نام باید با حرف کوچک شروع شود و هیچ فاصله، زیرخط یا نقطهای نداشته باشد.",
- "customize-landing-page-header": "Customize {{pageName}} for Persona \"<0>{{persona}}\"",
+ "customize-landing-page-header": "سفارشیسازی صفحه اصلی برای نقش \"<0>{{persona}}\"",
"customize-open-metadata-description": "تجربه کاربری OpenMetadata را برای نیازهای سازمانی و تیمی خود تنظیم کنید.",
"data-asset-has-been-action-type": "دارایی دادهای {{actionType}} شده است",
"data-insight-alert-destination-description": "اعلانهای ایمیلی را به مدیران یا تیمها ارسال کنید.",
@@ -1700,7 +1697,6 @@
"no-config-available": "هیچ پیکربندی اتصالی در دسترس نیست.",
"no-config-plural": "هیچ پیکربندیای وجود ندارد.",
"no-custom-properties-entity": "در حال حاضر هیچ ویژگی سفارشی برای دارایی داده {{entity}} تعریف نشده است. برای یادگیری نحوه افزودن ویژگیهای سفارشی، لطفاً به <0>{{docs}} مراجعه کنید.",
- "no-customization-available": "No customization available for this tab",
"no-data": "بدون داده",
"no-data-assets": "به OpenMetadata خوش آمدید! به نظر میرسد هنوز هیچ دارایی دادهای اضافه نشده است. راهنمای <0>چگونه شروع کنیم را بررسی کنید تا شروع کنید.",
"no-data-available": "بدون داده در دسترس.",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
index affb40ecc1ab..4c4cf535c277 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
@@ -260,7 +260,6 @@
"custom-theme": "Custom Theme",
"customise": "Personalizar",
"customize-entity": "Personalizar {{entity}}",
- "customize-ui": "Customize UI",
"dag": "DAG",
"dag-view": "Visualização DAG",
"daily-active-users-on-the-platform": "Usuários Ativos Diários na Plataforma",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "Ocultar {{entity}} Excluída",
"history": "Histórico",
"home": "Início",
- "homepage": "Homepage",
"hour": "Hora",
"http-config-source": "Fonte de Configuração HTTP",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "Meus Dados",
"name": "Nome",
"name-lowercase": "nome",
- "navigation": "Navigation",
"need-help": "Need Help",
"new": "Novo",
"new-password": "Nova Senha",
@@ -1499,7 +1496,7 @@
"custom-properties-description": " Capture custom metadata to enrich your data assets by extending the attributes.",
"custom-property-is-set-to-message": "{{fieldName}} is set to",
"custom-property-name-validation": "O nome deve começar com letra minúscula sem espaço, sublinhado ou pontos.",
- "customize-landing-page-header": "Customize {{pageName}} for Persona \"<0>{{persona}}\"",
+ "customize-landing-page-header": "Personalize a Página de Entrada para a Persona \"<0>{{persona}}\"",
"customize-open-metadata-description": "Tailor the OpenMetadata UX to suit your organizational and team needs.",
"data-asset-has-been-action-type": "O Ativo de Dados foi {{actionType}}",
"data-insight-alert-destination-description": "Envie notificações por e-mail para administradores ou equipes.",
@@ -1700,7 +1697,6 @@
"no-config-available": "Nenhuma Configuração de Conexão disponível.",
"no-config-plural": "Nenhuma Configuração.",
"no-custom-properties-entity": "Atualmente, não há Propriedades Personalizadas definidas para o Ativo de Dados {{entity}}. Para saber como adicionar Propriedades Personalizadas, consulte <0>{{docs}}.",
- "no-customization-available": "No customization available for this tab",
"no-data": "Sem dados",
"no-data-assets": "Welcome to OpenMetadata! It looks like no data assets have been added yet. Check out our <0>How to Get Started guide to begin.",
"no-data-available": "Nenhum dado disponível.",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json
index 1aae806030dc..9fc8129ca7aa 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json
@@ -260,7 +260,6 @@
"custom-theme": "Custom Theme",
"customise": "Personalizar",
"customize-entity": "Personalizar {{entity}}",
- "customize-ui": "Customize UI",
"dag": "DAG",
"dag-view": "Visualização DAG",
"daily-active-users-on-the-platform": "Utilizadors Ativos Diários na Plataforma",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "Ocultar {{entity}} Excluída",
"history": "Histórico",
"home": "Início",
- "homepage": "Homepage",
"hour": "Hora",
"http-config-source": "Fonte de Configuração HTTP",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "Meus Dados",
"name": "Nome",
"name-lowercase": "nome",
- "navigation": "Navigation",
"need-help": "Need Help",
"new": "Novo",
"new-password": "Nova Senha",
@@ -1700,7 +1697,6 @@
"no-config-available": "Nenhuma Configuração de Conexão disponível.",
"no-config-plural": "Nenhuma Configuração.",
"no-custom-properties-entity": "Atualmente, não existem Propriedades Personalizadas definidas para o Ativo de Dados {{entity}}. Para descobrir como adicionar Propriedades Personalizadas, consulte <0>{{docs}}",
- "no-customization-available": "No customization available for this tab",
"no-data": "Sem dados",
"no-data-assets": "Welcome to OpenMetadata! It looks like no data assets have been added yet. Check out our <0>How to Get Started guide to begin.",
"no-data-available": "Nenhum dado disponível.",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
index 7c66fe72cb72..6c9ac09dc76a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
@@ -260,7 +260,6 @@
"custom-theme": "Custom Theme",
"customise": "Customise",
"customize-entity": "Customize {{entity}}",
- "customize-ui": "Customize UI",
"dag": "Dag",
"dag-view": "Просмотр DAG",
"daily-active-users-on-the-platform": "Количество активных пользователей на платформе",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "Скрыть удаленные {{entity}}",
"history": "History",
"home": "Домой",
- "homepage": "Homepage",
"hour": "Час",
"http-config-source": "Источник конфигурации HTTP",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "Мои данные",
"name": "Наименование",
"name-lowercase": "наименование",
- "navigation": "Navigation",
"need-help": "Need Help",
"new": "Новый",
"new-password": "Новый пароль",
@@ -1499,7 +1496,7 @@
"custom-properties-description": " Capture custom metadata to enrich your data assets by extending the attributes.",
"custom-property-is-set-to-message": "{{fieldName}} is set to",
"custom-property-name-validation": "Имя должно начинаться со строчной буквы без пробелов, подчеркивания и точек.",
- "customize-landing-page-header": "Customize {{pageName}} for Persona \"<0>{{persona}}\"",
+ "customize-landing-page-header": "Customize Landing Page for Persona \"<0>{{persona}}\"",
"customize-open-metadata-description": "Tailor the OpenMetadata UX to suit your organizational and team needs.",
"data-asset-has-been-action-type": "Объект данных был {{actionType}}",
"data-insight-alert-destination-description": "Отправляйте уведомления по электронной почте администраторам или командам.",
@@ -1700,7 +1697,6 @@
"no-config-available": "Нет доступных конфигураций подключения.",
"no-config-plural": "No Configs.",
"no-custom-properties-entity": "В настоящее время для {{entity}} Data Asset не определены пользовательские свойства. Чтобы узнать, как добавить пользовательские свойства, обратитесь к <0>{{docs}}",
- "no-customization-available": "No customization available for this tab",
"no-data": "Нет данных",
"no-data-assets": "Welcome to OpenMetadata! It looks like no data assets have been added yet. Check out our <0>How to Get Started guide to begin.",
"no-data-available": "Данные недоступны.",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json
index 0de47bc325d6..22787ea96f88 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json
@@ -260,7 +260,6 @@
"custom-theme": "ธีมที่กำหนดเอง",
"customise": "ปรับแต่ง",
"customize-entity": "ปรับแต่ง {{entity}}",
- "customize-ui": "ปรับแต่ง UI",
"dag": "Dag",
"dag-view": "มุมมอง DAG",
"daily-active-users-on-the-platform": "ผู้ใช้ที่ใช้งานอยู่รายวันบนแพลตฟอร์ม",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "ซ่อน {{entity}} ที่ถูกลบ",
"history": "ประวัติ",
"home": "หน้าแรก",
- "homepage": "หน้าแรก",
"hour": "ชั่วโมง",
"http-config-source": "แหล่งที่มาของการตั้งค่า HTTP",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "ข้อมูลของฉัน",
"name": "ชื่อ",
"name-lowercase": "ชื่อ",
- "navigation": "การนำทาง",
"need-help": "ต้องการความช่วยเหลือ",
"new": "ใหม่",
"new-password": "รหัสผ่านใหม่",
@@ -1700,7 +1697,6 @@
"no-config-available": "ไม่มีการตั้งค่าการเชื่อมต่อที่สามารถใช้งานได้",
"no-config-plural": "ไม่มีการตั้งค่า",
"no-custom-properties-entity": "ขณะนี้ไม่มีการกำหนดคุณสมบัติเฉพาะสำหรับสินทรัพย์ข้อมูล {{entity}} หากต้องการเรียนรู้วิธีการเพิ่มคุณสมบัติเฉพาะ โปรดดูที่ <0>{{docs}}.",
- "no-customization-available": "ไม่มีการปรับแต่งให้ใช้งานได้สำหรับแท็บนี้",
"no-data": "ไม่มีข้อมูล",
"no-data-assets": "ยินดีต้อนรับสู่ OpenMetadata! ดูเหมือนว่ายังไม่มีสินทรัพย์ข้อมูลถูกเพิ่ม ตรวจสอบเรา <0>วิธีการเริ่มต้นใช้งาน เพื่อเริ่มต้น",
"no-data-available": "ไม่มีข้อมูลที่สามารถใช้งานได้",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
index c59d5059a02b..4bcd4f27a5d1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
@@ -260,7 +260,6 @@
"custom-theme": "自定义主题",
"customise": "自定义",
"customize-entity": "自定义{{entity}}",
- "customize-ui": "Customize UI",
"dag": "DAG",
"dag-view": "DAG 视图",
"daily-active-users-on-the-platform": "平台上的每日活跃用户",
@@ -593,7 +592,6 @@
"hide-deleted-entity": "隐藏已删除的{{entity}}",
"history": "历史",
"home": "主页",
- "homepage": "Homepage",
"hour": "小时",
"http-config-source": "HTTP 配置源",
"http-method": "HTTP Method",
@@ -792,7 +790,6 @@
"my-data": "我的数据",
"name": "名称",
"name-lowercase": "名称",
- "navigation": "Navigation",
"need-help": "Need Help",
"new": "新",
"new-password": "新密码",
@@ -1499,7 +1496,7 @@
"custom-properties-description": " 获取自定义元数据, 通过扩展属性来丰富数据资产",
"custom-property-is-set-to-message": "{{fieldName}}设置为",
"custom-property-name-validation": "命名首字母必须是小写字母不能为空格、下划线或点号",
- "customize-landing-page-header": "Customize {{pageName}} for Persona \"<0>{{persona}}\"",
+ "customize-landing-page-header": "为用户角色\"<0>{{persona}}\"自定义登陆页面",
"customize-open-metadata-description": "自定义 OpenMetadata, 以满足您的组织和团队需求",
"data-asset-has-been-action-type": "数据资产已{{actionType}}",
"data-insight-alert-destination-description": "发送通知邮件给管理员或团队",
@@ -1700,7 +1697,6 @@
"no-config-available": "没有可用的连接配置",
"no-config-plural": "No Configs.",
"no-custom-properties-entity": "当前没有为 {{entity}} 数据资产定义自定义属性。要了解如何添加自定义属性，请参考 <0>{{docs}}",
- "no-customization-available": "No customization available for this tab",
"no-data": "没有数据",
"no-data-assets": "欢迎访问 OpenMetadata! 看起来还没有添加数据资产, 请查看我们的<0>How to Get Started开始指南",
"no-data-available": "没有可用的数据",
diff --git a/openmetadata-ui/src/main/resources/ui/src/mocks/MyDataPage.mock.tsx b/openmetadata-ui/src/main/resources/ui/src/mocks/MyDataPage.mock.tsx
index bacc213dd97c..f500c9e666d4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/mocks/MyDataPage.mock.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/mocks/MyDataPage.mock.tsx
@@ -16,7 +16,6 @@ import { LandingPageWidgetKeys } from '../enums/CustomizablePage.enum';
import { Document } from '../generated/entity/docStore/document';
import { Thread, ThreadType } from '../generated/entity/feed/thread';
import { User } from '../generated/entity/teams/user';
-import { PageType } from '../generated/system/ui/page';
import { Paging } from '../generated/type/paging';
import { WidgetConfig } from '../pages/CustomizablePage/CustomizablePage.interface';
@@ -134,12 +133,9 @@ export const mockDocumentData: Document = {
fullyQualifiedName: `persona.${mockPersonaName}.Page.LandingPage`,
entityType: 'Page',
data: {
- pages: [
- {
- pageType: PageType.LandingPage,
- layout: mockCustomizedLayout,
- },
- ],
+ page: {
+ layout: mockCustomizedLayout,
+ },
},
};
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.test.tsx
index 791cdd6491cd..5d682931c0cc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.test.tsx
@@ -12,10 +12,13 @@
*/
import { act, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
import React from 'react';
import { useParams } from 'react-router-dom';
-import { Page, PageType } from '../../generated/system/ui/page';
+import { LandingPageWidgetKeys } from '../../enums/CustomizablePage.enum';
+import { PageType } from '../../generated/system/ui/page';
import {
+ mockCustomizePageClassBase,
mockDocumentData,
mockPersonaDetails,
mockPersonaName,
@@ -57,6 +60,10 @@ jest.mock('../../components/common/Loader/Loader', () => {
return jest.fn().mockImplementation(() => Loader
);
});
+jest.mock('../../utils/CustomizePageClassBase', () => {
+ return mockCustomizePageClassBase;
+});
+
jest.mock('../../rest/DocStoreAPI', () => ({
createDocument: jest
.fn()
@@ -88,33 +95,6 @@ jest.mock('react-router-dom', () => ({
Link: jest.fn().mockImplementation(() => Link
),
}));
-jest.mock('./CustomizeStore', () => ({
- useCustomizeStore: jest.fn().mockImplementation(() => ({
- document: mockDocumentData,
- setDocument: jest.fn(),
- getNavigation: jest.fn(),
- currentPage: {} as Page,
- getPage: jest.fn(),
- setCurrentPageType: jest.fn(),
- })),
-}));
-
-jest.mock(
- '../../components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData',
- () => {
- return jest.fn().mockImplementation(() => CustomizeMyData
);
- }
-);
-
-jest.mock(
- '../../components/MyData/CustomizableComponents/CustomiseGlossaryTermDetailPage/CustomiseGlossaryTermDetailPage',
- () => {
- return jest
- .fn()
- .mockImplementation(() => CustomizeGlossaryTermDetailPage
);
- }
-);
-
describe('CustomizablePage component', () => {
it('CustomizablePage should show ErrorPlaceholder if the API to fetch the persona details fails', async () => {
(getPersonaByName as jest.Mock).mockImplementationOnce(() =>
@@ -134,7 +114,7 @@ describe('CustomizablePage component', () => {
expect(screen.getByText('Loader')).toBeInTheDocument();
expect(screen.queryByText('ErrorPlaceHolder')).toBeNull();
- expect(screen.queryByTestId('CustomizeMyData')).toBeNull();
+ expect(screen.queryByTestId('customize-my-data')).toBeNull();
});
});
@@ -143,8 +123,22 @@ describe('CustomizablePage component', () => {
render(({} as Document);
+ const [editedPage, setEditedPage] = useState({} as Document);
+ const [isLoading, setIsLoading] = useState(false);
+ const [isPersonaLoading, setIsPersonaLoading] = useState(true);
const [personaDetails, setPersonaDetails] = useState();
- const {
- document,
- setDocument,
- getNavigation,
- currentPage,
- getPage,
- setCurrentPageType,
- } = useCustomizeStore();
+ const [saveCurrentPageLayout, setSaveCurrentPageLayout] = useState(false);
- const handlePageCustomizeSave = async (newPage?: Page) => {
- if (!document) {
- return;
- }
- try {
- let response: Document;
- const newDoc = cloneDeep(document);
- const pageData = getPage(pageFqn);
+ const handlePageDataChange = useCallback((newPageData: Document) => {
+ setEditedPage(newPageData);
+ }, []);
- if (pageData) {
- newDoc.data.pages = newPage
- ? newDoc.data?.pages?.map((p: Page) =>
- p.pageType === pageFqn ? newPage : p
- )
- : newDoc.data?.pages.filter((p: Page) => p.pageType !== pageFqn);
- } else {
- newDoc.data = {
- ...newDoc.data,
- pages: [...(newDoc.data.pages ?? []), newPage],
- };
- }
+ const handleSaveCurrentPageLayout = useCallback((value: boolean) => {
+ setSaveCurrentPageLayout(value);
+ }, []);
- if (document.id) {
- const jsonPatch = compare(document, newDoc);
+ const fetchPersonaDetails = useCallback(async () => {
+ try {
+ setIsPersonaLoading(true);
+ const response = await getPersonaByName(decodedPageFQN);
- response = await updateDocument(document.id ?? '', jsonPatch);
- } else {
- response = await createDocument({
- ...newDoc,
- domain: newDoc.domain?.fullyQualifiedName,
- });
+ setPersonaDetails(response);
+ } catch {
+ // No error handling needed
+ // No data placeholder will be shown in case of failure
+ } finally {
+ setIsPersonaLoading(false);
+ }
+ }, [decodedPageFQN]);
+
+ const fetchDocument = async () => {
+ if (!isUndefined(personaDetails)) {
+ const pageLayoutFQN = `${EntityType.PERSONA}.${decodedPageFQN}.${EntityType.PAGE}.${pageFqn}`;
+ try {
+ setIsLoading(true);
+ const pageData = await getDocumentByFQN(pageLayoutFQN);
+
+ setPage(pageData);
+ setEditedPage(pageData);
+ } catch (error) {
+ if ((error as AxiosError).response?.status === ClientErrors.NOT_FOUND) {
+ setPage({
+ name: `${personaDetails.name}-${decodedPageFQN}`,
+ fullyQualifiedName: pageLayoutFQN,
+ entityType: EntityType.PAGE,
+ data: {
+ page: { layout: customizePageClassBase.defaultLayout },
+ },
+ });
+ } else {
+ showErrorToast(error as AxiosError);
+ }
+ } finally {
+ setIsLoading(false);
}
- setDocument(response);
-
- showSuccessToast(
- t('server.page-layout-operation-success', {
- operation: document.id
- ? t('label.updated-lowercase')
- : t('label.created-lowercase'),
- })
- );
- } catch (error) {
- // Error
- showErrorToast(
- t('server.page-layout-operation-error', {
- operation: document.id
- ? t('label.updating-lowercase')
- : t('label.creating-lowercase'),
- })
- );
}
};
- const handleNavigationSave = async (
- uiNavigation: UICustomization['navigation']
- ) => {
- if (!document) {
- return;
- }
+ const handleSave = async () => {
try {
let response: Document;
- const newDoc = cloneDeep(document);
- newDoc.data.navigation = uiNavigation;
+ if (page.id) {
+ const jsonPatch = compare(page, editedPage);
- if (document.id) {
- const jsonPatch = compare(document, newDoc);
-
- response = await updateDocument(document.id ?? '', jsonPatch);
+ response = await updateDocument(page.id ?? '', jsonPatch);
} else {
response = await createDocument({
- ...newDoc,
- domain: newDoc.domain?.fullyQualifiedName,
+ ...editedPage,
+ domain: editedPage.domain?.fullyQualifiedName,
});
}
- setDocument(response);
-
+ setPage(response);
+ setEditedPage(response);
showSuccessToast(
t('server.page-layout-operation-success', {
- operation: document.id
+ operation: page.id
? t('label.updated-lowercase')
: t('label.created-lowercase'),
})
@@ -151,7 +132,7 @@ export const CustomizablePage = () => {
// Error
showErrorToast(
t('server.page-layout-operation-error', {
- operation: document.id
+ operation: page.id
? t('label.updating-lowercase')
: t('label.creating-lowercase'),
})
@@ -159,47 +140,22 @@ export const CustomizablePage = () => {
}
};
- const initializeCustomizeStore = async () => {
- setIsLoading(true);
- const pageLayoutFQN = `${EntityType.PERSONA}.${personaFQN}`;
- try {
- const personaDetails = await getPersonaByName(personaFQN);
- setPersonaDetails(personaDetails);
-
- if (personaDetails) {
- try {
- const pageData = await getDocumentByFQN(pageLayoutFQN);
-
- setDocument(pageData);
- setCurrentPageType(pageFqn as PageType);
- } catch (error) {
- if (
- (error as AxiosError).response?.status === ClientErrors.NOT_FOUND
- ) {
- setDocument({
- name: `${personaDetails.name}-${personaFQN}`,
- fullyQualifiedName: pageLayoutFQN,
- entityType: EntityType.PAGE,
- data: {},
- });
- setCurrentPageType(pageFqn as PageType);
- } else {
- showErrorToast(error as AxiosError);
- }
- }
- }
- } catch (error) {
- showErrorToast(error as AxiosError);
- } finally {
- setIsLoading(false);
+ useEffect(() => {
+ if (saveCurrentPageLayout) {
+ handleSave();
+ setSaveCurrentPageLayout(false);
}
- };
+ }, [saveCurrentPageLayout]);
useEffect(() => {
- initializeCustomizeStore();
- }, []);
+ fetchPersonaDetails();
+ }, [decodedPageFQN, pageFqn]);
+
+ useEffect(() => {
+ fetchDocument();
+ }, [personaDetails]);
- if (isLoading) {
+ if (isLoading || isPersonaLoading) {
return ()((set, get) => ({
- document: null,
- currentPage: null,
- currentPageType: null,
- currentPersonaDocStore: null,
- setDocument: (document: Document) => {
- set({ document });
- },
-
- setPage: (page: Page) => {
- const { document } = get();
- const newDocument = {
- ...document,
- data: {
- ...document?.data,
- pages: document?.data?.pages?.map((p: Page) =>
- p.pageType === page.pageType ? page : p
- ),
- },
- } as Document;
- set({ document: newDocument });
- },
-
- getPage: (pageType: string) => {
- const { document } = get();
-
- return document?.data?.pages?.find((p: Page) => p.pageType === pageType);
- },
-
- getNavigation: () => {
- const { document } = get();
-
- return document?.data?.navigation;
- },
-
- updateCurrentPage: (page: Page) => {
- set({ currentPage: page });
- },
-
- setCurrentPageType: (pageType: PageType) => {
- const { getPage } = get();
-
- set({
- currentPage: getPage(pageType) ?? { pageType },
- currentPageType: pageType,
- });
- },
-
- setCurrentPersonaDocStore: (document: Document) => {
- set({ currentPersonaDocStore: document });
- },
-
- reset: () => {
- set({ document: null, currentPage: null });
- },
-
- resetCurrentPage: () => {
- set({ currentPage: null });
- },
- resetCurrentPersonaDocStore: () => {
- set({ currentPersonaDocStore: null });
- },
-}));
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CustomizeTableDetailPage/CustomizeTableDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CustomizeTableDetailPage/CustomizeTableDetailPage.tsx
deleted file mode 100644
index 080be151a1bc..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/pages/CustomizeTableDetailPage/CustomizeTableDetailPage.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2024 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { noop } from 'lodash';
-import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-import gridBgImg from '../../assets/img/grid-bg-img.png';
-import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component';
-import { CustomizeTabWidget } from '../../components/Glossary/CustomiseWidgets/CustomizeTabWidget/CustomizeTabWidget';
-import { CustomizablePageHeader } from '../../components/MyData/CustomizableComponents/CustomizablePageHeader/CustomizablePageHeader';
-import { CustomizeMyDataProps } from '../../components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface';
-import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1';
-import { OperationPermission } from '../../context/PermissionProvider/PermissionProvider.interface';
-import { EntityType } from '../../enums/entity.enum';
-import { Table } from '../../generated/entity/data/table';
-import { Page, PageType } from '../../generated/system/ui/page';
-import { useGridLayoutDirection } from '../../hooks/useGridLayoutDirection';
-import { getDummyDataByPage } from '../../utils/CustomizePage/CustomizePageUtils';
-import { getEntityName } from '../../utils/EntityUtils';
-import { useCustomizeStore } from '../CustomizablePage/CustomizeStore';
-
-export const CustomizeTableDetailPage = ({
- personaDetails,
- onSaveLayout,
-}: CustomizeMyDataProps) => {
- const { t } = useTranslation();
- const { currentPage, currentPageType } = useCustomizeStore();
-
- const handleReset = useCallback(async () => {
- await onSaveLayout();
- }, [onSaveLayout]);
-
- const handleSave = async () => {
- await onSaveLayout(currentPage ?? ({ pageType: currentPageType } as Page));
- };
-
- const entityDummyData = getDummyDataByPage(
- currentPageType as PageType
- ) as unknown;
-
- // call the hook to set the direction of the grid layout
- useGridLayoutDirection();
-
- const asyncNoop = async () => {
- noop();
- };
-
- return (
-
-
-
-
- );
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.component.tsx
index 2839a2b47274..ab2d3592eb7a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.component.tsx
@@ -279,11 +279,6 @@ const GlossaryPage = () => {
if (isEmpty(jsonPatch)) {
return;
}
-
- const shouldRefreshTerms = jsonPatch.some((patch) =>
- patch.path.startsWith('/owners')
- );
-
try {
const response = await patchGlossaryTerm(activeGlossary?.id, jsonPatch);
if (response) {
@@ -292,7 +287,6 @@ const GlossaryPage = () => {
history.push(getGlossaryPath(response.fullyQualifiedName));
fetchGlossaryList();
}
- shouldRefreshTerms && fetchGlossaryTermDetails();
} else {
throw t('server.entity-updating-error', {
entity: t('label.glossary-term'),
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.component.tsx
index 55565b683804..96e541a15516 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.component.tsx
@@ -33,7 +33,7 @@ import {
import { EntityType } from '../../enums/entity.enum';
import { SearchIndex } from '../../enums/search.enum';
import { Thread } from '../../generated/entity/feed/thread';
-import { Page, PageType } from '../../generated/system/ui/page';
+import { PageType } from '../../generated/system/ui/page';
import { EntityReference } from '../../generated/type/entityReference';
import LimitWrapper from '../../hoc/LimitWrapper';
import { useApplicationStore } from '../../hooks/useApplicationStore';
@@ -42,7 +42,7 @@ import { getDocumentByFQN } from '../../rest/DocStoreAPI';
import { getActiveAnnouncement } from '../../rest/feedsAPI';
import { searchQuery } from '../../rest/searchAPI';
import { getWidgetFromKey } from '../../utils/CustomizableLandingPageUtils';
-import customizePageClassBase from '../../utils/CustomizeMyDataPageClassBase';
+import customizePageClassBase from '../../utils/CustomizePageClassBase';
import { showErrorToast } from '../../utils/ToastUtils';
import { WidgetConfig } from '../CustomizablePage/CustomizablePage.interface';
import './my-data.less';
@@ -78,18 +78,9 @@ const MyDataPage = () => {
try {
setIsLoading(true);
if (!isEmpty(selectedPersona)) {
- const pageFQN = `${EntityType.PERSONA}.${selectedPersona.fullyQualifiedName}`;
- const docData = await getDocumentByFQN(pageFQN);
-
- const pageData = docData.data?.pages?.find(
- (p: Page) => p.pageType === PageType.LandingPage
- ) ?? { layout: [], pageType: PageType.LandingPage };
-
- setLayout(
- isEmpty(pageData.layout)
- ? customizePageClassBase.defaultLayout
- : pageData.layout
- );
+ const pageFQN = `${EntityType.PERSONA}.${selectedPersona.fullyQualifiedName}.${EntityType.PAGE}.${PageType.LandingPage}`;
+ const pageData = await getDocumentByFQN(pageFQN);
+ setLayout(pageData.data.page.layout);
} else {
setLayout(customizePageClassBase.defaultLayout);
}
@@ -223,7 +214,6 @@ const MyDataPage = () => {
{
return jest.fn().mockImplementation(() => Loader
);
});
-jest.mock('../../utils/CustomizeMyDataPageClassBase', () => {
+jest.mock('../../utils/CustomizePageClassBase', () => {
return mockCustomizePageClassBase;
});
jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.test.tsx
index 40a57d7e2aaf..fe70f17845b6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.test.tsx
@@ -17,7 +17,6 @@ import {
waitForElementToBeRemoved,
} from '@testing-library/react';
import React from 'react';
-import { MemoryRouter } from 'react-router-dom';
import { getPersonaByName, updatePersona } from '../../../rest/PersonaAPI';
import { PersonaDetailsPage } from './PersonaDetailsPage';
@@ -150,13 +149,9 @@ jest.mock(
() => jest.fn().mockImplementation(() => EntityHeaderTitle
)
);
-jest.mock('../../../hooks/useCustomLocation/useCustomLocation', () => {
- return jest.fn().mockImplementation(() => ({ pathname: '', hash: '' }));
-});
-
describe('PersonaDetailsPage', () => {
it('Component should render', async () => {
- render( {
}
- onChange={handleTabChange}
/>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.test.tsx
index 4801d246c694..7f1682c942b6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.test.tsx
@@ -89,39 +89,28 @@ jest.mock('../../../rest/PersonaAPI', () => {
describe('PersonaPage', () => {
it('Component should render', async () => {
- await act(async () => {
+ act(() => {
render( {
}
};
- if (isEmpty(persona) && !isLoading) {
- return (
- <>
- {errorPlaceHolder}
- {Boolean(addEditPersona) && (
-
-
+
{
/>
)}
+
{Boolean(addEditPersona) && (
Promise;
- currentNavigation?: NavigationItem[];
-}
-
-export const SettingsNavigationPage = ({
- onSave,
- currentNavigation,
-}: Props) => {
- const { fqn } = useFqn();
- const [isPersonaLoading, setIsPersonaLoading] = useState(true);
- const [personaDetails, setPersonaDetails] = useState(null);
- const { t } = useTranslation();
- const [saving, setSaving] = useState(false);
- const [targetKeys, setTargetKeys] = useState(
- currentNavigation
- ? getNestedKeysFromNavigationItems(currentNavigation)
- : getNestedKeys(sidebarOptions)
- );
-
- const treeData = filterAndArrangeTreeByKeys(
- cloneDeep(sidebarOptions),
- targetKeys
- );
-
- const handleChange = (newTargetKeys: string[]) => {
- setTargetKeys(newTargetKeys);
- };
-
- const titleLinks = useMemo(
- () => [
- {
- name: 'Settings',
- url: '/settings',
- },
- ...(personaDetails
- ? [
- {
- name: getEntityName(personaDetails),
- url: getPersonaDetailsPath(fqn),
- },
- ]
- : []),
- ],
- [personaDetails?.name]
- );
-
- const fetchPersonaDetails = async () => {
- try {
- setIsPersonaLoading(true);
- const persona = await getPersonaByName(fqn);
-
- setPersonaDetails(persona);
- } catch (error) {
- showErrorToast(error as AxiosError);
- } finally {
- setIsPersonaLoading(false);
- }
- };
-
- const handleSave = async () => {
- setSaving(true);
- const navigationItems = getNavigationItems(
- filterAndArrangeTreeByKeys(
- cloneDeep(sidebarOptions),
- targetKeys
- ).filter((t) => !isNil(t))
- );
-
- await onSave(navigationItems);
- setSaving(false);
- };
-
- const onDrop: TreeProps['onDrop'] = (info) => {
- const dropKey = info.node.key;
- const dragKey = info.dragNode.key;
- const dropPos = info.node.pos.split('-');
- const dropPosition =
- info.dropPosition - Number(dropPos[dropPos.length - 1]); // the drop position relative to the drop node, inside 0, top -1, bottom 1
-
- const loop = (
- data: TreeDataNode[],
- key: React.Key,
- callback: (node: TreeDataNode, i: number, data: TreeDataNode[]) => void
- ) => {
- for (let i = 0; i < data.length; i++) {
- if (data[i].key === key) {
- return callback(data[i], i, data);
- }
- if (data[i].children) {
- loop(data[i].children!, key, callback);
- }
- }
- };
- const tempData = cloneDeep(treeData);
-
- // Find dragObject
- let dragObj: TreeDataNode;
- loop(tempData, dragKey, (item, index, arr) => {
- arr.splice(index, 1);
- dragObj = item;
- });
-
- if (!info.dropToGap) {
- // Drop on the content
- loop(tempData, dropKey, (item) => {
- item.children = item.children || [];
- // where to insert. New item was inserted to the start of the array in this example, but can be anywhere
- item.children.unshift(dragObj);
- });
- } else {
- let ar: TreeDataNode[] = [];
- let i: number;
- loop(tempData, dropKey, (_item, index, arr) => {
- ar = arr;
- i = index;
- });
- if (dropPosition === -1) {
- // Drop on the top of the drop node
- ar.splice(i!, 0, dragObj!);
- } else {
- // Drop on the bottom of the drop node
- ar.splice(i! + 1, 0, dragObj!);
- }
- }
-
- handleChange(getNestedKeys(tempData));
- };
-
- const handleRemove = (key: string) => {
- setTargetKeys(targetKeys.filter((k) => k !== key));
- };
-
- const switcherIcon = useCallback(({ expanded }) => {
- return expanded ?
- {node.title}{' '}
- handleRemove(node.key as string)}
- />
-
- );
-
- useEffect(() => {
- fetchPersonaDetails();
- }, [fqn]);
-
- if (isPersonaLoading) {
- return
-
-
- {t('label.save')}
-
-
- {t('label.reset')}
-
-
-
-
- );
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx
index 57de014c90fb..45527f49cf99 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx
@@ -61,7 +61,11 @@ import {
} from '../../enums/entity.enum';
import { CreateThread } from '../../generated/api/feed/createThread';
import { Tag } from '../../generated/entity/classification/tag';
-import { Table, TableType } from '../../generated/entity/data/table';
+import {
+ JoinedWith,
+ Table,
+ TableType,
+} from '../../generated/entity/data/table';
import { Suggestion } from '../../generated/entity/feed/suggestion';
import { ThreadType } from '../../generated/entity/feed/thread';
import { TestSummary } from '../../generated/tests/testCase';
@@ -87,6 +91,7 @@ import {
addToRecentViewed,
getFeedCounts,
getPartialNameFromTableFQN,
+ getTableFQNFromColumnFQN,
sortTagsCaseInsensitive,
} from '../../utils/CommonUtils';
import { defaultFields } from '../../utils/DatasetDetailsUtils';
@@ -95,11 +100,7 @@ import entityUtilClassBase from '../../utils/EntityUtilClassBase';
import { getEntityName } from '../../utils/EntityUtils';
import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils';
import tableClassBase from '../../utils/TableClassBase';
-import {
- getJoinsFromTableJoins,
- getTagsWithoutTier,
- getTierTags,
-} from '../../utils/TableUtils';
+import { getTagsWithoutTier, getTierTags } from '../../utils/TableUtils';
import { createTagObject, updateTierTag } from '../../utils/TagsUtils';
import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils';
import { useTestCaseStore } from '../IncidentManager/IncidentManagerDetailPage/useTestCase.store';
@@ -308,13 +309,44 @@ const TableDetailsPageV1: React.FC = () => {
const { tags } = tableDetails;
const { joins } = tableDetails ?? {};
+ const tableFQNGrouping = [
+ ...(joins?.columnJoins?.flatMap(
+ (cjs) =>
+ cjs.joinedWith?.map((jw) => ({
+ fullyQualifiedName: getTableFQNFromColumnFQN(
+ jw.fullyQualifiedName
+ ),
+ joinCount: jw.joinCount,
+ })) ?? []
+ ) ?? []),
+ ...(joins?.directTableJoins ?? []),
+ ].reduce(
+ (result, jw) => ({
+ ...result,
+ [jw.fullyQualifiedName]:
+ (result[jw.fullyQualifiedName] ?? 0) + jw.joinCount,
+ }),
+ {} as Record
+ );
return {
...tableDetails,
tier: getTierTags(tags ?? []),
tableTags: getTagsWithoutTier(tags ?? []),
entityName: getEntityName(tableDetails),
- joinedTables: getJoinsFromTableJoins(joins),
+ joinedTables: Object.entries(tableFQNGrouping)
+ .map(
+ ([fullyQualifiedName, joinCount]) => ({
+ fullyQualifiedName,
+ joinCount,
+ name: getPartialNameFromTableFQN(
+ fullyQualifiedName,
+ [FqnPart.Database, FqnPart.Table],
+ FQN_SEPARATOR_CHAR
+ ),
+ })
+ )
+ .sort((a, b) => b.joinCount - a.joinCount),
};
}
diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/PersonaAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/PersonaAPI.ts
index 3637229b85d1..29b2aa23b33d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/rest/PersonaAPI.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/rest/PersonaAPI.ts
@@ -36,12 +36,12 @@ export const getAllPersonas = async (params: GetPersonasParams) => {
return response.data;
};
-export const getPersonaByName = async (fqn: string, fields?: string) => {
+export const getPersonaByName = async (fqn: string) => {
const response = await axiosClient.get(
`${BASE_URL}/name/${getEncodedFqn(fqn)}`,
{
params: {
- fields: fields ?? TabSpecificField.USERS,
+ fields: TabSpecificField.USERS,
},
}
);
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/tree.less b/openmetadata-ui/src/main/resources/ui/src/styles/tree.less
index 80b91f77ed1c..1b71463bfb8e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/tree.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/tree.less
@@ -55,9 +55,7 @@
}
.ant-tree-switcher-icon {
- width: 12px;
- height: 12px;
- color: @grey-4;
+ color: black;
}
.execution-node-container {
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ApplicationRoutesClassBase.test.ts b/openmetadata-ui/src/main/resources/ui/src/utils/ApplicationRoutesClassBase.test.ts
index 927930dc8654..e6d407ab9195 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/ApplicationRoutesClassBase.test.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/ApplicationRoutesClassBase.test.ts
@@ -11,9 +11,13 @@
* limitations under the License.
*/
import { FC } from 'react';
-import AuthenticatedAppRouter from '../components/AppRouter/AuthenticatedAppRouter';
import { ApplicationRoutesClassBase } from './ApplicationRoutesClassBase';
+jest.mock('../components/AppRouter/AuthenticatedAppRouter', () => ({
+ __esModule: true,
+ default: 'AuthenticatedAppRouter',
+}));
+
describe('ApplicationRoutesClassBase', () => {
let applicationRoutesClassBase: ApplicationRoutesClassBase;
@@ -24,6 +28,6 @@ describe('ApplicationRoutesClassBase', () => {
it('should return AuthenticatedAppRouter from getRouteElements', () => {
const result: FC = applicationRoutesClassBase.getRouteElements();
- expect(result).toBe(AuthenticatedAppRouter);
+ expect(result).toBe('AuthenticatedAppRouter');
});
});
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ContainerDetailUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/ContainerDetailUtils.ts
index 656ba18bc230..e47ba8654f5a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/ContainerDetailUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/ContainerDetailUtils.ts
@@ -12,8 +12,7 @@
*/
import { isEmpty, omit } from 'lodash';
import { EntityTags } from 'Models';
-import { DetailPageWidgetKeys } from '../enums/CustomizeDetailPage.enum';
-import { EntityTabs, TabSpecificField } from '../enums/entity.enum';
+import { TabSpecificField } from '../enums/entity.enum';
import { Column, ContainerDataModel } from '../generated/entity/data/container';
import { LabelType, State, TagLabel } from '../generated/type/tagLabel';
@@ -96,72 +95,5 @@ export const updateContainerColumnDescription = (
});
};
-export const getContainerDetailsPageDefaultLayout = (tab: EntityTabs) => {
- switch (tab) {
- case EntityTabs.SCHEMA:
- return [
- {
- h: 2,
- i: DetailPageWidgetKeys.DESCRIPTION,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 8,
- i: DetailPageWidgetKeys.TABLE_SCHEMA,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.FREQUENTLY_JOINED_TABLES,
- w: 2,
- x: 6,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.DATA_PRODUCTS,
- w: 2,
- x: 6,
- y: 1,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.TAGS,
- w: 2,
- x: 6,
- y: 2,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.GLOSSARY_TERMS,
- w: 2,
- x: 6,
- y: 3,
- static: false,
- },
- {
- h: 3,
- i: DetailPageWidgetKeys.CUSTOM_PROPERTIES,
- w: 2,
- x: 6,
- y: 4,
- static: false,
- },
- ];
-
- default:
- return [];
- }
-};
-
// eslint-disable-next-line max-len
export const ContainerFields = `${TabSpecificField.TAGS}, ${TabSpecificField.OWNERS},${TabSpecificField.FOLLOWERS},${TabSpecificField.DATAMODEL}, ${TabSpecificField.DOMAIN},${TabSpecificField.DATA_PRODUCTS}`;
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomiseGlossaryTermPage/CustomizeGlossaryTermPage.ts b/openmetadata-ui/src/main/resources/ui/src/utils/CustomiseGlossaryTermPage/CustomizeGlossaryTermPage.ts
deleted file mode 100644
index bf22e99fe1d2..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomiseGlossaryTermPage/CustomizeGlossaryTermPage.ts
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
- * Copyright 2023 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {
- CustomizeTabWidget,
- CustomizeTabWidgetProps,
-} from '../../components/Glossary/CustomiseWidgets/CustomizeTabWidget/CustomizeTabWidget';
-import { GenericWidget } from '../../components/Glossary/CustomiseWidgets/SynonymsWidget/GenericWidget';
-import GlossaryHeader from '../../components/Glossary/GlossaryHeader/GlossaryHeader.component';
-import { GlossaryHeaderProps } from '../../components/Glossary/GlossaryHeader/GlossaryHeader.interface';
-import { GlossaryHeaderWidget } from '../../components/Glossary/GlossaryHeader/GlossaryHeaderWidget';
-import {
- CommonWidgetType,
- CUSTOM_PROPERTIES_WIDGET,
- DESCRIPTION_WIDGET,
-} from '../../constants/CustomizeWidgets.constants';
-import { GlossaryTermDetailPageWidgetKeys } from '../../enums/CustomizeDetailPage.enum';
-import { EntityTabs } from '../../enums/entity.enum';
-import {
- WidgetCommonProps,
- WidgetConfig,
-} from '../../pages/CustomizablePage/CustomizablePage.interface';
-
-type ComponentMap = {
- [GlossaryTermDetailPageWidgetKeys.HEADER]: {
- component: typeof GlossaryHeader;
- props: GlossaryHeaderProps & WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.TABS]: {
- component: typeof CustomizeTabWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.DESCRIPTION]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.TAGS]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.DOMAIN]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.CUSTOM_PROPERTIES]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.SYNONYMS]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.RELATED_TERMS]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.REFERENCES]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.OWNER]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.REVIEWER]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.EMPTY_WIDGET_PLACEHOLDER]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
-};
-
-class CustomizeGlossaryTermPageClassBase {
- defaultWidgetHeight = 2;
- detailPageWidgetMargin = 16;
- detailPageRowHeight = 100;
- detailPageMaxGridSize = 4;
- defaultLayout: Array = [];
- detailPageWidgetDefaultHeights: Record<
- keyof typeof GlossaryTermDetailPageWidgetKeys,
- number
- >;
- widgets: ComponentMap;
-
- constructor() {
- this.detailPageWidgetDefaultHeights = {
- HEADER: 1,
- DESCRIPTION: 2,
- TAGS: 2,
- DOMAIN: 1,
- CUSTOM_PROPERTIES: 3,
- TABS: 10,
- SYNONYMS: 1,
- RELATED_TERMS: 1,
- REFERENCES: 2,
- OWNER: 1,
- REVIEWER: 1,
- TERMS_TABLE: 1,
- EMPTY_WIDGET_PLACEHOLDER: 3,
- };
-
- this.defaultLayout = [
- {
- h: this.detailPageWidgetDefaultHeights.HEADER,
- i: GlossaryTermDetailPageWidgetKeys.HEADER,
- w: 8,
- x: 0,
- y: 0,
- static: true,
- },
- {
- h: this.detailPageWidgetDefaultHeights.TABS,
- i: GlossaryTermDetailPageWidgetKeys.TABS,
- w: 8,
- x: 0,
- y: 1,
- static: true,
- },
- ];
-
- this.widgets = {
- [GlossaryTermDetailPageWidgetKeys.HEADER]: {
- component: GlossaryHeader,
- props: {} as GlossaryHeaderProps & WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.TABS]: {
- component: CustomizeTabWidget,
- props: {} as CustomizeTabWidgetProps,
- },
- [GlossaryTermDetailPageWidgetKeys.DESCRIPTION]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.TAGS]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.DOMAIN]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.CUSTOM_PROPERTIES]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.SYNONYMS]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.RELATED_TERMS]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.REFERENCES]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.OWNER]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.REVIEWER]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.EMPTY_WIDGET_PLACEHOLDER]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- };
- }
-
- protected updateDefaultLayoutLayout(layout: Array) {
- this.defaultLayout = layout;
- }
-
- protected updateLandingPageWidgetDefaultHeights(obj: Record) {
- this.detailPageWidgetDefaultHeights = obj;
- }
-
- public getKeyFromWidgetName(
- widgetName: string
- ): GlossaryTermDetailPageWidgetKeys {
- switch (widgetName) {
- case 'HEADER':
- return GlossaryTermDetailPageWidgetKeys.HEADER;
- case 'DESCRIPTION':
- return GlossaryTermDetailPageWidgetKeys.DESCRIPTION;
- case 'TAGS':
- return GlossaryTermDetailPageWidgetKeys.TAGS;
- case 'DOMAIN':
- return GlossaryTermDetailPageWidgetKeys.DOMAIN;
- case 'CUSTOM_PROPERTIES':
- return GlossaryTermDetailPageWidgetKeys.CUSTOM_PROPERTIES;
- case 'TABS':
- return GlossaryTermDetailPageWidgetKeys.TABS;
- case 'SYNONYMS':
- return GlossaryTermDetailPageWidgetKeys.SYNONYMS;
- case 'RELATED_TERMS':
- return GlossaryTermDetailPageWidgetKeys.RELATED_TERMS;
- case 'REFERENCES':
- return GlossaryTermDetailPageWidgetKeys.REFERENCES;
- case 'OWNER':
- return GlossaryTermDetailPageWidgetKeys.OWNER;
- case 'REVIEWER':
- return GlossaryTermDetailPageWidgetKeys.REVIEWER;
- default:
- return GlossaryTermDetailPageWidgetKeys.EMPTY_WIDGET_PLACEHOLDER;
- }
- }
-
- /**
- *
- * @param string widgetKey
- * @returns React.FC<
- {
- isEditView?: boolean;
- widgetKey: string;
- handleRemoveWidget?: (widgetKey: string) => void;
- announcements: Thread[];
- followedData: EntityReference[];
- followedDataCount: number;
- isLoadingOwnedData: boolean;
- }
- >
- */
- public getWidgetsFromKey(
- widgetKey: T
- ) {
- if (widgetKey.startsWith(GlossaryTermDetailPageWidgetKeys.HEADER)) {
- return GlossaryHeaderWidget;
- } else if (widgetKey.startsWith(GlossaryTermDetailPageWidgetKeys.TABS)) {
- return CustomizeTabWidget;
- } else {
- return GenericWidget;
- }
- }
-
- public getWidgetHeight(widgetName: string) {
- switch (widgetName) {
- case 'HEADER':
- return this.detailPageWidgetDefaultHeights.HEADER;
- case 'DESCRIPTION':
- return this.detailPageWidgetDefaultHeights.DESCRIPTION;
- case 'TAGS':
- return this.detailPageWidgetDefaultHeights.TAGS;
- case 'DOMAIN':
- return this.detailPageWidgetDefaultHeights.DOMAIN;
- case 'CUSTOM_PROPERTIES':
- return this.detailPageWidgetDefaultHeights.CUSTOM_PROPERTIES;
- case 'TABS':
- return this.detailPageWidgetDefaultHeights.TABS;
- case 'SYNONYMS':
- return this.detailPageWidgetDefaultHeights.SYNONYMS;
- case 'RELATED_TERMS':
- return this.detailPageWidgetDefaultHeights.RELATED_TERMS;
- case 'REFERENCES':
- return this.detailPageWidgetDefaultHeights.REFERENCES;
- case 'OWNER':
- return this.detailPageWidgetDefaultHeights.OWNER;
- case 'REVIEWER':
- return this.detailPageWidgetDefaultHeights.REVIEWER;
-
- default:
- return this.defaultWidgetHeight;
- }
- }
-
- public getDefaultWidgetForTab(tab: EntityTabs) {
- if (tab === EntityTabs.OVERVIEW) {
- return [
- {
- h: this.detailPageWidgetDefaultHeights.DESCRIPTION,
- i: GlossaryTermDetailPageWidgetKeys.DESCRIPTION,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.CUSTOM_PROPERTIES,
- i: GlossaryTermDetailPageWidgetKeys.CUSTOM_PROPERTIES,
- w: 2,
- x: 6,
- y: 7,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.DOMAIN,
- i: GlossaryTermDetailPageWidgetKeys.DOMAIN,
- w: 2,
- x: 6,
- y: 0,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.SYNONYMS,
- i: GlossaryTermDetailPageWidgetKeys.SYNONYMS,
- w: 3,
- x: 0,
- y: 2,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.RELATED_TERMS,
- i: GlossaryTermDetailPageWidgetKeys.RELATED_TERMS,
- w: 3,
- x: 3,
- y: 2,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.REFERENCES,
- i: GlossaryTermDetailPageWidgetKeys.REFERENCES,
- w: 3,
- x: 0,
- y: 3,
- static: false,
- },
-
- {
- h: this.detailPageWidgetDefaultHeights.TAGS,
- i: GlossaryTermDetailPageWidgetKeys.TAGS,
- w: 3,
- x: 3,
- y: 3,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.OWNER,
- i: GlossaryTermDetailPageWidgetKeys.OWNER,
- w: 2,
- x: 6,
- y: 1,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.REVIEWER,
- i: GlossaryTermDetailPageWidgetKeys.REVIEWER,
- w: 2,
- x: 6,
- y: 4,
- static: false,
- },
- ];
- }
-
- return [];
- }
-
- public getCommonWidgetList(): CommonWidgetType[] {
- return [
- DESCRIPTION_WIDGET,
- {
- fullyQualifiedName: GlossaryTermDetailPageWidgetKeys.SYNONYMS,
- name: 'Synonyms',
- data: {
- gridSizes: ['small'],
- },
- },
- {
- fullyQualifiedName: GlossaryTermDetailPageWidgetKeys.RELATED_TERMS,
- name: 'Related Terms',
- data: { gridSizes: ['small'] },
- },
- {
- fullyQualifiedName: GlossaryTermDetailPageWidgetKeys.REFERENCES,
- name: 'References',
- data: { gridSizes: ['small'] },
- },
- {
- fullyQualifiedName: GlossaryTermDetailPageWidgetKeys.REVIEWER,
- name: 'Reviewer',
- data: { gridSizes: ['small'] },
- },
- CUSTOM_PROPERTIES_WIDGET,
- ];
- }
-}
-
-const customizeGlossaryTermPageClassBase =
- new CustomizeGlossaryTermPageClassBase();
-
-export default customizeGlossaryTermPageClassBase;
-export { CustomizeGlossaryTermPageClassBase };
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizaNavigation/CustomizeNavigation.ts b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizaNavigation/CustomizeNavigation.ts
deleted file mode 100644
index a0862d51b781..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizaNavigation/CustomizeNavigation.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2024 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { DataNode } from 'antd/lib/tree';
-import { NavigationItem } from '../../generated/system/ui/uiCustomization';
-
-export const filterAndArrangeTreeByKeys = <
- T extends { key: string | number; children?: T[] }
->(
- tree: T[],
- keys: Array
-): T[] => {
- // Sort nodes according to the keys order
- function sortByKeys(nodeArray: T[]) {
- return nodeArray.sort((a, b) => keys.indexOf(a.key) - keys.indexOf(b.key));
- }
-
- // Helper function to recursively filter and arrange the tree
- function filterAndArrange(node: T) {
- // If the current node's key is in the keys array, process it
- if (keys.includes(node.key)) {
- // If the node has children, we recursively filter and arrange them
- if (node.children && node.children.length > 0) {
- node.children = node.children
- .map(filterAndArrange) // Recursively filter and arrange children
- .filter((t): t is T => t !== null); // Remove any undefined children
-
- // Sort the children according to the order of the keys array
- node.children = sortByKeys(node.children);
- }
-
- return node; // Return the node if it has the required key
- }
-
- return null; // Return null if the key doesn't match
- }
-
- // Apply the filter and arrange function to the entire tree
- let filteredTree = tree
- .map(filterAndArrange)
- .filter((t): t is T => t !== null);
-
- // Sort the filtered tree based on the order of keys at the root level
- filteredTree = sortByKeys(filteredTree);
-
- return filteredTree;
-};
-
-export const getNestedKeys = <
- T extends { key: string | number; children?: T[] }
->(
- data: T[]
-): string[] =>
- data.reduce((acc: string[], item: T): string[] => {
- if (item.children) {
- return [
- ...acc,
- item.key as string,
- ...getNestedKeys(item.children ?? []),
- ];
- }
-
- return [...acc, item.key as string];
- }, [] as string[]);
-
-export const getNavigationItems = (items: DataNode[]): NavigationItem[] =>
- items
- .map((item) =>
- item.children
- ? ({
- id: item.key,
- title: item.title,
- pageId: item.key,
- children: getNavigationItems(item.children),
- } as NavigationItem)
- : ({
- id: item.key,
- title: item.title,
- pageId: item.key,
- } as NavigationItem)
- )
- .filter(Boolean);
-
-export const getNestedKeysFromNavigationItems = (data: NavigationItem[]) =>
- data.reduce((acc: string[], item: NavigationItem): string[] => {
- if (item.children) {
- return [
- ...acc,
- item.id,
- ...getNestedKeysFromNavigationItems(item.children),
- ];
- }
-
- return [...acc, item.id];
- }, [] as string[]);
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.tsx
index 50a4abffbc0b..5adc4fe6769f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.tsx
@@ -32,7 +32,7 @@ import { Document } from '../generated/entity/docStore/document';
import { Thread } from '../generated/entity/feed/thread';
import { EntityReference } from '../generated/entity/type';
import { WidgetConfig } from '../pages/CustomizablePage/CustomizablePage.interface';
-import customizeMyDataPageClassBase from './CustomizeMyDataPageClassBase';
+import customizePageClassBase from './CustomizePageClassBase';
const getNewWidgetPlacement = (
currentLayout: WidgetConfig[],
@@ -58,7 +58,7 @@ const getNewWidgetPlacement = (
// Check if there's enough space to place the new widget on the same row
if (
- customizeMyDataPageClassBase.landingPageMaxGridSize -
+ customizePageClassBase.landingPageMaxGridSize -
(lowestWidgetLayout.x + lowestWidgetLayout.w) >=
widgetWidth
) {
@@ -84,7 +84,7 @@ export const getAddWidgetHandler =
) =>
(currentLayout: Array) => {
const widgetFQN = uniqueId(`${newWidgetData.fullyQualifiedName}-`);
- const widgetHeight = customizeMyDataPageClassBase.getWidgetHeight(
+ const widgetHeight = customizePageClassBase.getWidgetHeight(
newWidgetData.name
);
@@ -265,7 +265,7 @@ export const getWidgetFromKey = ({
);
}
- const Widget = customizeMyDataPageClassBase.getWidgetsFromKey(widgetConfig.i);
+ const Widget = customizePageClassBase.getWidgetsFromKey(widgetConfig.i);
return (
= {
- header: 1,
- description: 6,
- tableSchema: 3,
- topicSchema: 3,
- announcement: 3,
- frequentlyJoinedTables: 3,
- dataProduct: 3,
- tags: 3,
- glossaryTerms: 3,
- customProperty: 3,
- tabs: 1,
- announcements: 3,
- };
-
- announcementWidget: WidgetConfig = {
- h: this.detailPageWidgetDefaultHeights.announcements,
- i: DetailPageWidgetKeys.ANNOUNCEMENTS,
- w: 1,
- x: 3,
- y: 0,
- static: false, // Making announcement widget fixed on top right position
- };
-
- defaultLayout: Array = [
- {
- h: this.detailPageWidgetDefaultHeights.header,
- i: DetailPageWidgetKeys.HEADER,
- w: 4,
- x: 0,
- y: 0,
- static: true,
- },
- {
- h: this.detailPageWidgetDefaultHeights.tabs,
- i: DetailPageWidgetKeys.TABS,
- w: 4,
- x: 0,
- y: 1,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.tableSchema,
- i: DetailPageWidgetKeys.TABLE_SCHEMA,
- w: 1,
- x: 3,
- y: 6,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.dataProduct,
- i: DetailPageWidgetKeys.DATA_PRODUCTS,
- w: 2,
- x: 0,
- y: 9,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.tags,
- i: DetailPageWidgetKeys.TAGS,
- w: 3,
- x: 0,
- y: 6,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.glossaryTerms,
- i: DetailPageWidgetKeys.GLOSSARY_TERMS,
- w: 1,
- x: 3,
- y: 1.5,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.frequentlyJoinedTables,
- i: DetailPageWidgetKeys.GLOSSARY_TERMS,
- w: 1,
- x: 3,
- y: 3,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.customProperty,
- i: DetailPageWidgetKeys.CUSTOM_PROPERTIES,
- w: 1,
- x: 3,
- y: 4.5,
- static: false,
- },
- {
- h: this.detailPageWidgetDefaultHeights.announcement,
- i: DetailPageWidgetKeys.ANNOUNCEMENTS,
- w: 1,
- x: 3,
- y: 0,
- static: true,
- },
- ];
-
- protected updateDefaultLayoutLayout(layout: Array) {
- this.defaultLayout = layout;
- }
-
- protected updateLandingPageWidgetDefaultHeights(obj: Record) {
- this.detailPageWidgetDefaultHeights = obj;
- }
-
- /**
- *
- * @param string widgetKey
- * @returns React.FC<
- {
- isEditView?: boolean;
- widgetKey: string;
- handleRemoveWidget?: (widgetKey: string) => void;
- announcements: Thread[];
- followedData: EntityReference[];
- followedDataCount: number;
- isLoadingOwnedData: boolean;
- }
- >
- */
- public getWidgetsFromKey(_widgetKey: string): FC {
- return GenericWidget;
- }
-
- public getWidgetHeight(widgetName: string) {
- switch (widgetName) {
- case 'ActivityFeed':
- return this.detailPageWidgetDefaultHeights.activityFeed;
- case 'DataAssets':
- return this.detailPageWidgetDefaultHeights.DataAssets;
- case 'Announcements':
- return this.detailPageWidgetDefaultHeights.announcements;
- case 'Following':
- return this.detailPageWidgetDefaultHeights.following;
- case 'RecentlyViewed':
- return this.detailPageWidgetDefaultHeights.recentlyViewed;
- case 'MyData':
- return this.detailPageWidgetDefaultHeights.myData;
- case 'KPI':
- return this.detailPageWidgetDefaultHeights.kpi;
- case 'TotalAssets':
- return this.detailPageWidgetDefaultHeights.totalAssets;
- default:
- return this.defaultWidgetHeight;
- }
- }
-
- public getCommonWidgetList() {
- return [
- DESCRIPTION_WIDGET,
- TAGS_WIDGET,
- DOMAIN_WIDGET,
- OWNER_WIDGET,
- CUSTOM_PROPERTIES_WIDGET,
- ];
- }
-}
-
-const customizeDetailPageClassBase = new CustomizeDetailPageClassBase();
-
-export default customizeDetailPageClassBase;
-export { CustomizeDetailPageClassBase };
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizeGlossaryPage/CustomizeGlossaryPage.ts b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizeGlossaryPage/CustomizeGlossaryPage.ts
deleted file mode 100644
index ced51bdae083..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizeGlossaryPage/CustomizeGlossaryPage.ts
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Copyright 2023 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {
- CustomizeTabWidget,
- CustomizeTabWidgetProps,
-} from '../../components/Glossary/CustomiseWidgets/CustomizeTabWidget/CustomizeTabWidget';
-import { GenericWidget } from '../../components/Glossary/CustomiseWidgets/SynonymsWidget/GenericWidget';
-import GlossaryHeader from '../../components/Glossary/GlossaryHeader/GlossaryHeader.component';
-import { GlossaryHeaderProps } from '../../components/Glossary/GlossaryHeader/GlossaryHeader.interface';
-import { GlossaryHeaderWidget } from '../../components/Glossary/GlossaryHeader/GlossaryHeaderWidget';
-import { GlossaryTermDetailPageWidgetKeys } from '../../enums/CustomizeDetailPage.enum';
-import { EntityTabs } from '../../enums/entity.enum';
-import {
- WidgetCommonProps,
- WidgetConfig,
-} from '../../pages/CustomizablePage/CustomizablePage.interface';
-
-type ComponentMap = {
- [GlossaryTermDetailPageWidgetKeys.HEADER]: {
- component: typeof GlossaryHeader;
- props: GlossaryHeaderProps & WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.TABS]: {
- component: typeof CustomizeTabWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.DESCRIPTION]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.TAGS]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.DOMAIN]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.CUSTOM_PROPERTIES]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.SYNONYMS]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.RELATED_TERMS]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.REFERENCES]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.OWNER]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.REVIEWER]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
- [GlossaryTermDetailPageWidgetKeys.EMPTY_WIDGET_PLACEHOLDER]: {
- component: typeof GenericWidget;
- props: WidgetCommonProps;
- };
-};
-
-class CustomizeGlossaryPageClassBase {
- defaultWidgetHeight = 2;
- detailWidgetMargin = 16;
- rowHeight = 100;
- maxGridSize = 4;
- defaultLayout: Array = [];
- defaultHeights: Record;
- widgets: ComponentMap;
-
- constructor() {
- this.defaultHeights = {
- HEADER: 1,
- DESCRIPTION: 2,
- TAGS: 2,
- DOMAIN: 1,
- CUSTOM_PROPERTIES: 3,
- TABS: 10,
- SYNONYMS: 1,
- RELATED_TERMS: 1,
- REFERENCES: 1,
- OWNER: 1,
- REVIEWER: 1,
- TERMS_TABLE: 6,
- EMPTY_WIDGET_PLACEHOLDER: 3,
- };
-
- this.defaultLayout = [
- {
- h: this.defaultHeights.HEADER,
- i: GlossaryTermDetailPageWidgetKeys.HEADER,
- w: 8,
- x: 0,
- y: 0,
- static: true,
- },
- {
- h: this.defaultHeights.TABS,
- i: GlossaryTermDetailPageWidgetKeys.TABS,
- w: 8,
- x: 0,
- y: 1,
- static: true,
- },
- ];
-
- this.widgets = {
- [GlossaryTermDetailPageWidgetKeys.HEADER]: {
- component: GlossaryHeader,
- props: {} as GlossaryHeaderProps & WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.TABS]: {
- component: CustomizeTabWidget,
- props: {} as CustomizeTabWidgetProps,
- },
- [GlossaryTermDetailPageWidgetKeys.DESCRIPTION]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.TAGS]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.DOMAIN]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.CUSTOM_PROPERTIES]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.SYNONYMS]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.RELATED_TERMS]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.REFERENCES]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.OWNER]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.REVIEWER]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- [GlossaryTermDetailPageWidgetKeys.EMPTY_WIDGET_PLACEHOLDER]: {
- component: GenericWidget,
- props: {} as WidgetCommonProps,
- },
- };
- }
-
- protected updateDefaultLayoutLayout(layout: Array) {
- this.defaultLayout = layout;
- }
-
- protected updateLandingPageWidgetDefaultHeights(obj: Record) {
- this.defaultHeights = obj;
- }
-
- public getKeyFromWidgetName(
- widgetName: string
- ): GlossaryTermDetailPageWidgetKeys {
- switch (widgetName) {
- case 'HEADER':
- return GlossaryTermDetailPageWidgetKeys.HEADER;
- case 'DESCRIPTION':
- return GlossaryTermDetailPageWidgetKeys.DESCRIPTION;
- case 'TAGS':
- return GlossaryTermDetailPageWidgetKeys.TAGS;
- case 'DOMAIN':
- return GlossaryTermDetailPageWidgetKeys.DOMAIN;
- case 'CUSTOM_PROPERTIES':
- return GlossaryTermDetailPageWidgetKeys.CUSTOM_PROPERTIES;
- case 'TABS':
- return GlossaryTermDetailPageWidgetKeys.TABS;
- case 'SYNONYMS':
- return GlossaryTermDetailPageWidgetKeys.SYNONYMS;
- case 'RELATED_TERMS':
- return GlossaryTermDetailPageWidgetKeys.RELATED_TERMS;
- case 'REFERENCES':
- return GlossaryTermDetailPageWidgetKeys.REFERENCES;
- case 'OWNER':
- return GlossaryTermDetailPageWidgetKeys.OWNER;
- case 'REVIEWER':
- return GlossaryTermDetailPageWidgetKeys.REVIEWER;
- default:
- return GlossaryTermDetailPageWidgetKeys.EMPTY_WIDGET_PLACEHOLDER;
- }
- }
-
- /**
- *
- * @param string widgetKey
- * @returns React.FC<
- {
- isEditView?: boolean;
- widgetKey: string;
- handleRemoveWidget?: (widgetKey: string) => void;
- announcements: Thread[];
- followedData: EntityReference[];
- followedDataCount: number;
- isLoadingOwnedData: boolean;
- }
- >
- */
- public getWidgetsFromKey(
- widgetKey: T
- ) {
- if (widgetKey.startsWith(GlossaryTermDetailPageWidgetKeys.HEADER)) {
- return GlossaryHeaderWidget;
- } else if (widgetKey.startsWith(GlossaryTermDetailPageWidgetKeys.TABS)) {
- return CustomizeTabWidget;
- } else {
- return GenericWidget;
- }
- }
-
- public getWidgetHeight(widgetName: string) {
- switch (widgetName) {
- case 'HEADER':
- return this.defaultHeights.HEADER;
- case 'DESCRIPTION':
- return this.defaultHeights.DESCRIPTION;
- case 'TAGS':
- return this.defaultHeights.TAGS;
- case 'DOMAIN':
- return this.defaultHeights.DOMAIN;
- case 'CUSTOM_PROPERTIES':
- return this.defaultHeights.CUSTOM_PROPERTIES;
- case 'TABS':
- return this.defaultHeights.TABS;
- case 'SYNONYMS':
- return this.defaultHeights.SYNONYMS;
- case 'RELATED_TERMS':
- return this.defaultHeights.RELATED_TERMS;
- case 'REFERENCES':
- return this.defaultHeights.REFERENCES;
- case 'OWNER':
- return this.defaultHeights.OWNER;
- case 'REVIEWER':
- return this.defaultHeights.REVIEWER;
- default:
- return this.defaultWidgetHeight;
- }
- }
-
- public getDefaultWidgetForTab(tab: EntityTabs) {
- if (tab === EntityTabs.TERMS) {
- return [
- {
- h: this.defaultHeights.DESCRIPTION,
- i: GlossaryTermDetailPageWidgetKeys.DESCRIPTION,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: this.defaultHeights.TERMS_TABLE,
- i: GlossaryTermDetailPageWidgetKeys.TERMS_TABLE,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: this.defaultHeights.DOMAIN,
- i: GlossaryTermDetailPageWidgetKeys.DOMAIN,
- w: 2,
- x: 6,
- y: 0,
- },
- {
- h: this.defaultHeights.OWNER,
- i: GlossaryTermDetailPageWidgetKeys.OWNER,
- w: 2,
- x: 6,
- y: 1,
- static: false,
- },
-
- {
- h: this.defaultHeights.REVIEWER,
- i: GlossaryTermDetailPageWidgetKeys.REVIEWER,
- w: 2,
- x: 6,
- y: 2,
- static: false,
- },
- {
- h: this.defaultHeights.TAGS,
- i: GlossaryTermDetailPageWidgetKeys.TAGS,
- w: 2,
- x: 6,
- y: 3,
- static: false,
- },
- ];
- }
-
- return [];
- }
-}
-
-const customizeGlossaryPageClassBase = new CustomizeGlossaryPageClassBase();
-
-export default customizeGlossaryPageClassBase;
-export { CustomizeGlossaryPageClassBase };
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePage/CustomizePageUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePage/CustomizePageUtils.ts
deleted file mode 100644
index 31b4498082e0..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePage/CustomizePageUtils.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright 2024 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { TabsProps } from 'antd';
-import {
- CommonWidgetType,
- CUSTOM_PROPERTIES_WIDGET,
- DESCRIPTION_WIDGET,
- DOMAIN_WIDGET,
- GLOSSARY_TERMS_WIDGET,
- TAGS_WIDGET,
-} from '../../constants/CustomizeWidgets.constants';
-import { EntityTabs } from '../../enums/entity.enum';
-import { PageType } from '../../generated/system/ui/page';
-import customizeGlossaryTermPageClassBase from '../CustomiseGlossaryTermPage/CustomizeGlossaryTermPage';
-import customizeDetailPageClassBase from '../CustomizeDetailPage/CustomizeDetailPage';
-import customizeGlossaryPageClassBase from '../CustomizeGlossaryPage/CustomizeGlossaryPage';
-import customizeMyDataPageClassBase from '../CustomizeMyDataPageClassBase';
-import i18n from '../i18next/LocalUtil';
-import tableClassBase from '../TableClassBase';
-
-export const getDefaultLayout = (pageType: string) => {
- switch (pageType) {
- case PageType.GlossaryTerm:
- return customizeGlossaryTermPageClassBase.defaultLayout;
- case PageType.Table:
- return customizeDetailPageClassBase.defaultLayout;
- case PageType.LandingPage:
- default:
- return customizeMyDataPageClassBase.defaultLayout;
- }
-};
-
-export const getGlossaryTermDefaultTabs = () => {
- return [
- {
- id: EntityTabs.OVERVIEW,
- displayName: 'Overview',
- layout: customizeGlossaryTermPageClassBase.getDefaultWidgetForTab(
- EntityTabs.OVERVIEW
- ),
- name: EntityTabs.OVERVIEW,
- editable: true,
- },
- {
- id: EntityTabs.GLOSSARY_TERMS,
- displayName: 'Glossary Terms',
- layout: customizeGlossaryTermPageClassBase.getDefaultWidgetForTab(
- EntityTabs.GLOSSARY_TERMS
- ),
- name: EntityTabs.GLOSSARY_TERMS,
- editable: false,
- },
- {
- id: EntityTabs.ASSETS,
- displayName: 'Assets',
- layout: customizeGlossaryTermPageClassBase.getDefaultWidgetForTab(
- EntityTabs.ASSETS
- ),
- name: EntityTabs.ASSETS,
- editable: false,
- },
- {
- displayName: 'Activity Feeds & Tasks',
- name: EntityTabs.ACTIVITY_FEED,
- id: EntityTabs.ACTIVITY_FEED,
- layout: customizeGlossaryTermPageClassBase.getDefaultWidgetForTab(
- EntityTabs.ACTIVITY_FEED
- ),
- editable: false,
- },
- {
- id: EntityTabs.CUSTOM_PROPERTIES,
- name: EntityTabs.CUSTOM_PROPERTIES,
- displayName: 'Custom Property',
- layout: customizeGlossaryTermPageClassBase.getDefaultWidgetForTab(
- EntityTabs.CUSTOM_PROPERTIES
- ),
- editable: false,
- },
- ];
-};
-
-export const getGlossaryDefaultTabs = () => {
- return [
- {
- id: EntityTabs.TERMS,
- name: EntityTabs.TERMS,
- displayName: 'Terms',
- layout: customizeGlossaryPageClassBase.getDefaultWidgetForTab(
- EntityTabs.TERMS
- ),
- editable: true,
- },
- {
- displayName: 'Activity Feeds & Tasks',
- name: EntityTabs.ACTIVITY_FEED,
- id: EntityTabs.ACTIVITY_FEED,
- layout: customizeGlossaryTermPageClassBase.getDefaultWidgetForTab(
- EntityTabs.ACTIVITY_FEED
- ),
- editable: false,
- },
- ];
-};
-
-export const getTabLabelFromId = (tab: EntityTabs) => {
- switch (tab) {
- case EntityTabs.OVERVIEW:
- return i18n.t('label.overview');
- case EntityTabs.GLOSSARY_TERMS:
- return i18n.t('label.glossary-terms');
- case EntityTabs.ASSETS:
- return i18n.t('label.assets');
- case EntityTabs.ACTIVITY_FEED:
- return i18n.t('label.activity-feed-and-task-plural');
- case EntityTabs.CUSTOM_PROPERTIES:
- return i18n.t('label.custom-property-plural');
- case EntityTabs.TERMS:
- return i18n.t('label.terms');
- case EntityTabs.SCHEMA:
- return i18n.t('label.schema');
- case EntityTabs.SAMPLE_DATA:
- return i18n.t('label.sample-data');
- case EntityTabs.TABLE_QUERIES:
- return i18n.t('label.query-plural');
- case EntityTabs.PROFILER:
- return i18n.t('label.profiler-amp-data-quality');
- case EntityTabs.INCIDENTS:
- return i18n.t('label.incident-plural');
- case EntityTabs.LINEAGE:
- return i18n.t('label.lineage');
- case EntityTabs.VIEW_DEFINITION:
- return i18n.t('label.view-definition');
- case EntityTabs.DBT:
- return i18n.t('label.dbt-lowercase');
- default:
- return '';
- }
-};
-
-const getCustomizeTabObject = (tab: EntityTabs) => ({
- id: tab,
- name: tab,
- displayName: getTabLabelFromId(tab),
- layout: tableClassBase.getDefaultLayout(tab),
- editable: [EntityTabs.SCHEMA, EntityTabs.OVERVIEW, EntityTabs.TERMS].includes(
- tab
- ),
-});
-
-export const getTableDefaultTabs = () => {
- const tabs = tableClassBase
- .getTableDetailPageTabsIds()
- .map(getCustomizeTabObject);
-
- return tabs;
-};
-
-export const getDefaultTabs = (pageType?: string) => {
- switch (pageType) {
- case PageType.GlossaryTerm:
- return getGlossaryTermDefaultTabs();
- case PageType.Glossary:
- return getGlossaryDefaultTabs();
- case PageType.Table:
- return getTableDefaultTabs();
- case PageType.Container:
- default:
- return [
- {
- id: EntityTabs.CUSTOM_PROPERTIES,
- name: EntityTabs.CUSTOM_PROPERTIES,
- displayName: 'Custom Property',
- layout: customizeGlossaryTermPageClassBase.getDefaultWidgetForTab(
- EntityTabs.CUSTOM_PROPERTIES
- ),
- },
- ];
- }
-};
-
-export const getDefaultWidgetForTab = (pageType: PageType, tab: EntityTabs) => {
- switch (pageType) {
- case PageType.GlossaryTerm:
- case PageType.Glossary:
- return customizeGlossaryTermPageClassBase.getDefaultWidgetForTab(tab);
- case PageType.Table:
- return tableClassBase.getDefaultLayout(tab);
- default:
- return [];
- }
-};
-
-export const sortTabs = (tabs: TabsProps['items'], order: string[]) => {
- return [...(tabs ?? [])].sort((a, b) => {
- const orderA = order.indexOf(a.key);
- const orderB = order.indexOf(b.key);
-
- if (orderA !== -1 && orderB !== -1) {
- return orderA - orderB;
- }
- if (orderA !== -1) {
- return -1;
- }
- if (orderB !== -1) {
- return 1;
- }
-
- const ia = tabs?.indexOf(a) ?? 0;
- const ib = tabs?.indexOf(b) ?? 0;
-
- return ia - ib;
- });
-};
-
-export const getCustomizableWidgetByPage = (
- pageType: PageType
-): CommonWidgetType[] => {
- switch (pageType) {
- case PageType.GlossaryTerm:
- case PageType.Glossary:
- return customizeGlossaryTermPageClassBase.getCommonWidgetList();
-
- case PageType.Table:
- return [
- DESCRIPTION_WIDGET,
- CUSTOM_PROPERTIES_WIDGET,
- DOMAIN_WIDGET,
- TAGS_WIDGET,
- GLOSSARY_TERMS_WIDGET,
- ];
- case PageType.LandingPage:
- default:
- return [];
- }
-};
-
-export const getDummyDataByPage = (pageType: PageType) => {
- switch (pageType) {
- case PageType.Table:
- return tableClassBase.getDummyData();
-
- case PageType.LandingPage:
- default:
- return {};
- }
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizeMyDataPageClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePageClassBase.ts
similarity index 97%
rename from openmetadata-ui/src/main/resources/ui/src/utils/CustomizeMyDataPageClassBase.ts
rename to openmetadata-ui/src/main/resources/ui/src/utils/CustomizePageClassBase.ts
index b0920e95f900..528257c0bda5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizeMyDataPageClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePageClassBase.ts
@@ -43,7 +43,7 @@ import {
WidgetConfig,
} from '../pages/CustomizablePage/CustomizablePage.interface';
-class CustomizeMyDataPageClassBase {
+class CustomizePageClassBase {
defaultWidgetHeight = 3;
landingPageWidgetMargin = 16;
landingPageRowHeight = 100;
@@ -246,7 +246,7 @@ class CustomizeMyDataPageClassBase {
}
}
-const customizeMyDataPageClassBase = new CustomizeMyDataPageClassBase();
+const customizePageClassBase = new CustomizePageClassBase();
-export default customizeMyDataPageClassBase;
-export { CustomizeMyDataPageClassBase };
+export default customizePageClassBase;
+export { CustomizePageClassBase };
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/DashboardDetailsUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/DashboardDetailsUtils.ts
index 587248779288..e7971723ffff 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/DashboardDetailsUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/DashboardDetailsUtils.ts
@@ -12,8 +12,7 @@
*/
import { AxiosError } from 'axios';
-import { DetailPageWidgetKeys } from '../enums/CustomizeDetailPage.enum';
-import { EntityTabs, TabSpecificField } from '../enums/entity.enum';
+import { TabSpecificField } from '../enums/entity.enum';
import { Dashboard } from '../generated/entity/data/dashboard';
import { ChartType } from '../pages/DashboardDetailsPage/DashboardDetailsPage.component';
import { getChartById } from '../rest/chartAPI';
@@ -51,139 +50,3 @@ export const fetchCharts = async (charts: Dashboard['charts']) => {
return chartsData;
};
-
-export const getDashboardDetailsPageDefaultLayout = (tab: EntityTabs) => {
- switch (tab) {
- case EntityTabs.SCHEMA:
- return [
- {
- h: 2,
- i: DetailPageWidgetKeys.DESCRIPTION,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 8,
- i: DetailPageWidgetKeys.TABLE_SCHEMA,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.FREQUENTLY_JOINED_TABLES,
- w: 2,
- x: 6,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.DATA_PRODUCTS,
- w: 2,
- x: 6,
- y: 1,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.TAGS,
- w: 2,
- x: 6,
- y: 2,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.GLOSSARY_TERMS,
- w: 2,
- x: 6,
- y: 3,
- static: false,
- },
- {
- h: 3,
- i: DetailPageWidgetKeys.CUSTOM_PROPERTIES,
- w: 2,
- x: 6,
- y: 4,
- static: false,
- },
- ];
-
- default:
- return [];
- }
-};
-
-export const getDashboardDataModelDetailsPageDefaultLayout = (
- tab: EntityTabs
-) => {
- switch (tab) {
- case EntityTabs.SCHEMA:
- return [
- {
- h: 2,
- i: DetailPageWidgetKeys.DESCRIPTION,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 8,
- i: DetailPageWidgetKeys.TABLE_SCHEMA,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.FREQUENTLY_JOINED_TABLES,
- w: 2,
- x: 6,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.DATA_PRODUCTS,
- w: 2,
- x: 6,
- y: 1,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.TAGS,
- w: 2,
- x: 6,
- y: 2,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.GLOSSARY_TERMS,
- w: 2,
- x: 6,
- y: 3,
- static: false,
- },
- {
- h: 3,
- i: DetailPageWidgetKeys.CUSTOM_PROPERTIES,
- w: 2,
- x: 6,
- y: 4,
- static: false,
- },
- ];
-
- default:
- return [];
- }
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Database/Database.util.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/Database/Database.util.tsx
index c7edadfcc32f..f298ff562506 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/Database/Database.util.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/Database/Database.util.tsx
@@ -22,12 +22,7 @@ import {
getEntityDetailsPath,
NO_DATA_PLACEHOLDER,
} from '../../constants/constants';
-import { DetailPageWidgetKeys } from '../../enums/CustomizeDetailPage.enum';
-import {
- EntityTabs,
- EntityType,
- TabSpecificField,
-} from '../../enums/entity.enum';
+import { EntityType, TabSpecificField } from '../../enums/entity.enum';
import { DatabaseSchema } from '../../generated/entity/data/databaseSchema';
import { EntityReference } from '../../generated/entity/type';
import { UsageDetails } from '../../generated/type/entityUsage';
@@ -120,70 +115,3 @@ export const schemaTableColumns: ColumnsType = [
getUsagePercentile(text?.weeklyStats?.percentileRank ?? 0),
},
];
-
-export const getDatabaseDetailsPageDefaultLayout = (tab: EntityTabs) => {
- switch (tab) {
- case EntityTabs.SCHEMA:
- return [
- {
- h: 2,
- i: DetailPageWidgetKeys.DESCRIPTION,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 8,
- i: DetailPageWidgetKeys.TABLE_SCHEMA,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.FREQUENTLY_JOINED_TABLES,
- w: 2,
- x: 6,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.DATA_PRODUCTS,
- w: 2,
- x: 6,
- y: 1,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.TAGS,
- w: 2,
- x: 6,
- y: 2,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.GLOSSARY_TERMS,
- w: 2,
- x: 6,
- y: 3,
- static: false,
- },
- {
- h: 3,
- i: DetailPageWidgetKeys.CUSTOM_PROPERTIES,
- w: 2,
- x: 6,
- y: 4,
- static: false,
- },
- ];
-
- default:
- return [];
- }
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/DatabaseSchemaClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/DatabaseSchemaClassBase.ts
index 5223f5697bf2..d85dae100fb9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/DatabaseSchemaClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/DatabaseSchemaClassBase.ts
@@ -14,7 +14,6 @@ import { EntityTags } from 'Models';
import { PagingHandlerParams } from '../components/common/NextPrevious/NextPrevious.interface';
import { TabProps } from '../components/common/TabsLabel/TabsLabel.interface';
import { OperationPermission } from '../context/PermissionProvider/PermissionProvider.interface';
-import { DetailPageWidgetKeys } from '../enums/CustomizeDetailPage.enum';
import { EntityTabs } from '../enums/entity.enum';
import { DatabaseSchema } from '../generated/entity/data/databaseSchema';
import { Table } from '../generated/entity/data/table';
@@ -65,81 +64,6 @@ class DatabaseSchemaClassBase {
): TabProps[] {
return getDataBaseSchemaPageBaseTabs(databaseSchemaTabData);
}
-
- public getDatabaseSchemaPageTabsIds(): EntityTabs[] {
- return [
- EntityTabs.SCHEMA,
- EntityTabs.ACTIVITY_FEED,
- EntityTabs.CUSTOM_PROPERTIES,
- ];
- }
-
- public getDatabaseSchemaPageDefaultLayout = (tab: EntityTabs) => {
- switch (tab) {
- case EntityTabs.SCHEMA:
- return [
- {
- h: 2,
- i: DetailPageWidgetKeys.DESCRIPTION,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 8,
- i: DetailPageWidgetKeys.TABLE_SCHEMA,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.FREQUENTLY_JOINED_TABLES,
- w: 2,
- x: 6,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.DATA_PRODUCTS,
- w: 2,
- x: 6,
- y: 1,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.TAGS,
- w: 2,
- x: 6,
- y: 2,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.GLOSSARY_TERMS,
- w: 2,
- x: 6,
- y: 3,
- static: false,
- },
- {
- h: 3,
- i: DetailPageWidgetKeys.CUSTOM_PROPERTIES,
- w: 2,
- x: 6,
- y: 4,
- static: false,
- },
- ];
-
- default:
- return [];
- }
- };
}
const databaseSchemaClassBase = new DatabaseSchemaClassBase();
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntityVersionUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/EntityVersionUtils.tsx
index 24a7a6f7eced..e67551d66224 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityVersionUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityVersionUtils.tsx
@@ -46,6 +46,8 @@ import { EntityType, TabSpecificField } from '../enums/entity.enum';
import { EntityChangeOperations } from '../enums/VersionPage.enum';
import { Column as ContainerColumn } from '../generated/entity/data/container';
import { Column as DataModelColumn } from '../generated/entity/data/dashboardDataModel';
+import { Glossary } from '../generated/entity/data/glossary';
+import { GlossaryTerm } from '../generated/entity/data/glossaryTerm';
import { Column as TableColumn } from '../generated/entity/data/table';
import { Field } from '../generated/entity/data/topic';
import {
@@ -606,6 +608,9 @@ export const getCommonExtraInfoForVersionDetails = (
tier?: TagLabel,
domain?: EntityReference
) => {
+ // const { entityRef: ownerRef, entityDisplayName: ownerDisplayName } =
+ // getEntityReferenceDiffFromFieldName('owners', changeDescription, owners);
+
const { owners: ownerRef, ownerDisplayName } = getOwnerDiff(
owners ?? [],
changeDescription
@@ -1029,10 +1034,7 @@ export const getOwnerDiff = (
};
export const getOwnerVersionLabel = (
- entity: {
- [TabSpecificField.OWNERS]?: EntityReference[];
- changeDescription?: ChangeDescription;
- },
+ entity: Glossary | GlossaryTerm,
isVersionView: boolean,
ownerField = TabSpecificField.OWNERS, // Can be owners, experts, reviewers all are OwnerLabels
hasPermission = true
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsClassBase.ts
index be29d9324f39..6cc2bb5c013b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsClassBase.ts
@@ -17,6 +17,7 @@ import { ReactComponent as AdminIcon } from '../assets/svg/admin-colored.svg';
import { ReactComponent as ApplicationIcon } from '../assets/svg/application-colored.svg';
import { ReactComponent as BotIcon } from '../assets/svg/bot-colored.svg';
import { ReactComponent as AppearanceIcon } from '../assets/svg/custom-logo-colored.svg';
+import { ReactComponent as CustomDashboardLogoIcon } from '../assets/svg/customize-landing-page-colored.svg';
import { ReactComponent as DashboardIcon } from '../assets/svg/dashboard-colored.svg';
import { ReactComponent as DatabaseIcon } from '../assets/svg/database-colored.svg';
import { ReactComponent as EmailIcon } from '../assets/svg/email-colored.svg';
@@ -95,10 +96,6 @@ class GlobalSettingsClassBase {
name: t('label.application-plural'),
url: GlobalSettingsMenuCategory.APPLICATIONS,
},
- [GlobalSettingsMenuCategory.PERSONA]: {
- name: t('label.persona'),
- url: GlobalSettingsMenuCategory.PERSONA,
- },
};
protected updateSettingCategories(
@@ -273,6 +270,14 @@ class GlobalSettingsClassBase {
key: `${GlobalSettingsMenuCategory.MEMBERS}.${GlobalSettingOptions.ADMINS}`,
icon: AdminIcon,
},
+
+ {
+ label: t('label.persona-plural'),
+ description: t('message.page-sub-header-for-persona'),
+ isProtected: Boolean(isAdminUser),
+ key: `${GlobalSettingsMenuCategory.MEMBERS}.${GlobalSettingOptions.PERSONA}`,
+ icon: PersonasIcon,
+ },
],
},
{
@@ -310,6 +315,17 @@ class GlobalSettingsClassBase {
key: `${GlobalSettingsMenuCategory.PREFERENCES}.${GlobalSettingOptions.APPEARANCE}`,
icon: AppearanceIcon,
},
+ {
+ label: t('label.customize-entity', {
+ entity: t('label.landing-page'),
+ }),
+ description: t(
+ 'message.page-sub-header-for-customize-landing-page'
+ ),
+ isProtected: Boolean(isAdminUser),
+ key: `${GlobalSettingsMenuCategory.PREFERENCES}.${GlobalSettingOptions.CUSTOMIZE_LANDING_PAGE}`,
+ icon: CustomDashboardLogoIcon,
+ },
{
label: t('label.email'),
description: t('message.email-configuration-message'),
@@ -519,13 +535,6 @@ class GlobalSettingsClassBase {
key: GlobalSettingOptions.BOTS,
icon: BotIcon,
},
- {
- category: t('label.persona-plural'),
- description: t('message.page-sub-header-for-persona'),
- isProtected: Boolean(isAdminUser),
- key: GlobalSettingOptions.PERSONA,
- icon: PersonasIcon,
- },
];
}
}
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/GlossaryTerm/GlossaryTermUtil.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/GlossaryTerm/GlossaryTermUtil.tsx
deleted file mode 100644
index e88986669211..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/utils/GlossaryTerm/GlossaryTermUtil.tsx
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright 2024 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { TabsProps } from 'antd';
-import { isUndefined, uniqueId } from 'lodash';
-import React from 'react';
-import EmptyWidgetPlaceholder from '../../components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder';
-import { SIZE } from '../../enums/common.enum';
-import { LandingPageWidgetKeys } from '../../enums/CustomizablePage.enum';
-import { GlossaryTermDetailPageWidgetKeys } from '../../enums/CustomizeDetailPage.enum';
-import { EntityTabs } from '../../enums/entity.enum';
-import { Document } from '../../generated/entity/docStore/document';
-import { Tab } from '../../generated/system/ui/uiCustomization';
-import { WidgetConfig } from '../../pages/CustomizablePage/CustomizablePage.interface';
-import customizeGlossaryTermPageClassBase from '../CustomiseGlossaryTermPage/CustomizeGlossaryTermPage';
-import { moveEmptyWidgetToTheEnd } from '../CustomizableLandingPageUtils';
-import customizeMyDataPageClassBase from '../CustomizeMyDataPageClassBase';
-import { getEntityName } from '../EntityUtils';
-
-export const getWidgetFromKey = ({
- widgetConfig,
- handleOpenAddWidgetModal,
- handlePlaceholderWidgetKey,
- handleRemoveWidget,
- isEditView,
- iconHeight,
- iconWidth,
-}: {
- widgetConfig: WidgetConfig;
- handleOpenAddWidgetModal?: () => void;
- handlePlaceholderWidgetKey?: (key: string) => void;
- handleRemoveWidget?: (key: string) => void;
- iconHeight?: SIZE;
- iconWidth?: SIZE;
- isEditView?: boolean;
-}) => {
- if (
- widgetConfig.i.endsWith('.EmptyWidgetPlaceholder') &&
- !isUndefined(handleOpenAddWidgetModal) &&
- !isUndefined(handlePlaceholderWidgetKey) &&
- !isUndefined(handleRemoveWidget)
- ) {
- return (
- ) => {
- const widgetFQN = uniqueId(`${newWidgetData.fullyQualifiedName}-`);
- const widgetHeight = customizeMyDataPageClassBase.getWidgetHeight(
- newWidgetData.name
- );
-
- // The widget with key "ExtraWidget.EmptyWidgetPlaceholder" will always remain in the bottom
- // and is not meant to be replaced hence
- // if placeholderWidgetKey is "ExtraWidget.EmptyWidgetPlaceholder"
- // append the new widget in the array
- // else replace the new widget with other placeholder widgets
- if (
- placeholderWidgetKey === LandingPageWidgetKeys.EMPTY_WIDGET_PLACEHOLDER
- ) {
- return [
- ...moveEmptyWidgetToTheEnd(currentLayout),
- {
- w: widgetWidth,
- h: widgetHeight,
- i: widgetFQN,
- static: false,
- ...getNewWidgetPlacement(currentLayout, widgetWidth),
- },
- ];
- } else {
- return currentLayout.map((widget: WidgetConfig) => {
- const widgetX =
- widget.x + widgetWidth <= maxGridSize
- ? widget.x
- : maxGridSize - widgetWidth;
-
- return widget.i === placeholderWidgetKey
- ? {
- ...widget,
- i: widgetFQN,
- h: widgetHeight,
- w: widgetWidth,
- x: widgetX,
- }
- : widget;
- });
- }
- };
-
-export const getGlossaryTermDetailTabs = (
- defaultTabs: TabsProps['items'],
- customizedTabs?: Tab[],
- defaultTabId: EntityTabs = EntityTabs.OVERVIEW
-) => {
- if (!customizedTabs) {
- return defaultTabs;
- }
- const overviewTab = defaultTabs?.find((t) => t.key === defaultTabId);
-
- const newTabs =
- customizedTabs?.map((t) => {
- const tabItemDetails = defaultTabs?.find((i) => i.key === t.id);
-
- return (
- tabItemDetails ?? {
- label: getEntityName(t),
- key: t.id,
- children: overviewTab?.children,
- }
- );
- }) ?? defaultTabs;
-
- return newTabs;
-};
-
-export const getTabLabelMap = (tabs?: Tab[]): Record => {
- const labelMap = {} as Record;
-
- return (
- tabs?.reduce((acc: Record, item) => {
- if (item.id && item.displayName) {
- const tab = item.id as EntityTabs;
- acc[tab] = item.displayName;
- }
-
- return acc;
- }, labelMap) ?? labelMap
- );
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/GlossaryUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/GlossaryUtils.tsx
index c2bfda868435..b95492e8bf39 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/GlossaryUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/GlossaryUtils.tsx
@@ -11,32 +11,18 @@
* limitations under the License.
*/
-import Icon from '@ant-design/icons';
-import { Tag, Tooltip, Typography } from 'antd';
+import { Typography } from 'antd';
import { DefaultOptionType } from 'antd/lib/select';
-import classNames from 'classnames';
import { isEmpty, isUndefined } from 'lodash';
import React from 'react';
-import { ReactComponent as ExternalLinkIcon } from '../assets/svg/external-links.svg';
import { StatusType } from '../components/common/StatusBadge/StatusBadge.interface';
import { ModifiedGlossaryTerm } from '../components/Glossary/GlossaryTermTab/GlossaryTermTab.interface';
import { ModifiedGlossary } from '../components/Glossary/useGlossary.store';
import { FQN_SEPARATOR_CHAR } from '../constants/char.constants';
-import {
- ICON_DIMENSION,
- SUCCESS_COLOR,
- TEXT_BODY_COLOR,
- TEXT_GREY_MUTED,
-} from '../constants/constants';
import { EntityType } from '../enums/entity.enum';
import { Glossary } from '../generated/entity/data/glossary';
-import {
- GlossaryTerm,
- Status,
- TermReference,
-} from '../generated/entity/data/glossaryTerm';
+import { GlossaryTerm, Status } from '../generated/entity/data/glossaryTerm';
import { getEntityName } from './EntityUtils';
-import { VersionStatus } from './EntityVersionUtils.interface';
import Fqn from './Fqn';
import { getGlossaryPath } from './RouterUtils';
@@ -348,49 +334,3 @@ export const filterTreeNodeOptions = (
return filterNodes(options as ModifiedGlossaryTerm[]);
};
-
-export const renderReferenceElement = (
- ref: TermReference,
- versionStatus?: VersionStatus
-) => {
- let iconColor: string;
- let textClassName: string;
- if (versionStatus?.added) {
- iconColor = SUCCESS_COLOR;
- textClassName = 'text-success';
- } else if (versionStatus?.removed) {
- iconColor = TEXT_GREY_MUTED;
- textClassName = 'text-grey-muted';
- } else {
- iconColor = TEXT_BODY_COLOR;
- textClassName = 'text-body';
- }
-
- return (
-
-
-
-
- {ref.name}
-
-
-
-
- );
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/LeftSidebarClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/LeftSidebarClassBase.ts
index 77a6b0f26934..e610d190cc80 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/LeftSidebarClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/LeftSidebarClassBase.ts
@@ -14,21 +14,11 @@ import { LeftSidebarItem } from '../components/MyData/LeftSidebar/LeftSidebar.in
import { SIDEBAR_LIST } from '../constants/LeftSidebar.constants';
class LeftSidebarClassBase {
- sidebarItems: Array;
-
- constructor() {
- this.sidebarItems = SIDEBAR_LIST;
- }
-
/**
* getSidebarItems
*/
public getSidebarItems(): Array {
- return this.sidebarItems;
- }
-
- public setSidebarItems(items: Array): void {
- this.sidebarItems = items;
+ return SIDEBAR_LIST;
}
}
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Persona/PersonaUtils.test.ts b/openmetadata-ui/src/main/resources/ui/src/utils/Persona/PersonaUtils.test.ts
deleted file mode 100644
index 7ada07359838..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/utils/Persona/PersonaUtils.test.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2024 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { PageType } from '../../generated/system/ui/uiCustomization';
-import {
- getCustomizePageCategories,
- getCustomizePageOptions,
-} from './PersonaUtils';
-
-describe('PersonaUtils', () => {
- describe('getCustomizePageCategories', () => {
- it('should return the correct categories', () => {
- const categories = getCustomizePageCategories();
-
- expect(categories).toEqual([
- {
- key: 'navigation',
- label: 'label.navigation',
- description: 'Navigation',
- icon: 'svg-mock',
- },
- {
- key: PageType.LandingPage,
- label: 'label.homepage',
- description: 'Homepage',
- icon: 'svg-mock',
- },
- {
- key: 'governance',
- label: 'label.governance',
- description: 'Governance',
- icon: 'svg-mock',
- },
- {
- key: 'data-assets',
- label: 'label.data-asset-plural',
- description: 'Data assets',
- icon: 'svg-mock',
- },
- ]);
- });
- });
-
- describe('getCustomizePageOptions', () => {
- it('should return the correct options for governance category', () => {
- const options = getCustomizePageOptions('governance');
-
- expect(options).toEqual([
- {
- key: PageType.Domain,
- label: 'Domain',
- description: PageType.Domain,
- icon: 'svg-mock',
- },
- {
- key: PageType.Glossary,
- label: 'Glossary',
- description: PageType.Glossary,
- icon: 'svg-mock',
- },
- {
- key: PageType.GlossaryTerm,
- label: 'Glossary Term',
- description: PageType.GlossaryTerm,
- icon: 'svg-mock',
- },
- ]);
- });
-
- it('should return the correct options for data-assets category', () => {
- const options = getCustomizePageOptions('data-assets');
-
- expect(options).toEqual(
- expect.arrayContaining([
- {
- key: PageType.Dashboard,
- label: 'Dashboard',
- description: PageType.Dashboard,
- icon: 'svg-mock',
- },
- {
- key: PageType.Database,
- label: 'Database',
- description: PageType.Database,
- icon: 'svg-mock',
- },
- {
- key: PageType.Pipeline,
- label: 'Pipeline',
- description: PageType.Pipeline,
- icon: 'svg-mock',
- },
- {
- key: PageType.Table,
- label: 'Table',
- description: PageType.Table,
- icon: 'svg-mock',
- },
- {
- key: PageType.Container,
- label: 'Container',
- description: PageType.Container,
- icon: 'svg-mock',
- },
- ])
- );
- });
-
- it('should return an empty array for an unknown category', () => {
- const options = getCustomizePageOptions('unknown-category');
-
- expect(options).toEqual([]);
- });
- });
-});
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Persona/PersonaUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/Persona/PersonaUtils.ts
deleted file mode 100644
index c795e521d1ad..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/utils/Persona/PersonaUtils.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2024 Collate.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { camelCase, map, startCase } from 'lodash';
-import { ReactComponent as DashboardIcon } from '../../assets/svg/dashboard-colored.svg';
-import { ReactComponent as DataAssetsIcon } from '../../assets/svg/data-assets.svg';
-import { ReactComponent as DatabaseIcon } from '../../assets/svg/database-colored.svg';
-import { ReactComponent as GlossaryIcon } from '../../assets/svg/glossary-colored.svg';
-import { ReactComponent as GovernIcon } from '../../assets/svg/governance.svg';
-import { ReactComponent as HomepageIcon } from '../../assets/svg/homepage.svg';
-import { ReactComponent as DashboardDataModelIcon } from '../../assets/svg/ic-dashboard-data-model-colored.svg';
-import { ReactComponent as SchemaIcon } from '../../assets/svg/ic-database-schema-colored.svg';
-import { ReactComponent as MessagingIcon } from '../../assets/svg/messaging-colored.svg';
-import { ReactComponent as NavigationIcon } from '../../assets/svg/navigation.svg';
-import { ReactComponent as PipelineIcon } from '../../assets/svg/pipeline-colored.svg';
-import { ReactComponent as SearchIcon } from '../../assets/svg/search-colored.svg';
-import { ReactComponent as StorageIcon } from '../../assets/svg/storage-colored.svg';
-import { ReactComponent as StoredProcedureIcon } from '../../assets/svg/stored-procedure-colored.svg';
-import { ReactComponent as TableIcon } from '../../assets/svg/table-colored.svg';
-
-import { EntityType } from '../../enums/entity.enum';
-import { PageType } from '../../generated/system/ui/uiCustomization';
-import { SettingMenuItem } from '../GlobalSettingsUtils';
-import i18n from '../i18next/LocalUtil';
-
-const ENTITY_ICONS: Record = {
- [EntityType.TABLE]: TableIcon,
- [EntityType.CONTAINER]: StorageIcon,
- [EntityType.DASHBOARD]: DashboardIcon,
- [EntityType.DASHBOARD_DATA_MODEL]: DashboardDataModelIcon,
- [EntityType.DATABASE]: DatabaseIcon,
- [EntityType.DATABASE_SCHEMA]: SchemaIcon,
- [EntityType.DOMAIN]: SchemaIcon,
- [EntityType.GLOSSARY]: GlossaryIcon,
- [EntityType.GLOSSARY_TERM]: GlossaryIcon,
- [EntityType.PIPELINE]: PipelineIcon,
- [EntityType.SEARCH_INDEX]: SearchIcon,
- [EntityType.STORED_PROCEDURE]: StoredProcedureIcon,
- [EntityType.TOPIC]: MessagingIcon,
- [EntityType.GOVERN]: GovernIcon,
- ['dataAssets']: DataAssetsIcon,
- ['homepage']: HomepageIcon,
- ['navigation']: NavigationIcon,
- ['governance']: GovernIcon,
- [PageType.LandingPage]: MessagingIcon,
-};
-
-export const getCustomizePageCategories = (): SettingMenuItem[] => {
- return [
- {
- key: 'navigation',
- label: i18n.t('label.navigation'),
- description: 'Navigation',
- icon: ENTITY_ICONS[camelCase('Navigation')],
- },
- {
- key: PageType.LandingPage,
- label: i18n.t('label.homepage'),
- description: 'Homepage',
- icon: ENTITY_ICONS[camelCase('Homepage')],
- },
- {
- key: 'governance',
- label: i18n.t('label.governance'),
- description: 'Governance',
- icon: ENTITY_ICONS[camelCase('GOVERN')],
- },
- {
- key: 'data-assets',
- label: i18n.t('label.data-asset-plural'),
- description: 'Data assets',
- icon: ENTITY_ICONS[camelCase('data-assets')],
- },
- ];
-};
-
-const generateSettingItems = (pageType: PageType): SettingMenuItem => ({
- key: pageType,
- label: startCase(pageType),
- description: pageType,
- icon: ENTITY_ICONS[camelCase(pageType)],
-});
-
-export const getCustomizePageOptions = (
- category: string
-): SettingMenuItem[] => {
- const list = map(PageType);
-
- switch (category) {
- case 'governance':
- return list.reduce((acc, item) => {
- if (
- [PageType.Glossary, PageType.GlossaryTerm, PageType.Domain].includes(
- item
- )
- ) {
- acc.push(generateSettingItems(item));
- }
-
- return acc;
- }, [] as SettingMenuItem[]);
- case 'data-assets':
- return list.reduce((acc, item) => {
- if (
- ![
- PageType.Glossary,
- PageType.GlossaryTerm,
- PageType.Domain,
- PageType.LandingPage,
- ].includes(item)
- ) {
- acc.push(generateSettingItems(item));
- }
-
- return acc;
- }, [] as SettingMenuItem[]);
- default:
- return [];
- }
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/PipelineDetailsUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/PipelineDetailsUtils.ts
index 93006ab3c062..e48ee97f58c4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/PipelineDetailsUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/PipelineDetailsUtils.ts
@@ -15,8 +15,7 @@ import { isUndefined } from 'lodash';
import { ReactComponent as IconFailBadge } from '../assets/svg/fail-badge.svg';
import { ReactComponent as IconSkippedBadge } from '../assets/svg/skipped-badge.svg';
import { ReactComponent as IconSuccessBadge } from '../assets/svg/success-badge.svg';
-import { DetailPageWidgetKeys } from '../enums/CustomizeDetailPage.enum';
-import { EntityTabs, TabSpecificField } from '../enums/entity.enum';
+import { TabSpecificField } from '../enums/entity.enum';
import {
Pipeline,
StatusType,
@@ -63,70 +62,3 @@ export const getFormattedPipelineDetails = (
return pipelineDetails;
}
};
-
-export const getPipelineDetailsPageDefaultLayout = (tab: EntityTabs) => {
- switch (tab) {
- case EntityTabs.SCHEMA:
- return [
- {
- h: 2,
- i: DetailPageWidgetKeys.DESCRIPTION,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 8,
- i: DetailPageWidgetKeys.TABLE_SCHEMA,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.FREQUENTLY_JOINED_TABLES,
- w: 2,
- x: 6,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.DATA_PRODUCTS,
- w: 2,
- x: 6,
- y: 1,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.TAGS,
- w: 2,
- x: 6,
- y: 2,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.GLOSSARY_TERMS,
- w: 2,
- x: 6,
- y: 3,
- static: false,
- },
- {
- h: 3,
- i: DetailPageWidgetKeys.CUSTOM_PROPERTIES,
- w: 2,
- x: 6,
- y: 4,
- static: false,
- },
- ];
-
- default:
- return [];
- }
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/RouterUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/RouterUtils.ts
index 4226f62c3f27..0de983d84c2f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/RouterUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/RouterUtils.ts
@@ -581,10 +581,11 @@ export const getClassificationVersionsPath = (
};
export const getPersonaDetailsPath = (fqn: string) => {
- let path = ROUTES.SETTINGS_WITH_CATEGORY_FQN;
+ let path = ROUTES.SETTINGS_WITH_TAB_FQN;
path = path
- .replace(PLACEHOLDER_SETTING_CATEGORY, GlobalSettingOptions.PERSONA)
+ .replace(PLACEHOLDER_SETTING_CATEGORY, GlobalSettingsMenuCategory.MEMBERS)
+ .replace(PLACEHOLDER_ROUTE_TAB, GlobalSettingOptions.PERSONA)
.replace(PLACEHOLDER_ROUTE_FQN, getEncodedFqn(fqn));
return path;
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/SearchIndexUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/SearchIndexUtils.tsx
index fd85984bd5d8..40c1335146da 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/SearchIndexUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/SearchIndexUtils.tsx
@@ -12,8 +12,7 @@
*/
import { uniqueId } from 'lodash';
-import { DetailPageWidgetKeys } from '../enums/CustomizeDetailPage.enum';
-import { EntityTabs, TabSpecificField } from '../enums/entity.enum';
+import { TabSpecificField } from '../enums/entity.enum';
import { SearchIndexField } from '../generated/entity/data/searchIndex';
import { sortTagsCaseInsensitive } from './CommonUtils';
@@ -41,70 +40,3 @@ export const makeData = (
children: column.children ? makeData(column.children) : undefined,
}));
};
-
-export const getSearchIndexDetailsPageDefaultLayout = (tab: EntityTabs) => {
- switch (tab) {
- case EntityTabs.SCHEMA:
- return [
- {
- h: 2,
- i: DetailPageWidgetKeys.DESCRIPTION,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 8,
- i: DetailPageWidgetKeys.TABLE_SCHEMA,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.FREQUENTLY_JOINED_TABLES,
- w: 2,
- x: 6,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.DATA_PRODUCTS,
- w: 2,
- x: 6,
- y: 1,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.TAGS,
- w: 2,
- x: 6,
- y: 2,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.GLOSSARY_TERMS,
- w: 2,
- x: 6,
- y: 3,
- static: false,
- },
- {
- h: 3,
- i: DetailPageWidgetKeys.CUSTOM_PROPERTIES,
- w: 2,
- x: 6,
- y: 4,
- static: false,
- },
- ];
-
- default:
- return [];
- }
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/StoredProceduresUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/StoredProceduresUtils.tsx
index b4deb38f412c..d1d1e05e9e74 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/StoredProceduresUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/StoredProceduresUtils.tsx
@@ -10,75 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { DetailPageWidgetKeys } from '../enums/CustomizeDetailPage.enum';
-import { EntityTabs, TabSpecificField } from '../enums/entity.enum';
+import { TabSpecificField } from '../enums/entity.enum';
// eslint-disable-next-line max-len
export const STORED_PROCEDURE_DEFAULT_FIELDS = `${TabSpecificField.OWNERS}, ${TabSpecificField.FOLLOWERS},${TabSpecificField.TAGS}, ${TabSpecificField.DOMAIN},${TabSpecificField.DATA_PRODUCTS}, ${TabSpecificField.VOTES},${TabSpecificField.EXTENSION}`;
-
-export const getStoredProceduresPageDefaultLayout = (tab: EntityTabs) => {
- switch (tab) {
- case EntityTabs.SCHEMA:
- return [
- {
- h: 2,
- i: DetailPageWidgetKeys.DESCRIPTION,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 8,
- i: DetailPageWidgetKeys.TABLE_SCHEMA,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.FREQUENTLY_JOINED_TABLES,
- w: 2,
- x: 6,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.DATA_PRODUCTS,
- w: 2,
- x: 6,
- y: 1,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.TAGS,
- w: 2,
- x: 6,
- y: 2,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.GLOSSARY_TERMS,
- w: 2,
- x: 6,
- y: 3,
- static: false,
- },
- {
- h: 3,
- i: DetailPageWidgetKeys.CUSTOM_PROPERTIES,
- w: 2,
- x: 6,
- y: 4,
- static: false,
- },
- ];
-
- default:
- return [];
- }
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TableClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TableClassBase.ts
index 91e354e073ab..64e9b0e9d2ff 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TableClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TableClassBase.ts
@@ -12,15 +12,8 @@
*/
import { TabProps } from '../components/common/TabsLabel/TabsLabel.interface';
import { OperationPermission } from '../context/PermissionProvider/PermissionProvider.interface';
-import { DetailPageWidgetKeys } from '../enums/CustomizeDetailPage.enum';
import { EntityTabs } from '../enums/entity.enum';
-import {
- Constraint,
- DatabaseServiceType,
- DataType,
- Table,
- TableType,
-} from '../generated/entity/data/table';
+import { Table } from '../generated/entity/data/table';
import { TestSummary } from '../generated/tests/testCase';
import { FeedCounts } from '../interface/feed.interface';
import { getTableDetailPageBaseTabs } from './TableUtils';
@@ -55,210 +48,9 @@ class TableClassBase {
return getTableDetailPageBaseTabs(tableDetailsPageProps);
}
- public getTableDetailPageTabsIds(): EntityTabs[] {
- return [
- EntityTabs.SCHEMA,
- EntityTabs.ACTIVITY_FEED,
- EntityTabs.SAMPLE_DATA,
- EntityTabs.TABLE_QUERIES,
- EntityTabs.PROFILER,
- EntityTabs.INCIDENTS,
- EntityTabs.LINEAGE,
- EntityTabs.VIEW_DEFINITION,
- EntityTabs.CUSTOM_PROPERTIES,
- ];
- }
-
- public getDefaultLayout(tab: EntityTabs) {
- switch (tab) {
- case EntityTabs.SCHEMA:
- return [
- {
- h: 2,
- i: DetailPageWidgetKeys.DESCRIPTION,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 11,
- i: DetailPageWidgetKeys.TABLE_SCHEMA,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 2,
- i: DetailPageWidgetKeys.FREQUENTLY_JOINED_TABLES,
- w: 2,
- x: 6,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.DATA_PRODUCTS,
- w: 2,
- x: 6,
- y: 1,
- static: false,
- },
- {
- h: 2,
- i: DetailPageWidgetKeys.TAGS,
- w: 2,
- x: 6,
- y: 2,
- static: false,
- },
- {
- h: 2,
- i: DetailPageWidgetKeys.GLOSSARY_TERMS,
- w: 2,
- x: 6,
- y: 3,
- static: false,
- },
- {
- h: 4,
- i: DetailPageWidgetKeys.CUSTOM_PROPERTIES,
- w: 2,
- x: 6,
- y: 4,
- static: false,
- },
- ];
-
- default:
- return [];
- }
- }
-
public getAlertEnableStatus() {
return false;
}
-
- public getDummyData(): Table {
- return {
- id: 'ab4f893b-c303-43d9-9375-3e620a670b02',
- name: 'raw_product_catalog',
- fullyQualifiedName:
- 'sample_data.ecommerce_db.shopify.raw_product_catalog',
- description:
- 'This is a raw product catalog table contains the product listing, price, seller etc.. represented in our online DB. ',
- version: 0.2,
- updatedAt: 1688442727895,
- updatedBy: 'admin',
- tableType: TableType.Regular,
- dataProducts: [
- {
- id: 'c9b891b1-5d60-4171-9af0-7fd6d74f8f2b',
- type: 'dataProduct',
- name: 'Design Data product ',
- fullyQualifiedName: 'Design Data product ',
- description:
- "Here's the description for the Design Data product Name.",
- displayName: 'Design Data product Name',
- href: '#',
- },
- ],
- joins: {
- startDate: new Date(),
- dayCount: 30,
- columnJoins: [
- {
- columnName: 'address_id',
- joinedWith: [
- {
- fullyQualifiedName:
- 'sample_data.ecommerce_db.shopify.dim_address_clean.address_id',
- joinCount: 0,
- },
- {
- fullyQualifiedName:
- 'sample_data.ecommerce_db.shopify.dim_address.address_id',
- joinCount: 0,
- },
- ],
- },
- ],
- directTableJoins: [
- {
- fullyQualifiedName: 'sample_data.ecommerce_db.shopify.dim_address',
- joinCount: 0,
- },
- ],
- },
- columns: [
- {
- name: 'shop_id',
- displayName: 'Shop Id Customer',
- dataType: DataType.Number,
- dataTypeDisplay: 'numeric',
- description:
- 'Unique identifier for the store. This column is the primary key for this table.',
- fullyQualifiedName:
- 'sample_data.ecommerce_db.shopify."dim.shop".shop_id',
- tags: [],
- constraint: Constraint.PrimaryKey,
- ordinalPosition: 1,
- },
- ],
- owners: [
- {
- id: '38be030f-f817-4712-bc3b-ff7b9b9b805e',
- type: 'user',
- name: 'aaron_johnson0',
- fullyQualifiedName: 'aaron_johnson0',
- displayName: 'Aaron Johnson',
- deleted: false,
- },
- ],
- databaseSchema: {
- id: '3f0d9c39-0926-4028-8070-65b0c03556cb',
- type: 'databaseSchema',
- name: 'shopify',
- fullyQualifiedName: 'sample_data.ecommerce_db.shopify',
- description:
- 'This **mock** database contains schema related to shopify sales and orders with related dimension tables.',
- deleted: false,
- },
- database: {
- id: 'f085e133-e184-47c8-ada5-d7e005d3153b',
- type: 'database',
- name: 'ecommerce_db',
- fullyQualifiedName: 'sample_data.ecommerce_db',
- description:
- 'This **mock** database contains schemas related to shopify sales and orders with related dimension tables.',
- deleted: false,
- },
- service: {
- id: 'e61069a9-29e3-49fa-a7f4-f5227ae50b72',
- type: 'databaseService',
- name: 'sample_data',
- fullyQualifiedName: 'sample_data',
- deleted: false,
- },
- serviceType: DatabaseServiceType.BigQuery,
- tags: [],
- followers: [],
- changeDescription: {
- fieldsAdded: [
- {
- name: 'owner',
- newValue:
- '{"id":"38be030f-f817-4712-bc3b-ff7b9b9b805e","type":"user","name":"aaron_johnson0","fullyQualifiedName":"aaron_johnson0","displayName":"Aaron Johnson","deleted":false}',
- },
- ],
- fieldsUpdated: [],
- fieldsDeleted: [],
- previousVersion: 0.1,
- },
- deleted: false,
- };
- }
}
const tableClassBase = new TableClassBase();
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TagClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TagClassBase.ts
index decb520cc99d..7a13f29d299d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TagClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TagClassBase.ts
@@ -18,7 +18,7 @@ import { escapeESReservedCharacters, getEncodedFqn } from './StringsUtils';
class TagClassBase {
public async getTags(searchText: string, page: number) {
- // this is to escape and encode any chars which is known by ES search internally
+ // this is to esacpe and encode any chars which is known by ES search internally
const encodedValue = getEncodedFqn(escapeESReservedCharacters(searchText));
const res = await searchQuery({
query: `*${encodedValue}*`,
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TopicDetailsUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TopicDetailsUtils.ts
index 804965019ee6..20959667e6e1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TopicDetailsUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TopicDetailsUtils.ts
@@ -11,72 +11,18 @@
* limitations under the License.
*/
-import { DetailPageWidgetKeys } from '../enums/CustomizeDetailPage.enum';
-import { EntityTabs } from '../enums/entity.enum';
+import { TopicConfigObjectInterface } from '../components/Topic/TopicDetails/TopicDetails.interface';
+import { Topic } from '../generated/entity/data/topic';
-export const getTopicDetailsPageDefaultLayout = (tab: EntityTabs) => {
- switch (tab) {
- case EntityTabs.SCHEMA:
- return [
- {
- h: 2,
- i: DetailPageWidgetKeys.DESCRIPTION,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 8,
- i: DetailPageWidgetKeys.TABLE_SCHEMA,
- w: 6,
- x: 0,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.FREQUENTLY_JOINED_TABLES,
- w: 2,
- x: 6,
- y: 0,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.DATA_PRODUCTS,
- w: 2,
- x: 6,
- y: 1,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.TAGS,
- w: 2,
- x: 6,
- y: 2,
- static: false,
- },
- {
- h: 1,
- i: DetailPageWidgetKeys.GLOSSARY_TERMS,
- w: 2,
- x: 6,
- y: 3,
- static: false,
- },
- {
- h: 3,
- i: DetailPageWidgetKeys.CUSTOM_PROPERTIES,
- w: 2,
- x: 6,
- y: 4,
- static: false,
- },
- ];
-
- default:
- return [];
- }
+export const getConfigObject = (
+ topicDetails: Topic
+): TopicConfigObjectInterface => {
+ return {
+ Partitions: topicDetails.partitions,
+ 'Replication Factor': topicDetails.replicationFactor,
+ 'Retention Size': topicDetails.retentionSize,
+ 'CleanUp Policies': topicDetails.cleanupPolicies,
+ 'Max Message Size': topicDetails.maximumMessageSize,
+ 'Schema Type': topicDetails.messageSchema?.schemaType,
+ };
};