@geode/opengeodeweb-front 9.11.0-rc.1 → 9.11.0-rc.10

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({})
@@ -66,6 +66,11 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     db[id] = { actor, polydata, mapper }
   }
 
+  async function setVisibility(id, visibility) {
+    db[id].actor.setVisibility(visibility)
+    const renderWindow = genericRenderWindow.value.getRenderWindow()
+    renderWindow.render()
+  }
   async function setZScaling(z_scale) {
     zScale.value = z_scale
     const renderer = genericRenderWindow.value.getRenderer()
@@ -183,6 +188,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     db,
     genericRenderWindow,
     addItem,
+    setVisibility,
     setZScaling,
     syncRemoteCamera,
     initHybridViewer,

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

package/tests/integration/stores/DataStyle/mesh/Edges.nuxt.test.js

@@ -0,0 +1,138 @@
+import path from "path"
+
+import { setActivePinia } from "pinia"
+import { createTestingPinia } from "@pinia/testing"
+
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  test,
+  vi,
+} from "vitest"
+
+import {
+  executable_name,
+  executable_path,
+  kill_processes,
+  run_viewer,
+} from "@ogw_f/utils/local"
+
+import Status from "@ogw_f/utils/status"
+
+import * as composables from "@ogw_f/composables/viewer_call"
+import { useDataStyleStore } from "@ogw_f/stores/data_style"
+import { useDataBaseStore } from "@ogw_f/stores/data_base"
+import { useViewerStore } from "@ogw_f/stores/viewer"
+import { useInfraStore } from "@ogw_f/stores/infra"
+
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
+import { WebSocket } from "ws"
+
+const mesh_edges_schemas = viewer_schemas.opengeodeweb_viewer.mesh.edges
+
+const mockLockRequest = vi.fn().mockImplementation(async (name, callback) => {
+  return callback({ name })
+})
+
+vi.stubGlobal("navigator", {
+  ...navigator,
+  locks: {
+    request: mockLockRequest,
+  },
+})
+
+beforeAll(() => {
+  global.WebSocket = WebSocket
+})
+
+afterAll(() => {
+  delete global.WebSocket
+})
+
+const id = "fake_id"
+const file_name = "edged_curve.vtp"
+const geode_object = "EdgedCurve2D"
+const object_type = "mesh"
+
+beforeEach(async () => {
+  const pinia = createTestingPinia({
+    stubActions: false,
+    createSpy: vi.fn,
+  })
+  setActivePinia(pinia)
+  const dataStyleStore = useDataStyleStore()
+  const dataBaseStore = useDataBaseStore()
+  const viewerStore = useViewerStore()
+  const infraStore = useInfraStore()
+  infraStore.app_mode = appMode.appMode.BROWSER
+
+  const viewer_path = path.join(
+    executable_path(
+      path.join("tests", "integration", "microservices", "viewer"),
+    ),
+    executable_name("opengeodeweb_viewer"),
+  )
+  const viewer_port = await run_viewer(viewer_path, {
+    port: 1234,
+    data_folder_path: path.join(__dirname, "..", "..", "..", "data"),
+  })
+
+  viewerStore.default_local_port = viewer_port
+  await viewerStore.ws_connect()
+  await dataBaseStore.registerObject(id, file_name, object_type)
+  await dataStyleStore.addDataStyle(id, geode_object, object_type)
+  expect(viewerStore.status).toBe(Status.CONNECTED)
+})
+
+describe("Mesh edges", () => {
+  afterEach(async () => {
+    await kill_processes()
+  })
+
+  describe("Edges visibility", () => {
+    test("test visibility true", async () => {
+      const dataStyleStore = useDataStyleStore()
+      const viewerStore = useViewerStore()
+      await dataStyleStore.setEdgesVisibility(id, true)
+      expect(dataStyleStore.edgesVisibility(id)).toBe(true)
+      expect(viewerStore.status).toBe(Status.CONNECTED)
+    })
+  })
+
+  describe("Edges active coloring", () => {
+    test("test coloring", async () => {
+      const dataStyleStore = useDataStyleStore()
+      const viewerStore = useViewerStore()
+      const coloringTypes = ["color"]
+      for (let i = 0; i < coloringTypes.length; i++) {
+        dataStyleStore.setEdgesActiveColoring(id, coloringTypes[i])
+        expect(dataStyleStore.edgesActiveColoring(id)).toBe(coloringTypes[i])
+        expect(viewerStore.status).toBe(Status.CONNECTED)
+      }
+    })
+  })
+  describe("Edges color", () => {
+    test("test red", async () => {
+      const dataStyleStore = useDataStyleStore()
+      const viewerStore = useViewerStore()
+      const color = { r: 255, g: 0, b: 0 }
+      const spy = vi.spyOn(composables, "viewer_call")
+      await dataStyleStore.setEdgesColor(id, color)
+      expect(spy).toHaveBeenCalledWith(
+        {
+          schema: mesh_edges_schemas.color,
+          params: { id, color },
+        },
+        {
+          response_function: expect.any(Function),
+        },
+      )
+      expect(dataStyleStore.edgesColor(id)).toStrictEqual(color)
+      expect(viewerStore.status).toBe(Status.CONNECTED)
+    })
+  })
+})

package/{test → tests/unit}/components/CrsSelector.nuxt.test.js

