@kenyaemr/esm-ward-app 7.0.3-pre.89 → 8.0.0

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0","emrapi":"^2.0.0 || 2.0.0-SNAPSHOT"},"optionalBackendDependencies":{"bedmanagement":{"version":"^6.0.0 || 6.0.0-SNAPSHOT","feature":{"flagName":"bedmanagement-module","label":"Ward App Patient Service","description":"This module, if installed, provides services for managing patients admitted to the ward."}}},"workspaces":[{"name":"admission-requests-cards","component":"admissionRequestWorkspace","title":"admissionRequests","type":"admission-requests"}],"pages":[{"component":"root","route":"ward"}],"version":"7.0.3-pre.89"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0","emrapi":"^2.0.0 || 2.0.0-SNAPSHOT"},"optionalBackendDependencies":{"bedmanagement":{"version":"^6.0.0 || 6.0.0-SNAPSHOT","feature":{"flagName":"bedmanagement-module","label":"Ward App Patient Service","description":"This module, if installed, provides services for managing patients admitted to the ward."}}},"extensions":[{"name":"ward-dashboard-link","component":"wardDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"ward","slot":"ward-dashboard-slot","title":"Wards"}},{"component":"root","name":"ward-dashboard","slot":"ward-dashboard-slot"},{"component":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"wardPatientNotesActionButtonExtension","name":"ward-inpatient-notes-form-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"transfer-swap-patient-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientTransferAndSwapWorkspaceSiderailIcon"},{"component":"admissionRequestNoteRowExtension","name":"admission-request-note-card-row","slot":"ward-patient-card-slot"}],"workspaces":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","type":"ward-patient-notes","title":"inpatientNotesWorkspaceTitle","sidebarFamily":"ward-patient","hasOwnSidebar":true},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","type":"ward","title":"Ward Patient","width":"extra-wide","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","title":"transfers","type":"transfer-swap-bed-form","hasOwnSidebar":true,"sidebarFamily":"ward-patient"}],"version":"8.0.0"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-ward-app",
-  "version": "7.0.3-pre.89",
+  "version": "8.0.0",
   "description": "Ward and bed management module for O3",
   "browser": "dist/kenyaemr-esm-ward-app.js",
   "main": "src/index.ts",
@@ -18,7 +18,7 @@
     "test:watch": "cross-env TZ=UTC jest --watch --config jest.config.js --color",
     "coverage": "yarn test --coverage",
     "typescript": "tsc",
-    "extract-translations": "i18next 'src/**/*.component.tsx' 'src/**/*.resource.ts' --config ../../tools/i18next-parser.config.js"
+    "extract-translations": "i18next 'src/**/*.component.tsx' 'src/**/*.resource.ts' 'src/index.ts' 'src/**/**.workspace.tsx' --config ../../tools/i18next-parser.config.js"
   },
   "browserslist": [
     "extends browserslist-config-openmrs"
@@ -49,6 +49,5 @@
   },
   "devDependencies": {
     "webpack": "^5.74.0"
-  },
-  "stableVersion": "7.0.2"
+  }
 }

package/src/action-menu-buttons/transfer-workspace-siderail.component.tsx

@@ -0,0 +1,27 @@
+import {
+  ActionMenuButton,
+  getGlobalStore,
+  launchWorkspace,
+  MovementIcon,
+  type DefaultWorkspaceProps,
+} from '@openmrs/esm-framework';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+interface PatientTransferAndSwapSiderailIconProps extends DefaultWorkspaceProps {}
+
+export default function PatientTransferAndSwapSiderailIcon(additionalProps: PatientTransferAndSwapSiderailIconProps) {
+  const { t } = useTranslation();
+  const handler = () => {
+    launchWorkspace('patient-transfer-swap-workspace');
+  };
+  return (
+    <ActionMenuButton
+      getIcon={(props) => <MovementIcon {...props} />}
+      label={t('transfers', 'Transfers')}
+      iconDescription={t('transfers', 'Transfers')}
+      handler={handler}
+      type="transfer-swap-bed-form"
+    />
+  );
+}

