Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import { getTagsWithoutTier, getTierTags } from '../../../utils/TablePureUtils';
import {
updateCertificationTag,
updateTierTag,
} from '../../../utils/TagsUtils';
} from '../../../utils/TagsPureUtils';
import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils';
import { useRequiredParams } from '../../../utils/useRequiredParams';
import { withActivityFeed } from '../../AppRouter/withActivityFeed';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import { EntityAttachmentProvider } from '../../common/EntityDescription/EntityA
import RichTextEditorPreviewerV1 from '../../common/RichTextEditor/RichTextEditorPreviewerV1';
import Table from '../../common/Table/Table';
import ToggleExpandButton from '../../common/ToggleExpandButton/ToggleExpandButton';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import { ColumnFilter } from '../../Database/ColumnFilter/ColumnFilter.component';
import TableDescription from '../../Database/TableDescription/TableDescription.component';
import TableTags from '../../Database/TableTags/TableTags.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import { getEntityDetailsPath } from '../../../utils/RouterUtils';
import {
updateCertificationTag,
updateTierTag,
} from '../../../utils/TagsUtils';
} from '../../../utils/TagsPureUtils';
import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils';
import { useRequiredParams } from '../../../utils/useRequiredParams';
import { withActivityFeed } from '../../AppRouter/withActivityFeed';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ import { usePaging } from '../../../hooks/paging/usePaging';
import { useApplicationStore } from '../../../hooks/useApplicationStore';
import { useFqn } from '../../../hooks/useFqn';
import { getTags } from '../../../rest/tagAPI';
import { getClassificationInfo } from '../../../utils/ClassificationPureUtils';
import {
getClassificationExtraDropdownContent,
getClassificationInfo,
getTagsTableColumn,
} from '../../../utils/ClassificationUtils';
import { getEntityName } from '../../../utils/EntityNameUtils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { showErrorToast } from '../../../utils/ToastUtils';
import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface';
import Table from '../../common/Table/Table';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import { ContainerChildrenProps } from './ContainerChildren.interface';
import { useContainerChildrenCountSetter } from './ContainerChildrenCountContext';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jest.mock('../../../utils/GlossaryUtils', () => ({
getGlossaryTermHierarchy: jest.fn().mockReturnValue([]),
}));

