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 @@ -1380,6 +1380,24 @@ export interface ResourceSourceCodeResponse {
[key: string]: TextEdit[];
};
}

export interface ResourceReturnTypesRequest {
filePath?: string;
context?: string;
}

export interface ResponseCode {
category: string;
label: string;
type: string;
statusCode: string;
hasBody?: boolean;
}
export interface ResourceReturnTypesResponse {
completions: ResponseCode[];
}


// <-------- Service Designer Related ------->


Expand Down Expand Up @@ -1594,6 +1612,7 @@ export interface BIInterface extends BaseLangClientInterface {
getHttpResourceModel: (params: HttpResourceModelRequest) => Promise<HttpResourceModelResponse>;
addResourceSourceCode: (params: FunctionSourceCodeRequest) => Promise<ResourceSourceCodeResponse>;
addFunctionSourceCode: (params: FunctionSourceCodeRequest) => Promise<ResourceSourceCodeResponse>;
getResourceReturnTypes: (params: ResourceReturnTypesRequest) => Promise<ResourceReturnTypesResponse>;

// Function APIs
getFunctionNode: (params: FunctionNodeRequest) => Promise<FunctionNodeResponse>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

import { UpdatedArtifactsResponse } from "../../interfaces/bi";
import { ListenerModelRequest, ListenerModelResponse, ServiceModelRequest, ServiceModelResponse, ServiceModelFromCodeRequest, ServiceModelFromCodeResponse, HttpResourceModelRequest, HttpResourceModelResponse, FunctionSourceCodeRequest, ListenerSourceCodeRequest, ListenersRequest, ListenersResponse, ServiceSourceCodeRequest, ListenerModelFromCodeRequest, ListenerModelFromCodeResponse, TriggerModelsRequest, TriggerModelsResponse, FunctionModelRequest, FunctionModelResponse } from "../../interfaces/extended-lang-client";
import { ListenerModelRequest, ListenerModelResponse, ServiceModelRequest, ServiceModelResponse, ServiceModelFromCodeRequest, ServiceModelFromCodeResponse, HttpResourceModelRequest, HttpResourceModelResponse, FunctionSourceCodeRequest, ListenerSourceCodeRequest, ListenersRequest, ListenersResponse, ServiceSourceCodeRequest, ListenerModelFromCodeRequest, ListenerModelFromCodeResponse, TriggerModelsRequest, TriggerModelsResponse, FunctionModelRequest, FunctionModelResponse, ResourceReturnTypesRequest, ResourceReturnTypesResponse } from "../../interfaces/extended-lang-client";
import {
ExportOASRequest,
ExportOASResponse,
Expand All @@ -37,6 +37,7 @@ export interface ServiceDesignerAPI {
updateServiceSourceCode: (params: ServiceSourceCodeRequest) => Promise<UpdatedArtifactsResponse>;
getServiceModelFromCode: (params: ServiceModelFromCodeRequest) => Promise<ServiceModelFromCodeResponse>;
getHttpResourceModel: (params: HttpResourceModelRequest) => Promise<HttpResourceModelResponse>;
getResourceReturnTypes: (params: ResourceReturnTypesRequest) => Promise<ResourceReturnTypesResponse>;
addResourceSourceCode: (params: FunctionSourceCodeRequest) => Promise<UpdatedArtifactsResponse>;
addFunctionSourceCode: (params: FunctionSourceCodeRequest) => Promise<UpdatedArtifactsResponse>;
updateResourceSourceCode: (params: FunctionSourceCodeRequest) => Promise<UpdatedArtifactsResponse>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,73 +24,6 @@ export interface ExportOASRequest {
export interface ExportOASResponse {
openSpecFile: string;
}
export interface ResponseCode {
code: number;
title: string;
source: string;
}

export const responseCodes: ResponseCode[] = [
{ code: 200, title: "200 - OK", source: "http:Ok" },
{ code: 100, title: "100 - Continue", source: "http:Continue" },
{ code: 101, title: "101 - Switching Protocols", source: "http:SwitchingProtocols" },
{ code: 201, title: "201 - Created", source: "http:Created" },
{ code: 202, title: "202 - Accepted", source: "http:Accepted" },
{ code: 203, title: "203 - Non-Authoritative Information", source: "http:NonAuthoritativeInformation" },
{ code: 204, title: "204 - No Content", source: "http:NoContent" },
{ code: 205, title: "205 - Reset Content", source: "http:ResetContent" },
{ code: 206, title: "206 - Partial Content", source: "http:PartialContent" },
{ code: 207, title: "207 - Multi-Status", source: "http:MultiStatus" },
{ code: 208, title: "208 - Already Reported", source: "http:AlreadyReported" },
{ code: 226, title: "226 - IM Used", source: "http:IMUsed" },
{ code: 300, title: "300 - Multiple Choices", source: "http:MultipleChoices" },
{ code: 301, title: "301 - Moved Permanently", source: "http:MovedPermanently" },
{ code: 302, title: "302 - Found", source: "http:Found" },
{ code: 303, title: "303 - See Other", source: "http:SeeOther" },
{ code: 304, title: "304 - Not Modified", source: "http:NotModified" },
{ code: 305, title: "305 - Use Proxy", source: "http:UseProxy" },
{ code: 307, title: "307 - Temporary Redirect", source: "http:TemporaryRedirect" },
{ code: 308, title: "308 - Permanent Redirect", source: "http:PermanentRedirect" },
{ code: 400, title: "400 - Bad Request", source: "http:BadRequest" },
{ code: 401, title: "401 - Unauthorized", source: "http:Unauthorized" },
{ code: 402, title: "402 - Payment Required", source: "http:PaymentRequired" },
{ code: 403, title: "403 - Forbidden", source: "http:Forbidden" },
{ code: 404, title: "404 - Not Found", source: "http:NotFound" },
{ code: 405, title: "405 - Method Not Allowed", source: "http:MethodNotAllowed" },
{ code: 406, title: "406 - Not Acceptable", source: "http:NotAcceptable" },
{ code: 407, title: "407 - Proxy Authentication Required", source: "http:ProxyAuthenticationRequired" },
{ code: 408, title: "408 - Request Timeout", source: "http:RequestTimeout" },
{ code: 409, title: "409 - Conflict", source: "http:Conflict" },
{ code: 410, title: "410 - Gone", source: "http:Gone" },
{ code: 411, title: "411 - Length Required", source: "http:LengthRequired" },
{ code: 412, title: "412 - Precondition Failed", source: "http:PreconditionFailed" },
{ code: 413, title: "413 - Payload Too Large", source: "http:PayloadTooLarge" },
{ code: 414, title: "414 - URI Too Long", source: "http:UriTooLong" },
{ code: 415, title: "415 - Unsupported Media Type", source: "http:UnsupportedMediaType" },
{ code: 416, title: "416 - Range Not Satisfiable", source: "http:RangeNotSatisfiable" },
{ code: 417, title: "417 - Expectation Failed", source: "http:ExpectationFailed" },
{ code: 422, title: "422 - Unprocessable Entity", source: "http:UnprocessableEntity" },
{ code: 423, title: "423 - Locked", source: "http:Locked" },
{ code: 424, title: "424 - Failed Dependency", source: "http:FailedDependency" },
{ code: 425, title: "425 - Too Early", source: "http:TooEarly" },
{ code: 426, title: "426 - Upgrade Required", source: "http:UpgradeRequired" },
{ code: 428, title: "428 - Precondition Required", source: "http:PreconditionRequired" },
{ code: 429, title: "429 - Too Many Requests", source: "http:TooManyRequests" },
{ code: 431, title: "431 - Request Header Fields Too Large", source: "http:RequestHeaderFieldsTooLarge" },
{ code: 451, title: "451 - Unavailable Due To Legal Reasons", source: "http:UnavailableDueToLegalReasons" },
{ code: 500, title: "500 - Internal Server Error", source: "http:InternalServerError" },
{ code: 501, title: "501 - Not Implemented", source: "http:NotImplemented" },
{ code: 502, title: "502 - Bad Gateway", source: "http:BadGateway" },
{ code: 503, title: "503 - Service Unavailable", source: "http:ServiceUnavailable" },
{ code: 504, title: "504 - Gateway Timeout", source: "http:GatewayTimeout" },
{ code: 505, title: "505 - HTTP Version Not Supported", source: "http:HttpVersionNotSupported" },
{ code: 506, title: "506 - Variant Also Negotiates", source: "http:VariantAlsoNegotiates" },
{ code: 507, title: "507 - Insufficient Storage", source: "http:InsufficientStorage" },
{ code: 508, title: "508 - Loop Detected", source: "http:LoopDetected" },
{ code: 510, title: "510 - Not Extended", source: "http:NotExtended" },
{ code: 511, title: "511 - Network Authentication Required", source: "http:NetworkAuthorizationRequired" }
]

export interface SourceUpdateResponse {
artifacts: ProjectStructureArtifactResponse[]
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* THIS FILE INCLUDES AUTO GENERATED CODE
*/
import { UpdatedArtifactsResponse } from "../../interfaces/bi";
import { ListenerModelRequest, ListenerModelResponse, ServiceModelRequest, ServiceModelResponse, ServiceModelFromCodeRequest, ServiceModelFromCodeResponse, HttpResourceModelRequest, HttpResourceModelResponse, FunctionSourceCodeRequest, ListenerSourceCodeRequest, ListenersRequest, ListenersResponse, ServiceSourceCodeRequest, ListenerModelFromCodeRequest, ListenerModelFromCodeResponse, TriggerModelsRequest, TriggerModelsResponse, FunctionModelRequest, FunctionModelResponse } from "../../interfaces/extended-lang-client";
import { ListenerModelRequest, ListenerModelResponse, ServiceModelRequest, ServiceModelResponse, ServiceModelFromCodeRequest, ServiceModelFromCodeResponse, HttpResourceModelRequest, HttpResourceModelResponse, FunctionSourceCodeRequest, ListenerSourceCodeRequest, ListenersRequest, ListenersResponse, ServiceSourceCodeRequest, ListenerModelFromCodeRequest, ListenerModelFromCodeResponse, TriggerModelsRequest, TriggerModelsResponse, FunctionModelRequest, FunctionModelResponse, ResourceReturnTypesRequest, ResourceReturnTypesResponse } from "../../interfaces/extended-lang-client";
import {
ExportOASRequest,
ExportOASResponse,
Expand All @@ -39,6 +39,7 @@ export const addServiceSourceCode: RequestType<ServiceSourceCodeRequest, Updated
export const updateServiceSourceCode: RequestType<ServiceSourceCodeRequest, UpdatedArtifactsResponse> = { method: `${_preFix}/updateServiceSourceCode` };
export const getServiceModelFromCode: RequestType<ServiceModelFromCodeRequest, ServiceModelFromCodeResponse> = { method: `${_preFix}/getServiceModelFromCode` };
export const getHttpResourceModel: RequestType<HttpResourceModelRequest, HttpResourceModelResponse> = { method: `${_preFix}/getHttpResourceModel` };
export const getResourceReturnTypes: RequestType<ResourceReturnTypesRequest, ResourceReturnTypesResponse> = { method: `${_preFix}/getResourceReturnTypes` };
export const addResourceSourceCode: RequestType<FunctionSourceCodeRequest, UpdatedArtifactsResponse> = { method: `${_preFix}/addResourceSourceCode` };
export const addFunctionSourceCode: RequestType<FunctionSourceCodeRequest, UpdatedArtifactsResponse> = { method: `${_preFix}/addFunctionSourceCode` };
export const updateResourceSourceCode: RequestType<FunctionSourceCodeRequest, UpdatedArtifactsResponse> = { method: `${_preFix}/updateResourceSourceCode` };
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ import {
UpdateConfigVariableResponseV2,
DeleteConfigVariableRequestV2,
DeleteConfigVariableResponseV2,
ResourceReturnTypesRequest,
ResourceReturnTypesResponse,
JsonToTypeRequest,
JsonToTypeResponse
} from "@wso2/ballerina-core";
Expand Down Expand Up @@ -344,6 +346,7 @@ enum EXTENDED_APIS {
BI_SERVICE_GET_SERVICE_SOURCE = 'serviceDesign/getServiceFromSource',
BI_SERVICE_UPDATE_SERVICE_CLASS = 'serviceDesign/updateServiceClass',
BI_SERVICE_GET_RESOURCE = 'serviceDesign/getFunctionModel',
BI_SERVICE_GET_RESOURCE_RETURN_TYPES = 'serviceDesign/types',
BI_SERVICE_ADD_RESOURCE = 'serviceDesign/addResource',
BI_SERVICE_ADD_FUNCTION = 'serviceDesign/addFunction',
BI_SERVICE_UPDATE_RESOURCE = 'serviceDesign/updateFunction',
Expand Down Expand Up @@ -1024,6 +1027,10 @@ export class ExtendedLangClient extends LanguageClient implements ExtendedLangCl
return this.sendRequest<HttpResourceModelResponse>(EXTENDED_APIS.BI_SERVICE_GET_RESOURCE, params);
}

async getResourceReturnTypes(params: ResourceReturnTypesRequest): Promise<ResourceReturnTypesResponse> {
return this.sendRequest<ResourceReturnTypesResponse>(EXTENDED_APIS.BI_SERVICE_GET_RESOURCE_RETURN_TYPES, params);
}

async addResourceSourceCode(params: FunctionSourceCodeRequest): Promise<ResourceSourceCodeResponse> {
return this.sendRequest<ResourceSourceCodeResponse>(EXTENDED_APIS.BI_SERVICE_ADD_RESOURCE, params);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,33 @@
* THIS FILE INCLUDES AUTO GENERATED CODE
*/
import {
ExportOASRequest,
FunctionModelRequest,
FunctionSourceCodeRequest,
HttpResourceModelRequest,
ListenerModelFromCodeRequest,
ListenerModelRequest,
ListenerSourceCodeRequest,
ListenersRequest,
ServiceModelFromCodeRequest,
ServiceModelRequest,
ServiceSourceCodeRequest,
TriggerModelsRequest,
addFunctionSourceCode,
addListenerSourceCode,
addResourceSourceCode,
addServiceSourceCode,
exportOASFile,
ExportOASRequest,
FunctionModelRequest,
FunctionSourceCodeRequest,
getFunctionModel,
getHttpResourceModel,
getListenerModel,
getListenerModelFromCode,
getListeners,
getResourceReturnTypes,
getServiceModel,
getServiceModelFromCode,
getTriggerModels,
HttpResourceModelRequest,
ListenerModelFromCodeRequest,
ListenerModelRequest,
ListenerSourceCodeRequest,
ListenersRequest,
ResourceReturnTypesRequest,
ServiceModelFromCodeRequest,
ServiceModelRequest,
ServiceSourceCodeRequest,
TriggerModelsRequest,
updateListenerSourceCode,
updateResourceSourceCode,
updateServiceSourceCode
Expand All @@ -65,6 +67,7 @@ export function registerServiceDesignerRpcHandlers(messenger: Messenger) {
messenger.onRequest(updateServiceSourceCode, (args: ServiceSourceCodeRequest) => rpcManger.updateServiceSourceCode(args));
messenger.onRequest(getServiceModelFromCode, (args: ServiceModelFromCodeRequest) => rpcManger.getServiceModelFromCode(args));
messenger.onRequest(getHttpResourceModel, (args: HttpResourceModelRequest) => rpcManger.getHttpResourceModel(args));
messenger.onRequest(getResourceReturnTypes, (args: ResourceReturnTypesRequest) => rpcManger.getResourceReturnTypes(args));
messenger.onRequest(addResourceSourceCode, (args: FunctionSourceCodeRequest) => rpcManger.addResourceSourceCode(args));
messenger.onRequest(addFunctionSourceCode, (args: FunctionSourceCodeRequest) => rpcManger.addFunctionSourceCode(args));
messenger.onRequest(updateResourceSourceCode, (args: FunctionSourceCodeRequest) => rpcManger.updateResourceSourceCode(args));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* THIS FILE INCLUDES AUTO GENERATED CODE
*/
import {
DIRECTORY_MAP,
ExportOASRequest,
ExportOASResponse,
FunctionModelRequest,
Expand All @@ -34,29 +35,26 @@ import {
ListenersRequest,
ListenersResponse,
OpenAPISpec,
ResourceReturnTypesRequest,
ResourceReturnTypesResponse,
ResourceSourceCodeResponse,
STModification,
ServiceDesignerAPI,
ServiceModelFromCodeRequest,
ServiceModelFromCodeResponse,
ServiceModelRequest,
ServiceModelResponse,
ServiceSourceCodeRequest,
UpdatedArtifactsResponse,
SyntaxTree,
TriggerModelsRequest,
TriggerModelsResponse,
DIRECTORY_MAP
UpdatedArtifactsResponse
} from "@wso2/ballerina-core";
import { NodePosition } from "@wso2/syntax-tree";
import * as fs from 'fs';
import { existsSync, writeFileSync } from "fs";
import * as yaml from 'js-yaml';
import * as path from 'path';
import * as vscode from "vscode";
import { Uri, window, workspace } from "vscode";
import { StateMachine } from "../../stateMachine";
import { window, workspace } from "vscode";
import { extension } from "../../BalExtensionContext";
import { StateMachine } from "../../stateMachine";
import { updateSourceCode } from "../../utils/source-utils";

export class ServiceDesignerRpcManager implements ServiceDesignerAPI {
Expand Down Expand Up @@ -388,4 +386,18 @@ export class ServiceDesignerRpcManager implements ServiceDesignerAPI {
console.log(`>>> Created file at ${targetFile}`);
}
}

async getResourceReturnTypes(params: ResourceReturnTypesRequest): Promise<ResourceReturnTypesResponse> {
return new Promise(async (resolve) => {
const context = StateMachine.context();
params.filePath = StateMachine.context().projectUri;
params.context = "HTTP_STATUS_CODE";
try {
const res: ResourceReturnTypesResponse = await context.langClient.getResourceReturnTypes(params);
resolve(res);
} catch (error) {
console.log(">>> error fetching resource return types", error);
}
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ import {
ListenerSourceCodeRequest,
ListenersRequest,
ListenersResponse,
ResourceReturnTypesRequest,
ResourceReturnTypesResponse,
ServiceDesignerAPI,
ServiceModelFromCodeRequest,
ServiceModelFromCodeResponse,
Expand All @@ -51,6 +53,7 @@ import {
getListenerModel,
getListenerModelFromCode,
getListeners,
getResourceReturnTypes,
getServiceModel,
getServiceModelFromCode,
getTriggerModels,
Expand Down Expand Up @@ -120,6 +123,10 @@ export class ServiceDesignerRpcClient implements ServiceDesignerAPI {
return this._messenger.sendRequest(getHttpResourceModel, HOST_EXTENSION, params);
}

getResourceReturnTypes(params: ResourceReturnTypesRequest): Promise<ResourceReturnTypesResponse> {
return this._messenger.sendRequest(getResourceReturnTypes, HOST_EXTENSION, params);
}

addResourceSourceCode(params: FunctionSourceCodeRequest): Promise<UpdatedArtifactsResponse> {
return this._messenger.sendRequest(addResourceSourceCode, HOST_EXTENSION, params);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

import { RefObject } from "react";
import { DiagnosticMessage, FormDiagnostics, TextEdit, PropertyModel, LinePosition, LineRange, ExpressionProperty, Metadata, RecordTypeField, Imports } from "@wso2/ballerina-core";
import { DiagnosticMessage, FormDiagnostics, TextEdit, PropertyModel, LinePosition, LineRange, ExpressionProperty, Metadata, RecordTypeField, Imports } from "@wso2/ballerina-core";
import { ParamConfig } from "../ParamManager/ParamManager";
import { CompletionItem, FormExpressionEditorRef, HelperPaneHeight, HelperPaneOrigin, OptionProps } from "@wso2/ui-toolkit";

Expand Down Expand Up @@ -53,8 +53,9 @@ export type FormField = {
enabled: boolean;
lineRange?: LineRange;
metadata?: Metadata;
codedata?: {[key: string]: any};
imports?: {[key: string]: string};
codedata?: { [key: string]: any };
imports?: { [key: string]: string };
onValueChange?: (value: string) => void;
};

export type ParameterValue = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,16 @@ export function DropdownEditor(props: DropdownEditorProps) {
return (
<Dropdown
id={field.key}
description={field.documentation}
{...register(field.key, { required: !field.optional, value: getValueForDropdown(field) })}
label={capitalize(field.label)}
items={field.itemOptions ? field.itemOptions : field.items?.map((item) => ({ id: item, content: item, value: item }))}
required={!field.optional}
disabled={!field.editable}
onChange={(e) => setValue(field.key, e.target.value)}
onChange={(e) => {
setValue(field.key, e.target.value);
field.onValueChange?.(e.target.value);
}}
sx={{ width: "100%" }}
containerSx={{ width: "100%" }}
addNewBtnClick={field.addNewButton ? () => openSubPanel({ view: SubPanelView.ADD_NEW_FORM }) : undefined}
Expand Down
Loading
Loading