From fa659143fa9534ded7a09b5a9a0ab2940a3e0f55 Mon Sep 17 00:00:00 2001 From: Ponnarasi Date: Mon, 5 May 2025 12:55:44 +0530 Subject: [PATCH] Added empty option in basepath --- package-lock.json | 4 ++-- package.json | 2 +- src/core/components/RestImport.tsx | 10 +++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62b757a..7d13f03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@wavemaker/rest-client-ui", - "version": "0.0.20", + "version": "0.0.21", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@wavemaker/rest-client-ui", - "version": "0.0.20", + "version": "0.0.21", "dependencies": { "@babel/runtime-corejs3": "^7.22.6", "@braintree/sanitize-url": "=6.0.2", diff --git a/package.json b/package.json index 4a4a880..246e4e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@wavemaker/rest-client-ui", - "version": "0.0.20", + "version": "0.0.21", "private": false, "main": "./dist/core/components/RestImport.js", "release": { diff --git a/src/core/components/RestImport.tsx b/src/core/components/RestImport.tsx index 1714439..2c48458 100644 --- a/src/core/components/RestImport.tsx +++ b/src/core/components/RestImport.tsx @@ -345,9 +345,13 @@ export default function RestImport({ language, restImportConfig }: { language: s }); const filteredParts = firstValidIndex === -1 ? parts : parts.slice(0, firstValidIndex); - const basePathDetails = filteredParts.map((_, index) => decodeURIComponent("/" + filteredParts.slice(0, index + 1).join("/"))); + const basePathDetails = ["empty"]; + for (let i = 0; i < filteredParts.length; i++) { + const segment = filteredParts.slice(0, i + 1).join("/"); + basePathDetails.push(decodeURIComponent(segment)); + } if(basePathDetails.length > 0){ - setBasePath(restImportConfig?.urlBasePath ? restImportConfig?.urlBasePath : basePathDetails[0]); + setBasePath(restImportConfig?.urlBasePath ? restImportConfig?.urlBasePath : basePathDetails[1]); } setBasePathList(basePathDetails) } catch (error) { @@ -983,7 +987,7 @@ export default function RestImport({ language, restImportConfig }: { language: s statusCode: response?.status, }, requestBody: bodyParams, - urlBasePath : basePathEnabled ? '' : basePath + urlBasePath : basePathEnabled ? null : basePath }; const dataConfig: AxiosRequestConfig = { url: restImportConfig.proxy_conf.base_path + restImportConfig.proxy_conf.settingsUpload,