@openmrs/esm-dispensing-app 1.9.2-pre.883 → 1.9.2-pre.885

package/src/prescriptions/prescription-tab-panel.component.tsx

@@ -1,165 +1,62 @@
-import {
-  DataTable,
-  DataTableSkeleton,
-  Layer,
-  Pagination,
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableExpandedRow,
-  TableExpandHeader,
-  TableExpandRow,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TabPanel,
-  Tile,
-} from '@carbon/react';
-import { formatDatetime, parseDate, useConfig } from '@openmrs/esm-framework';
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { ComboBox, Search, TabPanel } from '@carbon/react';
+import { useConfig, useDebounce } from '@openmrs/esm-framework';
 import { type PharmacyConfig } from '../config-schema';
-import { usePrescriptionsTable } from '../medication-request/medication-request.resource';
-import PatientInfoCell from '../patient/patient-info-cell.component';
-import PrescriptionExpanded from './prescription-expanded.component';
+import PrescriptionsTable from './prescriptions-table.component';
 import styles from './prescriptions.scss';
+import { useLocationForFiltering } from '../location/location.resource';
+import { type SimpleLocation } from '../types';
 
 interface PrescriptionTabPanelProps {
-  searchTerm: string;
-  location: string;
   status: string;
+  isTabActive: boolean;
 }
 
