@openmrs/esm-billing-app 1.0.2-pre.681 → 1.0.2-pre.683

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

@@ -1236,9 +1236,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1090674,
+      "size": 1084459,
       "sizes": {
-        "javascript": 1090632,
+        "javascript": 1084417,
         "consume-shared": 42
       },
       "names": [],
@@ -1252,7 +1252,7 @@
       "auxiliaryFiles": [
         "8638.js.map"
       ],
-      "hash": "c5bca2028b805aed",
+      "hash": "2f05e231d6f881bd",
       "childrenByOrder": {}
     },
     {
@@ -1260,10 +1260,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5416164,
+      "size": 5409949,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5393511,
+        "javascript": 5387296,
         "share-init": 336,
         "runtime": 22107
       },
@@ -1280,7 +1280,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "243fd27696865ad7",
+      "hash": "e5d8d93fd0371708",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.24.0","fhir2":">=1.2"},"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"},"featureFlag":"billing"},{"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":"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"},"featureFlag":"billing"},{"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","featureFlag":"billing"},{"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":"billing-home-tiles-ext","slot":"billing-home-tiles-slot","component":"serviceMetrics"},{"name":"edit-bill-line-item-dialog","component":"editBillLineItemDialog","online":true,"offline":true}],"modals":[{"name":"require-billing-modal","component":"requirePaymentModal"}],"workspaces":[{"name":"billing-form-workspace","title":"billingForm","component":"billingFormWorkspace","type":"form"}],"featureFlags":[{"flagName":"billing","label":"Billing module","description":"This feature introduces navigation links on the patient chart and home page to allow accessing the billing module features"}],"version":"1.0.2-pre.681"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.24.0","fhir2":">=1.2"},"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"},"featureFlag":"billing"},{"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":"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"},"featureFlag":"billing"},{"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","featureFlag":"billing"},{"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":"billing-home-tiles-ext","slot":"billing-home-tiles-slot","component":"serviceMetrics"},{"name":"edit-bill-line-item-dialog","component":"editBillLineItemDialog","online":true,"offline":true}],"modals":[{"name":"require-billing-modal","component":"requirePaymentModal"}],"workspaces":[{"name":"billing-form-workspace","title":"billingForm","component":"billingFormWorkspace","type":"form"}],"featureFlags":[{"flagName":"billing","label":"Billing module","description":"This feature introduces navigation links on the patient chart and home page to allow accessing the billing module features"}],"version":"1.0.2-pre.683"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-billing-app",
-  "version": "1.0.2-pre.681",
+  "version": "1.0.2-pre.683",
   "description": "O3 frontend module for handling billing concerns in healthcare settings",
   "browser": "dist/openmrs-esm-billing-app.js",
   "main": "src/index.ts",

package/src/bill-history/bill-history.component.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   Button,
@@ -19,7 +19,7 @@ import {
   Tile,
 } from '@carbon/react';
 import { Add } from '@carbon/react/icons';
-import { isDesktop, launchWorkspace, useConfig, useLayoutType, usePagination } from '@openmrs/esm-framework';
+import { launchWorkspace, useConfig, usePagination } from '@openmrs/esm-framework';
 import { CardHeader, EmptyDataIllustration, ErrorState, usePaginationInfo } from '@openmrs/esm-patient-common-lib';
 import { convertToCurrency } from '../helpers';
 import { useBills } from '../billing.resource';
