From 768504a308a63671ebd984a11df42f31c0f2f025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 30 Jul 2024 16:00:02 +0200
Subject: [PATCH 01/18] fix(_filters): manage future format

---
 templates/bazar/entries/index-dynamic/_filters.twig | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/templates/bazar/entries/index-dynamic/_filters.twig b/templates/bazar/entries/index-dynamic/_filters.twig
index 8e193ba..68c0571 100644
--- a/templates/bazar/entries/index-dynamic/_filters.twig
+++ b/templates/bazar/entries/index-dynamic/_filters.twig
@@ -24,6 +24,15 @@
       '<div class="checkbox" v-for="filterOption, id in filter.list" :key="id">':'<template v-for="filterOption, id in filter.list">
         <template v-if="isDisplayedFilterOption(filterOption,$root)">
           <div class="checkbox" :key="id">',
+      '<div v-else class="checkbox" v-for="filterOption, id in filter.list" :key="id">':'<template v-for="filterOption, id in filter.list">
+        <template v-if="isDisplayedFilterOption(filterOption,$root)">
+          <div class="checkbox" :key="id">',
       '<span class="nb" v-if="filterOption.nb">':'<span class="nb">',
-      '</Panel>':'</template></template></Panel></template>'
+      '</Panel>':'</template></template></Panel></template>',
+      '<template v-if="filter.listTree">': '<template v-if="filterHasAtLeastOneOption(filter,$root) && filter.listTree">',
+      '<Filter-Option v-for="filterOption, id in filter.listTree" :key="id" :option="filterOption" />': '<template v-for="filterOption, id in filter.listTree">
+          <template v-if="isDisplayedFilterOption(filterOption,$root)">
+            <Filter-Option :key="id" :option="filterOption" />
+          </template>
+        </template>'
     })|raw }}

From a36d37d99e7c0ffe23fb98cb82b9adda07d44888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Thu, 1 Aug 2024 17:18:41 +0200
Subject: [PATCH 02/18] fix(input.js): use fieldData if available to find
 associated ObjectName

---
 javascripts/enumlevel2Field/input.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/javascripts/enumlevel2Field/input.js b/javascripts/enumlevel2Field/input.js