package/src/beds/empty-bed.component.tsx

@@ -10,7 +10,7 @@ interface EmptyBedProps {
 
 const EmptyBed: React.FC<EmptyBedProps> = ({ bed }) => {
   const { t } = useTranslation();
-  
+
   return (
     <div className={styles.container}>
       <span className={`${wardPatientCardStyles.wardPatientBedNumber} ${wardPatientCardStyles.empty}`}>

package/src/beds/empty-bed.scss

@@ -1,14 +1,14 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .container {
   display: flex;
-  gap: spacing.$spacing-04;
+  gap: layout.$spacing-04;
   justify-content: center;
   align-items: center;
   border: 1px dashed $ui-04;
-  padding: spacing.$spacing-03 spacing.$spacing-04;
+  padding: layout.$spacing-03 layout.$spacing-04;
   height: fit-content;
 }
 
@@ -24,5 +24,5 @@
 }
 
 .skeletonText {
-  width: 100px;
+  width: 6.25rem;
 }

package/src/beds/occupied-bed.component.tsx

@@ -1,18 +1,18 @@
-import { Tag } from '@carbon/react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import WardPatientCard from '../ward-patient-card/ward-patient-card';
+import { Tag } from '@carbon/react';
 import { type WardBedProps } from '../ward-view/ward-bed.component';
+import WardPatientCard from '../ward-patient-card/ward-patient-card.component';
 import styles from './occupied-bed.scss';
 
 const OccupiedBed: React.FC<WardBedProps> = ({ wardPatients, bed }) => {
   return (
     <div className={styles.occupiedBed}>
-      {wardPatients.map(({ patient, visit }, index: number) => {
+      {wardPatients.map((wardPatient, index: number) => {
         const last = index === wardPatients.length - 1;
         return (
-          <div key={'occupied-bed-pt-' + patient.uuid}>
-            <WardPatientCard patient={patient} visit={visit} bed={bed} />
+          <div key={'occupied-bed-pt-' + wardPatient.patient.uuid}>
+            <WardPatientCard {...wardPatient} bed={bed} />
             {!last && <BedShareDivider />}
           </div>
         );

package/src/beds/occupied-bed.scss

@@ -1,5 +1,4 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
+@use '@carbon/layout';
 @use '@openmrs/esm-styleguide/src/vars';
 
 .occupiedBed {
@@ -11,7 +10,7 @@
 .bedDivider {
   background-color: vars.$ui-02;
   color: vars.$text-02;
-  padding: spacing.$spacing-01;
+  padding: layout.$spacing-01;
   display: flex;
   align-items: center;
   justify-content: space-between;

package/src/beds/occupied-bed.test.tsx

@@ -1,37 +1,53 @@
-import { render, screen } from '@testing-library/react';
-import OccupiedBed from './occupied-bed.component';
 import React from 'react';
-import { mockAdmissionLocation } from '../../../../__mocks__/wards.mock';
-import { bedLayoutToBed, filterBeds } from '../ward-view/ward-view.resource';
+import { render, screen } from '@testing-library/react';
 import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
-import { configSchema, defaultPatientCardElementConfig } from '../config-schema';
-import { mockAdmittedPatient } from '../../../../__mocks__/ward-patient';
+import { configSchema, type WardConfigObject } from '../config-schema';
+import {
+  mockAdmissionLocation,
+  mockLocationInpatientWard,
+  mockPatientAlice,
+  mockPatientBrian,
+} from '../../../../__mocks__';
+import { bedLayoutToBed, filterBeds } from '../ward-view/ward-view.resource';
+import useWardLocation from '../hooks/useWardLocation';
+import OccupiedBed from './occupied-bed.component';
 
-const defaultConfig = getDefaultsFromConfigSchema(configSchema);
+const defaultConfig: WardConfigObject = getDefaultsFromConfigSchema(configSchema);
 
 jest.mocked(useConfig).mockReturnValue(defaultConfig);
 
 const mockBedLayouts = filterBeds(mockAdmissionLocation);
 
-const mockBedToUse = mockBedLayouts[0];
-jest.replaceProperty(mockBedToUse.patients[0].person, 'preferredName', {
-  uuid: '',
-  givenName: 'Alice',
-  familyName: 'Johnson',
+jest.mock('../hooks/useWardLocation', () => jest.fn());
+
+const mockedUseWardLocation = useWardLocation as jest.Mock;
+mockedUseWardLocation.mockReturnValue({
+  location: mockLocationInpatientWard,
+  isLoadingLocation: false,
+  errorFetchingLocation: null,
+  invalidLocation: false,
 });
+
+const mockBedToUse = mockBedLayouts[0];
 const mockBed = bedLayoutToBed(mockBedToUse);
 
-describe('Occupied bed: ', () => {
+const mockWardPatientProps = {
+  admitted: true,
+  visit: null,
+  encounterAssigningToCurrentInpatientLocation: null,
+  firstAdmissionOrTransferEncounter: null,
+};
+
+describe('Occupied bed', () => {
   it('renders a single bed with patient details', () => {
-    const mockPatient = mockAdmittedPatient.patient;
-    render(<OccupiedBed wardPatients={[{ ...mockAdmittedPatient, admitted: true }]} bed={mockBed} />);
+    render(<OccupiedBed wardPatients={[{ ...mockWardPatientProps, patient: mockPatientAlice }]} bed={mockBed} />);
     const patientName = screen.getByText('Alice Johnson');
     expect(patientName).toBeInTheDocument();
-    const patientAge = `${mockPatient.person.age} yrs`;
+    const patientAge = `${mockPatientAlice.person.age} yrs`;
     expect(screen.getByText(patientAge)).toBeInTheDocument();
-    const defaultAddressFields = defaultPatientCardElementConfig.address.addressFields;
+    const defaultAddressFields = ['cityVillage', 'country'];
     defaultAddressFields.forEach((addressField) => {
-      const addressFieldValue = mockPatient.person.preferredAddress[addressField] as string;
+      const addressFieldValue = mockPatientAlice.person.preferredAddress[addressField] as string;
       expect(screen.getByText(addressFieldValue)).toBeInTheDocument();
     });
   });
@@ -39,11 +55,11 @@ describe('Occupied bed: ', () => {
   it('renders a divider for shared patients', () => {
     render(
       <OccupiedBed
+        bed={mockBed}
         wardPatients={[
-          { ...mockAdmittedPatient, admitted: true },
-          { ...mockAdmittedPatient, admitted: true },
+          { ...mockWardPatientProps, patient: mockPatientAlice },
+          { ...mockWardPatientProps, patient: mockPatientBrian },
         ]}
-        bed={mockBed}
       />,
     );
     const bedShareText = screen.getByTitle('Bed share');

package/src/beds/unassigned-patient.component.tsx

@@ -0,0 +1,20 @@
+import React from 'react';
+import WardPatientCard from '../ward-patient-card/ward-patient-card.component';
+import styles from './unassigned-patient.scss';
+import { type WardPatient } from '../types';
+
+export interface UnassignedPatientProps {
+  wardPatient: WardPatient;
+}
+
+const UnassignedPatient: React.FC<UnassignedPatientProps> = ({ wardPatient }) => {
+  return (
+    <div className={styles.unassignedPatient}>
+      <div key={'unassigned-bed-pt-' + wardPatient.patient.uuid}>
+        <WardPatientCard {...wardPatient} />
+      </div>
+    </div>
+  );
+};
+
+export default UnassignedPatient;

package/src/beds/unassigned-patient.scss

@@ -0,0 +1,6 @@
+@use '@openmrs/esm-styleguide/src/vars';
+
+.unassignedPatient {
+  display: flex;
+  flex-direction: column;
+}

package/src/config-schema-admission-request-note.ts

@@ -0,0 +1,9 @@
+import { Type } from '@openmrs/esm-framework';
+
+export const admissionRequestNoteRowConfigSchema = {
+  conceptUuid: {
+    _type: Type.UUID,
+    _description: 'Required. Identifies the concept for the admission request note.',
+    _default: '161011AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+  },
+};

package/src/config-schema-extension-colored-obs-tags.ts

@@ -0,0 +1,91 @@
+import { Type } from '@openmrs/esm-framework';
+
+export const coloredObsTagsCardRowConfigSchema = {
+  conceptUuid: {
+    _type: Type.UUID,
+    _description: 'Required. Identifies the concept to use to identify the desired observations.',
+    // Problem list
+    _default: '1284AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+  },
+  summaryLabel: {
+    _type: Type.String,
+    _description: `Optional. The custom label or i18n key to the translated label to display for the summary tag. The summary tag shows the count of the number of answers that are present but not configured to show as their own tags. If not provided, defaults to the name of the concept.`,
+    _default: null,
+  },
+  summaryLabelI18nModule: {
+    _type: Type.String,
+    _description: 'Optional. The custom module to use for translation of the summary label',
+    _default: null,
+  },
+  summaryLabelColor: {
+    _type: Type.String,
+    _description:
+      'The color of the summary tag. See https://react.carbondesignsystem.com/?path=/docs/components-tag--overview for a list of supported colors',
+    _default: null,
+  },
+  tags: {
+    _type: Type.Array,
+    _description: `An array specifying concept sets and color. Observations with coded values that are members of the specified concept sets will be displayed as their own tags with the specified color. Any observation with coded values not belonging to any concept sets specified will be summarized as a count in the summary tag. If a concept set is listed multiple times, the first matching applied-to rule takes precedence.`,
+    _default: [],
+    _elements: {
+      color: {
+        _type: Type.String,
+        _description:
+          'Color of the tag. See https://react.carbondesignsystem.com/?path=/docs/components-tag--overview for a list of supported colors.',
+      },
+      appliedToConceptSets: {
+        _type: Type.Array,
+        _description: `The concept sets which the color applies to. Observations with coded values that are members of the specified concept sets will be displayed as their own tag with the specified color. If an observation's coded value belongs to multiple concept sets, the first matching applied-to rule takes precedence.`,
+        _elements: {
+          _type: Type.UUID,
+        },
+      },
+    },
+  },
+};
+
+export interface ColoredObsTagsCardRowConfigObject {
+  /**
+   * Required. Identifies the concept to use to identify the desired observations.
+   */
+  conceptUuid: string;
+
+  /**
+   * Optional. The custom label or i18n key to the translated label to display for the summary tag. The summary tag
+   * shows the count of the number of answers that are present but not configured to show as their own tags. If not
+   * provided, defaults to the name of the concept.
+   */
+  summaryLabel?: string;
+  /**
+   * Optional. The custom module to use for translation of the summary label
+   */
+  summaryLabelI18nModule?: string;
+
+  /**
+   * The color of the summary tag.
+   * See https://react.carbondesignsystem.com/?path=/docs/components-tag--overview for a list of supported colors
+   */
+  summaryLabelColor?: string;
+
+  /**
+   * An array specifying concept sets and color. Observations with coded values that are members of the specified concept sets
+   * will be displayed as their own tags with the specified color. Any observation with coded values not belonging to
+   * any concept sets specified will be summarized as a count in the summary tag. If a concept set is listed multiple times,
+   * the first matching applied-to rule takes precedence.
+   */
+  tags: Array<TagConfigObject>;
+}
+
+export interface TagConfigObject {
+  /**
+   * Color of the tag. See https://react.carbondesignsystem.com/?path=/docs/components-tag--overview for a list of supported colors.
+   */
+  color: string;
+
+  /**
+   * The concept sets which the color applies to. Observations with coded values that are members of the specified concept sets
+   * will be displayed as their own tag with the specified color.
+   * If an observation's coded value belongs to multiple concept sets, the first matching applied-to rule takes precedence.
+   */
+  appliedToConceptSets: Array<string>;
+}