feat: add error handling

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-11-04T15:34:51.698Z\n"
-"PO-Revision-Date: 2023-11-04T15:34:51.698Z\n"
+"POT-Creation-Date: 2023-11-04T16:21:37.396Z\n"
+"PO-Revision-Date: 2023-11-04T16:21:37.396Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1373,8 +1373,8 @@ msgstr "Scheduled date"
 msgid "Report date"
 msgstr "Report date"
 
-msgid "Please provide a valid event"
-msgstr "Please provide a valid event"
+msgid "Please select a valid event"
+msgstr "Please select a valid event"
 
 msgid "New {{ eventName }} event"
 msgstr "New {{ eventName }} event"

src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js

@@ -20,7 +20,7 @@ const ValidatedPlain = ({
     stage,
     programName,
     programId,
-    teiId,
+    enrollmentId,
     eventSaveInProgress,
     formFoundation,
     classes,
@@ -49,7 +49,7 @@ const ValidatedPlain = ({
                 />
                 <WidgetReferral
                     ref={referralRef}
-                    teiId={teiId}
+                    enrollmentId={enrollmentId}
                     programId={programId}
                     programStageId={stage?.id}
                     currentStageLabel={stage.name}

src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js

@@ -130,7 +130,7 @@ export const Validated = ({
             ready={ready}
             id={dataEntryId}
             itemId={itemId}
-            teiId={teiId}
+            enrollmentId={enrollmentId}
             formFoundation={formFoundation}
             referralRef={referralRef}
             onSave={handleSave}

src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js

@@ -38,7 +38,7 @@ export type ContainerProps = {|
 export type Props = {|
     programName: string,
     programId: string,
-    teiId: string,
+    enrollmentId: string,
     eventSaveInProgress: boolean,
     stage: ProgramStage,
     formFoundation: RenderFoundation,

src/core_modules/capture-core/components/WidgetReferral/LinkToExisting/LinkToExisting.component.js

@@ -30,6 +30,8 @@ export const LinkToExistingPlain = ({
     setReferralDataValues,
     linkableEvents,
     referralProgramStageLabel,
+    errorMessages,
+    saveAttempted,
     classes,
 }: LinkToExistingProps) => {
     const onChange = (value) => {
@@ -53,6 +55,8 @@ export const LinkToExistingPlain = ({
                     referralProgramStageLabel,
                 })}
                 className={classes.singleSelectField}
+                error={saveAttempted && !!errorMessages.linkedEventId}
+                validationText={saveAttempted && errorMessages.linkedEventId}
             >
                 {linkableEvents.map(event => (
                     <SingleSelectOption

src/core_modules/capture-core/components/WidgetReferral/LinkToExisting/LinkToExisting.types.js

@@ -1,12 +1,14 @@
 // @flow
 
-import type { LinkableEvent } from '../ReferralActions/ReferralActions.types';
+import type { ErrorMessagesForReferral, LinkableEvent } from '../ReferralActions/ReferralActions.types';
 import type { ReferralDataValueStates } from '../WidgetReferral.types';
 
 export type LinkToExistingProps = {|
     referralDataValues: ReferralDataValueStates,
     setReferralDataValues: (ReferralDataValueStates) => void,
     linkableEvents: Array<LinkableEvent>,
+    errorMessages: ErrorMessagesForReferral,
+    saveAttempted: boolean,
     referralProgramStageLabel: string,
     ...CssClasses,
 |}

src/core_modules/capture-core/components/WidgetReferral/ReferralActions/ReferralActions.component.js

@@ -46,13 +46,13 @@ export const ReferralActionsPlain = ({
     classes,
     type,
     scheduledLabel,
-    selectedType,
     linkableEvents,
     referralDataValues,
     setReferralDataValues,
     constraint,
     currentStageLabel,
-    ...passOnProps
+    errorMessages,
+    saveAttempted,
 }: Props) => {
     const { programStage } = useProgramStageInfo(constraint?.programStage?.id);
 
@@ -97,7 +97,8 @@ export const ReferralActionsPlain = ({
                     referralDataValues={referralDataValues}
                     setReferralDataValues={setReferralDataValues}
                     scheduledLabel={scheduledLabel}
-                    {...passOnProps}
+                    saveAttempted={saveAttempted}
+                    errorMessages={errorMessages}
                 />
             )}
 
@@ -122,7 +123,8 @@ export const ReferralActionsPlain = ({
                     setReferralDataValues={setReferralDataValues}
                     linkableEvents={linkableEvents}
                     referralProgramStageLabel={programStage.stageForm.name}
-                    {...passOnProps}
+                    errorMessages={errorMessages}
+                    saveAttempted={saveAttempted}
                 />
             )}
 

src/core_modules/capture-core/components/WidgetReferral/ReferralActions/ReferralActions.types.js

@@ -1,21 +1,6 @@
 // @flow
 import type { ReferralDataValueStates } from '../WidgetReferral.types';
 
-type ReferralRelationshipType = {|
-    id: string,
-    fromConstraint: {
-        entity: string,
-        programStageId?: {
-            id: string,
-        }
-    },
-    toConstraint: {
-        programStage?: {
-            id: string,
-        },
-    },
-|}
-
 type Constraint = {
     programStage: {
         id: string,
@@ -26,6 +11,7 @@ type Constraint = {
 export type ErrorMessagesForReferral = {|
     scheduledAt?: ?string,
     orgUnit?: ?string,
+    linkedEventId?: ?string,
 |}
 
 export type LinkableEvent = {
@@ -35,7 +21,6 @@ export type LinkableEvent = {
 
 export type Props = {|
     type: string,
-    selectedType: ReferralRelationshipType,
     referralDataValues: ReferralDataValueStates,
     linkableEvents: Array<LinkableEvent>,
     scheduledLabel: string,

src/core_modules/capture-core/components/WidgetReferral/WidgetReferral.component.js

@@ -11,7 +11,7 @@ import { useAvailableReferralEvents } from './hooks/useAvailableReferralEvents';
 
 const WidgetReferralPlain = ({
     programId,
-    teiId,
+    enrollmentId,
     programStageId,
     currentStageLabel,
     ...passOnProps
@@ -23,7 +23,7 @@ const WidgetReferralPlain = ({
         relationshipTypeId: selectedRelationshipType?.id,
         scheduledLabel,
         occurredLabel,
-        teiId,
+        enrollmentId,
     });
     const [saveAttempted, setSaveAttempted] = useState(false);
     const [errorMessages, setErrorMessages] = useState({});
@@ -85,7 +85,6 @@ const WidgetReferralPlain = ({
     return (
         <ReferralActions
             scheduledLabel={scheduledLabel}
-            selectedType={selectedRelationshipType}
             type={currentReferralStatus}
             linkableEvents={linkableEvents}
             referralDataValues={referralDataValues}

src/core_modules/capture-core/components/WidgetReferral/WidgetReferral.types.js

@@ -3,7 +3,7 @@ import { actions as ReferralModes } from './constants';
 
 export type Props = {|
     programId: string,
-    teiId: string,
+    enrollmentId: string,
     programStageId: string,
     currentStageLabel: string,
 |}

src/core_modules/capture-core/components/WidgetReferral/hooks/useAvailableReferralEvents.js

@@ -6,7 +6,7 @@ import { useApiDataQuery } from '../../../utils/reactQueryHelpers';
 
 type Props = {
     stageId: ?string,
-    teiId: string,
+    enrollmentId: string,
     scheduledLabel: string,
     occurredLabel: string,
     relationshipTypeId: ?string,
@@ -22,7 +22,7 @@ type ReturnType = {
 
 export const useAvailableReferralEvents = ({
     stageId,
-    teiId,
+    enrollmentId,
     relationshipTypeId,
     scheduledLabel,
     occurredLabel,
@@ -32,19 +32,20 @@ export const useAvailableReferralEvents = ({
         resource: 'tracker/events',
         params: {
             programStage: stageId,
-            trackedEntity: teiId,
-            fields: 'event,occurredAt,scheduledAt,relationships',
+            enrollments: enrollmentId,
+            fields: 'event,occurredAt,scheduledAt,status,relationships',
         },
-    }), [stageId, teiId]);
+    }), [stageId, enrollmentId]);
     const { data, isLoading, isError } = useApiDataQuery<Array<LinkableEvent>>(
-        ['availableReferralEvents', stageId, teiId, relationshipTypeId],
+        ['availableReferralEvents', stageId, enrollmentId, relationshipTypeId],
         query,
         {
             enabled: !!stageId && enabled,
             cacheTime: 0,
             staleTime: 0,
             select: (response: any) => {
-                const events = response?.instances;
+                const events = response?.instances.filter(instance => ['SCHEDULE', 'ACTIVE'].includes(instance.status));
+
                 if (events.length === 0) return [];
 
                 return events.reduce((acc, event) => {

src/core_modules/capture-core/components/WidgetReferral/referralEventIsValid/ValidationFunctions.js

@@ -50,7 +50,7 @@ const linkToExistingResponse = (props) => {
 
     if (!linkedEventIdIsValid) {
         setErrorMessages({
-            linkedEventId: i18n.t('Please provide a valid event'),
+            linkedEventId: i18n.t('Please select a valid event'),
         });
     } else {
         setErrorMessages({