fix: set false on successive completion actions with compulsory deope…

…rands
dhis2 · Dec 10, 2024 · 81505eb · 81505eb
1 parent fb52233
commit 81505eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/bottom-bar/use-on-complete-callback.js b/src/bottom-bar/use-on-complete-callback.js
@@ -150,7 +150,7 @@ export default function useOnCompleteCallback() {
 
         if (hasCompulsoryDataElementOperandsToFillOut) {
             setCompleteAttempted(true)
-            cancelCompletionMutation()
+            cancelCompletionMutation({ completedBoolean: false })
             promise = Promise.reject(
                 new Error(
                     i18n.t(

diff --git a/src/shared/completion/use-imperative-cancel-completion-mutation.js b/src/shared/completion/use-imperative-cancel-completion-mutation.js
@@ -8,7 +8,7 @@ export default function useImperativeCancelCompletionMutation() {
     const mutationKey = useSetFormCompletionMutationKey()
     const dataValueSetQueryKey = useDataValueSetQueryKey()
 
-    return () => {
+    return ({ completedBoolean } = {}) => {
         const foundMutation = mutationCache.find({ mutationKey })
 
         if (!foundMutation) {
@@ -30,7 +30,7 @@ export default function useImperativeCancelCompletionMutation() {
                 ...previousDataValueSet,
                 completeStatus: {
                     ...previousDataValueSet.completeStatus,
-                    complete: !completed,
+                    complete: completedBoolean ?? !completed,
                 },
             })
         )