exportStores/importStores and createTestingPinia

Author: MaxNumerique

composables/project_manager.js

@@ -1,7 +1,3 @@
-import { useAppStore } from "@/stores/app.js"
-import { useInfraStore } from "@ogw_f/stores/infra"
-import { viewer_call } from "@/composables/viewer_call.js"
-import { useGeodeStore } from "@/stores/geode.js"
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
@@ -13,10 +9,10 @@ export function useProjectManager() {
     geode.start_request()
     try {
       await useInfraStore().create_connection()
-      const snapshot = appStore.exportStore()
+      const snapshot = appStore.exportStores()
 
       const schema = back_schemas.opengeodeweb_back.project.export_project
-      const url = `${geode.base_url}${schema.route}`
+      const url = `${geode.base_url}${schema.$id}`
       const method = schema.methods[0]
 
       const response = await fetch(url, {
@@ -55,7 +51,7 @@ export function useProjectManager() {
         params: {},
       })
 
-      await appStore.importStore(snapshot)
+      await appStore.importStores(snapshot)
     } finally {
       geode.stop_request()
     }

package-lock.json

@@ -15,17 +15,17 @@ export const useAppStore = defineStore("app", () => {
     stores.push(store)
   }
 
-  function exportStore() {
+  function exportStores() {
     const snapshot = {}
     let exportCount = 0
 
     for (const store of stores) {
-      if (!store.exportStore) {
+      if (!store.exportStores) {
         continue
       }
       const storeId = store.$id
       try {
-        snapshot[storeId] = store.exportStore()
+        snapshot[storeId] = store.exportStores()
         exportCount++
       } catch (error) {
         console.error(`[AppStore] Error exporting store "${storeId}":`, error)
@@ -35,22 +35,22 @@ export const useAppStore = defineStore("app", () => {
     return snapshot
   }
 
-  async function importStore(snapshot) {
+  async function importStores(snapshot) {
     if (!snapshot) {
       console.warn("[AppStore] import called with invalid snapshot")
       return
     }
     let importedCount = 0
     const notFoundStores = []
     for (const store of stores) {
-      if (!store.importStore) continue
+      if (!store.importStores) continue
       const storeId = store.$id
       if (!snapshot[storeId]) {
         notFoundStores.push(storeId)
         continue
       }
       try {
-        await store.importStore(snapshot[storeId])
+        await store.importStores(snapshot[storeId])
         importedCount++
       } catch (error) {
         console.error(`[AppStore] Error importing store "${storeId}":`, error)
@@ -67,7 +67,7 @@ export const useAppStore = defineStore("app", () => {
   return {
     stores,
     registerStore,
-    exportStore,
-    importStore,
+    exportStores,
+    importStores,
   }
 })

stores/app.js

@@ -1,6 +1,5 @@
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
-import { viewer_call } from "@/composables/viewer_call.js"
 
 export const useDataBaseStore = defineStore("dataBase", () => {
   const treeview_store = useTreeviewStore()
@@ -135,11 +134,11 @@ export const useDataBaseStore = defineStore("dataBase", () => {
     return flat_indexes.filter((index) => index !== null)
   }
 
-  function exportStore() {
+  function exportStores() {
     return { db: JSON.parse(JSON.stringify(db)) }
   }
 
-  async function importStore(snapshot) {
+  async function importStores(snapshot) {
     const entries = snapshot?.db || {}
     const hybrid_store = useHybridViewerStore()
     await hybrid_store.initHybridViewer()
@@ -164,7 +163,7 @@ export const useDataBaseStore = defineStore("dataBase", () => {
     getSurfacesUuids,
     getBlocksUuids,
     getFlatIndexes,
-    exportStore,
-    importStore,
+    exportStores,
+    importStores,
   }
 })

stores/data_base.js

@@ -46,11 +46,11 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
     return modelStyleStore.modelMeshComponentVisibility(id, "Edge", null)
   }
 
-  function exportStore() {
+  function exportStores() {
     return { styles: dataStyleState.styles }
   }
 
-  async function importStore(snapshot) {
+  async function importStores(snapshot) {
     dataStyleState.styles = snapshot?.styles || {}
   }
 
@@ -60,8 +60,8 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
     setVisibility,
     setModelEdgesVisibility,
     modelEdgesVisibility,
-    exportStore,
-    importStore,
+    exportStores,
+    importStores,
     ...meshStyleStore,
     ...modelStyleStore,
   }

stores/data_style.js

@@ -192,11 +192,11 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     Object.keys(db).forEach((id) => delete db[id])
   }
 
-  function exportStore() {
+  function exportStores() {
     return { zScale: zScale.value }
   }
 
-  async function importStore(snapshot) {
+  async function importStores(snapshot) {
     const z_scale = snapshot?.zScale
     if (z_scale != null) {
       await setZScaling(z_scale)
@@ -215,7 +215,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     setContainer,
     zScale,
     clear,
-    exportStore,
-    importStore,
+    exportStores,
+    importStores,
   }
 })

stores/hybrid_viewer.js

@@ -17,19 +17,18 @@ export const useTreeviewStore = defineStore("treeview", () => {
     displayed_name,
     id,
     object_type,
-    autoSelect = true,
   ) {
     dataStyleStore.addDataStyle(id, geodeObject, object_type)
     const child = { title: displayed_name, id, object_type }
     for (let i = 0; i < items.value.length; i++) {
       if (items.value[i].title === geodeObject) {
         items.value[i].children.push(child)
-        if (autoSelect) selection.value.push(child)
+        selection.value.push(child)
         return
       }
     }
     items.value.push({ title: geodeObject, children: [child] })
-    if (autoSelect) selection.value.push(child)
+    selection.value.push(child)
   }
 
   function displayAdditionalTree(id) {
@@ -53,7 +52,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
     panelWidth.value = width
   }
 
-  function exportStore() {
+  function exportStores() {
     return {
       isAdditionnalTreeDisplayed: isAdditionnalTreeDisplayed.value,
       panelWidth: panelWidth.value,
@@ -64,7 +63,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
     }
   }
 
-  async function importStore(snapshot) {
+  async function importStores(snapshot) {
     selection.value = snapshot?.selection || []
     isAdditionnalTreeDisplayed.value =
       snapshot?.isAdditionnalTreeDisplayed || false
@@ -87,7 +86,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
     displayFileTree,
     toggleTreeView,
     setPanelWidth,
-    exportStore,
-    importStore,
+    exportStores,
+    importStores,
   }
 })

stores/treeview.js

@@ -5,8 +5,8 @@ import { useProjectManager } from "@/composables/project_manager.js"
 
 // Mocks
 const mockAppStore = {
-  exportStore: vi.fn(() => ({ projectName: "mockedProject" })),
-  importStore: vi.fn(),
+  exportStores: vi.fn(() => ({ projectName: "mockedProject" })),
+  importStores: vi.fn(),
 }
 const mockInfraStore = { create_connection: vi.fn() }
 
@@ -26,20 +26,12 @@ beforeEach(async () => {
   await geode_store.$reset()
   geode_store.base_url = ""
 })
-vi.mock("@/stores/geode.js", () => ({
-  useGeodeStore: () => ({
-    base_url: "http://localhost:5000",
-    start_request: vi.fn(),
-    stop_request: vi.fn(),
-    do_ping: vi.fn(),
-  }),
-}))
 
 vi.mock("@geode/opengeodeweb-back/opengeodeweb_back_schemas.json", () => ({
   default: {
     opengeodeweb_back: {
       project: {
-        export_project: { route: "/project/export_project", methods: ["POST"] },
+        export_project: { $id: "/project/export_project", methods: ["POST"] },
       },
     },
   },
@@ -71,7 +63,7 @@ describe("ProjectManager composable", () => {
     await exportProject()
 
     const app_store = useAppStore()
-    expect(app_store.exportStore).toHaveBeenCalled()
+    expect(app_store.exportStores).toHaveBeenCalled()
     expect(fetchSpy).toHaveBeenCalledTimes(1)
     expect(clickSpy).toHaveBeenCalled()
   })
@@ -88,6 +80,6 @@ describe("ProjectManager composable", () => {
 
     expect(infra_store.create_connection).toHaveBeenCalled()
     expect(viewer_call).toHaveBeenCalled()
-    expect(app_store.importStore).toHaveBeenCalled()
+    expect(app_store.importStores).toHaveBeenCalled()
   })
 })

tests/unit/composables/ProjectManager.nuxt.test.js

@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, test, vi } from "vitest"
-import { setActivePinia, createPinia } from "pinia"
+import { setActivePinia } from "pinia"
+import { createTestingPinia } from "@pinia/testing"
 import { useAppStore } from "@/stores/app.js"
 import { useDataBaseStore } from "@/stores/data_base.js"
 import { useTreeviewStore } from "@/stores/treeview.js"
@@ -23,10 +24,17 @@ vi.mock("@/stores/hybrid_viewer.js", () => ({
   }),
 }))
 
-beforeEach(() => setActivePinia(createPinia()))
+beforeEach(() => {
+  setActivePinia(
+    createTestingPinia({
+      stubActions: false,
+      createSpy: vi.fn,
+    }),
+  )
+})
 
 describe("Project import", () => {
-  test("app.importStore restores stores", async () => {
+  test("app.importStores restores stores", async () => {
     const stores = {
       app: useAppStore(),
       dataBase: useDataBaseStore(),
@@ -75,7 +83,7 @@ describe("Project import", () => {
       JSON.stringify(snapshot.dataStyle, null, 2),
     )
 
-    await stores.app.importStore(snapshot)
+    await stores.app.importStores(snapshot)
 
     console.log(
       "[TEST ProjectImport] Treeview items after import:",