From 92913c6eaf27bdbec6a0845feb141130f16cdee0 Mon Sep 17 00:00:00 2001 From: darth-coder00 <86726556+darth-coder00@users.noreply.github.com> Date: Mon, 9 May 2022 23:45:18 +0530 Subject: [PATCH] Fix: Remove Test Connection for Pipeline Services (#4808) --- .../ServiceConfig/ConnectionConfigForm.tsx | 14 +++++++------- .../main/resources/ui/src/utils/ServiceUtils.tsx | 10 ++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ConnectionConfigForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ConnectionConfigForm.tsx index e377e970c2e..2f1b0add664 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ConnectionConfigForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ConnectionConfigForm.tsx @@ -14,7 +14,7 @@ import { ISubmitEvent } from '@rjsf/core'; import { cloneDeep, isNil } from 'lodash'; import { LoadingState } from 'Models'; -import React, { Fragment, FunctionComponent } from 'react'; +import React, { Fragment, FunctionComponent, useMemo } from 'react'; import { TestConnection } from '../../axiosAPIs/serviceAPI'; import { ServiceCategory } from '../../enums/service.enum'; import { @@ -24,7 +24,6 @@ import { import { DatabaseConnection, DatabaseService, - DatabaseServiceType, } from '../../generated/entity/services/databaseService'; import { MessagingConnection, @@ -38,6 +37,7 @@ import { getDatabaseConfig } from '../../utils/DatabaseServiceUtils'; import { formatFormDataForSubmit } from '../../utils/JSONSchemaFormUtils'; import { getMessagingConfig } from '../../utils/MessagingServiceUtils'; import { getPipelineConfig } from '../../utils/PipelineServiceUtils'; +import { shouldTestConnection } from '../../utils/ServiceUtils'; import { showErrorToast } from '../../utils/ToastUtils'; import FormBuilder from '../common/FormBuilder/FormBuilder'; @@ -62,6 +62,10 @@ const ConnectionConfigForm: FunctionComponent = ({ onCancel, onSave, }: Props) => { + const allowTestConn = useMemo(() => { + return shouldTestConnection(serviceType, serviceCategory); + }, [serviceType, serviceCategory]); + const config = !isNil(data) ? /* eslint-disable-next-line no-prototype-builtins */ data.hasOwnProperty('connection') @@ -152,11 +156,7 @@ const ConnectionConfigForm: FunctionComponent = ({ uiSchema={connSch.uiSchema} onCancel={onCancel} onSubmit={handleSave} - onTestConnection={ - serviceType !== DatabaseServiceType.SampleData - ? handleTestConnection - : undefined - } + onTestConnection={allowTestConn ? handleTestConnection : undefined} /> ); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtils.tsx index 3b8c346d736..62ae7b6ff36 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtils.tsx @@ -584,3 +584,13 @@ export const getIngestionName = ( return `${serviceName}_${type}`; } }; + +export const shouldTestConnection = ( + serviceType: string, + serviceCategory: ServiceCategory +) => { + return ( + serviceType !== DatabaseServiceType.SampleData && + serviceCategory !== ServiceCategory.PIPELINE_SERVICES + ); +};