@openmrs/esm-billing-app 1.2.1-pre.1879 → 1.3.0

package/dist/openmrs-esm-billing-app.js.buildmanifest.json

@@ -127,9 +127,9 @@
       "rendered": true,
       "initial": false,
       "entry": false,
-      "size": 17235,
+      "size": 18782,
       "sizes": {
-        "javascript": 17235
+        "javascript": 18782
       },
       "names": [],
       "idHints": [],
@@ -143,7 +143,7 @@
       "auxiliaryFiles": [
         "1877.js.map"
       ],
-      "hash": "4046db07f7ba16b4",
+      "hash": "24d615079518f592",
       "childrenByOrder": {}
     },
     {
@@ -151,10 +151,10 @@
       "rendered": true,
       "initial": true,
       "entry": true,
-      "size": 5561583,
+      "size": 5561090,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5561037,
+        "javascript": 5560544,
         "runtime": 13411,
         "share-init": 336
       },
@@ -171,7 +171,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "345e80db8e2c4d9b",
+      "hash": "9533672256712833",
       "childrenByOrder": {}
     },
     {
@@ -856,9 +856,9 @@
       "rendered": true,
       "initial": false,
       "entry": false,
-      "size": 19296,
+      "size": 20612,
       "sizes": {
-        "javascript": 19296
+        "javascript": 20612
       },
       "names": [],
       "idHints": [],
@@ -872,7 +872,7 @@
       "auxiliaryFiles": [
         "5145.js.map"
       ],
-      "hash": "02bc290ce89208ed",
+      "hash": "8ce91e7134a27952",
       "childrenByOrder": {}
     },
     {
@@ -1626,7 +1626,7 @@
       "auxiliaryFiles": [
         "9655.js.map"
       ],
-      "hash": "7a469c142e1856f6",
+      "hash": "662fed6e03f90c25",
       "childrenByOrder": {}
     },
     {
@@ -1658,10 +1658,10 @@
       "rendered": true,
       "initial": false,
       "entry": false,
-      "size": 1628122,
+      "size": 1627629,
       "sizes": {
         "consume-shared": 42,
-        "javascript": 1628080
+        "javascript": 1627587
       },
       "names": [],
       "idHints": [],
@@ -1674,7 +1674,7 @@
       "auxiliaryFiles": [
         "990.js.map"
       ],
-      "hash": "dae014f89f92bf85",
+      "hash": "de747c285b3365e4",
       "childrenByOrder": {}
     }
   ]

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"billing":">=2.3.0-0","webservices.rest":">=2.24.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"visit-bills-panel","component":"visitBillsPanel","slot":"visit-summary-panels","meta":{"title":"Bills"}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"billing-history"}},{"name":"billable-services-app-menu-item","component":"billableServicesAppMenuItem","slot":"app-menu-item-slot","meta":{"name":"Billable Services"}},{"name":"billing-checkin-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"slot":"system-admin-page-card-link-slot","component":"billableServicesCardLink","name":"billable-services-admin-card-link"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"patient-banner-payment-status-tag","component":"patientPaymentStatusTag","slot":"patient-banner-tags-slot","order":3},{"name":"billable-services-left-panel-link","component":"billableServicesLeftPanelLink","slot":"billable-services-left-panel-slot","order":0},{"name":"billing-settings-left-panel-menu","component":"billingSettingsLeftPanelMenu","slot":"billable-services-left-panel-slot","order":1},{"name":"discount-requests-left-panel-link","component":"discountRequestsLeftPanelLink","slot":"billable-services-left-panel-slot","order":2},{"name":"refund-requests-left-panel-link","component":"refundRequestsLeftPanelLink","slot":"billable-services-left-panel-slot","order":3}],"modals":[{"name":"add-cash-point-modal","component":"addCashPointModal"},{"name":"payment-mode-form-modal","component":"paymentModeFormModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"edit-bill-item-modal","component":"editBillLineItemModal"},{"name":"edit-bill-line-item-modal","component":"editBillLineItemModal"},{"name":"require-billing-modal","component":"requirePaymentModal"},{"name":"delete-line-item-confirmation-modal","component":"deleteLineItemConfirmationModal"},{"name":"finalize-bill-confirmation-modal","component":"finalizeBillConfirmationModal"},{"name":"delete-bill-confirmation-modal","component":"deleteBillConfirmationModal"},{"name":"request-discount-modal","component":"requestDiscountModal"},{"name":"review-bill-discounts-modal","component":"reviewBillDiscountsModal"},{"name":"request-refund-modal","component":"requestRefundModal"},{"name":"review-bill-refunds-modal","component":"reviewBillRefundsModal"}],"workspaces2":[{"name":"billing-form-workspace","component":"billingFormWorkspace","window":"billing-form-window"},{"name":"billable-service-form","component":"billableServiceFormWorkspace","window":"billable-service-form-window"}],"workspaceWindows2":[{"name":"billing-form-window","group":"billingFormWorkspaceGroup"},{"name":"billable-service-form-window","group":"billingFormWorkspaceGroup","width":"wider"}],"workspaceGroups2":[{"name":"billingFormWorkspaceGroup","overlay":false}],"version":"1.2.1-pre.1879"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"billing":">=2.3.0-0","webservices.rest":">=2.24.0"},"pages":[{"component":"billableServicesHome","route":"billable-services"}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"}},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"visit-bills-panel","component":"visitBillsPanel","slot":"visit-summary-panels","meta":{"title":"Bills"}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"billing-history"}},{"name":"billable-services-app-menu-item","component":"billableServicesAppMenuItem","slot":"app-menu-item-slot","meta":{"name":"Billable Services"}},{"name":"billing-checkin-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm"},{"slot":"system-admin-page-card-link-slot","component":"billableServicesCardLink","name":"billable-services-admin-card-link"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"patient-banner-payment-status-tag","component":"patientPaymentStatusTag","slot":"patient-banner-tags-slot","order":3},{"name":"billable-services-left-panel-link","component":"billableServicesLeftPanelLink","slot":"billable-services-left-panel-slot","order":0},{"name":"billing-settings-left-panel-menu","component":"billingSettingsLeftPanelMenu","slot":"billable-services-left-panel-slot","order":1},{"name":"discount-requests-left-panel-link","component":"discountRequestsLeftPanelLink","slot":"billable-services-left-panel-slot","order":2},{"name":"refund-requests-left-panel-link","component":"refundRequestsLeftPanelLink","slot":"billable-services-left-panel-slot","order":3}],"modals":[{"name":"add-cash-point-modal","component":"addCashPointModal"},{"name":"payment-mode-form-modal","component":"paymentModeFormModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"edit-bill-item-modal","component":"editBillLineItemModal"},{"name":"edit-bill-line-item-modal","component":"editBillLineItemModal"},{"name":"require-billing-modal","component":"requirePaymentModal"},{"name":"delete-line-item-confirmation-modal","component":"deleteLineItemConfirmationModal"},{"name":"finalize-bill-confirmation-modal","component":"finalizeBillConfirmationModal"},{"name":"delete-bill-confirmation-modal","component":"deleteBillConfirmationModal"},{"name":"request-discount-modal","component":"requestDiscountModal"},{"name":"review-bill-discounts-modal","component":"reviewBillDiscountsModal"},{"name":"request-refund-modal","component":"requestRefundModal"},{"name":"review-bill-refunds-modal","component":"reviewBillRefundsModal"}],"workspaces2":[{"name":"billing-form-workspace","component":"billingFormWorkspace","window":"billing-form-window"},{"name":"billable-service-form","component":"billableServiceFormWorkspace","window":"billable-service-form-window"}],"workspaceWindows2":[{"name":"billing-form-window","group":"billingFormWorkspaceGroup"},{"name":"billable-service-form-window","group":"billingFormWorkspaceGroup","width":"wider"}],"workspaceGroups2":[{"name":"billingFormWorkspaceGroup","overlay":false}],"version":"1.3.0"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-billing-app",
-  "version": "1.2.1-pre.1879",
+  "version": "1.3.0",
   "description": "O3 frontend module for handling billing concerns in healthcare settings",
   "browser": "dist/openmrs-esm-billing-app.js",
   "main": "src/index.ts",
@@ -106,6 +106,5 @@
     "*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
     "*.{css,scss,ts,tsx}": "prettier --write --list-different"
   },
-  "packageManager": "yarn@4.10.3",
-  "stableVersion": "1.2.0"
+  "packageManager": "yarn@4.10.3"
 }

