From 1da2d319fbaea7d556944b97153750b6462e995e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 24 Jul 2022 15:22:07 +0200
Subject: [PATCH] Improved handling of tag targeting

---
 .../buildComputation/linkTypeDependencies.js       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js b/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
index 848cf1d3..3de06818 100644
--- a/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
+++ b/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
@@ -1,4 +1,4 @@
-import { get, intersection, difference } from 'lodash';
+import { get, intersection, difference, union } from 'lodash';
 
 const linkDependenciesByType = {
   action: linkAction,
@@ -144,16 +144,18 @@ function linkEffects(dependencyGraph, prop, computation){
 
 // Returns an array of IDs of the properties the effect targets
 function getEffectTagTargets(effect, computation){
-  const targets = getTargetListFromTags(effect.targetTags, computation);
-  const notIds = [];
+  let targets = getTargetListFromTags(effect.targetTags, computation);
+  let notIds = [];
   if (effect.extraTags){
     effect.extraTags.forEach(ex => {
-      if (ex.operation === 'OR'){
-        targets.push(...getTargetListFromTags(ex.tags, computation));
+      if (ex.operation === 'OR') {
+        targets = union(targets, getTargetListFromTags(ex.tags, computation));
       } else if (ex.operation === 'NOT'){
         ex.tags.forEach(tag => {
           const idList = computation.propsWithTag[tag];
-          if (idList) notIds.push(...computation.propsWithTag[tag])
+          if (idList) {
+            notIds = union(notIds, computation.propsWithTag[tag]);
+          }
         });
       }
     });