multi import data work arround

Author: MaxNumerique

composables/project_manager.js

@@ -33,26 +33,18 @@ export function useProjectManager() {
   async function importProjectFile(file) {
     geode.start_request()
     try {
-      console.log("[ProjectManager] Import start with file:", file?.name)
-
-      const infra = useInfraStore()
-      await infra.create_connection()
-      const schemaImport = back_schemas.opengeodeweb_back.import_project || {}
+      await useInfraStore().create_connection()
 
+      const schemaImport = back_schemas.opengeodeweb_back.import_project
       const form = new FormData()
-      form.append("file", file, file?.name || "project.zip")
+      form.append("file", file, file?.name)
 
       const result = await $fetch(schemaImport.$id, {
         baseURL: geode.base_url,
         method: "POST",
         body: form,
       })
-
       const snapshot = result?.snapshot ?? {}
-      console.log(
-        "[ProjectManager] snapshot keys:",
-        Object.keys(snapshot || {}),
-      )
 
       await viewer_call({
         schema: viewer_schemas.opengeodeweb_viewer.import_project,
@@ -65,18 +57,31 @@ export function useProjectManager() {
 
       const treeviewStore = useTreeviewStore()
       treeviewStore.isImporting = true
-      console.log("[ProjectManager] isImporting = true")
+      await treeviewStore.importStores(snapshot?.treeview)
+
+      const hybridViewerStore = useHybridViewerStore()
+      await hybridViewerStore.initHybridViewer()
+      hybridViewerStore.clear()
+
+      const snapshotDataBase = snapshot?.dataBase?.db || {}
+      const items = Object.entries(snapshotDataBase).map(([id, item]) => ({
+        id,
+        object_type: item.object_type,
+        geode_object: item.geode_object,
+        native_filename: item.native_filename,
+        viewable_filename: item.viewable_filename,
+        displayed_name: item.displayed_name,
+        vtk_js: { binary_light_viewable: item?.vtk_js?.binary_light_viewable },
+      }))
 
-      await appStore.importStores(snapshot)
-      console.log("[ProjectManager] stores imported")
+      await importWorkflowFromSnapshot(items)
 
       const dataStyleStore = useDataStyleStore()
+      await dataStyleStore.importStores(snapshot?.dataStyle)
       await dataStyleStore.applyAllStylesFromState()
-      console.log("[ProjectManager] styles applied")
 
       treeviewStore.finalizeImportSelection()
       treeviewStore.isImporting = false
-      console.log("[ProjectManager] isImporting = false")
     } finally {
       geode.stop_request()
     }

stores/data_base.js

@@ -190,7 +190,7 @@ export const useDataBaseStore = defineStore("dataBase", () => {
     getSurfacesUuids,
     getBlocksUuids,
     getFlatIndexes,
-    exportStores, // maintenant défini
+    exportStores,
     importStores,
   }
 })

stores/treeview.js

@@ -8,7 +8,6 @@ export const useTreeviewStore = defineStore("treeview", () => {
   const isTreeCollection = ref(false)
   const selectedTree = ref(null)
   const isImporting = ref(false)
-  // Buffer pour reconstruire la sélection après que les items soient recréés
   const pendingSelectionIds = ref([])
 
   // /** Functions **/
@@ -24,7 +23,6 @@ export const useTreeviewStore = defineStore("treeview", () => {
             sensitivity: "base",
           }),
         )
-        // Ne pas polluer la sélection pendant import; on la reconstruit ensuite
         if (!isImporting.value) {
           selection.value.push(child)
         }
@@ -65,28 +63,24 @@ export const useTreeviewStore = defineStore("treeview", () => {
       model_id: model_id.value,
       isTreeCollection: isTreeCollection.value,
       selectedTree: selectedTree.value,
-      // Exporter uniquement les IDs pour éviter les problèmes de référence
       selectionIds: selection.value.map((c) => c.id),
     }
   }
 
   async function importStores(snapshot) {
-    // Charger l’état UI
     isAdditionnalTreeDisplayed.value =
       snapshot?.isAdditionnalTreeDisplayed || false
     panelWidth.value = snapshot?.panelWidth || 300
     model_id.value = snapshot?.model_id || ""
     isTreeCollection.value = snapshot?.isTreeCollection || false
     selectedTree.value = snapshot?.selectedTree || null
 
-    // Bufferiser les IDs de sélection (compat v1: snapshot.selection -> ids)
     pendingSelectionIds.value =
       snapshot?.selectionIds ||
       (snapshot?.selection || []).map((c) => c.id) ||
       []
   }
 
-  // Appeler après import pour reconstruire la sélection à partir des items
   function finalizeImportSelection() {
     const ids = pendingSelectionIds.value || []
     const rebuilt = []

utils/file_import_workflow.js

@@ -6,13 +6,13 @@ import { useHybridViewerStore } from "../stores/hybrid_viewer"
 
 async function importWorkflow(files) {
   console.log("importWorkflow", { files })
-  const promise_array = []
-  for (const file of files) {
-    const { filename, geode_object } = file
+  const results = []
+  for (const { filename, geode_object } of files) {
     console.log({ filename }, { geode_object })
-    promise_array.push(importFile(filename, geode_object))
+    const id = await importFile(filename, geode_object)
+    results.push(id)
   }
-  return Promise.all(promise_array)
+  return results
 }
 
 async function importFile(filename, geode_object) {
@@ -53,12 +53,9 @@ async function importFile(filename, geode_object) {
     },
   })
 
-  await treeviewStore.addItem(geode_object, name, id, object_type)
-
-  console.log("after treeviewStore.addItem")
-
-  await hybridViewerStore.addItem(id)
-  console.log("after dataBaseStore.addItem")
+  // await treeviewStore.addItem(geode_object, name, id, object_type)
+  // await hybridViewerStore.addItem(id)
+  // console.log("after dataBaseStore.addItem")
 
   await dataStyleStore.addDataStyle(
     data._value.id,
@@ -79,4 +76,33 @@ async function importFile(filename, geode_object) {
   return data._value.id
 }
 
-export { importFile, importWorkflow }
+async function importWorkflowFromSnapshot(items) {
+  const dataBaseStore = useDataBaseStore()
+  const ids = []
+  for (const item of items) {
+    const {
+      id,
+      object_type,
+      geode_object,
+      native_filename,
+      viewable_filename,
+      displayed_name,
+      vtk_js,
+    } = item
+
+    await dataBaseStore.registerObject(id)
+    await dataBaseStore.addItem(id, {
+      object_type,
+      geode_object,
+      native_filename,
+      viewable_filename,
+      displayed_name,
+      vtk_js,
+    })
+
+    ids.push(id)
+  }
+  return ids
+}
+
+export { importFile, importWorkflow, importWorkflowFromSnapshot }