From eb14e92fa9e96839d262cb2b3acbe452f79b18e9 Mon Sep 17 00:00:00 2001
From: Ponnarasi <ponnarasi.arumugasamy@wavemaker.com>
Date: Mon, 10 Mar 2025 17:09:10 +0530
Subject: [PATCH] Fixed BasePath UI alignment and set service name

---
 package-lock.json                  |  4 ++--
 package.json                       |  2 +-
 src/core/components/RestImport.tsx | 30 ++++++++++++++++++------------
 src/jsx/locales/en.json            |  3 ++-
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8f95db0..af43568 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@wavemaker/rest-client-ui",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@wavemaker/rest-client-ui",
-      "version": "0.0.16",
+      "version": "0.0.17",
       "dependencies": {
         "@babel/runtime-corejs3": "^7.22.6",
         "@braintree/sanitize-url": "=6.0.2",
diff --git a/package.json b/package.json
index d3b1210..e22f7d7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wavemaker/rest-client-ui",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "private": false,
   "main": "./dist/core/components/RestImport.js",
   "release": {
diff --git a/src/core/components/RestImport.tsx b/src/core/components/RestImport.tsx
index 9d00c3d..813cd19 100644
--- a/src/core/components/RestImport.tsx
+++ b/src/core/components/RestImport.tsx
@@ -1222,10 +1222,16 @@ export default function RestImport({ language, restImportConfig }: { language: s
                     withCredentials: true
                 };
             const response: any = await Apicall(updateSwagger);
-            handleResponse(handleRes, handleReq, response)
-            if (response.status === 200) {
+            
+            if (response.status >= 200 && response.status < 300) {
                 const updateSwaggerResponse = response.data
+                if (!restImportConfig.viewMode) {
+                    restImportConfig.getServiceName(updateSwaggerResponse?.serviceId)
+                    setserviceName(updateSwaggerResponse?.serviceId)
+                }
+                handleResponse(handleRes, handleReq, updateSwaggerResponse)
             } else {
+                handleResponse(handleRes, handleReq)
                 console.log("Received an unexpected response:", response);
             }
         }
@@ -1271,8 +1277,8 @@ export default function RestImport({ language, restImportConfig }: { language: s
                             <Button className='test-btn' name="wm-webservice-sample-test" onClick={handleTestClick} variant='contained'>{translate('TEST')}</Button>
                         </Stack>
                         <Grid mt={2} container>
-                            <Grid item md={3}>
-                                <Stack sx={{ cursor: "pointer" }} spacing={2} display={'flex'} alignItems={'center'} direction={'row'}>
+                            <Grid item md={4}>
+                                <Stack sx={{ cursor: "pointer" }}  display={'flex'} alignItems={'center'} direction={'row'}>
                                     <Typography>{translate('SERVICE_NAME')}</Typography>
                                     <TextField value={serviceName}
                                         className='url-input service-input'
@@ -1289,17 +1295,17 @@ export default function RestImport({ language, restImportConfig }: { language: s
                                         }} disabled={serviceNameEnabled || restImportConfig.viewMode} size='small' />
                                 </Stack>
                             </Grid>
-                            <Grid item md={3} pr={2}>
+                            <Grid item md={4} px={2}>
                                 <Stack sx={{ cursor: "pointer" }} spacing={2} display={'flex'} alignItems={'center'} direction={'row'}>
-                                <Typography sx={{ margin: '10px' }}>{translate("BASE_PATH")}</Typography>
+                                <Typography sx={{ marginRight: '15px' }}>{translate("BASE_PATH")}</Typography>
                                 <FormControl size='small' sx={{width:'200px'}}>
                                     <Select
-                                        className='form-control-select'
+                                        className='form-control-select service-base-path'
                                         name="wm-base-path"
                                         data-testid="base-path"
                                         value={basePath}
                                         title={basePath}
-                                        inputProps={{ readOnly: basePathEnabled}}
+                                        disabled={ basePathEnabled}
                                         onChange={handleChangeBasePath}
                                     >
                                         {basePathList.map((basePath) => <MenuItem key={basePath} title={basePath} value={basePath}>{basePath}</MenuItem>)}
@@ -1307,8 +1313,8 @@ export default function RestImport({ language, restImportConfig }: { language: s
                                 </FormControl>
                                 </Stack>
                             </Grid>
-                            <Grid item md={3}>
-                                <Stack spacing={2} display={'flex'} alignItems={'center'} direction={'row'}>
+                            <Grid item md={2}>
+                                <Stack display={'flex'} alignItems={'center'} direction={'row'}>
                                     <Typography>{translate('USE_PROXY')}</Typography>
                                     <Switch name="wm-webservice-use-proxy" data-testid="proxy-switch" checked={useProxy} onChange={handleChangeProxy} />
                                     <Tooltip
@@ -1321,8 +1327,8 @@ export default function RestImport({ language, restImportConfig }: { language: s
                                 </Stack>
                             </Grid>
                             {!useProxy &&
-                                <Grid item md={3}>
-                                    <Stack spacing={2} display={'flex'} alignItems={'center'} direction={'row'}>
+                                <Grid item md={2}>
+                                    <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} />
                                         <Tooltip
diff --git a/src/jsx/locales/en.json b/src/jsx/locales/en.json
index 86c9b2d..f7f3e95 100644
--- a/src/jsx/locales/en.json
+++ b/src/jsx/locales/en.json
@@ -104,5 +104,6 @@
   "CODE_CHALLENGE": "Code Challenge method which your oAuth provider supports for PKCE.",
   "USEPROXY_TOOLTIP": "Disable the Use Proxy to make a direct call to the target API for bypassing the proxy server. There may be issues if the API does not allow Cross Origin Resource Sharing.<br><br><u>Note</u>: \nUse Proxy should be enabled if you want to configure a Header or Query param as a Server Side Property. A server side param is sent from the proxy server and is hidden from the UI.",
   "WITH_CREDENTIALS_TOOLTIP": "Check this if the cookies from the endpoint API should be set and honored by the browser.",
-  "CHANGE_PROVIDER": "Change Provider"
+  "CHANGE_PROVIDER": "Change Provider",
+  "BASE_PATH": "Base Path"
 }