From 76fc50a3b2416210c7c95f96f1a64006126e78a1 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 19 Dec 2025 15:31:52 +0530 Subject: [PATCH 1/3] fix: elastic search changes added isenabled boolean variable --- Common-UI | 2 +- src/environments/environment.ci.ts.template | 4 ++++ src/environments/environment.local.ts | 3 +++ src/environments/environment.prod.ts | 2 ++ src/environments/environment.test.ts | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 93c91570..20a21fc5 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 93c915707165d8ebeefa5c62cc087b08184b261a +Subproject commit 20a21fc58bac618d8acbee1453e1699176603921 diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template index 85f2b1b2..6ac92c19 100644 --- a/src/environments/environment.ci.ts.template +++ b/src/environments/environment.ci.ts.template @@ -53,6 +53,7 @@ const dhisURL = '<%= DHIS_URL %>' ; export const environment = { production: true, + isEnableES: true, app: `MMU`, encKey: sessionStorageEncKey, @@ -124,6 +125,9 @@ export const environment = { registrarMasterDataUrl: `${HWC_API}registrar/registrarMasterData`, quickSearchUrl: `${HWC_API}registrar/quickSearch`, identityQuickSearchUrl: `${HWC_API}registrar/quickSearchNew`, + elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, + + advanceSearchUrl: `${HWC_API}registrar/advanceSearch`, advanceSearchIdentityUrl: `${HWC_API}registrar/advanceSearchNew`, externalSearchIdentityUrl: `${FHIR_API}patient/data/profile/search/demographic`, diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts index ea23922b..4d089550 100644 --- a/src/environments/environment.local.ts +++ b/src/environments/environment.local.ts @@ -71,6 +71,7 @@ const dhisURL = 'http://abc.xyz.org/dhis2-web-public/Reports.html?auth='; //samp export const environment = { production: false, encKey: sessionStorageEncKey, + isEnableES: true, tracking: { platform: 'matomo', @@ -143,6 +144,8 @@ export const environment = { registrarMasterDataUrl: `${HWC_API}registrar/registrarMasterData`, quickSearchUrl: `${HWC_API}registrar/quickSearch`, identityQuickSearchUrl: `${HWC_API}registrar/quickSearchNew`, + elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, + advanceSearchUrl: `${HWC_API}registrar/advanceSearch`, advanceSearchIdentityUrl: `${HWC_API}registrar/advanceSearchNew`, externalSearchIdentityUrl: `${FHIR_API}patient/data/profile/search/demographic`, diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 281f54e4..e8040a6a 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -71,6 +71,7 @@ const dhisURL = ''; export const environment = { production: true, encKey: sessionStorageEncKey, + isEnableES: true, tracking: { platform: 'matomo', @@ -143,6 +144,7 @@ export const environment = { registrarMasterDataUrl: `${HWC_API}registrar/registrarMasterData`, quickSearchUrl: `${HWC_API}registrar/quickSearch`, identityQuickSearchUrl: `${HWC_API}registrar/quickSearchNew`, + elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, advanceSearchUrl: `${HWC_API}registrar/advanceSearch`, advanceSearchIdentityUrl: `${HWC_API}registrar/advanceSearchNew`, externalSearchIdentityUrl: `${FHIR_API}patient/data/profile/search/demographic`, diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index ecfc00fd..6f3c180b 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -69,6 +69,7 @@ const enableCaptcha = false; export const environment = { production: false, encKey: sessionStorageEncKey, + isEnableES: true, tracking: { platform: 'matomo', @@ -141,6 +142,7 @@ export const environment = { registrarMasterDataUrl: `${HWC_API}registrar/registrarMasterData`, quickSearchUrl: `${HWC_API}registrar/quickSearch`, identityQuickSearchUrl: `${HWC_API}registrar/quickSearchNew`, + elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, advanceSearchUrl: `${HWC_API}registrar/advanceSearch`, advanceSearchIdentityUrl: `${HWC_API}registrar/advanceSearchNew`, externalSearchIdentityUrl: `${FHIR_API}patient/data/profile/search/demographic`, From 2076d807c6d1c862e0ffd5c97bd67993b37c3e08 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 19 Dec 2025 17:36:55 +0530 Subject: [PATCH 2/3] fix: elastic search changes added isenabled boolean variable --- src/environments/environment.ci.ts.template | 4 +++- src/environments/environment.dev.ts | 2 ++ src/environments/environment.development.ts | 2 ++ src/environments/environment.local.ts | 3 ++- src/environments/environment.prod.ts | 3 ++- src/environments/environment.test.ts | 3 ++- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template index 6ac92c19..f46b06de 100644 --- a/src/environments/environment.ci.ts.template +++ b/src/environments/environment.ci.ts.template @@ -50,10 +50,12 @@ const captchaChallengeURL = '<%= CAPTCHA_CHALLENGE_URL %>'; const enableCaptcha = <%= ENABLE_CAPTCHA %>; const enableCHOReportBtn = <%= ENABLE_CHO_REPORT_BUTTON %> ; const dhisURL = '<%= DHIS_URL %>' ; +const isEnableES = '<%= ISENABLE_ELASTICSEARCH_IN_UI>'; + export const environment = { production: true, - isEnableES: true, + isEnableES: isEnableES, app: `MMU`, encKey: sessionStorageEncKey, diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index ad2353e5..c2d520ec 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -66,10 +66,12 @@ const captchaChallengeURL = ''; const enableCaptcha = false; const enableCHOReportBtn = true; const dhisURL = ''; +const isEnableES = true; export const environment = { production: false, encKey: sessionStorageEncKey, + isEnableES: isEnableES, tracking: { platform: 'matomo', diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts index 7fe69f6c..eb068e13 100644 --- a/src/environments/environment.development.ts +++ b/src/environments/environment.development.ts @@ -67,10 +67,12 @@ const captchaChallengeURL = ''; const enableCaptcha = false; const enableCHOReportBtn = true; const dhisURL = ''; +const isEnableES = true; export const environment = { production: false, encKey: sessionStorageEncKey, + isEnableES: isEnableES, tracking: { platform: 'matomo', diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts index 4d089550..eb57f2ab 100644 --- a/src/environments/environment.local.ts +++ b/src/environments/environment.local.ts @@ -67,11 +67,12 @@ const captchaChallengeURL = ''; const enableCaptcha = false; const enableCHOReportBtn = true; const dhisURL = 'http://abc.xyz.org/dhis2-web-public/Reports.html?auth='; //sample +const isEnableES = true; export const environment = { production: false, encKey: sessionStorageEncKey, - isEnableES: true, + isEnableES: isEnableES, tracking: { platform: 'matomo', diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index e8040a6a..b34f8ac6 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -67,11 +67,12 @@ const captchaChallengeURL = ''; const enableCaptcha = false; const enableCHOReportBtn = true; const dhisURL = ''; +const isEnableES = true; export const environment = { production: true, encKey: sessionStorageEncKey, - isEnableES: true, + isEnableES: isEnableES, tracking: { platform: 'matomo', diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index 6f3c180b..e14d4c98 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -65,11 +65,12 @@ const sessionStorageEncKey = ''; const siteKey = ''; const captchaChallengeURL = ''; const enableCaptcha = false; +const isEnableES = true; export const environment = { production: false, encKey: sessionStorageEncKey, - isEnableES: true, + isEnableES: isEnableES, tracking: { platform: 'matomo', From b92dcb934d66853dc9aef35b5673767a21506353 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 31 Dec 2025 15:03:42 +0530 Subject: [PATCH 3/3] fix: pushing the common ui code of 3.6.1 --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 20a21fc5..f2acefff 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 20a21fc58bac618d8acbee1453e1699176603921 +Subproject commit f2acefffe6be43aa2445bd9936059233362cfc92