@openmrs/esm-patient-allergies-app 11.3.1-patch.9064 → 11.3.1-patch.9310

package/src/allergies/allergies-list.extension.tsx

@@ -1,17 +1,18 @@
 import React from 'react';
-import { useTranslation } from 'react-i18next';
+import classNames from 'classnames';
 import { Tag, TagSkeleton, Tooltip } from '@carbon/react';
-import { getCoreTranslation } from '@openmrs/esm-framework';
+import { getCoreTranslation, translateFrom } from '@openmrs/esm-framework';
 import { useAllergies } from './allergy-intolerance.resource';
 import { severityOrder } from '../utils';
 import styles from './allergies-list.scss';
 
+const moduleName = '@openmrs/esm-patient-allergies-app';
+
 interface AllergyListProps {
   patientUuid: string;
 }
 
 const AllergyList: React.FC<AllergyListProps> = ({ patientUuid }) => {
-  const { t } = useTranslation();
   const { allergies, isLoading } = useAllergies(patientUuid);
 
   const sortedAllergies = allergies?.sort(
@@ -19,18 +20,22 @@ const AllergyList: React.FC<AllergyListProps> = ({ patientUuid }) => {
   );
 
   if (isLoading) {
-    return <TagSkeleton />;
+    return (
+      <div className={styles.container}>
+        <TagSkeleton />
+      </div>
+    );
   }
 
   if (sortedAllergies?.length) {
     return (
-      <div className={styles.label}>
-        <span>{t('allergies', 'Allergies')}:</span>
+      <div className={classNames(styles.label, styles.container)}>
+        <span>{translateFrom(moduleName, 'allergies', 'Allergies')}:</span>
         {sortedAllergies.map((allergy) => (
           <Tooltip
             align="bottom"
             key={allergy.id}
-            label={`${allergy.reactionToSubstance} - ${allergy.reactionSeverity || getCoreTranslation('unknown')}`}
+            label={`${allergy.reactionToSubstance} - ${allergy.reactionSeverity ? translateFrom(moduleName, allergy.reactionSeverity) : getCoreTranslation('unknown')}`}
           >
             <Tag
               className={styles.allergyLabel}
@@ -46,8 +51,8 @@ const AllergyList: React.FC<AllergyListProps> = ({ patientUuid }) => {
   }
 
   return (
-    <div className={styles.label}>
-      {t('allergies', 'Allergies')}: {getCoreTranslation('unknown')}
+    <div className={classNames(styles.label, styles.container)}>
+      {translateFrom(moduleName, 'allergies', 'Allergies')}: {getCoreTranslation('unknown')}
     </div>
   );
 };

package/src/allergies/allergies-list.scss

@@ -3,6 +3,10 @@
 @use '@carbon/type';
 @use '@openmrs/esm-styleguide/src/vars' as *;
 
+.container {
+  margin: layout.$spacing-03 layout.$spacing-05;
+}
+
 .label {
   @include type.type-style('label-01');
   color: $text-02;

package/src/allergies/allergies-overview.component.tsx

@@ -13,7 +13,7 @@ import {
   TableRow,
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { AddIcon, launchWorkspace, useLayoutType, usePagination } from '@openmrs/esm-framework';
+import { AddIcon, launchWorkspace2, useLayoutType, usePagination } from '@openmrs/esm-framework';
 import { CardHeader, EmptyState, ErrorState, PatientChartPagination } from '@openmrs/esm-patient-common-lib';
 import { allergiesCount, patientAllergiesFormWorkspace } from '../constants';
 import { useAllergies } from './allergy-intolerance.resource';
@@ -57,7 +57,7 @@ const AllergiesOverview: React.FC<AllergiesOverviewProps> = ({ patient }) => {
     }));
   }, [paginatedAllergies]);
 
-  const launchAllergiesForm = useCallback(() => launchWorkspace(patientAllergiesFormWorkspace), []);
+  const launchAllergiesForm = useCallback(() => launchWorkspace2(patientAllergiesFormWorkspace), []);
 
   if (isLoading) {
     return <DataTableSkeleton role="progressbar" compact={isDesktop} zebra />;

package/src/index.ts

@@ -51,7 +51,6 @@ export const allergiesDashboardLink = getSyncLifecycle(
   options,
 );
 
-// t('recordNewAllergy', "Record a new allergy")
 export const allergyFormWorkspace = getAsyncLifecycle(
   () => import('./allergies/allergies-form/allergy-form.workspace'),
   options,

package/src/routes.json

@@ -2,7 +2,7 @@
   "$schema": "https://json.openmrs.org/routes.schema.json",
   "backendDependencies": {
     "fhir2": ">=1.2",
-    "webservices.rest": "^2.2.0"
+    "webservices.rest": ">=2.2.0"
   },
   "extensions": [
     {
@@ -44,12 +44,17 @@
       "component": "deleteAllergyModal"
     }
   ],
-  "workspaces": [
+  "workspaces2": [
     {
       "name": "patient-allergy-form-workspace",
-      "title": "recordNewAllergy",
       "component": "allergyFormWorkspace",
-      "type": "form"
+      "window": "patient-allergy-form-window"
+    }
+  ],
+  "workspaceWindows2": [
+    {
+      "name": "patient-allergy-form-window",
+      "group": "patient-chart"
     }
   ]
 }

package/translations/fr.json

@@ -48,5 +48,5 @@
   "typeAdditionalComments": "Ajouter ici tous commentaires additionnels",
   "typeAllergenName": "Veuillez saisir le nom de l'allergène",
   "typeAllergicReactionName": "Veuillez saisir le nom de la réaction allergique",
-  "unknown": "Unknown"
+  "unknown": "Inconnu(e)"
 }