jest.mock('../../Customization/GenericProvider/GenericProvider', () => ({
jest.mock('../../Customization/GenericProvider/GenericContext', () => ({
useGenericContext: jest.fn().mockReturnValue({
type: 'container',
setDisplayedColumns: jest.fn(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import CopyLinkButton from '../../common/CopyLinkButton/CopyLinkButton';
import { EntityAttachmentProvider } from '../../common/EntityDescription/EntityAttachmentProvider/EntityAttachmentProvider';
import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
import Table from '../../common/Table/Table';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import { ColumnFilter } from '../../Database/ColumnFilter/ColumnFilter.component';
import TableDescription from '../../Database/TableDescription/TableDescription.component';
import TableTags from '../../Database/TableTags/TableTags.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { isEmpty } from 'lodash';
import { useMemo } from 'react';
import { Container } from '../../../generated/entity/data/container';
import { useFqn } from '../../../hooks/useFqn';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import ContainerChildren from '../ContainerChildren/ContainerChildren';
import ContainerDataModel from '../ContainerDataModel/ContainerDataModel';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ import { postThread } from '../../../rest/feedsAPI';
import { updateWidgetHeightRecursively } from '../../../utils/CustomizePage/CustomizePageWidgetUtils';
import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils';
import ActivityThreadPanel from '../../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel';
import { GenericProvider, useGenericContext } from './GenericProvider';
import { useGenericContext } from './GenericContext';
import { GenericProvider } from './GenericProvider';

// Mock dependencies
jest.mock('../../../rest/feedsAPI');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,8 @@
* limitations under the License.
*/
import { AxiosError } from 'axios';
import { isEmpty, omit, once } from 'lodash';
import {
createContext,
lazy,
useCallback,
useContext,
useEffect,
useMemo,
useRef,
useState,
} from 'react';
import { isEmpty, omit } from 'lodash';
import { lazy, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useLocation, useNavigate } from 'react-router-dom';
import { ENTITY_PAGE_TYPE_MAP } from '../../../constants/Customize.constants';
Expand Down Expand Up @@ -56,10 +47,8 @@ import {
ColumnFieldUpdate,
ColumnOrTask,
} from '../../Database/ColumnDetailPanel/ColumnDetailPanel.interface';
import {
GenericContextType,
GenericProviderProps,
} from './GenericProvider.interface';
import { createGenericContext } from './GenericContext';
import { GenericProviderProps } from './GenericProvider.interface';

const ColumnDetailPanel = withSuspenseFallback(
lazy(() =>
Expand All @@ -69,10 +58,6 @@ const ColumnDetailPanel = withSuspenseFallback(
)
);

const createGenericContext = once(<T extends Omit<EntityReference, 'type'>>() =>
createContext({} as GenericContextType<T>)
);

export const GenericProvider = <T extends Omit<EntityReference, 'type'>>({
children,
data,
Expand Down Expand Up @@ -493,6 +478,3 @@ export const GenericProvider = <T extends Omit<EntityReference, 'type'>>({
</GenericContext.Provider>
);
};

export const useGenericContext = <T extends Omit<EntityReference, 'type'>>() =>
useContext(createGenericContext<T>());
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { PageType } from '../../../generated/system/ui/page';
import { useGridLayoutDirection } from '../../../hooks/useGridLayoutDirection';
import { WidgetConfig } from '../../../pages/CustomizablePage/CustomizablePage.interface';
import { getWidgetsFromKey } from '../../../utils/CustomizePage/CustomizePageDispatchUtils';
import { useGenericContext } from '../GenericProvider/GenericProvider';
import { useGenericContext } from '../GenericProvider/GenericContext';
import { DynamicHeightWidget } from './DynamicHeightWidget';
import './generic-tab.less';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils';
import { getChartDetailsPath } from '../../../utils/RouterUtils';
import { columnFilterIcon } from '../../../utils/TableColumn.util';
import { getAllTags } from '../../../utils/TableTags/TableTags.utils';
import { createTagObject } from '../../../utils/TagsUtils';
import { createTagObject } from '../../../utils/TagsPureUtils';
import { showErrorToast } from '../../../utils/ToastUtils';
import withSuspenseFallback from '../../AppRouter/withSuspenseFallback';
import { EntityAttachmentProvider } from '../../common/EntityDescription/EntityAttachmentProvider/EntityAttachmentProvider';
import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
import Table from '../../common/Table/Table';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import { ColumnFilter } from '../../Database/ColumnFilter/ColumnFilter.component';
import TableDescription from '../../Database/TableDescription/TableDescription.component';
import TableTags from '../../Database/TableTags/TableTags.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import { getEntityDetailsPath } from '../../../utils/RouterUtils';
import {
updateCertificationTag,
updateTierTag,
} from '../../../utils/TagsUtils';
} from '../../../utils/TagsPureUtils';
import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils';
import { useRequiredParams } from '../../../utils/useRequiredParams';
import { withActivityFeed } from '../../AppRouter/withActivityFeed';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import {
getEntityDetailsPath,
getVersionPath,
} from '../../../../utils/RouterUtils';
import { updateCertificationTag } from '../../../../utils/TagsUtils';
import { updateCertificationTag } from '../../../../utils/TagsPureUtils';
import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils';
import { useRequiredParams } from '../../../../utils/useRequiredParams';
import { withActivityFeed } from '../../../AppRouter/withActivityFeed';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ import { EntityAttachmentProvider } from '../../../../common/EntityDescription/E
import FilterTablePlaceHolder from '../../../../common/ErrorWithPlaceholder/FilterTablePlaceHolder';
import { PagingHandlerParams } from '../../../../common/NextPrevious/NextPrevious.interface';
import Table from '../../../../common/Table/Table';
import { useGenericContext } from '../../../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../../../Customization/GenericProvider/GenericContext';
import { ColumnFilter } from '../../../../Database/ColumnFilter/ColumnFilter.component';
import TableDescription from '../../../../Database/TableDescription/TableDescription.component';
import TableTags from '../../../../Database/TableTags/TableTags.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import {
} from '../../../enums/CustomizeDetailPage.enum';
import { EntityType } from '../../../enums/entity.enum';
import commonWidgetClassBase from '../../../utils/CommonWidget/CommonWidgetClassBase';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import { CommonWidgets } from './CommonWidgets';

// Mock the required dependencies
jest.mock('../../Customization/GenericProvider/GenericProvider');
jest.mock('../../Customization/GenericProvider/GenericContext');
jest.mock('../../common/EntityDescription/DescriptionV1', () => ({
__esModule: true,
default: () => <div data-testid="description-widget">Description Widget</div>,
Expand Down Expand Up @@ -54,6 +54,11 @@ jest.mock('../ReviewerLabelV2/ReviewerLabelV2', () => ({
<div data-testid="reviewer-label-widget">Reviewer Label Widget</div>
),
}));
jest.mock('../../Domain/DomainExpertsWidget/DomainExpertWidget', () => ({
DomainExpertWidget: () => (
<div data-testid="domain-expert-name">Domain Expert Widget</div>
),
}));

jest.mock('../../../utils/CommonWidget/CommonWidgetClassBase', () => ({
getCommonWidgetsFromConfig: jest.fn(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ import {
import { VersionEntityTypes } from '../../../utils/EntityVersionUtils.interface';
import { getPrioritizedViewPermission } from '../../../utils/PermissionsUtils';
import { getTagsWithoutTier, getTierTags } from '../../../utils/TablePureUtils';
import { createTagObject } from '../../../utils/TagsUtils';
import { createTagObject } from '../../../utils/TagsPureUtils';
import withSuspenseFallback from '../../AppRouter/withSuspenseFallback';
import CertificationWidget from '../../common/CertificationWidget/CertificationWidget';
import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable';
import DescriptionV1 from '../../common/EntityDescription/DescriptionV1';
import TierWidget from '../../common/TierWidget/TierWidget';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import { LeftPanelContainer } from '../../Customization/GenericTab/LeftPanelContainer';
import DataProductsContainer from '../../DataProducts/DataProductsContainer/DataProductsContainer.component';
import { DomainExpertWidget } from '../../Domain/DomainExpertsWidget/DomainExpertWidget';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { showErrorToast } from '../../../utils/ToastUtils';
import { DomainLabelProps } from '../../common/DomainLabel/DomainLabel.interface';
import DomainSelectableList from '../../common/DomainSelectableList/DomainSelectableList.component';
import ExpandableCard from '../../common/ExpandableCard/ExpandableCard';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import { AssetsUnion } from '../AssetsSelectionModal/AssetSelectionModal.interface';
import { DataAssetWithDomains } from '../DataAssetsHeader/DataAssetsHeader.interface';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {
PlusIconButton,
} from '../../common/IconButtons/EditIconButton';
import { UserTeamSelectableList } from '../../common/UserTeamSelectableList/UserTeamSelectableList.component';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';

export interface OwnerLabelV2Props {
dataTestId?: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
PlusIconButton,
} from '../../common/IconButtons/EditIconButton';
import { UserTeamSelectableList } from '../../common/UserTeamSelectableList/UserTeamSelectableList.component';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';

export const ReviewerLabelV2 = <
T extends {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jest.mock('../../../utils/DataContract/DataContractUtils', () => ({
getContractTabLabel: jest.fn(),
}));

jest.mock('../../Customization/GenericProvider/GenericProvider', () => ({
jest.mock('../../Customization/GenericProvider/GenericContext', () => ({
useGenericContext: jest.fn(() => ({
data: {
id: 'table-id',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import {
import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils';
import { useRequiredParams } from '../../../utils/useRequiredParams';
import withSuspenseFallback from '../../AppRouter/withSuspenseFallback';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import { ContractDetailFormTab } from '../ContractDetailFormTab/ContractDetailFormTab';
import { ContractQualityFormTab } from '../ContractQualityFormTab/ContractQualityFormTab';
import { ContractSchemaFormTab } from '../ContractSchemaFormTab/ContractScehmaFormTab';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jest.mock('../../../hooks/paging/usePaging', () => ({
})),
}));

jest.mock('../../Customization/GenericProvider/GenericProvider', () => ({
jest.mock('../../Customization/GenericProvider/GenericContext', () => ({
useGenericContext: jest.fn(() => ({
data: {
id: 'table-1',
Expand Down Expand Up @@ -246,7 +246,7 @@ describe('ContractQualityFormTab', () => {

it('should not fetch data when table FQN is missing', () => {
const mockUseGenericContext = jest.requireMock(
'../../Customization/GenericProvider/GenericProvider'
'../../Customization/GenericProvider/GenericContext'
).useGenericContext;
mockUseGenericContext.mockReturnValueOnce({
data: { fullyQualifiedName: undefined },
Expand Down Expand Up @@ -428,7 +428,7 @@ describe('ContractQualityFormTab', () => {
describe('Error Handling', () => {
it('should handle missing table context', () => {
const mockUseGenericContext = jest.requireMock(
'../../Customization/GenericProvider/GenericProvider'
'../../Customization/GenericProvider/GenericContext'
).useGenericContext;
mockUseGenericContext.mockReturnValue({ data: undefined });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.inte
import StatusBadge from '../../common/StatusBadge/StatusBadge.component';
import { StatusType } from '../../common/StatusBadge/StatusBadge.interface';
import Table from '../../common/Table/Table';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import { TestLevel } from '../../DataQuality/AddDataQualityTest/components/TestCaseFormV1.interface';
import './contract-quality-form-tab.less';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { DataContract } from '../../../generated/entity/data/dataContract';
import { Table } from '../../../generated/entity/data/table';
import { getEntityName } from '../../../utils/EntityNameUtils';
import { Transi18next } from '../../../utils/i18next/LocalUtil';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import './contract-sla.less';

const ContractSLA: React.FC<{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jest.mock('../../../assets/svg/ic-check-circle-2.svg', () => ({
ReactComponent: () => <svg data-testid="check-icon" />,
}));

jest.mock('../../Customization/GenericProvider/GenericProvider', () => ({
jest.mock('../../Customization/GenericProvider/GenericContext', () => ({
useGenericContext: jest.fn().mockImplementation(() => ({
data: mockTableData,
})),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
import { mockTableData } from '../../../mocks/TableVersion.mock';
import { ContractSLAFormTab } from './ContractSLAFormTab';

jest.mock('../../Customization/GenericProvider/GenericProvider', () => ({
jest.mock('../../Customization/GenericProvider/GenericContext', () => ({
useGenericContext: jest.fn().mockImplementation(() => ({
data: mockTableData,
})),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import { generateSelectOptionsFromString } from '../../../utils/DataContract/Dat
import { filterSelectOptions } from '../../../utils/FilterQueryUtils';
import { getPopupContainer } from '../../../utils/formUtils';
import { getColumnOptionsFromTableColumn } from '../../../utils/TablePureUtils';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import './contract-sla-form-tab.less';

export const ContractSLAFormTab: React.FC<{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import { getTableExpandableConfig } from '../../../utils/TableUtils';
import { useRequiredParams } from '../../../utils/useRequiredParams';
import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface';
import AntTable from '../../common/Table/Table';
import { useGenericContext } from '../../Customization/GenericProvider/GenericProvider';
import { useGenericContext } from '../../Customization/GenericProvider/GenericContext';
import { TableCellRendered } from '../../Database/SchemaTable/SchemaTable.interface';
import TableTags from '../../Database/TableTags/TableTags.component';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jest.mock('../../../utils/TableUtils', () => ({
getAllRowKeysByKeyName: jest.fn(),
}));

jest.mock('../../Customization/GenericProvider/GenericProvider', () => ({
jest.mock('../../Customization/GenericProvider/GenericContext', () => ({
useGenericContext: jest.fn().mockImplementation(() => ({
data: mockTableData,
})),
Expand Down
Loading
Loading