-const PrescriptionTabPanel: React.FC<PrescriptionTabPanelProps> = ({ searchTerm, location, status }) => {
+const PrescriptionTabPanel: React.FC<PrescriptionTabPanelProps> = ({ status, isTabActive }) => {
   const { t } = useTranslation();
   const config = useConfig<PharmacyConfig>();
-  const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
-  const [nextOffSet, setNextOffSet] = useState(0);
-  const { prescriptionsTableRows, error, isLoading, totalOrders } = usePrescriptionsTable(
-    pageSize,
-    nextOffSet,
-    searchTerm,
-    location,
-    status,
-    config.medicationRequestExpirationPeriodInDays,
-    config.refreshInterval,
-  );
-
-  // dynamic status keys we need to maintain
-  // t('active', 'Active')
-  // t('paused', 'Paused')
-  // t('closed', 'Closed')
-  // t('completed', 'Completed')
-  // t('expired', 'Expired')
-  // t('cancelled', 'Cancelled')
-
-  let columns = [
-    { header: t('created', 'Created'), key: 'created' },
-    { header: t('patientName', 'Patient name'), key: 'patient' },
-    { header: t('prescriber', 'Prescriber'), key: 'prescriber' },
-    { header: t('drugs', 'Drugs'), key: 'drugs' },
-    { header: t('lastDispenser', 'Last dispenser'), key: 'lastDispenser' },
-    { header: t('status', 'Status'), key: 'status' },
-  ];
-
-  // add the locations column, if enabled
-  if (config.locationBehavior?.locationColumn?.enabled) {
-    columns = [...columns.slice(0, 3), { header: t('location', 'Location'), key: 'location' }, ...columns.slice(3)];
-  }
-
-  // reset back to page 1 whenever search term changes
-  useEffect(() => {
-    setPage(1);
-    setNextOffSet(0);
-  }, [searchTerm]);
+  const { filterLocations, isLoading: isFilterLocationsLoading } = useLocationForFiltering(config);
+  const [searchTerm, setSearchTerm] = useState('');
+  const debouncedSearchTerm = useDebounce(searchTerm, 500);
+  const [location, setLocation] = useState('');
 
   return (
     <TabPanel>
-      <div className={styles.patientListTableContainer}>
-        {isLoading && <DataTableSkeleton role="progressbar" />}
-        {error && <p>Error</p>}
-        {prescriptionsTableRows && (
-          <>
-            <DataTable rows={prescriptionsTableRows} headers={columns} isSortable>
-              {({ rows, headers, getExpandHeaderProps, getHeaderProps, getRowProps, getTableProps }) => (
-                <TableContainer>
-                  <Table {...getTableProps()} useZebraStyles>
-                    <TableHead>
-                      <TableRow>
-                        <TableExpandHeader {...getExpandHeaderProps()} />
-                        {headers.map((header) => (
-                          <TableHeader {...getHeaderProps({ header })}>{header.header}</TableHeader>
-                        ))}
-                      </TableRow>
-                    </TableHead>
-                    <TableBody>
-                      {rows.map((row) => (
-                        <React.Fragment key={row.id}>
-                          <TableExpandRow {...getRowProps({ row })}>
-                            {row.cells.map((cell) => (
-                              <TableCell key={cell.id}>
-                                {cell.id.endsWith('created') ? (
-                                  formatDatetime(parseDate(cell.value))
-                                ) : cell.id.endsWith('patient') ? (
-                                  <PatientInfoCell patient={cell.value} />
-                                ) : cell.id.endsWith('status') ? (
-                                  t(cell.value)
-                                ) : (
-                                  cell.value
-                                )}
-                              </TableCell>
-                            ))}
-                          </TableExpandRow>
-                          {row.isExpanded ? (
-                            <TableExpandedRow colSpan={headers.length + 1}>
-                              <PrescriptionExpanded
-                                encounterUuid={row.id}
-                                patientUuid={row.cells.find((cell) => cell.id.endsWith('patient')).value.uuid}
-                                status={row.cells.find((cell) => cell.id.endsWith('status')).value}
-                              />
-                            </TableExpandedRow>
-                          ) : (
-                            <TableExpandedRow className={styles.hiddenRow} colSpan={headers.length + 2} />
-                          )}
-                        </React.Fragment>
-                      ))}
-                    </TableBody>
-                  </Table>
-                </TableContainer>
-              )}
-            </DataTable>
-            {prescriptionsTableRows?.length === 0 && (
-              <div className={styles.filterEmptyState}>
-                <Layer>
-                  <Tile className={styles.filterEmptyStateTile}>
-                    <p className={styles.filterEmptyStateContent}>
-                      {t('noPrescriptionsToDisplay', 'No prescriptions to display')}
-                    </p>
-                    <p className={styles.filterEmptyStateHelper}>{t('checkFilters', 'Check the filters above')}</p>
-                  </Tile>
-                </Layer>
-              </div>
-            )}
-            {prescriptionsTableRows?.length > 0 && (
-              <div style={{ width: '100%' }}>
-                <Pagination
-                  page={page}
-                  pageSize={pageSize}
-                  pageSizes={[10, 20, 30, 40, 50, 100]}
-                  totalItems={totalOrders}
-                  onChange={({ page, pageSize }) => {
-                    setPage(page);
-                    setNextOffSet((page - 1) * pageSize);
-                    setPageSize(pageSize);
-                  }}
-                />
-              </div>
-            )}
-          </>
-        )}
+      <div className={styles.searchContainer}>
+        <Search
+          closeButtonLabelText={t('clearSearchInput', 'Clear search input')}
+          defaultValue={searchTerm}
+          placeholder={t('searchByPatientIdOrName', 'Search by patient ID or name')}
+          labelText={t('searchByPatientIdOrName', 'Search by patient ID or name')}
+          onChange={(e) => {
+            e.preventDefault();
+            setSearchTerm(e.target.value);
+          }}
+          size="md"
+          className={styles.patientSearch}
+        />
+        {config.locationBehavior?.locationFilter?.enabled &&
+          !isFilterLocationsLoading &&
+          filterLocations?.length > 1 && (
+            <ComboBox
+              id="locationFilter"
+              placeholder={t('filterByLocation', 'Filter by location')}
+              items={isFilterLocationsLoading ? [] : filterLocations}
+              itemToString={(item: SimpleLocation) => item?.name}
+              onChange={({ selectedItem }) => {
+                setLocation(selectedItem?.id);
+              }}
+              className={styles.locationFilter}
+            />
+          )}
       </div>
+      <PrescriptionsTable
+        loadData={isTabActive}
+        status={status}
+        debouncedSearchTerm={debouncedSearchTerm}
+        location={location}
+      />
     </TabPanel>
   );
 };

package/src/prescriptions/prescriptions-table.component.tsx

@@ -0,0 +1,164 @@
+import {
+  DataTable,
+  DataTableSkeleton,
+  Layer,
+  Pagination,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableExpandedRow,
+  TableExpandHeader,
+  TableExpandRow,
+  TableHead,
+  TableHeader,
+  TableRow,
+  Tile,
+} from '@carbon/react';
+import { formatDatetime, parseDate, useConfig } from '@openmrs/esm-framework';
+import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import PatientInfoCell from '../patient/patient-info-cell.component';
+import PrescriptionExpanded from './prescription-expanded.component';
+import styles from './prescriptions.scss';
+import { usePrescriptionsTable } from '../medication-request/medication-request.resource';
+import { type PharmacyConfig } from '../config-schema';
+
+interface PrescriptionsTableProps {
+  loadData: boolean;
+  debouncedSearchTerm: string;
+  location: string;
+  status: string;
+}
+
+const PrescriptionsTable: React.FC<PrescriptionsTableProps> = ({ loadData, debouncedSearchTerm, location, status }) => {
+  const { t } = useTranslation();
+  const config = useConfig<PharmacyConfig>();
+  const [page, setPage] = useState(1);
+  const [pageSize, setPageSize] = useState(10);
+  const nextOffSet = (page - 1) * pageSize;
+  const { prescriptionsTableRows, error, isLoading, totalOrders } = usePrescriptionsTable(
+    loadData,
+    pageSize,
+    nextOffSet,
+    debouncedSearchTerm,
+    location,
+    status,
+    config.medicationRequestExpirationPeriodInDays,
+    config.refreshInterval,
+  );
+
+  // reset back to page 1 whenever search term changes
+  useEffect(() => {
+    setPage(1);
+  }, [debouncedSearchTerm]);
+
+  // dynamic status keys we need to maintain
+  // t('active', 'Active')
+  // t('paused', 'Paused')
+  // t('closed', 'Closed')
+  // t('completed', 'Completed')
+  // t('expired', 'Expired')
+  // t('cancelled', 'Cancelled')
+
+  let columns = [
+    { header: t('created', 'Created'), key: 'created' },
+    { header: t('patientName', 'Patient name'), key: 'patient' },
+    { header: t('prescriber', 'Prescriber'), key: 'prescriber' },
+    { header: t('drugs', 'Drugs'), key: 'drugs' },
+    { header: t('lastDispenser', 'Last dispenser'), key: 'lastDispenser' },
+    { header: t('status', 'Status'), key: 'status' },
+  ];
+
+  // add the locations column, if enabled
+  if (config.locationBehavior?.locationColumn?.enabled) {
+    columns = [...columns.slice(0, 3), { header: t('location', 'Location'), key: 'location' }, ...columns.slice(3)];
+  }
+
+  return (
+    <div className={styles.patientListTableContainer}>
+      {isLoading && <DataTableSkeleton role="progressbar" />}
+      {error && <p>Error</p>}
+      {prescriptionsTableRows && (
+        <>
+          <DataTable rows={prescriptionsTableRows} headers={columns} isSortable>
+            {({ rows, headers, getExpandHeaderProps, getHeaderProps, getRowProps, getTableProps }) => (
+              <TableContainer>
+                <Table {...getTableProps()} useZebraStyles>
+                  <TableHead>
+                    <TableRow>
+                      <TableExpandHeader {...getExpandHeaderProps()} />
+                      {headers.map((header) => (
+                        <TableHeader {...getHeaderProps({ header })}>{header.header}</TableHeader>
+                      ))}
+                    </TableRow>
+                  </TableHead>
+                  <TableBody>
+                    {rows.map((row) => (
+                      <React.Fragment key={row.id}>
+                        <TableExpandRow {...getRowProps({ row })}>
+                          {row.cells.map((cell) => (
+                            <TableCell key={cell.id}>
+                              {cell.id.endsWith('created') ? (
+                                formatDatetime(parseDate(cell.value))
+                              ) : cell.id.endsWith('patient') ? (
+                                <PatientInfoCell patient={cell.value} />
+                              ) : cell.id.endsWith('status') ? (
+                                t(cell.value)
+                              ) : (
+                                cell.value
+                              )}
+                            </TableCell>
+                          ))}
+                        </TableExpandRow>
+                        {row.isExpanded ? (
+                          <TableExpandedRow colSpan={headers.length + 1}>
+                            <PrescriptionExpanded
+                              encounterUuid={row.id}
+                              patientUuid={row.cells.find((cell) => cell.id.endsWith('patient')).value.uuid}
+                              status={row.cells.find((cell) => cell.id.endsWith('status')).value}
+                            />
+                          </TableExpandedRow>
+                        ) : (
+                          <TableExpandedRow className={styles.hiddenRow} colSpan={headers.length + 2} />
+                        )}
+                      </React.Fragment>
+                    ))}
+                  </TableBody>
+                </Table>
+              </TableContainer>
+            )}
+          </DataTable>
+          {prescriptionsTableRows?.length === 0 && (
+            <div className={styles.filterEmptyState}>
+              <Layer>
+                <Tile className={styles.filterEmptyStateTile}>
+                  <p className={styles.filterEmptyStateContent}>
+                    {t('noPrescriptionsToDisplay', 'No prescriptions to display')}
+                  </p>
+                  <p className={styles.filterEmptyStateHelper}>{t('checkFilters', 'Check the filters above')}</p>
+                </Tile>
+              </Layer>
+            </div>
+          )}
+          {prescriptionsTableRows?.length > 0 && (
+            <div style={{ width: '100%' }}>
+              <Pagination
+                page={page}
+                pageSize={pageSize}
+                pageSizes={[10, 20, 30, 40, 50, 100]}
+                totalItems={totalOrders}
+                onChange={({ page, pageSize }) => {
+                  setPage(page);
+                  setPageSize(pageSize);
+                }}
+              />
+            </div>
+          )}
+        </>
+      )}
+    </div>
+  );
+};
+
+export default PrescriptionsTable;

package/translations/en.json

@@ -96,7 +96,10 @@
   "reasonForPause": "Reason for pause",
   "refills": "Refills",
   "route": "Route",
+  "search": "Search",
   "searchByPatientIdOrName": "Search by patient ID or name",
+  "searchForPatient": "Search for a patient by name or identifier number",
+  "searchForPatientHeader": "Search for a patient",
   "selectPrescriptions": "Check prescriptions to print",
   "selectStockDispense": "Select stock to dispense from",
   "status": "Status",

package/.turbo/cache/aa05468322fdf99e-meta.json

@@ -1 +0,0 @@
-{"hash":"aa05468322fdf99e","duration":43765}