From b4dcbeeaa18afca789b83c1b4b239dcb57fbf973 Mon Sep 17 00:00:00 2001 From: darth-coder00 <86726556+darth-coder00@users.noreply.github.com> Date: Wed, 4 May 2022 05:28:36 +0530 Subject: [PATCH] Fix #4511: Hide the test connection button for Sample Data. (#4669) --- .../src/components/AddService/AddService.component.tsx | 1 + .../components/ServiceConfig/ConnectionConfigForm.tsx | 9 ++++++++- .../ui/src/components/ServiceConfig/ServiceConfig.tsx | 3 +++ .../src/main/resources/ui/src/pages/service/index.tsx | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.component.tsx index 795bed4fffa..b445aa94f54 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.component.tsx @@ -214,6 +214,7 @@ const AddService = ({ : {}) as DataService } serviceCategory={serviceCategory} + serviceType={selectServiceType} status={saveServiceState} onCancel={handleConnectionDetailsBackClick} onSave={(e) => { 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 98d6b4641a7..d9a5b138257 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 @@ -24,6 +24,7 @@ import { import { DatabaseConnection, DatabaseService, + DatabaseServiceType, } from '../../generated/entity/services/databaseService'; import { MessagingConnection, @@ -44,6 +45,7 @@ interface Props { data: DatabaseService | MessagingService | DashboardService | PipelineService; okText?: string; cancelText?: string; + serviceType: string; serviceCategory: ServiceCategory; status: LoadingState; onCancel?: () => void; @@ -54,6 +56,7 @@ const ConnectionConfigForm: FunctionComponent = ({ data, okText = 'Save', cancelText = 'Cancel', + serviceType, serviceCategory, status, onCancel, @@ -149,7 +152,11 @@ const ConnectionConfigForm: FunctionComponent = ({ uiSchema={connSch.uiSchema} onCancel={onCancel} onSubmit={handleSave} - onTestConnection={handleTestConnection} + onTestConnection={ + serviceType !== DatabaseServiceType.SampleData + ? handleTestConnection + : undefined + } /> ); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ServiceConfig.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ServiceConfig.tsx index fcc6b6c0fab..5af4eb7fe03 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ServiceConfig.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ServiceConfig.tsx @@ -24,6 +24,7 @@ import ConnectionConfigForm from './ConnectionConfigForm'; interface ServiceConfigProps { serviceCategory: ServiceCategory; + serviceType: string; data?: ServicesData; handleUpdate: ( data: ConfigData, @@ -37,6 +38,7 @@ export const Field = ({ children }: { children: React.ReactNode }) => { const ServiceConfig = ({ serviceCategory, + serviceType, data, handleUpdate, }: ServiceConfigProps) => { @@ -69,6 +71,7 @@ const ServiceConfig = ({ | PipelineService } serviceCategory={serviceCategory} + serviceType={serviceType} status={status} onSave={handleOnSaveClick} /> diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx index 5b6cedd4053..32e88b16957 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx @@ -999,6 +999,7 @@ const ServicePage: FunctionComponent = () => { data={serviceDetails as ServicesData} handleUpdate={handleConfigUpdate} serviceCategory={serviceName as ServiceCategory} + serviceType={serviceDetails?.serviceType || ''} /> )}