(fix) O3-3609: Fix program enrollment eligibility logic

packages/esm-patient-programs-app/src/config-schema.ts

@@ -8,6 +8,5 @@ export const configSchema = {
 };
 
 export interface ConfigObject {
-  customUrl: string;
   hideAddProgramButton: boolean;
 }

packages/esm-patient-programs-app/src/programs/programs-detailed-summary.component.tsx

@@ -105,6 +105,7 @@ const ProgramsDetailedSummary: React.FC<ProgramsDetailedSummaryProps> = ({ patie
           <span>{isValidating ? <InlineLoading /> : null}</span>
           {hideAddProgramButton ? null : (
             <Button
+              disabled={isEnrolledInAllPrograms}
               kind="ghost"
               renderIcon={(props) => <Add size={16} {...props} />}
               iconDescription={t('addPrograms', 'Add programs')}

packages/esm-patient-programs-app/src/programs/programs-detailed-summary.scss

@@ -1,4 +1,4 @@
-@import '@openmrs/esm-styleguide/src/vars';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .widgetCard {
   border: 1px solid $ui-03;

packages/esm-patient-programs-app/src/programs/programs-detailed-summary.test.tsx

@@ -88,6 +88,7 @@ describe('ProgramsDetailedSummary', () => {
     expect(editButton).toBeInTheDocument();
 
     // Clicking "Add" launches the programs form in a workspace
+    expect(addButton).toBeEnabled();
     await user.click(addButton);
 
     expect(launchPatientWorkspace).toHaveBeenCalledWith('programs-form-workspace');
@@ -111,6 +112,7 @@ describe('ProgramsDetailedSummary', () => {
     expect(screen.getByRole('row', { name: /hiv care and treatment/i })).toBeInTheDocument();
     expect(screen.getByRole('row', { name: /hiv differentiated care/i })).toBeInTheDocument();
     expect(screen.getByRole('row', { name: /oncology screening and diagnosis/i })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /add/i })).toBeDisabled();
     expect(screen.getByText(/enrolled in all programs/i)).toBeInTheDocument();
     expect(screen.getByText(/there are no more programs left to enroll this patient in/i)).toBeInTheDocument();
   });

packages/esm-patient-programs-app/src/programs/programs-form.scss

@@ -1,6 +1,6 @@
-@use '@carbon/styles/scss/type';
-@use '@carbon/styles/scss/spacing';
-@import '@openmrs/esm-styleguide/src/vars';
+@use '@carbon/type';
+@use '@carbon/layout';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .loading {
   margin-left: 1rem;
@@ -42,6 +42,12 @@
 
 .errorMessage {
   @include type.type-style("label-02");
-  margin-top: spacing.$spacing-03;
+  margin-top: layout.$spacing-03;
   color: $danger;
 }
+
+.notification {
+  margin: 0;
+  min-width: 100%;
+  padding: 0;
+}

packages/esm-patient-programs-app/src/programs/programs-form.workspace.tsx

@@ -1,9 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { type TFunction, useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
-import filter from 'lodash-es/filter';
-import includes from 'lodash-es/includes';
-import map from 'lodash-es/map';
 import {
   Button,
   ButtonSet,
@@ -72,7 +69,10 @@ const ProgramsForm: React.FC<ProgramsFormProps> = ({
 
   const eligiblePrograms = currentProgram
     ? [currentProgram]
-    : filter(availablePrograms, (program) => !includes(map(enrollments, 'program.uuid'), program.uuid));
+    : availablePrograms.filter((program) => {
+        const enrollment = enrollments.find((e) => e.program.uuid === program.uuid);
+        return !enrollment || enrollment.dateCompleted !== null;
+      });
 
   const getLocationUuid = () => {
     if (!currentEnrollment?.location.uuid && session?.sessionLocation?.uuid) {
@@ -243,7 +243,7 @@ const ProgramsForm: React.FC<ProgramsFormProps> = ({
 
   const formGroups = [
     {
-      style: { maxWidth: isTablet ? '50%' : 'fit-content' },
+      style: { maxWidth: isTablet && '50%' },
       legendText: '',
       value: programSelect,
     },
@@ -267,10 +267,10 @@ const ProgramsForm: React.FC<ProgramsFormProps> = ({
   return (
     <Form className={styles.form} onSubmit={handleSubmit(onSubmit)}>
       <Stack className={styles.formContainer} gap={7}>
-        {!eligiblePrograms.length && (
+        {!availablePrograms.length && (
           <InlineNotification
-            style={{ minWidth: '100%', margin: '0rem', padding: '0rem' }}
-            kind={'error'}
+            className={styles.notification}
+            kind="error"
             lowContrast
             subtitle={t('configurePrograms', 'Please configure programs to continue.')}
             title={t('noProgramsConfigured', 'No programs configured')}

packages/esm-patient-programs-app/src/programs/programs-overview.scss

@@ -1,4 +1,4 @@
-@import '@openmrs/esm-styleguide/src/vars';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .widgetCard {
   border: 1px solid $ui-03;

packages/esm-patient-programs-app/src/programs/programs-overview.test.tsx

@@ -3,8 +3,7 @@ import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { openmrsFetch } from '@openmrs/esm-framework';
 import { launchPatientWorkspace } from '@openmrs/esm-patient-common-lib';
-import { mockEnrolledProgramsResponse } from '__mocks__';
-
+import { mockCareProgramsResponse, mockEnrolledInAllProgramsResponse, mockEnrolledProgramsResponse } from '__mocks__';
 import { mockPatient, renderWithSwr, waitForLoadingToFinish } from 'tools';
 import ProgramsOverview from './programs-overview.component';
 
@@ -81,10 +80,27 @@ describe('ProgramsOverview', () => {
     expect(screen.getByRole('row', { name: /HIV Care and Treatment/i })).toBeInTheDocument();
 
     // Clicking "Add" launches the programs form in a workspace
+    expect(addButton).toBeEnabled();
     await user.click(addButton);
 
     expect(launchPatientWorkspace).toHaveBeenCalledWith('programs-form-workspace');
   });
+
+  it('renders a notification when the patient is enrolled in all available programs', async () => {
+    mockOpenmrsFetch.mockReturnValueOnce({ data: { results: mockEnrolledInAllProgramsResponse } });
+    mockOpenmrsFetch.mockReturnValueOnce({ data: { results: mockCareProgramsResponse } });
+
+    renderProgramsOverview();
+
+    await waitForLoadingToFinish();
+
+    expect(screen.getByRole('row', { name: /hiv care and treatment/i })).toBeInTheDocument();
+    expect(screen.getByRole('row', { name: /hiv differentiated care/i })).toBeInTheDocument();
+    expect(screen.getByRole('row', { name: /oncology screening and diagnosis/i })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /add/i })).toBeDisabled();
+    expect(screen.getByText(/enrolled in all programs/i)).toBeInTheDocument();
+    expect(screen.getByText(/there are no more programs left to enroll this patient in/i)).toBeInTheDocument();
+  });
 });
 
 function renderProgramsOverview() {