@kenyaemr/esm-patient-registration-app 8.1.2-pre.238 → 8.1.2-pre.240

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.0"},"pages":[{"component":"root","route":"patient-registration","online":true,"offline":true},{"component":"editPatient","routeRegex":"patient\\/([a-zA-Z0-9\\-]+)\\/edit","online":true,"offline":true}],"extensions":[{"component":"addPatientLink","name":"add-patient-action","slot":"top-nav-actions-slot","online":true,"offline":true},{"component":"patientPhotoExtension","name":"patient-photo-widget","slot":"patient-photo-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-actions-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-search-actions-slot","online":true,"offline":true}],"modals":[{"name":"cancel-patient-edit-modal","component":"cancelPatientEditModal"},{"name":"delete-identifier-confirmation-modal","component":"deleteIdentifierConfirmationModal"},{"component":"emptyClientRegistryModal","name":"empty-client-registry-modal"},{"component":"confirmClientRegistryModal","name":"confirm-client-registry-modal"},{"component":"hieConfirmationModal","name":"hie-confirmation-modal"}],"version":"8.1.2-pre.238"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.0"},"pages":[{"component":"root","route":"patient-registration","online":true,"offline":true},{"component":"editPatient","routeRegex":"patient\\/([a-zA-Z0-9\\-]+)\\/edit","online":true,"offline":true}],"extensions":[{"component":"addPatientLink","name":"add-patient-action","slot":"top-nav-actions-slot","online":true,"offline":true},{"component":"patientPhotoExtension","name":"patient-photo-widget","slot":"patient-photo-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-actions-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-search-actions-slot","online":true,"offline":true}],"modals":[{"name":"cancel-patient-edit-modal","component":"cancelPatientEditModal"},{"name":"delete-identifier-confirmation-modal","component":"deleteIdentifierConfirmationModal"},{"component":"emptyClientRegistryModal","name":"empty-client-registry-modal"},{"component":"confirmClientRegistryModal","name":"confirm-client-registry-modal"},{"component":"hieConfirmationModal","name":"hie-confirmation-modal"}],"version":"8.1.2-pre.240"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-patient-registration-app",
-  "version": "8.1.2-pre.238",
+  "version": "8.1.2-pre.240",
   "description": "Patient registration microfrontend for the OpenMRS SPA",
   "browser": "dist/kenyaemr-esm-patient-registration-app.js",
   "main": "src/index.ts",

package/src/patient-registration/field/custom-field.component.tsx

@@ -14,8 +14,31 @@ export function CustomField({ name }: CustomFieldProps) {
   const config = useConfig() as RegistrationConfig;
   const fieldDefinition = config.fieldDefinitions.filter((def) => def.id == name)[0];
 
-  const [{ value }] = useField(`attributes.${fieldDefinition.showWhenExpression?.field}`);
-  if (fieldDefinition.showWhenExpression && value !== fieldDefinition.showWhenExpression.value) {
+  let watchFieldPath: string | null = null;
+
+  if (fieldDefinition.showWhenExpression) {
+    const { field: watchedFieldUuid } = fieldDefinition.showWhenExpression;
+    const watchedFieldDefinition = config.fieldDefinitions.find((def) => def.uuid === watchedFieldUuid);
+
+    if (watchedFieldDefinition?.type === 'obs') {
+      watchFieldPath = `obs.${watchedFieldUuid}`;
+    } else if (watchedFieldDefinition?.type === 'person attribute') {
+      watchFieldPath = `attributes.${watchedFieldUuid}`;
+    } else {
+      watchFieldPath = `attributes.${watchedFieldUuid}`;
+    }
+  }
+
+  const [{ value: currentValue }] = useField(watchFieldPath || 'dummy');
+
+  let shouldShow = true;
+
+  if (fieldDefinition.showWhenExpression && watchFieldPath) {
+    const { value: expectedValue } = fieldDefinition.showWhenExpression;
+    shouldShow = currentValue === expectedValue;
+  }
+
+  if (!shouldShow) {
     return null;
   }