fix overflowMenu position

openmrs · Aug 23, 2023 · e4eab9b · e4eab9b
1 parent 970d9f2
commit e4eab9b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/packages/esm-patient-list-app/src/api/api-remote.ts b/packages/esm-patient-list-app/src/api/api-remote.ts
@@ -150,7 +150,7 @@ export async function removePatientFromList(cohortMembershipUuid: string, ac = n
   return postData(
     `${cohortUrl}/cohortmember/${cohortMembershipUuid}`,
     {
-      voidReason: '',
+      endDate: new Date(),
     },
     ac,
   );

diff --git a/packages/esm-patient-list-app/src/patient-table/overflow-menu.component.tsx b/packages/esm-patient-list-app/src/patient-table/overflow-menu.component.tsx
@@ -4,6 +4,7 @@ import { removePatientFromList } from '../api/api-remote';
 import { ExtensionSlot, isDesktop, showToast, useLayoutType } from '@openmrs/esm-framework';
 import { OverflowMenu, Layer, OverflowMenuItem, Modal } from '@carbon/react';
 import styles from './patient-table.scss';
+import overflowMenuStyles from './overflow-menu.scss';
 
 interface OverflowMenuCellProps {
   cohortMembershipUuid: string;
@@ -44,7 +45,7 @@ const OverflowMenuComponent: React.FC<OverflowMenuCellProps> = ({
   }, [cohortMembershipUuid, cohortName, mutatePatientListMembers, t]);
 
   return (
-    <Layer className={styles.layer}>
+    <Layer className={overflowMenuStyles.layer}>
       <OverflowMenu
         data-floating-menu-container
         ariaLabel={`Remove patient from the ${cohortName} list`}
@@ -53,7 +54,7 @@ const OverflowMenuComponent: React.FC<OverflowMenuCellProps> = ({
         <ExtensionSlot name={'cohort-member-action-items'} />
         <OverflowMenuItem
           size={desktopLayout ? 'sm' : 'lg'}
-          className={styles.menuItem}
+          className={overflowMenuStyles.menuItem}
           onClick={() => setShowConfirmationModal(true)}
           itemText={t('removePatient', 'Remove patient')}
           isDelete

diff --git a/packages/esm-patient-list-app/src/patient-table/overflow-menu.scss b/packages/esm-patient-list-app/src/patient-table/overflow-menu.scss
@@ -0,0 +1,6 @@
+.layer {
+  height: 100%;
+}
+.menuItem {
+  max-width: none;
+}
diff --git a/packages/esm-patient-list-app/src/patient-table/patient-table.component.tsx b/packages/esm-patient-list-app/src/patient-table/patient-table.component.tsx
@@ -141,7 +141,7 @@ const PatientTable: React.FC<PatientTableProps> = ({
                     {row.cells.map((cell) => (
                       <TableCell key={cell.id}>{cell.value?.content ?? cell.value}</TableCell>
                     ))}
-                    <TableCell>
+                    <TableCell className="cds--table-column-menu">
                       <PatientListOverflowMenuComponent
                         cohortMembershipUuid={row.id}
                         cohortName={cohortName}