From 78f19d4f847809590313105b35c2594dc9301fc7 Mon Sep 17 00:00:00 2001 From: Sachin Chaurasiya Date: Thu, 24 Oct 2024 17:47:41 +0530 Subject: [PATCH] minor: improve types in ModalWithCustomPropertyEditor component (#18395) * minor: improve types in ModalWithCustomPropertyEditor component * fix: formatting --- .../Auth/AuthProviders/AuthProvider.tsx | 1 - .../ModalWithCustomPropertyEditor.component.tsx | 15 ++++++++++----- .../resources/ui/src/utils/TagClassBase.test.ts | 1 - 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx index cea014035d0..ab99a54361f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx @@ -768,7 +768,6 @@ export const AuthProvider = ({ handleFailedLogin, updateAxiosInterceptors: initializeAxiosInterceptors, }); - }, [handleSuccessfulLogin]); const isConfigLoading = diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithCustomProperty/ModalWithCustomPropertyEditor.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithCustomProperty/ModalWithCustomPropertyEditor.component.tsx index abd5b9b0810..726779153f0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithCustomProperty/ModalWithCustomPropertyEditor.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithCustomProperty/ModalWithCustomPropertyEditor.component.tsx @@ -15,8 +15,6 @@ import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { AxiosError } from 'axios'; -import { EntityType } from '../../../enums/entity.enum'; -import { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm'; import { Type } from '../../../generated/entity/type'; import { getTypeByFQN } from '../../../rest/metadataTypeAPI'; import { @@ -25,6 +23,7 @@ import { } from '../../../utils/CSV/CSV.utils'; import { showErrorToast } from '../../../utils/ToastUtils'; import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; +import { ExtentionEntities } from '../../common/CustomPropertyTable/CustomPropertyTable.interface'; import Loader from '../../common/Loader/Loader'; import { ExtensionDataProps, @@ -75,7 +74,9 @@ export const ModalWithCustomPropertyEditor = ({ setIsSaveLoading(false); }; - const onExtensionUpdate = async (data: GlossaryTerm) => { + const onExtensionUpdate = async ( + data: ExtentionEntities[keyof ExtentionEntities] + ) => { setExtensionObject(data.extension); }; @@ -120,8 +121,12 @@ export const ModalWithCustomPropertyEditor = ({ hasEditAccess hasPermission isRenderedInRightPanel - entityDetails={{ extension: extensionObject } as GlossaryTerm} - entityType={EntityType.GLOSSARY_TERM} + entityDetails={ + { + extension: extensionObject, + } as ExtentionEntities[keyof ExtentionEntities] + } + entityType={entityType as keyof ExtentionEntities} handleExtensionUpdate={onExtensionUpdate} /> )} diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TagClassBase.test.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TagClassBase.test.ts index a393d968c22..396cce6ac06 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/TagClassBase.test.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/TagClassBase.test.ts @@ -16,7 +16,6 @@ import tagClassBase, { TagClassBase } from './TagClassBase'; jest.mock('../rest/searchAPI'); - jest.mock('./StringsUtils', () => ({ getEncodedFqn: jest.fn().mockReturnValue('test'), escapeESReservedCharacters: jest.fn().mockReturnValue('test'),