(refactor) follow up changes on the case management: discontinuity of case

packages/esm-morgue-app/src/config-schema.ts

@@ -1,18 +1,6 @@
 import { Type } from '@openmrs/esm-framework';
 
 export const configSchema = {
-  autopsyEncounterUuid: {
-    _type: Type.String,
-    _description: 'Encounter UUID for autopsy',
-    _default: '',
-  },
-  formsList: {
-    _type: Type.Object,
-    _description: 'List of form UUIDs',
-    _default: {
-      autopsyFormUuid: '',
-    },
-  },
   morgueVisitTypeUuid: {
     _type: Type.String,
     _description: ' UUID for morgue visit',
@@ -21,7 +9,7 @@ export const configSchema = {
   morgueDepartmentServiceTypeUuid: {
     _type: Type.String,
     _description: ' UUID for morgue department service type',
-    _default: 'd7bd4cc0-90b1-4f22-90f2-ab7fde936727',
+    _default: '5b9e6cd1-f836-4144-91e4-401c58dd62af',
   },
   insurancepaymentModeUuid: {
     _type: Type.String,
@@ -36,7 +24,7 @@ export const configSchema = {
   tagNumberUuid: {
     _type: Type.String,
     _description: 'UUID for tag number concept',
-    _default: '13ba9c45-c540-4f10-b915-fa3d7baeb3d1',
+    _default: 'f2b35679-7ba9-4619-92cb-6872b0c6bf57',
   },
   morgueAdmissionEncounterType: {
     _type: Type.String,
@@ -56,22 +44,22 @@ export const configSchema = {
   obNumberUuid: {
     _type: Type.String,
     _description: 'UUID for ob number concept',
-    _default: 'c756d06a-22a5-4b66-933e-3d44667b72a0',
+    _default: '0dffecb3-2dc4-4d56-8cd4-56ba38579c69',
   },
   policeNameUuid: {
     _type: Type.String,
     _description: 'UUID for police name concept',
-    _default: '6d58d9b5-6f84-4e77-941e-f5cc86d18a60',
+    _default: 'd889f05b-0d9b-462f-ae8e-2e9be79fd954',
   },
   burialPermitNumberUuid: {
     _type: Type.String,
     _description: 'UUID for burial permit number concept',
-    _default: '29ef3df3-9845-49b0-96f2-5fb6d6240039',
+    _default: 'da524812-5600-4677-ba26-eb61eb925eef',
   },
   policeIDNumber: {
     _type: Type.String,
     _description: 'UUID for police id number concept',
-    _default: '8d488d02-d1d8-41a5-8219-61f4fc5dbeb0',
+    _default: '163084AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
   },
   encounterProviderRoleUuid: {
     _type: Type.UUID,
@@ -133,4 +121,4 @@ export type ConfigObject = {
   dischargeAreaUuid: string;
   morgueDischargeEncounterTypeUuid: string;
   adminUuid: string;
-};
+};

packages/esm-patient-clinical-view-app/src/case-management/table/case-management-list-active-component.tsx

@@ -22,7 +22,6 @@ import {
   ConfigurableLink,
   isDesktop,
   launchWorkspace,
-  showModal,
   showSnackbar,
   useLayoutType,
   useSession,
@@ -47,7 +46,7 @@ const CaseManagementListActive: React.FC<CaseManagementListActiveProps> = ({ set
   const { user } = useSession();
   const caseManagerPersonUuid = user?.person.uuid;
 
-  const { data: activeCasesData, error: activeCasesError } = useActivecases(caseManagerPersonUuid);
+  const { data: activeCasesData, error: activeCasesError, mutate: fetchCases } = useActivecases(caseManagerPersonUuid);
 
   const patientChartUrl = '${openmrsSpaBase}/patient/${patientUuid}/chart/case-management-encounters';
 
@@ -65,10 +64,26 @@ const CaseManagementListActive: React.FC<CaseManagementListActiveProps> = ({ set
         caseData.personB.display.toLowerCase().includes(searchTerm.toLowerCase())),
   );
   const handleDiscontinueACase = async (relationshipUuid: string) => {
-    const dispose = showModal('end-relationship-dialog', {
-      relationshipUuid,
-      closeModal: () => dispose(),
-    });
+    try {
+      await updateRelationship(relationshipUuid, { endDate: new Date() });
+      await fetchCases();
+
+      showSnackbar({
+        kind: 'success',
+        title: t('endRlship', 'End relationship'),
+        subtitle: t('savedRlship', 'Relationship ended successfully'),
+        timeoutInMs: 3000,
+        isLowContrast: true,
+      });
+    } catch (error) {
+      showSnackbar({
+        kind: 'error',
+        title: t('RlshipError', 'Relationship Error'),
+        subtitle: t('RlshipError', 'Request Failed.......'),
+        timeoutInMs: 2500,
+        isLowContrast: true,
+      });
+    }
   };
 
   const tableRows = filteredCases
@@ -87,12 +102,12 @@ const CaseManagementListActive: React.FC<CaseManagementListActiveProps> = ({ set
       dateofend: caseData.endDate ? (
         new Date(caseData.endDate).toLocaleDateString()
       ) : (
-        <Tag type="green" size={responsiveSize}>
+        <Tag type="green" size="lg">
           {t('enrolled', 'Enrolled')}
         </Tag>
       ),
       actions: (
-        <OverflowMenu size={responsiveSize}>
+        <OverflowMenu size="md">
           <OverflowMenuItem
             isDelete
             itemText={t('discontinue', 'Discontinue')}