@kenyaemr/esm-care-panel-app 5.4.4-pre.43 → 5.4.4-pre.430

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-care-panel-app",
-  "version": "5.4.4-pre.43",
+  "version": "5.4.4-pre.430",
   "description": "Patient care panels microfrontend for the OpenMRS SPA",
   "keywords": [
     "openmrs"
@@ -20,14 +20,12 @@
   "scripts": {
     "analyze": "rspack build --mode=production --analyze",
     "build": "rspack --mode=production",
-    "coverage": "yarn test --coverage",
+    "coverage": "echo \"Jest has been removed; no unit test runner is configured\" && exit 0",
     "debug": "npm run serve",
-    "extract-translations": "i18next 'src/**/*.component.tsx' 'src/index.ts' --config ../../tools/i18next-parser.config.js",
+    "extract-translations": "i18next 'src/**/*.{ts,tsx}' --config ../../tools/i18next-parser.config.js",
     "lint": "eslint src --ext ts,tsx",
     "serve": "rspack serve --mode=development",
     "start": "openmrs develop",
-    "test": "cross-env TZ=UTC jest --config jest.config.js --verbose false --passWithNoTests",
-    "test:watch": "cross-env TZ=UTC jest --watch --config jest.config.js",
     "typescript": "tsc"
   },
   "browserslist": [
@@ -39,7 +37,7 @@
   },
   "peerDependencies": {
     "@carbon/react": "1.x",
-    "@openmrs/esm-framework": "8.x",
+    "@openmrs/esm-framework": "9.x",
     "react": "^18.1.0",
     "react-i18next": "11.x",
     "react-router-dom": "6.x",

package/src/care-panel/care-panel.component.tsx

@@ -53,7 +53,7 @@ const CarePanel: React.FC<CarePanelProps> = ({ patientUuid, formEntrySub }) => {
         <div className={styles.contextSwitcherContainer}>
           <ContentSwitcher size="md" selectedIndex={switchItem?.index} onChange={(params) => setSwitcherItem(params)}>
             {switcherHeaders?.map((enrollment) => (
-              <Switch key={enrollment} name={enrollment} text={enrollment} />
+              <Switch key={enrollment} name={enrollment} text={t(enrollment)} />
             ))}
           </ContentSwitcher>
         </div>

package/src/care-panel-dashboard/care-panel-dashboard.component.tsx

@@ -7,11 +7,15 @@ import CarePrograms from '../care-programs/care-programs.component';
 
 import CarePanelMachineLearning from '../machine-learning/machine-learning.component';
 import styles from './care-panel-dashboard.scss';
-import { DefaultWorkspaceProps, launchWorkspace } from '@openmrs/esm-framework/src';
+import { DefaultWorkspaceProps } from '@openmrs/esm-framework';
 
-type CarePanelDashboardProps = { patientUuid: string; formEntrySub: any } & DefaultWorkspaceProps;
+type CarePanelDashboardProps = {
+  patientUuid: string;
+  formEntrySub: any;
+  patient: fhir.Patient;
+} & DefaultWorkspaceProps;
 
-const CarePanelDashboard: React.FC<CarePanelDashboardProps> = ({ formEntrySub, patientUuid }) => {
+const CarePanelDashboard: React.FC<CarePanelDashboardProps> = ({ formEntrySub, patientUuid, patient }) => {
   const { t } = useTranslation();
   return (
     <Layer className={styles.container}>
@@ -32,7 +36,7 @@ const CarePanelDashboard: React.FC<CarePanelDashboardProps> = ({ formEntrySub, p
               <CarePanel patientUuid={patientUuid} formEntrySub={formEntrySub} />
             </TabPanel>
             <TabPanel>
-              <CarePrograms patientUuid={patientUuid} />
+              <CarePrograms patientUuid={patientUuid} patient={patient} />
             </TabPanel>
             <TabPanel>
               <CarePanelMachineLearning patientUuid={patientUuid} />

package/src/care-programs/care-program-form-translation-keys.ts

@@ -0,0 +1,121 @@
+/**
+ * This file exists solely to register care program form translation keys for i18next-parser extraction.
+ * The keys are used dynamically via `formTranslationKey` in the careProgramForms config — the parser
+ * cannot detect dynamic keys, so they are listed here as static t() calls.
+ *
+ * Do not remove or call this function at runtime.
+ */
+export function registerCareProgramFormTranslationKeys(t: (key: string, defaultValue: string) => string) {
+  // VMMC
+  t('vmmcEnrollment', 'VMMC Enrollment');
+  t('vmmcInitial', 'VMMC Initial');
+  t('vmmcClientFollowUp', 'VMMC Client Follow-Up');
+  t('vmmcCircumcisionProcedure', 'VMMC Circumcision Procedure');
+  t('vmmcImmediatePostOperationAssessment', 'VMMC Immediate Post-Operation Assessment');
+  t('vmmcMedicalExamination', 'VMMC Medical Examination');
+  t('vmmcDiscontinuation', 'VMMC Discontinuation');
+
+  // CPM
+  t('cpmEnrollment', 'CPM Enrollment');
+  t('cpmInitial', 'CPM Initial');
+  t('cpmReferral', 'CPM Referral');
+  t('cpmScreening', 'CPM Screening');
+  t('cpmDiscontinuation', 'CPM Discontinuation');
+
+  // PNC
+  t('pncEnrollment', 'PNC Enrollment');
+  t('mchPncVisit', 'MCH PNC Visit');
+  t('pncDiscontinuation', 'PNC Discontinuation');
+
+  // ANC
+  t('ancEnrollment', 'ANC Enrollment');
+  t('mchAntenatalVisit', 'MCH Antenatal Visit');
+  t('ancFollowUpForm', 'ANC Follow Up form');
+  t('ancDiscontinuation', 'ANC Discontinuation');
+
+  // MCH - Child Services (CWC)
+  t('cwcEnrolment', 'CWC Enrolment');
+  t('cwcInitial', 'Initial CWC');
+  t('cwcFollowup', 'CWC Followup');
+  t('cwcDiscontinuation', 'CWC Discontinuation');
+
+  // Nutrition
+  t('nutritionEnrollment', 'Nutrition Enrollment');
+  t('nutritionForm', 'Nutrition form');
+  t('nutritionDiscontinuation', 'Nutrition Discontinuation');
+
+  // Family Planning
+  t('familyPlanningEnrollment', 'Family Planning Enrollment');
+  t('familyPlanningForm', 'Family Planning Form');
+  t('familyPlanningDiscontinuation', 'Family Planning Discontinuation');
+
+  // TB
+  t('tbEnrollment', 'TB Enrollment');
+  t('tbInitial', 'TB Initial');
+  t('tbFollowUp', 'TB FollowUp');
+  t('tbDiscontinuation', 'TB Discontinuation');
+
+  // Violence screening
+  t('violenceEnrollment', 'Violence enrollment');
+  t('violenceScreening', 'Violence Screening');
+  t('violenceInitialForm', 'Violence Initial Form');
+  t('violenceConsentForm', 'Violence Consent Form');
+  t('sexualViolencePostRapeCare363A', 'Sexual Violence post rape care 363A');
+  t('sexualViolencePrcPsychologicalAssessment363B', 'Sexual Violence PRC Psychological Assessment 363B');
+  t('physicalAndEmotionalViolenceForm', 'Physical and Emotional Violence Form');
+  t('violenceTraumaCounselling', 'Violence Trauma Counselling');
+  t('violenceReportingForm', 'Violence Reporting Form');
+  t('violenceCommunityLinkageForm', 'Violence Community Linkage Form');
+  t('violenceLegalForm', 'Violence Legal Form');
+  t('violencePerpetratorDetails', 'Violence Perpetrator Details');
+  t('pepFollowupForm', 'PEP FOLLOWUP Form');
+  t('violenceDiscontinuationForm', 'Violence Discontinuation Form');
+
+  // TPT
+  t('tptInitiation', 'TPT Initiation');
+  t('tptInitial', 'TPT Initial');
+  t('tptFollowUp', 'TPT FollowUp');
+  t('tptOutcomeDiscontinuation', 'TPT Outcome/Discontinuation');
+
+  // PrEP
+  t('prepEnrollment', 'PrEP Enrollment');
+  t('prepInitiation', 'PrEP Initiation');
+  t('prepClinicalForm', 'PrEP Clinical Form');
+  t('prepDiscontinuation', 'PrEP Discontinuation');
+
+  // NCD
+  t('ncdEnrollment', 'NCD Enrollment');
+  t('ncdInitial', 'NCD Initial');
+  t('ncdFollowUp', 'NCD Follow Up');
+  t('ncdDiscontinuation', 'NCD Discontinuation');
+
+  // KVP
+  t('kvpEnrollmentForm', 'KVP Enrollment Form');
+  t('kvpContactForm', 'KVP Contact Form');
+  t('kvpClinicalEnrollment', 'KVP Clinical Enrollment');
+  t('kvpPeerEducatorOutreachCalendar', 'KVP Peer Educator Outreach Calendar');
+  t('kvpClinicalEncounterForm', 'KVP Clinical Encounter form');
+  t('kvpClientDiscontinuation', 'KVP Client Discontinuation');
+
+  // HIV Program
+  t('hivEnrollment', 'HIV Enrollment');
+  t('hivInitialForm', 'HIV Initial form');
+  t('artReadiness', 'ART Readyness');
+  t('hivGreenCard', 'HIV Green Card');
+  t('hivDiscontinuation', 'HIV Discontinuation');
+
+  // Pre-Conception care program
+  t('preConceptionCareEnrollmentForm', 'Pre-Conception Care Enrollment Form');
+  t('preConceptionCare', 'Pre-Conception Care');
+  t('preConceptionDiscontinuation', 'Pre-Conception Discontinuation');
+
+  // MAT
+  t('matClinicalEligibilityAssessmentAndReferralForm', 'MAT Clinical Eligibility Assessment & Referral Form');
+  t('matInitialRegistrationForm', 'MAT Initial Registration Form');
+  t('matPsychoSocialIntakeAndFollowUpForm', 'MAT Psycho-social Intake & Follow-up Form');
+  t('matClinicalEncounterForm', 'MAT Clinical Encounter Form');
+  t('matPsychiatricIntakeAndFollowUpForm', 'MAT Psychiatric Intake and Follow up Form');
+  t('matTransitReferralForm', 'MAT Transit/Referral Form');
+  t('matCessationForm', 'MAT Cessation Form');
+  t('matDiscontinuationForm', 'MAT Discontinuation Form');
+}

package/src/care-programs/care-program.resource.ts

@@ -1,6 +1,7 @@
 import {
   FetchResponse,
   launchWorkspace,
+  launchWorkspace2,
   openmrsFetch,
   parseDate,
   restBaseUrl,
@@ -266,10 +267,15 @@ export const launchProgramForm = (
   enrollment: Enrollment | undefined,
   onSuccess?: () => void,
 ) => {
-  launchWorkspace('mch-program-form-workspace', {
-    enrollment,
-    patientUuid,
-    programUuid,
-    onSubmitSuccess: onSuccess,
-  });
+  launchWorkspace2(
+    'mch-program-form-workspace',
+    {
+      enrollment,
+      patientUuid,
+      programUuid,
+      onSubmitSuccess: onSuccess,
+    },
+    {},
+    {},
+  );
 };

package/src/care-programs/care-programs.component.tsx

@@ -16,8 +16,14 @@ import {
   Tile,
 } from '@carbon/react';
 import { Close, DocumentAdd } from '@carbon/react/icons';
-import { formatDate, launchWorkspace, restBaseUrl, useLayoutType, useVisit } from '@openmrs/esm-framework';
-import { CardHeader, EmptyState, ErrorState, launchStartVisitPrompt } from '@openmrs/esm-patient-common-lib';
+import { formatDate, restBaseUrl, useLayoutType, useVisit } from '@openmrs/esm-framework';
+import {
+  CardHeader,
+  EmptyState,
+  ErrorState,
+  useLaunchWorkspaceRequiringVisit,
+  usePatientChartStore,
+} from '@openmrs/esm-patient-common-lib';
 import capitalize from 'lodash/capitalize';
 import React, { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -31,12 +37,12 @@ import useCareProgramForms from './useCareProgramForms';
 
 type CareProgramsProps = {
   patientUuid: string;
+  patient: fhir.Patient;
 };
 
-const CarePrograms: React.FC<CareProgramsProps> = ({ patientUuid }) => {
+const CarePrograms: React.FC<CareProgramsProps> = ({ patientUuid, patient }) => {
   const { t } = useTranslation();
   const { getProgramForms, getProgramEnrollmentForm } = useCareProgramForms();
-  const { currentVisit, mutate: mutateVisit } = useVisit(patientUuid);
   const { eligibleCarePrograms, isLoading, isValidating, error, mutateEligiblePrograms } = useCarePrograms(patientUuid);
   const {
     enrollments,
@@ -44,9 +50,7 @@ const CarePrograms: React.FC<CareProgramsProps> = ({ patientUuid }) => {
     error: enrollmentsError,
     mutate: mutateEnrollments,
   } = usePatientEnrolledPrograms(patientUuid);
-
-  const isTablet = useLayoutType() === 'tablet';
-
+  const { mutateVisitContext, visitContext } = usePatientChartStore(patientUuid);
   const handleMutations = useCallback(() => {
     mutateEligiblePrograms();
     mutate(
@@ -60,9 +64,24 @@ const CarePrograms: React.FC<CareProgramsProps> = ({ patientUuid }) => {
       undefined,
       { revalidate: true },
     );
-    mutateVisit();
     mutateEnrollments();
-  }, [mutateEligiblePrograms, mutateEnrollments, mutateVisit, patientUuid]);
+  }, [mutateEligiblePrograms, mutateEnrollments, patientUuid]);
+  const groupProps = useMemo(
+    () => ({
+      patient,
+      patientUuid,
+      visitContext,
+      mutateVisitContext: () => {
+        mutateVisitContext();
+        handleMutations();
+      },
+    }),
+    [patient, patientUuid, visitContext, mutateVisitContext, handleMutations],
+  );
+
+  const isTablet = useLayoutType() === 'tablet';
+
+  const launchFormEntryWorkspace = useLaunchWorkspaceRequiringVisit(patientUuid, 'patient-form-entry-workspace');
 
   const rows = useMemo(
     () => [
@@ -71,7 +90,7 @@ const CarePrograms: React.FC<CareProgramsProps> = ({ patientUuid }) => {
 
         return {
           id: enrollment.program.uuid,
-          programName: enrollment.program.name,
+          programName: t(enrollment.program.name),
           status: (
             <div className={styles.careProgramButtonContainer}>
               <Tag type="green">{t('enrolled', 'Enrolled')}</Tag>
@@ -81,7 +100,6 @@ const CarePrograms: React.FC<CareProgramsProps> = ({ patientUuid }) => {
                     <ProgramFormOverflowMenuItem
                       key={`${enrollment.uuid}-${form.formUuId}`}
                       form={form}
-                      visit={currentVisit}
                       patientUuid={patientUuid}
                       mutate={handleMutations}
                       enrollment={enrollment}
@@ -105,15 +123,35 @@ const CarePrograms: React.FC<CareProgramsProps> = ({ patientUuid }) => {
       }),
       ...eligibleCarePrograms.map((careProgram) => {
         const enrollmentForm = getProgramEnrollmentForm(careProgram.uuid);
-
         return {
           id: `${careProgram.uuid}`,
-          programName: careProgram.display,
+          //  t('HIV', 'HIV')
+          //  t('Child Welfare Clinic', 'Child Welfare Clinic')
+          //  t('SMNI - Services maternels', 'SMNI - Services maternels')
+          //  t('TB', 'TB')
+          //  t('TPT', 'TPT')
+          //  t('PrEP', 'PrEP')
+          //  t('OVC', 'OVC')
+          //  t('OTZ', 'OTZ')
+          //  t('KVP', 'KVP')
+          //  t('NimeCONFIRM', 'NimeCONFIRM')
+          //  t('VMMC', 'VMMC')
+          //  t('MAT', 'MAT')
+          //  t('NCD', 'NCD')
+          //  t('Violence screening', 'Violence screening')
+          //  t('CPM', 'CPM')
+          //  t('Nutrition', 'Nutrition')
+          //  t('Antenatal Care', 'Antenatal Care')
+          //  t('Postnatal Care', 'Postnatal Care')
+          //  t('Family Planning', 'Family Planning')
+          //  t('Pre-Conception Care', 'Pre-Conception Care')
+          programName: t(careProgram.display),
           status: (
             <div className={styles.careProgramButtonContainer}>
               <span>
                 {capitalize(
-                  `${careProgram.enrollmentStatus} ${
+                  // t('eligible', 'Eligible')
+                  `${t(careProgram.enrollmentStatus)} ${
                     careProgram.enrollmentDetails?.dateEnrolled && careProgram.enrollmentStatus === 'active'
                       ? `Since (${formatDate(new Date(careProgram.enrollmentDetails.dateEnrolled))})`
                       : ''
@@ -132,22 +170,18 @@ const CarePrograms: React.FC<CareProgramsProps> = ({ patientUuid }) => {
                       mutateEligiblePrograms();
                     });
                   }
-                  if (currentVisit) {
-                    if (enrollmentForm) {
-                      return launchWorkspace('patient-form-entry-workspace', {
-                        workspaceTitle: enrollmentForm.formName,
-                        mutateForm: handleMutations,
-                        formInfo: {
-                          encounterUuid: '',
-                          formUuid: enrollmentForm.formUuId,
-                        },
-                      });
-                    }
-                  }
-                  launchStartVisitPrompt();
+                  launchFormEntryWorkspace(
+                    {
+                      workspaceTitle: enrollmentForm.formName,
+                      form: { uuid: enrollmentForm.formUuId },
+                      encounterUuid: '',
+                    },
+                    {},
+                    groupProps,
+                  );
                 }}
                 renderIcon={careProgram.enrollmentStatus == 'active' ? Close : DocumentAdd}>
-                {careProgram.enrollmentStatus == 'active' ? 'Discontinue' : 'Enroll'}
+                {careProgram.enrollmentStatus == 'active' ? t('discontinue', 'Discontinue') : t('enroll', 'Enroll')}
               </Button>
             </div>
           ),
@@ -159,11 +193,12 @@ const CarePrograms: React.FC<CareProgramsProps> = ({ patientUuid }) => {
       eligibleCarePrograms,
       getProgramForms,
       t,
-      currentVisit,
       patientUuid,
       handleMutations,
       mutateEnrollments,
       getProgramEnrollmentForm,
+      launchFormEntryWorkspace,
+      groupProps,
       mutateEligiblePrograms,
     ],
   );
@@ -171,11 +206,11 @@ const CarePrograms: React.FC<CareProgramsProps> = ({ patientUuid }) => {
   const headers = [
     {
       key: 'programName',
-      header: 'Program name',
+      header: t('programName', 'Program Name'),
     },
     {
       key: 'status',
-      header: 'Status',
+      header: t('status', 'Status'),
     },
   ];
 

package/src/care-programs/link-patient-to-peer-action.component.tsx

@@ -1,27 +1,37 @@
-import React, { FC } from 'react';
+import React, { FC, useMemo } from 'react';
 import { usePatientActivePeerEducator } from './kvp-program-actions.resource';
 import { useTranslation } from 'react-i18next';
 import { InlineLoading, OverflowMenuItem } from '@carbon/react';
-import { launchWorkspace, useConfig, Visit } from '@openmrs/esm-framework';
+import { launchWorkspace, launchWorkspace2, useConfig, Visit } from '@openmrs/esm-framework';
 import { CarePanelConfig } from '../config-schema';
-import { launchStartVisitPrompt } from '@openmrs/esm-patient-common-lib';
+import {
+  launchStartVisitPrompt,
+  useLaunchWorkspaceRequiringVisit,
+  usePatientChartStore,
+} from '@openmrs/esm-patient-common-lib';
 
 type KvpLinkPatientToPeerEducatorProps = {
   patientUuid: string;
   form: CarePanelConfig['careProgramForms'][0]['forms'][0];
-  visit?: Visit;
   mutate?: () => void;
 };
-const KvpLinkPatientToPeerEducator: FC<KvpLinkPatientToPeerEducatorProps> = ({
-  patientUuid,
-  form,
-  visit: currentVisit,
-  mutate,
-}) => {
+const KvpLinkPatientToPeerEducator: FC<KvpLinkPatientToPeerEducatorProps> = ({ patientUuid, form, mutate }) => {
+  const { mutateVisitContext, visitContext, patient: fhirPatient } = usePatientChartStore(patientUuid);
   const { activePeer, error, isLoading } = usePatientActivePeerEducator(patientUuid);
   const { hideFilledProgramForm } = useConfig<CarePanelConfig>();
   const { t } = useTranslation();
-  const formEncounter = currentVisit?.encounters?.find((en) => en.form?.uuid === form.formUuId);
+  const formEncounter = visitContext?.encounters?.find((en) => en.form?.uuid === form.formUuId);
+  const launchFormEntryWorkspace = useLaunchWorkspaceRequiringVisit(patientUuid, 'patient-form-entry-workspace');
+
+  const groupProps = useMemo(
+    () => ({
+      patientUuid,
+      patient: fhirPatient,
+      visitContext,
+      mutateVisitContext,
+    }),
+    [patientUuid, fhirPatient, visitContext, mutateVisitContext],
+  );
 
   if (isLoading) {
     return <InlineLoading />;
@@ -32,10 +42,15 @@ const KvpLinkPatientToPeerEducator: FC<KvpLinkPatientToPeerEducatorProps> = ({
       <OverflowMenuItem
         itemText={t('linkToPeerEducator', 'Link to peer Educator')}
         onClick={() => {
-          launchWorkspace('kvp-peer-linkage-form-workspace', {
-            workspaceTitle: t('linkPatientToPeerEducator', 'Link Patient to Peer Educator'),
-            patientUuid,
-          });
+          launchWorkspace2(
+            'kvp-peer-linkage-form-workspace',
+            {
+              workspaceTitle: t('linkPatientToPeerEducator', 'Link Patient to Peer Educator'),
+              patientUuid,
+            },
+            {},
+            {},
+          );
         }}
       />
     );
@@ -50,18 +65,15 @@ const KvpLinkPatientToPeerEducator: FC<KvpLinkPatientToPeerEducatorProps> = ({
       key={form.formUuId}
       itemText={form.formName}
       onClick={() => {
-        if (currentVisit) {
-          return launchWorkspace('patient-form-entry-workspace', {
+        launchFormEntryWorkspace(
+          {
             workspaceTitle: form.formName,
-            mutateForm: mutate,
-            formInfo: {
-              encounterUuid: formEncounter?.uuid ?? '',
-              formUuid: form.formUuId,
-              // additionalProps: { enrollmenrDetails: careProgram.enrollmentDetails ?? {} },
-            },
-          });
-        }
-        launchStartVisitPrompt();
+            form: { uuid: form.formUuId },
+            encounterUuid: formEncounter?.uuid ?? '',
+          },
+          {},
+          groupProps,
+        );
       }}
     />
   );

package/src/care-programs/program-form-overflow-menu-item.component.tsx

@@ -1,6 +1,6 @@
 import { InlineLoading, OverflowMenuItem } from '@carbon/react';
-import { launchWorkspace, showSnackbar, useConfig, Visit } from '@openmrs/esm-framework';
-import { launchStartVisitPrompt } from '@openmrs/esm-patient-common-lib';
+import { showSnackbar, useConfig } from '@openmrs/esm-framework';
+import { useLaunchWorkspaceRequiringVisit, usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 import React, { FC, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { CarePanelConfig } from '../config-schema';
@@ -11,7 +11,6 @@ type ProgramFormOverflowMenuItemProps = {
   patientUuid: string;
   form: CarePanelConfig['careProgramForms'][0]['forms'][0];
   mutate?: () => void;
-  visit?: Visit;
   enrollment: Enrollment;
 };
 
@@ -19,9 +18,10 @@ const ProgramFormOverflowMenuItem: FC<ProgramFormOverflowMenuItemProps> = ({
   form,
   patientUuid,
   mutate,
-  visit: currentVisit,
   enrollment,
 }) => {
+  const { mutateVisitContext, visitContext, patient: fhirPatient } = usePatientChartStore(patientUuid);
+  const launchFormEntryWorkspace = useLaunchWorkspaceRequiringVisit(patientUuid, 'patient-form-entry-workspace');
   const {
     formEncounters,
     error,
@@ -29,7 +29,7 @@ const ProgramFormOverflowMenuItem: FC<ProgramFormOverflowMenuItemProps> = ({
     mutate: mutateFormEncounters,
   } = usePatientFormEncounter(patientUuid, form.formUuId, {
     scope: form.tags.includes('bound-to-current-visit') ? 'current-visit' : 'all-visits',
-    currentVisit: currentVisit,
+    currentVisit: visitContext,
   });
   const { hideFilledProgramForm, peerCalendarOutreactForm } = useConfig<CarePanelConfig>();
   const { t } = useTranslation();
@@ -39,6 +39,20 @@ const ProgramFormOverflowMenuItem: FC<ProgramFormOverflowMenuItemProps> = ({
     isLoading: isLoadingDependancyStatus,
     mutate: mutateDependancyStatus,
   } = useFormsFilled(patientUuid, form.dependancies);
+  const groupProps = useMemo(
+    () => ({
+      patientUuid,
+      patient: fhirPatient,
+      visitContext,
+      mutateVisitContext: () => {
+        mutateVisitContext();
+        mutate?.();
+        mutateDependancyStatus();
+        mutateFormEncounters();
+      },
+    }),
+    [patientUuid, fhirPatient, visitContext, mutateVisitContext, mutate, mutateDependancyStatus, mutateFormEncounters],
+  );
 
   const latestFormEncounter = useMemo(() => formEncounters.at(0)?.encounter, [formEncounters]);
   // Show form if
@@ -78,7 +92,6 @@ const ProgramFormOverflowMenuItem: FC<ProgramFormOverflowMenuItemProps> = ({
       <KvpLinkPatientToPeerEducator
         form={form}
         patientUuid={patientUuid}
-        visit={currentVisit}
         mutate={() => {
           mutate?.();
           mutateDependancyStatus();
@@ -88,14 +101,16 @@ const ProgramFormOverflowMenuItem: FC<ProgramFormOverflowMenuItemProps> = ({
     );
   }
 
+  const formLabel = t(form.formTranslationKey ?? form.formName, { defaultValue: form.formName });
+
   return (
     <OverflowMenuItem
       key={form.formUuId}
-      itemText={form.formName}
+      itemText={formLabel}
       onClick={() => {
-        if (currentVisit) {
-          return launchWorkspace('patient-form-entry-workspace', {
-            workspaceTitle: form.formName,
+        /**
+          launchWorkspace('patient-form-entry-workspace', {
+            workspaceTitle: formLabel,
             mutateForm: () => {
               mutate?.();
               mutateDependancyStatus();
@@ -109,8 +124,21 @@ const ProgramFormOverflowMenuItem: FC<ProgramFormOverflowMenuItemProps> = ({
               },
             },
           });
-        }
-        launchStartVisitPrompt();
+         */
+        return launchFormEntryWorkspace(
+          {
+            workspaceTitle: formLabel,
+            form: {
+              uuid: form.formUuId,
+            },
+            additionalProps: {
+              enrollmentDetails: { dateEnrolled: new Date(enrollment.dateEnrolled), uuid: enrollment.uuid },
+            },
+            encounterUuid: form.tags.includes('discontinuation') ? '' : latestFormEncounter?.uuid ?? '',
+          },
+          {},
+          groupProps,
+        );
       }}
     />
   );