@paris-ias/list 1.0.136 → 1.0.138

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

@@ -28,33 +28,34 @@ export declare const useRootStore: import("pinia").StoreDefinition<"rootStore",
     loadRouteQuery(type: string): void;
     setFiltersCount(type: string): void;
     updateRouteQuery(type: string): void;
-    resetState(type: string, lang?: string): Promise<void>;
-    updateSort({ value, type, lang, }: {
+    resetState(type: string, lang?: string): void;
+    updateSort({ value, type, }: {
         value: (number | string)[];
         type: string;
         lang?: string;
-    }): Promise<void>;
+    }): void;
     updateView({ value, type, lang, }: {
         value: string;
         type: string;
         lang?: string;
-    }): Promise<void>;
-    updateFilter(key: string, val: unknown, type: string, lang: string): Promise<void>;
+    }): void;
+    updateFilter(key: string, val: unknown, type: string, lang: string): void;
     updateItemsPerPage({ value, type, lang, }: {
         value: number;
         type: string;
         lang?: string;
-    }): Promise<void>;
+    }): void;
     updatePage({ page, type, lang, }: {
         page: number;
         type: string;
         lang?: string;
-    }): Promise<void>;
+    }): void;
     updateSearch({ type, search, lang, }: {
         type: string;
         search: string;
         lang: string;
-    }): Promise<void>;
-    update(type: string, lang?: string): Promise<boolean>;
+    }): void;
+    buildListVariables(type: string, lang?: string): any;
+    applyListResult(type: string, data: Record<string, any>, itemsPerPageOverride?: number): void;
 }>;
 export {};

package/dist/runtime/stores/root.js

@@ -1,10 +1,9 @@
 import { defineStore } from "pinia";
