Skip to content

Commit a1b0b67

Browse files
BUGFIX/HCMPRE-11112: Formatting changes
1 parent bd1558d commit a1b0b67

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

health/micro-ui/web/micro-ui-internals/packages/modules/health-dss/src/configs/InboxConfig.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ export const InboxConfig = {
88
label: "ALL_CAMPAIGNS",
99
type: "search",
1010
apiDetails: {
11-
serviceName: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/staff/v1/_search` || "/project/staff/v1/_search",
11+
serviceName:
12+
window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")
13+
? `${String(window.globalConfigs.getConfig("PROJECT_SERVICE_PATH")).replace(/\/+$/,"")}/staff/v1/_search`
14+
: "/project/staff/v1/_search",
1215
requestParam: {},
1316
requestBody: {
1417
ProjectStaff: {},
@@ -104,7 +107,10 @@ export const InboxConfig = {
104107
label: "PAST_CAMPAIGNS",
105108
type: "search",
106109
apiDetails: {
107-
serviceName: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/staff/v1/_search` || "/project/staff/v1/_search",
110+
serviceName:
111+
window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")
112+
? `${String(window.globalConfigs.getConfig("PROJECT_SERVICE_PATH")).replace(/\/+$/,"")}/staff/v1/_search`
113+
: "/project/staff/v1/_search",
108114
requestParam: {},
109115
requestBody: {
110116
ProjectStaff: {},
@@ -200,7 +206,10 @@ export const InboxConfig = {
200206
label: "LIVE_CAMPAIGNS",
201207
type: "search",
202208
apiDetails: {
203-
serviceName: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/staff/v1/_search` || "/project/staff/v1/_search",
209+
serviceName:
210+
window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")
211+
? `${String(window.globalConfigs.getConfig("PROJECT_SERVICE_PATH")).replace(/\/+$/,"")}/staff/v1/_search`
212+
: "/project/staff/v1/_search",
204213
requestParam: {},
205214
requestBody: {
206215
ProjectStaff: {},

health/micro-ui/web/micro-ui-internals/packages/modules/health-dss/src/services/ProjectService.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ export const ProjectService = {
22
staffSearch: async ({ body, params }) => {
33
try {
44
const response = await Digit.CustomService.getResponse({
5-
url: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/staff/v1/_search` || "/project/staff/v1/_search",
5+
url:
6+
window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")
7+
? `${String(window.globalConfigs.getConfig("PROJECT_SERVICE_PATH")).replace(/\/+$/, "")}/staff/v1/_search`
8+
: "/project/staff/v1/_search",
69
useCache: false,
710
method: "POST",
811
userService: true,
@@ -20,7 +23,10 @@ export const ProjectService = {
2023
projectSearch: async ({ body, params }) => {
2124
try {
2225
const response = await Digit.CustomService.getResponse({
23-
url: `${window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")}/v1/_search` || "/project/v1/_search",
26+
url:
27+
window?.globalConfigs?.getConfig("PROJECT_SERVICE_PATH")
28+
? `${String(window.globalConfigs.getConfig("PROJECT_SERVICE_PATH")).replace(/\/+$/, "")}/v1/_search`
29+
: "/project/v1/_search",
2430
useCache: false,
2531
method: "POST",
2632
userService: true,

0 commit comments

Comments
 (0)