@kenyaemr/esm-patient-list-management-app 8.0.1-pre.99 → 8.0.2

package/src/lists-dashboard/lists-dashboard.component.tsx

@@ -2,12 +2,12 @@ import React, { useMemo, useState } from 'react';
 import classnames from 'classnames';
 import { useLocation } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { Tab, Tabs, TabList } from '@carbon/react';
-import { navigate } from '@openmrs/esm-framework';
+import { Tab, Tabs, TabList, Button } from '@carbon/react';
+import { Add } from '@carbon/react/icons';
+import { PageHeader, PageHeaderContent, PatientListsPictogram } from '@openmrs/esm-framework';
 import { type PatientListFilter, PatientListType } from '../api/types';
 import { useAllPatientLists } from '../api/hooks';
 import CreateEditPatientList from '../create-edit-patient-list/create-edit-list.component';
-import Header from '../header/header.component';
 import ListsTable from '../lists-table/lists-table.component';
 import styles from './lists-dashboard.scss';
 
@@ -42,19 +42,13 @@ const ListsDashboard: React.FC = () => {
   const patientListFilter = usePatientListFilterForCurrentTab(selectedTab);
   const { patientLists, isLoading, error, mutate } = useAllPatientLists(patientListFilter);
   const { search } = useLocation();
-
-  const isCreatingPatientList =
-    Object.fromEntries(
-      search
-        .slice(1)
-        .split('&')
-        ?.map((searchParam) => searchParam?.split('=')),
-    )['new_cohort'] === 'true';
+  const [showCreatePatientList, setShowCreatePatientList] = useState(!!search);
+  const handleShowNewListOverlay = () => {
+    setShowCreatePatientList(true);
+  };
 
   const handleHideNewListOverlay = () => {
-    navigate({
-      to: window.getOpenmrsSpaBase() + 'home/patient-lists',
-    });
+    setShowCreatePatientList(false);
   };
 
   const tableHeaders = [
@@ -67,7 +61,19 @@ const ListsDashboard: React.FC = () => {
   return (
     <main className={classnames('omrs-main-content', styles.dashboardContainer)}>
       <section className={styles.dashboard}>
-        <Header />
+        <PageHeader>
+          <PageHeaderContent title={t('patientLists', 'Patient lists')} illustration={<PatientListsPictogram />} />
+          <Button
+            className={styles.newListButton}
+            data-openmrs-role="New List"
+            kind="ghost"
+            iconDescription="Add"
+            renderIcon={(props) => <Add {...props} size={16} />}
+            onClick={handleShowNewListOverlay}
+            size="sm">
+            {t('newList', 'New list')}
+          </Button>
+        </PageHeader>
         <Tabs
           className={styles.tabs}
           onChange={({ selectedIndex }) => {
@@ -95,7 +101,7 @@ const ListsDashboard: React.FC = () => {
         </div>
       </section>
       <section>
-        {isCreatingPatientList && <CreateEditPatientList close={handleHideNewListOverlay} onSuccess={() => mutate()} />}
+        {showCreatePatientList && <CreateEditPatientList close={handleHideNewListOverlay} onSuccess={() => mutate()} />}
       </section>
     </main>
   );

package/src/lists-dashboard/lists-dashboard.scss

@@ -6,6 +6,12 @@
   margin: layout.$spacing-05 0;
 }
 
+.newListButton {
+  width: fit-content;
+  height: fit-content;
+  margin: 1rem 0;
+}
+
 .dashboardContainer {
   display: flex;
   background-color: $ui-02;

package/src/routes.json

@@ -23,14 +23,16 @@
       "name": "list-details-table",
       "component": "listDetailsTable"
     },
-    {
-      "name": "add-patient-to-patient-list-modal",
-      "component": "addPatientToListModal"
-    },
     {
       "name": "add-patient-to-patient-list-button",
       "slot": "patient-actions-slot",
       "component": "addPatientToPatientListMenuItem"
     }
+  ],
+  "modals": [
+    {
+      "name": "add-patient-to-patient-list-modal",
+      "component": "addPatientToListModal"
+    }
   ]
 }

package/translations/am.json

@@ -29,7 +29,6 @@
   "errorDeletingList": "Error deleting patient list",
   "errorRemovingPatientFromList": "Failed to remove patient from list",
   "errorUpdatingList": "Error updating list",
-  "home": "Home",
   "identifier": "Identifier",
   "items": "items",
   "itemsDisplayed": "{{numberOfItemsDisplayed}} items",

package/translations/ar.json

@@ -29,7 +29,6 @@
   "errorDeletingList": "Error deleting patient list",
   "errorRemovingPatientFromList": "Failed to remove patient from list",
   "errorUpdatingList": "Error updating list",
-  "home": "الرئيسية",
   "identifier": "المعرف",
   "items": "العناصر",
   "itemsDisplayed": "{{numberOfItemsDisplayed}} items",

package/translations/en.json

@@ -29,7 +29,6 @@
   "errorDeletingList": "Error deleting patient list",
   "errorRemovingPatientFromList": "Failed to remove patient from list",
   "errorUpdatingList": "Error updating list",
-  "home": "Home",
   "identifier": "Identifier",
   "items": "items",
   "itemsDisplayed": "{{numberOfItemsDisplayed}} items",
@@ -48,11 +47,10 @@
   "newPatientListNameLabel": "List name",
   "nextPage": "Next page",
   "noMatchingLists": "No matching lists to display",
+  "noMatchingListsFound": "No matching lists found",
   "noMatchingPatients": "No matching patients to display",
   "noOfPatients": "No. of patients",
-  "noPatientListFound": "No patient list found",
   "noPatientsInList": "There are no patients in this list",
-  "offlinePatients": "Offline patients",
   "openPatientList": "Add to list",
   "patientListMemberCount_one": "This list has {{count}} patient",
   "patientListMemberCount_other": "This list has {{count}} patients",
@@ -78,6 +76,7 @@
   "successfullyAdded": "Successfully added",
   "systemDefined": "system-defined",
   "systemLists": "System lists",
+  "trySearchingForADifferentList": "Try searching for a different list",
   "unstarList": "Unstar list",
   "updated": "Updated",
   "userDefined": "user-defined"

package/translations/es.json

@@ -29,7 +29,6 @@
   "errorDeletingList": "Error deleting patient list",
   "errorRemovingPatientFromList": "Failed to remove patient from list",
   "errorUpdatingList": "Error updating list",
-  "home": "Inicio",
   "identifier": "Identificador",
   "items": "elementos",
   "itemsDisplayed": "{{numberOfItemsDisplayed}} items",

package/translations/fr.json

@@ -5,41 +5,40 @@
   "allLists": "Toutes les listes",
   "backToListsPage": "Retour sur la page des listes",
   "cancel": "Annuler",
-  "checkFilters": "Check the filters above",
+  "checkFilters": "Vérifiez les filtres ci-dessus",
   "configureList": "Configurez votre liste de patients à l'aide des champs ci-dessous",
-  "confirmDeletePatientList": "Are you sure you want to delete this patient list?",
-  "created": "Created",
+  "confirmDeletePatientList": "Êtes-vous sûr de vouloir supprimer cette liste de patients?",
+  "created": "Créé(e)",
   "createdOn": "Créé le",
   "createList": "Créer une liste",
   "createNewPatientList": "Créer une nouvelle liste de patients",
-  "createPatientList": "Create patient list",
+  "createPatientList": "Créer une liste de patients",
   "deleted": "Supprimé",
   "deletedPatientList": "Liste des patients supprimés",
-  "deletePatientList": "Delete patient list",
+  "deletePatientList": "Supprimer la liste des patients",
   "editList": "Modifier la liste",
   "editNameDescription": "Modifier le Nom/ la Description",
   "editPatientListHeader": "Modifier la liste des patients",
-  "emptyList": "This list has no patients",
+  "emptyList": "Cette liste ne contient aucun patient",
   "emptyStateIllustration": "Empty state illustration",
   "emptyStateText": "Il n'y a pas de liste de patient {{listType}} à afficher",
   "error": "Erreur",
   "errorAddPatientToList": "Patient non ajouté à la liste",
   "errorCopy": "Désolé, une erreur s’est produite à l’affichage. Vous pouvez tenter de rafraîchir la page, ou bien contacter l'administrateur du site et transmettre le message d'erreur ci-dessus.",
-  "errorCreatingList": "Error creating list",
-  "errorDeletingList": "Error deleting patient list",
-  "errorRemovingPatientFromList": "Failed to remove patient from list",
-  "errorUpdatingList": "Error updating list",
-  "home": "Accueil",
+  "errorCreatingList": "Erreur lors de la création de la liste",
+  "errorDeletingList": "Erreur lors de la suppression de la liste de patients",
+  "errorRemovingPatientFromList": "Échec de la suppression du patient de la liste",
+  "errorUpdatingList": "Erreur lors de la mise à jour de la liste",
   "identifier": "Identifiant",
   "items": "eléments",
   "itemsDisplayed": "{{numberOfItemsDisplayed}} eléments",
-  "listCreated": "List created successfully",
+  "listCreated": "Liste créée avec succès",
   "listDescriptionPlaceholder": "par ex. Les patients atteints d'asthme diagnostiqué qui peuvent être disposés à faire partie d'une étude de recherche universitaire",
-  "listName": "List name",
+  "listName": "Nom de la liste",
   "listNamePlaceholder": "par ex. Participants potentiels de la recherche",
-  "listType": "List type",
-  "listUpdated": "List updated successfully",
-  "listUpToDate": "The list is now up to date",
+  "listType": "Type de liste",
+  "listUpdated": "Liste mise à jour avec succès",
+  "listUpToDate": "La liste est maintenant à jour",
   "myLists": "Mes listes",
   "name": "Nom",
   "newList": "Nouvelle liste",
@@ -48,37 +47,37 @@
   "newPatientListNameLabel": "Nom de la liste",
   "nextPage": "Page suivante",
   "noMatchingLists": "Aucun liste à afficher",
-  "noMatchingPatients": "No matching patients to display",
-  "noOfPatients": "No. of patients",
+  "noMatchingPatients": "Aucun patient correspondant à afficher",
+  "noOfPatients": "Nombre de patients",
   "noPatientListFound": "Aucune liste de patients trouvée",
   "noPatientsInList": "Il n'y a pas de patient dans cette liste",
   "offlinePatients": "Patients hors ligne",
   "openPatientList": "Ajouter à la liste",
-  "patientListMemberCount_one": "This list has {{count}} patient",
-  "patientListMemberCount_other": "This list has {{count}} patients",
+  "patientListMemberCount_one": "Cette liste a {{count}} patient",
+  "patientListMemberCount_other": "Cette liste a {{count}} patients",
   "patientLists": "Listes de patients",
-  "patientRemovedFromList": "Patient removed from list",
+  "patientRemovedFromList": "Patient retiré de la liste",
   "patients": "Patients",
   "previousPage": "Page précédente",
-  "problemCreatingList": "There was a problem creating the list",
-  "problemUpdatingList": "There was a problem updating the list",
-  "removeFromList": "Remove from list",
-  "removePatientFromListConfirmation": "Are you sure you want to remove {{patientName}} from this list?",
+  "problemCreatingList": "Problème lors de la création de la liste",
+  "problemUpdatingList": "Problème lors de la mise à jour de la liste",
+  "removeFromList": "Supprimer la liste",
+  "removePatientFromListConfirmation": "Êtes-vous sûr de vouloir retirer {{patientName}} de cette liste?",
   "searchForAListToAddThisPatientTo": "Rechercher une liste à laquelle ajouter ce patient.",
   "searchForList": "Rechercher une liste",
-  "searchThisList": "Search this list",
+  "searchThisList": "Recherchez dans cette liste",
   "sex": "Sexe",
-  "starList": "Mettre en favori",
-  "starred": "favori",
-  "starredLists": "Listes de favoris",
-  "starringPatientListFailed": "Marquage des listes de patients comme favoris/non favoris échec du marquage",
+  "starList": "Étoile de la liste",
+  "starred": "étoilé",
+  "starredLists": "Listes etoilées",
+  "starringPatientListFailed": "Marquage des listes de patients étoilées / non étoilées a échoué",
   "startDate": "Date de début",
-  "submitting": "Submitting",
+  "submitting": "En cours de soumission",
   "successAddPatientToList": "Patient ajouté à la liste",
   "successfullyAdded": "Ajouté avec succès",
-  "systemDefined": "system-defined",
-  "systemLists": "Listes systemes",
-  "unstarList": "Enlever comme favori",
-  "updated": "Updated",
-  "userDefined": "user-defined"
+  "systemDefined": "définie par le système",
+  "systemLists": "Listes du système",
+  "unstarList": "Enlever comme étoilée",
+  "updated": "Mis à jour",
+  "userDefined": "définie par I'utilisateur"
 }

package/translations/he.json

@@ -29,7 +29,6 @@
   "errorDeletingList": "שגיאה במחיקת רשימת המטופלים",
   "errorRemovingPatientFromList": "נכשל להסיר מטופל מהרשימה",
   "errorUpdatingList": "שגיאה בעדכון רשימה",
-  "home": "בית",
   "identifier": "מזהה",
   "items": "פריטים",
   "itemsDisplayed": "{{numberOfItemsDisplayed}} items",

package/translations/km.json

@@ -29,7 +29,6 @@
   "errorDeletingList": "Error deleting patient list",
   "errorRemovingPatientFromList": "Failed to remove patient from list",
   "errorUpdatingList": "Error updating list",
-  "home": "ទំព័រដើម",
   "identifier": "អ្នកកំណត់អត្តសញ្ញាណ",
   "items": "ពត៌មានតាមមុខនិមួយៗ",
   "itemsDisplayed": "{{numberOfItemsDisplayed}} items",

package/translations/zh.json

@@ -29,7 +29,6 @@
   "errorDeletingList": "删除患者列表时出现错误",
   "errorRemovingPatientFromList": "未能从列表中移除患者",
   "errorUpdatingList": "更新列表时出现错误",
-  "home": "首页",
   "identifier": "ID",
   "items": "项",
   "itemsDisplayed": "{{numberOfItemsDisplayed}} 项",

package/translations/zh_CN.json

@@ -29,7 +29,6 @@
   "errorDeletingList": "删除患者列表时出现错误",
   "errorRemovingPatientFromList": "未能从列表中移除患者",
   "errorUpdatingList": "更新列表时出现错误",
-  "home": "首页",
   "identifier": "ID",
   "items": "项",
   "itemsDisplayed": "{{numberOfItemsDisplayed}} 项",