Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions workspaces/mi/mi-core/src/rpc-types/mi-diagram/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,12 @@ import {
DriverDownloadResponse,
DriverMavenCoordinatesRequest,
DriverMavenCoordinatesResponse,
GetConnectorDependenciesRequest,
GetConnectorDependenciesResponse,
UpdateConnectorDependencyOverrideRequest,
ResetConnectorDependencyOverridesRequest,
UpdateConnectorFlagsRequest,
UpdateGlobalConnectorFlagsRequest,
} from "./types";

export interface MiDiagramAPI {
Expand Down Expand Up @@ -465,6 +471,11 @@ export interface MiDiagramAPI {
getDriverMavenCoordinates: (params: DriverMavenCoordinatesRequest) => Promise<DriverMavenCoordinatesResponse>;
canCreateConsolidatedProject: () => Promise<ProjectCreationStatusResponse>;
createConsolidatedProjectFromWorkspace: (params: CreateProjectRequest) => Promise<CreateProjectResponse>;
getConnectorDependencies: (params: GetConnectorDependenciesRequest) => Promise<GetConnectorDependenciesResponse>;
updateConnectorDependencyOverride: (params: UpdateConnectorDependencyOverrideRequest) => Promise<boolean>;
resetConnectorDependencyOverrides: (params: ResetConnectorDependencyOverridesRequest) => Promise<boolean>;
updateConnectorFlags: (params: UpdateConnectorFlagsRequest) => Promise<boolean>;
updateGlobalConnectorFlags: (params: UpdateGlobalConnectorFlagsRequest) => Promise<boolean>;
}

// Re-export LS-only types (consumed by the extension's LS client; not part of MiDiagramAPI).
Expand Down
14 changes: 13 additions & 1 deletion workspaces/mi/mi-core/src/rpc-types/mi-diagram/rpc-type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,13 @@ import {
Property,
UpdateRegistryPropertyRequest,
GenerateMappingsParamsRequest,
ProjectCreationStatusResponse
ProjectCreationStatusResponse,
GetConnectorDependenciesRequest,
GetConnectorDependenciesResponse,
UpdateConnectorDependencyOverrideRequest,
ResetConnectorDependencyOverridesRequest,
UpdateConnectorFlagsRequest,
UpdateGlobalConnectorFlagsRequest,
} from "./types";
import { RequestType, NotificationType } from "vscode-messenger-common";

Expand Down Expand Up @@ -474,3 +480,9 @@ export const downloadDriverForConnector: RequestType<DriverDownloadRequest, Driv
export const getDriverMavenCoordinates: RequestType<DriverMavenCoordinatesRequest, DriverMavenCoordinatesResponse> = { method: `${_preFix}/getDriverMavenCoordinates` };
export const canCreateConsolidatedProject: RequestType<void, ProjectCreationStatusResponse> = { method: `${_preFix}/canCreateConsolidatedProject` };
export const createConsolidatedProjectFromWorkspace: RequestType<CreateProjectRequest, CreateProjectResponse> = { method: `${_preFix}/createConsolidatedProjectFromWorkspace` };

export const getConnectorDependencies: RequestType<GetConnectorDependenciesRequest, GetConnectorDependenciesResponse> = { method: `${_preFix}/getConnectorDependencies` };
export const updateConnectorDependencyOverride: RequestType<UpdateConnectorDependencyOverrideRequest, boolean> = { method: `${_preFix}/updateConnectorDependencyOverride` };
export const resetConnectorDependencyOverrides: RequestType<ResetConnectorDependencyOverridesRequest, boolean> = { method: `${_preFix}/resetConnectorDependencyOverrides` };
export const updateConnectorFlags: RequestType<UpdateConnectorFlagsRequest, boolean> = { method: `${_preFix}/updateConnectorFlags` };
export const updateGlobalConnectorFlags: RequestType<UpdateGlobalConnectorFlagsRequest, boolean> = { method: `${_preFix}/updateGlobalConnectorFlags` };
62 changes: 59 additions & 3 deletions workspaces/mi/mi-core/src/rpc-types/mi-diagram/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2389,9 +2389,8 @@ export interface GetStoredProceduresResponse {
}

export interface DriverDownloadRequest {
groupId: string;
artifactId: string;
version: string;
connectorName: string;
connectionType: string;
}

export interface DriverDownloadResponse {
Expand Down Expand Up @@ -2426,3 +2425,60 @@ export interface ProjectCreationStatusResponse {
canCreateConsolidatedProject: boolean;
isConsolidatedProject: boolean;
}

export interface ConnectorEffectiveDependency {
connectionType?: string;
groupId?: string;
artifactId?: string;
defaultVersion?: string;
overriddenVersion?: string;
omit?: boolean;
isOverridden?: boolean;
isConnectionTypeActive?: boolean;
localPath?: string;
}

export interface ConnectorEffectiveData {
omit?: boolean;
omitAllDrivers?: boolean;
dependencies?: ConnectorEffectiveDependency[];
}

export interface GetConnectorDependenciesRequest {
connectorArtifactId?: string;
}

export interface GetConnectorDependenciesResponse {
omitAllDrivers?: boolean;
omitAllConnectors?: boolean;
dependencies?: ConnectorEffectiveDependency[];
allConnectors?: { [connectorArtifactId: string]: ConnectorEffectiveData };
}

export interface UpdateConnectorDependencyOverrideRequest {
connectorArtifactId: string;
connectionType?: string;
groupId?: string;
artifactId?: string;
version?: string;
omit?: boolean;
localPath?: string;
}

export interface ResetConnectorDependencyOverridesRequest {
connectorArtifactId: string;
connectionType?: string;
groupId?: string;
artifactId?: string;
}

export interface UpdateConnectorFlagsRequest {
connectorArtifactId: string;
omit?: boolean;
omitAllDrivers?: boolean;
}

export interface UpdateGlobalConnectorFlagsRequest {
omitAllDrivers?: boolean;
omitAllConnectors?: boolean;
}
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,6 @@ export const CustomDriverConfig: React.FC<DriverConfigProps> = ({
</table>

<div style={{ display: 'flex', gap: '8px', justifyContent: 'flex-end' }}>
<Button appearance="primary" onClick={onSave}>
<SpacedCodicon name="save" iconSx={{ fontSize: '15px', marginRight: '10px' }} /> Save
</Button>
<Button appearance="secondary" onClick={onClear} disabled={!config.groupId}>
<SpacedCodicon name="trash" iconSx={{ fontSize: '15px', color: "red", marginRight: '10px' }} /> Delete
</Button>
Expand Down Expand Up @@ -264,7 +261,7 @@ export const MavenDriverConfig: React.FC<DriverConfigProps> = ({

<div style={{ display: 'flex', gap: '8px', justifyContent: 'flex-end' }}>
<Button appearance="primary" onClick={onSave}>
<SpacedCodicon name="save" iconSx={{ fontSize: '15px', marginRight: '10px' }} /> Save
<SpacedCodicon name="check" iconSx={{ fontSize: '15px', marginRight: '10px' }} /> Resolve
</Button>
<Button appearance="secondary" onClick={onClear}>
<SpacedCodicon name="clear-all" iconSx={{ fontSize: '15px', color: "red", marginRight: '10px' }} /> Clear
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -649,9 +649,8 @@ export class DynamicFieldsHandler {
if (!driverPath) {
while (!isDriverDownloaded && retryCount < maxRetries) {
const args = {
groupId: groupId,
artifactId: artifactId,
version: version,
connectorName: connectorName,
connectionType: connectionType,
};
this.setCustomError(getNameForController(FIELD_NAMES.CONFIG_KEY), "Checking DB Driver...");
driverPath = await this.rpcClient.getMiDiagramRpcClient().downloadDriverForConnector(args);
Expand Down
Loading
Loading