package/src/billable-services/billable-service.resource.ts

@@ -1,4 +1,4 @@
-import useSWR, { mutate } from 'swr';
+import useSWR from 'swr';
 import { type OpenmrsResource, openmrsFetch, restBaseUrl, useOpenmrsFetchAll, useConfig } from '@openmrs/esm-framework';
 import { apiBasePath } from '../constants';
 import type {
@@ -92,9 +92,6 @@ export const createBillableService = async (payload: CreateBillableServicePayloa
     },
   });
 
-  // Revalidate the billable services cache using the exact URL
-  await mutate(`${apiBasePath}${BILLABLE_SERVICES_URL}`);
-
   return response;
 };
 
@@ -108,9 +105,6 @@ export const updateBillableService = async (uuid: string, payload: UpdateBillabl
     },
   });
 
-  // Revalidate the billable services cache using the exact URL
-  await mutate(`${apiBasePath}${BILLABLE_SERVICES_URL}`);
-
   return response;
 };
 

package/src/billable-services/billable-services.component.tsx

@@ -40,6 +40,7 @@ interface FilterableTableHeaderProps {
   layout: LayoutType;
   handleSearch: (e: React.ChangeEvent<HTMLInputElement>) => void;
   isValidating: boolean;
+  launchBillableServiceForm: () => void;
   responsiveSize: 'sm' | 'md' | 'lg';
   t: (key: string, fallback: string) => string;
 }
