diff --git a/Common-UI b/Common-UI index 93c9157..f2aceff 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 93c915707165d8ebeefa5c62cc087b08184b261a +Subproject commit f2acefffe6be43aa2445bd9936059233362cfc92 diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template index 85f2b1b..f46b06d 100644 --- a/src/environments/environment.ci.ts.template +++ b/src/environments/environment.ci.ts.template @@ -50,9 +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: isEnableES, app: `MMU`, encKey: sessionStorageEncKey, @@ -124,6 +127,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.dev.ts b/src/environments/environment.dev.ts index ad2353e..c2d520e 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 7fe69f6..eb068e1 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 ea23922..eb57f2a 100644 --- a/src/environments/environment.local.ts +++ b/src/environments/environment.local.ts @@ -67,10 +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: isEnableES, tracking: { platform: 'matomo', @@ -143,6 +145,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 281f54e..b34f8ac 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -67,10 +67,12 @@ const captchaChallengeURL = ''; const enableCaptcha = false; const enableCHOReportBtn = true; const dhisURL = ''; +const isEnableES = true; export const environment = { production: true, encKey: sessionStorageEncKey, + isEnableES: isEnableES, tracking: { platform: 'matomo', @@ -143,6 +145,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 ecfc00f..e14d4c9 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -65,10 +65,12 @@ const sessionStorageEncKey = ''; const siteKey = ''; const captchaChallengeURL = ''; const enableCaptcha = false; +const isEnableES = true; export const environment = { production: false, encKey: sessionStorageEncKey, + isEnableES: isEnableES, tracking: { platform: 'matomo', @@ -141,6 +143,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`,