-import SEARCH from "../graphql/list/search.gql";
-import { useNuxtApp, useRouter, useAsyncQuery } from "#imports";
+import { useNuxtApp, useRouter } from "#imports";
 export const useRootStore = defineStore("rootStore", {
   state: () => ({
     scrolled: typeof window !== "undefined" ? window.scrollY > 0 : false,
-    loading: false,
+    loading: true,
     total: 0,
     skip: 0,
     page: 1,
@@ -27,11 +26,12 @@ export const useRootStore = defineStore("rootStore", {
   }),
   actions: {
     setLoading(value, type = "") {
-      console.log("setLoading", { value, type });
+      console.log("X - setLoading", { value, type });
       const { $stores } = useNuxtApp();
-      this.loading = value;
-      if (type.length && type !== "all" && $stores[type]) {
+      if (type.length && $stores[type]) {
         $stores[type].loading = value;
+      } else {
+        this.loading = value;
       }
     },
     setScrolled() {
@@ -40,29 +40,27 @@ export const useRootStore = defineStore("rootStore", {
       }
     },
     loadRouteQuery(type) {
-      console.log("loadRouteQuery", type);
-      const { $stores } = useNuxtApp();
+      console.log("0 - loadRouteQuery", type);
       const { currentRoute } = useRouter();
+      const { $stores } = useNuxtApp();
       const query = currentRoute.value.query;
       const filters = $stores[type]?.filters ?? {};
-      console.log("filters: ", filters);
       if (Object.keys(query)?.length) {
         Object.keys(query).forEach((filter) => {
           if (filter in filters) {
-            console.log("filter: ", filter, query[filter]);
             const queryValue = query[filter];
             if (typeof queryValue === "string") {
               filters[filter].value = filters[filter].multiple ? JSON.parse(queryValue) : queryValue;
             }
           } else {
-            console.log("unknown filter: ", filter);
           }
         });
       }
-      console.log("query loaded");
+      if (query.page && query.page > 1)
+        $stores[type].page = parseInt(query.page, 10) || 1;
     },
     setFiltersCount(type) {
-      console.log("setFiltersCount", type);
+      console.log("6- setFiltersCount", type);
       const { $stores } = useNuxtApp();
       const filters = $stores[type]?.filters ?? {};
       const count = Object.values(filters).reduce((acc, filter) => {
@@ -70,12 +68,10 @@ export const useRootStore = defineStore("rootStore", {
         const isEmpty = value === void 0 || value === null || Array.isArray(value) && value.length === 0 || typeof value === "string" && value.trim() === "";
         return isEmpty ? acc : acc + 1;
       }, 0);
-      if ($stores[type]) {
-        $stores[type].filtersCount = count;
-      }
+      $stores[type].filtersCount = count;
     },
     updateRouteQuery(type) {
-      console.log("updateRouteQuery", type);
+      console.log("5- updateRouteQuery", type);
       const router = useRouter();
       const { $stores } = useNuxtApp();
       const routeQuery = {
@@ -96,44 +92,19 @@ export const useRootStore = defineStore("rootStore", {
       };
       router.replace({ query: routeQuery });
     },
-    async resetState(type, lang = "en") {
+    resetState(type, lang = "en") {
+      console.log("Y - resetState", { type, lang });
       const { $stores, $models } = useNuxtApp();
-      const moduleState = $stores[type];
-      const model = $models[type];
-      if (moduleState && model) {
-        const clone = (o) => typeof structuredClone === "function" ? structuredClone(o) : JSON.parse(JSON.stringify(o));
-        moduleState.search = "";
-        moduleState.filters = clone(model.filters ?? {});
-        moduleState.view = model.views ? {
-          ...clone(model.views[Object.keys(model.views)[0]]),
-          name: Object.keys(model.views)[0]
-        } : void 0;
-        moduleState.sortBy = clone(model.sortBy ?? ["date"]);
-        moduleState.sortDesc = clone(model.sortDesc ?? [0]);
-        moduleState.itemsPerPage = model.itemsPerPage ?? 10;
-        moduleState.items = [];
-        moduleState.total = 0;
-        moduleState.numberOfPages = 0;
-        moduleState.loading = false;
-      }
-      this.$patch({
-        search: "",
-        page: 1,
-        scrolled: false,
-        loading: false,
-        total: 0,
-        skip: 0,
-        numberOfPages: 0
-      });
-      this.updateRouteQuery(type);
-      await this.update(type, lang);
+      const model = structuredClone($models[type]);
+      $stores[type].filters = model?.filters;
+      $stores[type].search = "";
+      $stores[type].page = 1;
     },
-    async updateSort({
+    updateSort({
       value,
-      type,
-      lang = "en"
+      type
     }) {
-      console.log("updateSort", {
+      console.log("Z - updateSort", {
         value,
         type
       });
@@ -143,97 +114,100 @@ export const useRootStore = defineStore("rootStore", {
         $stores[type].sortDesc = [Number(value[1])];
       }
       this.page = 1;
-      await this.update(type, lang);
+      $stores[type].loading = true;
+      this.updateRouteQuery(type);
     },
-    async updateView({
+    updateView({
       value,
       type,
       lang
     }) {
-      console.log("updateView", { value, type });
+      console.log("W - updateView", { value, type });
       const { $stores } = useNuxtApp();
       if ($stores[type]?.views?.[value]) {
         $stores[type].view = {
           ...$stores[type].views[value],
           name: value
         };
+        $stores[type].loading = true;
       }
-      await this.update(type, lang);
+      this.updateRouteQuery(type);
     },
     /*     updateLocalStorage(key: string, value: string): void {
       const local = JSON.parse(localStorage.getItem("PARIS_IAS") || "{}")
       local[key] = value
       localStorage.setItem("PARIS_IAS", JSON.stringify(local))
     }, */
-    async updateFilter(key, val, type, lang) {
+    updateFilter(key, val, type, lang) {
       const { $stores } = useNuxtApp();
-      console.log("update filter: ", { key, val, type });
+      console.log("R - update filter: ", { key, val, type });
       if ($stores[type]?.filters?.[key]) {
         $stores[type].filters[key].value = val;
       }
       this.page = 1;
-      await this.update(type, lang);
+      $stores[type].loading = true;
+      this.setFiltersCount(type);
+      this.updateRouteQuery(type);
     },
-    async updateItemsPerPage({
+    updateItemsPerPage({
       value,
       type,
       lang
     }) {
-      console.log("updateItemsPerPage", { value, type });
+      console.log("H - updateItemsPerPage", { value, type });
       const { $stores } = useNuxtApp();
       this.page = 1;
-      if ($stores[type]) {
-        $stores[type].itemsPerPage = value;
-      }
-      await this.update(type, lang);
+      $stores[type].itemsPerPage = value;
+      $stores[type].loading = true;
+      this.updateRouteQuery(type);
     },
-    async updatePage({
+    updatePage({
       page,
       type,
       lang = "en"
     }) {
-      console.log("updatePage", { page, type });
+      console.log("update page: ", page);
       const router = useRouter();
       const currentQuery = router.currentRoute.value.query;
       const newQuery = { ...currentQuery };
+      if (type !== "all") {
+        const { $stores } = useNuxtApp();
+        $stores[type].page = page;
+        $stores[type].loading = true;
+      } else {
+        this.page = page;
+      }
       if (page > 1) {
         newQuery.page = page.toString();
       } else {
         delete newQuery.page;
       }
-      this.page = page;
-      await this.update(type, lang);
+      router.replace({ query: newQuery });
     },
-    /* 
-    initializePageFromRoute(): void {
-      const { query } = useRouter().currentRoute.value
-      const page = Number.parseInt(query.page as string, 10)
-      this.page = isNaN(page) || page < 1 ? 1 : page
-    }, */
-    async updateSearch({
+    updateSearch({
       type = "all",
       search = "",
       lang = "en"
     }) {
-      const { $stores } = useNuxtApp();
-      console.log("updateSearch", { type, search, lang });
       if (type === "all") {
         this.search = search;
       } else {
+        const { $stores } = useNuxtApp();
         if ($stores[type]) {
-          $stores[type].$patch({ search });
+          ;
+          $stores[type].search = search;
+          $stores[type].loading = true;
         }
       }
-      await this.update(type, lang);
+      this.page = 1;
+      this.updateRouteQuery(type);
     },
-    async update(type, lang = "en") {
-      const { $stores, $queries } = useNuxtApp();
-      console.log("update", { type, lang });
-      this.setLoading(true);
-      if (type !== "all" && $stores[type]) {
-        $stores[type].loading = true;
-      }
+    buildListVariables(type, lang = "en") {
+      const { $stores } = useNuxtApp();
       const itemsPerPage = type === "all" ? 3 : $stores[type]?.itemsPerPage || 10;
+      const _viewName = $stores[type]?.view && $stores[type].view.name;
+      const _sortByName = $stores[type]?.sortBy && $stores[type].sortBy;
+      const _sortDescName = $stores[type]?.sortDesc && $stores[type].sortDesc;
       const filters = {};
       if (type !== "all") {
         const storeFilters = $stores[type]?.filters ?? {};
@@ -247,16 +221,11 @@ export const useRootStore = defineStore("rootStore", {
       const args = JSON.parse(
         JSON.stringify({
           options: {
-            // skip
-            skip: +this.page === 1 ? 0 : (+this.page - 1) * itemsPerPage,
-            // limit
+            skip: +$stores[type]?.page === 1 ? 0 : (+$stores[type]?.page - 1) * itemsPerPage,
             limit: itemsPerPage,
-            // sort, array of keys and array of directions - to have x tie breakers if necessary
             sortBy: type === "all" ? "searchScore" : $stores[type]?.sortBy || ["created"],
             sortDesc: type === "all" ? -1 : ($stores[type]?.sortDesc?.[0] || 0) > 0 ? true : false,
-            // search (if set)
             ...this.search?.length && type !== "all" && { search: this.search },
-            // add the store module filters
             filters
           },
           ...type === "all" && this.search?.length && { search: this.search },
@@ -268,36 +237,31 @@ export const useRootStore = defineStore("rootStore", {
         })
       );
       args.options.filters = JSON.stringify(args.options.filters);
-      console.log("args: ", args);
-      const { data, error } = await useAsyncQuery(
-        type === "all" ? SEARCH : $queries[type]?.list,
-        args
-      );
-      console.log("data: ", data);
-      if (error.value) console.log(error.value);
+      return args;
+    },
+    applyListResult(type, data, itemsPerPageOverride) {
+      const { $stores } = useNuxtApp();
       const key = type === "all" ? "search" : "list" + type.charAt(0).toUpperCase() + type.slice(1);
       if (type === "all") {
-        this.results = data?.value?.[key] || this.results;
-      } else {
-        const items = data?.value?.[key]?.items ?? [];
-        if ($stores[type]) {
-          $stores[type].total = data?.value?.[key]?.total || 0;
-          const result = {
-            ...data?.value?.[key],
-            items: items.map(({ id, ...rest }) => ({
-              ...rest,
-              _path: `/${id}`
-            }))
-          };
-          $stores[type].items = result.items;
-          const lastPage = Math.ceil((result.total || 0) / itemsPerPage);
-          this.setFiltersCount(type);
-          $stores[type].numberOfPages = lastPage;
-        }
+        this.results = data?.[key] || this.results;
+        return;
+      }
+      const items = data?.[key]?.items ?? [];
+      if ($stores[type]) {
+        const itemsPerPage = itemsPerPageOverride || $stores[type].itemsPerPage || 10;
+        $stores[type].total = data?.[key]?.total || 0;
+        const result = {
+          ...data?.[key],
+          items: items.map(({ id, ...rest }) => ({
+            ...rest,
+            _path: `/${id}`
+          }))
+        };
+        $stores[type].items = result.items;
+        const lastPage = Math.ceil((result.total || 0) / itemsPerPage);
+        this.setFiltersCount(type);
+        $stores[type].numberOfPages = lastPage;
       }
-      this.updateRouteQuery(type);
-      this.setLoading(false, type);
-      return true;
     }
   }
 });

package/package.json

@@ -1,14 +1,14 @@
 {
   "license": "AGPL-3.0-only",
   "main": "./dist/module.mjs",
-  "version": "1.0.136",
+  "version": "1.0.138",
   "name": "@paris-ias/list",
   "repository": {
     "url": "git+https://github.com/IEA-Paris/list.git",
     "type": "git"
   },
   "dependencies": {
-    "@paris-ias/data": "^1.8.52"
+    "@paris-ias/data": "^1.8.54"
   },
   "description": "Paris IAS List Module",
   "peerDependencies": {
@@ -19,7 +19,6 @@
     "@nuxt/module-builder": "^0.8.4",
     "@nuxt/schema": "^3.16.2",
     "@nuxt/test-utils": "^3.17.2",
-    "@nuxtjs/apollo": "^5.0.0-alpha.14",
     "@nuxtjs/i18n": "^9.5.2",
     "@nuxtjs/mdc": "0.16.1",
     "@pinia/nuxt": "^0.5.4",
@@ -69,6 +68,6 @@
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
   "devDependencies": {
-    "@nuxt/devtools": "^2.6.3"
+    "@nuxtjs/apollo": "^5.0.0-alpha.15"
   }
 }