@openmrs/esm-billing-app 1.1.2-pre.8 → 1.2.0

package/src/bills-table/bills-table.test.tsx

@@ -1,21 +1,22 @@
 import React from 'react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import userEvent from '@testing-library/user-event';
 import { render, screen, waitFor } from '@testing-library/react';
 import { usePaginatedBills } from '../billing.resource';
-import { BillStatus } from '../types';
+import { BillLineItemStatus, BillStatus, type MappedBill } from '../types';
 import BillsTable from './bills-table.component';
 
-jest.mock('../billing.resource', () => ({
-  usePaginatedBills: jest.fn(() => ({
+vi.mock('../billing.resource', () => ({
+  usePaginatedBills: vi.fn(() => ({
     bills: mockBillsData,
     isLoading: false,
     isValidating: false,
     error: null,
-    mutate: jest.fn(),
+    mutate: vi.fn(),
   })),
 }));
 
-const mockBills = jest.mocked(usePaginatedBills);
+const mockBills = vi.mocked(usePaginatedBills);
 
 const mockBillsData = [
   {
@@ -23,7 +24,6 @@ const mockBillsData = [
     id: 1,
     patientName: 'John Doe',
     identifier: '12345678',
-    visitType: 'Checkup',
     patientUuid: 'uuid1',
     dateCreated: '2024-01-01',
     lineItems: [
@@ -40,7 +40,7 @@ const mockBillsData = [
         priceUuid: 'price-1',
         lineItemOrder: 1,
         resourceVersion: '1.0',
-        paymentStatus: 'PENDING',
+        status: BillLineItemStatus.PENDING,
       },
     ],
     status: BillStatus.PENDING,
@@ -52,6 +52,7 @@ const mockBillsData = [
     billingService: 'Service 1',
     payments: [],
     totalAmount: 100,
+    netAmount: 100,
     tenderedAmount: 0,
   },
   {
@@ -59,7 +60,6 @@ const mockBillsData = [
     id: 2,
     patientName: 'Mary Smith',
     identifier: '98765432',
-    visitType: 'Wake up',
     patientUuid: 'uuid2',
     dateCreated: '2024-01-02',
     lineItems: [
@@ -76,7 +76,7 @@ const mockBillsData = [
         priceUuid: 'price-1',
         lineItemOrder: 1,
         resourceVersion: '1.0',
-        paymentStatus: 'PENDING',
+        status: BillLineItemStatus.PENDING,
       },
     ],
     status: BillStatus.PENDING,
@@ -88,9 +88,10 @@ const mockBillsData = [
     billingService: 'Service 2',
     payments: [],
     totalAmount: 200,
+    netAmount: 200,
     tenderedAmount: 200,
   },
-];
+] satisfies MappedBill[];
 
 describe('BillsTable', () => {
   beforeEach(() => {
@@ -99,14 +100,14 @@ describe('BillsTable', () => {
       isLoading: false,
       isValidating: false,
       error: null,
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 1,
       totalCount: 10,
-      goTo: jest.fn(),
+      goTo: vi.fn(),
     }));
   });
 
-  test('renders data table with pending bills', () => {
+  it('renders data table with pending bills', () => {
     render(<BillsTable />);
 
     expect(screen.getByText(/bill date/i)).toBeInTheDocument();
@@ -116,16 +117,16 @@ describe('BillsTable', () => {
     expect(screen.getByText(/12345678/i)).toBeInTheDocument();
   });
 
-  test('displays empty state when there are no bills with default filter', () => {
+  it('displays empty state when there are no bills with default filter', () => {
     mockBills.mockImplementationOnce(() => ({
       bills: [],
       isLoading: false,
       isValidating: false,
       error: null,
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 1,
       totalCount: 0,
-      goTo: jest.fn(),
+      goTo: vi.fn(),
     }));
 
     render(<BillsTable />);
@@ -136,35 +137,35 @@ describe('BillsTable', () => {
     expect(screen.getByRole('searchbox')).toBeInTheDocument();
   });
 
-  test('should show the loading spinner while retrieving data', () => {
+  it('should show the loading spinner while retrieving data', () => {
     mockBills.mockImplementationOnce(() => ({
       bills: undefined,
       isLoading: true,
       isValidating: false,
       error: null,
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 1,
       totalCount: 0,
-      goTo: jest.fn(),
+      goTo: vi.fn(),
     }));
 
     render(<BillsTable />);
 
-    expect(screen.getByRole('progressbar')).toBeInTheDocument();
+    expect(screen.getByTestId('bills-table-skeleton')).toBeInTheDocument();
     expect(screen.getByText(/filter by/i)).toBeInTheDocument();
-    expect(screen.getByText(/pending payment/i)).toBeInTheDocument();
+    expect(screen.getByText(/pending confirmation/i)).toBeInTheDocument();
   });
 
-  test('should display an error state if there is a problem loading bill data', () => {
+  it('should display an error state if there is a problem loading bill data', () => {
     mockBills.mockImplementationOnce(() => ({
       bills: undefined,
       isLoading: false,
       isValidating: false,
       error: new Error('Error in fetching data'),
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 1,
       totalCount: 0,
-      goTo: jest.fn(),
+      goTo: vi.fn(),
     }));
 
     render(<BillsTable />);
@@ -172,19 +173,19 @@ describe('BillsTable', () => {
     expect(screen.getByText(/error state/i)).toBeInTheDocument();
     expect(screen.queryByRole('table')).not.toBeInTheDocument();
     expect(screen.getByText(/filter by/i)).toBeInTheDocument();
-    expect(screen.getByText(/pending payment/i)).toBeInTheDocument();
+    expect(screen.getByText(/pending confirmation/i)).toBeInTheDocument();
   });
 
-  test('should pass search term to backend API', async () => {
+  it('should pass search term to backend API', async () => {
     const user = userEvent.setup();
-    const mockGoTo = jest.fn();
+    const mockGoTo = vi.fn();
 
     mockBills.mockImplementation((_pageSize, _status, patientName) => ({
       bills: patientName === 'John' ? [mockBillsData[0]] : mockBillsData,
       isLoading: false,
       isValidating: false,
       error: null,
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 1,
       totalCount: patientName === 'John' ? 1 : 2,
       goTo: mockGoTo,
@@ -201,13 +202,13 @@ describe('BillsTable', () => {
     await user.type(searchInput, 'John');
 
     await waitFor(() => {
-      expect(mockBills).toHaveBeenCalledWith(10, 'POSTED', 'John');
+      expect(mockBills).toHaveBeenCalledWith(10, 'PENDING', 'John');
     });
 
     expect(mockGoTo).toHaveBeenCalledWith(1);
   });
 
-  test('should render invoice number as a link to the invoice page', () => {
+  it('should render invoice number as a link to the invoice page', () => {
     render(<BillsTable />);
 
     const invoiceNumberLink = screen.getByRole('link', { name: 'RCP-001' });
@@ -216,7 +217,7 @@ describe('BillsTable', () => {
     expect(invoiceNumberLink).toHaveAttribute('href', '/openmrs/spa/home/billing/patient/uuid1/1');
   });
 
-  test('should filter bills by payment status', async () => {
+  it('should filter bills by payment status', async () => {
     const user = userEvent.setup();
 
     // First call: initial render with PENDING filter (default)
@@ -225,10 +226,10 @@ describe('BillsTable', () => {
       isLoading: false,
       isValidating: false,
       error: null,
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 1,
       totalCount: 2,
-      goTo: jest.fn(),
+      goTo: vi.fn(),
     }));
 
     // Second call: after filter changes to PAID, return empty bills
@@ -237,15 +238,15 @@ describe('BillsTable', () => {
       isLoading: false,
       isValidating: false,
       error: null,
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 1,
       totalCount: 0,
-      goTo: jest.fn(),
+      goTo: vi.fn(),
     }));
 
     render(<BillsTable />);
 
-    const filterDropdown = screen.getByText('Pending payment');
+    const filterDropdown = screen.getByText('Pending confirmation');
     await user.click(filterDropdown);
 
     const paidBillsOption = screen.getAllByText('Paid bills')[0];
@@ -258,16 +259,16 @@ describe('BillsTable', () => {
     expect(screen.getByText(/check the filters above/i)).toBeInTheDocument();
   });
 
-  test('should show loading state during background updates', () => {
+  it('should show loading state during background updates', () => {
     mockBills.mockImplementationOnce(() => ({
       bills: mockBillsData,
       isLoading: false,
       isValidating: true,
       error: null,
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 1,
       totalCount: 0,
-      goTo: jest.fn(),
+      goTo: vi.fn(),
     }));
 
     render(<BillsTable />);
@@ -276,16 +277,16 @@ describe('BillsTable', () => {
     expect(loadingIndicator).toBeInTheDocument();
   });
 
-  test('should show search box and empty state message when search returns no results', () => {
+  it('should show search box and empty state message when search returns no results', () => {
     mockBills.mockImplementationOnce(() => ({
       bills: [],
       isLoading: false,
       isValidating: false,
       error: null,
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 1,
       totalCount: 0,
-      goTo: jest.fn(),
+      goTo: vi.fn(),
     }));
 
     render(<BillsTable />);
@@ -297,16 +298,16 @@ describe('BillsTable', () => {
     expect(screen.queryByText(/next page/i)).not.toBeInTheDocument();
   });
 
-  test('should reset to page 1 when page size changes', async () => {
+  it('should reset to page 1 when page size changes', async () => {
     const user = userEvent.setup();
-    const mockGoTo = jest.fn();
+    const mockGoTo = vi.fn();
 
     mockBills.mockImplementation(() => ({
       bills: mockBillsData,
       isLoading: false,
       isValidating: false,
       error: null,
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 3,
       totalCount: 100,
       goTo: mockGoTo,
@@ -326,60 +327,60 @@ describe('BillsTable', () => {
     });
   });
 
-  test('should default to "Pending payment" filter showing POSTED bills', () => {
+  it('should default to "Pending confirmation" filter showing PENDING bills', () => {
     render(<BillsTable />);
 
-    expect(screen.getByText('Pending payment')).toBeInTheDocument();
-    expect(mockBills).toHaveBeenCalledWith(expect.any(Number), 'POSTED', undefined);
+    expect(screen.getByText('Pending confirmation')).toBeInTheDocument();
+    expect(mockBills).toHaveBeenCalledWith(expect.any(Number), 'PENDING', undefined);
   });
 
-  test('should show "Pending confirmation" option in filter dropdown', async () => {
+  it('should show "Pending payment" option in filter dropdown', async () => {
     const user = userEvent.setup();
     render(<BillsTable />);
 
-    const filterDropdown = screen.getByText('Pending payment');
+    const filterDropdown = screen.getByText('Pending confirmation');
     await user.click(filterDropdown);
 
-    expect(screen.getByRole('option', { name: /pending confirmation/i })).toBeInTheDocument();
+    expect(screen.getByRole('option', { name: /pending payment/i })).toBeInTheDocument();
   });
 
-  test('should filter by PENDING status when "Pending confirmation" is selected', async () => {
+  it('should filter by POSTED status when "Pending payment" is selected', async () => {
     const user = userEvent.setup();
-    const mockGoTo = jest.fn();
+    const mockGoTo = vi.fn();
 
     mockBills.mockImplementation((_pageSize, status) => ({
-      bills: status === 'PENDING' ? [mockBillsData[0]] : mockBillsData,
+      bills: status === 'POSTED' ? [mockBillsData[1]] : mockBillsData,
       isLoading: false,
       isValidating: false,
       error: null,
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 1,
-      totalCount: status === 'PENDING' ? 1 : 2,
+      totalCount: status === 'POSTED' ? 1 : 2,
       goTo: mockGoTo,
     }));
 
     render(<BillsTable />);
 
-    const filterDropdown = screen.getByText('Pending payment');
+    const filterDropdown = screen.getByText('Pending confirmation');
     await user.click(filterDropdown);
 
-    await user.click(screen.getByRole('option', { name: /pending confirmation/i }));
+    await user.click(screen.getByRole('option', { name: /pending payment/i }));
 
     await waitFor(() => {
-      expect(mockBills).toHaveBeenCalledWith(expect.any(Number), 'PENDING', undefined);
+      expect(mockBills).toHaveBeenCalledWith(expect.any(Number), 'POSTED', undefined);
     });
   });
 
-  test('should filter by POSTED status when "Pending payment" is selected', async () => {
+  it('should filter by PENDING status when "Pending confirmation" is selected', async () => {
     const user = userEvent.setup();
-    const mockGoTo = jest.fn();
+    const mockGoTo = vi.fn();
 
     mockBills.mockImplementation((_pageSize, status) => ({
-      bills: status === 'POSTED' ? [mockBillsData[1]] : mockBillsData,
+      bills: status === 'PENDING' ? [mockBillsData[0]] : mockBillsData,
       isLoading: false,
       isValidating: false,
       error: null,
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 1,
       totalCount: 1,
       goTo: mockGoTo,
@@ -387,31 +388,31 @@ describe('BillsTable', () => {
 
     render(<BillsTable />);
 
-    // Navigate away from the default POSTED filter first, then select it again
-    const filterDropdown = screen.getByText('Pending payment');
+    // Navigate away from the default PENDING filter first, then select it again
+    const filterDropdown = screen.getByText('Pending confirmation');
     await user.click(filterDropdown);
     await user.click(screen.getByRole('option', { name: /all bills/i }));
 
     mockBills.mockClear();
 
     await user.click(screen.getByText('All bills'));
-    await user.click(screen.getByRole('option', { name: /pending payment/i }));
+    await user.click(screen.getByRole('option', { name: /pending confirmation/i }));
 
     await waitFor(() => {
-      expect(mockBills).toHaveBeenCalledWith(expect.any(Number), 'POSTED', undefined);
+      expect(mockBills).toHaveBeenCalledWith(expect.any(Number), 'PENDING', undefined);
     });
   });
 
-  test('should keep data visible during subsequent loads', () => {
+  it('should keep data visible during subsequent loads', () => {
     mockBills.mockImplementationOnce(() => ({
       bills: mockBillsData,
       isLoading: true,
       isValidating: true,
       error: null,
-      mutate: jest.fn(),
+      mutate: vi.fn(),
       currentPage: 2,
       totalCount: 50,
-      goTo: jest.fn(),
+      goTo: vi.fn(),
     }));
 
     render(<BillsTable />);
@@ -424,6 +425,6 @@ describe('BillsTable', () => {
     expect(screen.getByTitle('loading')).toBeInTheDocument();
 
     // Should NOT show skeleton
-    expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('bills-table-skeleton')).not.toBeInTheDocument();
   });
 });

package/src/config-schema.ts

@@ -95,12 +95,6 @@ export const configSchema = {
     _description: 'The default page size',
     _default: 10,
   },
-  waiverPaymentModeUuid: {
-    _type: Type.String,
-    _description:
-      'Payment Mode UUID used for bill waivers. This UUID identifies the payment mode (e.g. waiver) used when posting a waiver payment to a bill.',
-    _default: 'eb6173cb-9678-4614-bbe1-0ccf7ed9d1d4',
-  },
 };
 
 /**
@@ -141,5 +135,4 @@ export interface BillingConfig {
   };
   defaultCurrency: string;
   pageSize: number;
-  waiverPaymentModeUuid: string;
 }

package/src/discounts/admin/discount-requests-left-panel-link.component.tsx

@@ -0,0 +1,43 @@
+import React, { useMemo } from 'react';
+import { BrowserRouter, useLocation } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
+import { SideNavLink } from '@carbon/react';
+import { navigate } from '@openmrs/esm-framework';
+
+export interface LinkConfig {
+  name: string;
+  title: string;
+  path: string;
+  icon?: React.ComponentType;
+}
+
+function DiscountRequestsLinkExtension({ config }: { config: LinkConfig }) {
+  const { title, path, icon: Icon } = config;
+  const { t } = useTranslation();
+  const location = useLocation();
+  const spaBasePath = `${window.spaBase}/billable-services`;
+
+  const isActive = useMemo(() => {
+    const currentPath = location.pathname.replace(spaBasePath, '');
+    if (path === '' || path === '/') {
+      return currentPath === '' || currentPath === '/';
+    }
+    return currentPath.startsWith(`/${path}`);
+  }, [location.pathname, path, spaBasePath]);
+
+  const handleNavigation = () => {
+    navigate({ to: `${spaBasePath}/${path}` });
+  };
+
+  return (
+    <SideNavLink onClick={handleNavigation} renderIcon={Icon} isActive={isActive}>
+      {t(title)}
+    </SideNavLink>
+  );
+}
+
+export const createDiscountRequestsLeftPanelLink = (config: LinkConfig) => () => (
+  <BrowserRouter>
+    <DiscountRequestsLinkExtension config={config} />
+  </BrowserRouter>
+);