Add modifications according to reviews

I-TECH-UW · Oct 1, 2024 · 94c4504 · 94c4504
1 parent b0fbac3
commit 94c4504
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/frontend/src/components/patient/SearchPatientForm.js b/frontend/src/components/patient/SearchPatientForm.js
@@ -455,8 +455,7 @@ function SearchPatientForm(props) {
                   />
                 </Button>
               </Column>
-              {configurationProperties.MAKE_CLIENT_REGISTRY_CONFIGURABLE ===
-                "true" && (
+              {configurationProperties.ENABLE_CLIENT_REGISTRY === "true" && (
                 <Column lg={4} md={4} sm={2}>
                   <Toggle
                     labelText="Client Registry Search"

diff --git a/src/main/java/org/openelisglobal/common/rest/DisplayListController.java b/src/main/java/org/openelisglobal/common/rest/DisplayListController.java
@@ -367,8 +367,8 @@ private Map<String, String> getOpenConfigurationProperties() {
                 ConfigurationProperties.getInstance().getPropertyValue(Property.configurationName));
         configs.put(Property.REQUIRE_LAB_UNIT_AT_LOGIN.toString(),
                 ConfigurationProperties.getInstance().getPropertyValue(Property.REQUIRE_LAB_UNIT_AT_LOGIN));
-        configs.put(Property.MAKE_CLIENT_REGISTRY_CONFIGURABLE.toString(),
-                ConfigurationProperties.getInstance().getPropertyValue(Property.MAKE_CLIENT_REGISTRY_CONFIGURABLE));
+        configs.put(Property.ENABLE_CLIENT_REGISTRY.toString(),
+                ConfigurationProperties.getInstance().getPropertyValue(Property.ENABLE_CLIENT_REGISTRY));
         return configs;
     }
 

diff --git a/src/main/java/org/openelisglobal/common/rest/provider/PatientSearchRestController.java b/src/main/java/org/openelisglobal/common/rest/provider/PatientSearchRestController.java
@@ -109,7 +109,7 @@ public PatientSearchResultsForm getPatientResults(HttpServletRequest request,
                 }
             }
 
-            if (ConfigurationProperties.getInstance().getPropertyValue(Property.MAKE_CLIENT_REGISTRY_CONFIGURABLE)
+            if (ConfigurationProperties.getInstance().getPropertyValue(Property.ENABLE_CLIENT_REGISTRY)
                     .equals("true")) {
                 String crSearchParam = request.getParameter("crSearch");
                 if (crSearchParam != null && crSearchParam.contains("true")) {

diff --git a/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java b/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java
@@ -197,7 +197,8 @@ public enum Property {
         PATIENT_RESULTS_SMTP_ENABLED("patientresultssmtp.enabled"), //
         CONTACT_TRACING("contactTracingEnabled"), //
         REQUIRE_LAB_UNIT_AT_LOGIN("requireLabUnitAtLogin"), //
-        MAKE_CLIENT_REGISTRY_CONFIGURABLE("clientRegistryConfigurable");
+        ENABLE_CLIENT_REGISTRY("Enable Client Registry"); // if true, then client registry search option is visible on
+                                                          // the ui
 
         private String name;
 

diff --git a/src/main/java/org/openelisglobal/common/util/DefaultConfigurationProperties.java b/src/main/java/org/openelisglobal/common/util/DefaultConfigurationProperties.java
@@ -214,8 +214,8 @@ public class DefaultConfigurationProperties extends ConfigurationProperties {
                 Property.USE_ALPHANUM_ACCESSION_PREFIX.getName(), "false");
         setDBPropertyMappingAndDefault(Property.REQUIRE_LAB_UNIT_AT_LOGIN, Property.REQUIRE_LAB_UNIT_AT_LOGIN.getName(),
                 "false");
-        setDBPropertyMappingAndDefault(Property.MAKE_CLIENT_REGISTRY_CONFIGURABLE,
-                Property.MAKE_CLIENT_REGISTRY_CONFIGURABLE.getName(), "false");
+        setDBPropertyMappingAndDefault(Property.ENABLE_CLIENT_REGISTRY, Property.ENABLE_CLIENT_REGISTRY.getName(),
+                "false");
     }
 
     private void setDBPropertyMappingAndDefault(Property property, String dbName, String defaultValue) {

diff --git a/src/main/resources/liquibase/2.8.x.x/base.xml b/src/main/resources/liquibase/2.8.x.x/base.xml
@@ -23,5 +23,5 @@
   <include relativeToChangelogFile="true" file="notification_subscriptions.xml" />
   <include relativeToChangelogFile="true" file="method.xml" />
   <include relativeToChangelogFile="true" file="landing_page_config.xml" />
-  <include relativeToChangelogFile="true" file="client_registry_search_configurable.xml" />
+  <include relativeToChangelogFile="true" file="enable_client_registry_search.xml" />
 </databaseChangeLog>
diff --git a/...x/client_registry_search_configurable.xml → ...2.8.x.x/enable_client_registry_search.xml b/...x/client_registry_search_configurable.xml → ...2.8.x.x/enable_client_registry_search.xml
@@ -8,16 +8,16 @@
 
     <changeSet author="mherman22" id="1">
         <preConditions onFail="MARK_RAN">
-            <sqlCheck expectedResult="0">select count(*) from clinlims.site_information where name = 'clientRegistryConfigurable'; </sqlCheck>
+            <sqlCheck expectedResult="0">select count(*) from clinlims.site_information where name = 'Enable Client Registry'; </sqlCheck>
         </preConditions>
-        <comment>add Config to make client registry search configurable</comment>
+        <comment>add Config to enable client registry search</comment>
         <insert schemaName="clinlims" tableName="site_information">
             <column name="id" valueSequenceNext="site_information_seq" />
-            <column name="name" value="clientRegistryConfigurable" />
+            <column name="name" value="Enable Client Registry" />
             <column name="lastupdated" valueComputed="${now}" />
             <column name="description" value="Enable Client Registry Search" />
             <column name="encrypted" value="false" />
-            <column name="domain_id" valueComputed="(SELECT id FROM site_information_domain WHERE name = 'siteIdentity')" />
+            <column name="domain_id" valueComputed="(SELECT id FROM site_information_domain WHERE name = 'patientEntryConfig')" />
             <column name="value_type" value="boolean" />
             <column name="value" value="false" />
             <column name="group" value="0" />