Merge branch 'main' into O3-4970

Author: UjjawalPrabhat

packages/esm-patient-allergies-app/src/allergies/allergies-list.extension.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { Tag, TagSkeleton, Tooltip } from '@carbon/react';
 import { getCoreTranslation } from '@openmrs/esm-framework';
@@ -19,12 +20,16 @@ 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}>
+      <div className={classNames(styles.label, styles.container)}>
         <span>{t('allergies', 'Allergies')}:</span>
         {sortedAllergies.map((allergy) => (
           <Tooltip
@@ -46,7 +51,7 @@ const AllergyList: React.FC<AllergyListProps> = ({ patientUuid }) => {
   }
 
   return (
-    <div className={styles.label}>
+    <div className={classNames(styles.label, styles.container)}>
       {t('allergies', 'Allergies')}: {getCoreTranslation('unknown')}
     </div>
   );

packages/esm-patient-allergies-app/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;

packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.component.tsx

@@ -99,8 +99,14 @@ function ConditionsDetailedSummary({ patient }) {
 
   const handleConditionStatusChange = ({ selectedItem }) => setFilter(selectedItem.id);
 
-  if (isLoading) return <DataTableSkeleton role="progressbar" compact={isDesktop} zebra />;
-  if (error) return <ErrorState error={error} headerTitle={headerTitle} />;
+  if (isLoading) {
+    return <DataTableSkeleton role="progressbar" compact={isDesktop} zebra />;
+  }
+
+  if (error) {
+    return <ErrorState error={error} headerTitle={headerTitle} />;
+  }
+
   if (conditions?.length) {
     return (
       <div className={styles.widgetCard}>

packages/esm-patient-conditions-app/src/conditions/conditions-overview.component.tsx

@@ -55,7 +55,7 @@ interface ConditionsOverviewProps {
 const ConditionsOverview: React.FC<ConditionsOverviewProps> = ({ patientUuid }) => {
   const { conditionPageSize } = useConfig<ConfigObject>();
   const { t } = useTranslation();
-  const displayText = t('conditions', 'Conditions');
+  const displayText = t('conditions_lower', 'conditions');
   const headerTitle = t('conditions', 'Conditions');
   const urlLabel = t('seeAll', 'See all');
   const pageUrl = `\${openmrsSpaBase}/patient/${patientUuid}/chart/Conditions`;

packages/esm-patient-medications-app/package.json

@@ -17,7 +17,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/**/*.modal.tsx' 'src/**/*.extension.tsx' 'src/**/*.workspace.tsx' 'src/**/*.hook.tsx' 'src/index.ts' --config ../../tools/i18next-parser.config.js"
+    "extract-translations": "i18next 'src/**/*.component.tsx' 'src/**/*.modal.tsx' 'src/**/*.extension.tsx' 'src/**/*.workspace.tsx' 'src/**/*.hook.tsx' 'src/**/*.resource.ts' 'src/index.ts' --config ../../tools/i18next-parser.config.js"
   },
   "browserslist": [
     "extends browserslist-config-openmrs"

packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx

@@ -351,7 +351,7 @@ export function DrugOrderForm({
                       kind="warning"
                       lowContrast
                       className={styles.inlineNotification}
-                      title={t('errorLoadingProviders', 'Error loading clinicians list')}
+                      title={t('errorLoadingClinicians', 'Error loading clinicians')}
                       subtitle={t('tryReopeningTheForm', 'Please try launching the form again')}
                     />
                   ) : (

packages/esm-patient-medications-app/translations/am.json

@@ -15,10 +15,12 @@
   "discontinued": "Discontinued",
   "dispensingInformation": "Dispensing instructions",
   "dosageInstructions": "Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
   "dose": "Dose",
   "drugAlreadyPrescribed": "Already prescribed",
   "drugName": "Drug name",
   "drugOrders": "Drug orders",
+  "drugRequiredErrorMessage": "Drug is required",
   "duration": "Duration",
   "durationUnit": "Duration unit",
   "durationUnitPlaceholder": "Duration Unit",
@@ -33,12 +35,15 @@
   "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
   "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
   "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "errorLoadingClinicians": "Error loading clinicians",
   "female": "Female",
   "fillPrescription": "Fill prescription",
+  "freeDosageErrorMessage": "Add free dosage note",
   "freeTextDosage": "Free text dosage",
   "goToDrugOrderForm": "Order form",
   "increment": "Increment",
   "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
   "indicationPlaceholder": "e.g. \"Hypertension\"",
   "male": "Male",
   "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
@@ -48,6 +53,7 @@
   "noCliniciansFound": "No clinicians found",
   "noCliniciansFoundDescription": "Cannot select prescribing clinician because no clinicians with appropriate roles are found. Check configuration.",
   "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
   "onDate": "on",
   "or": "or",
   "orderActionDiscontinue": "Discontinue",
@@ -64,7 +70,9 @@
   "pastMedicationsTableTitle": "Past Medications",
   "patientInstructions": "Patient instructions",
   "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
   "prescribingClinician": "Prescribing Clinician",
+  "prescribingClinicianRequiredErrorMessage": "Prescribing clinician is required",
   "prescriptionDuration": "Prescription duration",
   "prescriptionInfo": "Prescription info",
   "prescriptionRefills": "Prescription refills",
@@ -85,6 +93,10 @@
   "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
   "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
   "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
   "startDate": "Start date",
   "takeAsNeeded": "Take as needed",
   "tryReopeningTheForm": "Please try launching the form again",

packages/esm-patient-medications-app/translations/ar.json

@@ -15,10 +15,12 @@
   "discontinued": "Discontinued",
   "dispensingInformation": "Dispensing instructions",
   "dosageInstructions": "Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
   "dose": "الجرعة",
   "drugAlreadyPrescribed": "تم وصفها بالفعل",
   "drugName": "Drug name",
   "drugOrders": "Drug orders",
+  "drugRequiredErrorMessage": "Drug is required",
   "duration": "المدة",
   "durationUnit": "وحدة المدة",
   "durationUnitPlaceholder": "وحدة المدة",
@@ -33,12 +35,15 @@
   "errorFetchingDrugOrderTemplates": "خطأ في جلب قوالب طلب الدواء",
   "errorFetchingDrugResults": "خطأ في جلب النتائج لـ \"{{searchTerm}}\"",
   "errorFetchingOrderConfig": "حدث خطأ عند جلب تكوين الطلب",
+  "errorLoadingClinicians": "Error loading clinicians",
   "female": "أنثى",
   "fillPrescription": "Fill prescription",
+  "freeDosageErrorMessage": "Add free dosage note",
   "freeTextDosage": "نص الجرعة الحر",
   "goToDrugOrderForm": "نموذج الطلب",
   "increment": "زيادة",
   "indication": "الدلالة",
+  "indicationErrorMessage": "Indication is required",
   "indicationPlaceholder": "مثل \"ارتفاع ضغط الدم\"",
   "male": "ذكر",
   "medicationDurationAndUnit": "لمدة {{duration}} {{durationUnit}}",
@@ -48,6 +53,7 @@
   "noCliniciansFound": "No clinicians found",
   "noCliniciansFoundDescription": "Cannot select prescribing clinician because no clinicians with appropriate roles are found. Check configuration.",
   "noResultsForDrugSearch": "لا توجد نتائج لـ \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
   "onDate": "في",
   "or": "or",
   "orderActionDiscontinue": "إيقاف",
@@ -64,7 +70,9 @@
   "pastMedicationsTableTitle": "الأدوية السابقة",
   "patientInstructions": "تعليمات المريض",
   "patientInstructionsPlaceholder": "تعليمات الجرعة الإضافية (مثل \"خذ بعد الأكل\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
   "prescribingClinician": "Prescribing Clinician",
+  "prescribingClinicianRequiredErrorMessage": "Prescribing clinician is required",
   "prescriptionDuration": "Prescription duration",
   "prescriptionInfo": "Prescription info",
   "prescriptionRefills": "إعادة الوصفة",
@@ -85,6 +93,10 @@
   "searchFieldPlaceholder": "ابحث عن دواء أو مجموعة طلبات (مثل \"أسبرين\")",
   "searchResultsMatchesForTerm_one": "{{count}} نتيجة لـ \"{{searchTerm}}\"",
   "searchResultsMatchesForTerm_other": "{{count}} نتائج لـ \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
   "startDate": "تاريخ البداية",
   "takeAsNeeded": "خذ حسب الحاجة",
   "tryReopeningTheForm": "يرجى محاولة فتح النموذج مرة أخرى",

packages/esm-patient-medications-app/translations/ar_SY.json

@@ -15,10 +15,12 @@
   "discontinued": "Discontinued",
   "dispensingInformation": "Dispensing instructions",
   "dosageInstructions": "Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
   "dose": "Dose",
   "drugAlreadyPrescribed": "Already prescribed",
   "drugName": "Drug name",
   "drugOrders": "Drug orders",
+  "drugRequiredErrorMessage": "Drug is required",
   "duration": "Duration",
   "durationUnit": "Duration unit",
   "durationUnitPlaceholder": "Duration Unit",
@@ -33,12 +35,15 @@
   "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
   "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
   "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "errorLoadingClinicians": "Error loading clinicians",
   "female": "Female",
   "fillPrescription": "Fill prescription",
+  "freeDosageErrorMessage": "Add free dosage note",
   "freeTextDosage": "Free text dosage",
   "goToDrugOrderForm": "Order form",
   "increment": "Increment",
   "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
   "indicationPlaceholder": "e.g. \"Hypertension\"",
   "male": "Male",
   "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
@@ -48,6 +53,7 @@
   "noCliniciansFound": "No clinicians found",
   "noCliniciansFoundDescription": "Cannot select prescribing clinician because no clinicians with appropriate roles are found. Check configuration.",
   "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
   "onDate": "on",
   "or": "or",
   "orderActionDiscontinue": "Discontinue",
@@ -64,7 +70,9 @@
   "pastMedicationsTableTitle": "Past Medications",
   "patientInstructions": "Patient instructions",
   "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
   "prescribingClinician": "Prescribing Clinician",
+  "prescribingClinicianRequiredErrorMessage": "Prescribing clinician is required",
   "prescriptionDuration": "Prescription duration",
   "prescriptionInfo": "Prescription info",
   "prescriptionRefills": "Prescription refills",
@@ -85,6 +93,10 @@
   "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
   "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
   "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
   "startDate": "Start date",
   "takeAsNeeded": "Take as needed",
   "tryReopeningTheForm": "Please try launching the form again",

packages/esm-patient-medications-app/translations/bn.json

@@ -15,10 +15,12 @@
   "discontinued": "Discontinued",
   "dispensingInformation": "Dispensing instructions",
   "dosageInstructions": "Dosage instructions",
+  "dosageRequiredErrorMessage": "Dosage is required",
   "dose": "Dose",
   "drugAlreadyPrescribed": "Already prescribed",
   "drugName": "Drug name",
   "drugOrders": "Drug orders",
+  "drugRequiredErrorMessage": "Drug is required",
   "duration": "Duration",
   "durationUnit": "Duration unit",
   "durationUnitPlaceholder": "Duration Unit",
@@ -33,12 +35,15 @@
   "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
   "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
   "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "errorLoadingClinicians": "Error loading clinicians",
   "female": "Female",
   "fillPrescription": "Fill prescription",
+  "freeDosageErrorMessage": "Add free dosage note",
   "freeTextDosage": "Free text dosage",
   "goToDrugOrderForm": "Order form",
   "increment": "Increment",
   "indication": "Indication",
+  "indicationErrorMessage": "Indication is required",
   "indicationPlaceholder": "e.g. \"Hypertension\"",
   "male": "Male",
   "medicationDurationAndUnit": "for {{duration}} {{durationUnit}}",
@@ -48,6 +53,7 @@
   "noCliniciansFound": "No clinicians found",
   "noCliniciansFoundDescription": "Cannot select prescribing clinician because no clinicians with appropriate roles are found. Check configuration.",
   "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
+  "numRefillsErrorMessage": "Number of refills is required",
   "onDate": "on",
   "or": "or",
   "orderActionDiscontinue": "Discontinue",
@@ -64,7 +70,9 @@
   "pastMedicationsTableTitle": "Past Medications",
   "patientInstructions": "Patient instructions",
   "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
+  "pillDispensedErrorMessage": "Quantity to dispense is required",
   "prescribingClinician": "Prescribing Clinician",
+  "prescribingClinicianRequiredErrorMessage": "Prescribing clinician is required",
   "prescriptionDuration": "Prescription duration",
   "prescriptionInfo": "Prescription info",
   "prescriptionRefills": "Prescription refills",
@@ -85,6 +93,10 @@
   "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
   "searchResultsMatchesForTerm_one": "{{count}} result for \"{{searchTerm}}\"",
   "searchResultsMatchesForTerm_other": "{{count}} results for \"{{searchTerm}}\"",
+  "selectFrequencyErrorMessage": "Frequency is required",
+  "selectQuantityUnitsErrorMessage": "Quantity unit is required",
+  "selectRouteErrorMessage": "Route is required",
+  "selectUnitErrorMessage": "Dose unit is required",
   "startDate": "Start date",
   "takeAsNeeded": "Take as needed",
   "tryReopeningTheForm": "Please try launching the form again",