fix: loading spinner spins indefinitely

dhis2 · Feb 7, 2025 · 177a849 · 177a849
1 parent 0dc7399
commit 177a849
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.container.js b/...core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.container.js
@@ -81,7 +81,12 @@ export const WidgetRelatedStagesPlain = ({
             enrollmentId,
         });
 
-        if (!formHasError && relationship && linkMode) {
+        if (formHasError) {
+            setIsLinking(false);
+            return;
+        }
+
+        if (relationship && linkMode) {
             const serverData = createServerData({ enrollment, linkedEvent: relatedStageLinkedEvent, relationship });
             addEventWithRelationship({ serverData, linkMode, eventIdToRedirectTo: relatedStageLinkedEvent?.event });
         }

diff --git a/..._modules/capture-core/components/WidgetRelatedStages/hooks/useAddEventWithRelationship.js b/..._modules/capture-core/components/WidgetRelatedStages/hooks/useAddEventWithRelationship.js
@@ -44,6 +44,7 @@ export const useAddEventWithRelationship = ({
                 onUpdateOrAddEnrollmentEvents && onUpdateOrAddEnrollmentEvents(payload.serverData.events);
             },
             onSuccess: (_, payload: { linkMode: string, eventIdToRedirectTo?: string, serverData: Object }) => {
+                setIsLinking(false);
                 const queryKey = [ReactQueryAppNamespace, 'linkedEventByOriginEvent', eventId];
                 queryClient.refetchQueries(queryKey);
                 onUpdateEnrollmentEventsSuccess && onUpdateEnrollmentEventsSuccess(payload.serverData.events);