@geode/opengeodeweb-front 9.11.0-rc.7 → 9.11.0-rc.9

package/internal_stores/mesh/polyhedra.js

@@ -27,7 +27,7 @@ export function useMeshPolyhedraStyle() {
 
   /** Actions **/
   function setPolyhedraVisibility(id, visibility) {
-    viewer_call(
+    return viewer_call(
       {
         schema: mesh_polyhedra_schemas.visibility,
         params: { id, visibility },
@@ -60,7 +60,7 @@ export function useMeshPolyhedraStyle() {
     )
   }
   function setPolyhedraColor(id, color) {
-    viewer_call(
+    return viewer_call(
       {
         schema: mesh_polyhedra_schemas.color,
         params: { id, color },
@@ -78,7 +78,7 @@ export function useMeshPolyhedraStyle() {
   }
 
   function setPolyhedraVertexAttribute(id, vertex_attribute) {
-    viewer_call(
+    return viewer_call(
       {
         schema: mesh_polyhedra_schemas.vertex_attribute,
         params: { id, ...vertex_attribute },
@@ -96,7 +96,7 @@ export function useMeshPolyhedraStyle() {
   }
 
   function setPolyhedraPolyhedronAttribute(id, polyhedron_attribute) {
-    viewer_call(
+    return viewer_call(
       {
         schema: mesh_polyhedra_schemas.polyhedron_attribute,
         params: { id, ...polyhedron_attribute },
@@ -115,8 +115,10 @@ export function useMeshPolyhedraStyle() {
   }
 
   function applyPolyhedraStyle(id, style) {
-    setPolyhedraVisibility(id, style.visibility)
-    setPolyhedraActiveColoring(id, style.coloring.active)
+    return Promise.all([
+      setPolyhedraVisibility(id, style.visibility),
+      setPolyhedraActiveColoring(id, style.coloring.active),
+    ])
   }
 
   return {

package/internal_stores/model/blocks.js

@@ -15,7 +15,7 @@ export function useBlocksStyle() {
   /** Actions **/
   function setBlockVisibility(id, block_ids, visibility) {
     const block_flat_indexes = dataBaseStore.getFlatIndexes(id, block_ids)
-    viewer_call(
+    return viewer_call(
       {
         schema: blocks_schemas.visibility,
         params: { id, block_ids: block_flat_indexes, visibility },

package/internal_stores/model/corners.js

@@ -14,7 +14,7 @@ export function useCornersStyle() {
   /** Actions **/
   function setCornerVisibility(id, corner_ids, visibility) {
     const corner_flat_indexes = dataBaseStore.getFlatIndexes(id, corner_ids)
-    viewer_call(
+    return viewer_call(
       {
         schema: corners_schemas.visibility,
         params: { id, block_ids: corner_flat_indexes, visibility },

package/internal_stores/model/edges.js

@@ -9,14 +9,7 @@ export function useModelEdgesStyle() {
   }
 
   function setModelEdgesVisibility(id, visibility) {
-    if (!dataStyleStore.styles[id]) {
-      dataStyleStore.styles[id] = {}
-    }
-    if (!dataStyleStore.styles[id].edges) {
-      dataStyleStore.styles[id].edges = {}
-    }
-
-    viewer_call(
+    return viewer_call(
       {
         schema: model_edges_schemas.visibility,
         params: { id, visibility },

package/internal_stores/model/index.js

@@ -63,7 +63,7 @@ export default function useModelStyle() {
   }
 
   function setModelVisibility(id, visibility) {
-    viewer_call(
+    return viewer_call(
       {
         schema: viewer_schemas.opengeodeweb_viewer.model.visibility,
         params: { id, visibility },

package/internal_stores/model/lines.js

@@ -18,7 +18,7 @@ export function useLinesStyle() {
   /** Actions **/
   function setLineVisibility(id, line_ids, visibility) {
     const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
-    viewer_call(
+    return viewer_call(
       {
         schema: lines_schemas.visibility,
         params: { id, block_ids: line_flat_indexes, visibility },
@@ -38,7 +38,7 @@ export function useLinesStyle() {
 
   function setLineColor(id, line_ids, color) {
     const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
-    viewer_call(
+    return viewer_call(
       {
         schema: lines_schemas.color,
         params: { id, block_ids: line_flat_indexes, color },

package/internal_stores/model/points.js

@@ -12,7 +12,7 @@ export function useModelPointsStyle() {
   }
 
   function setModelPointsVisibility(id, visibility) {
-    viewer_call(
+    return viewer_call(
       {
         schema: model_points_schemas.visibility,
         params: { id, visibility },
@@ -27,7 +27,7 @@ export function useModelPointsStyle() {
   }
 
   function setModelPointsSize(id, size) {
-    viewer_call(
+    return viewer_call(
       {
         schema: model_points_schemas.size,
         params: { id, size },

package/internal_stores/model/surfaces.js

@@ -14,7 +14,7 @@ export function useSurfacesStyle() {
   /** Actions **/
   function setSurfaceVisibility(id, surface_ids, visibility) {
     const surface_flat_indexes = dataBaseStore.getFlatIndexes(id, surface_ids)
-    viewer_call(
+    return viewer_call(
       {
         schema: surfaces_schemas.visibility,
         params: { id, block_ids: surface_flat_indexes, visibility },

package/package.json

@@ -2,16 +2,19 @@
   "name": "@geode/opengeodeweb-front",
   "scripts": {
     "lint": "eslint --fix --ext .js,.vue --ignore-path .gitignore .",
-    "test": "vitest",
-    "coverage": "vitest run --coverage",
+    "test": "npm run test:unit",
+    "tests": "vitest --config ./tests/vitest.config.js",
+    "test:unit": "npm run tests --project unit",
+    "test:integration": "npm run tests --project integration",
     "geode_objects": "node scripts/generate_geode_objects.js && prettier ./assets/geode_objects.js --write",
     "build": ""
   },
   "devDependencies": {
-    "@nuxt/test-utils": "3.18.0",
+    "@nuxt/test-utils": "3.19.2",
     "@pinia/testing": "0.1.7",
     "@vitejs/plugin-vue": "5.2.3",
     "@vue/test-utils": "2.4.6",
+    "electron": "36.4.0",
     "eslint": "9.26.0",
     "eslint-plugin-import": "2.31.0",
     "eslint-plugin-nuxt": "4.0.0",
@@ -21,13 +24,15 @@
     "eslint-plugin-vuetify": "2.5.2",
     "happy-dom": "17.4.6",
     "jsdom": "26.1.0",
+    "msw": "2.11.1",
     "nuxt": "3.13.2",
     "playwright-core": "1.52.0",
     "prettier": "3.3.3",
     "resize-observer-polyfill": "1.5.1",
+    "unplugin-auto-import": "^20.0.0",
     "vite": "6.3.5",
     "vite-plugin-vuetify": "2.1.1",
-    "vitest": "3.1.2",
+    "vitest": "3.2.4",
     "vitest-environment-nuxt": "1.0.1"
   },
   "overrides": {
@@ -35,7 +40,7 @@
   },
   "description": "OpenSource Vue/Vuetify framework for web applications",
   "type": "module",
-  "version": "9.11.0-rc.7",
+  "version": "9.11.0-rc.9",
   "main": "./nuxt.config.js",
   "dependencies": {
     "@geode/opengeodeweb-back": "latest",
@@ -47,10 +52,12 @@
     "@vueuse/components": "13.1.0",
     "@vueuse/nuxt": "13.1.0",
     "ajv": "8.17.1",
+    "get-port-please": "3.2.0",
     "is-electron": "2.2.2",
     "js-file-download": "0.4.12",
     "nuxt": "3.13.2",
-    "pinia": "2.3.1",
+    "pidtree": "0.6.0",
+    "pinia": "3.0.3",
     "sass": "1.87.0",
     "semver": "7.7.1",
     "uuid": "11.1.0",

package/stores/data_base.js

@@ -1,7 +1,8 @@
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
 export const useDataBaseStore = defineStore("dataBase", () => {
-  const treeview_store = use_treeview_store()
+  const treeview_store = useTreeviewStore()
   const hybridViewerStore = useHybridViewerStore()
 
   /** State **/
@@ -41,6 +42,12 @@ export const useDataBaseStore = defineStore("dataBase", () => {
   }
 
   /** Actions **/
+  async function registerObject(id, file_name, viewer_object) {
+    return viewer_call({
+      schema: viewer_schemas.opengeodeweb_viewer.generic.register,
+      params: { id, file_name, viewer_object },
+    })
+  }
   async function addItem(
     id,
     value = {
@@ -137,6 +144,7 @@ export const useDataBaseStore = defineStore("dataBase", () => {
     itemMetaDatas,
     meshComponentType,
     formatedMeshComponents,
+    registerObject,
     addItem,
     fetchUuidToFlatIndexDict,
     fetchMeshComponents,

package/stores/data_style.js

@@ -12,21 +12,22 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
   /** Actions **/
   function addDataStyle(id, geode_object, object_type) {
     dataStyleState.styles[id] = getDefaultStyle(geode_object)
-
     if (object_type === "mesh") {
-      meshStyleStore.applyMeshDefaultStyle(id)
+      return Promise.all([meshStyleStore.applyMeshDefaultStyle(id)])
     } else if (object_type === "model") {
-      modelStyleStore.setMeshComponentsDefaultStyle(id)
-      modelStyleStore.applyModelDefaultStyle(id)
+      return Promise.all([
+        modelStyleStore.setMeshComponentsDefaultStyle(id),
+        modelStyleStore.applyModelDefaultStyle(id),
+      ])
     }
   }
 
   function setVisibility(id, visibility) {
     const object_type = dataBaseStore.itemMetaDatas(id).object_type
     if (object_type === "mesh") {
-      meshStyleStore.setMeshVisibility(id, visibility)
+      return Promise.all([meshStyleStore.setMeshVisibility(id, visibility)])
     } else if (object_type === "model") {
-      modelStyleStore.setModelVisibility(id, visibility)
+      return Promise.all([modelStyleStore.setModelVisibility(id, visibility)])
     }
   }
 

package/stores/feedback.js

@@ -1,6 +1,6 @@
 import { v4 as uuidv4 } from "uuid"
 
-export const use_feedback_store = defineStore("feedback", {
+export const useFeedbackStore = defineStore("feedback", {
   state: () => ({
     feedbacks: [],
     server_error: false,

package/stores/geode.js

@@ -1,7 +1,7 @@
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import Status from "@ogw_f/utils/status.js"
 
-export const use_geode_store = defineStore("geode", {
+export const useGeodeStore = defineStore("geode", {
   state: () => ({
     default_local_port: "5000",
     request_counter: 0,
@@ -9,13 +9,13 @@ export const use_geode_store = defineStore("geode", {
   }),
   getters: {
     protocol() {
-      if (use_infra_store().app_mode == appMode.appMode.CLOUD) {
+      if (useInfraStore().app_mode == appMode.appMode.CLOUD) {
         return "https"
       }
       return "http"
     },
     port() {
-      if (use_infra_store().app_mode == appMode.appMode.CLOUD) {
+      if (useInfraStore().app_mode == appMode.appMode.CLOUD) {
         return "443"
       }
       const GEODE_PORT = useRuntimeConfig().public.GEODE_PORT
@@ -25,7 +25,7 @@ export const use_geode_store = defineStore("geode", {
       return this.default_local_port
     },
     base_url() {
-      const infra_store = use_infra_store()
+      const infra_store = useInfraStore()
       let geode_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
       if (infra_store.app_mode == appMode.appMode.CLOUD) {
         if (infra_store.ID == "") {
@@ -49,7 +49,7 @@ export const use_geode_store = defineStore("geode", {
     },
     do_ping() {
       const geode_store = this
-      const feedback_store = use_feedback_store()
+      const feedback_store = useFeedbackStore()
       return useFetch(back_schemas.opengeodeweb_back.ping.$id, {
         baseURL: this.base_url,
         method: back_schemas.opengeodeweb_back.ping.methods[0],

package/stores/hybrid_viewer.js

@@ -8,7 +8,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 import Status from "@ogw_f/utils/status.js"
 
 export const useHybridViewerStore = defineStore("hybridViewer", () => {
-  const viewer_store = use_viewer_store()
+  const viewer_store = useViewerStore()
   const db = reactive({})
   const status = ref(Status.NOT_CREATED)
   const camera_options = reactive({})

package/stores/infra.js

@@ -1,7 +1,7 @@
 import { useStorage } from "@vueuse/core"
 import Status from "@ogw_f/utils/status.js"
 
-export const use_infra_store = defineStore("infra", {
+export const useInfraStore = defineStore("infra", {
   state: () => ({
     app_mode: getAppMode(),
     ID: useStorage("ID", ""),
@@ -16,7 +16,7 @@ export const use_infra_store = defineStore("infra", {
       return "localhost"
     },
     lambda_url() {
-      const geode_store = use_geode_store()
+      const geode_store = useGeodeStore()
       const public_runtime_config = useRuntimeConfig().public
       const url =
         geode_store.protocol +
@@ -31,12 +31,12 @@ export const use_infra_store = defineStore("infra", {
     },
     microservices_connected() {
       return (
-        use_geode_store().status == Status.CONNECTED &&
-        use_viewer_store().status == Status.CONNECTED
+        useGeodeStore().status == Status.CONNECTED &&
+        useViewerStore().status == Status.CONNECTED
       )
     },
     microservices_busy() {
-      return use_geode_store().is_busy || use_viewer_store().is_busy
+      return useGeodeStore().is_busy || useViewerStore().is_busy
     },
   },
   actions: {
@@ -48,8 +48,8 @@ export const use_infra_store = defineStore("infra", {
         if (this.status === Status.CREATED) return
         console.log("LOCK GRANTED !", lock)
         if (this.app_mode == appMode.appMode.DESKTOP) {
-          const viewer_store = use_viewer_store()
-          const geode_store = use_geode_store()
+          const viewer_store = useViewerStore()
+          const geode_store = useGeodeStore()
           const back_port = await window.electronAPI.run_back(
             geode_store.default_local_port,
           )
@@ -64,7 +64,7 @@ export const use_infra_store = defineStore("infra", {
           })
           if (error.value || !data.value) {
             this.status = Status.NOT_CREATED
-            const feedback_store = use_feedback_store()
+            const feedback_store = useFeedbackStore()
             feedback_store.server_error = true
             return
           }
@@ -77,8 +77,8 @@ export const use_infra_store = defineStore("infra", {
     },
     async create_connection() {
       console.log("create_connection")
-      await use_viewer_store().ws_connect()
-      await use_geode_store().do_ping()
+      await useViewerStore().ws_connect()
+      await useGeodeStore().do_ping()
       return
     },
   },

package/stores/menu.js

@@ -142,7 +142,7 @@ export const useMenuStore = defineStore("menu", () => {
     current_id.value = null
   }
 
-  async function openMenu(id, x, y, containerWidth, containerHeight) {
+  async function openMenu(id, x, y, width, height) {
     await closeMenu()
     current_id.value = id
 
@@ -151,8 +151,8 @@ export const useMenuStore = defineStore("menu", () => {
       menuY.value = y
     }
 
-    if (containerWidth) containerWidth.value = containerWidth
-    if (containerHeight) containerHeight.value = containerHeight
+    if (containerWidth) containerWidth.value = width
+    if (containerHeight) containerHeight.value = height
 
     display_menu.value = true
   }

package/stores/treeview.js

@@ -1,4 +1,4 @@
-export const use_treeview_store = defineStore("treeview", () => {
+export const useTreeviewStore = defineStore("treeview", () => {
   const dataStyleStore = useDataStyleStore()
 
   /** State **/

package/stores/viewer.js

@@ -4,7 +4,7 @@ import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
 import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 import Status from "@ogw_f/utils/status.js"
 
-export const use_viewer_store = defineStore("viewer", {
+export const useViewerStore = defineStore("viewer", {
   state: () => ({
     default_local_port: "1234",
     client: {},
@@ -16,14 +16,14 @@ export const use_viewer_store = defineStore("viewer", {
   }),
   getters: {
     protocol() {
-      if (use_infra_store().app_mode == appMode.appMode.CLOUD) {
+      if (useInfraStore().app_mode == appMode.appMode.CLOUD) {
         return "wss"
       } else {
         return "ws"
       }
     },
     port() {
-      if (use_infra_store().app_mode == appMode.appMode.CLOUD) {
+      if (useInfraStore().app_mode == appMode.appMode.CLOUD) {
         return "443"
       }
       const VIEWER_PORT = useRuntimeConfig().public.VIEWER_PORT
@@ -33,7 +33,7 @@ export const use_viewer_store = defineStore("viewer", {
       return this.default_local_port
     },
     base_url() {
-      const infra_store = use_infra_store()
+      const infra_store = useInfraStore()
       let viewer_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
       if (infra_store.app_mode == appMode.appMode.CLOUD) {
         if (infra_store.ID == "") {
@@ -60,7 +60,6 @@ export const use_viewer_store = defineStore("viewer", {
       this.picking_mode = false
     },
     async ws_connect() {
-      if (process.env.NODE_ENV == "test") return
       if (this.status === Status.CONNECTED) return
       return navigator.locks.request("viewer.ws_connect", async (lock) => {
         if (this.status === Status.CONNECTED) return
@@ -125,7 +124,7 @@ export const use_viewer_store = defineStore("viewer", {
               resolve()
             })
             .catch((error) => {
-              console.error(error)
+              console.error("error", error)
               viewer_store.status = Status.NOT_CONNECTED
               reject(error)
             })

package/tests/integration/data/fake_id/edged_curve.vtp

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<VTKFile type="PolyData" version="1.0" byte_order="LittleEndian" header_type="UInt32" compressor="vtkZLibDataCompressor">
+	<PolyData>
+		<Piece NumberOfPoints="4" NumberOfLines="4">
+			<PointData>
+				<DataArray type="Float64" Name="points" format="ascii" NumberOfComponents="3" RangeMin="0.100000001" RangeMax="9.39999962">0.1 0.2 0.3 2.1 9.4 6.7 7.5 5.2 6.3 8.7 1.4 4.7 </DataArray>
+			</PointData>
+			<Points>
+				<DataArray type="Float64" Name="Points" format="ascii" NumberOfComponents="3" RangeMin="0.10000000000000001" RangeMax="9.4000000000000004">0.1 0.2 0.3 2.1 9.4 6.7 7.5 5.2 6.3 8.7 1.4 4.7 </DataArray>
+			</Points>
+			<CellData>
+				<DataArray type="Float64" Name="edges" format="ascii" NumberOfComponents="2" RangeMin="0" RangeMax="3">0 1 0 2 3 2 1 2 </DataArray>
+			</CellData>
+			<Lines>
+				<DataArray type="Int64" Name="connectivity" format="ascii" RangeMin="0" RangeMax="3">0 1 0 2 3 2 1 2 </DataArray>
+				<DataArray type="Int64" Name="offsets" format="ascii" RangeMin="0" RangeMax="4">2 4 6 8 </DataArray>
+			</Lines>
+		</Piece>
+	</PolyData>
+</VTKFile>

package/tests/integration/microservices/back/requirements.in

@@ -0,0 +1 @@
+OpenGeodeWeb-Back

package/tests/integration/microservices/back/requirements.txt

@@ -0,0 +1,75 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile requirements.in
+#
+asgiref==3.9.1
+    # via
+    #   flask
+    #   opengeodeweb-back
+blinker==1.9.0
+    # via
+    #   flask
+    #   opengeodeweb-back
+click==8.2.1
+    # via
+    #   flask
+    #   opengeodeweb-back
+fastjsonschema==2.16.2
+    # via opengeodeweb-back
+flask[async]==3.0.3
+    # via
+    #   flask-cors
+    #   opengeodeweb-back
+flask-cors==6.0.1
+    # via opengeodeweb-back
+geode-common==33.9.0
+    # via
+    #   geode-viewables
+    #   opengeodeweb-back
+geode-viewables==3.2.0
+    # via opengeodeweb-back
+itsdangerous==2.2.0
+    # via
+    #   flask
+    #   opengeodeweb-back
+jinja2==3.1.6
+    # via
+    #   flask
+    #   opengeodeweb-back
+markupsafe==3.0.2
+    # via
+    #   jinja2
+    #   opengeodeweb-back
+    #   werkzeug
+opengeode-core==15.24.2
+    # via
+    #   geode-common
+    #   geode-viewables
+    #   opengeode-geosciences
+    #   opengeode-geosciencesio
+    #   opengeode-inspector
+    #   opengeode-io
+    #   opengeodeweb-back
+opengeode-geosciences==9.2.2
+    # via
+    #   geode-viewables
+    #   opengeode-geosciencesio
+    #   opengeodeweb-back
+opengeode-geosciencesio==5.7.2
+    # via opengeodeweb-back
+opengeode-inspector==6.7.0
+    # via opengeodeweb-back
+opengeode-io==7.3.2
+    # via
+    #   geode-viewables
+    #   opengeode-geosciencesio
+    #   opengeodeweb-back
+opengeodeweb-back==5.9.1
+    # via -r requirements.in
+werkzeug==3.0.3
+    # via
+    #   flask
+    #   flask-cors
+    #   opengeodeweb-back

package/tests/integration/microservices/viewer/requirements.in

@@ -0,0 +1 @@
+OpenGeodeWeb-Viewer[cpu]

package/tests/integration/microservices/viewer/requirements.txt

@@ -0,0 +1,87 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --extra-index-url=https://wheels.vtk.org --pre requirements.in
+#
+--extra-index-url https://wheels.vtk.org
+
+aiohappyeyeballs==2.6.1
+    # via
+    #   aiohttp
+    #   opengeodeweb-viewer
+aiohttp==3.12.15
+    # via
+    #   opengeodeweb-viewer
+    #   wslink
+aiosignal==1.4.0
+    # via
+    #   aiohttp
+    #   opengeodeweb-viewer
+attrs==25.3.0
+    # via
+    #   aiohttp
+    #   opengeodeweb-viewer
+contourpy==1.3.3
+    # via matplotlib
+cycler==0.12.1
+    # via matplotlib
+fastjsonschema==2.21.1
+    # via opengeodeweb-viewer
+fonttools==4.59.2
+    # via matplotlib
+frozenlist==1.7.0
+    # via
+    #   aiohttp
+    #   aiosignal
+    #   opengeodeweb-viewer
+idna==3.10
+    # via
+    #   opengeodeweb-viewer
+    #   yarl
+kiwisolver==1.4.10rc0
+    # via matplotlib
+matplotlib==3.10.6
+    # via vtk-osmesa
+multidict==6.6.3
+    # via
+    #   aiohttp
+    #   opengeodeweb-viewer
+    #   yarl
+numpy==2.3.2
+    # via
+    #   contourpy
+    #   matplotlib
+opengeodeweb-viewer[cpu]==1.11.0rc3
+    # via
+    #   -r requirements.in
+    #   opengeodeweb-viewer
+packaging==25.0
+    # via matplotlib
+pillow==11.3.0
+    # via matplotlib
+propcache==0.3.2
+    # via
+    #   aiohttp
+    #   opengeodeweb-viewer
+    #   yarl
+pyparsing==3.2.3
+    # via matplotlib
+python-dateutil==2.9.0.post0
+    # via matplotlib
+six==1.17.0
+    # via python-dateutil
+typing-extensions==4.14.1
+    # via
+    #   aiosignal
+    #   opengeodeweb-viewer
+vtk-osmesa==9.3.1
+    # via opengeodeweb-viewer
+websocket-client==1.8.0
+    # via opengeodeweb-viewer
+wslink==1.12.4
+    # via opengeodeweb-viewer
+yarl==1.20.1
+    # via
+    #   aiohttp
+    #   opengeodeweb-viewer