Merge branch 'develop' into feature-nested-sets

2023-11-11 10:01:34 +02:00
parent b4993b86b5 6af9246ad1
commit 6e0364b636
40 changed files with 562 additions and 394 deletions
--- a/app/imports/api/engine/computation/buildComputation/linkCalculationDependencies.js
+++ b/app/imports/api/engine/computation/buildComputation/linkCalculationDependencies.js
@@ -12,8 +12,8 @@ export default function linkCalculationDependencies(dependencyGraph, prop, { pro
    // Skip empty calculations that aren't targeted by anything
    if (
      !calcObj.calculation
-      && !calcObj.effects
-      && !calcObj.proficiencies
+      && !calcObj.effectIds
+      && !calcObj.proficiencyIds
    ) return;

    dependencyGraph.addNode(calcNodeId, calcObj);