@@ -33,11 +33,9 @@ interface BillHistoryProps {
 const BillHistory: React.FC<BillHistoryProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
   const { bills, isLoading, error } = useBills(patientUuid);
-  const layout = useLayoutType();
-  const responsiveSize = isDesktop(layout) ? 'sm' : 'lg';
   const { paginated, goTo, results, currentPage } = usePagination(bills);
   const { pageSize, defaultCurrency } = useConfig();
-  const [currentPageSize, setCurrentPageSize] = React.useState(pageSize);
+  const [currentPageSize, setCurrentPageSize] = useState(pageSize);
   const { pageSizes } = usePaginationInfo(pageSize, bills?.length, currentPage, results?.length);
 
   const headerData = [
@@ -74,7 +72,7 @@ const BillHistory: React.FC<BillHistoryProps> = ({ patientUuid }) => {
   if (isLoading) {
     return (
       <div className={styles.loaderContainer}>
-        <DataTableSkeleton showHeader={false} showToolbar={false} zebra size={responsiveSize} />
+        <DataTableSkeleton showHeader={false} showToolbar={false} zebra size="md" />
       </div>
     );
   }
@@ -113,15 +111,15 @@ const BillHistory: React.FC<BillHistoryProps> = ({ patientUuid }) => {
         </Button>
       </CardHeader>
       <div className={styles.billHistoryContainer}>
-        <DataTable isSortable rows={rowData} headers={headerData} size={responsiveSize} useZebraStyles>
+        <DataTable isSortable rows={rowData} headers={headerData} size="md" useZebraStyles>
           {({
-            rows,
-            headers,
             getExpandHeaderProps,
-            getTableProps,
-            getTableContainerProps,
             getHeaderProps,
             getRowProps,
+            getTableContainerProps,
+            getTableProps,
+            headers,
+            rows,
           }) => (
             <TableContainer {...getTableContainerProps}>
               <Table className={styles.table} {...getTableProps()} aria-label="Bill list">
@@ -153,7 +151,7 @@ const BillHistory: React.FC<BillHistoryProps> = ({ patientUuid }) => {
                           ))}
                         </TableExpandRow>
                         {row.isExpanded ? (
-                          <TableExpandedRow className={styles.expandedRow} colSpan={headers.length + 1}>
+                          <TableExpandedRow colSpan={headers.length + 1}>
                             <div className={styles.container} key={i}>
                               <InvoiceTable bill={currentBill} />
                             </div>
@@ -178,7 +176,7 @@ const BillHistory: React.FC<BillHistoryProps> = ({ patientUuid }) => {
             pageSizes={pageSizes}
             totalItems={bills.length}
             className={styles.pagination}
-            size={responsiveSize}
+            size="md"
             onChange={({ page: newPage, pageSize }) => {
               if (newPage !== currentPage) {
                 goTo(newPage);

package/src/bill-history/bill-history.scss

@@ -3,7 +3,7 @@
 @use '@openmrs/esm-styleguide/src/vars' as *;
 
 .container {
-  margin: layout.$spacing-07 0;
+  margin: layout.$spacing-03 0;
 }
 
 .emptyStateContainer,
@@ -21,27 +21,8 @@
   padding-bottom: 0;
 }
 
-.headerContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: layout.$spacing-04 0 layout.$spacing-04 layout.$spacing-05;
-  background-color: $ui-02;
-}
-
-.backgroundDataFetchingIndicator {
-  align-items: center;
-  display: flex;
-  flex: 1 1 0%;
-  justify-content: center;
-}
-
-.tableContainer section {
-  position: relative;
-}
-
-.tableContainer a {
-  text-decoration: none;
+.errorContainer {
+  @extend .container;
 }
 
 .pagination {
@@ -56,34 +37,6 @@
   display: none;
 }
 
-.emptyRow {
-  padding: 0 layout.$spacing-05;
-  display: flex;
-  align-items: center;
-}
-
-.visitSummaryContainer {
-  width: 100%;
-  max-width: 768px;
-  margin: layout.$spacing-05 auto;
-}
-
-.expandedActiveVisitRow > td > div {
-  max-height: max-content !important;
-}
-
-.expandedActiveVisitRow td {
-  padding: 0 layout.$spacing-07;
-}
-
-.expandedActiveVisitRow th[colspan] td[colspan] > div:first-child {
-  padding: 0 layout.$spacing-05;
-}
-
-.action {
-  margin-bottom: layout.$spacing-03;
-}
-
 .illo {
   margin-top: layout.$spacing-05;
 }
@@ -95,55 +48,11 @@
   margin-bottom: layout.$spacing-03;
 }
 
-.desktopHeading,
-.tabletHeading {
-  text-align: left;
-  text-transform: capitalize;
-
-  h4 {
-    @include type.type-style('heading-compact-02');
-    color: $text-02;
-
-    &:after {
-      content: '';
-      display: block;
-      width: layout.$spacing-07;
-      padding-top: 3px;
-      border-bottom: 0.375rem solid;
-      @include brand-03(border-bottom-color);
-    }
-  }
-}
-
 .tile {
   text-align: center;
   border: 1px solid $ui-03;
 }
 
-.filterEmptyState {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: layout.$spacing-05;
-  margin: layout.$spacing-09;
-  text-align: center;
-}
-
-.filterEmptyStateTile {
-  margin: auto;
-}
-
-.filterEmptyStateContent {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: 0.5rem;
-}
-
-.filterEmptyStateHelper {
-  @include type.type-style('body-compact-01');
-  color: $text-02;
-}
-
 .table {
   width: 100%;
   table-layout: fixed; // This helps with uniform column sizing
@@ -156,6 +65,7 @@
       text-overflow: unset;
     }
   }
+
   :global(tr.cds--parent-row.cds--expandable-row + tr[data-child-row]) td {
     padding-left: layout.$spacing-05;
   }