Fix #4511: Hide the test connection button for Sample Data. (#4669)

This commit is contained in:
darth-coder00 2022-05-04 05:28:36 +05:30 committed by GitHub
parent 78da4ca2e6
commit b4dcbeeaa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 1 deletions

View File

@ -214,6 +214,7 @@ const AddService = ({
: {}) as DataService : {}) as DataService
} }
serviceCategory={serviceCategory} serviceCategory={serviceCategory}
serviceType={selectServiceType}
status={saveServiceState} status={saveServiceState}
onCancel={handleConnectionDetailsBackClick} onCancel={handleConnectionDetailsBackClick}
onSave={(e) => { onSave={(e) => {

View File

@ -24,6 +24,7 @@ import {
import { import {
DatabaseConnection, DatabaseConnection,
DatabaseService, DatabaseService,
DatabaseServiceType,
} from '../../generated/entity/services/databaseService'; } from '../../generated/entity/services/databaseService';
import { import {
MessagingConnection, MessagingConnection,
@ -44,6 +45,7 @@ interface Props {
data: DatabaseService | MessagingService | DashboardService | PipelineService; data: DatabaseService | MessagingService | DashboardService | PipelineService;
okText?: string; okText?: string;
cancelText?: string; cancelText?: string;
serviceType: string;
serviceCategory: ServiceCategory; serviceCategory: ServiceCategory;
status: LoadingState; status: LoadingState;
onCancel?: () => void; onCancel?: () => void;
@ -54,6 +56,7 @@ const ConnectionConfigForm: FunctionComponent<Props> = ({
data, data,
okText = 'Save', okText = 'Save',
cancelText = 'Cancel', cancelText = 'Cancel',
serviceType,
serviceCategory, serviceCategory,
status, status,
onCancel, onCancel,
@ -149,7 +152,11 @@ const ConnectionConfigForm: FunctionComponent<Props> = ({
uiSchema={connSch.uiSchema} uiSchema={connSch.uiSchema}
onCancel={onCancel} onCancel={onCancel}
onSubmit={handleSave} onSubmit={handleSave}
onTestConnection={handleTestConnection} onTestConnection={
serviceType !== DatabaseServiceType.SampleData
? handleTestConnection
: undefined
}
/> />
); );
}; };

View File

@ -24,6 +24,7 @@ import ConnectionConfigForm from './ConnectionConfigForm';
interface ServiceConfigProps { interface ServiceConfigProps {
serviceCategory: ServiceCategory; serviceCategory: ServiceCategory;
serviceType: string;
data?: ServicesData; data?: ServicesData;
handleUpdate: ( handleUpdate: (
data: ConfigData, data: ConfigData,
@ -37,6 +38,7 @@ export const Field = ({ children }: { children: React.ReactNode }) => {
const ServiceConfig = ({ const ServiceConfig = ({
serviceCategory, serviceCategory,
serviceType,
data, data,
handleUpdate, handleUpdate,
}: ServiceConfigProps) => { }: ServiceConfigProps) => {
@ -69,6 +71,7 @@ const ServiceConfig = ({
| PipelineService | PipelineService
} }
serviceCategory={serviceCategory} serviceCategory={serviceCategory}
serviceType={serviceType}
status={status} status={status}
onSave={handleOnSaveClick} onSave={handleOnSaveClick}
/> />

View File

@ -999,6 +999,7 @@ const ServicePage: FunctionComponent = () => {
data={serviceDetails as ServicesData} data={serviceDetails as ServicesData}
handleUpdate={handleConfigUpdate} handleUpdate={handleConfigUpdate}
serviceCategory={serviceName as ServiceCategory} serviceCategory={serviceName as ServiceCategory}
serviceType={serviceDetails?.serviceType || ''}
/> />
)} )}