From 016f51175fa72945bdbe8f8da311f9e42770eb99 Mon Sep 17 00:00:00 2001
From: antoine <antoine.guingand@wanadoo.fr>
Date: Thu, 3 Dec 2020 19:27:47 +0100
Subject: [PATCH] Handle conditionalDisplays

---
 packages/formoj/example/data/form.json  |  6 ++++++
 packages/formoj/src/components/Form.vue | 28 +++++++++++++++++++------
 packages/formoj/src/util/visibility.js  | 21 +++++++++++++++++++
 3 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 packages/formoj/src/util/visibility.js

diff --git a/packages/formoj/example/data/form.json b/packages/formoj/example/data/form.json
index adb4d27..35a65ca 100644
--- a/packages/formoj/example/data/form.json
+++ b/packages/formoj/example/data/form.json
@@ -50,6 +50,9 @@
             "multiple": false,
             "radios": true,
             "label": "Genre",
+            "conditionalDisplay": {
+              "5": [1]
+            },
             "options": [
               {
                 "id": 1,
@@ -67,6 +70,9 @@
         "id": 2,
         "title": "Ma section 2",
         "description": "Deuxième questions",
+        "conditionalDisplay": {
+          "8": [1]
+        },
         "fields": [
           {
             "id": 2,
diff --git a/packages/formoj/src/components/Form.vue b/packages/formoj/src/components/Form.vue
index 8d4ea26..2b2e78b 100644
--- a/packages/formoj/src/components/Form.vue
+++ b/packages/formoj/src/components/Form.vue
@@ -9,7 +9,7 @@
         <div class="fj-form__content">
             <template v-if="currentSection">
                 <fj-section
-                    :fields="currentSection.fields"
+                    :fields="currentFields"
                     :title="currentSection.title"
                     :is-title-hidden="currentSection.isTitleHidden"
                     :description="currentSection.description"
@@ -21,7 +21,7 @@
                     @next="handleNextSectionRequested"
                     @previous="handlePreviousSectionRequested"
                 >
-                    <template slot="field" slot-scope="{ field }">
+                    <template v-slot:field="{ field }">
                         <fj-field
                             :id="fieldIdAttribute(field)"
                             :value="fieldValue(field)"
@@ -34,7 +34,7 @@
                             @clear="handleFieldClear(field)"
                         />
                     </template>
-                    <template slot="indication">
+                    <template v-slot:indication>
                         <template v-if="isIndicationVisible">{{ currentIndication }}</template>
                     </template>
                 </fj-section>
@@ -44,8 +44,10 @@
 </template>
 
 <script>
+    import pick from 'lodash/pick';
     import FjSection from './Section.vue';
     import FjField from './Field.vue';
+    import { isVisible } from "../util/visibility";
 
     export default {
         name: 'FjForm',
@@ -85,6 +87,14 @@
         },
 
         computed: {
+            currentFields() {
+                const fields = this.currentSection?.fields ?? [];
+                return fields.filter(field => isVisible(field, this.data));
+            },
+            visibleSections() {
+                return this.sections
+                    .filter(section => isVisible(section, this.data))
+            },
             currentSection() {
                 return this.sections[this.currentSectionIndex];
             },
@@ -92,13 +102,13 @@
                 return this.currentSectionIndex === 0;
             },
             isCurrentLast() {
-                return this.currentSectionIndex === this.sections.length - 1;
+                return this.currentSectionIndex === this.visibleSections.length - 1;
             },
             isIndicationVisible() {
                 return !this.isCurrentLast;
             },
             currentIndication() {
-                return `${this.currentSectionIndex + 1}/${this.sections.length}`;
+                return `${this.currentSectionIndex + 1}/${this.visibleSections.length}`;
             },
 
             classes() {
@@ -148,10 +158,16 @@
 
             handleFieldChanged(field, value) {
                 const fieldKey = this.fieldKey(field);
-                this.data = {
+                const data = {
                     ...this.data,
                     [fieldKey]: value,
                 };
+                // keep only visible fields
+                this.data = pick(data,
+                    this.sections.map(s => s.fields).flat()
+                        .filter(field => isVisible(field, data))
+                        .map(f => f.id)
+                );
             },
             handleFieldError(field, message) {
                 const fieldKey = this.fieldKey(field);
diff --git a/packages/formoj/src/util/visibility.js b/packages/formoj/src/util/visibility.js
new file mode 100644
index 0000000..b335cf1
--- /dev/null
+++ b/packages/formoj/src/util/visibility.js
@@ -0,0 +1,21 @@
+
+/**
+ * @typedef {Object} Conditionable
+ * @property {Object.<string, Array>} conditionalDisplay
+ */
+
+/**
+ * @param {Conditionable} conditionable - field or section
+ * @param data
+ * @returns {boolean}
+ */
+export function isVisible(conditionable, data) {
+    if(!conditionable.conditionalDisplay) {
+        return true;
+    }
+
+    return Object.entries(conditionable.conditionalDisplay)
+        .every(([fieldId, value]) =>
+            [].concat(data?.[fieldId] ?? []).some(v => value.includes(v))
+        );
+}
\ No newline at end of file