index 5ae5dcb..7a7a3ca 100644
--- a/javascripts/enumlevel2Field/input.js
+++ b/javascripts/enumlevel2Field/input.js
@@ -426,7 +426,9 @@ const enumlevel2Helper = {
                     childField.type = field.type
                     childField.node = 'node' in field ? field.node : null 
                     childField.nodes = 'nodes' in field ? field.nodes : null 
-                    childField.linkedObjectId = field.linkedObjectId 
+                    childField.linkedObjectId = field?.linkedObjectId?.length > 0
+                        ? field?.linkedObjectId
+                        : (fieldData?.linkedObjectName ?? '')
                     twoLevelsHelper.formatParentField(
                         this.parents,
                         childField,

From b12ce634a0a13325ff7465c5ca7c7533e53bd889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Fri, 2 Aug 2024 12:18:30 +0200
Subject: [PATCH 03/18] fix(input.js): detect linked Objectname directly from
 field data

---
 javascripts/enumlevel2Field/input.js          | 55 ++++---------------
 styles/enum-field.css                         | 12 ++++
 templates/bazar/inputs/checkbox-tree.twig     | 17 ++++++
 templates/bazar/inputs/checkbox.twig          | 17 ++++++
 .../bazar/inputs/checkbox_drag_and_drop.twig  | 17 ++++++
 .../inputs/checkbox_drag_and_drop_entry.twig  | 17 ++++++
 templates/bazar/inputs/checkbox_list.twig     | 17 ++++++
 templates/bazar/inputs/checkbox_tags.twig     | 17 ++++++
 templates/bazar/inputs/radio.twig             | 17 ++++++
 templates/bazar/inputs/radio_tags.twig        | 17 ++++++
 templates/bazar/inputs/select.twig            | 17 ++++++
 11 files changed, 177 insertions(+), 43 deletions(-)
 create mode 100644 styles/enum-field.css
 create mode 100644 templates/bazar/inputs/checkbox-tree.twig
 create mode 100644 templates/bazar/inputs/checkbox.twig
 create mode 100644 templates/bazar/inputs/checkbox_drag_and_drop.twig
 create mode 100644 templates/bazar/inputs/checkbox_drag_and_drop_entry.twig
 create mode 100644 templates/bazar/inputs/checkbox_list.twig
 create mode 100644 templates/bazar/inputs/checkbox_tags.twig
 create mode 100644 templates/bazar/inputs/radio.twig
 create mode 100644 templates/bazar/inputs/radio_tags.twig
 create mode 100644 templates/bazar/inputs/select.twig

diff --git a/javascripts/enumlevel2Field/input.js b/javascripts/enumlevel2Field/input.js
index 7a7a3ca..555a29e 100644
--- a/javascripts/enumlevel2Field/input.js
+++ b/javascripts/enumlevel2Field/input.js
@@ -154,43 +154,15 @@ const enumlevel2Helper = {
             }
             return id.replace(/\[.*$/,'')
         },
-        extractLinkedObjectIdForCheckox(node, mode = "group-checkbox-", type = "checkbox"){
-            let linkedObjectId = ""
-            let fieldPropertyName = ""
-            node.classList.forEach((className)=>{
-                let match = className.match(new RegExp(`^${mode}((?:${type}fiche[0-9]*|${type}Liste[A-Za-z0-9\-_]+)[A-Za-z0-9_\\-]*)$`))
-                if (match && match[1].length > 0){
-                    fieldPropertyName = match[1] 
-                }
-            })
-            if (fieldPropertyName.length > 0){
-                let fieldName = "[A-Za-z0-9_\\-]*"
-                if (fieldPropertyName in this.levels2
-                    && this.levels2[fieldPropertyName].fieldName.length > 0){
-                    fieldName = this.levels2[fieldPropertyName].fieldName
-                }
-                
-                let match = fieldPropertyName.match(new RegExp(`^(?:${type}fiche([0-9]*)|${type}(Liste[A-Za-z0-9\-_]+))${fieldName}$`))
-                if (match && ((match[1] && match[1].length > 0) || (match[2] && match[2].length > 0))){
-                    linkedObjectId = match[1] ?? match[2]
-                }
-            }
-            return linkedObjectId
-        },
-        extractLinkedObjectIdForRadioOrListe(name, type){
-            let linkedObjectId = ""
-            if (name.length > 0){
-                let fieldName = "[A-Za-z0-9_\\-]*"
-                if (name in this.levels2 
-                    && this.levels2[name].fieldName.length > 0){
-                    fieldName = this.levels2[name].fieldName
-                }
-                let match = name.match(new RegExp(`^(?:${type}fiche([0-9]*)|${type}(Liste[A-Za-z0-9\-_]+))${fieldName}$`))
-                if (match && ((match[1] && match[1].length > 0) || (match[2] && match[2].length > 0))){
-                    linkedObjectId = match[1] ?? match[2]
+        extractLinkedObjectId(node){
+            const parent = $(node).closest('.form-group.control-group')
+            if (parent?.length > 0){
+                const previous = parent?.prev()?? null
+                if (previous?.length > 0 && previous.hasClass('enum-to-level-field-linked-object-name')){
+                    return previous?.data('fieldLinkedObjectName') ?? ''
                 }
             }
-            return linkedObjectId
+            return ''
         },
         extractListOfAssociatingForms(fieldName,parentField){
             if (typeof fieldName != "string" || fieldName.length == 0){
@@ -236,7 +208,7 @@ const enumlevel2Helper = {
                 type: "checkbox",
                 nodes: inputsNodes,
                 propertyname: this.extractIdForCheckbox($(filteredElements[0]).find('input')[0]), // keep only the first one
-                linkedObjectId: this.extractLinkedObjectIdForCheckox(filteredElements[0]) // keep only the first one
+                linkedObjectId: this.extractLinkedObjectId(filteredElements[0]) // keep only the first one
             }
         },
         findCheckboxDragAndDrop(fieldName){
@@ -266,16 +238,13 @@ const enumlevel2Helper = {
                 type: "checkboxdraganddrop",
                 nodes: inputsNodes,
                 propertyname: this.extractIdForCheckbox(filteredElements[0]), // keep only the first one
-                linkedObjectId: this.extractLinkedObjectIdForCheckox(filteredElements[0],"group-") // keep only the first one
+                linkedObjectId: this.extractLinkedObjectId(filteredElements[0]) // keep only the first one
             }
         },
         findCheckboxTag(fieldName){            
             let elements = document.querySelectorAll(`input[class$=${fieldName}].yeswiki-input-entries`)
             if (!elements || elements.length == 0) return null
-            let linkedObjectId = this.extractLinkedObjectIdForCheckox(elements[0],"yeswiki-input-entries"); // keep only the first one
-            if (!linkedObjectId || linkedObjectId.length == 0){
-                linkedObjectId = this.extractLinkedObjectIdForCheckox(elements[0],"yeswiki-input-entries","radio"); // keep only the first one
-            }
+            let linkedObjectId = this.extractLinkedObjectId(elements[0]); // keep only the first one
             return {
                     type: "checkboxtag",
                     node: elements[0],
@@ -303,7 +272,7 @@ const enumlevel2Helper = {
                     type: "select",
                     node: elements[0],
                     propertyname: $(elements[0]).prop('name'), // keep only the first one
-                    linkedObjectId: this.extractLinkedObjectIdForRadioOrListe(elements[0].getAttribute('name'),"liste")
+                    linkedObjectId: this.extractLinkedObjectId(elements[0])
                 }
         },
         findRadio(fieldName){
@@ -319,7 +288,7 @@ const enumlevel2Helper = {
                     type: "radio",
                     nodes: inputsNodes,
                     propertyname: $(elements[0]).prop('name'), // keep only the first one
-                    linkedObjectId: this.extractLinkedObjectIdForRadioOrListe(elements[0].getAttribute('name'),"radio")
+                    linkedObjectId: this.extractLinkedObjectId(elements[0])
             }
         },
         getAssociatedCheckboxLabels(parentFieldName,currentValue,parentValuesAssociations){
diff --git a/styles/enum-field.css b/styles/enum-field.css
new file mode 100644
index 0000000..ce12bd4
--- /dev/null
+++ b/styles/enum-field.css
@@ -0,0 +1,12 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+.enum-to-level-field-linked-object-name {
+  display: none;
+}
diff --git a/templates/bazar/inputs/checkbox-tree.twig b/templates/bazar/inputs/checkbox-tree.twig
new file mode 100644
index 0000000..149cdb9
--- /dev/null
+++ b/templates/bazar/inputs/checkbox-tree.twig
@@ -0,0 +1,17 @@
+{# # This file is part of the YesWiki Extension twolevels.
+# Authors : see README.md file that was distributed with this source code.
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code. 
+#}
+
+{{ include_css("tools/twolevels/styles/enum-field.css") }}
+<span class="enum-to-level-field-linked-object-name" data-field-linked-object-name="{{field.linkedObjectName}}"></span>
+</span>
+{{ include([
+    "custom/templates/tools/bazar/templates/inputs/checkbox-tree.twig",
+    "custom/templates/bazar/templates/inputs/checkbox-tree.twig",
+    "custom/templates/bazar/inputs/checkbox-tree.twig",
+    "themes/tools/bazar/templates/inputs/checkbox-tree.twig",
+    "themes/tools/bazar/inputs/checkbox-tree.twig",
+    "tools/bazar/templates/inputs/checkbox-tree.twig",
+    ],{renderedFromTwoLevels:true}) }}
diff --git a/templates/bazar/inputs/checkbox.twig b/templates/bazar/inputs/checkbox.twig
new file mode 100644
index 0000000..e5f7a6f
--- /dev/null
+++ b/templates/bazar/inputs/checkbox.twig
@@ -0,0 +1,17 @@
+{# # This file is part of the YesWiki Extension twolevels.
+# Authors : see README.md file that was distributed with this source code.
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code. 
+#}
+
+{{ include_css("tools/twolevels/styles/enum-field.css") }}
+<span class="enum-to-level-field-linked-object-name" data-field-linked-object-name="{{field.linkedObjectName}}"></span>
+</span>
+{{ include([
+    "custom/templates/tools/bazar/templates/inputs/checkbox.twig",
+    "custom/templates/bazar/templates/inputs/checkbox.twig",
+    "custom/templates/bazar/inputs/checkbox.twig",
+    "themes/tools/bazar/templates/inputs/checkbox.twig",
+    "themes/tools/bazar/inputs/checkbox.twig",
+    "tools/bazar/templates/inputs/checkbox.twig",
+    ],{renderedFromTwoLevels:true}) }}
diff --git a/templates/bazar/inputs/checkbox_drag_and_drop.twig b/templates/bazar/inputs/checkbox_drag_and_drop.twig
new file mode 100644
index 0000000..c568576
--- /dev/null
+++ b/templates/bazar/inputs/checkbox_drag_and_drop.twig
@@ -0,0 +1,17 @@
+{# # This file is part of the YesWiki Extension twolevels.
+# Authors : see README.md file that was distributed with this source code.
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code. 
+#}
+
+{{ include_css("tools/twolevels/styles/enum-field.css") }}
+<span class="enum-to-level-field-linked-object-name" data-field-linked-object-name="{{field.linkedObjectName}}"></span>
+</span>
+{{ include([
+    "custom/templates/tools/bazar/templates/inputs/checkbox_drag_and_drop.twig",
+    "custom/templates/bazar/templates/inputs/checkbox_drag_and_drop.twig",
+    "custom/templates/bazar/inputs/checkbox_drag_and_drop.twig",
+    "themes/tools/bazar/templates/inputs/checkbox_drag_and_drop.twig",
+    "themes/tools/bazar/inputs/checkbox_drag_and_drop.twig",
+    "tools/bazar/templates/inputs/checkbox_drag_and_drop.twig",
+    ],{renderedFromTwoLevels:true}) }}
diff --git a/templates/bazar/inputs/checkbox_drag_and_drop_entry.twig b/templates/bazar/inputs/checkbox_drag_and_drop_entry.twig
new file mode 100644
index 0000000..ced705f
--- /dev/null
+++ b/templates/bazar/inputs/checkbox_drag_and_drop_entry.twig
@@ -0,0 +1,17 @@
+{# # This file is part of the YesWiki Extension twolevels.
+# Authors : see README.md file that was distributed with this source code.
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code. 
+#}
+
+{{ include_css("tools/twolevels/styles/enum-field.css") }}
+<span class="enum-to-level-field-linked-object-name" data-field-linked-object-name="{{field.linkedObjectName}}"></span>
+</span>
+{{ include([
+    "custom/templates/tools/bazar/templates/inputs/checkbox_drag_and_drop_entry.twig",
+    "custom/templates/bazar/templates/inputs/checkbox_drag_and_drop_entry.twig",
+    "custom/templates/bazar/inputs/checkbox_drag_and_drop_entry.twig",
+    "themes/tools/bazar/templates/inputs/checkbox_drag_and_drop_entry.twig",
+    "themes/tools/bazar/inputs/checkbox_drag_and_drop_entry.twig",
+    "tools/bazar/templates/inputs/checkbox_drag_and_drop_entry.twig",
+    ],{renderedFromTwoLevels:true}) }}
diff --git a/templates/bazar/inputs/checkbox_list.twig b/templates/bazar/inputs/checkbox_list.twig
new file mode 100644
index 0000000..6a6021e
--- /dev/null
+++ b/templates/bazar/inputs/checkbox_list.twig
@@ -0,0 +1,17 @@
+{# # This file is part of the YesWiki Extension twolevels.
+# Authors : see README.md file that was distributed with this source code.
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code. 
+#}
+
+{{ include_css("tools/twolevels/styles/enum-field.css") }}
+<span class="enum-to-level-field-linked-object-name" data-field-linked-object-name="{{field.linkedObjectName}}"></span>
+</span>
+{{ include([
+    "custom/templates/tools/bazar/templates/inputs/checkbox_list.twig",
+    "custom/templates/bazar/templates/inputs/checkbox_list.twig",
+    "custom/templates/bazar/inputs/checkbox_list.twig",
+    "themes/tools/bazar/templates/inputs/checkbox_list.twig",
+    "themes/tools/bazar/inputs/checkbox_list.twig",
+    "tools/bazar/templates/inputs/checkbox_list.twig",
+    ],{renderedFromTwoLevels:true}) }}
diff --git a/templates/bazar/inputs/checkbox_tags.twig b/templates/bazar/inputs/checkbox_tags.twig
new file mode 100644
index 0000000..4f40818
--- /dev/null
+++ b/templates/bazar/inputs/checkbox_tags.twig
@@ -0,0 +1,17 @@
+{# # This file is part of the YesWiki Extension twolevels.
+# Authors : see README.md file that was distributed with this source code.
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code. 
+#}
+
+{{ include_css("tools/twolevels/styles/enum-field.css") }}
+<span class="enum-to-level-field-linked-object-name" data-field-linked-object-name="{{field.linkedObjectName}}"></span>
+</span>
+{{ include([
+    "custom/templates/tools/bazar/templates/inputs/checkbox_tags.twig",
+    "custom/templates/bazar/templates/inputs/checkbox_tags.twig",
+    "custom/templates/bazar/inputs/checkbox_tags.twig",
+    "themes/tools/bazar/templates/inputs/checkbox_tags.twig",
+    "themes/tools/bazar/inputs/checkbox_tags.twig",
+    "tools/bazar/templates/inputs/checkbox_tags.twig",
+    ],{renderedFromTwoLevels:true}) }}
diff --git a/templates/bazar/inputs/radio.twig b/templates/bazar/inputs/radio.twig
new file mode 100644
index 0000000..ff3da86
--- /dev/null
+++ b/templates/bazar/inputs/radio.twig
@@ -0,0 +1,17 @@
+{# # This file is part of the YesWiki Extension twolevels.
+# Authors : see README.md file that was distributed with this source code.
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code. 
+#}
+
+{{ include_css("tools/twolevels/styles/enum-field.css") }}
+<span class="enum-to-level-field-linked-object-name" data-field-linked-object-name="{{field.linkedObjectName}}"></span>
+</span>
+{{ include([
+    "custom/templates/tools/bazar/templates/inputs/radio.twig",
+    "custom/templates/bazar/templates/inputs/radio.twig",
+    "custom/templates/bazar/inputs/radio.twig",
+    "themes/tools/bazar/templates/inputs/radio.twig",
+    "themes/tools/bazar/inputs/radio.twig",
+    "tools/bazar/templates/inputs/radio.twig",
+    ],{renderedFromTwoLevels:true}) }}
diff --git a/templates/bazar/inputs/radio_tags.twig b/templates/bazar/inputs/radio_tags.twig
new file mode 100644
index 0000000..e3a5b13
--- /dev/null
+++ b/templates/bazar/inputs/radio_tags.twig
@@ -0,0 +1,17 @@
+{# # This file is part of the YesWiki Extension twolevels.
+# Authors : see README.md file that was distributed with this source code.
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code. 
+#}
+
+{{ include_css("tools/twolevels/styles/enum-field.css") }}
+<span class="enum-to-level-field-linked-object-name" data-field-linked-object-name="{{field.linkedObjectName}}"></span>
+</span>
+{{ include([
+    "custom/templates/tools/bazar/templates/inputs/radio_tags.twig",
+    "custom/templates/bazar/templates/inputs/radio_tags.twig",
+    "custom/templates/bazar/inputs/radio_tags.twig",
+    "themes/tools/bazar/templates/inputs/radio_tags.twig",
+    "themes/tools/bazar/inputs/radio_tags.twig",
+    "tools/bazar/templates/inputs/radio_tags.twig",
+    ],{renderedFromTwoLevels:true}) }}
diff --git a/templates/bazar/inputs/select.twig b/templates/bazar/inputs/select.twig
new file mode 100644
index 0000000..1bf376b
--- /dev/null
+++ b/templates/bazar/inputs/select.twig
@@ -0,0 +1,17 @@
+{# # This file is part of the YesWiki Extension twolevels.
+# Authors : see README.md file that was distributed with this source code.
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code. 
+#}
+
+{{ include_css("tools/twolevels/styles/enum-field.css") }}
+<span class="enum-to-level-field-linked-object-name" data-field-linked-object-name="{{field.linkedObjectName}}"></span>
+</span>
+{{ include([
+    "custom/templates/tools/bazar/templates/inputs/select.twig",
+    "custom/templates/bazar/templates/inputs/select.twig",
+    "custom/templates/bazar/inputs/select.twig",
+    "themes/tools/bazar/templates/inputs/select.twig",
+    "themes/tools/bazar/inputs/select.twig",
+    "tools/bazar/templates/inputs/select.twig",
+    ],{renderedFromTwoLevels:true}) }}

From 900c4773384b09d6489a485530449b0e187195df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Fri, 2 Aug 2024 12:19:52 +0200
Subject: [PATCH 04/18] fix(twoLevels): ensure field detection even if
 EnumField's name has been updated

---
 javascripts/twolevels.js | 65 +++++++++++++++++++++++++++++++++-------
 1 file changed, 54 insertions(+), 11 deletions(-)

diff --git a/javascripts/twolevels.js b/javascripts/twolevels.js
index bd4bbfa..c7f62ba 100644
--- a/javascripts/twolevels.js
+++ b/javascripts/twolevels.js
@@ -97,6 +97,10 @@ const appendChildrenFieldsPropertyNamestoParentForm = (form,parentField,linkedOb
                     if (["checkbox","checkboxfiche","radio","radiofiche","liste","listefiche","enumlevel2"]
                         .includes(field.type) && field.linkedObjectName == wantedObjectName){
                         forms[formId].childrenFieldsPropertyNames[childId][field.propertyname] = field
+                        const oldName = `${field.type}${field.linkedObjectName}`
+                        if (field.propertyname.slice(0,oldName.length) !== oldName){
+                            forms[formId].childrenFieldsPropertyNames[childId][field.propertyname].oldName = oldName + field.name
+                        }
                     }
                 })
             }
@@ -138,6 +142,10 @@ const appendParentsFieldsPropertyNamestoParentForm = (form,fieldName,parentField
             if ((isEnum(field) && field.linkedObjectName == parentField.linkedObjectId) ||
                 (isEnumList && parentField.linkedObjectId.slice(0,field.linkedObjectName.length) == field.linkedObjectName)){
                     forms[formId].parentsFieldsPropertyNames[fieldName][field.propertyname] = field
+                    const oldName = `${field.type}${field.linkedObjectName}`
+                    if (field.propertyname.slice(0,oldName.length) !== oldName){
+                        forms[formId].parentsFieldsPropertyNames[fieldName][field.propertyname].oldName = oldName + field.name
+                    }
             }
         })
     }
@@ -168,17 +176,22 @@ const appendReverseParentsFieldsPropertyNamestoParentForm = (form,fieldName,pare
             if (["checkbox","checkboxfiche","radio","radiofiche","liste","listefiche","enumlevel2"]
                 .includes(field.type) && field.linkedObjectName == childId){
                     forms[formId].reverseParentsFieldsPropertyNames[fieldName][field.propertyname] = field
+                    const oldName = `${field.type}${field.linkedObjectName}${field.name}`
+                    if (oldName?.length > field.propertyname?.length){
+                        forms[formId].reverseParentsFieldsPropertyNames[fieldName][field.propertyname].oldName = oldName
+                    }
             }
         })
     }
     return forms[formId]
 }
 
-const appendToArrayIfInEntry = (entry,propName,currentArray,registerAssociation = null)=>{
-    if (propName in entry && 
-            typeof entry[propName] == "string" && 
-            entry[propName].length > 0){ 
-        entry[propName].split(',').forEach((value)=>{
+const appendToArrayIfInEntry = (entry,propName,currentArray,oldPropName = '',registerAssociation = null)=>{
+    const sanitizedPropName = propName in entry ? propName : oldPropName
+    if (sanitizedPropName in entry && 
+            typeof entry[sanitizedPropName] == "string" && 
+            entry[sanitizedPropName].length > 0){ 
+        entry[sanitizedPropName].split(',').forEach((value)=>{
             if (!currentArray.includes(value)){
                 currentArray.push(value)
             }
@@ -405,7 +418,12 @@ const getAvailableSecondLevelsValues = async (parentForm,parentField,values,link
                     if (parentEntryId in entries){
                         let parentEntry = entries[parentEntryId]
                         for (let propName in parentForm.childrenFieldsPropertyNames[childId]){
-                            secondLevelValues[childId] = appendToArrayIfInEntry(parentEntry,propName,secondLevelValues[childId],(value)=>{
+                            secondLevelValues[childId] = appendToArrayIfInEntry(
+                                parentEntry,
+                                propName,
+                                secondLevelValues[childId],
+                                parentForm.childrenFieldsPropertyNames[childId][propName]?.oldName ?? '',
+                                (value)=>{
                                 if (!(value in associations[childId])){
                                     associations[childId][value] = []
                                 }
@@ -494,12 +512,22 @@ const getCorrespondances = async (associatingForm,fieldName) => {
         fieldName,
         getParentsAndChildren:(tmp,entry)=>{
             for (const propertyName in associatingForm.parentsFieldsPropertyNames[fieldName]) {
-                tmp.parents = appendToArrayIfInEntry(entry,propertyName,tmp.parents)
+                tmp.parents = appendToArrayIfInEntry(
+                    entry,
+                    propertyName,
+                    tmp.parents,
+                    associatingForm.parentsFieldsPropertyNames[fieldName][propertyName]?.oldName ?? ''
+                )
             }
             for (const childId in associatingForm.childrenFieldsPropertyNames) {
                 tmp.children[childId] = []
                 for (const propertyName in associatingForm.childrenFieldsPropertyNames[childId]) {
-                    tmp.children[childId] = appendToArrayIfInEntry(entry,propertyName,tmp.children[childId])
+                    tmp.children[childId] = appendToArrayIfInEntry(
+                        entry,
+                        propertyName,
+                        tmp.children[childId],
+                        associatingForm.childrenFieldsPropertyNames[childId][propertyName]?.oldName ?? ''
+                    )
                 }
             }
         }
@@ -516,11 +544,21 @@ const getCorrespondancesReverse = async (associatingForm,fieldName,wantedFieldId
                     return k == wantedFieldId || associatingForm.reverseParentsFieldsPropertyNames[fieldName][k].name == wantedFieldId
                 })
                 foundFields.forEach((k)=>{
-                    tmp.parents = appendToArrayIfInEntry(entry,k,tmp.parents)
+                    tmp.parents = appendToArrayIfInEntry(
+                        entry,
+                        k,
+                        tmp.parents,
+                        foundFields[k]?.oldName ?? ''
+                    )
                 })
             } else {
                 for (const propertyName in associatingForm.reverseParentsFieldsPropertyNames[fieldName]) {
-                    tmp.parents = appendToArrayIfInEntry(entry,propertyName,tmp.parents)
+                    tmp.parents = appendToArrayIfInEntry(
+                        entry,
+                        propertyName,
+                        tmp.parents,
+                        associatingForm.reverseParentsFieldsPropertyNames[fieldName][propertyName]?.oldName ?? ''
+                    )
                 }
             }
             
@@ -531,7 +569,12 @@ const getCorrespondancesReverse = async (associatingForm,fieldName,wantedFieldId
             wantedIds.forEach((childId)=>{
                 tmp.children[childId] = []
                 for (const propertyName in associatingForm.reverseChildrenFieldsPropertyNames[childId]) {
-                    tmp.children[childId] = appendToArrayIfInEntry(entry,propertyName,tmp.children[childId])
+                    tmp.children[childId] = appendToArrayIfInEntry(
+                        entry,
+                        propertyName,
+                        tmp.children[childId],
+                        associatingForm.reverseChildrenFieldsPropertyNames[childId][propertyName]?.oldName ?? ''
+                    )
                 }
             })
         }

From fdfb61dd9f165530b927e8ecfb28c5c7ac19aae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Mon, 5 Aug 2024 13:03:19 +0200
Subject: [PATCH 05/18] fix(EnumLevel2Field): ensure that new name of
 parentField can be reached with old name

---
 fields/EnumLevel2CommonsField.php | 46 +++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/fields/EnumLevel2CommonsField.php b/fields/EnumLevel2CommonsField.php
index ae26671..5ad6b4f 100644
--- a/fields/EnumLevel2CommonsField.php
+++ b/fields/EnumLevel2CommonsField.php
@@ -74,12 +74,12 @@ public function __construct(array $values, ContainerInterface $services)
             ? $matches[1]
             : "";
 
-            
+
         $this->associatingFieldId = $explodedParam[2] ?? '';
         $this->associatingFieldId = (
-            !empty($this->associatingFieldId) && 
-            !empty($this->associatingFormId) && 
-            substr($internalValues[parent::FIELD_TYPE],-5) == 'fiche' // current is form
+            !empty($this->associatingFieldId) &&
+            !empty($this->associatingFormId) &&
+            substr($internalValues[parent::FIELD_TYPE], -5) == 'fiche' // current is form
         ) ? strval($this->associatingFieldId) : '';
 
         // construct with parent
@@ -93,7 +93,7 @@ public function __construct(array $values, ContainerInterface $services)
     public function renderInputIfPermitted($entry)
     {
         return $this->render("@bazar/inputs/enum-level2.twig", [])
-            .parent::renderInputIfPermitted($entry);
+            . parent::renderInputIfPermitted($entry);
     }
 
     // Format input values before save
@@ -109,7 +109,7 @@ public function formatValuesBeforeSaveIfEditable($entry, bool $isCreation = fals
                 && (strval($assocFormId) !== strval(intval($assocFormId)) || $assocFormId !== $parentField->getLinkedObjectName())) {
                 $formId = $this->formatFormId($this->getLinkedObjectName());
                 $associatingFormId = $this->formatFormId($assocFormId);
-                if (!empty($formId) && $formId == $associatingFormId){
+                if (!empty($formId) && $formId == $associatingFormId) {
                     $availableValues = $this->getAvailableChildrenValuesReverseFromForm($parentValues, $parentField->getLinkedObjectName());
                 } else {
                     $availableValues = $this->getAvailableChildrenValuesFromLists($parentValues, $parentField->getLinkedObjectName());
@@ -142,7 +142,31 @@ protected function getParentField($entry): ?EnumField
         }
         $formId = $this->formatFormId($entry['id_typeannonce'] ?? '');
         $formManager = $this->getService(FormManager::class);
-        return empty($formId) ? null : $formManager->findFieldFromNameOrPropertyName($parentFieldName, $formId);
+        if (empty($formId)) {
+            return null;
+        }
+        $form = $formManager->getOne($formId);
+        if (empty($form['prepared']) || !is_array($form['prepared'])) {
+            return null;
+        }
+        foreach ($form['prepared'] as $field) {
+            if (
+                $field instanceof EnumField
+                && (
+                    $field->getName() === $parentFieldName
+                    || in_array(
+                        $field->getPropertyName(),
+                        [
+                           $parentFieldName,
+                           $field->getType() . $field->getLinkedObjectName() . $parentFieldName
+                        ]
+                    )
+                )
+            ) {
+                return $field;
+            }
+        }
+        return null;
     }
 
     protected function formatFormId($formId): string
@@ -244,7 +268,7 @@ protected function getAvailableChildrenValuesFromLists(array $parentValues, stri
                             $parentValuesInEntry = $this->getFieldValues($parentField, $entry);
                             if (count(array_filter($parentValues, function ($v) use ($parentValuesInEntry) {
                                 return in_array($v, $parentValuesInEntry);
-                            }))>0) {
+                            })) > 0) {
                                 $childrenValuesInEntry = $this->getFieldValues($childField, $entry);
                                 foreach ($childrenValuesInEntry as $value) {
                                     if (!in_array($value, $availableValues)) {
@@ -271,7 +295,7 @@ protected function getAvailableChildrenValuesReverseFromForm(array $parentValues
             $fields = [];
             foreach ($form['prepared'] as $field) {
                 if ($field instanceof EnumField && $field->getLinkedObjectName() == $parentLinkedObjectName && $field->getPropertyName() !== "") {
-                    if (!empty($this->associatingFieldId) && $this->associatingFieldId == $field->getName()){
+                    if (!empty($this->associatingFieldId) && $this->associatingFieldId == $field->getName()) {
                         $fields = [$field];
                         break;
                     }
@@ -288,9 +312,9 @@ protected function getAvailableChildrenValuesReverseFromForm(array $parentValues
                     ]
                 ]);
                 if (!empty($entries)) {
-                    $availableValues= array_map(function($entry){
+                    $availableValues = array_map(function ($entry) {
                         return $entry['id_fiche'];
-                    },$entries);
+                    }, $entries);
                 }
             }
         }

From 6b94ff06c18b152c2faa020f1254fb29b467ea9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Mon, 5 Aug 2024 16:49:42 +0200
Subject: [PATCH 06/18] fix(Enum2LevelField): manage old and new syntex for
 children fields

---
 fields/EnumLevel2CommonsField.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fields/EnumLevel2CommonsField.php b/fields/EnumLevel2CommonsField.php
index 5ad6b4f..ee6ff50 100644
--- a/fields/EnumLevel2CommonsField.php
+++ b/fields/EnumLevel2CommonsField.php
@@ -295,7 +295,13 @@ protected function getAvailableChildrenValuesReverseFromForm(array $parentValues
             $fields = [];
             foreach ($form['prepared'] as $field) {
                 if ($field instanceof EnumField && $field->getLinkedObjectName() == $parentLinkedObjectName && $field->getPropertyName() !== "") {
-                    if (!empty($this->associatingFieldId) && $this->associatingFieldId == $field->getName()) {
+                    if (
+                        !empty($this->associatingFieldId)
+                        && (
+                            $this->associatingFieldId == $field->getName()
+                                || $field->getName() === ($field->getType() . $field->getLinkedObjectName() . $this->associatingFieldId)
+                        )
+                    ) {
                         $fields = [$field];
                         break;
                     }

From 6788530f33e45dd26fafb82ce1fd8e146d3292a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 6 Aug 2024 09:08:53 +0200
Subject: [PATCH 07/18] refactor(twolevels): extract eventDispatcher

---
 javascripts/event.js                   | 45 +++++++++++++++++
 javascripts/eventDispatcher.service.js | 58 ++++++++++++++++++++++
 javascripts/events.registry.js         | 37 ++++++++++++++
 javascripts/twolevels.js               | 67 ++++----------------------
 4 files changed, 149 insertions(+), 58 deletions(-)
 create mode 100644 javascripts/event.js
 create mode 100644 javascripts/eventDispatcher.service.js
 create mode 100644 javascripts/events.registry.js

diff --git a/javascripts/event.js b/javascripts/event.js
new file mode 100644
index 0000000..9f2eeb4
--- /dev/null
+++ b/javascripts/event.js
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class Event {
+
+    #listener
+    #name
+    #once
+    #triggered
+
+    constructor(name, listener, once = false) {
+        this.#name = name
+        this.#triggered = false
+        this.#listener = typeof listener === 'function' ? listener : null
+        this.#once = once === true
+    }
+
+    getListener(){
+        return this.#listener
+    }
+
+    getName(){
+        return this.#name
+    }
+
+    getOnce(){
+        return this.#once
+    }
+
+    getTriggered(){
+        return this.#triggered
+    }
+
+    setTriggered(newState){
+        this.#triggered = newState === true
+    }
+}
+
+export default Event
\ No newline at end of file
diff --git a/javascripts/eventDispatcher.service.js b/javascripts/eventDispatcher.service.js
new file mode 100644
index 0000000..a8c2304
--- /dev/null
+++ b/javascripts/eventDispatcher.service.js
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import eventsRegistry from './events.registry.js'
+
+/** data */
+
+const events = {}
+
+/** methods */
+
+const addEvent = (eventName, listener, once = false) => {
+    eventsRegistry.add(eventName,listener,once)
+}
+const addEventOnce = (eventName, listener) => {
+    addEvent(eventName,listener,true)
+}
+
+const triggerEvent = (eventName) => {
+    eventsRegistry.get(eventName)?.forEach((listener) => {
+        listener.setTriggered(true)
+    })
+}
+
+const cleanEvent = (eventName) => {
+    eventsRegistry.set(
+        eventName,
+        eventsRegistry.get(eventName)?.filter(
+            (listener) => {
+                return !listener.getOnce() || !listener.getTriggered()
+            }
+        )
+    )
+}
+
+const dispatchEvent = (eventName, param = undefined) => {
+    
+    eventsRegistry.get(eventName)?.forEach((listener) => {
+        listener.setTriggered(true)
+        if (param != undefined){
+            listener.getListener()(param)
+        } else {
+            listener.getListener()()
+        }
+    })
+    cleanEvent(eventName)
+}
+
+export default {
+    addEventOnce,
+    dispatchEvent
+}
diff --git a/javascripts/events.registry.js b/javascripts/events.registry.js
new file mode 100644
index 0000000..f514865
--- /dev/null
+++ b/javascripts/events.registry.js
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import Event from './event.js'
+
+/* data */
+const eventsByName = {}
+
+/* methods */
+const add = (eventName, listener, once = false) => {
+    if (typeof eventName === "string"){
+        if (!(eventName in eventsByName)){
+            eventsByName[eventName] = []
+        }
+        eventsByName[eventName].push(new Event(eventName, listener, once))
+    }
+}
+const get = (eventName) => {
+    return typeof eventName === "string" ? (eventsByName?.[eventName] ?? null) : null
+}
+const set = (eventName, events) => {
+    if (typeof eventName === "string" && eventName in eventsByName) {
+        eventsByName[eventName] = events
+    }
+}
+
+export default {
+    add,
+    get,
+    set
+}
\ No newline at end of file
diff --git a/javascripts/twolevels.js b/javascripts/twolevels.js
index c7f62ba..43f6087 100644
--- a/javascripts/twolevels.js
+++ b/javascripts/twolevels.js
@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  */
 
+import eventDispatcher from './eventDispatcher.service.js'
+
 let allEntriesCache = {}
 let cache = {
     loadingAllEntries: [],
@@ -16,59 +18,8 @@ let cache = {
 }
 let correspondances = {}
 let entries = {}
-let eventsListeners = {}
 let forms = {}
 
-// event management 
-
-const addEvent = (eventName, listener, once = false) => {
-    if (typeof eventName == "string"){
-        if (!(eventName in eventsListeners)){
-            eventsListeners[eventName] = []
-        }
-        eventsListeners[eventName] = [
-            ...eventsListeners[eventName],
-            ...[{listener, once, triggered: false}]
-        ]
-    }
-}
-const addEventOnce = (eventName, listener) => {
-    addEvent(eventName,listener,true)
-}
-
-const setEventTriggered = (eventName) => {
-    if (typeof eventName == "string" && (eventName in eventsListeners)){
-        eventsListeners[eventName] = eventsListeners[eventName].map((evenData)=>{
-            evenData.triggered = true
-            return evenData
-        })
-    }
-}
-
-const cleanEvent = (eventName)=>{
-    eventsListeners[eventName] = eventsListeners[eventName].filter((eventData)=>{
-        return !eventData.once || !eventData.triggered
-    })
-}
-
-const dispatchEvent = (eventName, param = undefined)=>{
-    if (typeof eventName == "string"){
-        if (eventName in eventsListeners){
-            eventsListeners[eventName].forEach((eventData,idx)=>{
-                if (!eventData.once || !eventData.triggered){
-                    eventsListeners[eventName][idx].triggered = true
-                    if (param != undefined){
-                        eventData.listener(param)
-                    } else {
-                        eventData.listener()
-                    }
-                }
-            })
-            cleanEvent(eventName)
-        }
-    }
-}
-
 // manage forms
 
 const getPreparedFromForm = (form) => {
@@ -265,24 +216,24 @@ const formatParentField = (parentsContainer,childField,findFieldFunction) => {
 
 const manageInternalEvents = async(id,eventPrefix,loadingCacheName,asynFunc)=>{
     let p = new Promise((resolve,reject)=>{
-        addEventOnce(`${eventPrefix}.${id}.ready`,()=>resolve())
-        addEventOnce(`${eventPrefix}.${id}.error`,(e)=>reject(e))
+        eventDispatcher.addEventOnce(`${eventPrefix}.${id}.ready`,()=>resolve())
+        eventDispatcher.addEventOnce(`${eventPrefix}.${id}.error`,(e)=>reject(e))
         if (!cache[loadingCacheName].includes(id)){
             cache[loadingCacheName] = [...cache[loadingCacheName],id]
             let resettingLoadingForms = ()=>{
                 cache[loadingCacheName] = cache[loadingCacheName].filter((idToCheck)=>idToCheck!=id)
             }
-            addEventOnce(`${eventPrefix}.${id}.error`,resettingLoadingForms)
-            addEventOnce(`${eventPrefix}.${id}.ready`,resettingLoadingForms)
-            addEventOnce(`${eventPrefix}.${id}.ready`,()=>{
+            eventDispatcher.addEventOnce(`${eventPrefix}.${id}.error`,resettingLoadingForms)
+            eventDispatcher.addEventOnce(`${eventPrefix}.${id}.ready`,resettingLoadingForms)
+            eventDispatcher.addEventOnce(`${eventPrefix}.${id}.ready`,()=>{
                 setEventTriggered(`${eventPrefix}.${id}.error`)
             })
             asynFunc()
                 .then((...args)=>{
-                    dispatchEvent(`${eventPrefix}.${id}.ready`)
+                    eventDispatcher.dispatchEvent(`${eventPrefix}.${id}.ready`)
                     return Promise.resolve(...args)
                 })
-                .catch((e)=>{dispatchEvent(`${eventPrefix}.${id}.error`,e)})
+                .catch((e)=>{eventDispatcher.dispatchEvent(`${eventPrefix}.${id}.error`,e)})
         }
     })
     return await p.then((...args)=>Promise.resolve(...args))

From de44dbac55b931291ed1733f8a5408e2ac9b272b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 6 Aug 2024 09:08:53 +0200
Subject: [PATCH 08/18] refactor(twoLevels): split in different services

---
 javascripts/allEntriesLoader.service.js      |  64 +++++
 javascripts/bazar/define-common.js           |   3 +-
 javascripts/entryLoader.service.js           |  76 ++++++
 javascripts/enumlevel2Field/input.js         |   3 +-
 javascripts/{event.js => event.prototype.js} |   0
 javascripts/eventDispatcher.service.js       |  53 +++-
 javascripts/events.registry.js               |  19 +-
 javascripts/formLoader.service.js            |  60 +++++
 javascripts/registry.prototype.js            |  37 +++
 javascripts/twolevels.js                     | 239 ++++---------------
 javascripts/wikiDataLoader.prototype.js      |  80 +++++++
 11 files changed, 410 insertions(+), 224 deletions(-)
 create mode 100644 javascripts/allEntriesLoader.service.js
 create mode 100644 javascripts/entryLoader.service.js
 rename javascripts/{event.js => event.prototype.js} (100%)
 create mode 100644 javascripts/formLoader.service.js
 create mode 100644 javascripts/registry.prototype.js
 create mode 100644 javascripts/wikiDataLoader.prototype.js

diff --git a/javascripts/allEntriesLoader.service.js b/javascripts/allEntriesLoader.service.js
new file mode 100644
index 0000000..2bdf32a
--- /dev/null
+++ b/javascripts/allEntriesLoader.service.js
@@ -0,0 +1,64 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import WikiDataLoader from './wikiDataLoader.prototype.js'
+
+/** data */
+const allEntriesCache = {}
+
+/** methods */
+/**
+ * @param {Object} responseDecoded 
+ */
+const allEntriesTestFunction = (responseDecoded) => {
+    return (typeof responseDecoded == "object"
+        || Array.isArray(responseDecoded))
+}
+
+
+    /**
+     * @param {string} id 
+     */
+const load = async (id) => {
+    WikiDataLoader.assertIsRegularFormId(id)
+    if (id in allEntriesCache){
+        return allEntriesCache[id]
+    } else {
+        return await (new WikiDataLoader(
+            wiki.url(`?api/forms/${id}/entries`),
+            id,
+            'getAllEntries',
+            'loadingAllEntries',
+            allEntriesTestFunction
+        )).load()
+           .then((entries)=>{
+            const entriesToSave = 
+                Object.fromEntries(
+                    (typeof entries == "object" ? Object.values(entries) : entries)
+                    .filter((e)=>{
+                        return typeof e.id_fiche === "string" &&
+                            typeof e.id_typeannonce === "string" &&
+                            typeof e.bf_titre === "string"
+                    }).map((e)=>[e.id_fiche,e])
+                )
+                allEntriesCache[id] = entriesToSave
+                return entriesToSave
+           }) 
+            .catch((e)=>{
+                throw new Error(
+                    `error when getting all Entries for form '${id}'`,
+                    {cause:e}
+                )
+            })
+    }
+}
+
+export default {
+    load
+}
\ No newline at end of file
diff --git a/javascripts/bazar/define-common.js b/javascripts/bazar/define-common.js
index eed35a0..839d7db 100644
--- a/javascripts/bazar/define-common.js
+++ b/javascripts/bazar/define-common.js
@@ -7,6 +7,7 @@
  * file that was distributed with this source code.
  */
 
+import allEntriesLoader from '../allEntriesLoader.service.js'
 import twoLevelsHelper from '../twolevels.js'
 
 if (Vue) {
@@ -249,7 +250,7 @@ if (Vue) {
                                     })
                                 },
                                 getEntriesAsync: ()=>{
-                                    return twoLevelsHelper.getAllEntries(formId)
+                                    return allEntriesLoader.load(formId)
                                 },
                                 getEntriesLabel: `getting all entries of form ${formId}`})
                         }
diff --git a/javascripts/entryLoader.service.js b/javascripts/entryLoader.service.js
new file mode 100644
index 0000000..9dec312
--- /dev/null
+++ b/javascripts/entryLoader.service.js
@@ -0,0 +1,76 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import WikiDataLoader from './wikiDataLoader.prototype.js'
+
+/** data */
+const entriesCache = {}
+
+/** methods */
+/**
+ * @param {Object} responseDecoded 
+ */
+const entryTestFunction = (responseDecoded) => {
+    if (responseDecoded && typeof responseDecoded == "object"){
+        let firstValue = Object.values(responseDecoded)[0]
+        if ('id_fiche' in firstValue &&
+            firstValue.id_fiche == entryId){
+            return true
+        } else {
+            return false
+        }
+    } else {
+        return false
+    }
+}
+
+/**
+ * 
+ * @param {String} entryId 
+ */
+const assertIsRegularEntryId = (entryId)=>{
+    if (
+        typeof entryId != "string"
+        || entryId.length == 0
+        || String(Number(entryId)) === entryId) {
+        throw `'entryId' as parameter as 'assertIsRegularEntryId' should be a not empty string and not representing a form number`
+    }
+}
+
+/**
+ * @param {string} id 
+ */
+const load = async (id) => {
+    assertIsRegularEntryId(id)
+    if (id in entriesCache){
+        return entriesCache[id]
+    } else {
+        return await (new WikiDataLoader(
+            wiki.url(`?api/entries/json/${id}`),
+            id,
+            'getEntry',
+            'loadingEntries',
+            entryTestFunction
+        )).load()
+           .then((entry)=>{
+                entriesCache[id] = entry
+                return entry
+            }) 
+            .catch((e)=>{
+                throw new Error(
+                    `error when getting entry '${id}'`,
+                    {cause:e}
+                )
+            })
+    }
+}
+
+export default {
+    load
+}
\ No newline at end of file
diff --git a/javascripts/enumlevel2Field/input.js b/javascripts/enumlevel2Field/input.js
index 555a29e..92c799a 100644
--- a/javascripts/enumlevel2Field/input.js
+++ b/javascripts/enumlevel2Field/input.js
@@ -6,6 +6,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+import allEntriesLoader from '../allEntriesLoader.service.js'
 import twoLevelsHelper from '../twolevels.js'
 
 // create a new Event `propChange`
@@ -685,7 +686,7 @@ const enumlevel2Helper = {
                                         })
                                     },
                                     getEntriesAsync: ()=>{
-                                        return twoLevelsHelper.getAllEntries(formId)
+                                        return allEntriesLoader.load(formId)
                                     },
                                     getEntriesLabel: `getting all entries of form ${formId}`})
                             }
diff --git a/javascripts/event.js b/javascripts/event.prototype.js
similarity index 100%
rename from javascripts/event.js
rename to javascripts/event.prototype.js
diff --git a/javascripts/eventDispatcher.service.js b/javascripts/eventDispatcher.service.js
index a8c2304..3116f38 100644
--- a/javascripts/eventDispatcher.service.js
+++ b/javascripts/eventDispatcher.service.js
@@ -8,10 +8,10 @@
  */
 
 import eventsRegistry from './events.registry.js'
+import Registry from './registry.prototype.js'
 
-/** data */
-
-const events = {}
+/** cache */
+const registry = new Registry()
 
 /** methods */
 
@@ -39,20 +39,53 @@ const cleanEvent = (eventName) => {
     )
 }
 
-const dispatchEvent = (eventName, param = undefined) => {
-    
+const dispatchEvent = (eventName, args = undefined) => {
     eventsRegistry.get(eventName)?.forEach((listener) => {
         listener.setTriggered(true)
-        if (param != undefined){
-            listener.getListener()(param)
+        if (args != undefined){
+            listener.getListener().apply(null,args)
         } else {
-            listener.getListener()()
+            listener.getListener().call(null)
         }
     })
     cleanEvent(eventName)
 }
 
+const resetLoading = (id,cacheName) => {
+    registry.set(
+        cacheName,
+        registry.get(cacheName)?.filter((idToCheck) => idToCheck != id )
+    )
+}
+
+const manageInternalEvents = async (id,eventPrefix,cacheName,asynFunc)=>{
+    let p = new Promise((resolve,reject)=>{
+        const readyName = `${eventPrefix}.${id}.ready`
+        const errorName = `${eventPrefix}.${id}.error`
+        addEventOnce(readyName,(...args)=>resolve(...args))
+        addEventOnce(errorName,(e)=>reject(e))
+        if (!(registry.get(cacheName)?.includes(id) ?? false)) {
+            registry.add(cacheName, id)
+            
+            addEventOnce(errorName,() => resetLoading(id,cacheName))
+            addEventOnce(readyName,() => resetLoading(id,cacheName))
+            addEventOnce(readyName,()=>{
+                triggerEvent(errorName)
+            })
+            asynFunc()
+                .catch((e) => {
+                    dispatchEvent(errorName,[e])
+                })
+                .then((...args)=>{
+                    dispatchEvent(readyName, args)
+                    return true
+                })
+                .catch((e)=>console.error(e))
+        }
+    })
+    return await p
+}
+
 export default {
-    addEventOnce,
-    dispatchEvent
+    manageInternalEvents
 }
diff --git a/javascripts/events.registry.js b/javascripts/events.registry.js
index f514865..defcacd 100644
--- a/javascripts/events.registry.js
+++ b/javascripts/events.registry.js
@@ -7,27 +7,20 @@
  * file that was distributed with this source code.
  */
 
-import Event from './event.js'
+import Event from './event.prototype.js'
+import Registry from './registry.prototype.js'
 
-/* data */
-const eventsByName = {}
+const registry = new Registry()
 
 /* methods */
 const add = (eventName, listener, once = false) => {
-    if (typeof eventName === "string"){
-        if (!(eventName in eventsByName)){
-            eventsByName[eventName] = []
-        }
-        eventsByName[eventName].push(new Event(eventName, listener, once))
-    }
+    registry.add(eventName, new Event(eventName, listener, once))
 }
 const get = (eventName) => {
-    return typeof eventName === "string" ? (eventsByName?.[eventName] ?? null) : null
+    return registry.get(eventName)
 }
 const set = (eventName, events) => {
-    if (typeof eventName === "string" && eventName in eventsByName) {
-        eventsByName[eventName] = events
-    }
+    registry.set(eventName, events)
 }
 
 export default {
diff --git a/javascripts/formLoader.service.js b/javascripts/formLoader.service.js
new file mode 100644
index 0000000..3c5b9bc
--- /dev/null
+++ b/javascripts/formLoader.service.js
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import WikiDataLoader from './wikiDataLoader.prototype.js'
+
+/** data */
+const forms = {}
+
+/** methods */
+/**
+ * @param {Object} responseDecoded 
+ */
+const formTestFunction = (id, responseDecoded) => {
+    if (responseDecoded
+        && 'bn_id_nature' in responseDecoded
+        && responseDecoded.bn_id_nature == id){
+        return true
+    } else {
+        return false
+    }
+}
+
+
+    /**
+     * @param {string} id 
+     */
+const load = async (id) => {
+    WikiDataLoader.assertIsRegularFormId(id)
+    if (id in forms){
+        return forms[id]
+    } else {
+        return await (new WikiDataLoader(
+            wiki.url(`?api/forms/${id}`),
+            id,
+            'getForm',
+            'loadingForms',
+            (json) => formTestFunction(id,json)
+        )).load()
+           .then((form)=>{
+                forms[id] = form
+                return form
+           }) 
+            .catch((e)=>{
+                throw new Error(
+                    `error when getting form '${id}'`,
+                    {cause:e}
+                )
+            })
+    }
+}
+
+export default {
+    load
+}
\ No newline at end of file
diff --git a/javascripts/registry.prototype.js b/javascripts/registry.prototype.js
new file mode 100644
index 0000000..a682a11
--- /dev/null
+++ b/javascripts/registry.prototype.js
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class Registry {
+    #cache
+
+    constructor(){
+        this.#cache = {}
+    }
+
+    add(name, value) {
+        if (typeof name === "string"){
+            if (!(name in this.#cache)){
+                this.#cache[name] = []
+            }
+            this.#cache[name].push(value)
+        }
+    }
+
+    get(name) {
+        return typeof name === "string" ? (this.#cache?.[name] ?? null) : null
+    }
+    
+    set(name, value) {
+        if (typeof name === "string" && name in this.#cache) {
+            this.#cache[name] = value
+        }
+    }
+}
+
+export default Registry
diff --git a/javascripts/twolevels.js b/javascripts/twolevels.js
index 43f6087..381aa90 100644
--- a/javascripts/twolevels.js
+++ b/javascripts/twolevels.js
@@ -8,17 +8,12 @@
  */
 
 import eventDispatcher from './eventDispatcher.service.js'
+import allEntriesLoader from './allEntriesLoader.service.js'
+import entryLoader from './entryLoader.service.js'
+import formLoader from './formLoader.service.js'
 
-let allEntriesCache = {}
-let cache = {
-    loadingAllEntries: [],
-    loadingEntries: [],
-    loadingForms: [],
-    registeringCorrespondances: []
-}
 let correspondances = {}
-let entries = {}
-let forms = {}
+let parentEntries = {}
 
 // manage forms
 
@@ -33,42 +28,40 @@ const getPreparedFromForm = (form) => {
 }
 
 const appendChildrenFieldsPropertyNamestoParentForm = (form,parentField,linkedObjectIds,fromList = false) => {
-    const formId = form.bn_id_nature
-    if (!('childrenFieldsPropertyNames' in forms[formId])){
-        forms[formId].childrenFieldsPropertyNames = {}
+    if (!('childrenFieldsPropertyNames' in form)){
+        form.childrenFieldsPropertyNames = {}
     }
     parentField.childrenIds.forEach((childId)=>{
-        if (!(childId in forms[formId].childrenFieldsPropertyNames)){
-            forms[formId].childrenFieldsPropertyNames[childId] = {}
+        if (!(childId in form.childrenFieldsPropertyNames)){
+            form.childrenFieldsPropertyNames[childId] = {}
             if (parentField.isForm
                 || (childId in linkedObjectIds
                     && linkedObjectIds[childId].length > 0)){
                 const wantedObjectName = (parentField.isForm && fromList) ? parentField.linkedObjectId : linkedObjectIds[childId]
-                getPreparedFromForm(forms[formId]).forEach((field)=> {
+                getPreparedFromForm(form).forEach((field)=> {
                     if (["checkbox","checkboxfiche","radio","radiofiche","liste","listefiche","enumlevel2"]
                         .includes(field.type) && field.linkedObjectName == wantedObjectName){
-                        forms[formId].childrenFieldsPropertyNames[childId][field.propertyname] = field
+                        form.childrenFieldsPropertyNames[childId][field.propertyname] = field
                         const oldName = `${field.type}${field.linkedObjectName}`
                         if (field.propertyname.slice(0,oldName.length) !== oldName){
-                            forms[formId].childrenFieldsPropertyNames[childId][field.propertyname].oldName = oldName + field.name
+                            form.childrenFieldsPropertyNames[childId][field.propertyname].oldName = oldName + field.name
                         }
                     }
                 })
             }
         }
     })
-    return forms[formId]
+    return form
 }
 
 const appendParentsFieldsPropertyNamestoParentForm = (form,fieldName,parentField) =>{
-    const formId = form.bn_id_nature
-    if (!('parentsFieldsPropertyNames' in forms[formId])){
+    if (!('parentsFieldsPropertyNames' in form)){
         form.parentsFieldsPropertyNames = {}
     }
 
     if (fieldName && fieldName.length > 0 && 
-        !(fieldName in forms[formId].parentsFieldsPropertyNames)){
-            forms[formId].parentsFieldsPropertyNames[fieldName] = {}
+        !(fieldName in form.parentsFieldsPropertyNames)){
+            form.parentsFieldsPropertyNames[fieldName] = {}
         const isList = (type) => {
             return ["checkbox","radio","liste"].includes(type)
         }
@@ -88,53 +81,51 @@ const appendParentsFieldsPropertyNamestoParentForm = (form,fieldName,parentField
         const isEnum = (field) => {
             return isList(field.type) || isEntry(field.type) || isEnum2Level(field)
         }
-        getPreparedFromForm(forms[formId]).forEach((field)=> {
+        getPreparedFromForm(form).forEach((field)=> {
             const isEnumList = isList(field.type) || isEnum2Level(field,'list')
             if ((isEnum(field) && field.linkedObjectName == parentField.linkedObjectId) ||
                 (isEnumList && parentField.linkedObjectId.slice(0,field.linkedObjectName.length) == field.linkedObjectName)){
-                    forms[formId].parentsFieldsPropertyNames[fieldName][field.propertyname] = field
+                    form.parentsFieldsPropertyNames[fieldName][field.propertyname] = field
                     const oldName = `${field.type}${field.linkedObjectName}`
                     if (field.propertyname.slice(0,oldName.length) !== oldName){
-                        forms[formId].parentsFieldsPropertyNames[fieldName][field.propertyname].oldName = oldName + field.name
+                        form.parentsFieldsPropertyNames[fieldName][field.propertyname].oldName = oldName + field.name
                     }
             }
         })
     }
-    return forms[formId]
+    return form
 }
 
 const appendReverseChildrenFieldsPropertyNamestoParentForm = (form,parentField) => {
-    const formId = form.bn_id_nature
-    if (!('reverseChildrenFieldsPropertyNames' in forms[formId])){
-        forms[formId].reverseChildrenFieldsPropertyNames = {}
+    if (!('reverseChildrenFieldsPropertyNames' in form)){
+        form.reverseChildrenFieldsPropertyNames = {}
     }
     parentField.childrenIds.forEach((childId)=>{
-        if (!(childId in forms[formId].reverseChildrenFieldsPropertyNames)){
-            forms[formId].reverseChildrenFieldsPropertyNames[childId] = {'id_fiche':'id_fiche'}
+        if (!(childId in form.reverseChildrenFieldsPropertyNames)){
+            form.reverseChildrenFieldsPropertyNames[childId] = {'id_fiche':'id_fiche'}
         }
     })
-    return forms[formId]
+    return form
 }
 const appendReverseParentsFieldsPropertyNamestoParentForm = (form,fieldName,parentField) =>{
-    const formId = form.bn_id_nature
-    if (!('reverseParentsFieldsPropertyNames' in forms[formId])){
-        forms[formId].reverseParentsFieldsPropertyNames = {}
+    if (!('reverseParentsFieldsPropertyNames' in form)){
+        form.reverseParentsFieldsPropertyNames = {}
     }
     const childId = parentField.linkedObjectId
-    if (childId.length > 0 && !(fieldName in forms[formId].reverseParentsFieldsPropertyNames)){
-        forms[formId].reverseParentsFieldsPropertyNames[fieldName] = {}
-        getPreparedFromForm(forms[formId]).forEach((field)=> {
+    if (childId.length > 0 && !(fieldName in form.reverseParentsFieldsPropertyNames)){
+        form.reverseParentsFieldsPropertyNames[fieldName] = {}
+        getPreparedFromForm(form).forEach((field)=> {
             if (["checkbox","checkboxfiche","radio","radiofiche","liste","listefiche","enumlevel2"]
                 .includes(field.type) && field.linkedObjectName == childId){
-                    forms[formId].reverseParentsFieldsPropertyNames[fieldName][field.propertyname] = field
+                    form.reverseParentsFieldsPropertyNames[fieldName][field.propertyname] = field
                     const oldName = `${field.type}${field.linkedObjectName}${field.name}`
                     if (oldName?.length > field.propertyname?.length){
-                        forms[formId].reverseParentsFieldsPropertyNames[fieldName][field.propertyname].oldName = oldName
+                        form.reverseParentsFieldsPropertyNames[fieldName][field.propertyname].oldName = oldName
                     }
             }
         })
     }
-    return forms[formId]
+    return form
 }
 
 const appendToArrayIfInEntry = (entry,propName,currentArray,oldPropName = '',registerAssociation = null)=>{
@@ -154,17 +145,6 @@ const appendToArrayIfInEntry = (entry,propName,currentArray,oldPropName = '',reg
     return currentArray
 }
 
-const assertIsRegularFormId = (formId) => {
-    if (typeof formId != "string" || formId.length == 0 || Number(formId) < 1){
-        throw `'formId' as parameter as 'getForm' should be a not empty string representing a postive integer`
-    }
-}
-const assertIsRegularEntryId = (entryId)=>{
-    if (typeof entryId != "string" || entryId.length == 0 || String(Number(entryId)) === entryId){
-        throw `'entryId' as parameter as 'assertIsRegularEntryId' should be a not empty string and not representing a form number`
-    }
-}
-
 const extractLinkedObjects = (data) => {
     return Object.fromEntries(Object.entries(data).map(([k,v])=>[k,v.linkedObjectId]))
 }
@@ -214,120 +194,6 @@ const formatParentField = (parentsContainer,childField,findFieldFunction) => {
     }
 }
 
-const manageInternalEvents = async(id,eventPrefix,loadingCacheName,asynFunc)=>{
-    let p = new Promise((resolve,reject)=>{
-        eventDispatcher.addEventOnce(`${eventPrefix}.${id}.ready`,()=>resolve())
-        eventDispatcher.addEventOnce(`${eventPrefix}.${id}.error`,(e)=>reject(e))
-        if (!cache[loadingCacheName].includes(id)){
-            cache[loadingCacheName] = [...cache[loadingCacheName],id]
-            let resettingLoadingForms = ()=>{
-                cache[loadingCacheName] = cache[loadingCacheName].filter((idToCheck)=>idToCheck!=id)
-            }
-            eventDispatcher.addEventOnce(`${eventPrefix}.${id}.error`,resettingLoadingForms)
-            eventDispatcher.addEventOnce(`${eventPrefix}.${id}.ready`,resettingLoadingForms)
-            eventDispatcher.addEventOnce(`${eventPrefix}.${id}.ready`,()=>{
-                setEventTriggered(`${eventPrefix}.${id}.error`)
-            })
-            asynFunc()
-                .then((...args)=>{
-                    eventDispatcher.dispatchEvent(`${eventPrefix}.${id}.ready`)
-                    return Promise.resolve(...args)
-                })
-                .catch((e)=>{eventDispatcher.dispatchEvent(`${eventPrefix}.${id}.error`,e)})
-        }
-    })
-    return await p.then((...args)=>Promise.resolve(...args))
-}
-
-const getData = async (url,id,eventPrefix,loadingCacheName,testFunction) => {
-    if (typeof testFunction != "function"){
-        throw "'testFunction' should be a function"
-    }
-    return await manageInternalEvents(id,eventPrefix,loadingCacheName,async ()=>{
-        return fetch(url)
-            .then((response)=>{
-                if (!response.ok){
-                    throw `response not ok when fetching ${url}`
-                } else {
-                    return response.json()
-                }
-            })
-            .then((responseDecoded)=>{
-                if (!testFunction(responseDecoded)){
-                    throw 'response badly formatted'
-                }
-                return responseDecoded
-            })
-    }).then((form)=>{return form})
-}
-
-const getAllEntries = async (formId) => {
-    assertIsRegularFormId(formId)
-    if (formId in allEntriesCache){
-        return allEntriesCache[formId]
-    } else {
-        return await getData(wiki.url(`?api/forms/${formId}/entries`),formId,'getAllEntries','loadingAllEntries',(responseDecoded)=>{
-                if (typeof responseDecoded == "object"||
-                    Array.isArray(responseDecoded)){
-                        
-                    let entriesInt = (typeof responseDecoded == "object")
-                        ? Object.values(responseDecoded)
-                        : responseDecoded
-                    entriesInt = entriesInt.filter((e)=>{
-                        return typeof e.id_fiche === "string" &&
-                            typeof e.id_typeannonce === "string" &&
-                            typeof e.bf_titre === "string"
-                    })
-                    entriesInt.forEach((e)=>{
-                        if (!(e.id_fiche in entries)){
-                            entries[e.id_fiche] = e
-                        }
-                    })
-                    allEntriesCache[formId] = entriesInt
-                    return true
-                } else {
-                    return false
-                }
-            }).then(()=>{
-                if (formId in allEntriesCache){
-                    return allEntriesCache[formId]
-                } else {
-                    throw `allEntriesCache '${formId}' not found in 'allEntriesCache (${JSON.stringify(Object.keys(allEntriesCache))})`
-                }
-            })
-            .catch((e)=>{throw `error when getting all Entries for '${formId}'`+(e!=undefined ? ` : ${(e)}`:'')})
-    }
-}
-
-const getEntry = async (entryId) => {
-    assertIsRegularEntryId(entryId)
-    if (entryId in entries){
-        return entries[entryId]
-    } else {
-        return await getData(wiki.url(`?api/entries/json/${entryId}`),entryId,'getEntry','loadingEntries',(responseDecoded)=>{
-                if (responseDecoded && typeof responseDecoded == "object"){
-                    let firstValue = Object.values(responseDecoded)[0]
-                    if ('id_fiche' in firstValue &&
-                        firstValue.id_fiche == entryId){
-                        entries[entryId] = firstValue
-                        return true
-                    } else {
-                        return false
-                    }
-                } else {
-                    return false
-                }
-            }).then(()=>{
-                if (entryId in entries){
-                    return entries[entryId]
-                } else {
-                    throw `entryId '${entryId}' not found in 'entries (${JSON.stringify(Object.keys(entries))})`
-                }
-            })
-            .catch((e)=>{throw `error when getting entry '${entryId}'`+(e!=undefined ? ` : ${(e)}`:'')})
-    }
-}
-
 const getParentEntries = async (entriesIds)=>{
     if (entriesIds.length == 0){
         return []
@@ -337,7 +203,8 @@ const getParentEntries = async (entriesIds)=>{
     for (let entryId of entriesIds){
         promises.push(
             new Promise((resolve,reject)=>{
-                getEntry(entryId).then((entry)=>{
+                entryLoader.load(entryId).then((entry)=>{
+                    parentEntries[entryId] = entry
                     resolve(entry)
                 })
                 .catch((e)=>{
@@ -367,7 +234,7 @@ const getAvailableSecondLevelsValues = async (parentForm,parentField,values,link
             if (childId in parentForm.childrenFieldsPropertyNames){
                 values.forEach((parentEntryId)=>{
                     if (parentEntryId in entries){
-                        let parentEntry = entries[parentEntryId]
+                        let parentEntry = parentEntries[parentEntryId]
                         for (let propName in parentForm.childrenFieldsPropertyNames[childId]){
                             secondLevelValues[childId] = appendToArrayIfInEntry(
                                 parentEntry,
@@ -396,7 +263,7 @@ const registerCorrespondances = async (formId,fieldName,asyncFunc)=>{
     if (formId in correspondances && fieldName in correspondances[formId]){
         return correspondances[formId][fieldName]
     }
-    return await manageInternalEvents(`${formId}-${fieldName}`,'registerCorrespondances','registeringCorrespondances',asyncFunc).then((...args)=>{
+    return await eventDispatcher.manageInternalEvents(`${formId}-${fieldName}`,'registerCorrespondances','registeringCorrespondances',asyncFunc).then((...args)=>{
         if (formId in correspondances){
             if (fieldName in correspondances[formId]){
                 return correspondances[formId][fieldName]
@@ -413,10 +280,9 @@ const getCorrespondancesCommon = async ({associatingForm,fieldName,getParentsAnd
     if (associatingForm.bn_id_nature in correspondances && fieldName in correspondances[associatingForm.bn_id_nature]){
         return correspondances[associatingForm.bn_id_nature][fieldName]
     } else {
-        return await getAllEntries(associatingForm.bn_id_nature)
+        return await allEntriesLoader.load(associatingForm.bn_id_nature)
             .then((entries)=>registerCorrespondances(associatingForm.bn_id_nature,fieldName,async ()=>{
-                    let entries = allEntriesCache[associatingForm.bn_id_nature] || []
-                    if (entries.length == 0){
+                    if (Object.keys(entries).length == 0){
                         console.log(`entries should not be empty`)
                     }
                     let correspondancesInt = 
@@ -424,7 +290,7 @@ const getCorrespondancesCommon = async ({associatingForm,fieldName,getParentsAnd
                             fieldName in correspondances[associatingForm.bn_id_nature])
                         ? correspondances[associatingForm.bn_id_nature][fieldName]
                         : []
-                    entries.forEach((e)=>{
+                    Object.values(entries).forEach((e)=>{
                         let tmp = {
                             parents: [],
                             children: {}
@@ -575,30 +441,6 @@ const getAvailableSecondLevelsValuesForLists = async (associatingForm,fieldName,
     return [secondLevelValues,associatingForm,associations]
 }
 
-const getForm = async (formId) => {
-    assertIsRegularFormId(formId)
-    if (formId in forms){
-        return forms[formId]
-    } else {
-        return await getData(wiki.url(`?api/forms/${formId}`),formId,'getForm','loadingForms',(responseDecoded)=>{
-                if (responseDecoded && ('bn_id_nature' in responseDecoded) &&
-                    responseDecoded.bn_id_nature == formId){
-                    forms[formId] = responseDecoded
-                    return true
-                } else {
-                    return false
-                }
-            }).then(()=>{
-                if (formId in forms){
-                    return forms[formId]
-                } else {
-                    throw `formId '${formId}' not found in 'forms (${JSON.stringify(Object.keys(forms))})`
-                }
-            })
-            .catch((e)=>{throw `error when getting form '${formId}'`+(e!=undefined ? ` : ${(e)}`:'')})
-    }
-}
-
 // manage promise
 const initPromisesData = () => {
     return {
@@ -610,7 +452,7 @@ const initPromisesData = () => {
 const createPromise = (promisesData,{formId,processFormAsync,getEntriesAsync,getEntriesLabel}) => {
     // get form
     promisesData.promises.push(new Promise((resolve,reject)=>{
-        getForm(formId).then((form)=>{
+        formLoader.load(formId).then((form)=>{
             processFormAsync(form).then(([,formModified,])=>{
                 resolve(formModified)
             })
@@ -651,7 +493,6 @@ export default {
     createPromise,
     formatChildField,
     formatParentField,
-    getAllEntries,
     getAvailableSecondLevelsValues,
     getAvailableSecondLevelsValuesForLists,
     getParentEntries,
diff --git a/javascripts/wikiDataLoader.prototype.js b/javascripts/wikiDataLoader.prototype.js
new file mode 100644
index 0000000..bc3fc7b
--- /dev/null
+++ b/javascripts/wikiDataLoader.prototype.js
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import eventDispatcher from './eventDispatcher.service.js'
+
+class WikiDataLoader {
+
+    #eventPrefix
+    #id
+    #cacheName
+    #testFunction
+    #url
+
+    /**
+     * 
+     * @param {string} url 
+     * @param {string} id 
+     * @param {string} eventPrefix 
+     * @param {string} cacheName 
+     * @param {function} testFunction
+     * @throws {Error} if testFunction is not a function
+     */
+    constructor(
+        url,
+        id,
+        eventPrefix,
+        cacheName,
+        testFunction) {
+        this.#url = url
+        this.#id = id
+        this.#eventPrefix = eventPrefix
+        this.#cacheName = cacheName
+        this.#testFunction = testFunction
+        if (typeof testFunction != "function"){
+            throw new Error("'testFunction' should be a function")
+        }
+    }
+
+    async load() {
+        return await eventDispatcher.manageInternalEvents(
+            this.#id,
+            this.#eventPrefix,
+            this.#cacheName,
+            async ()=>{
+                return fetch(this.#url)
+                    .then((response)=>{
+                        if (!response.ok){
+                            throw `response not ok when fetching ${this.#url}`
+                        } else {
+                            return response.json()
+                        }
+                    })
+                    .then((json)=>{
+                        if (!this.#testFunction.call(this,json)){
+                            throw 'response badly formatted'
+                        }
+                        return json
+                    })
+            }
+        )
+    }
+
+    static assertIsRegularFormId(formId) {
+        if (
+            typeof formId != "string"
+            || formId.length == 0
+            || Number(formId) < 1
+        ){
+            throw `'formId' as parameter as 'getForm' should be a not empty string representing a postive integer`
+        }
+    }
+}
+
+export default WikiDataLoader
\ No newline at end of file

From d1d71d76118343144234ea748f87ff77b224f46a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 6 Aug 2024 09:08:54 +0200
Subject: [PATCH 09/18] refactor(twoLevels): split formPromisesManager

---
 javascripts/bazar/define-common.js   |  9 ++--
 javascripts/enumlevel2Field/input.js |  9 ++--
 javascripts/formPromises.service.js  | 64 ++++++++++++++++++++++++++++
 javascripts/twolevels.js             | 54 +----------------------
 4 files changed, 75 insertions(+), 61 deletions(-)
 create mode 100644 javascripts/formPromises.service.js

diff --git a/javascripts/bazar/define-common.js b/javascripts/bazar/define-common.js
index 839d7db..d5819ea 100644
--- a/javascripts/bazar/define-common.js
+++ b/javascripts/bazar/define-common.js
@@ -8,6 +8,7 @@
  */
 
 import allEntriesLoader from '../allEntriesLoader.service.js'
+import formPromisesManager from '../formPromises.service.js'
 import twoLevelsHelper from '../twolevels.js'
 
 if (Vue) {
@@ -216,7 +217,7 @@ if (Vue) {
                         const values = [optionKey]
                         const formIdData = extractFormIdData(filterOption.name,parentField,uuid)
                         if (canGetSecondValuesByForm(parentField,formIdData)){
-                            twoLevelsHelper.createPromise(promisesData,{
+                            formPromisesManager.createPromise(promisesData,{
                                 formId: parentField.linkedObjectId,
                                 processFormAsync: async (form)=>{
                                     return twoLevelsHelper.getAvailableSecondLevelsValues(form,parentField,values,refreshOptionCache[uuid].options)
@@ -232,7 +233,7 @@ if (Vue) {
                             )
                         } else {
                             const formId = formIdData.id
-                            twoLevelsHelper.createPromise(promisesData,{
+                            formPromisesManager.createPromise(promisesData,{
                                 formId,
                                 processFormAsync: async (form)=>{
                                     return twoLevelsHelper.getAvailableSecondLevelsValuesForLists(
@@ -267,7 +268,7 @@ if (Vue) {
                 return
             }
             const filters = root.filters // TODO check if get computedFilters
-            let promisesData = twoLevelsHelper.initPromisesData()
+            let promisesData = formPromisesManager.initPromisesData()
             for (const filterId in filters) {
                 if (Object.hasOwnProperty.call(filters, filterId)) {
                     const filter = filters[filterId]
@@ -279,7 +280,7 @@ if (Vue) {
                 }
             }
             if (promisesData.promises.length > 0){
-                await twoLevelsHelper.resolvePromises(promisesData)
+                await formPromisesManager.resolvePromises(promisesData)
                 // something could have changes
                 // trigger update entries
                 root.filteredEntries = [...root.filteredEntries]
diff --git a/javascripts/enumlevel2Field/input.js b/javascripts/enumlevel2Field/input.js
index 92c799a..8603760 100644
--- a/javascripts/enumlevel2Field/input.js
+++ b/javascripts/enumlevel2Field/input.js
@@ -7,6 +7,7 @@
  * file that was distributed with this source code.
  */
 import allEntriesLoader from '../allEntriesLoader.service.js'
+import formPromisesManager from '../formPromises.service.js'
 import twoLevelsHelper from '../twolevels.js'
 
 // create a new Event `propChange`
@@ -637,7 +638,7 @@ const enumlevel2Helper = {
             if (typeof parentsFields != "object"){
                 throw "'parentsFields' should be an object with format 'fieldName' => field"
             } else {
-                let promisesData = twoLevelsHelper.initPromisesData()
+                let promisesData = formPromisesManager.initPromisesData()
                 for (let fieldName in parentsFields){
                     let parentField = parentsFields[fieldName]
                     if (parentField && parentField.linkedObjectId.length > 0){
@@ -651,7 +652,7 @@ const enumlevel2Helper = {
                                 )
                             )
                         if (canGetSecondValuesByForm){
-                            twoLevelsHelper.createPromise(promisesData,{
+                            formPromisesManager.createPromise(promisesData,{
                                 formId: parentField.linkedObjectId,
                                 processFormAsync: async (form)=>{
                                     return twoLevelsHelper.getAvailableSecondLevelsValues(form,parentField,values,this.levels2)
@@ -668,7 +669,7 @@ const enumlevel2Helper = {
                         } else {
                             for (let formIdData of formsIds){
                                 const formId = formIdData.id
-                                twoLevelsHelper.createPromise(promisesData,{
+                                formPromisesManager.createPromise(promisesData,{
                                     formId,
                                     processFormAsync: async (form)=>{
                                         return twoLevelsHelper.getAvailableSecondLevelsValuesForLists(
@@ -693,7 +694,7 @@ const enumlevel2Helper = {
                         }
                     }
                 }
-                return await twoLevelsHelper.resolvePromises(promisesData)
+                return await formPromisesManager.resolvePromises(promisesData)
             }
         },
         updateRadio(field,secondLevelValues,childId,parentValuesAssociations){
diff --git a/javascripts/formPromises.service.js b/javascripts/formPromises.service.js
new file mode 100644
index 0000000..181a2d8
--- /dev/null
+++ b/javascripts/formPromises.service.js
@@ -0,0 +1,64 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import formLoader from './formLoader.service.js'
+
+// manage promise
+const initPromisesData = () => {
+    return {
+        promises: [],
+        promisesLabel: []
+    }
+}
+
+const createPromise = (promisesData,{formId,processFormAsync,getEntriesAsync,getEntriesLabel}) => {
+    // get form
+    promisesData.promises.push(new Promise((resolve,reject)=>{
+        formLoader.load(formId).then((form)=>{
+            processFormAsync(form).then(([,formModified,])=>{
+                resolve(formModified)
+            })
+            .catch((e)=>reject(e))
+        })
+        .catch((e)=>{
+            reject(e)
+        })
+    }))
+    promisesData.promisesLabel.push(`getting form ${formId}`)
+    // start getting entries in parallel of form
+    promisesData.promises.push(
+        new Promise((resolve,reject)=>{
+            getEntriesAsync().then((entries)=>{
+                resolve(entries)
+            })
+            .catch((e)=>{
+                reject(e)
+            })
+        })
+    )
+    promisesData.promisesLabel.push(getEntriesLabel)
+}
+
+const resolvePromises = async (promisesData) => {
+    return await Promise.allSettled(promisesData.promises).then((promisesStatus)=>{
+        promisesStatus.forEach((p,idx)=>{
+            if (p.status != "fulfilled"){
+                console.warn(`error : ${p.reason} (when ${promisesData.promisesLabel[idx]})`)
+                console.error({error:p.reason})
+            }
+        })
+        return promisesStatus
+    })
+}
+
+export default {
+    createPromise,
+    initPromisesData,
+    resolvePromises
+}
\ No newline at end of file
diff --git a/javascripts/twolevels.js b/javascripts/twolevels.js
index 381aa90..fd0fc35 100644
--- a/javascripts/twolevels.js
+++ b/javascripts/twolevels.js
@@ -10,7 +10,6 @@
 import eventDispatcher from './eventDispatcher.service.js'
 import allEntriesLoader from './allEntriesLoader.service.js'
 import entryLoader from './entryLoader.service.js'
-import formLoader from './formLoader.service.js'
 
 let correspondances = {}
 let parentEntries = {}
@@ -441,61 +440,10 @@ const getAvailableSecondLevelsValuesForLists = async (associatingForm,fieldName,
     return [secondLevelValues,associatingForm,associations]
 }
 
-// manage promise
-const initPromisesData = () => {
-    return {
-        promises: [],
-        promisesLabel: []
-    }
-}
-
-const createPromise = (promisesData,{formId,processFormAsync,getEntriesAsync,getEntriesLabel}) => {
-    // get form
-    promisesData.promises.push(new Promise((resolve,reject)=>{
-        formLoader.load(formId).then((form)=>{
-            processFormAsync(form).then(([,formModified,])=>{
-                resolve(formModified)
-            })
-            .catch((e)=>reject(e))
-        })
-        .catch((e)=>{
-            reject(e)
-        })
-    }))
-    promisesData.promisesLabel.push(`getting form ${formId}`)
-    // start getting entries in parallel of form
-    promisesData.promises.push(
-        new Promise((resolve,reject)=>{
-            getEntriesAsync().then((entries)=>{
-                resolve(entries)
-            })
-            .catch((e)=>{
-                reject(e)
-            })
-        })
-    )
-    promisesData.promisesLabel.push(getEntriesLabel)
-}
-
-const resolvePromises = async (promisesData) => {
-    return await Promise.allSettled(promisesData.promises).then((promisesStatus)=>{
-        promisesStatus.forEach((p,idx)=>{
-            if (p.status != "fulfilled"){
-                console.warn(`error : ${p.reason} (when ${promisesData.promisesLabel[idx]})`)
-                console.error({error:p.reason})
-            }
-        })
-        return promisesStatus
-    })
-}
-
 export default {
-    createPromise,
     formatChildField,
     formatParentField,
     getAvailableSecondLevelsValues,
     getAvailableSecondLevelsValuesForLists,
-    getParentEntries,
-    initPromisesData,
-    resolvePromises
+    getParentEntries
 }
\ No newline at end of file

From 4da00be792abe58bba2cfbdbb1815fce4922cf91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 6 Aug 2024 09:08:54 +0200
Subject: [PATCH 10/18] refactor(define-common): extract component and utils

---
 javascripts/bazar/FilterLoadRootComponent.js |  51 ++++++
 javascripts/bazar/RootVueJsComponentUtil.js  |  33 ++++
 javascripts/bazar/define-common.js           | 170 ++++++++-----------
 3 files changed, 158 insertions(+), 96 deletions(-)
 create mode 100644 javascripts/bazar/FilterLoadRootComponent.js
 create mode 100644 javascripts/bazar/RootVueJsComponentUtil.js

diff --git a/javascripts/bazar/FilterLoadRootComponent.js b/javascripts/bazar/FilterLoadRootComponent.js
new file mode 100644
index 0000000..54cb306
--- /dev/null
+++ b/javascripts/bazar/FilterLoadRootComponent.js
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import utils from './RootVueJsComponentUtil.js'
+
+export default {
+    props: ['root'],
+    data: function(){
+        return {
+            actions: {
+                filteredEntries: 'updateFilteredEntries',
+                params: 'processParams'
+            },
+            unwatcher: {}
+        };
+    },
+    methods: {
+        processParams: function(){
+            this.unwatcher.params();
+            if (utils.canShowAnd(this.root)){
+                this.registerWatcher('filteredEntries');
+            }
+        },
+        registerWatcher: function(varname){
+            if (varname in this.actions && typeof this[this.actions[varname]] == "function"){
+                this.unwatcher[varname] = this.root.$watch(varname,()=>(this[this.actions[varname]])())
+            }
+        },
+        updateFilteredEntries: function(){
+            if (Object.keys(this.root.computedFilters).length > 0){
+                const results = utils.filterEntriesSync(this.root.searchedEntries,this.root)
+                this.unwatcher.filteredEntries();
+                this.root.filteredEntries = results
+                this.registerWatcher('filteredEntries');
+                this.root.paginateEntries();
+            }
+        }
+    },
+    mounted(){
+        this.registerWatcher('params');
+    },
+    template: `
+    <span v-show="false"></span>
+    `
+}
\ No newline at end of file
diff --git a/javascripts/bazar/RootVueJsComponentUtil.js b/javascripts/bazar/RootVueJsComponentUtil.js
new file mode 100644
index 0000000..459dafd
--- /dev/null
+++ b/javascripts/bazar/RootVueJsComponentUtil.js
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+const canShowAnd = (root) => {
+    return (root.params.intrafiltersmode === 'and')
+}
+
+const filterEntriesSync = (entries,root) => {
+    if (!canShowAnd(root)){
+        return entries
+    }
+    let results = entries
+    for(const filterId in root.computedFilters) {
+        results = results.filter(entry => {
+            if (!(filterId in entry) || typeof entry[filterId] != "string"){
+                return false
+            }
+            return root.computedFilters[filterId].every((value)=>entry[filterId].split(',').includes(value));
+        })
+    }
+    return results
+}
+
+export default {
+    canShowAnd,
+    filterEntriesSync
+}
\ No newline at end of file
diff --git a/javascripts/bazar/define-common.js b/javascripts/bazar/define-common.js
index d5819ea..296cb70 100644
--- a/javascripts/bazar/define-common.js
+++ b/javascripts/bazar/define-common.js
@@ -9,7 +9,9 @@
 
 import allEntriesLoader from '../allEntriesLoader.service.js'
 import formPromisesManager from '../formPromises.service.js'
+import FilterLoadRoot from './FilterLoadRootComponent.js'
 import twoLevelsHelper from '../twolevels.js'
+import utils from './RootVueJsComponentUtil.js'
 
 if (Vue) {
     let isSubLevelCache = null
@@ -23,25 +25,6 @@ if (Vue) {
         return isSubLevelCache
     }
 
-    const canShowAnd = (root) => {
-        return (root.params.intrafiltersmode === 'and')
-    }
-
-    const filterEntriesSync = (entries,root) => {
-        if (!canShowAnd(root)){
-            return entries
-        }
-        let results = entries
-        for(const filterId in root.computedFilters) {
-            results = results.filter(entry => {
-                if (!(filterId in entry) || typeof entry[filterId] != "string"){
-                    return false
-                }
-                return root.computedFilters[filterId].every((value)=>entry[filterId].split(',').includes(value));
-            })
-        }
-        return results
-    }
 
     const getEntriesForThisField = (entries,fieldName,test) => {
         return entries.filter(entry => {
@@ -64,7 +47,11 @@ if (Vue) {
             for (const key in root.formFields) {
                 if (Object.hasOwnProperty.call(root.formFields, key)) {
                     const field = root.formFields[key];
-                    if ('name' in field && field.name === fieldName){
+                    if ('name' in field && (
+                                field.name === fieldName
+                                || field.name === ('' + field.type + field.linkedObjectName + fieldName)
+                            )
+                        ){
                         return field
                     }
                 }
@@ -74,48 +61,74 @@ if (Vue) {
     }
 
     const updateNbForEachFilter = (root,fieldName,availableEntriesForThisFilter) => {
-        for (let option of root.filters[fieldName].list) {
+        const filter = root.filters[fieldName]
+        for (let option of (filter?.list ?? filter.nodes)) {
             if (typeof customCalculatebFromAvailableEntries == "function"){
                 // allow usage of custom function if available
-                option.nb = customCalculatebFromAvailableEntries(option,availableEntriesForThisFilter,root,fieldName)
+                root.$set(option,'nb',customCalculatebFromAvailableEntries(option,availableEntriesForThisFilter,root,fieldName))
             } else {
-                option.nb = getEntriesForThisField(availableEntriesForThisFilter,fieldName,(values)=>values.some((value)=>value == option.value)).length
+                root.$set(option,'nb',getEntriesForThisField(availableEntriesForThisFilter,fieldName,(values)=>values.some((value)=>value == option.value)).length)
             }
+            root.$set(option,'count', option.nb)
         }
     }
 
+    const getFilterFromPropName = (filterName, filters) => {
+        return !(filterName?.length > 0)
+            ? null
+            : (
+                filterName in filters
+                ? filterName
+                : filters.reduce((previousFilter, filter) => {
+                    return previousFilter !== null
+                        ? previousFilter
+                        : (
+                            (
+                                filter?.propName == filterName
+                                || (
+                                    filter?.propName?.slice(-filterName.length) == filterName
+                                    && filter?.propName?.slice(0,-filterName.length)?.match(/^(liste|radio|checkbox)(Liste\S+|\d+)/)
+                                )
+                            )
+                            ? filter
+                            : null
+                        )
+                }, null)
+            )
+    }
+
     const updateVisibilityIfSublevel = (root) => {
         if (!isSubLevel(root)){
             return
         }
         const uuid = getUuid(root)
-        Object.keys(root.filters).forEach((fieldName)=>{
-            const filter = root.filters[fieldName]
+        Object.entries(root.filters).forEach(([key,filter])=>{
+            const fieldName = filter?.propName ?? key
             if (fieldName in refreshOptionCache[uuid].options){
                 const childField = refreshOptionCache[uuid].options[fieldName]
+                const parentFilter = getFilterFromPropName(childField?.parentId ?? '', root.filters)
                 if (childField.parentId
                     && childField.parentId.length > 0
                     && childField.parentId in refreshOptionCache[uuid].parents
-                    && childField.parentId in root.filters){
+                    && parentFilter){
                     const parentField = refreshOptionCache[uuid].parents[childField.parentId]
-                    const parentFilter = root.filters[childField.parentId]
-                    const parentValues = parentFilter.list.filter((option)=>option.checked).map(option=>option.value)
+                    const parentValues = (parentFilter?.list ?? parentFilter?.nodes ?? []).filter((option)=>option.checked).map(option=>option.value)
                     const parentValueIsChecked = (parentValue,option)=>{
                         return (parentValue in parentField.secondLevelValues)
                             ? parentField.secondLevelValues[parentValue].includes(option.value)
                             : false
                     }
-                    for (let index = 0; index < filter.list.length; index++) {
-                        const option = filter.list[index]
-                        option.hide = canShowAnd(root)
+                    for (let index = 0; index < (filter?.list ?? filter.nodes).length; index++) {
+                        const option = (filter?.list ?? filter.nodes)[index]
+                        option.hide = utils.canShowAnd(root)
                             ? !parentValues.every((parentValue)=>parentValueIsChecked(parentValue,option))
                             : !parentValues.some((parentValue)=>parentValueIsChecked(parentValue,option))
                     }
                 }
             }
             if (fieldName in refreshOptionCache[uuid].parents){
-                for (let index = 0; index < filter.list.length; index++) {
-                    const option = filter.list[index]
+                for (let index = 0; index < (filter?.list ?? filter.nodes).length; index++) {
+                    const option = (filter?.list ?? filter.nodes)[index]
                     option.forceShow = true
                 }
             }
@@ -125,7 +138,8 @@ if (Vue) {
     const getCheckedFiltersWithMoreThanOne = (root) => {
         let modeThanOneCheckedFiltersName = [];
         for(let fieldName in root.filters) {
-            for (let option of root.filters[fieldName].list) {
+            const filter = root.filters[fieldName]
+            for (let option of (filter?.list ?? filter.nodes)) {
                 if (option.checked) {
                     if (!modeThanOneCheckedFiltersName.includes(fieldName)){
                         modeThanOneCheckedFiltersName.push(fieldName)
@@ -166,9 +180,10 @@ if (Vue) {
         })
         return parentField.listOfAssociatingForms?.[fieldName]
     }
-    const updateSecondLevelValues = (value,filterOption,childField,parentField,secondLevelValues,formModified,associations) =>{
-        parentField.secondLevelValues[value] = secondLevelValues[filterOption.name]
-        Object.entries(associations[filterOption.name]).forEach(([val,parentValue])=>{
+    const updateSecondLevelValues = (value,filterId,filterOption,childField,parentField,secondLevelValues,formModified,associations) =>{
+        const propName = filterOption?.name ?? filterId
+        parentField.secondLevelValues[value] = secondLevelValues[propName]
+        Object.entries(associations[propName]).forEach(([val,parentValue])=>{
             if (!(val in childField.associations)){
                 childField.associations[val] = []
             }
@@ -185,21 +200,21 @@ if (Vue) {
         return res
     }
 
-    const refreshOption = (filterOption,promisesData,root,uuid) => {
-        const field = getFieldFormRoot(root,filterOption.name)
+    const refreshOption = (filterId, filterOption,promisesData,root,uuid) => {
+        const field = getFieldFormRoot(root,filterId)
         if (field !== null && Object.keys(field).length > 0
-            && !(filterOption.name in refreshOptionCache[uuid].options)){
+            && !(filterId in refreshOptionCache[uuid].options)){
             // start refresh
-            refreshOptionCache[uuid].options[filterOption.name] = {
+            refreshOptionCache[uuid].options[filterId] = {
                 status: 'refreshing',
                 linkedObjectId: '',
                 associations: {}
             }
-            refreshOptionCache[uuid].options[filterOption.name] = {
-                ...refreshOptionCache[uuid].options[filterOption.name],
+            refreshOptionCache[uuid].options[filterId] = {
+                ...refreshOptionCache[uuid].options[filterId],
                 ...twoLevelsHelper.formatChildField(field)
             }
-            const childField = refreshOptionCache[uuid].options[filterOption.name]
+            const childField = refreshOptionCache[uuid].options[filterId]
             if ('parentFieldName' in childField && childField.parentFieldName.length > 0){
                 twoLevelsHelper.formatParentField(
                     refreshOptionCache[uuid].parents,
@@ -215,14 +230,14 @@ if (Vue) {
                     for (let index = 0; index < optionsAsEntries.length; index++) {
                         const optionKey = optionsAsEntries[index][0]
                         const values = [optionKey]
-                        const formIdData = extractFormIdData(filterOption.name,parentField,uuid)
+                        const formIdData = extractFormIdData(filterId,parentField,uuid)
                         if (canGetSecondValuesByForm(parentField,formIdData)){
                             formPromisesManager.createPromise(promisesData,{
                                 formId: parentField.linkedObjectId,
                                 processFormAsync: async (form)=>{
                                     return twoLevelsHelper.getAvailableSecondLevelsValues(form,parentField,values,refreshOptionCache[uuid].options)
                                         .then(([secondLevelValues,formModified,associations])=>{
-                                            updateSecondLevelValues(optionKey,filterOption,childField,parentField,secondLevelValues,formModified,associations)
+                                            updateSecondLevelValues(optionKey,filterId,filterOption,childField,parentField,secondLevelValues,formModified,associations)
                                             return [secondLevelValues,formModified,associations]
                                         })
                                 },
@@ -246,7 +261,7 @@ if (Vue) {
                                         formIdData.isForm && formId === childField.linkedObjectId
                                     )
                                     .then(([secondLevelValues,formModified,associations])=>{
-                                        updateSecondLevelValues(optionKey,filterOption,childField,parentField,secondLevelValues,formModified,associations)
+                                        updateSecondLevelValues(optionKey,filterId,filterOption,childField,parentField,secondLevelValues,formModified,associations)
                                         return [secondLevelValues,formModified,associations]
                                     })
                                 },
@@ -271,10 +286,11 @@ if (Vue) {
             let promisesData = formPromisesManager.initPromisesData()
             for (const filterId in filters) {
                 if (Object.hasOwnProperty.call(filters, filterId)) {
-                    const filter = filters[filterId]
-                    filter.list.forEach((filterOption)=>{
-                        if (!(filterOption.name in refreshOptionCache[uuid].options)){
-                            refreshOption(filterOption,promisesData,root,uuid)
+                    const filter = filters[filterId];
+                    (filter?.list ?? filter?.nodes).forEach((filterOption)=>{
+                        const filterPropName = filterOption?.name ?? filter.propName
+                        if (!(filterPropName in refreshOptionCache[uuid].options)){
+                            refreshOption(filterPropName,filterOption,promisesData,root,uuid)
                         }
                     })
                 }
@@ -298,58 +314,19 @@ if (Vue) {
 
     Vue.prototype.isDisplayedFilterOption = function(filterOption,root){
         return root.params.autohidefilter === "false" // main param
-            || (!canShowAnd(root) && filterOption.checked) // display if checked in all case
+            || (!utils.canShowAnd(root) && filterOption.checked) // display if checked in all case
             || (root.params.keepallparents !== "false" && filterOption.forceShow === true) // display if parentField of sublevel
-            || (filterOption.hide !== true &&  filterOption.nb > 0) // hide or at least one element
+            || (filterOption.hide !== true && (filterOption?.nb ?? filterOption.count) > 0) // hide or at least one element
     }
     Vue.prototype.filterHasAtLeastOneOption = function(filter,root){
         if (typeof customfilterHasAtLeastOneOption == "function"){
             // allow usage of custom function if available
             return customfilterHasAtLeastOneOption(filter,root)
         } else {
-            return filter.list.some((filterOption)=>Vue.prototype.isDisplayedFilterOption(filterOption,root));
+            return (filter?.list ?? filter.nodes).some((filterOption)=>Vue.prototype.isDisplayedFilterOption(filterOption,root));
         }
     }
-    Vue.component('FilterLoadRoot', {
-        props: ['root'],
-        data: function(){
-            return {
-                actions: {
-                    filteredEntries: 'updateFilteredEntries',
-                    params: 'processParams'
-                },
-                unwatcher: {}
-            };
-        },
-        methods: {
-            processParams: function(){
-                this.unwatcher.params();
-                if (canShowAnd(this.root)){
-                    this.registerWatcher('filteredEntries');
-                }
-            },
-            registerWatcher: function(varname){
-                if (varname in this.actions && typeof this[this.actions[varname]] == "function"){
-                    this.unwatcher[varname] = this.root.$watch(varname,()=>(this[this.actions[varname]])())
-                }
-            },
-            updateFilteredEntries: function(){
-                if (Object.keys(this.root.computedFilters).length > 0){
-                    const results = filterEntriesSync(this.root.searchedEntries,this.root)
-                    this.unwatcher.filteredEntries();
-                    this.root.filteredEntries = results
-                    this.registerWatcher('filteredEntries');
-                    this.root.paginateEntries();
-                }
-            }
-        },
-        mounted(){
-            this.registerWatcher('params');
-        },
-        template: `
-        <span v-show="false"></span>
-        `
-    });
+    Vue.component('FilterLoadRoot', FilterLoadRoot);
     Vue.prototype.refreshedFiltersWithentries = function(entries,root){
         refreshOptionsAsync(root)
         const modeThanOneCheckedFiltersName = getCheckedFiltersWithMoreThanOne(root)
@@ -366,7 +343,8 @@ if (Vue) {
                             availableEntriesForThisFilter,
                             otherFieldName,
                             (values)=>{
-                                return root.filters[otherFieldName].list.some((option)=>option.checked && values.some(value=>value == option.value))
+                                const filter = root.filters[otherFieldName]
+                                return (filter?.list ?? filter.nodes).some((option)=>option.checked && values.some(value=>value == option.value))
                             }
                         )
                 });
@@ -375,7 +353,7 @@ if (Vue) {
                     ? root.filteredEntries.filter(entry => entry.bf_latitude && entry.bf_longitude)
                     : root.filteredEntries
             }
-            availableEntriesForThisFilter = filterEntriesSync(availableEntriesForThisFilter,root)
+            availableEntriesForThisFilter = utils.filterEntriesSync(availableEntriesForThisFilter,root)
             updateNbForEachFilter(root,fieldName,availableEntriesForThisFilter)
             updateVisibilityIfSublevel(root)
         }

From 5a33759769b50b5db1b61a8743e98adba0ec34d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 6 Aug 2024 09:08:54 +0200
Subject: [PATCH 11/18] refactor(define-common): extract isSubLevel

---
 javascripts/bazar/RootVueJsComponentUtil.js | 15 ++++++++++++++-
 javascripts/bazar/define-common.js          | 15 ++-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/javascripts/bazar/RootVueJsComponentUtil.js b/javascripts/bazar/RootVueJsComponentUtil.js
index 459dafd..bf7dbbf 100644
--- a/javascripts/bazar/RootVueJsComponentUtil.js
+++ b/javascripts/bazar/RootVueJsComponentUtil.js
@@ -27,7 +27,20 @@ const filterEntriesSync = (entries,root) => {
     return results
 }
 
+
+let isSubLevelCache = null
+const isSubLevel = (root) => {
+    if (isSubLevelCache === null){
+        if (Object.keys(root.formFields).length === 0){
+            return false
+        }
+        isSubLevelCache = Object.values(root.formFields).some((field)=>('parentFieldName' in field && 'associatingFormId' in field))
+    }
+    return isSubLevelCache
+}
+
 export default {
     canShowAnd,
-    filterEntriesSync
+    filterEntriesSync,
+    isSubLevel
 }
\ No newline at end of file
diff --git a/javascripts/bazar/define-common.js b/javascripts/bazar/define-common.js
index 296cb70..81b31a2 100644
--- a/javascripts/bazar/define-common.js
+++ b/javascripts/bazar/define-common.js
@@ -14,17 +14,6 @@ import twoLevelsHelper from '../twolevels.js'
 import utils from './RootVueJsComponentUtil.js'
 
 if (Vue) {
-    let isSubLevelCache = null
-    const isSubLevel = (root) => {
-        if (isSubLevelCache === null){
-            if (Object.keys(root.formFields).length === 0){
-                return false
-            }
-            isSubLevelCache = Object.values(root.formFields).some((field)=>('parentFieldName' in field && 'associatingFormId' in field))
-        }
-        return isSubLevelCache
-    }
-
 
     const getEntriesForThisField = (entries,fieldName,test) => {
         return entries.filter(entry => {
@@ -98,7 +87,7 @@ if (Vue) {
     }
 
     const updateVisibilityIfSublevel = (root) => {
-        if (!isSubLevel(root)){
+        if (!utils.isSubLevel(root)){
             return
         }
         const uuid = getUuid(root)
@@ -278,7 +267,7 @@ if (Vue) {
     const refreshOptionsAsync = async (root) => {
         try {
             const uuid = getUuid(root)
-            if (!isSubLevel(root)
+            if (!utils.isSubLevel(root)
                 || Object.keys(refreshOptionCache?.[uuid].options).length > 0){
                 return
             }

From aee351dbb5562a0cca0e0e91edf37bb0962d1601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 6 Aug 2024 09:41:48 +0200
Subject: [PATCH 12/18] refactor(options.registry): extract it from
 define-common

---
 javascripts/bazar/RootVueJsComponentUtil.js | 10 +++
 javascripts/bazar/define-common.js          | 67 +++++++++------------
 javascripts/bazar/options.registry.js       | 47 +++++++++++++++
 3 files changed, 85 insertions(+), 39 deletions(-)
 create mode 100644 javascripts/bazar/options.registry.js

diff --git a/javascripts/bazar/RootVueJsComponentUtil.js b/javascripts/bazar/RootVueJsComponentUtil.js
index bf7dbbf..8a6bee8 100644
--- a/javascripts/bazar/RootVueJsComponentUtil.js
+++ b/javascripts/bazar/RootVueJsComponentUtil.js
@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  */
 
+import optionRegistry from './options.registry.js'
+
 const canShowAnd = (root) => {
     return (root.params.intrafiltersmode === 'and')
 }
@@ -39,8 +41,16 @@ const isSubLevel = (root) => {
     return isSubLevelCache
 }
 
+const getUuid = (root) => root?._uid ?? 'unknown'
+
+const getOptionData = (root) => {
+    const uuid = getUuid(root)
+    return optionRegistry.getAndInitIfNeeded(uuid)
+}
+
 export default {
     canShowAnd,
     filterEntriesSync,
+    getOptionData,
     isSubLevel
 }
\ No newline at end of file
diff --git a/javascripts/bazar/define-common.js b/javascripts/bazar/define-common.js
index 81b31a2..d48e540 100644
--- a/javascripts/bazar/define-common.js
+++ b/javascripts/bazar/define-common.js
@@ -90,17 +90,17 @@ if (Vue) {
         if (!utils.isSubLevel(root)){
             return
         }
-        const uuid = getUuid(root)
+        const optionData = utils.getOptionData(root)
         Object.entries(root.filters).forEach(([key,filter])=>{
             const fieldName = filter?.propName ?? key
-            if (fieldName in refreshOptionCache[uuid].options){
-                const childField = refreshOptionCache[uuid].options[fieldName]
+            if (fieldName in optionData.options){
+                const childField = optionData.options[fieldName]
                 const parentFilter = getFilterFromPropName(childField?.parentId ?? '', root.filters)
                 if (childField.parentId
                     && childField.parentId.length > 0
-                    && childField.parentId in refreshOptionCache[uuid].parents
+                    && childField.parentId in optionData.parents
                     && parentFilter){
-                    const parentField = refreshOptionCache[uuid].parents[childField.parentId]
+                    const parentField = optionData.parents[childField.parentId]
                     const parentValues = (parentFilter?.list ?? parentFilter?.nodes ?? []).filter((option)=>option.checked).map(option=>option.value)
                     const parentValueIsChecked = (parentValue,option)=>{
                         return (parentValue in parentField.secondLevelValues)
@@ -115,7 +115,7 @@ if (Vue) {
                     }
                 }
             }
-            if (fieldName in refreshOptionCache[uuid].parents){
+            if (fieldName in optionData.parents){
                 for (let index = 0; index < (filter?.list ?? filter.nodes).length; index++) {
                     const option = (filter?.list ?? filter.nodes)[index]
                     option.forceShow = true
@@ -139,30 +139,19 @@ if (Vue) {
         return modeThanOneCheckedFiltersName
     }
 
-    const refreshOptionCache = {}
-    const getUuid = (root) => {
-        const uuid = root?._uid ?? 'unknown'
-        if (!refreshOptionCache.hasOwnProperty(uuid)){
-            refreshOptionCache[uuid] = {
-                options: {},
-                parents: {}
-            }
-        }
-        return uuid
-    }
-    const extractFormIdData = (fieldName,parentField,uuid) => {
+    const extractFormIdData = (fieldName,parentField,optionData) => {
         if (!('listOfAssociatingForms' in parentField)){
             parentField.listOfAssociatingForms = {}
         }
         parentField.childrenIds.forEach((id)=>{
             if (!(id in parentField.listOfAssociatingForms)){
-                let associatingFormId = refreshOptionCache[uuid].options[id].associatingFormId
+                let associatingFormId = optionData.options[id].associatingFormId
                 if (associatingFormId.length > 0){
                     parentField.listOfAssociatingForms[id] = {
                         childId:id,
                         id:associatingFormId,
-                        isForm:refreshOptionCache[uuid].options[id].isForm,
-                        wantedFieldId:refreshOptionCache[uuid].options[id].associatingFieldId
+                        isForm:optionData.options[id].isForm,
+                        wantedFieldId:optionData.options[id].associatingFieldId
                     }
                 }
             }
@@ -189,42 +178,42 @@ if (Vue) {
         return res
     }
 
-    const refreshOption = (filterId, filterOption,promisesData,root,uuid) => {
+    const refreshOption = (filterId, filterOption,promisesData,root,optionData) => {
         const field = getFieldFormRoot(root,filterId)
         if (field !== null && Object.keys(field).length > 0
-            && !(filterId in refreshOptionCache[uuid].options)){
+            && !(filterId in optionData.options)){
             // start refresh
-            refreshOptionCache[uuid].options[filterId] = {
+            optionData.options[filterId] = {
                 status: 'refreshing',
                 linkedObjectId: '',
                 associations: {}
             }
-            refreshOptionCache[uuid].options[filterId] = {
-                ...refreshOptionCache[uuid].options[filterId],
+            optionData.options[filterId] = {
+                ...optionData.options[filterId],
                 ...twoLevelsHelper.formatChildField(field)
             }
-            const childField = refreshOptionCache[uuid].options[filterId]
+            const childField = optionData.options[filterId]
             if ('parentFieldName' in childField && childField.parentFieldName.length > 0){
                 twoLevelsHelper.formatParentField(
-                    refreshOptionCache[uuid].parents,
+                    optionData.parents,
                     childField,
                     ()=>{
                         return getFieldFormRoot(root,childField.parentFieldName)
                     }
                 )
-                if (childField.parentId in refreshOptionCache[uuid].parents){
-                    const parentField = refreshOptionCache[uuid].parents[childField.parentId]
+                if (childField.parentId in optionData.parents){
+                    const parentField = optionData.parents[childField.parentId]
                     parentField.secondLevelValues = {}
                     const optionsAsEntries = Object.entries(parentField.field.options)
                     for (let index = 0; index < optionsAsEntries.length; index++) {
                         const optionKey = optionsAsEntries[index][0]
                         const values = [optionKey]
-                        const formIdData = extractFormIdData(filterId,parentField,uuid)
+                        const formIdData = extractFormIdData(filterId,parentField,optionData)
                         if (canGetSecondValuesByForm(parentField,formIdData)){
                             formPromisesManager.createPromise(promisesData,{
                                 formId: parentField.linkedObjectId,
                                 processFormAsync: async (form)=>{
-                                    return twoLevelsHelper.getAvailableSecondLevelsValues(form,parentField,values,refreshOptionCache[uuid].options)
+                                    return twoLevelsHelper.getAvailableSecondLevelsValues(form,parentField,values,optionData.options)
                                         .then(([secondLevelValues,formModified,associations])=>{
                                             updateSecondLevelValues(optionKey,filterId,filterOption,childField,parentField,secondLevelValues,formModified,associations)
                                             return [secondLevelValues,formModified,associations]
@@ -246,7 +235,7 @@ if (Vue) {
                                         parentField,
                                         values,
                                         formIdData,
-                                        refreshOptionCache[uuid].options,
+                                        optionData.options,
                                         formIdData.isForm && formId === childField.linkedObjectId
                                     )
                                     .then(([secondLevelValues,formModified,associations])=>{
@@ -266,9 +255,9 @@ if (Vue) {
     }
     const refreshOptionsAsync = async (root) => {
         try {
-            const uuid = getUuid(root)
+            const optionData = utils.getOptionData(root)
             if (!utils.isSubLevel(root)
-                || Object.keys(refreshOptionCache?.[uuid].options).length > 0){
+                || Object.keys(optionData?.options ?? null).length > 0){
                 return
             }
             const filters = root.filters // TODO check if get computedFilters
@@ -278,8 +267,8 @@ if (Vue) {
                     const filter = filters[filterId];
                     (filter?.list ?? filter?.nodes).forEach((filterOption)=>{
                         const filterPropName = filterOption?.name ?? filter.propName
-                        if (!(filterPropName in refreshOptionCache[uuid].options)){
-                            refreshOption(filterPropName,filterOption,promisesData,root,uuid)
+                        if (!(filterPropName in optionData.options)){
+                            refreshOption(filterPropName,filterOption,promisesData,root,optionData)
                         }
                     })
                 }
@@ -291,8 +280,8 @@ if (Vue) {
                 root.filteredEntries = [...root.filteredEntries]
             }
             
-            Object.keys(refreshOptionCache[uuid].options).forEach((k)=>{
-                refreshOptionCache[uuid].options[k].status = 'done'
+            Object.keys(optionData.options).forEach((k)=>{
+                optionData.options[k].status = 'done'
                 // todo only update the right ones
             })
 
diff --git a/javascripts/bazar/options.registry.js b/javascripts/bazar/options.registry.js
new file mode 100644
index 0000000..16153ec
--- /dev/null
+++ b/javascripts/bazar/options.registry.js
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import Registry from '../registry.prototype.js'
+
+const registry = new Registry()
+const defaultOption =
+    {
+        options: {},
+        parents: {}
+    }
+
+/* methods */
+const getAndInitIfNeeded = (uuid) => {
+    const stringifiedUUID = String(uuid)
+    if (get(stringifiedUUID) === null) {
+        // creation
+        registry.add(stringifiedUUID, [])
+        registry.set(stringifiedUUID, {...defaultOption})
+    }
+    return get(stringifiedUUID)
+}
+
+const get = (uuid) => {
+    return registry.get(String(uuid))
+}
+
+const getOptions = (uuid) => {
+    return registry.get(String(uuid))?.options ?? {}
+}
+
+const getParents = (uuid) => {
+    return registry.get(String(uuid))?.parents ?? {}
+}
+
+export default {
+    getAndInitIfNeeded,
+    get,
+    getOptions,
+    getParents
+}
\ No newline at end of file

From 3164948051601d0028a411497984f29967a3ff24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 6 Aug 2024 09:50:38 +0200
Subject: [PATCH 13/18] refactor(define-common): extract getFieldFromRoot

---
 javascripts/bazar/RootVueJsComponentUtil.js | 29 +++++++++++++++++++++
 javascripts/bazar/define-common.js          | 27 ++-----------------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/javascripts/bazar/RootVueJsComponentUtil.js b/javascripts/bazar/RootVueJsComponentUtil.js
index 8a6bee8..2c49fdd 100644
--- a/javascripts/bazar/RootVueJsComponentUtil.js
+++ b/javascripts/bazar/RootVueJsComponentUtil.js
@@ -48,9 +48,38 @@ const getOptionData = (root) => {
     return optionRegistry.getAndInitIfNeeded(uuid)
 }
 
+const searchFieldByName = (fieldName,fields) => {
+    for (const key in fields) {
+        if (Object.hasOwnProperty.call(fields, key)) {
+            const field = fields[key];
+            if ('name' in field && (
+                        field.name === fieldName
+                        || field.name === ('' + field.type + field.linkedObjectName + fieldName)
+                    )
+                ){
+                return field
+            }
+        }
+    }
+    return null
+}
+
+const getFieldFromRoot = (root,fieldName) => {
+    if ('formFields' in root 
+        && typeof root.formFields === 'object'
+        && Object.keys(root.formFields).length > 0){
+        if (fieldName in root.formFields){
+            return root.formFields[fieldName]
+        }
+        return searchFieldByName(fieldName, root.formFields)
+    }
+    return null
+}
+
 export default {
     canShowAnd,
     filterEntriesSync,
+    getFieldFromRoot,
     getOptionData,
     isSubLevel
 }
\ No newline at end of file
diff --git a/javascripts/bazar/define-common.js b/javascripts/bazar/define-common.js
index d48e540..f1ace18 100644
--- a/javascripts/bazar/define-common.js
+++ b/javascripts/bazar/define-common.js
@@ -26,29 +26,6 @@ if (Vue) {
         })
     }
 
-    const getFieldFormRoot = (root,fieldName) => {
-        if ('formFields' in root 
-            && typeof root.formFields === 'object'
-            && Object.keys(root.formFields).length > 0){
-            if (fieldName in root.formFields){
-                return root.formFields[fieldName]
-            }
-            for (const key in root.formFields) {
-                if (Object.hasOwnProperty.call(root.formFields, key)) {
-                    const field = root.formFields[key];
-                    if ('name' in field && (
-                                field.name === fieldName
-                                || field.name === ('' + field.type + field.linkedObjectName + fieldName)
-                            )
-                        ){
-                        return field
-                    }
-                }
-            }
-        }
-        return null
-    }
-
     const updateNbForEachFilter = (root,fieldName,availableEntriesForThisFilter) => {
         const filter = root.filters[fieldName]
         for (let option of (filter?.list ?? filter.nodes)) {
@@ -179,7 +156,7 @@ if (Vue) {
     }
 
     const refreshOption = (filterId, filterOption,promisesData,root,optionData) => {
-        const field = getFieldFormRoot(root,filterId)
+        const field = utils.getFieldFromRoot(root,filterId)
         if (field !== null && Object.keys(field).length > 0
             && !(filterId in optionData.options)){
             // start refresh
@@ -198,7 +175,7 @@ if (Vue) {
                     optionData.parents,
                     childField,
                     ()=>{
-                        return getFieldFormRoot(root,childField.parentFieldName)
+                        return utils.getFieldFromRoot(root,childField.parentFieldName)
                     }
                 )
                 if (childField.parentId in optionData.parents){

From 1a7dffa6e84a26518f1875f41f465ff7792af2b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 6 Aug 2024 09:58:21 +0200
Subject: [PATCH 14/18] refactor(define-common): extract getChekedFilters

---
 javascripts/bazar/RootVueJsComponentUtil.js | 23 ++++++++++++++++++++-
 javascripts/bazar/define-common.js          | 17 +--------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/javascripts/bazar/RootVueJsComponentUtil.js b/javascripts/bazar/RootVueJsComponentUtil.js
index 2c49fdd..1933d3b 100644
--- a/javascripts/bazar/RootVueJsComponentUtil.js
+++ b/javascripts/bazar/RootVueJsComponentUtil.js
@@ -76,10 +76,31 @@ const getFieldFromRoot = (root,fieldName) => {
     return null
 }
 
+const pushIfNotPresent = (value,data) => {
+    if (!data.a.includes(value)){
+        data.a.push(value)
+    }
+}
+
+const getChekedFilters = (root) => {
+    let filters = [];
+    for(let fieldName in root.filters) {
+        const filter = root.filters[fieldName]
+        for (let option of (filter?.list ?? filter.nodes)) {
+            if (option.checked) {
+                pushIfNotPresent(fieldName,{a:filters})
+            }
+        }
+    }
+    return filters
+}
+
 export default {
     canShowAnd,
     filterEntriesSync,
+    getChekedFilters,
     getFieldFromRoot,
     getOptionData,
-    isSubLevel
+    isSubLevel,
+    pushIfNotPresent
 }
\ No newline at end of file
diff --git a/javascripts/bazar/define-common.js b/javascripts/bazar/define-common.js
index f1ace18..e66305c 100644
--- a/javascripts/bazar/define-common.js
+++ b/javascripts/bazar/define-common.js
@@ -101,21 +101,6 @@ if (Vue) {
         })
     }
 
-    const getCheckedFiltersWithMoreThanOne = (root) => {
-        let modeThanOneCheckedFiltersName = [];
-        for(let fieldName in root.filters) {
-            const filter = root.filters[fieldName]
-            for (let option of (filter?.list ?? filter.nodes)) {
-                if (option.checked) {
-                    if (!modeThanOneCheckedFiltersName.includes(fieldName)){
-                        modeThanOneCheckedFiltersName.push(fieldName)
-                    }
-                }
-            }
-        }
-        return modeThanOneCheckedFiltersName
-    }
-
     const extractFormIdData = (fieldName,parentField,optionData) => {
         if (!('listOfAssociatingForms' in parentField)){
             parentField.listOfAssociatingForms = {}
@@ -284,7 +269,7 @@ if (Vue) {
     Vue.component('FilterLoadRoot', FilterLoadRoot);
     Vue.prototype.refreshedFiltersWithentries = function(entries,root){
         refreshOptionsAsync(root)
-        const modeThanOneCheckedFiltersName = getCheckedFiltersWithMoreThanOne(root)
+        const modeThanOneCheckedFiltersName = utils.getChekedFilters(root)
         for(let fieldName in root.filters) {
             let availableEntriesForThisFilter = root.searchedEntries;
             if (root.params.template === "map"){

From b06db95d6092302a5fe267b4fbeceb8d4d3bdbef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 6 Aug 2024 10:22:02 +0200
Subject: [PATCH 15/18] refactor(define-common): extract
 updateVisibilityIfSublevel()

---
 javascripts/bazar/define-common.js      | 65 +----------------------
 javascripts/bazar/filters.service.js    | 36 +++++++++++++
 javascripts/bazar/visibility.service.js | 68 +++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 63 deletions(-)
 create mode 100644 javascripts/bazar/filters.service.js
 create mode 100644 javascripts/bazar/visibility.service.js

diff --git a/javascripts/bazar/define-common.js b/javascripts/bazar/define-common.js
index e66305c..4c20c6d 100644
--- a/javascripts/bazar/define-common.js
+++ b/javascripts/bazar/define-common.js
@@ -11,6 +11,7 @@ import allEntriesLoader from '../allEntriesLoader.service.js'
 import formPromisesManager from '../formPromises.service.js'
 import FilterLoadRoot from './FilterLoadRootComponent.js'
 import twoLevelsHelper from '../twolevels.js'
+import visibilityManager from './visibility.service.js'
 import utils from './RootVueJsComponentUtil.js'
 
 if (Vue) {
@@ -39,68 +40,6 @@ if (Vue) {
         }
     }
 
-    const getFilterFromPropName = (filterName, filters) => {
-        return !(filterName?.length > 0)
-            ? null
-            : (
-                filterName in filters
-                ? filterName
-                : filters.reduce((previousFilter, filter) => {
-                    return previousFilter !== null
-                        ? previousFilter
-                        : (
-                            (
-                                filter?.propName == filterName
-                                || (
-                                    filter?.propName?.slice(-filterName.length) == filterName
-                                    && filter?.propName?.slice(0,-filterName.length)?.match(/^(liste|radio|checkbox)(Liste\S+|\d+)/)
-                                )
-                            )
-                            ? filter
-                            : null
-                        )
-                }, null)
-            )
-    }
-
-    const updateVisibilityIfSublevel = (root) => {
-        if (!utils.isSubLevel(root)){
-            return
-        }
-        const optionData = utils.getOptionData(root)
-        Object.entries(root.filters).forEach(([key,filter])=>{
-            const fieldName = filter?.propName ?? key
-            if (fieldName in optionData.options){
-                const childField = optionData.options[fieldName]
-                const parentFilter = getFilterFromPropName(childField?.parentId ?? '', root.filters)
-                if (childField.parentId
-                    && childField.parentId.length > 0
-                    && childField.parentId in optionData.parents
-                    && parentFilter){
-                    const parentField = optionData.parents[childField.parentId]
-                    const parentValues = (parentFilter?.list ?? parentFilter?.nodes ?? []).filter((option)=>option.checked).map(option=>option.value)
-                    const parentValueIsChecked = (parentValue,option)=>{
-                        return (parentValue in parentField.secondLevelValues)
-                            ? parentField.secondLevelValues[parentValue].includes(option.value)
-                            : false
-                    }
-                    for (let index = 0; index < (filter?.list ?? filter.nodes).length; index++) {
-                        const option = (filter?.list ?? filter.nodes)[index]
-                        option.hide = utils.canShowAnd(root)
-                            ? !parentValues.every((parentValue)=>parentValueIsChecked(parentValue,option))
-                            : !parentValues.some((parentValue)=>parentValueIsChecked(parentValue,option))
-                    }
-                }
-            }
-            if (fieldName in optionData.parents){
-                for (let index = 0; index < (filter?.list ?? filter.nodes).length; index++) {
-                    const option = (filter?.list ?? filter.nodes)[index]
-                    option.forceShow = true
-                }
-            }
-        })
-    }
-
     const extractFormIdData = (fieldName,parentField,optionData) => {
         if (!('listOfAssociatingForms' in parentField)){
             parentField.listOfAssociatingForms = {}
@@ -295,7 +234,7 @@ if (Vue) {
             }
             availableEntriesForThisFilter = utils.filterEntriesSync(availableEntriesForThisFilter,root)
             updateNbForEachFilter(root,fieldName,availableEntriesForThisFilter)
-            updateVisibilityIfSublevel(root)
+            visibilityManager.updateVisibilityIfSublevel(root)
         }
         return root.filters;
     };
diff --git a/javascripts/bazar/filters.service.js b/javascripts/bazar/filters.service.js
new file mode 100644
index 0000000..613cb61
--- /dev/null
+++ b/javascripts/bazar/filters.service.js
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+const getFilterFromPropName = (filterName, filters) => {
+    return !(filterName?.length > 0)
+        ? null
+        : (
+            filterName in filters
+            ? filterName
+            : filters.reduce((previousFilter, filter) => {
+                return previousFilter !== null
+                    ? previousFilter
+                    : (
+                        (
+                            filter?.propName == filterName
+                            || (
+                                filter?.propName?.slice(-filterName.length) == filterName
+                                && filter?.propName?.slice(0,-filterName.length)?.match(/^(liste|radio|checkbox)(Liste\S+|\d+)/)
+                            )
+                        )
+                        ? filter
+                        : null
+                    )
+            }, null)
+        )
+}
+
+export default {
+    getFilterFromPropName
+}
\ No newline at end of file
diff --git a/javascripts/bazar/visibility.service.js b/javascripts/bazar/visibility.service.js
new file mode 100644
index 0000000..f4b5ef2
--- /dev/null
+++ b/javascripts/bazar/visibility.service.js
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import filtersService from './filters.service.js'
+import utils from './RootVueJsComponentUtil.js'
+
+const parentValueIsChecked = (parentValue,parentField,option)=>{
+    return (parentValue in parentField.secondLevelValues)
+        ? parentField.secondLevelValues[parentValue].includes(option.value)
+        : false
+}
+
+const getParentValues = (parentFilter) => {
+    return (parentFilter?.list ?? parentFilter?.nodes ?? [])
+        .filter((option)=>option.checked)
+        .map(option=>option.value)
+}
+
+const updateOptionsVisibility = (fieldName, optionData, root, nodes) => {
+    if (fieldName in optionData.options){
+        const childField = optionData.options[fieldName]
+        const parentFilter = filtersService.getFilterFromPropName(childField?.parentId ?? '', root.filters)
+        if (childField.parentId
+            && childField.parentId.length > 0
+            && childField.parentId in optionData.parents
+            && parentFilter){
+            const parentField = optionData.parents[childField.parentId]
+            const parentValues = getParentValues(parentFilter)
+            for (let index = 0; index < nodes.length; index++) {
+                const option = nodes[index]
+                option.hide = utils.canShowAnd(root)
+                    ? !parentValues.every((parentValue)=>parentValueIsChecked(parentValue,parentField,option))
+                    : !parentValues.some((parentValue)=>parentValueIsChecked(parentValue,parentField,option))
+            }
+        }
+    }
+}
+const updateParentsVisibility = (fieldName, optionData, nodes) => {
+    if (fieldName in optionData.parents){
+        for (let index = 0; index < nodes.length; index++) {
+            const option = nodes[index]
+            option.forceShow = true
+        }
+    }
+}
+
+const updateVisibilityIfSublevel = (root) => {
+    if (!utils.isSubLevel(root)){
+        return
+    }
+    const optionData = utils.getOptionData(root)
+    Object.entries(root.filters).forEach(([key,filter])=>{
+        const fieldName = filter?.propName ?? key
+        const nodes = filter?.list ?? filter.nodes
+        updateOptionsVisibility(fieldName, optionData, root, nodes)
+        updateParentsVisibility(fieldName, optionData, nodes)
+    })
+}
+
+export default {
+    updateVisibilityIfSublevel
+}
\ No newline at end of file

From 47cfb49938e7bd8205ac8a4bf63061821a768530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 6 Aug 2024 10:53:30 +0200
Subject: [PATCH 16/18] refactor(define-commons): split last services

---
 javascripts/bazar/define-common.js    | 231 +-------------------------
 javascripts/bazar/field.service.js    |  53 ++++++
 javascripts/bazar/filters.service.js  |  18 +-
 javascripts/bazar/options.service.js  | 153 +++++++++++++++++
 javascripts/bazar/vue.configurator.js |  75 +++++++++
 5 files changed, 300 insertions(+), 230 deletions(-)
 create mode 100644 javascripts/bazar/field.service.js
 create mode 100644 javascripts/bazar/options.service.js
 create mode 100644 javascripts/bazar/vue.configurator.js

diff --git a/javascripts/bazar/define-common.js b/javascripts/bazar/define-common.js
index 4c20c6d..1965d04 100644
--- a/javascripts/bazar/define-common.js
+++ b/javascripts/bazar/define-common.js
@@ -7,235 +7,8 @@
  * file that was distributed with this source code.
  */
 
-import allEntriesLoader from '../allEntriesLoader.service.js'
-import formPromisesManager from '../formPromises.service.js'
-import FilterLoadRoot from './FilterLoadRootComponent.js'
-import twoLevelsHelper from '../twolevels.js'
-import visibilityManager from './visibility.service.js'
-import utils from './RootVueJsComponentUtil.js'
+import vueConfigurator from './vue.configurator.js'
 
 if (Vue) {
-
-    const getEntriesForThisField = (entries,fieldName,test) => {
-        return entries.filter(entry => {
-            let entryValues = entry[fieldName]
-            if (!entryValues || typeof entryValues != "string"){
-                return
-            }
-            entryValues = entryValues.split(',')
-            return test(entryValues)
-        })
-    }
-
-    const updateNbForEachFilter = (root,fieldName,availableEntriesForThisFilter) => {
-        const filter = root.filters[fieldName]
-        for (let option of (filter?.list ?? filter.nodes)) {
-            if (typeof customCalculatebFromAvailableEntries == "function"){
-                // allow usage of custom function if available
-                root.$set(option,'nb',customCalculatebFromAvailableEntries(option,availableEntriesForThisFilter,root,fieldName))
-            } else {
-                root.$set(option,'nb',getEntriesForThisField(availableEntriesForThisFilter,fieldName,(values)=>values.some((value)=>value == option.value)).length)
-            }
-            root.$set(option,'count', option.nb)
-        }
-    }
-
-    const extractFormIdData = (fieldName,parentField,optionData) => {
-        if (!('listOfAssociatingForms' in parentField)){
-            parentField.listOfAssociatingForms = {}
-        }
-        parentField.childrenIds.forEach((id)=>{
-            if (!(id in parentField.listOfAssociatingForms)){
-                let associatingFormId = optionData.options[id].associatingFormId
-                if (associatingFormId.length > 0){
-                    parentField.listOfAssociatingForms[id] = {
-                        childId:id,
-                        id:associatingFormId,
-                        isForm:optionData.options[id].isForm,
-                        wantedFieldId:optionData.options[id].associatingFieldId
-                    }
-                }
-            }
-        })
-        return parentField.listOfAssociatingForms?.[fieldName]
-    }
-    const updateSecondLevelValues = (value,filterId,filterOption,childField,parentField,secondLevelValues,formModified,associations) =>{
-        const propName = filterOption?.name ?? filterId
-        parentField.secondLevelValues[value] = secondLevelValues[propName]
-        Object.entries(associations[propName]).forEach(([val,parentValue])=>{
-            if (!(val in childField.associations)){
-                childField.associations[val] = []
-            }
-            if (!childField.associations[val].includes(parentValue)){
-                childField.associations[val].push(parentValue)
-            }
-        })
-    }
-    const canGetSecondValuesByForm = (parentField,formIdData) => {
-        const res = parentField.isForm && (
-                !(formIdData?.id?.length > 0) // no associatingForm => form
-                || String(formIdData?.id) === String(parentField.linkedObjectId) // same as form for primary level
-            )
-        return res
-    }
-
-    const refreshOption = (filterId, filterOption,promisesData,root,optionData) => {
-        const field = utils.getFieldFromRoot(root,filterId)
-        if (field !== null && Object.keys(field).length > 0
-            && !(filterId in optionData.options)){
-            // start refresh
-            optionData.options[filterId] = {
-                status: 'refreshing',
-                linkedObjectId: '',
-                associations: {}
-            }
-            optionData.options[filterId] = {
-                ...optionData.options[filterId],
-                ...twoLevelsHelper.formatChildField(field)
-            }
-            const childField = optionData.options[filterId]
-            if ('parentFieldName' in childField && childField.parentFieldName.length > 0){
-                twoLevelsHelper.formatParentField(
-                    optionData.parents,
-                    childField,
-                    ()=>{
-                        return utils.getFieldFromRoot(root,childField.parentFieldName)
-                    }
-                )
-                if (childField.parentId in optionData.parents){
-                    const parentField = optionData.parents[childField.parentId]
-                    parentField.secondLevelValues = {}
-                    const optionsAsEntries = Object.entries(parentField.field.options)
-                    for (let index = 0; index < optionsAsEntries.length; index++) {
-                        const optionKey = optionsAsEntries[index][0]
-                        const values = [optionKey]
-                        const formIdData = extractFormIdData(filterId,parentField,optionData)
-                        if (canGetSecondValuesByForm(parentField,formIdData)){
-                            formPromisesManager.createPromise(promisesData,{
-                                formId: parentField.linkedObjectId,
-                                processFormAsync: async (form)=>{
-                                    return twoLevelsHelper.getAvailableSecondLevelsValues(form,parentField,values,optionData.options)
-                                        .then(([secondLevelValues,formModified,associations])=>{
-                                            updateSecondLevelValues(optionKey,filterId,filterOption,childField,parentField,secondLevelValues,formModified,associations)
-                                            return [secondLevelValues,formModified,associations]
-                                        })
-                                },
-                                getEntriesAsync: ()=>{
-                                    return twoLevelsHelper.getParentEntries(values)
-                                },
-                                getEntriesLabel: `getting parentEntries for ${JSON.stringify(values)}`}
-                            )
-                        } else {
-                            const formId = formIdData.id
-                            formPromisesManager.createPromise(promisesData,{
-                                formId,
-                                processFormAsync: async (form)=>{
-                                    return twoLevelsHelper.getAvailableSecondLevelsValuesForLists(
-                                        form,
-                                        parentField.field.propertyname,
-                                        parentField,
-                                        values,
-                                        formIdData,
-                                        optionData.options,
-                                        formIdData.isForm && formId === childField.linkedObjectId
-                                    )
-                                    .then(([secondLevelValues,formModified,associations])=>{
-                                        updateSecondLevelValues(optionKey,filterId,filterOption,childField,parentField,secondLevelValues,formModified,associations)
-                                        return [secondLevelValues,formModified,associations]
-                                    })
-                                },
-                                getEntriesAsync: ()=>{
-                                    return allEntriesLoader.load(formId)
-                                },
-                                getEntriesLabel: `getting all entries of form ${formId}`})
-                        }
-                    }
-                }
-            }
-        }
-    }
-    const refreshOptionsAsync = async (root) => {
-        try {
-            const optionData = utils.getOptionData(root)
-            if (!utils.isSubLevel(root)
-                || Object.keys(optionData?.options ?? null).length > 0){
-                return
-            }
-            const filters = root.filters // TODO check if get computedFilters
-            let promisesData = formPromisesManager.initPromisesData()
-            for (const filterId in filters) {
-                if (Object.hasOwnProperty.call(filters, filterId)) {
-                    const filter = filters[filterId];
-                    (filter?.list ?? filter?.nodes).forEach((filterOption)=>{
-                        const filterPropName = filterOption?.name ?? filter.propName
-                        if (!(filterPropName in optionData.options)){
-                            refreshOption(filterPropName,filterOption,promisesData,root,optionData)
-                        }
-                    })
-                }
-            }
-            if (promisesData.promises.length > 0){
-                await formPromisesManager.resolvePromises(promisesData)
-                // something could have changes
-                // trigger update entries
-                root.filteredEntries = [...root.filteredEntries]
-            }
-            
-            Object.keys(optionData.options).forEach((k)=>{
-                optionData.options[k].status = 'done'
-                // todo only update the right ones
-            })
-
-        } catch (error) {
-            console.error(error)
-        }
-    }
-
-    Vue.prototype.isDisplayedFilterOption = function(filterOption,root){
-        return root.params.autohidefilter === "false" // main param
-            || (!utils.canShowAnd(root) && filterOption.checked) // display if checked in all case
-            || (root.params.keepallparents !== "false" && filterOption.forceShow === true) // display if parentField of sublevel
-            || (filterOption.hide !== true && (filterOption?.nb ?? filterOption.count) > 0) // hide or at least one element
-    }
-    Vue.prototype.filterHasAtLeastOneOption = function(filter,root){
-        if (typeof customfilterHasAtLeastOneOption == "function"){
-            // allow usage of custom function if available
-            return customfilterHasAtLeastOneOption(filter,root)
-        } else {
-            return (filter?.list ?? filter.nodes).some((filterOption)=>Vue.prototype.isDisplayedFilterOption(filterOption,root));
-        }
-    }
-    Vue.component('FilterLoadRoot', FilterLoadRoot);
-    Vue.prototype.refreshedFiltersWithentries = function(entries,root){
-        refreshOptionsAsync(root)
-        const modeThanOneCheckedFiltersName = utils.getChekedFilters(root)
-        for(let fieldName in root.filters) {
-            let availableEntriesForThisFilter = root.searchedEntries;
-            if (root.params.template === "map"){
-                availableEntriesForThisFilter = availableEntriesForThisFilter.filter(entry => entry.bf_latitude && entry.bf_longitude)
-            }
-            if (modeThanOneCheckedFiltersName.includes(fieldName)){
-                modeThanOneCheckedFiltersName
-                    .filter(fName=>fName!=fieldName)
-                    .forEach((otherFieldName)=>{
-                        availableEntriesForThisFilter = getEntriesForThisField(
-                            availableEntriesForThisFilter,
-                            otherFieldName,
-                            (values)=>{
-                                const filter = root.filters[otherFieldName]
-                                return (filter?.list ?? filter.nodes).some((option)=>option.checked && values.some(value=>value == option.value))
-                            }
-                        )
-                });
-            } else {
-                availableEntriesForThisFilter = (root.params.template === "map")
-                    ? root.filteredEntries.filter(entry => entry.bf_latitude && entry.bf_longitude)
-                    : root.filteredEntries
-            }
-            availableEntriesForThisFilter = utils.filterEntriesSync(availableEntriesForThisFilter,root)
-            updateNbForEachFilter(root,fieldName,availableEntriesForThisFilter)
-            visibilityManager.updateVisibilityIfSublevel(root)
-        }
-        return root.filters;
-    };
+    vueConfigurator.init()
 }
\ No newline at end of file
diff --git a/javascripts/bazar/field.service.js b/javascripts/bazar/field.service.js
new file mode 100644
index 0000000..70742e7
--- /dev/null
+++ b/javascripts/bazar/field.service.js
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+const getEntriesForThisField = (entries,fieldName,test) => {
+    return entries.filter(entry => {
+        let entryValues = entry[fieldName]
+        if (!entryValues || typeof entryValues != "string"){
+            return
+        }
+        entryValues = entryValues.split(',')
+        return test(entryValues)
+    })
+}
+
+const canGetSecondValuesByForm = (parentField,formIdData) => {
+    const res = parentField.isForm && (
+            !(formIdData?.id?.length > 0) // no associatingForm => form
+            || String(formIdData?.id) === String(parentField.linkedObjectId) // same as form for primary level
+        )
+    return res
+}
+
+const extractFormIdData = (fieldName,parentField,optionData) => {
+    if (!('listOfAssociatingForms' in parentField)){
+        parentField.listOfAssociatingForms = {}
+    }
+    parentField.childrenIds.forEach((id)=>{
+        if (!(id in parentField.listOfAssociatingForms)){
+            let associatingFormId = optionData.options[id].associatingFormId
+            if (associatingFormId.length > 0){
+                parentField.listOfAssociatingForms[id] = {
+                    childId:id,
+                    id:associatingFormId,
+                    isForm:optionData.options[id].isForm,
+                    wantedFieldId:optionData.options[id].associatingFieldId
+                }
+            }
+        }
+    })
+    return parentField.listOfAssociatingForms?.[fieldName]
+}
+
+export default {
+    canGetSecondValuesByForm,
+    extractFormIdData,
+    getEntriesForThisField
+}
\ No newline at end of file
diff --git a/javascripts/bazar/filters.service.js b/javascripts/bazar/filters.service.js
index 613cb61..757efa8 100644
--- a/javascripts/bazar/filters.service.js
+++ b/javascripts/bazar/filters.service.js
@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  */
 
+import fieldService from './field.service.js'
+
 const getFilterFromPropName = (filterName, filters) => {
     return !(filterName?.length > 0)
         ? null
@@ -31,6 +33,20 @@ const getFilterFromPropName = (filterName, filters) => {
         )
 }
 
+const updateNbForEachFilter = (root,fieldName,availableEntriesForThisFilter) => {
+    const filter = root.filters[fieldName]
+    for (let option of (filter?.list ?? filter.nodes)) {
+        if (typeof customCalculatebFromAvailableEntries == "function"){
+            // allow usage of custom function if available
+            root.$set(option,'nb',customCalculatebFromAvailableEntries(option,availableEntriesForThisFilter,root,fieldName))
+        } else {
+            root.$set(option,'nb',fieldService.getEntriesForThisField(availableEntriesForThisFilter,fieldName,(values)=>values.some((value)=>value == option.value)).length)
+        }
+        root.$set(option,'count', option.nb)
+    }
+}
+
 export default {
-    getFilterFromPropName
+    getFilterFromPropName,
+    updateNbForEachFilter
 }
\ No newline at end of file
diff --git a/javascripts/bazar/options.service.js b/javascripts/bazar/options.service.js
new file mode 100644
index 0000000..67447e6
--- /dev/null
+++ b/javascripts/bazar/options.service.js
@@ -0,0 +1,153 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import allEntriesLoader from '../allEntriesLoader.service.js'
+import formPromisesManager from '../formPromises.service.js'
+import twoLevelsHelper from '../twolevels.js'
+import fieldService from './field.service.js'
+import utils from './RootVueJsComponentUtil.js'
+
+const updateSecondLevelValues = (value,filterId,filterOption,childField,parentField,secondLevelValues,associations) =>{
+    const propName = filterOption?.name ?? filterId
+    parentField.secondLevelValues[value] = secondLevelValues[propName]
+    Object.entries(associations[propName]).forEach(([val,parentValue])=>{
+        if (!(val in childField.associations)){
+            childField.associations[val] = []
+        }
+        if (!childField.associations[val].includes(parentValue)){
+            childField.associations[val].push(parentValue)
+        }
+    })
+}
+
+const createPromiseForForm = (promisesData, parentField, filterId, filterOption, childField, values, optionData, optionKey) => {
+    formPromisesManager.createPromise(promisesData,{
+        formId: parentField.linkedObjectId,
+        processFormAsync: async (form)=>{
+            return twoLevelsHelper.getAvailableSecondLevelsValues(form,parentField,values,optionData.options)
+                .then(([secondLevelValues,formModified,associations])=>{
+                    updateSecondLevelValues(optionKey,filterId,filterOption,childField,parentField,secondLevelValues,associations)
+                    return [secondLevelValues,formModified,associations]
+                })
+        },
+        getEntriesAsync: ()=>{
+            return twoLevelsHelper.getParentEntries(values)
+        },
+        getEntriesLabel: `getting parentEntries for ${JSON.stringify(values)}`}
+    )
+}
+
+const createPromiseForList = (promisesData, formIdData, parentField, filterId, filterOption, childField, values, optionData, optionKey) => {
+    
+    const formId = formIdData.id
+    formPromisesManager.createPromise(promisesData,{
+        formId,
+        processFormAsync: async (form)=>{
+            return twoLevelsHelper.getAvailableSecondLevelsValuesForLists(
+                form,
+                parentField.field.propertyname,
+                parentField,
+                values,
+                formIdData,
+                optionData.options,
+                formIdData.isForm && formId === childField.linkedObjectId
+            )
+            .then(([secondLevelValues,formModified,associations])=>{
+                updateSecondLevelValues(optionKey, filterId, filterOption, childField, parentField, secondLevelValues,associations)
+                return [secondLevelValues,formModified,associations]
+            })
+        },
+        getEntriesAsync: ()=>{
+            return allEntriesLoader.load(formId)
+        },
+        getEntriesLabel: `getting all entries of form ${formId}`})
+}
+
+const refreshOption = (filterId, filterOption,promisesData,root,optionData) => {
+    const field = utils.getFieldFromRoot(root,filterId)
+    if (field !== null && Object.keys(field).length > 0
+        && !(filterId in optionData.options)){
+        // start refresh
+        optionData.options[filterId] = {
+            status: 'refreshing',
+            linkedObjectId: '',
+            associations: {}
+        }
+        optionData.options[filterId] = {
+            ...optionData.options[filterId],
+            ...twoLevelsHelper.formatChildField(field)
+        }
+        const childField = optionData.options[filterId]
+        if ('parentFieldName' in childField && childField.parentFieldName.length > 0){
+            twoLevelsHelper.formatParentField(
+                optionData.parents,
+                childField,
+                ()=>{
+                    return utils.getFieldFromRoot(root,childField.parentFieldName)
+                }
+            )
+            if (childField.parentId in optionData.parents){
+                const parentField = optionData.parents[childField.parentId]
+                parentField.secondLevelValues = {}
+                const optionsAsEntries = Object.entries(parentField.field.options)
+                for (let index = 0; index < optionsAsEntries.length; index++) {
+                    const optionKey = optionsAsEntries[index][0]
+                    const values = [optionKey]
+                    const formIdData = fieldService.extractFormIdData(filterId,parentField,optionData)
+                    if (fieldService.canGetSecondValuesByForm(parentField,formIdData)){
+                        createPromiseForForm(promisesData, parentField, filterId, filterOption, childField, values, optionData, optionKey)
+                    } else {
+                        createPromiseForList(promisesData, formIdData, parentField, filterId, filterOption, childField, values, optionData, optionKey)
+                    }
+                }
+            }
+        }
+    }
+}
+
+const refreshOptionsAsync = async (root) => {
+    try {
+        const optionData = utils.getOptionData(root)
+        if (!utils.isSubLevel(root)
+            || Object.keys(optionData?.options ?? null).length > 0){
+            return
+        }
+        const filters = root.filters // TODO check if get computedFilters
+        let promisesData = formPromisesManager.initPromisesData()
+        for (const filterId in filters) {
+            if (Object.hasOwnProperty.call(filters, filterId)) {
+                const filter = filters[filterId];
+                (filter?.list ?? filter?.nodes).forEach((filterOption)=>{
+                    const filterPropName = filterOption?.name ?? filter.propName
+                    if (!(filterPropName in optionData.options)){
+                        refreshOption(filterPropName,filterOption,promisesData,root,optionData)
+                    }
+                })
+            }
+        }
+        if (promisesData.promises.length > 0){
+            await formPromisesManager.resolvePromises(promisesData)
+            // something could have changes
+            // trigger update entries
+            root.filteredEntries = [...root.filteredEntries]
+        }
+        
+        Object.keys(optionData.options).forEach((k)=>{
+            optionData.options[k].status = 'done'
+            // todo only update the right ones
+        })
+
+    } catch (error) {
+        console.error(error)
+    }
+}
+
+export default {
+    refreshOptionsAsync
+}
\ No newline at end of file
diff --git a/javascripts/bazar/vue.configurator.js b/javascripts/bazar/vue.configurator.js
new file mode 100644
index 0000000..d6634d6
--- /dev/null
+++ b/javascripts/bazar/vue.configurator.js
@@ -0,0 +1,75 @@
+/*
+ * This file is part of the YesWiki Extension twolevels.
+ *
+ * Authors : see README.md file that was distributed with this source code.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import fieldService from './field.service.js'
+import FilterLoadRoot from './FilterLoadRootComponent.js'
+import filtersService from './filters.service.js'
+import optionsManager from './options.service.js'
+import utils from './RootVueJsComponentUtil.js'
+import visibilityManager from './visibility.service.js'
+
+const isDisplayedFilterOption = (filterOption,root) => {
+    return root.params.autohidefilter === "false" // main param
+        || (!utils.canShowAnd(root) && filterOption.checked) // display if checked in all case
+        || (root.params.keepallparents !== "false" && filterOption.forceShow === true) // display if parentField of sublevel
+        || (filterOption.hide !== true && (filterOption?.nb ?? filterOption.count) > 0) // hide or at least one element
+}
+
+const filterHasAtLeastOneOption = (filter,root) => {
+    if (typeof window?.customfilterHasAtLeastOneOption == "function"){
+        // allow usage of custom function if available
+        return window.customfilterHasAtLeastOneOption(filter,root)
+    } else {
+        return (filter?.list ?? filter.nodes).some((filterOption)=>Vue.prototype.isDisplayedFilterOption(filterOption,root));
+    }
+}
+
+const refreshedFiltersWithentries = (entries,root) => {
+    optionsManager.refreshOptionsAsync(root)
+    const modeThanOneCheckedFiltersName = utils.getChekedFilters(root)
+    for(let fieldName in root.filters) {
+        let availableEntriesForThisFilter = root.searchedEntries;
+        if (root.params.template === "map"){
+            availableEntriesForThisFilter = availableEntriesForThisFilter.filter(entry => entry.bf_latitude && entry.bf_longitude)
+        }
+        if (modeThanOneCheckedFiltersName.includes(fieldName)){
+            modeThanOneCheckedFiltersName
+                .filter(fName=>fName!=fieldName)
+                .forEach((otherFieldName)=>{
+                    availableEntriesForThisFilter = fieldService.getEntriesForThisField(
+                        availableEntriesForThisFilter,
+                        otherFieldName,
+                        (values)=>{
+                            const filter = root.filters[otherFieldName]
+                            return (filter?.list ?? filter.nodes).some((option)=>option.checked && values.some(value=>value == option.value))
+                        }
+                    )
+            });
+        } else {
+            availableEntriesForThisFilter = (root.params.template === "map")
+                ? root.filteredEntries.filter(entry => entry.bf_latitude && entry.bf_longitude)
+                : root.filteredEntries
+        }
+        availableEntriesForThisFilter = utils.filterEntriesSync(availableEntriesForThisFilter,root)
+        filtersService.updateNbForEachFilter(root,fieldName,availableEntriesForThisFilter)
+        visibilityManager.updateVisibilityIfSublevel(root)
+    }
+    return root.filters;
+};
+
+const init = () => {
+    Vue.prototype.isDisplayedFilterOption = isDisplayedFilterOption
+    Vue.prototype.filterHasAtLeastOneOption = filterHasAtLeastOneOption
+    Vue.component('FilterLoadRoot', FilterLoadRoot)
+    Vue.prototype.refreshedFiltersWithentries = refreshedFiltersWithentries
+}
+
+export default {
+    init
+}
\ No newline at end of file

From 2ee72e86181b6b96e99df58a116123581cfa48f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 6 Aug 2024 11:34:24 +0200
Subject: [PATCH 17/18] fix(define-common): trouble about fielfId and infinite
 loop option.count

---
 javascripts/bazar/RootVueJsComponentUtil.js |  7 +++--
 javascripts/bazar/filters.service.js        | 32 +++++++++++++++++----
 javascripts/bazar/options.service.js        |  3 +-
 javascripts/bazar/vue.configurator.js       |  5 ++--
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/javascripts/bazar/RootVueJsComponentUtil.js b/javascripts/bazar/RootVueJsComponentUtil.js
index 1933d3b..fa60397 100644
--- a/javascripts/bazar/RootVueJsComponentUtil.js
+++ b/javascripts/bazar/RootVueJsComponentUtil.js
@@ -7,6 +7,7 @@
  * file that was distributed with this source code.
  */
 
+import filtersService from './filters.service.js'
 import optionRegistry from './options.registry.js'
 
 const canShowAnd = (root) => {
@@ -84,11 +85,11 @@ const pushIfNotPresent = (value,data) => {
 
 const getChekedFilters = (root) => {
     let filters = [];
-    for(let fieldName in root.filters) {
-        const filter = root.filters[fieldName]
+    for(let fieldid in root.filters) {
+        const filter = root.filters[fieldid]
         for (let option of (filter?.list ?? filter.nodes)) {
             if (option.checked) {
-                pushIfNotPresent(fieldName,{a:filters})
+                pushIfNotPresent(filtersService.getFieldName(filter,option),{a:filters})
             }
         }
     }
diff --git a/javascripts/bazar/filters.service.js b/javascripts/bazar/filters.service.js
index 757efa8..bb95ca7 100644
--- a/javascripts/bazar/filters.service.js
+++ b/javascripts/bazar/filters.service.js
@@ -33,20 +33,42 @@ const getFilterFromPropName = (filterName, filters) => {
         )
 }
 
+const getFieldName = (filter, filterOption = null) => {
+    return filterOption?.name ?? filter?.propName ?? filter?.list?.[0]?.name ?? null
+}
+
 const updateNbForEachFilter = (root,fieldName,availableEntriesForThisFilter) => {
-    const filter = root.filters[fieldName]
+    const filter = getFilterFromPropName(fieldName,root.filters)
     for (let option of (filter?.list ?? filter.nodes)) {
-        if (typeof customCalculatebFromAvailableEntries == "function"){
+        const nb = (typeof window?.customCalculatebFromAvailableEntries == "function")
             // allow usage of custom function if available
-            root.$set(option,'nb',customCalculatebFromAvailableEntries(option,availableEntriesForThisFilter,root,fieldName))
+            ? window.customCalculatebFromAvailableEntries(option,availableEntriesForThisFilter,root,fieldName)
+            : fieldService.getEntriesForThisField(
+                    availableEntriesForThisFilter,
+                    fieldName,
+                    (values) => values.some((value)=>value == option.value)
+                ).length
+        if ('nb' in option) {
+            // prevent infinite loop
+            if (option.nb != nb) {
+                option.nb = nb
+            }
+        } else {
+            root.$set(option,'nb',nb)
+        }
+        if ('count' in option) {
+            // prevent infinite loop
+            if (option.count != nb) {
+                option.count = nb
+            }
         } else {
-            root.$set(option,'nb',fieldService.getEntriesForThisField(availableEntriesForThisFilter,fieldName,(values)=>values.some((value)=>value == option.value)).length)
+            root.$set(option,'count', nb)
         }
-        root.$set(option,'count', option.nb)
     }
 }
 
 export default {
+    getFieldName,
     getFilterFromPropName,
     updateNbForEachFilter
 }
\ No newline at end of file
diff --git a/javascripts/bazar/options.service.js b/javascripts/bazar/options.service.js
index 67447e6..7ebc501 100644
--- a/javascripts/bazar/options.service.js
+++ b/javascripts/bazar/options.service.js
@@ -11,6 +11,7 @@ import allEntriesLoader from '../allEntriesLoader.service.js'
 import formPromisesManager from '../formPromises.service.js'
 import twoLevelsHelper from '../twolevels.js'
 import fieldService from './field.service.js'
+import filtersService from './filters.service.js'
 import utils from './RootVueJsComponentUtil.js'
 
 const updateSecondLevelValues = (value,filterId,filterOption,childField,parentField,secondLevelValues,associations) =>{
@@ -124,7 +125,7 @@ const refreshOptionsAsync = async (root) => {
             if (Object.hasOwnProperty.call(filters, filterId)) {
                 const filter = filters[filterId];
                 (filter?.list ?? filter?.nodes).forEach((filterOption)=>{
-                    const filterPropName = filterOption?.name ?? filter.propName
+                    const filterPropName = filtersService.getFieldName(filter,filterOption)
                     if (!(filterPropName in optionData.options)){
                         refreshOption(filterPropName,filterOption,promisesData,root,optionData)
                     }
diff --git a/javascripts/bazar/vue.configurator.js b/javascripts/bazar/vue.configurator.js
index d6634d6..d1475b5 100644
--- a/javascripts/bazar/vue.configurator.js
+++ b/javascripts/bazar/vue.configurator.js
@@ -33,11 +33,12 @@ const filterHasAtLeastOneOption = (filter,root) => {
 const refreshedFiltersWithentries = (entries,root) => {
     optionsManager.refreshOptionsAsync(root)
     const modeThanOneCheckedFiltersName = utils.getChekedFilters(root)
-    for(let fieldName in root.filters) {
+    for(let fieldId in root.filters) {
         let availableEntriesForThisFilter = root.searchedEntries;
         if (root.params.template === "map"){
             availableEntriesForThisFilter = availableEntriesForThisFilter.filter(entry => entry.bf_latitude && entry.bf_longitude)
         }
+        const fieldName = filtersService.getFieldName(root.filters[fieldId])
         if (modeThanOneCheckedFiltersName.includes(fieldName)){
             modeThanOneCheckedFiltersName
                 .filter(fName=>fName!=fieldName)
@@ -46,7 +47,7 @@ const refreshedFiltersWithentries = (entries,root) => {
                         availableEntriesForThisFilter,
                         otherFieldName,
                         (values)=>{
-                            const filter = root.filters[otherFieldName]
+                            const filter = filtersService.getFilterFromPropName(otherFieldName, root.filters)
                             return (filter?.list ?? filter.nodes).some((option)=>option.checked && values.some(value=>value == option.value))
                         }
                     )

From 79f293b6fb6b3523ef9de79c8020c066c3449374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dufraisse?=
 <jeremy.dufraisse-info@orange.fr>
Date: Tue, 6 Aug 2024 11:45:56 +0200
Subject: [PATCH 18/18] fix(filters.service): return filter instead of
 fieldName

---
 javascripts/bazar/filters.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascripts/bazar/filters.service.js b/javascripts/bazar/filters.service.js
index bb95ca7..7d05bea 100644
--- a/javascripts/bazar/filters.service.js
+++ b/javascripts/bazar/filters.service.js
@@ -14,7 +14,7 @@ const getFilterFromPropName = (filterName, filters) => {
         ? null
         : (
             filterName in filters
-            ? filterName
+            ? filters[filterName]
             : filters.reduce((previousFilter, filter) => {
                 return previousFilter !== null
                     ? previousFilter