yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-04 14:43:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): types reference issue (#12789)

Browse Source 
* fix(ui): types reference issue

* fix: code smells
This commit is contained in:
Sachin Chaurasiya 2023-08-08 16:40:08 +05:30 committed by GitHub
parent d4ed941371
commit 30dbfb8458
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx
View File

@ -38,16 +38,14 @@ import {
PipelineType,
} from '../../generated/api/services/ingestionPipelines/createIngestionPipeline';
import {
ConfigClass,
ConfigType,
FilterPattern,
IngestionPipeline,
Pipeline,
} from '../../generated/entity/services/ingestionPipelines/ingestionPipeline';
import { ProfileSampleType } from '../../generated/metadataIngestion/databaseServiceProfilerPipeline';
import {
DbtConfig,
DbtPipelineClass,
} from '../../generated/metadataIngestion/dbtPipeline';
import { DbtPipeline } from 'generated/metadataIngestion/dbtPipeline';
import {
getCurrentUserId,
getFilterTypes,
@ -65,7 +63,7 @@ import DeployIngestionLoaderModal from '../Modals/DeployIngestionLoaderModal/Dep
import {
AddIngestionProps,
AddIngestionState,
ModifiedDbtConfig,
ModifiedDBTConfigurationSource,
} from './addIngestion.interface';
import ConfigureIngestion from './Steps/ConfigureIngestion';
import DataInsightMetadataToESConfigForm from './Steps/DataInsightMetadataToESConfigForm/DataInsightMetadataToESConfigForm';
@ -98,8 +96,8 @@ const AddIngestion = ({
const { t } = useTranslation();
const { sourceConfig, sourceConfigType } = useMemo(
() => ({
sourceConfig: data?.sourceConfig.config as ConfigClass,
sourceConfigType: (data?.sourceConfig.config as ConfigClass)?.type,
sourceConfig: data?.sourceConfig.config as Pipeline,
sourceConfigType: (data?.sourceConfig.config as Pipeline)?.type,
}),
[]
);
@ -129,8 +127,7 @@ const AddIngestion = ({
profilerIngestionType,
} = useMemo(() => {
return {
configData: (data?.sourceConfig.config as DbtPipelineClass)
?.dbtConfigSource,
configData: (data?.sourceConfig.config as DbtPipeline)?.dbtConfigSource,
usageIngestionType: sourceConfigType ?? ConfigType.DatabaseUsage,
lineageIngestionType: sourceConfigType ?? ConfigType.DatabaseLineage,
profilerIngestionType: sourceConfigType ?? ConfigType.Profiler,
@ -150,7 +147,7 @@ const AddIngestion = ({
}, [isDatabaseService, pipelineType]);
const sourceTypeData = useMemo(
() => getSourceTypeFromConfig(configData as DbtConfig | undefined),
() => getSourceTypeFromConfig(configData),
[configData]
);
const { database, ingestAllDatabases } = serviceData.connection
@ -186,7 +183,7 @@ const AddIngestion = ({
showPipelineFilter: !isUndefined(sourceConfig?.pipelineFilterPattern),
showMlModelFilter: !isUndefined(sourceConfig?.mlModelFilterPattern),
showContainerFilter: !isUndefined(sourceConfig?.containerFilterPattern),
dbtConfigSource: configData as ModifiedDbtConfig,
dbtConfigSource: configData as ModifiedDBTConfigurationSource,
gcsConfigType: showDBTConfig ? sourceTypeData.gcsType : undefined,
chartFilterPattern:
sourceConfig?.chartFilterPattern ?? INITIAL_FILTER_PATTERN,
@ -277,7 +274,7 @@ const AddIngestion = ({
[]
);
const handleMetadataToESConfig = (data: ConfigClass) => {
const handleMetadataToESConfig = (data: Pipeline) => {
handleStateChange({
metadataToESConfig: data,
});
@ -501,7 +498,7 @@ const AddIngestion = ({
}
};
const getConfigData = (type: PipelineType): ConfigClass => {
const getConfigData = (type: PipelineType): Pipeline => {
const {
databaseFilterPattern,
dbtConfigSource,
@ -577,7 +574,7 @@ const AddIngestion = ({
'dbtClassificationName',
'includeTags',
]),
} as ConfigClass),
} as Pipeline),
type: ConfigType.Dbt,
dbtUpdateDescriptions: dbtConfigSource?.dbtUpdateDescriptions,
includeTags: dbtConfigSource?.includeTags,
@ -673,7 +670,7 @@ const AddIngestion = ({
loggerLevel: enableDebugLog ? LogLevels.Debug : LogLevels.Info,
sourceConfig: {
config: {
...(data.sourceConfig.config as ConfigClass),
...(data.sourceConfig.config as Pipeline),
...getConfigData(pipelineType),
},
},

6
openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/Steps/DataInsightMetadataToESConfigForm/DataInsightMetadataToESConfigForm.tsx
View File

@ -15,12 +15,12 @@ import { Button, Col, Divider, Form, Input, Row, Switch } from 'antd';
import { AddIngestionState } from 'components/AddIngestion/addIngestion.interface';
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { ConfigClass } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline';
import { Pipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline';
import '../MetadataToESConfigForm/MetadataToESConfigForm.less';
interface Props {
data: AddIngestionState;
handleMetadataToESConfig: (data: ConfigClass) => void;
handleMetadataToESConfig: (data: Pipeline) => void;
handlePrev: () => void;
handleNext: () => void;
onFocus: (fieldId: string) => void;
@ -38,7 +38,7 @@ const DataInsightMetadataToESConfigForm = ({
const { t } = useTranslation();
const [form] = Form.useForm();
const handleSubmit = (values: ConfigClass) => {
const handleSubmit = (values: Pipeline) => {
handleMetadataToESConfig({
...values,
});

6
openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/Steps/MetadataToESConfigForm/MetadataToESConfigForm.tsx
View File

@ -20,12 +20,12 @@ import {
} from 'constants/elasticsearch.constant';
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { ConfigClass } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline';
import { Pipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline';
import './MetadataToESConfigForm.less';
interface Props {
data: AddIngestionState;
handleMetadataToESConfig: (data: ConfigClass) => void;
handleMetadataToESConfig: (data: Pipeline) => void;
handlePrev: () => void;
handleNext: () => void;
onFocus: (fieldId: string) => void;
@ -43,7 +43,7 @@ const MetadataToESConfigForm = ({
const { t } = useTranslation();
const [form] = Form.useForm();
const handleSubmit = (values: ConfigClass) => {
const handleSubmit = (values: Pipeline) => {
handleMetadataToESConfig({
...values,
});

14
openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/addIngestion.interface.ts
View File

@ -11,14 +11,15 @@
* limitations under the License.
*/
import { DbtPipeline } from 'generated/metadataIngestion/dbtPipeline';
import { LoadingState, ServicesUpdateRequest } from 'Models';
import { FilterPatternEnum } from '../../enums/filterPattern.enum';
import { FormSubmitType } from '../../enums/form.enum';
import { ServiceCategory } from '../../enums/service.enum';
import {
ConfigClass,
CreateIngestionPipeline,
DbtConfig,
DBTConfigurationSource,
Pipeline,
} from '../../generated/api/services/ingestionPipelines/createIngestionPipeline';
import { ProfileSampleType } from '../../generated/entity/data/table';
import {
@ -26,7 +27,6 @@ import {
IngestionPipeline,
PipelineType,
} from '../../generated/entity/services/ingestionPipelines/ingestionPipeline';
import { DbtPipelineClass } from '../../generated/metadataIngestion/dbtPipeline';
import {
DBT_SOURCES,
GCS_CONFIG,
@ -88,9 +88,9 @@ export type ScheduleIntervalProps = {
};
// Todo: Need to refactor below type, as per schema change #9575
export type ModifiedDbtConfig = DbtConfig &
export type ModifiedDBTConfigurationSource = DBTConfigurationSource &
Pick<
DbtPipelineClass,
DbtPipeline,
| 'dbtUpdateDescriptions'
| 'dbtClassificationName'
| 'includeTags'
@ -110,7 +110,7 @@ export interface AddIngestionState {
databaseServiceNames: string[];
dbtClassificationName: string;
dbtUpdateDescriptions: boolean;
dbtConfigSource: ModifiedDbtConfig;
dbtConfigSource: ModifiedDBTConfigurationSource;
dbtConfigSourceType: DBT_SOURCES;
description: string;
enableDebugLog: boolean;
@ -128,7 +128,7 @@ export interface AddIngestionState {
markDeletedTopics?: boolean;
markDeletedMlModels?: boolean;
markDeletedPipelines?: boolean;
metadataToESConfig: ConfigClass | undefined;
metadataToESConfig: Pipeline | undefined;
mlModelFilterPattern: FilterPattern;
pipelineFilterPattern: FilterPattern;
profileSample: number | undefined;

16
openmetadata-ui/src/main/resources/ui/src/components/common/DBTConfigFormBuilder/DBTConfigForm.interface.ts
View File

@ -15,12 +15,12 @@ import { FilterPatternEnum } from 'enums/filterPattern.enum';
import { FormSubmitType } from '../../../enums/form.enum';
import {
Credentials,
DbtConfig,
DBTConfigurationSource,
GCPCredentialsValues,
} from '../../../generated/metadataIngestion/dbtPipeline';
import {
AddIngestionState,
ModifiedDbtConfig,
ModifiedDBTConfigurationSource,
} from '../../AddIngestion/addIngestion.interface';
import { DBT_SOURCES, GCS_CONFIG } from './DBTFormEnum';
@ -28,7 +28,7 @@ export interface DBTFormCommonProps {
okText: string;
cancelText: string;
onCancel: () => void;
onSubmit: (data?: DbtConfig) => void;
onSubmit: (data?: DBTConfigurationSource) => void;
}
export interface DBTConfigFormProps extends DBTFormCommonProps {
@ -42,7 +42,7 @@ export interface DBTConfigFormProps extends DBTFormCommonProps {
}
export type DbtConfigCloud = Pick<
ModifiedDbtConfig,
ModifiedDBTConfigurationSource,
| 'dbtCloudAccountId'
| 'dbtCloudAuthToken'
| 'dbtUpdateDescriptions'
@ -54,7 +54,7 @@ export type DbtConfigCloud = Pick<
>;
export type DbtConfigLocal = Pick<
ModifiedDbtConfig,
ModifiedDBTConfigurationSource,
| 'dbtCatalogFilePath'
| 'dbtManifestFilePath'
| 'dbtRunResultsFilePath'
@ -64,7 +64,7 @@ export type DbtConfigLocal = Pick<
>;
export type DbtConfigHttp = Pick<
ModifiedDbtConfig,
ModifiedDBTConfigurationSource,
| 'dbtCatalogHttpPath'
| 'dbtManifestHttpPath'
| 'dbtRunResultsHttpPath'
@ -74,7 +74,7 @@ export type DbtConfigHttp = Pick<
>;
export type DbtConfigS3GCS = Pick<
ModifiedDbtConfig,
ModifiedDBTConfigurationSource,
| 'dbtSecurityConfig'
| 'dbtPrefixConfig'
| 'dbtUpdateDescriptions'
@ -83,7 +83,7 @@ export type DbtConfigS3GCS = Pick<
>;
export type DbtConfigAzure = Pick<
ModifiedDbtConfig,
ModifiedDBTConfigurationSource,
| 'dbtSecurityConfig'
| 'dbtPrefixConfig'
| 'dbtUpdateDescriptions'

4
openmetadata-ui/src/main/resources/ui/src/utils/DBTConfigFormUtil.ts
View File

@ -11,7 +11,7 @@
* limitations under the License.
*/
import { ModifiedDbtConfig } from 'components/AddIngestion/addIngestion.interface';
import { ModifiedDBTConfigurationSource } from 'components/AddIngestion/addIngestion.interface';
import {
DbtConfigCloud,
DbtConfigHttp,
@ -30,7 +30,7 @@ import {
import { isEmpty, isNil, isString } from 'lodash';
export const getSourceTypeFromConfig = (
data?: ModifiedDbtConfig,
data?: ModifiedDBTConfigurationSource,
defaultSource = DBT_SOURCES.local
): DbtSourceTypes => {
let sourceType = defaultSource;

4
openmetadata-ui/src/main/resources/ui/src/utils/LogsViewer.utils.ts
View File

@ -15,7 +15,7 @@ import { TableProfilerTab } from 'components/ProfilerDashboard/profilerDashboard
import { getTableTabPath } from 'constants/constants';
import { OPEN_METADATA } from 'constants/service-guide.constant';
import { EntityTabs } from 'enums/entity.enum';
import { ConfigClass } from 'generated/api/services/ingestionPipelines/createIngestionPipeline';
import { Pipeline } from 'generated/api/services/ingestionPipelines/createIngestionPipeline';
import { isUndefined, startCase } from 'lodash';
import { DataQualityPageTabs } from 'pages/DataQuality/DataQualityPage.interface';
import { IngestionPipeline } from '../generated/entity/services/ingestionPipelines/ingestionPipeline';
@ -71,7 +71,7 @@ export const getLogBreadCrumbs = (
url:
getTableTabPath(
getEncodedFqn(
(ingestionDetails.sourceConfig.config as ConfigClass)
(ingestionDetails.sourceConfig.config as Pipeline)
?.entityFullyQualifiedName ?? ''
),
EntityTabs.PROFILER