@paris-ias/list 1.0.58 → 1.0.60

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@paris-ias/list",
   "configKey": "list",
-  "version": "1.0.58",
+  "version": "1.0.60",
   "builder": {
     "@nuxt/module-builder": "1.0.0",
     "unbuild": "3.5.0"

package/dist/runtime/components/list/atoms/ResetButton.vue

@@ -9,7 +9,7 @@
         icon
         class="ml-auto"
         v-bind="tooltip"
-        @click="rootStore.resetState()"
+        @click="rootStore.resetState(type)"
       >
         <v-icon>mdi-restore</v-icon>
       </v-btn>
@@ -19,7 +19,7 @@
 </template>
 
 <script setup>
-import { useNuxtApp } from "#imports";
+import { useNuxtApp, onMounted } from "#imports";
 import { useRootStore } from "../../../stores/root";
 const { $stores } = useNuxtApp();
 const rootStore = useRootStore();

package/dist/runtime/stores/root.d.ts

@@ -8,7 +8,7 @@ export declare const useRootStore: import("pinia").StoreDefinition<"rootStore",
     setBlankFilterLoad(type: string): void;
     setDefaults(): void;
     updateRouteQuery(type: string): void;
-    resetState(): void;
+    resetState(type: string): void;
     updateSort({ value, type }: {
         value: number[] | string[];
         type: string;

package/dist/runtime/stores/root.js

@@ -20,31 +20,31 @@ export const useRootStore = defineStore("rootStore", {
     }
   }),
   actions: {
-    setLoading(value, type2 = "") {
+    setLoading(value, type = "") {
       const { $stores } = useNuxtApp();
       this.loading = value;
-      if (type2.length) $stores[type2].loading = value;
+      if (type.length) $stores[type].loading = value;
     },
     setScrolled() {
       if (import.meta.browser) {
         this.scrolled = window.scrollY > 0;
       }
     },
-    saveFiltersToLocalStorage(type2) {
+    saveFiltersToLocalStorage(type) {
       const { $stores } = useNuxtApp();
-      const filters = $stores[type2].filters ?? {};
+      const filters = $stores[type].filters ?? {};
       const values = Object.fromEntries(
         Object.entries(filters).map(([key, filter]) => [key, filter.value])
       );
       const local = JSON.parse(localStorage.getItem("PARIS_IAS") || "{}");
-      local[`${type2}_filters`] = values;
+      local[`${type}_filters`] = values;
       localStorage.setItem("PARIS_IAS", JSON.stringify(local));
     },
-    loadRouteQuery(type2) {
+    loadRouteQuery(type) {
       const { $stores } = useNuxtApp();
       const { currentRoute } = useRouter();
       const query = currentRoute.value.query;
-      const filters = $stores[type2].filters;
+      const filters = $stores[type].filters;
       if (Object.keys(query)?.length) {
         Object.keys(query).forEach((filter) => {
           if (filter in filters) {
@@ -53,48 +53,48 @@ export const useRootStore = defineStore("rootStore", {
         });
       }
       console.log("query loaded");
-      this.setFiltersCount(type2);
+      this.setFiltersCount(type);
     },
-    loadFiltersFromLocalStorage(type2) {
+    loadFiltersFromLocalStorage(type) {
       const { $stores } = useNuxtApp();
       const local = JSON.parse(localStorage.getItem("PARIS_IAS") || "{}");
-      const saved = local[`${type2}_filters`] ?? null;
+      const saved = local[`${type}_filters`] ?? null;
       if (!saved) {
-        console.log(`[${type2}] Aucune donn\xE9e \xE0 restaurer.`);
+        console.log(`[${type}] Aucune donn\xE9e \xE0 restaurer.`);
         return;
       }
-      const filters = $stores[type2].filters ?? {};
+      const filters = $stores[type].filters ?? {};
       for (const [key, value] of Object.entries(saved)) {
         if (filters[key]) {
           filters[key].value = value;
         }
       }
-      this.setFiltersCount(type2);
-      this.updateRouteQuery(type2);
-      console.log(`[${type2}] Filtres restaur\xE9s depuis localStorage`, saved);
+      this.setFiltersCount(type);
+      this.updateRouteQuery(type);
+      console.log(`[${type}] Filtres restaur\xE9s depuis localStorage`, saved);
     },
-    setFiltersCount(type2) {
+    setFiltersCount(type) {
       const { $stores } = useNuxtApp();
-      const filters = $stores[type2].filters ?? {};
+      const filters = $stores[type].filters ?? {};
       const count = Object.values(filters).reduce((acc, filter) => {
         const value = filter?.value;
         const isEmpty = value === void 0 || value === null || Array.isArray(value) && value.length === 0 || typeof value === "string" && value.trim() === "";
         return isEmpty ? acc : acc + 1;
       }, 0);
-      $stores[type2].filtersCount = count;
+      $stores[type].filtersCount = count;
     },
-    setBlankFilterLoad(type2) {
+    setBlankFilterLoad(type) {
     },
     setDefaults() {
       const lang = localStorage.getItem("lang");
     },
-    updateRouteQuery(type2) {
+    updateRouteQuery(type) {
       const router = useRouter();
       const { $stores } = useNuxtApp();
       const routeQuery = {
         ...this.search ? { search: this.search } : {},
         ...this.page > 1 ? { page: this.page.toString() } : {},
-        ...Object.entries($stores[type2].filters).reduce(
+        ...Object.entries($stores[type].filters).reduce(
           (acc, [key, filter]) => {
             const value = filter?.value;
             console.log("valueStore", value);
@@ -110,7 +110,7 @@ export const useRootStore = defineStore("rootStore", {
       };
       router.replace({ query: routeQuery });
     },
-    resetState() {
+    resetState(type) {
       const { $stores } = useNuxtApp();
       $stores[type].$reset();
       console.log("resetState");
@@ -122,68 +122,68 @@ export const useRootStore = defineStore("rootStore", {
       this.skip = 0;
       this.numberOfPages = 0;
     },
-    updateSort({ value, type: type2 }) {
+    updateSort({ value, type }) {
       const { $stores } = useNuxtApp();
-      $stores[type2].sortBy = [value[0]];
-      $stores[type2].sortDesc = [value[1]];
+      $stores[type].sortBy = [value[0]];
+      $stores[type].sortDesc = [value[1]];
       this.page = 1;
-      this.updateLocalStorage(type2 + "_sort", value.join("_"));
-      this.update(type2);
+      this.updateLocalStorage(type + "_sort", value.join("_"));
+      this.update(type);
     },
-    updateView({ value, type: type2 }) {
+    updateView({ value, type }) {
       const { $stores } = useNuxtApp();
-      $stores[type2].view = {
-        ...$stores[type2].views[value],
+      $stores[type].view = {
+        ...$stores[type].views[value],
         name: value
       };
-      this.updateLocalStorage(type2 + "_view", value);
-      this.update(type2);
+      this.updateLocalStorage(type + "_view", value);
+      this.update(type);
     },
     updateLocalStorage(key, value) {
       const local = JSON.parse(localStorage.getItem("PARIS_IAS")) || {};
       local[key] = value;
       localStorage.setItem("PARIS_IAS", JSON.stringify(local));
     },
-    updateFilter(key, val, type2) {
+    updateFilter(key, val, type) {
       const { $stores } = useNuxtApp();
-      console.log("update filter: ", { key, val, type: type2 });
-      $stores[type2].filters[key].value = val;
-      this.setFiltersCount(type2);
-      this.saveFiltersToLocalStorage(type2);
-      this.updateRouteQuery(type2);
+      console.log("update filter: ", { key, val, type });
+      $stores[type].filters[key].value = val;
+      this.setFiltersCount(type);
+      this.saveFiltersToLocalStorage(type);
+      this.updateRouteQuery(type);
       this.page = 1;
-      this.update(type2);
+      this.update(type);
     },
-    updateItemsPerPage({ value, type: type2 }) {
+    updateItemsPerPage({ value, type }) {
       const { $stores } = useNuxtApp();
       this.page = 1;
-      $stores[type2].itemsPerPage = value;
-      this.update(type2);
+      $stores[type].itemsPerPage = value;
+      this.update(type);
     },
-    updatePage({ page, type: type2 }) {
+    updatePage({ page, type }) {
       this.page = page;
-      this.update(type2);
+      this.update(type);
     },
     async updateSearch({
-      type: type2 = "all",
+      type = "all",
       search = "",
       lang = "en"
     }) {
       this.search = search;
       this.setLoading(true);
-      await this.update(type2, lang);
+      await this.update(type, lang);
     },
-    async update(type2, lang = "en") {
+    async update(type, lang = "en") {
       const { $stores } = useNuxtApp();
       this.setLoading(true);
-      if (type2 !== "all") {
-        $stores[type2].loading = true;
+      if (type !== "all") {
+        $stores[type].loading = true;
       }
-      const itemsPerPage = type2 === "all" ? 3 : $stores[type2]?.itemsPerPage;
+      const itemsPerPage = type === "all" ? 3 : $stores[type]?.itemsPerPage;
       const filters = {};
-      if (type2 !== "all") {
-        for (const filter in $stores[type2].filters) {
-          const filterValue = $stores[type2].filters[filter]?.value;
+      if (type !== "all") {
+        for (const filter in $stores[type].filters) {
+          const filterValue = $stores[type].filters[filter]?.value;
           if (typeof filterValue !== "undefined" && filterValue?.length) {
             filters[filter] = filterValue;
           }
@@ -197,14 +197,14 @@ export const useRootStore = defineStore("rootStore", {
             // limit
             limit: itemsPerPage,
             // sort, array of keys and array of directions - to have x tie breakers if necessary
-            sortBy: type2 === "all" ? "searchScore" : $stores[type2].sortBy,
-            sortDesc: type2 === "all" ? -1 : $stores[type2].sortDesc > 0 ? true : false,
+            sortBy: type === "all" ? "searchScore" : $stores[type].sortBy,
+            sortDesc: type === "all" ? -1 : $stores[type].sortDesc > 0 ? true : false,
             // search (if set)
-            ...this.search?.length && type2 !== "all" && { search: this.search },
+            ...this.search?.length && type !== "all" && { search: this.search },
             // add the store module filters
             filters
           },
-          ...this.search?.length && type2 === "all" && { search: this.search },
+          ...this.search?.length && type === "all" && { search: this.search },
           appId: "iea",
           lang
         })
@@ -212,15 +212,15 @@ export const useRootStore = defineStore("rootStore", {
       args.options.filters = JSON.stringify(args.options.filters);
       let result = {};
       console.log("args: ", args);
-      console.log(`Fetching ${type2}`);
+      console.log(`Fetching ${type}`);
       const { $queries } = useNuxtApp();
       const { data, error } = await useAsyncQuery(
-        type2 === "all" ? SEARCH : $queries[type2].list,
+        type === "all" ? SEARCH : $queries[type].list,
         args
       );
       if (error.value) console.log(error.value);
-      const key = type2 === "all" ? "search" : "list" + type2.charAt(0).toUpperCase() + type2.slice(1);
-      if (type2 === "all") {
+      const key = type === "all" ? "search" : "list" + type.charAt(0).toUpperCase() + type.slice(1);
+      if (type === "all") {
         this.results = data?.value?.[key];
       } else {
         const items = data?.value?.[key]?.items ?? [];
@@ -232,13 +232,13 @@ export const useRootStore = defineStore("rootStore", {
             _path: `/${id}`
           }))
         };
-        $stores[type2].items = result["items"];
+        $stores[type].items = result["items"];
         const lastPage = Math.ceil(result.total / itemsPerPage);
-        this.setFiltersCount(type2);
-        this.setBlankFilterLoad(type2);
-        $stores[type2].numberOfPages = lastPage;
+        this.setFiltersCount(type);
+        this.setBlankFilterLoad(type);
+        $stores[type].numberOfPages = lastPage;
       }
-      this.setLoading(false, type2);
+      this.setLoading(false, type);
       return true;
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "license": "AGPL-3.0-only",
   "main": "./dist/module.mjs",
-  "version": "1.0.58",
+  "version": "1.0.60",
   "name": "@paris-ias/list",
   "repository": {
     "url": "git+https://github.com/IEA-Paris/list.git",