fix: clear current also on missing TET error

dhis2 · Nov 27, 2023 · 971b15a · 971b15a
1 parent 2c6f517
commit 971b15a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/actions/current.js b/src/actions/current.js
@@ -1,6 +1,7 @@
 import { genericClientError } from '../modules/error.js'
 import {
     layoutHasProgramId,
+    layoutHasTrackedEntityTypeId,
     validateLayout,
 } from '../modules/layoutValidation.js'
 import { OUTPUT_TYPE_TRACKED_ENTITY } from '../modules/visualization.js'
@@ -53,12 +54,12 @@ export const tSetCurrentFromUi =
 
         if (!validateOnly) {
             if (
-                currentFromUi.outputType !== OUTPUT_TYPE_TRACKED_ENTITY &&
-                !layoutHasProgramId(currentFromUi)
+                layoutHasProgramId(currentFromUi) ||
+                layoutHasTrackedEntityTypeId(currentFromUi)
             ) {
-                dispatch(acClearCurrent())
-            } else {
                 dispatch(acSetCurrent(currentFromUi))
+            } else {
+                dispatch(acClearCurrent())
             }
 
             dispatch(acSetShowExpandedLayoutPanel(false))