@paris-ias/list 1.0.156 → 1.0.158

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@paris-ias/list",
   "configKey": "list",
-  "version": "1.0.156",
+  "version": "1.0.158",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/runtime/components/events/View.vue

@@ -210,7 +210,7 @@
             >
               <v-expansion-panel
                 v-if="item.description"
-                :value="panel[0]"
+                :value="presentation"
                 class="border-thin text-black"
                 :color="key === accordeon ? 'light-grey' : 'white'"
               >
@@ -326,11 +326,11 @@ const props = defineProps({
   },
 })
 
-const panel = ref(["presentation"])
+const panel = ref("presentation")
 
 function redirectToMap(long, lat) {
   router.push(
-    `https://www.openstreetmap.org/?mlat=${lat}&amp;mlon=${long}#map=19/${lat}/${long}`,
+    `https://www.openstreetmap.org/?mlat=${lat}&amp;mlon=${long}#map=19/${lat}/${long}`
   )
 }
 </script>

package/dist/runtime/components/list/molecules/Filters.vue

@@ -45,7 +45,7 @@ const props = defineProps(["type", "expanded"])
 
 const ComponentName = (name) => {
   return resolveComponent(
-    "ListInputs" + capitalize($stores[props.type].filters[name].type),
+    "ListInputs" + capitalize($stores[props.type].filters[name].type)
   )
 }
 const getItems = (name) => {
@@ -60,7 +60,7 @@ const getItems = (name) => {
         title: i18n.t(
           props.type === "people" && name === "vintage"
             ? item
-            : `list.filters.${props.type}.${name}.${item}`,
+            : `list.filters.${props.type}.${name}.${item}`
         ),
         value: item,
       }))
@@ -73,7 +73,7 @@ const getItems = (name) => {
   }
   // TODO replace with package based values
   return Object.keys(
-    messages.value[locale.value].list.filters[props.type][name],
+    messages.value[locale.value].list.filters[props.type][name]
   )
     .filter((key) => key !== "label")
     .map((item) => ({
@@ -82,24 +82,52 @@ const getItems = (name) => {
     }))
 }
 
-const computeVisibility = (filterItem) => {
-  return (
-    // if anything is set in the visibility key
-    !$stores[props.type].filters[filterItem].visibility ||
-    $stores[props.type].filters[filterItem].visibility?.default ||
-    $stores[props.type].filters[filterItem].visibility?.switchIf.find(
-      // for each of the rules set in the switchIf key
-      (rule) => {
-        // we check if each of the condition are fulfilled
-        return Object.keys(rule).find((value, _index, _obj) => {
-          return $stores[props.type].filters[value].multiple
-            ? $stores[props.type].filters[value]?.value &&
-                $stores[props.type].filters[value]?.value.includes(rule[value])
-            : $stores[props.type].filters[value]?.value === rule[value]
-        })
-      },
-    )
-  )
+// const computeVisibility = (filterItem) => {
+//   return (
+//     // if anything is set in the visibility key
+//     !$stores[props.type].filters[filterItem].visibility ||
+//     $stores[props.type].filters[filterItem].visibility?.default ||
+//     $stores[props.type].filters[filterItem].visibility?.switchIf.find(
+//       // for each of the rules set in the switchIf key
+//       (rule) => {
+//         // we check if each of the condition are fulfilled
+//         return Object.keys(rule).find((value, _index, _obj) => {
+//           return $stores[props.type].filters[value].multiple
+//             ? $stores[props.type].filters[value]?.value &&
+//                 $stores[props.type].filters[value]?.value.includes(rule[value])
+//             : $stores[props.type].filters[value]?.value === rule[value]
+//         })
+//       },
+//     )
+//   )
+// }
+
+const computeVisibility = (filterKey) => {
+  const filters = $stores[props.type].filters
+  const show = filters?.[filterKey]?.show
+
+  if (!show) return true
+  if (show.default) return true
+  if (!Array.isArray(show.switchIf)) return false
+
+  const checkRule = (rule) =>
+    Object.entries(rule).every(([depKey, expected]) => {
+      const dep = filters?.[depKey]
+      if (!dep) return false
+      const cur = dep.value
+
+      if (dep.multiple) {
+        if (!Array.isArray(cur)) return false
+        return Array.isArray(expected)
+          ? expected.some((e) => cur.includes(e))
+          : cur.includes(expected)
+      }
+      return Array.isArray(expected) ? expected.includes(cur) : cur === expected
+    })
+
+  return show.disjonctive !== false
+    ? show.switchIf.some(checkRule)
+    : show.switchIf.every(checkRule)
 }
 </script>
 

package/package.json

@@ -1,14 +1,14 @@
 {
   "license": "AGPL-3.0-only",
   "main": "./dist/module.mjs",
-  "version": "1.0.156",
+  "version": "1.0.158",
   "name": "@paris-ias/list",
   "repository": {
     "url": "git+https://github.com/IEA-Paris/list.git",
     "type": "git"
   },
   "dependencies": {
-    "@paris-ias/trees": "^2.0.14"
+    "@paris-ias/trees": "^2.0.17"
   },
   "description": "Paris IAS List Module",
   "peerDependencies": {