Fixed expression with $context evaluation on node delete (#253)

* Fixed expression with $context evaluation on node delete * update Mergify configuration --------- Co-authored-by: Stefano Ricci <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
openforis · Nov 25, 2024 · 2d9bf18 · 2d9bf18
1 parent ad2106d
commit 2d9bf18
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 19 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,16 +1,16 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
       - check-success=build
       - check-success=DeepScan
-
+    merge_method: squash
+
 pull_request_rules:
   - name: Automatic merge on approval
     conditions:
-      - "#approved-reviews-by>=1"
+      - '#approved-reviews-by>=1'
     actions:
       queue:
-        method: squash
         name: default
   - name: automatic branch update
     conditions:

diff --git a/src/nodeDefExpressionEvaluator/node/identifier.ts b/src/nodeDefExpressionEvaluator/node/identifier.ts
@@ -36,17 +36,13 @@ const findActualContextNode = (params: {
 export class NodeDefIdentifierEvaluator extends IdentifierEvaluator<NodeDefExpressionContext> {
   evaluate(expressionNode: IdentifierExpression): any {
     const { context } = this
-    const {
-      nodeDefContext,
-      nodeDefCurrent,
-      selfReferenceAllowed,
-      object: objectContext,
-      referencedNodeDefUuids,
-      itemsFilter,
-    } = context
+    const { nodeDefContext, nodeDefCurrent, selfReferenceAllowed, object: objectContext, itemsFilter } = context
     const { name: exprName } = expressionNode
 
     if (exprName === ExpressionVariable.CONTEXT) {
+      if (nodeDefContext) {
+        this.addReferencedNodeDefUuid(nodeDefContext.uuid)
+      }
       return nodeDefContext
     }
 
@@ -76,12 +72,10 @@ export class NodeDefIdentifierEvaluator extends IdentifierEvaluator<NodeDefExpre
 
     const referencedNodeDef = this.findIdentifierAmongReachableNodeDefs(expressionNode)
     if (referencedNodeDef) {
-      context.referencedNodeDefUuids = (referencedNodeDefUuids ?? new Set()).add(referencedNodeDef.uuid)
-
       if (!selfReferenceAllowed && referencedNodeDef.uuid === nodeDefCurrent?.uuid) {
         throw new SystemError(ValidatorErrorKeys.expressions.cannotUseCurrentNode, { name: exprName })
       }
-
+      this.addReferencedNodeDefUuid(referencedNodeDef.uuid)
       return referencedNodeDef
     }
     throw new SystemError('expression.identifierNotFound', {
@@ -90,6 +84,12 @@ export class NodeDefIdentifierEvaluator extends IdentifierEvaluator<NodeDefExpre
     })
   }
 
+  private addReferencedNodeDefUuid(uuid: string) {
+    const { context } = this
+    const { referencedNodeDefUuids = new Set() } = context
+    context.referencedNodeDefUuids = referencedNodeDefUuids.add(uuid)
+  }
+
   /**
    * Tries to find the specified identifier among the node defs that can be "reached" from the context node def.
    */

diff --git a/src/survey/surveys/dependencies.test.ts b/src/survey/surveys/dependencies.test.ts
@@ -36,10 +36,12 @@ describe('Survey Dependencies', () => {
         entityDef(
           'plot',
           integerDef('plot_id').key(),
-          integerDef('plot_id_double').readOnly().defaultValue('plot_id * 2')
+          integerDef('plot_id_double').readOnly().defaultValue('plot_id * 2'),
+          integerDef('plot_index').readOnly().defaultValue('index($context)').defaultValueEvaluatedOnlyOneTime()
         )
           .multiple()
-          .applyIf('accessible')
+          .applyIf('accessible'),
+        integerDef('plot_count').readOnly().defaultValue('plot.length')
       )
     ).build()
   }, 10000)
@@ -68,6 +70,14 @@ describe('Survey Dependencies', () => {
     })
   })
 
+  test('Default values dependency ($context)', () => {
+    expectDependents({
+      sourceName: 'plot',
+      dependencyType: SurveyDependencyType.defaultValues,
+      expectedDependentNames: ['plot_index', 'plot_count'],
+    })
+  })
+
   test('Apply if dependency', () => {
     expectDependents({
       sourceName: 'accessible',

diff --git a/src/survey/surveys/dependencies.ts b/src/survey/surveys/dependencies.ts
@@ -8,10 +8,10 @@ import { NodeDefExpressionFactory } from '../../nodeDef/nodeDef'
 
 const isContextParentByDependencyType = {
   [SurveyDependencyType.applicable]: true,
-  [SurveyDependencyType.defaultValues]: false,
+  [SurveyDependencyType.defaultValues]: true,
   [SurveyDependencyType.fileName]: true,
   [SurveyDependencyType.formula]: false,
-  [SurveyDependencyType.validations]: false,
+  [SurveyDependencyType.validations]: true,
 }
 
 const selfReferenceAllowedByDependencyType = {

diff --git a/src/tests/builder/surveyBuilder/nodeDefAttributeBuilder.ts b/src/tests/builder/surveyBuilder/nodeDefAttributeBuilder.ts
@@ -41,6 +41,11 @@ export class NodeDefAttributeBuilder extends NodeDefBuilder {
     return this
   }
 
+  defaultValueEvaluatedOnlyOneTime(): this {
+    this.propsAdvanced.defaultValueEvaluatedOneTime = true
+    return this
+  }
+
   validationExpressions(...expressions: (string | NodeDefExpression)[]): this {
     if (!this.propsAdvanced.validations) this.propsAdvanced.validations = {}
     this.propsAdvanced.validations.expressions = expressions.map((expression) =>