@@ -78,8 +79,10 @@ const BillableServices = () => {
   ];
 
   const launchBillableServiceForm = useCallback(() => {
-    launchWorkspace2('billable-service-form');
-  }, []);
+    launchWorkspace2('billable-service-form', {
+      onWorkspaceClose: mutate,
+    });
+  }, [mutate]);
 
   const searchResults: BillableService[] = useMemo(() => {
     const flatBillableServices = Array.isArray(billableServices) ? billableServices.flat() : billableServices;
@@ -163,6 +166,7 @@ const BillableServices = () => {
       <FilterableTableHeader
         handleSearch={handleSearch}
         isValidating={isValidating}
+        launchBillableServiceForm={launchBillableServiceForm}
         layout={layout}
         responsiveSize={responsiveSize}
         t={t}
@@ -253,7 +257,14 @@ const BillableServices = () => {
   );
 };
 
-function FilterableTableHeader({ layout, handleSearch, isValidating, responsiveSize, t }: FilterableTableHeaderProps) {
+function FilterableTableHeader({
+  layout,
+  handleSearch,
+  isValidating,
+  launchBillableServiceForm,
+  responsiveSize,
+  t,
+}: FilterableTableHeaderProps) {
   return (
     <>
       <div className={styles.headerContainer}>
@@ -279,9 +290,7 @@ function FilterableTableHeader({ layout, handleSearch, isValidating, responsiveS
           size={responsiveSize}
           kind="primary"
           renderIcon={(props) => <ArrowRight size={16} {...props} />}
-          onClick={() => {
-            launchWorkspace2('billable-service-form', {});
-          }}
+          onClick={launchBillableServiceForm}
           iconDescription={t('addNewBillableService', 'Add new billable service')}>
           {t('addNewService', 'Add new service')}
         </Button>

package/src/billable-services/billable-services.test.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { describe, expect, type Mock, it, vi } from 'vitest';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { launchWorkspace2 } from '@openmrs/esm-framework';
 import BillableServices from './billable-services.component';
 import { useBillableServices } from './billable-service.resource';
 
@@ -9,6 +10,8 @@ vi.mock('./billable-service.resource', () => ({
   useBillableServices: vi.fn(),
 }));
 
+const mockLaunchWorkspace2 = launchWorkspace2 as Mock;
+
 describe('BillableService', () => {
   const mockedUseBillableServices = useBillableServices as Mock;
 
@@ -135,4 +138,55 @@ describe('BillableService', () => {
     expect(screen.getByText('No matching services to display')).toBeInTheDocument();
     expect(screen.getByText('Check the filters above')).toBeInTheDocument();
   });
+
+  it('passes mutate as onWorkspaceClose when adding a new service so the table refreshes', async () => {
+    const mockMutate = vi.fn();
+    mockedUseBillableServices.mockReturnValue({
+      billableServices: [
+        {
+          uuid: '1',
+          name: 'Service 1',
+          shortName: 'S1',
+          serviceType: { display: 'Type 1' },
+          serviceStatus: 'ACTIVE',
+          servicePrices: [{ name: 'Price 1', price: 100 }],
+        },
+      ],
+      isLoading: false,
+      isValidating: false,
+      error: null,
+      mutate: mockMutate,
+    });
+
+    const user = userEvent.setup();
+    render(<BillableServices />);
+
+    await user.click(screen.getByRole('button', { name: /add new service/i }));
+
+    expect(mockLaunchWorkspace2).toHaveBeenCalledWith(
+      'billable-service-form',
+      expect.objectContaining({ onWorkspaceClose: mockMutate }),
+    );
+  });
+
+  it('passes mutate as onWorkspaceClose when adding the first service from the empty state', async () => {
+    const mockMutate = vi.fn();
+    mockedUseBillableServices.mockReturnValue({
+      billableServices: [],
+      isLoading: false,
+      isValidating: false,
+      error: null,
+      mutate: mockMutate,
+    });
+
+    const user = userEvent.setup();
+    render(<BillableServices />);
+
+    await user.click(screen.getByRole('button', { name: /record.*billable services/i }));
+
+    expect(mockLaunchWorkspace2).toHaveBeenCalledWith(
+      'billable-service-form',
+      expect.objectContaining({ onWorkspaceClose: mockMutate }),
+    );
+  });
 });