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
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.18",
"version": "0.0.19",
"private": false,
"main": "./dist/core/components/RestImport.js",
"release": {
Expand Down
5 changes: 4 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ export default function App() {
monacoEditorURL: undefined as any,
responseBlockHeight: 550,
urlBasePath:"",
settingsDetailsResponse: {}
settingsDetailsResponse: {},
handleUpdateSwaggerResponse: (updateSwaggerResponse) =>{
console.log(updateSwaggerResponse)
}
}

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

useEffect(() => {
if (!window.google) {
Expand Down Expand Up @@ -829,8 +828,6 @@ export default function RestImport({ language, restImportConfig }: { language: s

setloading(true)
const response: any = await Apicall(requestConfig as AxiosRequestConfig)
setHandleReq(requestConfig)
setHandleRes(response)
if (response.status >= 200 && response.status < 300) {
if (providerId) {
if (response.status === 401 || response.data.statusCode === 401) {
Expand Down Expand Up @@ -1117,8 +1114,6 @@ export default function RestImport({ language, restImportConfig }: { language: s
const config = useProxy ? configWProxy : configWOProxy
setloading(true)
const response: any = await Apicall(config as AxiosRequestConfig)
setHandleReq(config)
setHandleRes(response)
if (response.status >= 200 && response.status < 300) {
if (response.data.statusCode === 200) {
const settingsUploadData = await settingsUpload(config, response)
Expand Down Expand Up @@ -1230,10 +1225,8 @@ export default function RestImport({ language, restImportConfig }: { language: s
restImportConfig.getServiceName(updateSwaggerResponse?.serviceId)
setserviceName(updateSwaggerResponse?.serviceId)
}
if(handleRes && handleReq)
handleResponse(handleRes, handleReq, updateSwaggerResponse)
restImportConfig.handleUpdateSwaggerResponse(updateSwaggerResponse)
} else {
handleResponse(handleRes, handleReq)
console.log("Received an unexpected response:", response);
}
}
Expand Down Expand Up @@ -1297,10 +1290,10 @@ export default function RestImport({ language, restImportConfig }: { language: s
}} disabled={serviceNameEnabled || restImportConfig.viewMode} size='small' />
</Stack>
</Grid>
<Grid item md={4} px={2}>
<Grid item md={3} px={1}>
<Stack sx={{ cursor: "pointer" }} spacing={2} display={'flex'} alignItems={'center'} direction={'row'}>
<Typography sx={{ marginRight: '15px' }}>{translate("BASE_PATH")}</Typography>
<FormControl size='small' sx={{width:'200px'}}>
<FormControl size='small'>
<Select
className='form-control-select service-base-path'
name="wm-base-path"
Expand Down Expand Up @@ -1329,7 +1322,7 @@ export default function RestImport({ language, restImportConfig }: { language: s
</Stack>
</Grid>
{!useProxy &&
<Grid item md={2}>
<Grid item md={3}>
<Stack display={'flex'} alignItems={'center'} direction={'row'}>
<Typography>{translate('WITH_CREDENTIALS')}</Typography>
<Switch name="wm-webservice-with-credentials" data-testid="with-credentials" checked={withCredentials} onChange={handleChangeWithCredentials} />
Expand Down
3 changes: 3 additions & 0 deletions src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@
color: #212121;
border-color: #d3d3d3;
}
.service-base-path{
width: 12em;
}


}
4 changes: 3 additions & 1 deletion src/test/providermodal.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ export const ProxyOFFConfig: restImportConfigI = {
setResponseHeaders: { namespace: "test" },
monacoEditorURL: "",
urlBasePath: '',
settingsDetailsResponse : {}
settingsDetailsResponse : {},
handleUpdateSwaggerResponse: (updateSwaggerResponse: any) => {}

}

const mockProxyOFFProps: mockPropsI = {
Expand Down
7 changes: 5 additions & 2 deletions src/test/testdata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,8 @@ export const emptyConfig: restImportConfigI = {
viewMode: false,
monacoEditorURL: "",
urlBasePath: '',
settingsDetailsResponse : {}
settingsDetailsResponse : {},
handleUpdateSwaggerResponse: (updateSwaggerResponse: any) => {}
};
export const mockEmptyProps: mockPropsI = {
language: "en",
Expand Down Expand Up @@ -354,7 +355,9 @@ const configWithData: restImportConfigI = {
setResponseHeaders: { namespace: "test" },
monacoEditorURL: "",
urlBasePath: '',
settingsDetailsResponse : {}
settingsDetailsResponse : {},
handleUpdateSwaggerResponse: (updateSwaggerResponse: any) => {}

};

export const preLoadedProps: mockPropsI = {
Expand Down