@@ -1,6 +1,6 @@
-import { describe, expect, test } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 
+import { describe, expect, test, vi } from "vitest"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 import { createVuetify } from "vuetify"
@@ -19,9 +19,12 @@ const vuetify = createVuetify({
 })
 
 describe("CrsSelector.vue", () => {
-  const pinia = createTestingPinia()
+  const pinia = createTestingPinia({
+    stubActions: false,
+    createSpy: vi.fn,
+  })
   setActivePinia(pinia)
-  const geode_store = use_geode_store()
+  const geode_store = useGeodeStore()
   geode_store.base_url = ""
 
   test(`Default behavior`, async () => {

package/{test → tests/unit}/components/ExtensionSelector.nuxt.test.js

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "vitest"
+import { describe, expect, test, vi } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 
 import { createVuetify } from "vuetify"
@@ -19,9 +19,12 @@ const vuetify = createVuetify({
 })
 
 describe("ExtensionSelector.vue", async () => {
-  const pinia = createTestingPinia()
+  const pinia = createTestingPinia({
+    stubActions: false,
+    createSpy: vi.fn,
+  })
   setActivePinia(pinia)
-  const geode_store = use_geode_store()
+  const geode_store = useGeodeStore()
   geode_store.base_url = ""
 
   test(`Select geode_object & extension`, async () => {

package/{test → tests/unit}/components/FeedBack/ErrorsBanner.nuxt.test.js

@@ -6,6 +6,7 @@ import * as directives from "vuetify/directives"
 import { createTestingPinia } from "@pinia/testing"
 
 import FeedBackErrorBanner from "@ogw_f/components/FeedBack/ErrorBanner.vue"
+import { setActivePinia } from "pinia"
 
 const vuetify = createVuetify({
   components,
@@ -14,13 +15,18 @@ const vuetify = createVuetify({
 
 describe("FeedBackErrorBanner.vue", async () => {
   ;(test(`Test reload`, async () => {
+    const pinia = createTestingPinia({
+      stubActions: false,
+      createSpy: vi.fn,
+    })
+    setActivePinia(pinia)
     const wrapper = mount(FeedBackErrorBanner, {
       global: {
-        plugins: [createTestingPinia(), vuetify],
+        plugins: [pinia, vuetify],
       },
     })
     const reload_spy = vi.spyOn(wrapper.vm, "reload")
-    const feedback_store = use_feedback_store()
+    const feedback_store = useFeedbackStore()
     await feedback_store.$patch({ server_error: true })
     expect(feedback_store.server_error).toBe(true)
     const v_btn = wrapper.findAll(".v-btn")
@@ -38,13 +44,14 @@ describe("FeedBackErrorBanner.vue", async () => {
                 },
               },
               stubActions: false,
+              createSpy: vi.fn,
             }),
             vuetify,
           ],
         },
       })
 
-      const feedback_store = use_feedback_store()
+      const feedback_store = useFeedbackStore()
       const v_btn = wrapper.findAll(".v-btn")
       await v_btn[1].trigger("click")
       expect(feedback_store.server_error).toBe(false)

package/{test → tests/unit}/components/FeedBack/Snackers.nuxt.test.js

@@ -1,10 +1,12 @@
 // @vitest-environment nuxt
 vi.stubGlobal("visualViewport", new EventTarget())
-import { describe, expect, test } from "vitest"
+import { describe, expect, test, vi } from "vitest"
 import { mount } from "@vue/test-utils"
 import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
 import * as directives from "vuetify/directives"
+
+import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
 import FeedBackSnackers from "@ogw_f/components/FeedBack/Snackers.vue"
@@ -16,6 +18,25 @@ const vuetify = createVuetify({
 
 describe("FeedBackSnackers.vue", async () => {
   test(`Test delete error`, async () => {
+    const pinia = createTestingPinia({
+      initialState: {
+        feedback: {
+          feedbacks: [
+            {
+              type: "error",
+              code: 500,
+              route: "/test",
+              name: "test message",
+              description: "test description",
+            },
+          ],
+        },
+      },
+      stubActions: false,
+      createSpy: vi.fn,
+    })
+    setActivePinia(pinia)
+    const feedback_store = useFeedbackStore()
     const wrapper = mount(
       {
         template: "<v-layout><FeedBackSnackers/></v-layout>",
@@ -26,29 +47,11 @@ describe("FeedBackSnackers.vue", async () => {
           components: {
             FeedBackSnackers,
           },
-          plugins: [
-            createTestingPinia({
-              initialState: {
-                feedback: {
-                  feedbacks: [
-                    {
-                      type: "error",
-                      code: 500,
-                      route: "/test",
-                      name: "test message",
-                      description: "test description",
-                    },
-                  ],
-                },
-              },
-              stubActions: false,
-            }),
-            vuetify,
-          ],
+          plugins: [pinia, vuetify],
         },
       },
     )
-    const feedback_store = use_feedback_store()
+
     expect(feedback_store.feedbacks.length).toBe(1)
     const v_btn = await wrapper.findComponent(components.VBtn)
     await v_btn.trigger("click")

package/{test → tests/unit}/components/FileSelector.nuxt.test.js

@@ -23,9 +23,12 @@ const vuetify = createVuetify({
 })
 
 describe("FileSelector.vue", async () => {
-  const pinia = createTestingPinia()
+  const pinia = createTestingPinia({
+    stubActions: false,
+    createSpy: vi.fn,
+  })
   setActivePinia(pinia)
-  const geode_store = use_geode_store()
+  const geode_store = useGeodeStore()
   geode_store.base_url = ""
 
   test(`Select file`, async () => {