@pih/esm-audit-app 2.1.1-pre.148 → 2.1.1-pre.151

package/src/audit/user-encounters.component.test.tsx

@@ -30,9 +30,12 @@ function dayFromIndex(index: number): string {
 const consultationType = { uuid: 'type-consultation', display: 'Consultation' };
 const vitalsType = { uuid: 'type-vitals', display: 'Vitals' };
 
-/** A type nothing in the trail uses, since the dropdown offers every type in the system. */
+/** A type nothing in the trail uses, since the dropdown offers every type in use in the system. */
 const unusedType = { uuid: 'type-unused', display: 'Zibra Admission' };
 
+/** A type nothing in the system has been recorded against, which the dropdown leaves out. */
+const neverRecordedType = { uuid: 'type-never', display: 'Never Recorded' };
+
 function encounter(index: number) {
   return {
     uuid: `enc-${index}`,
@@ -82,11 +85,17 @@ function mockRestApi({ totalCreated = 250, obsPerEncounter = 20 } = {}) {
     if (url.includes('/pihapps/obs?') && url.includes('voidedBy=')) {
       return Promise.resolve({ data: { results: [] } }) as ReturnType<typeof openmrsFetch>;
     }
-    if (url.includes('/encountertype')) {
-      // deliberately unsorted, and including a type the trail does not use
-      return Promise.resolve({
-        data: { results: [vitalsType, unusedType, consultationType] },
-      }) as ReturnType<typeof openmrsFetch>;
+    if (url.includes('/pihapps/encounterTypeCount')) {
+      // deliberately unsorted, and including a type the trail does not use and one nothing uses
+      const counts = [
+        { encounterType: vitalsType, count: 40 },
+        { encounterType: neverRecordedType, count: 0 },
+        { encounterType: unusedType, count: 3 },
+        { encounterType: consultationType, count: 40 },
+      ];
+      // the endpoint leaves out unused types only when asked, so the mock does too
+      const results = url.includes('onlyUsed=true') ? counts.filter((entry) => entry.count > 0) : counts;
+      return Promise.resolve({ data: { results } }) as ReturnType<typeof openmrsFetch>;
     }
     if (url.includes('/obs?encounter=')) {
       return Promise.resolve({
@@ -187,7 +196,7 @@ describe('<UserEncounters />', () => {
     await screen.findByText('Encounters 1–10');
     const beforePaging = auditRequests().length;
 
-    await userEvent.click(screen.getByRole('button', { name: 'Next' }));
+    await userEvent.click(screen.getByRole('button', { name: 'Next page' }));
 
     expect(await screen.findByText('Encounters 11–20')).toBeInTheDocument();
     expect(auditRequests().length).toBeGreaterThan(beforePaging);
@@ -198,11 +207,11 @@ describe('<UserEncounters />', () => {
     mockRestApi({ totalCreated: 5000, obsPerEncounter: 20 });
     renderUserEncounters();
     await screen.findByText('Encounters 1–10');
-    await userEvent.click(screen.getByRole('button', { name: 'Next' }));
+    await userEvent.click(screen.getByRole('button', { name: 'Next page' }));
     await screen.findByText('Encounters 11–20');
     const afterPaging = auditRequests().length;
 
-    await userEvent.click(screen.getByRole('button', { name: 'Previous' }));
+    await userEvent.click(screen.getByRole('button', { name: 'Previous page' }));
 
     expect(await screen.findByText('Encounters 1–10')).toBeInTheDocument();
     expect(auditRequests()).toHaveLength(afterPaging);
@@ -214,10 +223,10 @@ describe('<UserEncounters />', () => {
     renderUserEncounters();
 
     await screen.findByText('Encounters 1–10');
-    await userEvent.click(screen.getByRole('button', { name: 'Next' }));
+    await userEvent.click(screen.getByRole('button', { name: 'Next page' }));
 
     expect(await screen.findByText('Encounters 11–12')).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Next' })).toBeDisabled();
+    expect(screen.getByRole('button', { name: 'Next page' })).toBeDisabled();
   });
 
   it('counts each row’s observations exactly, from the encounter itself', async () => {
@@ -270,7 +279,7 @@ describe('<UserEncounters />', () => {
     mockRestApi({ totalCreated: 5000, obsPerEncounter: 20 });
     renderUserEncounters();
     await screen.findByText('Encounters 1–10');
-    await userEvent.click(screen.getByRole('button', { name: 'Next' }));
+    await userEvent.click(screen.getByRole('button', { name: 'Next page' }));
     await screen.findByText('Encounters 11–20');
 
     await userEvent.clear(screen.getByLabelText('Changed between'));
@@ -300,7 +309,7 @@ describe('<UserEncounters />', () => {
     expect(screen.queryByRole('button', { name: /clear filters/i })).not.toBeInTheDocument();
   });
 
-  it('offers every encounter type in the system, not just the ones in the trail', async () => {
+  it('offers every encounter type in use in the system, not just the ones in the trail', async () => {
     renderUserEncounters();
     await screen.findByText('Encounters 1–10');
 

package/src/audit/user-encounters.component.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   Button,
@@ -6,6 +6,7 @@ import {
   DataTableSkeleton,
   InlineLoading,
   InlineNotification,
+  Pagination,
   Table,
   TableBody,
   TableCell,
@@ -20,7 +21,7 @@ import { type Config } from '../config-schema';
 import { type OpenmrsResourceRef } from '../types';
 import { formatAuditDatetime } from './audit-format';
 import { type DateRange, fromPickerRange, hasDateRange, toPickerDefault } from './date-range';
-import { useAllEncounterTypes, useAuditUser, useUserEncounters } from './audit.resource';
+import { useAuditUser, useUsedEncounterTypes, useUserEncounters } from './audit.resource';
 import styles from './audit.scss';
 
 interface UserEncountersProps {
@@ -37,7 +38,8 @@ interface UserEncountersProps {
 export default function UserEncounters({ userUuid, onSelectEncounter, onBackToSearch }: UserEncountersProps) {
   const { t } = useTranslation();
   const config = useConfig<Config>();
-  const pageSize = config.encountersPageSize ?? 10;
+  const [pageSize, setPageSize] = useState(config.encountersPageSize ?? 10);
+  const pageSizes = useMemo(() => Array.from(new Set([pageSize, 10, 20, 50])).sort((a, b) => a - b), [pageSize]);
   const [dateRange, setDateRange] = useState<DateRange>({});
   // bumped to clear the range picker, which has to be left to hold its own value
   const [datePickerKey, setDatePickerKey] = useState(0);
@@ -45,7 +47,7 @@ export default function UserEncounters({ userUuid, onSelectEncounter, onBackToSe
   const today = new Date();
 
   const { user, error: userError, isLoading: isLoadingUser } = useAuditUser(userUuid);
-  const { encounterTypes, isLoading: isLoadingTypes } = useAllEncounterTypes();
+  const { encounterTypes, isLoading: isLoadingTypes } = useUsedEncounterTypes();
   const {
     activity,
     currentPage,
@@ -78,7 +80,7 @@ export default function UserEncounters({ userUuid, onSelectEncounter, onBackToSe
       */}
       <div className={styles.filters}>
         {/*
-          Every type in the system rather than only those this account has touched: encounters are
+          Every type in use rather than only those this account has touched: encounters are
           discovered lazily, so which types the trail holds is not known until all of it is read.
         */}
         <ComboBox
@@ -197,35 +199,39 @@ export default function UserEncounters({ userUuid, onSelectEncounter, onBackToSe
               </TableBody>
             </Table>
           </TableContainer>
+          {/*
+            A filter is applied after the trail has been read, so matching rows arrive as the scan
+            goes on. Without this the list looks finished while it is still filling.
+          */}
+          {isDiscovering ? (
+            <InlineLoading
+              className={styles.discovering}
+              description={t('lookingForMoreEncounters', 'Looking for more encounters…')}
+            />
+          ) : null}
           {/*
             How many encounters this account has touched cannot be known without reading its whole
-            trail, which is the very thing being avoided, so there is no total to page against.
-            A range and a next button say exactly what is known.
+            trail, which is the very thing being avoided, so there is no total to page against: the
+            pager runs with its page count unknown and says only the range on screen.
           */}
-          <div className={styles.lazyPagination}>
-            <span className={styles.paginationRange}>
-              {t('encounterRange', 'Encounters {{from}}–{{to}}', {
+          <Pagination
+            isLastPage={!hasNextPage}
+            itemText={() =>
+              t('encounterRange', 'Encounters {{from}}–{{to}}', {
                 from: firstRowOnPage + 1,
                 to: firstRowOnPage + activity.length,
-              })}
-            </span>
-            {/*
-              A filter is applied after the trail has been read, so matching rows arrive as the
-              scan goes on. Without this the list looks finished while it is still filling.
-            */}
-            {isDiscovering ? (
-              <InlineLoading
-                className={styles.discovering}
-                description={t('lookingForMoreEncounters', 'Looking for more encounters…')}
-              />
-            ) : null}
-            <Button disabled={currentPage === 1} kind="ghost" onClick={() => goTo(currentPage - 1)} size="sm">
-              {t('previousPage', 'Previous')}
-            </Button>
-            <Button disabled={!hasNextPage} kind="ghost" onClick={() => goTo(currentPage + 1)} size="sm">
-              {t('nextPage', 'Next')}
-            </Button>
-          </div>
+              })
+            }
+            onChange={({ page: nextPage, pageSize: nextPageSize }) => {
+              setPageSize(nextPageSize);
+              goTo(nextPage);
+            }}
+            page={currentPage}
+            pageSize={pageSize}
+            pageSizes={pageSizes}
+            pagesUnknown
+            size="sm"
+          />
         </>
       )}
     </div>

package/translations/en.json

@@ -53,7 +53,6 @@
   "location": "Location",
   "lookingForMoreEncounters": "Looking for more encounters…",
   "name": "Name",
-  "nextPage": "Next",
   "noActivity": "There is no recorded activity to show.",
   "noEncountersFound": "This patient has no encounters to audit.",
   "noEncountersMatchFilters": "No encounters match these filters.",
@@ -78,7 +77,6 @@
   "patientName": "Patient name",
   "patients": "Patients",
   "patientSearchResults": "Patient search results",
-  "previousPage": "Previous",
   "previousValue": "Previous value",
   "previousValueLegend": "the value that an edit replaced",
   "provider": "Provider",

package/translations/es.json

@@ -53,7 +53,6 @@
   "location": "Localidad",
   "lookingForMoreEncounters": "Buscando más encuentros…",
   "name": "Nombre",
-  "nextPage": "Siguiente",
   "noActivity": "No hay actividad registrada que mostrar.",
   "noEncountersFound": "Este paciente no tiene encuentros que auditar.",
   "noEncountersMatchFilters": "Ningún encuentro coincide con estos filtros.",
@@ -78,7 +77,6 @@
   "patientName": "Nombre del paciente",
   "patients": "Pacientes",
   "patientSearchResults": "Resultados de la búsqueda de pacientes",
-  "previousPage": "Anterior",
   "previousValue": "Valor anterior",
   "previousValueLegend": "el valor sustituido por una edición",
   "provider": "Proveedor",

package/translations/fr.json

@@ -53,7 +53,6 @@
   "location": "Lieu",
   "lookingForMoreEncounters": "Recherche d'autres rencontres…",
   "name": "Nom",
-  "nextPage": "Suivant",
   "noActivity": "Aucune activité enregistrée à afficher.",
   "noEncountersFound": "Ce patient n'a aucune rencontre à auditer.",
   "noEncountersMatchFilters": "Aucune rencontre ne correspond à ces filtres.",
@@ -78,7 +77,6 @@
   "patientName": "Nom du patient",
   "patients": "Patients",
   "patientSearchResults": "Résultats de la recherche de patients",
-  "previousPage": "Précédent",
   "previousValue": "Valeur précédente",
   "previousValueLegend": "la valeur remplacée par une modification",
   "provider": "Prestataire de service",