@digihmis/esm-patient-registration-app 1.0.0 → 1.0.2

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"registration-dashboard-link","slot":"registration-dashboard-slot","component":"leftPanelLink","meta":{"name":"patient-registration","slot":"registration-homepage-dashboard-slot","title":"search"}},{"name":"search-dashboard","slot":"search-dashboard-slot","component":"searchDashboard"},{"name":"registration-form","slot":"registration-form-slot","component":"registrationForm"},{"name":"visit-tag","slot":"patient-banner-tags-slot","component":"visitTag","online":true,"offline":true},{"name":"deceased-patient-tag","slot":"patient-banner-tags-slot","component":"deceasedPatientTag","online":true,"offline":true}],"workspaces":[{"name":"configure-identifiers","component":"identifierConfigureForm","title":"configureIdentifiersForm","type":"other-form","canMaximize":true,"width":"extra-wide"},{"name":"check-in-form","component":"checkInWorkspace","title":"checkInFormTitle","type":"other-form","canMaximize":true,"width":"extra-wide"}],"version":"1.0.0"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.24.0"},"extensions":[{"name":"registration-dashboard-link","slot":"registration-dashboard-slot","component":"leftPanelLink","meta":{"name":"patient-registration","slot":"registration-homepage-dashboard-slot","title":"search"}},{"name":"search-dashboard","slot":"search-dashboard-slot","component":"searchDashboard"},{"name":"registration-form","slot":"registration-form-slot","component":"registrationForm"},{"name":"visit-tag","slot":"patient-banner-tags-slot","component":"visitTag","online":true,"offline":true},{"name":"deceased-patient-tag","slot":"patient-banner-tags-slot","component":"deceasedPatientTag","online":true,"offline":true}],"workspaces":[{"name":"configure-identifiers","component":"identifierConfigureForm","title":"configureIdentifiersForm","type":"other-form","canMaximize":true,"width":"extra-wide"},{"name":"check-in-form","component":"checkInWorkspace","title":"checkInFormTitle","type":"other-form","canMaximize":true,"width":"extra-wide"}],"version":"1.0.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digihmis/esm-patient-registration-app",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Patient Registration microfrontend for the OpenMRS SPA",
   "browser": "dist/digihmis-esm-patient-registration-app.js",
   "main": "src/index.ts",
@@ -18,7 +18,8 @@
     "start": "openmrs develop",
     "test": "cross-env TZ=UTC jest --config jest.config.js --verbose false --passWithNoTests",
     "test:watch": "cross-env TZ=UTC jest --watch --config jest.config.js",
-    "typescript": "tsc"
+    "typescript": "tsc",
+    "prepublishOnly": "rspack --mode=production"
   },
   "browserslist": [
     "extends browserslist-config-openmrs"
@@ -37,6 +38,7 @@
     "url": "https://github.com/its-kios09/DigiHMIS-apps/issues"
   },
   "dependencies": {
+    "@digihmis/esm-commons-lib": "1.0.0",
     "lodash-es": "^4.17.15",
     "react-to-print": "2.14.13"
   },

package/src/checkin-form/checkin-form.workspace.tsx

