(chore) Bump carbon version and clean up some redundant components

jest.config.js

@@ -7,6 +7,7 @@ const config = {
   collectCoverage: true,
   coverageThreshold: {
     global: {
+      statements: 0,
       branches: 0,
       functions: 0,
       lines: 0,
@@ -22,7 +23,7 @@ const config = {
     '!**/e2e/**',
   ],
   transform: {
-    '^.+\\.tsx?$': '@swc/jest',
+    '^.+\\.(j|t)sx?$': '@swc/jest',
   },
   transformIgnorePatterns: ['/node_modules/(?!@openmrs)'],
   moduleDirectories: ['node_modules', '__mocks__', 'tools', __dirname],
@@ -32,13 +33,12 @@ const config = {
     '^@carbon/charts-react$': path.resolve(__dirname, '__mocks__', '@carbon__charts-react.ts'),
     '^dexie$': require.resolve('dexie'),
     '^lodash-es/(.*)$': 'lodash/$1',
+    '^lodash-es$': 'lodash',
     '^react-i18next$': path.resolve(__dirname, '__mocks__', 'react-i18next.js'),
+    '^uuid$': path.resolve(__dirname, 'node_modules', 'uuid', 'dist', 'index.js'),
   },
   testEnvironment: 'jsdom',
-  testPathIgnorePatterns: [
-    "/node_modules/",
-      "/e2e/"  // Ignore the e2e directory containing Playwright tests
-    ]
+  testPathIgnorePatterns: [path.resolve(__dirname, 'node_modules'), path.resolve(__dirname, 'e2e')],
 };
 
 module.exports = config;

package.json

@@ -102,7 +102,6 @@
     "webpack-dev-server": "^4.8.1"
   },
   "resolutions": {
-    "@carbon/react": "1.17.0",
     "@types/react": "^18.0.14",
     "@types/react-dom": "^18.0.5"
   },

packages/esm-commons-lib/src/components/data-table/o-table.component.tsx

@@ -31,7 +31,8 @@ export const OTable: React.FC<TableProps> = ({ tableHeaders, tableRows }) => {
                     {...getHeaderProps({
                       header,
                       isSortable: header.isSortable,
-                    })}>
+                    })}
+                  >
                     {header.header?.content ?? header.header}
                   </TableHeader>
                 ))}

packages/esm-commons-lib/src/components/empty-state/table-empty-state.component.tsx

@@ -27,7 +27,8 @@ export const TableEmptyState: React.FC<{ tableHeaders: Array<{ key: string; head
                       {...getHeaderProps({
                         header,
                         isSortable: header.isSortable,
-                      })}>
+                      })}
+                    >
                       {header.header?.content ?? header.header}
                     </TableHeader>
                   ))}

packages/esm-commons-lib/src/components/encounter-list/encounter-list.component.tsx

@@ -2,10 +2,18 @@ import { navigate, showModal, showSnackbar } from '@openmrs/esm-framework';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { EmptyState } from '../empty-state/empty-state.component';
-import { FormLauncherWithIntent } from '../ohri-form-launcher/ohri-form-launcher.component';
 import styles from './encounter-list.scss';
 import { OTable } from '../data-table/o-table.component';
-import { Button, Link, OverflowMenu, OverflowMenuItem, Pagination, DataTableSkeleton } from '@carbon/react';
+import {
+  Button,
+  Link,
+  OverflowMenu,
+  OverflowMenuItem,
+  Pagination,
+  DataTableSkeleton,
+  MenuButton,
+  MenuItem,
+} from '@carbon/react';
 import { Add } from '@carbon/react/icons';
 import { FormSchema } from '@openmrs/openmrs-form-engine-lib';
 import { deleteEncounter, launchEncounterForm } from './helpers';
@@ -213,7 +221,8 @@ export const EncounterList: React.FC<EncounterListProps> = ({
                   } else {
                     column.link?.getUrl && navigate({ to: column.link.getUrl() });
                   }
-                }}>
+                }}
+              >
                 {val}
               </Link>
             );
@@ -283,29 +292,38 @@ export const EncounterList: React.FC<EncounterListProps> = ({
               workspaceWindowSize,
               patientUuid,
             );
-          }}>
+          }}
+        >
           {displayText}
         </Button>
       );
     } else if (forms.length && !(hideFormLauncher ?? isDead)) {
       return (
-        <FormLauncherWithIntent
-          formJsonList={forms}
-          launchForm={(formJson, intent) =>
-            launchEncounterForm(
-              formJson,
-              moduleName,
-              'add',
-              onFormSave,
-              null,
-              '',
-              intent,
-              workspaceWindowSize,
-              patientUuid,
-            )
-          }
-          title={displayText}
-        />
+        <MenuButton label={t('add', 'Add')} kind="ghost" menuAlignment="bottom-end">
+          {formsJson
+            .filter((formJson) => formJson.availableIntents.length > 0)
+            .map((filteredItem) =>
+              filteredItem.availableIntents.map((intent, index) => (
+                <MenuItem
+                  key={index}
+                  label={intent.display}
+                  onClick={() =>
+                    launchEncounterForm(
+                      filteredItem,
+                      moduleName,
+                      'add',
+                      onFormSave,
+                      null,
+                      '',
+                      intent,
+                      workspaceWindowSize,
+                      patientUuid,
+                    )
+                  }
+                />
+              )),
+            )}
+        </MenuButton>
       );
     }
     return null;

packages/esm-commons-lib/src/components/encounter-list/multiple-encounter-list.component.tsx

@@ -122,7 +122,8 @@ export const MultipleEncounterList: React.FC<MultipleEncounterListProps> = ({
                   } else {
                     column.link?.getUrl && navigate({ to: column.link.getUrl() });
                   }
-                }}>
+                }}
+              >
                 {val}
               </Link>
             );

packages/esm-commons-lib/src/components/modals/add-patient-to-list-modal.component.tsx

@@ -36,7 +36,8 @@ export const AddPatientToListOverflowMenuItem: React.FC<{
           onClick={() => setIsOpen(true)}
           style={{
             maxWidth: '100vw',
-          }}>
+          }}
+        >
           <span className="cds--overflow-menu-options__option-content">
             {displayText || t('startHTSSession', 'Start HTS Session')}
           </span>
@@ -167,7 +168,8 @@ export const AddPatientToListModal: React.FC<{
           selectedList == null ||
           isSubmitting ||
           (selectedList == 'none' && currentMemberships.length == 0)
-        }>
+        }
+      >
         <div style={{ paddingLeft: '1rem', marginBottom: '2rem' }}>
           <p style={{ marginBottom: '1rem' }}>Currently added to the list(s) below</p>
           {isLoading ? loader : alreadySubscribedLists}
@@ -180,7 +182,8 @@ export const AddPatientToListModal: React.FC<{
               legendText=""
               name="patient-lists"
               orientation="vertical"
-              onChange={(selected) => setSelectedList(selected.toString())}>
+              onChange={(selected) => setSelectedList(selected.toString())}
+            >
               {availableLists}
             </RadioButtonGroup>
           )}

packages/esm-commons-lib/src/components/ohri-form-launcher/ohri-form-empty-launcher.component.tsx

@@ -15,7 +15,8 @@ export const FormLauncherEmpty: React.FC<{
         onClick={(e) => {
           e.preventDefault();
           launchForm();
-        }}>
+        }}
+      >
         {t('add', 'New')}
       </Button>
     </div>