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
2 changes: 1 addition & 1 deletion dist/config-import-bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/config-import-bundle.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/rest-import-bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/rest-import-bundle.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wavemaker/rest-client-ui",
"version": "0.0.17",
"version": "0.0.18",
"private": false,
"main": "./dist/core/components/RestImport.js",
"release": {
Expand Down
3 changes: 2 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ export default function App() {
viewMode: false,
monacoEditorURL: undefined as any,
responseBlockHeight: 550,
urlBasePath:""
urlBasePath:"",
settingsDetailsResponse: {}
}

return (
Expand Down
10 changes: 6 additions & 4 deletions src/core/components/RestImport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ export interface restImportConfigI {
hideMonacoEditor: (value: boolean) => void,
getServiceName: (value: string) => void,
getUseProxy: (value: boolean) => void,
urlBasePath :string
urlBasePath :string,
settingsDetailsResponse : any
}
export interface ICustomAxiosConfig extends AxiosRequestConfig {
useProxy?: boolean,
Expand Down Expand Up @@ -302,7 +303,7 @@ export default function RestImport({ language, restImportConfig }: { language: s
const [basePath, setBasePath] = useState<string>(restImportConfig?.urlBasePath)
const [basePathList, setBasePathList] = useState<string[]>([]);
const [basePathEnabled, setBasePathEnabled] = useState(!restImportConfig?.viewMode)
const [settingsDetailsResponse, setSettingsDetailsResponse] = useState({})
const [settingsDetailsResponse, setSettingsDetailsResponse] = useState(restImportConfig?.settingsDetailsResponse || {})
const [handleRes, setHandleRes] =useState<any>()
const [handleReq, setHandleReq] = useState<any>()

Expand Down Expand Up @@ -1208,7 +1209,7 @@ export default function RestImport({ language, restImportConfig }: { language: s

const handleChangeBasePath = async (event: SelectChangeEvent) => {
setBasePath(event.target.value as any);
if (Object.keys(settingsDetailsResponse).length !== 0) {
if (Object.keys(settingsDetailsResponse).length !== 0 || restImportConfig.viewMode) {
let updateSwaggerPayload: any = settingsDetailsResponse;
updateSwaggerPayload['httpRequestDetails']['urlBasePath'] = event.target.value
const url = restImportConfig?.proxy_conf?.base_path + restImportConfig?.proxy_conf?.updateSwagger
Expand All @@ -1229,7 +1230,8 @@ export default function RestImport({ language, restImportConfig }: { language: s
restImportConfig.getServiceName(updateSwaggerResponse?.serviceId)
setserviceName(updateSwaggerResponse?.serviceId)
}
handleResponse(handleRes, handleReq, updateSwaggerResponse)
if(handleRes && handleReq)
handleResponse(handleRes, handleReq, updateSwaggerResponse)
} else {
handleResponse(handleRes, handleReq)
console.log("Received an unexpected response:", response);
Expand Down
3 changes: 2 additions & 1 deletion src/test/providermodal.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ export const ProxyOFFConfig: restImportConfigI = {
viewMode: false,
setResponseHeaders: { namespace: "test" },
monacoEditorURL: "",
urlBasePath: ''
urlBasePath: '',
settingsDetailsResponse : {}
}

const mockProxyOFFProps: mockPropsI = {
Expand Down
6 changes: 4 additions & 2 deletions src/test/testdata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,8 @@ export const emptyConfig: restImportConfigI = {
setResponseHeaders: { namespace: "test" },
viewMode: false,
monacoEditorURL: "",
urlBasePath: ''
urlBasePath: '',
settingsDetailsResponse : {}
};
export const mockEmptyProps: mockPropsI = {
language: "en",
Expand Down Expand Up @@ -352,7 +353,8 @@ const configWithData: restImportConfigI = {
viewMode: false,
setResponseHeaders: { namespace: "test" },
monacoEditorURL: "",
urlBasePath: ''
urlBasePath: '',
settingsDetailsResponse : {}
};

export const preLoadedProps: mockPropsI = {
Expand Down