@@ -277,10 +277,6 @@ const CheckInWorkspace: React.FC<VisitFormProps> = ({
         ...(config.showExtraVisitAttributesSlot && extraAttributes && { attributes: extraAttributes }),
       };
 
-      if (config.showExtraVisitAttributesSlot) {
-        handleCreateExtraVisitInfo?.();
-      }
-
       const abortController = new AbortController();
       if (isOnline) {
         const visitRequest = visitToEdit?.uuid
@@ -331,6 +327,11 @@ const CheckInWorkspace: React.FC<VisitFormProps> = ({
             // to update visit attributes or any other OnVisitCreatedOrUpdated actions
             const visit = response.data;
 
+            // DigiHMIS bills are visit-scoped, so bill the check-in services now that the visit exists.
+            const billingRequest = config.showExtraVisitAttributesSlot
+              ? Promise.resolve(handleCreateExtraVisitInfo?.(visit?.uuid))
+              : Promise.resolve();
+
             // For visit creation, we need to update:
             // 1. Current visit data (for critical components like visit summary, action buttons)
             // 2. Visit history table (for the paginated visit list)
@@ -364,7 +365,7 @@ const CheckInWorkspace: React.FC<VisitFormProps> = ({
               callbacks.onVisitCreatedOrUpdated(visit),
             );
 
-            return Promise.all([visitAttributesRequest, ...onVisitCreatedOrUpdatedRequests]);
+            return Promise.all([visitAttributesRequest, billingRequest, ...onVisitCreatedOrUpdatedRequests]);
           })
           .then(() => {
             closeWorkspace({ ignoreChanges: true });
@@ -375,7 +376,7 @@ const CheckInWorkspace: React.FC<VisitFormProps> = ({
       } else {
         createOfflineVisitForPatient(
           patientUuid,
-          visitLocation.uuid,
+          visitLocation?.uuid,
           config.offlineVisitTypeUuid,
           payload.startDatetime,
         ).then(

package/src/config-schema.ts

@@ -26,7 +26,7 @@ export const configSchema: ConfigSchema = {
   },
   OpenmrsIdentifierTypeUuid: {
     _type: Type.String,
-    _default: 'dfacd928-0370-4315-99d7-6ec1c9f7ae76',
+    _default: '8d793bee-c2cc-11de-8d13-0010c6dffd0f',
     _description: 'The UUID of the OpenMRS Identifier Type to be used as the main patient identifier.',
   },
   fieldConfigurations: {
@@ -51,6 +51,36 @@ export const configSchema: ConfigSchema = {
         _description: 'Whether cause of death field is required',
       },
     },
+    phone: {
+      _type: Type.Object,
+      _default: {
+        personAttributeUuid: '3af95db6-7634-4230-a433-1a003cb97c5c',
+        validation: { required: false, matches: '' },
+      },
+      _description: 'Configuration for the phone number field',
+      personAttributeUuid: {
+        _type: Type.String,
+        _default: '3af95db6-7634-4230-a433-1a003cb97c5c',
+        _description: 'The person attribute type UUID for the telephone contact',
+      },
+      validation: {
+        _type: Type.Object,
+        _default: { required: false, matches: '' },
+        _description: 'Validation rules for the phone number field',
+      },
+    },
+    email: {
+      _type: Type.Object,
+      _default: {
+        personAttributeUuid: '5d6639ba-75f3-4a3b-9517-f738d986b684',
+      },
+      _description: 'Configuration for the email address field',
+      personAttributeUuid: {
+        _type: Type.String,
+        _default: '5d6639ba-75f3-4a3b-9517-f738d986b684',
+        _description: 'The person attribute type UUID for the email address',
+      },
+    },
     gender: {
       _type: Type.Array,
       _default: [
@@ -422,6 +452,16 @@ export interface RegistrationConfig {
       conceptUuid: string;
       required: boolean;
     };
+    phone: {
+      personAttributeUuid: string;
+      validation: {
+        required: boolean;
+        matches: string;
+      };
+    };
+    email: {
+      personAttributeUuid: string;
+    };
     gender: Array<Gender>;
   };
   freeTextFieldConceptUuid: string;

package/src/icon-wrapper/icon-wrapper.extension.tsx

@@ -1,17 +1,2 @@
-import React from 'react';
-
-interface IconWrapperProps {
-  src: string;
-  alt?: string;
-  className?: string;
-  style?: React.CSSProperties;
-}
-
-export const IconWrapper: React.FC<IconWrapperProps> = ({
-  src,
-  alt = 'Icon',
-  className,
-  style = { width: '100px', height: '148px' },
-}) => {
-  return <img src={src} alt={alt} className={className} style={style} />;
-};
+// Moved to the shared library so every app uses one implementation.
+export { IconWrapper, type IconWrapperProps } from '@digihmis/esm-commons-lib';

package/src/page-header/page-header.component.tsx

@@ -1,35 +1,14 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { Calendar } from '@carbon/react/icons';
-import { useSession, formatDate, ExtensionSlot, useConfig } from '@openmrs/esm-framework';
-import styles from './page-header.scss';
-import { IconWrapper } from '../icon-wrapper/icon-wrapper.extension';
+import { useConfig } from '@openmrs/esm-framework';
+import { PageHeader as CommonPageHeader } from '@digihmis/esm-commons-lib';
 import { ConfigObject } from '../config-schema';
 
+// The shared header lives in @digihmis/esm-commons-lib; this passes the module's title + icon.
 export const PageHeader: React.FC = () => {
   const { t } = useTranslation();
-  const userSession = useSession();
   const { registrationIcon } = useConfig<ConfigObject>();
-  const userLocation = userSession?.sessionLocation?.display;
-
   return (
-    <div className={styles.header}>
-      <div className={styles['left-justified-items']}>
-        <IconWrapper src={registrationIcon.src} alt="Registration Dashboard Icon" />
-        <div className={styles['page-labels']}>
-          <p className={styles['page-name']}>{userLocation}</p>
-          <p className={styles['page-subtitle']}>{t('search', 'Search')}</p>
-        </div>
-      </div>
-      <div className={styles['right-justified-items']}>
-        <div className={styles.extensionSlot}>
-          <ExtensionSlot name={'provider-banner-slot'} />
-          <div className={styles['date-and-location']}>
-            <Calendar size={16} />
-            <span className={styles.value}>{formatDate(new Date(), { mode: 'wide', noToday: true })}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+    <CommonPageHeader title={t('search', 'Search')} iconSrc={registrationIcon.src} iconAlt="Registration Dashboard Icon" />
   );
 };

package/src/registration-form/registration-form.component.tsx

@@ -698,8 +698,13 @@ export const RegistrationForm: React.FC = () => {
       }
 
       const attributes = {};
-      if (data.phoneNumber) {
-        attributes['b2c38640-2603-4629-aebd-3b54f33f1e3a'] = data.phoneNumber;
+      const phoneAttributeUuid = fieldConfigurations?.phone?.personAttributeUuid;
+      if (data.phoneNumber && phoneAttributeUuid) {
+        attributes[phoneAttributeUuid] = data.phoneNumber;
+      }
+      const emailAttributeUuid = fieldConfigurations?.email?.personAttributeUuid;
+      if (data.email && emailAttributeUuid) {
+        attributes[emailAttributeUuid] = data.email;
       }
 
       const obs = {};

package/src/routes.json

@@ -2,7 +2,7 @@
   "$schema": "https://json.openmrs.org/routes.schema.json",
   "backendDependencies": {
     "fhir2": ">=1.2",
-    "webservices.rest": "^2.24.0"
+    "webservices.rest": ">=2.24.0"
   },
   "extensions": [
     {
@@ -25,7 +25,7 @@
       "slot": "registration-form-slot",
       "component": "registrationForm"
     },
-     {
+    {
       "name": "visit-tag",
       "slot": "patient-banner-tags-slot",
       "component": "visitTag",
@@ -44,9 +44,9 @@
     {
       "name": "configure-identifiers",
       "component": "identifierConfigureForm",
-      "title": "configureIdentifiersForm",  
+      "title": "configureIdentifiersForm",
       "type": "other-form",
-            "canMaximize": true,
+      "canMaximize": true,
       "width": "extra-wide"
     },
     {
@@ -54,9 +54,8 @@
       "component": "checkInWorkspace",
       "title": "checkInFormTitle",
       "type": "other-form",
-            "canMaximize": true,
+      "canMaximize": true,
       "width": "extra-wide"
     }
   ]
-  
-}
+}