@kenyaemr/esm-admin-app 5.4.4-pre.41 → 5.4.4-pre.410

package/src/components/locations/tables/locations-table.component.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useState, useEffect } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   Button,
@@ -18,7 +18,7 @@ import {
   Tag,
 } from '@carbon/react';
 import { Add } from '@carbon/react/icons';
-import { WorkspaceContainer, isDesktop as desktopLayout, launchWorkspace, useLayoutType } from '@openmrs/esm-framework';
+import { launchWorkspace2, useLayoutType } from '@openmrs/esm-framework';
 import styles from './locations-table.scss';
 import { CardHeader } from '@openmrs/esm-patient-common-lib';
 import { useFacilitiesTagged } from './locations-table.resource';
@@ -28,23 +28,26 @@ const LocationsTable: React.FC = () => {
   const { t } = useTranslation();
   const layout = useLayoutType();
   const isTablet = layout === 'tablet';
-  const isDesktop = desktopLayout(layout);
   const [pageSize, setPageSize] = useState(10);
   const [searchTerm, setSearchTerm] = useState('');
   const [currentPage, setCurrentPage] = useState(1);
 
-  const { locationTagList, isLoading: tagsLoading, error: tagsError } = useLocationTags();
+  const { locationTagList, isLoading: tagsLoading } = useLocationTags();
   const { facilityList, isLoading: taggedLoading } = useFacilitiesTagged({ results: locationTagList });
 
   const handleAddLocationWorkspace = () => {
-    launchWorkspace('add-location-workspace', {
-      workspaceTitle: t('addLocation', 'Add Location'),
+    launchWorkspace2('add-location-workspace', {
+      workspaceProps: {
+        workspaceTitle: t('addLocation', 'Add Location'),
+      },
     });
   };
 
   const handleSearchLocationWorkspace = () => {
-    launchWorkspace('search-location-workspace', {
-      workspaceTitle: t('tagLocation', 'Tag Location'),
+    launchWorkspace2('search-location-workspace', {
+      workspaceProps: {
+        workspaceTitle: t('tagLocation', 'Tag Location'),
+      },
     });
   };
 
@@ -117,126 +120,119 @@ const LocationsTable: React.FC = () => {
 
   if (tagsLoading || (taggedLoading && !facilityList.length)) {
     return (
-      <>
-        <div className={styles.widgetCard}>
-          <DataTableSkeleton role="progressbar" compact={isDesktop} zebra />
-        </div>
-      </>
+      <div className={styles.widgetCard}>
+        <DataTableSkeleton role="progressbar" zebra />
+      </div>
     );
   }
 
   return (
-    <>
-      <div className={styles.widgetCard}>
-        <CardHeader title={t('locations', 'Locations')}>
-          <span className={styles.backgroundDataFetchingIndicator}>
-            <span>{tagsLoading ? <InlineLoading /> : null}</span>
-          </span>
-          <div className={styles.headerActions}>
-            <>
-              <div className={styles.filterContainer}>
-                <Search
-                  onChange={(e) => {
-                    setSearchTerm(e.target.value);
-                    setCurrentPage(1);
-                  }}
-                  placeholder={t('search', 'Search location')}
-                  value={searchTerm}
-                  labelText={t('search', 'Search location')}
-                />
-              </div>
-              <Button
-                kind="ghost"
-                renderIcon={(props) => <Add size={16} {...props} />}
-                onClick={handleAddLocationWorkspace}>
-                {t('addLocation', 'Add Location')}
-              </Button>
-              <Button
-                kind="ghost"
-                renderIcon={(props) => <Add size={16} {...props} />}
-                onClick={handleSearchLocationWorkspace}>
-                {t('tagLocation', 'Tag Location')}
-              </Button>
-            </>
+    <div className={styles.widgetCard}>
+      <CardHeader title={t('locations', 'Locations')}>
+        <span className={styles.backgroundDataFetchingIndicator}>
+          <span>{tagsLoading ? <InlineLoading /> : null}</span>
+        </span>
+        <div className={styles.headerActions}>
+          <div className={styles.filterContainer}>
+            <Search
+              onChange={(e) => {
+                setSearchTerm(e.target.value);
+                setCurrentPage(1);
+              }}
+              placeholder={t('search', 'Search location')}
+              value={searchTerm}
+              labelText={t('search', 'Search location')}
+            />
           </div>
-        </CardHeader>
-
-        <DataTable rows={paginatedRows} headers={tableHeaders} isSortable size={isTablet ? 'lg' : 'sm'} useZebraStyles>
-          {({ rows, headers, getTableProps }) => {
-            return (
-              <TableContainer>
-                <Table {...getTableProps()}>
-                  <TableHead>
-                    <TableRow>
-                      {headers.map((header) => (
-                        <TableHeader key={header.key}>{header.header}</TableHeader>
+          <Button
+            kind="ghost"
+            renderIcon={(props) => <Add size={16} {...props} />}
+            onClick={handleAddLocationWorkspace}>
+            {t('addLocation', 'Add Location')}
+          </Button>
+          <Button
+            kind="ghost"
+            renderIcon={(props) => <Add size={16} {...props} />}
+            onClick={handleSearchLocationWorkspace}>
+            {t('tagLocation', 'Tag Location')}
+          </Button>
+        </div>
+      </CardHeader>
+
+      <DataTable rows={paginatedRows} headers={tableHeaders} isSortable size={isTablet ? 'lg' : 'sm'} useZebraStyles>
+        {({ rows, headers, getTableProps }) => {
+          return (
+            <TableContainer>
+              <Table {...getTableProps()}>
+                <TableHead>
+                  <TableRow>
+                    {headers.map((header) => (
+                      <TableHeader key={header.key}>{header.header}</TableHeader>
+                    ))}
+                  </TableRow>
+                </TableHead>
+                <TableBody>
+                  {rows.map((row) => (
+                    <TableRow key={row.id}>
+                      {row.cells.map((cell) => (
+                        <TableCell key={cell.id}>
+                          {cell.id.includes('tags') && cell.value !== 'No tags' ? (
+                            <div style={{ display: 'flex', flexWrap: 'wrap', gap: '4px' }}>
+                              {cell.value.split(', ').map((tag, index) => (
+                                <Tag key={index} type="blue" size="sm">
+                                  {tag}
+                                </Tag>
+                              ))}
+                            </div>
+                          ) : (
+                            cell.value
+                          )}
+                        </TableCell>
                       ))}
                     </TableRow>
-                  </TableHead>
-                  <TableBody>
-                    {rows.map((row) => (
-                      <TableRow key={row.id}>
-                        {row.cells.map((cell) => (
-                          <TableCell key={cell.id}>
-                            {cell.id.includes('tags') && cell.value !== 'No tags' ? (
-                              <div style={{ display: 'flex', flexWrap: 'wrap', gap: '4px' }}>
-                                {cell.value.split(', ').map((tag, index) => (
-                                  <Tag key={index} type="blue" size="sm">
-                                    {tag}
-                                  </Tag>
-                                ))}
-                              </div>
-                            ) : (
-                              cell.value
-                            )}
-                          </TableCell>
-                        ))}
-                      </TableRow>
-                    ))}
-                  </TableBody>
-                </Table>
-                {rows.length === 0 ? (
-                  <div className={styles.tileContainer}>
-                    <Tile className={styles.tile}>
-                      <div className={styles.tileContent}>
-                        <p className={styles.content}>
-                          {searchTerm
-                            ? t('noSearchResults', `No results found for "${searchTerm}"`)
-                            : t('noData', 'No data to display')}
-                        </p>
-                        <p className={styles.helper}>
-                          {searchTerm
-                            ? t('tryDifferentSearch', 'Try a different search term')
-                            : t('checkFilters', 'Check the filters above')}
-                        </p>
-                      </div>
-                    </Tile>
-                  </div>
-                ) : null}
-                <Pagination
-                  backwardText="Previous page"
-                  forwardText="Next page"
-                  page={currentPage}
-                  pageSize={pageSize}
-                  pageSizes={[10, 20, 30, 40, 50]}
-                  totalItems={filteredRows.length}
-                  onChange={({ pageSize: newPageSize, page }) => {
-                    if (newPageSize !== pageSize) {
-                      setPageSize(newPageSize);
-                      setCurrentPage(1);
-                    }
-                    if (page !== currentPage) {
-                      setCurrentPage(page);
-                    }
-                  }}
-                />
-              </TableContainer>
-            );
-          }}
-        </DataTable>
-      </div>
-      <WorkspaceContainer contextKey="locations" />
-    </>
+                  ))}
+                </TableBody>
+              </Table>
+              {rows.length === 0 ? (
+                <div className={styles.tileContainer}>
+                  <Tile className={styles.tile}>
+                    <div className={styles.tileContent}>
+                      <p className={styles.content}>
+                        {searchTerm
+                          ? t('noSearchResults', `No results found for "${searchTerm}"`)
+                          : t('noData', 'No data to display')}
+                      </p>
+                      <p className={styles.helper}>
+                        {searchTerm
+                          ? t('tryDifferentSearch', 'Try a different search term')
+                          : t('checkFilters', 'Check the filters above')}
+                      </p>
+                    </div>
+                  </Tile>
+                </div>
+              ) : null}
+              <Pagination
+                backwardText="Previous page"
+                forwardText="Next page"
+                page={currentPage}
+                pageSize={pageSize}
+                pageSizes={[10, 20, 30, 40, 50]}
+                totalItems={filteredRows.length}
+                onChange={({ pageSize: newPageSize, page }) => {
+                  if (newPageSize !== pageSize) {
+                    setPageSize(newPageSize);
+                    setCurrentPage(1);
+                  }
+                  if (page !== currentPage) {
+                    setCurrentPage(page);
+                  }
+                }}
+              />
+            </TableContainer>
+          );
+        }}
+      </DataTable>
+    </div>
   );
 };
 

package/src/components/logs-table/operation-log-table.component.tsx

@@ -12,7 +12,6 @@ import {
   TableRow,
   Tag,
   DataTableSkeleton,
-  InlineLoading,
 } from '@carbon/react';
 import { CardHeader, PatientChartPagination } from '@openmrs/esm-patient-common-lib';
 import { useLayoutType, usePagination, formatDate } from '@openmrs/esm-framework';
@@ -21,13 +20,14 @@ import { ETLResponse } from '../../types';
 import EmptyState from '../empty-state/empty-state-log.components';
 
 interface LogTableProps {
-  logData: ETLResponse[];
+  logData: Array<ETLResponse>;
   isLoading: boolean;
 }
 
+const PAGE_SIZE = 10;
+
 const LogTable: React.FC<LogTableProps> = ({ logData, isLoading }) => {
   const { t } = useTranslation();
-  const pageSize = 10;
   const isTablet = useLayoutType() === 'tablet';
 
   const headers = [
@@ -37,82 +37,94 @@ const LogTable: React.FC<LogTableProps> = ({ logData, isLoading }) => {
     { header: t('completionStatus', 'Completion status'), key: 'status' },
   ];
 
-  const rows = logData?.map((item, index) => ({
-    id: index.toString(),
-    script_name: item.script_name,
-    start_time: item?.start_time ? formatDate(new Date(item?.start_time)) : '--',
-    stop_time: item?.stop_time ? formatDate(new Date(item?.stop_time)) : '--',
-    status: item.status,
-  }));
+  const rows =
+    logData?.map((item, index) => ({
+      id: index.toString(),
+      script_name: item.script_name,
+      start_time: item?.start_time ? formatDate(new Date(item.start_time)) : '--',
+      stop_time: item?.stop_time ? formatDate(new Date(item.stop_time)) : '--',
+      status: item.status,
+    })) ?? [];
+
+  const { results: paginatedData, currentPage, goTo } = usePagination(rows, PAGE_SIZE);
+
+  const renderTable = ({ rows, headers, getHeaderProps, getTableProps }: any) => (
+    <TableContainer className={styles.tableContainer}>
+      <Table {...getTableProps()}>
+        <TableHead>
+          <TableRow>
+            {headers.map((header: any) => (
+              <TableHeader
+                className={classNames(styles.productiveHeading01, styles.text02)}
+                {...getHeaderProps({ header })}>
+                {header.header}
+              </TableHeader>
+            ))}
+          </TableRow>
+        </TableHead>
+        <TableBody>
+          {rows.map((row: any) => (
+            <TableRow key={row.id}>
+              {row.cells.map((cell: any) => (
+                <TableCell key={cell.id}>
+                  {cell.info.header === 'status' ? (
+                    <Tag size="md" type={cell.value === 'Success' ? 'green' : 'red'}>
+                      {cell.value}
+                    </Tag>
+                  ) : (
+                    cell.value
+                  )}
+                </TableCell>
+              ))}
+            </TableRow>
+          ))}
+        </TableBody>
+      </Table>
+    </TableContainer>
+  );
+
+  const renderContent = () => {
+    if (isLoading && logData.length === 0) {
+      return (
+        <DataTableSkeleton
+          headers={headers}
+          aria-label="etl table"
+          showToolbar={false}
+          showHeader={false}
+          rowCount={4}
+          zebra
+          columnCount={3}
+          className={styles.dataTableSkeleton}
+        />
+      );
+    }
+
+    if (logData.length === 0) {
+      return <EmptyState subTitle={t('noRecordsFound', 'No ETL Operation logs found')} />;
+    }
 
-  const { results: paginatedData, currentPage, goTo } = usePagination(rows, pageSize);
+    return (
+      <>
+        <DataTable rows={paginatedData} headers={headers} isSortable size={isTablet ? 'lg' : 'sm'} useZebraStyles>
+          {renderTable}
+        </DataTable>
+        <PatientChartPagination
+          currentItems={paginatedData.length}
+          totalItems={rows.length}
+          onPageNumberChange={({ page }: { page: number }) => goTo(page)}
+          pageNumber={currentPage}
+          pageSize={PAGE_SIZE}
+        />
+      </>
+    );
+  };
 
   return (
     <div className={styles.table}>
-      <CardHeader title={t('facilityInfo', 'Facility Info')} children={''} />
-      <div className={styles.logTable}>
-        {isLoading && logData.length === 0 ? (
-          <DataTableSkeleton
-            headers={headers}
-            aria-label="etl table"
-            showToolbar={false}
-            showHeader={false}
-            rowCount={4}
-            zebra
-            columnCount={3}
-            className={styles.dataTableSkeleton}
-          />
-        ) : logData.length === 0 ? (
-          <EmptyState subTitle={t('noRecordsFound', 'No ETL Operation logs found')} />
-        ) : (
-          <>
-            <DataTable rows={paginatedData} headers={headers} isSortable size={isTablet ? 'lg' : 'sm'} useZebraStyles>
-              {({ rows, headers, getHeaderProps, getTableProps }) => (
-                <TableContainer className={styles.tableContainer}>
-                  <Table {...getTableProps()}>
-                    <TableHead>
-                      <TableRow>
-                        {headers.map((header) => (
-                          <TableHeader
-                            key={header.key}
-                            className={classNames(styles.productiveHeading01, styles.text02)}
-                            {...getHeaderProps({ header })}>
-                            {header.header}
-                          </TableHeader>
-                        ))}
-                      </TableRow>
-                    </TableHead>
-                    <TableBody>
-                      {rows.map((row) => (
-                        <TableRow key={row.id}>
-                          {row.cells.map((cell) => (
-                            <TableCell key={cell.id}>
-                              {cell.info.header === 'status' ? (
-                                <Tag size="md" type={cell.value === 'Success' ? 'green' : 'red'}>
-                                  {cell.value}
-                                </Tag>
-                              ) : (
-                                cell.value
-                              )}
-                            </TableCell>
-                          ))}
-                        </TableRow>
-                      ))}
-                    </TableBody>
-                  </Table>
-                </TableContainer>
-              )}
-            </DataTable>
-            <PatientChartPagination
-              currentItems={paginatedData.length}
-              totalItems={rows.length}
-              onPageNumberChange={({ page }) => goTo(page)}
-              pageNumber={currentPage}
-              pageSize={pageSize}
-            />
-          </>
-        )}
-      </div>
+      <CardHeader title={t('facilityInfo', 'Facility Info')}>
+        <></>
+      </CardHeader>
+      <div className={styles.logTable}>{renderContent()}</div>
     </div>
   );
 };

package/src/components/logs-table/operation-log.test.tsx

@@ -1,47 +1,153 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
+import { vi, describe, it, expect, beforeEach } from 'vitest';
 import LogTable from './operation-log-table.component';
 import { ETLResponse } from '../../types';
 
-describe('LogTable Component', () => {
-  const mockLogData: ETLResponse[] = [
-    {
-      script_name: 'Initial Population of Tables',
-      start_time: '2024-11-28T09:30:12',
-      stop_time: '2024-11-28T09:33:15',
-      status: 'Success',
-    },
-    {
-      script_name: 'Initial Creation of Tables',
-      start_time: '2024-11-28T09:30:12',
-      stop_time: '2024-11-28T09:33:15',
-      status: 'Failed',
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({ t: (key: string, fallback: string) => fallback }),
+}));
+
+vi.mock('@openmrs/esm-framework', () => ({
+  useLayoutType: vi.fn(() => 'desktop'),
+  usePagination: vi.fn((data) => ({
+    results: data,
+    currentPage: 1,
+    goTo: vi.fn(),
+  })),
+  formatDate: vi.fn((date: Date) => date.toISOString()),
+}));
+
+vi.mock('@openmrs/esm-patient-common-lib', () => ({
+  CardHeader: ({ title }: { title: string }) => <div>{title}</div>,
+  PatientChartPagination: ({ currentItems, totalItems }: { currentItems: number; totalItems: number }) => (
+    <div data-testid="pagination">
+      {currentItems}/{totalItems}
+    </div>
+  ),
+}));
+
+vi.mock('../empty-state/empty-state-log.components', () => ({
+  default: ({ subTitle }: { subTitle: string }) => <div data-testid="empty-state">{subTitle}</div>,
+}));
+
+vi.mock('@carbon/react', async (importOriginal) => {
+  const original = await importOriginal<typeof import('@carbon/react')>();
+  return {
+    ...original,
+    DataTable: ({
+      children,
+      rows,
+      headers,
+    }: {
+      children: (props: any) => React.ReactNode;
+      rows: any[];
+      headers: any[];
+    }) => {
+      if (typeof children === 'function') {
+        const renderRows = rows.map((row) => ({
+          ...row,
+          cells: headers.map((h) => ({
+            id: `${row.id}:${h.key}`,
+            value: row[h.key],
+            info: { header: h.key },
+          })),
+        }));
+        return children({
+          rows: renderRows,
+          headers,
+          getTableProps: () => ({}),
+          getHeaderProps: ({ header }: any) => ({ key: header.key }),
+          getRowProps: () => ({}),
+        });
+      }
+      return children;
     },
-  ];
+  };
+});
 
-  it('renders the table with correct headers and rows', () => {
-    render(<LogTable logData={mockLogData} isLoading={false} />);
+vi.mock('classnames', () => ({ default: (...args: string[]) => args.filter(Boolean).join(' ') }));
 
-    const headers = ['Procedure', 'Start time', 'End time', 'Completion status'];
-    headers.forEach((header) => {
-      expect(screen.getByText(header)).toBeInTheDocument();
-    });
+vi.mock('./operation-log.scss', () => ({ default: {} }));
 
-    const rows = screen.getAllByRole('row');
-    expect(rows.length).toBe(3);
+const mockLogData: ETLResponse[] = [
+  {
+    script_name: 'Script A',
+    start_time: '2024-01-01T08:00:00Z',
+    stop_time: '2024-01-01T09:00:00Z',
+    status: 'Success',
+  },
+  {
+    script_name: 'Script B',
+    start_time: '2024-01-02T10:00:00Z',
+    stop_time: '2024-01-02T11:00:00Z',
+    status: 'Failed',
+  },
+];
+
+describe('LogTable', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
   });
 
-  it('displays "No ETL Operation logs found" when logData is empty', () => {
-    render(<LogTable logData={[]} isLoading={false} />);
+  it('renders the card header', () => {
+    render(<LogTable logData={mockLogData} isLoading={false} />);
+    expect(screen.getByText('Facility Info')).toBeInTheDocument();
+  });
+
+  it('shows skeleton while loading with no data', () => {
+    render(<LogTable logData={[]} isLoading={true} />);
+    expect(screen.getByRole('table')).toBeInTheDocument();
+  });
 
+  it('shows empty state when not loading and no data', () => {
+    render(<LogTable logData={[]} isLoading={false} />);
+    expect(screen.getByTestId('empty-state')).toBeInTheDocument();
     expect(screen.getByText('No ETL Operation logs found')).toBeInTheDocument();
   });
 
-  it('shows skeleton loading state when isLoading is true', () => {
-    render(<LogTable logData={[]} isLoading={true} />);
+  it('renders table headers when data is present', () => {
+    render(<LogTable logData={mockLogData} isLoading={false} />);
+    expect(screen.getByText('Procedure')).toBeInTheDocument();
+    expect(screen.getByText('Start time')).toBeInTheDocument();
+    expect(screen.getByText('End time')).toBeInTheDocument();
+    expect(screen.getByText('Completion status')).toBeInTheDocument();
+  });
+
+  it('renders script names in the table', () => {
+    render(<LogTable logData={mockLogData} isLoading={false} />);
+    expect(screen.getByText('Script A')).toBeInTheDocument();
+    expect(screen.getByText('Script B')).toBeInTheDocument();
+  });
+
+  it('renders Success status as a green tag', () => {
+    render(<LogTable logData={mockLogData} isLoading={false} />);
+    const successTag = screen.getByText('Success');
+    expect(successTag).toBeInTheDocument();
+  });
+
+  it('renders Failed status as a red tag', () => {
+    render(<LogTable logData={mockLogData} isLoading={false} />);
+    const failedTag = screen.getByText('Failed');
+    expect(failedTag).toBeInTheDocument();
+  });
+
+  it('renders pagination when data is present', () => {
+    render(<LogTable logData={mockLogData} isLoading={false} />);
+    expect(screen.getByTestId('pagination')).toBeInTheDocument();
+  });
+
+  it('renders -- for missing start_time', () => {
+    const dataWithMissingTime: ETLResponse[] = [
+      { script_name: 'Script C', start_time: '', stop_time: '', status: 'Success' },
+    ];
+    render(<LogTable logData={dataWithMissingTime} isLoading={false} />);
+    expect(screen.getAllByText('--').length).toBeGreaterThanOrEqual(2);
+  });
 
-    const skeleton = screen.getByLabelText('etl table');
-    expect(skeleton).toBeInTheDocument();
+  it('does not show empty state when data is present', () => {
+    render(<LogTable logData={mockLogData} isLoading={false} />);
+    expect(screen.queryByTestId('empty-state')).not.toBeInTheDocument();
   });
 });