From e673a058c995392b3ad6cbab91a9571bed29a57b Mon Sep 17 00:00:00 2001 From: Ashwin Sharma Date: Thu, 30 Jul 2020 16:05:02 +0000 Subject: Clamp react ui to use url pathname dynamically instead of hardcoded prefix for calling apis Issue-ID: CLAMP-914 Signed-off-by: Ashwin Sharma Change-Id: I266aeafe9a543e95bcb96fcab6437227c148f8c4 --- ui-react/src/api/LoopActionService.js | 4 ++-- ui-react/src/api/LoopService.js | 20 ++++++++++---------- ui-react/src/api/PolicyToscaService.js | 10 +++++----- ui-react/src/api/TemplateService.js | 16 ++++++++-------- ui-react/src/api/UserService.js | 4 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) (limited to 'ui-react/src/api') diff --git a/ui-react/src/api/LoopActionService.js b/ui-react/src/api/LoopActionService.js index 7cea3ff9f..bff812a2f 100644 --- a/ui-react/src/api/LoopActionService.js +++ b/ui-react/src/api/LoopActionService.js @@ -26,7 +26,7 @@ export default class LoopActionService{ static performAction(cl_name, uiAction) { console.info("LoopActionService perform action: " + uiAction + " closedloopName=" + cl_name); const svcAction = uiAction.toLowerCase(); - return fetch("/restservices/clds/v2/loop/" + svcAction + "/" + cl_name, { + return fetch(window.location.pathname + "restservices/clds/v2/loop/" + svcAction + "/" + cl_name, { method: 'PUT', credentials: 'same-origin' }) @@ -51,7 +51,7 @@ export default class LoopActionService{ static refreshStatus(cl_name) { console.info("Refresh the status for closedloopName=" + cl_name); - return fetch("/restservices/clds/v2/loop/getstatus/" + cl_name, { + return fetch(window.location.pathname + "restservices/clds/v2/loop/getstatus/" + cl_name, { method: 'GET', credentials: 'same-origin' }) diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js index c45df6c61..96bb8a0a7 100644 --- a/ui-react/src/api/LoopService.js +++ b/ui-react/src/api/LoopService.js @@ -22,7 +22,7 @@ export default class LoopService { static getLoopNames() { - return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' }) + return fetch(window.location.pathname + 'restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' }) .then(function (response) { console.debug("GetLoopNames response received: ", response.status); if (response.ok) { @@ -39,7 +39,7 @@ export default class LoopService { } static createLoop(loopName, templateName) { - return fetch('/restservices/clds/v2/loop/create/' + loopName + '?templateName=' + templateName, { + return fetch(window.location.pathname + 'restservices/clds/v2/loop/create/' + loopName + '?templateName=' + templateName, { method: 'POST', headers: { "Content-Type": "application/json" @@ -57,7 +57,7 @@ export default class LoopService { } static getLoop(loopName) { - return fetch('/restservices/clds/v2/loop/' + loopName, { + return fetch(window.location.pathname + 'restservices/clds/v2/loop/' + loopName, { method: 'GET', headers: { "Content-Type": "application/json" @@ -80,7 +80,7 @@ export default class LoopService { } static setMicroServiceProperties(loopName, jsonData) { - return fetch('/restservices/clds/v2/loop/updateMicroservicePolicy/' + loopName, { + return fetch(window.location.pathname + 'restservices/clds/v2/loop/updateMicroservicePolicy/' + loopName, { method: 'POST', credentials: 'same-origin', headers: { @@ -104,7 +104,7 @@ export default class LoopService { } static setOperationalPolicyProperties(loopName, jsonData) { - return fetch('/restservices/clds/v2/loop/updateOperationalPolicies/' + loopName, { + return fetch(window.location.pathname + 'restservices/clds/v2/loop/updateOperationalPolicies/' + loopName, { method: 'POST', credentials: 'same-origin', headers: { @@ -128,7 +128,7 @@ export default class LoopService { } static updateGlobalProperties(loopName, jsonData) { - return fetch('/restservices/clds/v2/loop/updateGlobalProperties/' + loopName, { + return fetch(window.location.pathname + 'restservices/clds/v2/loop/updateGlobalProperties/' + loopName, { method: 'POST', credentials: 'same-origin', headers: { @@ -152,7 +152,7 @@ export default class LoopService { } static refreshOperationalPolicyJson(loopName,operationalPolicyName) { - return fetch('/restservices/clds/v2/loop/refreshOperationalPolicyJsonSchema/' + loopName + '/' + operationalPolicyName, { + return fetch(window.location.pathname + 'restservices/clds/v2/loop/refreshOperationalPolicyJsonSchema/' + loopName + '/' + operationalPolicyName, { method: 'PUT', headers: { "Content-Type": "application/json" @@ -175,7 +175,7 @@ export default class LoopService { } static refreshMicroServicePolicyJson(loopName,microServicePolicyName) { - return fetch('/restservices/clds/v2/loop/refreshMicroServicePolicyJsonSchema/' + loopName + '/' + microServicePolicyName, { + return fetch(window.location.pathname + 'restservices/clds/v2/loop/refreshMicroServicePolicyJsonSchema/' + loopName + '/' + microServicePolicyName, { method: 'PUT', headers: { "Content-Type": "application/json" @@ -198,7 +198,7 @@ export default class LoopService { } static addOperationalPolicyType(loopName, policyType, policyVersion) { - return fetch('/restservices/clds/v2/loop/addOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , { + return fetch(window.location.pathname + 'restservices/clds/v2/loop/addOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , { method: 'PUT', headers: { "Content-Type": "application/json" @@ -220,7 +220,7 @@ export default class LoopService { } static removeOperationalPolicyType(loopName, policyType, policyVersion, policyName) { - return fetch('/restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion + '/' + policyName , { + return fetch(window.location.pathname + 'restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion + '/' + policyName , { method: 'PUT', headers: { "Content-Type": "application/json" diff --git a/ui-react/src/api/PolicyToscaService.js b/ui-react/src/api/PolicyToscaService.js index 610a11418..a7bc140b6 100644 --- a/ui-react/src/api/PolicyToscaService.js +++ b/ui-react/src/api/PolicyToscaService.js @@ -22,7 +22,7 @@ export default class PolicyToscaService { static getToscaPolicyModels() { - return fetch('restservices/clds/v2/policyToscaModels', { method: 'GET', credentials: 'same-origin' }) + return fetch(window.location.pathname + 'restservices/clds/v2/policyToscaModels', { method: 'GET', credentials: 'same-origin' }) .then(function (response) { console.debug("getToscaPolicyModels response received: ", response.status); if (response.ok) { @@ -39,7 +39,7 @@ export default class PolicyToscaService { } static getToscaPolicyModelYaml(policyModelType, policyModelVersion) { - return fetch('/restservices/clds/v2/policyToscaModels/yaml/' + policyModelType + "/" + policyModelVersion, { + return fetch(window.location.pathname + 'restservices/clds/v2/policyToscaModels/yaml/' + policyModelType + "/" + policyModelVersion, { method: 'GET', credentials: 'same-origin' }) @@ -59,7 +59,7 @@ export default class PolicyToscaService { } static getToscaPolicyModel(policyModelType, policyModelVersion) { - return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType + "/" + policyModelVersion, { + return fetch(window.location.pathname + 'restservices/clds/v2/policyToscaModels/' + policyModelType + "/" + policyModelVersion, { method: 'GET', credentials: 'same-origin' }) @@ -79,7 +79,7 @@ export default class PolicyToscaService { } static createPolicyModelFromToscaModel(jsonData) { - return fetch('/restservices/clds/v2/policyToscaModels', { + return fetch(window.location.pathname + 'restservices/clds/v2/policyToscaModels', { method: 'POST', credentials: 'same-origin', headers: { @@ -107,7 +107,7 @@ export default class PolicyToscaService { } static updatePolicyModelTosca(policyModelType, policyModelVersion, jsonData) { - return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType + '/' + policyModelVersion, { + return fetch(window.location.pathname + 'restservices/clds/v2/policyToscaModels/' + policyModelType + '/' + policyModelVersion, { method: 'PUT', credentials: 'same-origin', headers: { diff --git a/ui-react/src/api/TemplateService.js b/ui-react/src/api/TemplateService.js index 7d8a3400e..08436f2b8 100644 --- a/ui-react/src/api/TemplateService.js +++ b/ui-react/src/api/TemplateService.js @@ -23,7 +23,7 @@ export default class TemplateService { static getLoopNames() { - return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' }) + return fetch(window.location.pathname + 'restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' }) .then(function (response) { console.debug("getLoopNames response received: ", response.status); if (response.ok) { @@ -40,7 +40,7 @@ export default class TemplateService { } static getAllLoopTemplates() { - return fetch('restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', }) + return fetch(window.location.pathname + 'restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', }) .then(function (response) { console.debug("getAllLoopTemplates response received: ", response.status); if (response.ok) { @@ -57,7 +57,7 @@ export default class TemplateService { } static getDictionary() { - return fetch('restservices/clds/v2/dictionary/', { method: 'GET', credentials: 'same-origin', }) + return fetch(window.location.pathname + 'restservices/clds/v2/dictionary/', { method: 'GET', credentials: 'same-origin', }) .then(function (response) { console.debug("getDictionary response received: ", response.status); if (response.ok) { @@ -74,7 +74,7 @@ export default class TemplateService { } static getDictionaryElements(dictionaryName) { - return fetch('restservices/clds/v2/dictionary/' + dictionaryName, { + return fetch(window.location.pathname + 'restservices/clds/v2/dictionary/' + dictionaryName, { method: 'GET', headers: { "Content-Type": "application/json", @@ -98,7 +98,7 @@ export default class TemplateService { static insDictionary(jsonData) { console.log("dictionaryName is", jsonData.name) - return fetch('/restservices/clds/v2/dictionary/', { + return fetch(window.location.pathname + 'restservices/clds/v2/dictionary/', { method: 'PUT', credentials: 'same-origin', headers: { @@ -124,7 +124,7 @@ export default class TemplateService { static insDictionaryElements(jsonData) { console.log("dictionaryName is", jsonData.name) - return fetch('/restservices/clds/v2/dictionary/' + jsonData.name, { + return fetch(window.location.pathname + 'restservices/clds/v2/dictionary/' + jsonData.name, { method: 'PUT', credentials: 'same-origin', headers: { @@ -150,7 +150,7 @@ export default class TemplateService { static deleteDictionary(dictionaryName) { console.log("inside templaemenu service", dictionaryName) - return fetch('restservices/clds/v2/dictionary/' + dictionaryName, { + return fetch(window.location.pathname + 'restservices/clds/v2/dictionary/' + dictionaryName, { method: 'DELETE', headers: { "Content-Type": "application/json", @@ -173,7 +173,7 @@ export default class TemplateService { } static deleteDictionaryElements(dictionaryData) { - return fetch('restservices/clds/v2/dictionary/' + dictionaryData.name + '/elements/' + dictionaryData.shortName , { + return fetch(window.location.pathname + 'restservices/clds/v2/dictionary/' + dictionaryData.name + '/elements/' + dictionaryData.shortName , { method: 'DELETE', headers: { "Content-Type": "application/json", diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js index 477ca4269..5fb4aa6b4 100644 --- a/ui-react/src/api/UserService.js +++ b/ui-react/src/api/UserService.js @@ -24,7 +24,7 @@ export default class UserService { static notLoggedUserName='Anonymous'; static login() { - return fetch('/restservices/clds/v1/user/getUser', { + return fetch(window.location.pathname + 'restservices/clds/v1/user/getUser', { method: 'GET', credentials: 'same-origin' }) @@ -49,7 +49,7 @@ export default class UserService { } static getUserInfo() { - return fetch('/restservices/clds/v2/clampInformation', { + return fetch(window.location.pathname + 'restservices/clds/v2/clampInformation', { method: 'GET', credentials: 'same-origin' }) -- cgit 1.2.3-korg