From 5c7498a295306b52478ad215dfe7ac5237bed047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4der?= <florian.maeder@adfinis-sygroup.ch>
Date: Thu, 29 Oct 2020 11:30:06 +0100
Subject: [PATCH] feat(lib): only warn on missing fields in Jexl dependencies

Currently, the whole execution breaks if a referenced field is missing.
---
 addon/lib/field.js | 51 ++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/addon/lib/field.js b/addon/lib/field.js
index 9133ade98..402ea83fc 100644
--- a/addon/lib/field.js
+++ b/addon/lib/field.js
@@ -2,7 +2,7 @@ import Base from "ember-caluma/lib/base";
 import { computed, defineProperty } from "@ember/object";
 import { equal, not, reads } from "@ember/object/computed";
 import { inject as service } from "@ember/service";
-import { assert } from "@ember/debug";
+import { assert, warn } from "@ember/debug";
 import { getOwner } from "@ember/application";
 import { camelize } from "@ember/string";
 import { task } from "ember-concurrency";
@@ -378,19 +378,19 @@ export default Base.extend({
     "document.{jexl,fields.[]}",
     "question.isHidden",
     function () {
-      return getDependenciesFromJexl(
-        this.document.jexl,
-        this.question.isHidden
-      ).map((slug) => {
-        const f = this.document.findField(slug);
-
-        assert(
-          `Field for question \`${slug}\` was not found in this document. Please check the \`isHidden\` jexl expression: \`${this.question.isHidden}\`.`,
-          f
-        );
-
-        return f;
-      });
+      return getDependenciesFromJexl(this.document.jexl, this.question.isHidden)
+        .map((slug) => {
+          const f = this.document.findField(slug);
+
+          warn(
+            `Field for question \`${slug}\` was not found in this document. Please check the \`isHidden\` jexl expression: \`${this.question.isHidden}\`.`,
+            !f,
+            { id: "ember-caluma.lib.field.hiddenDependencies" }
+          );
+
+          return f;
+        })
+        .filter(Boolean);
     }
   ),
 
@@ -410,16 +410,19 @@ export default Base.extend({
       return getDependenciesFromJexl(
         this.document.jexl,
         this.question.isRequired
-      ).map((slug) => {
-        const f = this.document.findField(slug);
-
-        assert(
-          `Field for question \`${slug}\` was not found in this document. Please check the \`isRequired\` jexl expression: \`${this.question.isRequired}\`.`,
-          f
-        );
-
-        return f;
-      });
+      )
+        .map((slug) => {
+          const f = this.document.findField(slug);
+
+          warn(
+            `Field for question \`${slug}\` was not found in this document. Please check the \`isRequired\` jexl expression: \`${this.question.isRequired}\`.`,
+            !f,
+            { id: "ember-caluma.lib.field.optionalDependencies" }
+          );
+
+          return f;
+        })
+        .filter(Boolean);
     }
   ),