diff --git a/health/micro-ui/web/micro-ui-internals/example/src/setupProxy.js b/health/micro-ui/web/micro-ui-internals/example/src/setupProxy.js index 57c7ae98a98..01fcaab2b5c 100644 --- a/health/micro-ui/web/micro-ui-internals/example/src/setupProxy.js +++ b/health/micro-ui/web/micro-ui-internals/example/src/setupProxy.js @@ -84,7 +84,6 @@ module.exports = function (app) { "/mdms-v2", "/hcm-moz-impl", "/project", - "/project/staff/v1/_search", "/project/v1/_search", "/facility/v1/_search", "/product/v1/_search", @@ -107,6 +106,7 @@ module.exports = function (app) { "/health-expense-calculator/v1/_calculate", "/filestore/v1/files/id", "/health-project/staff/v1/_search", + "/project/staff/v1/_search", "/health-project/v1/_search", "/health-individual", "/health-hrms/employees", diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/health-dss/src/configs/InboxConfig.js b/health/micro-ui/web/micro-ui-internals/packages/modules/health-dss/src/configs/InboxConfig.js index 0eb74fa472a..1ca687b5fba 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/health-dss/src/configs/InboxConfig.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/health-dss/src/configs/InboxConfig.js @@ -8,7 +8,10 @@ export const InboxConfig = { label: "ALL_CAMPAIGNS", type: "search", apiDetails: { - serviceName: `/health-project/staff/v1/_search`, + serviceName: + window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH") + ? `${String(window.globalConfigs.getConfig("PROJECT_SERVICE_PATH")).replace(/\/+$/,"")}/staff/v1/_search` + : "/project/staff/v1/_search", requestParam: {}, requestBody: { ProjectStaff: {}, @@ -104,7 +107,10 @@ export const InboxConfig = { label: "PAST_CAMPAIGNS", type: "search", apiDetails: { - serviceName: `/health-project/staff/v1/_search`, + serviceName: + window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH") + ? `${String(window.globalConfigs.getConfig("PROJECT_SERVICE_PATH")).replace(/\/+$/,"")}/staff/v1/_search` + : "/project/staff/v1/_search", requestParam: {}, requestBody: { ProjectStaff: {}, @@ -200,7 +206,10 @@ export const InboxConfig = { label: "LIVE_CAMPAIGNS", type: "search", apiDetails: { - serviceName: `/health-project/staff/v1/_search`, + serviceName: + window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH") + ? `${String(window.globalConfigs.getConfig("PROJECT_SERVICE_PATH")).replace(/\/+$/,"")}/staff/v1/_search` + : "/project/staff/v1/_search", requestParam: {}, requestBody: { ProjectStaff: {}, diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/health-dss/src/services/ProjectService.js b/health/micro-ui/web/micro-ui-internals/packages/modules/health-dss/src/services/ProjectService.js index 47294d36d6f..11f49ee74b2 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/health-dss/src/services/ProjectService.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/health-dss/src/services/ProjectService.js @@ -2,7 +2,10 @@ export const ProjectService = { staffSearch: async ({ body, params }) => { try { const response = await Digit.CustomService.getResponse({ - url: "/health-project/staff/v1/_search", + url: + window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH") + ? `${String(window.globalConfigs.getConfig("PROJECT_SERVICE_PATH")).replace(/\/+$/, "")}/staff/v1/_search` + : "/project/staff/v1/_search", useCache: false, method: "POST", userService: true, @@ -20,7 +23,10 @@ export const ProjectService = { projectSearch: async ({ body, params }) => { try { const response = await Digit.CustomService.getResponse({ - url: `/health-project/v1/_search`, + url: + window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH") + ? `${String(window.globalConfigs.getConfig("PROJECT_SERVICE_PATH")).replace(/\/+$/, "")}/v1/_search` + : "/project/v1/_search", useCache: false, method: "POST", userService: true,