From 4c3017139c5ab58fea39418d808b9d0c9aaf16f1 Mon Sep 17 00:00:00 2001
From: Abishek <abishek.t@egovernments.org>
Date: Wed, 20 Aug 2025 18:30:34 +0530
Subject: [PATCH 1/6] BUGFIX/HCMPRE-11111: Changing Url
 health-project/staff/_search to project/staff/_search

---
 .../web/micro-ui-internals/example/src/setupProxy.js        | 2 +-
 .../packages/modules/health-dss/src/configs/InboxConfig.js  | 6 +++---
 .../modules/health-dss/src/services/ProjectService.js       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

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..5370908a900 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,7 @@ export const InboxConfig = {
       label: "ALL_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: `/health-project/staff/v1/_search`,
+        serviceName: `/project/staff/v1/_search`,
         requestParam: {},
         requestBody: {
           ProjectStaff: {},
@@ -104,7 +104,7 @@ export const InboxConfig = {
       label: "PAST_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: `/health-project/staff/v1/_search`,
+        serviceName: `/project/staff/v1/_search`,
         requestParam: {},
         requestBody: {
           ProjectStaff: {},
@@ -200,7 +200,7 @@ export const InboxConfig = {
       label: "LIVE_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: `/health-project/staff/v1/_search`,
+        serviceName: `/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..7d133b64baf 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,7 @@ export const ProjectService = {
   staffSearch: async ({ body, params }) => {
     try {
       const response = await Digit.CustomService.getResponse({
-        url: "/health-project/staff/v1/_search",
+        url: "/project/staff/v1/_search",
         useCache: false,
         method: "POST",
         userService: true,
@@ -20,7 +20,7 @@ export const ProjectService = {
   projectSearch: async ({ body, params }) => {
     try {
       const response = await Digit.CustomService.getResponse({
-        url: `/health-project/v1/_search`,
+        url: `/project/v1/_search`,
         useCache: false,
         method: "POST",
         userService: true,

From d7bd765a86c07439f399454fba1405a0710e26f3 Mon Sep 17 00:00:00 2001
From: Abishek <abishek.t@egovernments.org>
Date: Wed, 20 Aug 2025 19:29:34 +0530
Subject: [PATCH 2/6] BUGFIX/HCMPRE-11111: Using globalConfig for
 project/staff/v1/_search

---
 .../packages/modules/health-dss/src/configs/InboxConfig.js  | 6 +++---
 .../modules/health-dss/src/services/ProjectService.js       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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 5370908a900..e18550ae8ae 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,7 @@ export const InboxConfig = {
       label: "ALL_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: `/project/staff/v1/_search`,
+        serviceName:  window.globalConfigs?.getConfig("PROJECT_SEARCH_API") || `/project/staff/v1/_search`,
         requestParam: {},
         requestBody: {
           ProjectStaff: {},
@@ -104,7 +104,7 @@ export const InboxConfig = {
       label: "PAST_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: `/project/staff/v1/_search`,
+        serviceName: window.globalConfigs?.getConfig("PROJECT_SEARCH_API") || `/project/staff/v1/_search`,
         requestParam: {},
         requestBody: {
           ProjectStaff: {},
@@ -200,7 +200,7 @@ export const InboxConfig = {
       label: "LIVE_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: `/project/staff/v1/_search`,
+        serviceName: window.globalConfigs?.getConfig("PROJECT_SEARCH_API") || `/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 7d133b64baf..e4232f542cf 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,7 @@ export const ProjectService = {
   staffSearch: async ({ body, params }) => {
     try {
       const response = await Digit.CustomService.getResponse({
-        url: "/project/staff/v1/_search",
+        url: window.globalConfigs?.getConfig("PROJECT_SEARCH_API") || `/project/staff/v1/_search`,
         useCache: false,
         method: "POST",
         userService: true,

From a228298fe95067bf4af9853cc8f7439002919a65 Mon Sep 17 00:00:00 2001
From: Abishek <abishek.t@egovernments.org>
Date: Wed, 20 Aug 2025 19:36:52 +0530
Subject: [PATCH 3/6] BUGFIX/HCMPRE-11111:  Staff search and normal search in
 globalCondif for project service

---
 .../packages/modules/health-dss/src/configs/InboxConfig.js  | 6 +++---
 .../modules/health-dss/src/services/ProjectService.js       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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 e18550ae8ae..18692e32041 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,7 @@ export const InboxConfig = {
       label: "ALL_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName:  window.globalConfigs?.getConfig("PROJECT_SEARCH_API") || `/project/staff/v1/_search`,
+        serviceName:  window.globalConfigs?.getConfig("PROJECT_STAFF_SEARCH_API") || `/project/staff/v1/_search`,
         requestParam: {},
         requestBody: {
           ProjectStaff: {},
@@ -104,7 +104,7 @@ export const InboxConfig = {
       label: "PAST_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: window.globalConfigs?.getConfig("PROJECT_SEARCH_API") || `/project/staff/v1/_search`,
+        serviceName: window.globalConfigs?.getConfig("PROJECT_STAFF_SEARCH_API") || `/project/staff/v1/_search`,
         requestParam: {},
         requestBody: {
           ProjectStaff: {},
@@ -200,7 +200,7 @@ export const InboxConfig = {
       label: "LIVE_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: window.globalConfigs?.getConfig("PROJECT_SEARCH_API") || `/project/staff/v1/_search`,
+        serviceName: window.globalConfigs?.getConfig("PROJECT_STAFF_SEARCH_API") || `/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 e4232f542cf..c82be717ed9 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,7 @@ export const ProjectService = {
   staffSearch: async ({ body, params }) => {
     try {
       const response = await Digit.CustomService.getResponse({
-        url: window.globalConfigs?.getConfig("PROJECT_SEARCH_API") || `/project/staff/v1/_search`,
+        url: window.globalConfigs?.getConfig("PROJECT_STAFF_SEARCH_API") || `/project/staff/v1/_search`,
         useCache: false,
         method: "POST",
         userService: true,
@@ -20,7 +20,7 @@ export const ProjectService = {
   projectSearch: async ({ body, params }) => {
     try {
       const response = await Digit.CustomService.getResponse({
-        url: `/project/v1/_search`,
+        url: window.globalConfigs?.getConfig("PROJECT_SEARCH_API") || `/project/v1/_search`,
         useCache: false,
         method: "POST",
         userService: true,

From fc736950f7c7c299e056f98948a8b98ef76f8689 Mon Sep 17 00:00:00 2001
From: Abishek <abishek.t@egovernments.org>
Date: Thu, 21 Aug 2025 12:13:23 +0530
Subject: [PATCH 4/6] BUGFIX/HCMPRE-11111: Changes using globalConfig

---
 .../packages/modules/health-dss/src/configs/InboxConfig.js  | 6 +++---
 .../modules/health-dss/src/services/ProjectService.js       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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 18692e32041..173ac74d8a8 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,7 @@ export const InboxConfig = {
       label: "ALL_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName:  window.globalConfigs?.getConfig("PROJECT_STAFF_SEARCH_API") || `/project/staff/v1/_search`,
+        serviceName: `${window.globalConfigs?.getConfig("PROJECT_SERVICE")}/staff/v1/_search` || "/project/staff/v1/_search",
         requestParam: {},
         requestBody: {
           ProjectStaff: {},
@@ -104,7 +104,7 @@ export const InboxConfig = {
       label: "PAST_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: window.globalConfigs?.getConfig("PROJECT_STAFF_SEARCH_API") || `/project/staff/v1/_search`,
+        serviceName: `${window.globalConfigs?.getConfig("PROJECT_SERVICE")}/staff/v1/_search` || "/project/staff/v1/_search",
         requestParam: {},
         requestBody: {
           ProjectStaff: {},
@@ -200,7 +200,7 @@ export const InboxConfig = {
       label: "LIVE_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: window.globalConfigs?.getConfig("PROJECT_STAFF_SEARCH_API") || `/project/staff/v1/_search`,
+        serviceName: `${window.globalConfigs?.getConfig("PROJECT_SERVICE")}/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 c82be717ed9..703e50064d2 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,7 @@ export const ProjectService = {
   staffSearch: async ({ body, params }) => {
     try {
       const response = await Digit.CustomService.getResponse({
-        url: window.globalConfigs?.getConfig("PROJECT_STAFF_SEARCH_API") || `/project/staff/v1/_search`,
+        url: `${window.globalConfigs?.getConfig("PROJECT_SERVICE")}/staff/v1/_search` || "/project/staff/v1/_search",
         useCache: false,
         method: "POST",
         userService: true,
@@ -20,7 +20,7 @@ export const ProjectService = {
   projectSearch: async ({ body, params }) => {
     try {
       const response = await Digit.CustomService.getResponse({
-        url: window.globalConfigs?.getConfig("PROJECT_SEARCH_API") || `/project/v1/_search`,
+        url: `${window.globalConfigs?.getConfig("PROJECT_SERVICE")}/v1/_search` || "/project/v1/_search",
         useCache: false,
         method: "POST",
         userService: true,

From bd1558d88416822ac35fed25f2e47224d2bd3025 Mon Sep 17 00:00:00 2001
From: Abishek <abishek.t@egovernments.org>
Date: Thu, 21 Aug 2025 14:28:15 +0530
Subject: [PATCH 5/6] BUGFIX/HCMPRE-11112: context-path change for
 health-project sevice

---
 .../packages/modules/health-dss/src/configs/InboxConfig.js  | 6 +++---
 .../modules/health-dss/src/services/ProjectService.js       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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 173ac74d8a8..714d2069338 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,7 @@ export const InboxConfig = {
       label: "ALL_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: `${window.globalConfigs?.getConfig("PROJECT_SERVICE")}/staff/v1/_search` || "/project/staff/v1/_search",
+        serviceName: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/staff/v1/_search` || "/project/staff/v1/_search",
         requestParam: {},
         requestBody: {
           ProjectStaff: {},
@@ -104,7 +104,7 @@ export const InboxConfig = {
       label: "PAST_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: `${window.globalConfigs?.getConfig("PROJECT_SERVICE")}/staff/v1/_search` || "/project/staff/v1/_search",
+        serviceName: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/staff/v1/_search` || "/project/staff/v1/_search",
         requestParam: {},
         requestBody: {
           ProjectStaff: {},
@@ -200,7 +200,7 @@ export const InboxConfig = {
       label: "LIVE_CAMPAIGNS",
       type: "search",
       apiDetails: {
-        serviceName: `${window.globalConfigs?.getConfig("PROJECT_SERVICE")}/staff/v1/_search` || "/project/staff/v1/_search",
+        serviceName: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/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 703e50064d2..9430ebc3e29 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,7 @@ export const ProjectService = {
   staffSearch: async ({ body, params }) => {
     try {
       const response = await Digit.CustomService.getResponse({
-        url: `${window.globalConfigs?.getConfig("PROJECT_SERVICE")}/staff/v1/_search` || "/project/staff/v1/_search",
+        url: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/staff/v1/_search` || "/project/staff/v1/_search",
         useCache: false,
         method: "POST",
         userService: true,
@@ -20,7 +20,7 @@ export const ProjectService = {
   projectSearch: async ({ body, params }) => {
     try {
       const response = await Digit.CustomService.getResponse({
-        url: `${window.globalConfigs?.getConfig("PROJECT_SERVICE")}/v1/_search` || "/project/v1/_search",
+        url: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/v1/_search` || "/project/v1/_search",
         useCache: false,
         method: "POST",
         userService: true,

From a1b0b67b77c7f13b5fb16a45b16ae5646f1d4cc0 Mon Sep 17 00:00:00 2001
From: Abishek <abishek.t@egovernments.org>
Date: Thu, 21 Aug 2025 14:41:23 +0530
Subject: [PATCH 6/6] BUGFIX/HCMPRE-11112: Formatting changes

---
 .../modules/health-dss/src/configs/InboxConfig.js | 15 ++++++++++++---
 .../health-dss/src/services/ProjectService.js     | 10 ++++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

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 714d2069338..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: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/staff/v1/_search` || "/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: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/staff/v1/_search` || "/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: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/staff/v1/_search` || "/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 9430ebc3e29..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: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/staff/v1/_search` || "/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: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/v1/_search` || "/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,