Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import {
UpdatePomValuesRequest,
UpdateConfigValuesRequest,
ImportOpenAPISpecRequest,
ImportOpenAPISpecResponse,
SetupDetails,
SetPathRequest,
PathDetailsResponse,
Expand Down Expand Up @@ -104,7 +105,7 @@ export interface MIVisualizerAPI {
refetchIntegrationProjectDependencies: () => Promise<string>;
getDependencyStatusList: () => Promise<DependencyStatusResponse>;
updateDependenciesFromOverview: (params: UpdateDependenciesRequest) => Promise<boolean>;
importOpenAPISpec: (params: ImportOpenAPISpecRequest) => Promise<void>;
importOpenAPISpec: (params: ImportOpenAPISpecRequest) => Promise<ImportOpenAPISpecResponse>;
getProjectSetupDetails: () => Promise<SetupDetails>;
updateRuntimeVersionsInPom: (params:string) => Promise<boolean>;
setPathsInWorkSpace: (params: SetPathRequest) => Promise<PathDetailsResponse>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import {
UpdatePomValuesRequest,
UpdateConfigValuesRequest,
ImportOpenAPISpecRequest,
ImportOpenAPISpecResponse,
SetupDetails,
SetPathRequest,
PathDetailsResponse,
Expand Down Expand Up @@ -91,7 +92,7 @@ export const showNotification: RequestType<NotificationRequest, NotificationResp
export const getAvailableRuntimeServices: RequestType<void, RuntimeServicesResponse> = { method: `${_preFix}/getAvailableRuntimeServices` };
export const sendSwaggerProxyRequest: RequestType<SwaggerProxyRequest, SwaggerProxyResponse> = { method: `${_preFix}/sendSwaggerProxyRequest` };
export const openExternal: RequestType<OpenExternalRequest, OpenExternalResponse> = { method: `${_preFix}/openExternal` };
export const importOpenAPISpec: RequestType<ImportOpenAPISpecRequest, void> = { method: `${_preFix}/importOpenAPISpec` };
export const importOpenAPISpec: RequestType<ImportOpenAPISpecRequest, ImportOpenAPISpecResponse> = { method: `${_preFix}/importOpenAPISpec` };
export const getReadmeContent: RequestType<void, ReadmeContentResponse> = { method: `${_preFix}/getReadmeContent` };
export const openReadme: NotificationType<void> = { method: `${_preFix}/openReadme` };

Expand Down
5 changes: 5 additions & 0 deletions workspaces/mi/mi-core/src/rpc-types/mi-visualizer/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,11 @@ export interface ImportOpenAPISpecRequest {
filePath: string;
}

export interface ImportOpenAPISpecResponse {
isSuccess: boolean;
errorMessage?: string;
}

export interface RuntimeServicesResponse {
api: RuntimeServiceDetails | undefined;
proxy: RuntimeServiceDetails | undefined;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import {
UpdatePomValuesRequest,
UpdateConfigValuesRequest,
ImportOpenAPISpecRequest,
ImportOpenAPISpecResponse,
PathDetailsResponse,
DownloadMIRequest,
UpdateAiDependenciesRequest,
Expand Down Expand Up @@ -919,7 +920,7 @@ export class MiVisualizerRpcManager implements MIVisualizerAPI {
}
}

async importOpenAPISpec(params: ImportOpenAPISpecRequest): Promise<void> {
async importOpenAPISpec(params: ImportOpenAPISpecRequest): Promise<ImportOpenAPISpecResponse> {
const { filePath } = params;
const langClient = await MILanguageClient.getInstance(this.projectUri);
if (filePath && filePath.length > 0) {
Expand All @@ -931,10 +932,14 @@ export class MiVisualizerRpcManager implements MIVisualizerAPI {
if (buildStatus) {
await copy(connectorPath, path.join(this.projectUri, 'src', 'main', 'wso2mi', 'resources', 'connectors', path.basename(connectorPath)));
vscode.window.showInformationMessage("Connector generated successfully");
return { isSuccess: true };
} else {
vscode.window.showErrorMessage(errorMessage || "Error while generating connector");
const message = errorMessage || "Error while generating connector";
vscode.window.showErrorMessage(message);
return { isSuccess: false, errorMessage: message };
}
}
return { isSuccess: false, errorMessage: "Please select a valid file for connector generation" };
}

async updateProjectSettingsConfig(params: ProjectConfig): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ import {
updateConnectorDependencies,
refetchIntegrationProjectDependencies,
ImportOpenAPISpecRequest,
ImportOpenAPISpecResponse,
updateRuntimeVersionsInPom,
PathDetailsResponse,
updateProjectSettingsConfig,
Expand Down Expand Up @@ -296,7 +297,7 @@ export class MiVisualizerRpcClient implements MIVisualizerAPI {
updateDependenciesFromOverview(params: UpdateDependenciesRequest): Promise<boolean> {
return this._messenger.sendRequest(updateDependenciesFromOverview, HOST_EXTENSION, params);
}
importOpenAPISpec(params: ImportOpenAPISpecRequest): Promise<void> {
importOpenAPISpec(params: ImportOpenAPISpecRequest): Promise<ImportOpenAPISpecResponse> {
return this._messenger.sendRequest(importOpenAPISpec, HOST_EXTENSION, params);
}
updateProjectSettingsConfig(params: ProjectConfig): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,15 @@ export function ImportConnectionFromOpenAPI(props: ImportConnectionProps) {

const importWithOpenAPI = async () => {
setIsImporting(true);
setIsFailedImport(false);
try {
await rpcClient.getMiVisualizerRpcClient().importOpenAPISpec({ filePath: openApiDir });

const result = await rpcClient.getMiVisualizerRpcClient().importOpenAPISpec({ filePath: openApiDir });
if (!result?.isSuccess) {
setIsFailedImport(true);
setIsImporting(false);
return;
}

const newConnector: any = await waitForEvent();
if (newConnector?.isSuccess) {
props.onImportSuccess();
Expand All @@ -78,6 +84,7 @@ export function ImportConnectionFromOpenAPI(props: ImportConnectionProps) {
}
} catch (error) {
console.log(error);
setIsFailedImport(true);
}
setIsImporting(false);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,14 @@ export function ImportConnectionFromProto(props: ImportConnectionProps) {

const importWithProto = async () => {
setIsImporting(true);
setIsFailedImport(false);
try {
await rpcClient.getMiVisualizerRpcClient().importOpenAPISpec({ filePath: protoDir });
const result = await rpcClient.getMiVisualizerRpcClient().importOpenAPISpec({ filePath: protoDir });
if (!result?.isSuccess) {
setIsFailedImport(true);
setIsImporting(false);
return;
}

const newConnector: any = await waitForEvent();
if (newConnector?.isSuccess) {
Expand All @@ -78,6 +84,7 @@ export function ImportConnectionFromProto(props: ImportConnectionProps) {
}
} catch (error) {
console.log(error);
setIsFailedImport(true);
}
setIsImporting(false);
};
Expand Down
Loading