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

package/{tests/unit → test}/stores/Viewer.nuxt.test.js

@@ -1,61 +1,21 @@
-// Global imports
-import path from "path"
-
-// Third party imports
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
-import {
-  afterAll,
-  beforeAll,
-  describe,
-  test,
-  expect,
-  expectTypeOf,
-  beforeEach,
-  vi,
-} from "vitest"
-
-import { WebSocket } from "ws"
-
-// Local imports
-import { useViewerStore } from "@ogw_f/stores/viewer"
-import { useInfraStore } from "@ogw_f/stores/infra"
-
-import { appMode } from "@ogw_f/utils/app_mode"
-import Status from "@ogw_f/utils/status"
-
-// Mock navigator.locks API
-const mockLockRequest = vi.fn().mockImplementation(async (name, callback) => {
-  return callback({ name })
-})
-
-vi.stubGlobal("navigator", {
-  ...navigator,
-  locks: {
-    request: mockLockRequest,
-  },
-})
+import { describe, test, expect, expectTypeOf, beforeEach } from "vitest"
 
-beforeAll(() => {
-  global.WebSocket = WebSocket
-})
-
-afterAll(() => {
-  delete global.WebSocket
-})
-
-beforeEach(() => {
+describe("Viewer Store", () => {
   const pinia = createTestingPinia({
     stubActions: false,
-    createSpy: vi.fn,
   })
   setActivePinia(pinia)
-})
+  const infra_store = use_infra_store()
+  const viewer_store = use_viewer_store()
 
-describe("Viewer Store", () => {
+  beforeEach(() => {
+    infra_store.$reset()
+    viewer_store.$reset()
+  })
   describe("state", () => {
     test("initial state", () => {
-      const viewer_store = useViewerStore()
       expectTypeOf(viewer_store.default_local_port).toBeString()
       expectTypeOf(viewer_store.client).toEqualTypeOf({})
       expectTypeOf(viewer_store.picking_mode).toBeBoolean()
@@ -71,65 +31,48 @@ describe("Viewer Store", () => {
   describe("getters", () => {
     describe("protocol", () => {
       test("test app_mode CLOUD", () => {
-        const infra_store = useInfraStore()
-        const viewer_store = useViewerStore()
-        infra_store.app_mode = appMode.CLOUD
+        infra_store.app_mode = appMode.appMode.CLOUD
         expect(viewer_store.protocol).toBe("wss")
       })
       test("test app_mode BROWSER", () => {
-        const infra_store = useInfraStore()
-        const viewer_store = useViewerStore()
-        infra_store.app_mode = appMode.BROWSER
+        infra_store.app_mode = appMode.appMode.BROWSER
         expect(viewer_store.protocol).toBe("ws")
       })
       test("test app_mode DESKTOP", () => {
-        const infra_store = useInfraStore()
-        const viewer_store = useViewerStore()
-        infra_store.app_mode = appMode.DESKTOP
+        infra_store.app_mode = appMode.appMode.DESKTOP
         expect(viewer_store.protocol).toBe("ws")
       })
     })
 
     describe("port", () => {
       test("test app_mode CLOUD", () => {
-        const infra_store = useInfraStore()
-        const viewer_store = useViewerStore()
-        infra_store.app_mode = appMode.CLOUD
+        infra_store.app_mode = appMode.appMode.CLOUD
         expect(viewer_store.port).toBe("443")
       })
       test("test app_mode BROWSER", () => {
-        const infra_store = useInfraStore()
-        const viewer_store = useViewerStore()
-        infra_store.app_mode = appMode.BROWSER
+        infra_store.app_mode = appMode.appMode.BROWSER
         expect(viewer_store.port).toBe(viewer_store.default_local_port)
       })
       test("test app_mode DESKTOP", () => {
-        const infra_store = useInfraStore()
-        const viewer_store = useViewerStore()
-        infra_store.app_mode = appMode.DESKTOP
+        infra_store.app_mode = appMode.appMode.DESKTOP
         expect(viewer_store.port).toBe(viewer_store.default_local_port)
       })
 
       test("test override default_local_port", () => {
-        const infra_store = useInfraStore()
-        const viewer_store = useViewerStore()
-        infra_store.app_mode = appMode.DESKTOP
+        infra_store.app_mode = appMode.appMode.DESKTOP
         viewer_store.default_local_port = "8080"
         expect(viewer_store.port).toBe("8080")
       })
     })
     describe("base_url", () => {
       test("test app_mode DESKTOP", () => {
-        const infra_store = useInfraStore()
-        infra_store.app_mode = appMode.DESKTOP
+        infra_store.app_mode = appMode.appMode.DESKTOP
         infra_store.domain_name = "localhost"
-        // expect(viewer_store.base_url).toBe("ws://localhost:1234/ws")
+        expect(viewer_store.base_url).toBe("ws://localhost:1234/ws")
       })
 
       test("test app_mode CLOUD", () => {
-        const infra_store = useInfraStore()
-        const viewer_store = useViewerStore()
-        infra_store.app_mode = appMode.CLOUD
+        infra_store.app_mode = appMode.appMode.CLOUD
         infra_store.ID = "123456"
         infra_store.domain_name = "example.com"
         expect(viewer_store.base_url).toBe(
@@ -138,9 +81,7 @@ describe("Viewer Store", () => {
       })
 
       test("test app_mode CLOUD, ID empty", () => {
-        const infra_store = useInfraStore()
-        const viewer_store = useViewerStore()
-        infra_store.app_mode = appMode.CLOUD
+        infra_store.app_mode = appMode.appMode.CLOUD
         infra_store.ID = ""
         infra_store.domain_name = "example.com"
         expect(() => viewer_store.base_url).toThrowError(
@@ -150,53 +91,31 @@ describe("Viewer Store", () => {
     })
     describe("is_busy", () => {
       test("test is_busy", () => {
-        const viewer_store = useViewerStore()
         viewer_store.request_counter = 1
         expect(viewer_store.is_busy).toBe(true)
       })
       test("test not is_busy", () => {
-        const viewer_store = useViewerStore()
         viewer_store.request_counter = 0
         expect(viewer_store.is_busy).toBe(false)
       })
     })
   })
   describe("actions", () => {
-    // test("ws_connect", async () => {
-    //   const infra_store = useInfraStore()
-    //   const viewer_store = useViewerStore()
-    //   infra_store.app_mode = 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: "./data",
-    //   })
-    //   viewer_store.default_local_port = viewer_port
-    //   await viewer_store.ws_connect()
-    //   expect(viewer_store.status).toBe(Status.CONNECTED)
-    // }, 10000)
+    // MISSING TEST ws_connect()
     describe("toggle_picking_mode", () => {
       test("test true", async () => {
-        const viewer_store = useViewerStore()
         await viewer_store.toggle_picking_mode(true)
         expect(viewer_store.picking_mode).toBe(true)
       })
     })
     describe("start_request", () => {
       test("test increment", async () => {
-        const viewer_store = useViewerStore()
         await viewer_store.start_request()
         expect(viewer_store.request_counter).toBe(1)
       })
     })
     describe("stop_request", () => {
       test("test decrement", async () => {
-        const viewer_store = useViewerStore()
         await viewer_store.stop_request()
         expect(viewer_store.request_counter).toBe(-1)
       })

package/{tests/unit → test}/utils/validate_schema.nuxt.test.js

@@ -1,8 +1,5 @@
 import { describe, expect, test } from "vitest"
 
-import validate_schema from "@ogw_f/utils/validate_schema.js"
-console.log("@ogw_f", "@ogw_f")
-
 describe("validate_schema.js", () => {
   const schema = {
     $id: "/test",

package/vitest.config.js

@@ -0,0 +1,13 @@
+import { defineVitestConfig } from "@nuxt/test-utils/config"
+
+export default defineVitestConfig({
+  test: {
+    environment: "nuxt",
+    globals: true,
+    server: {
+      deps: {
+        inline: ["vuetify"],
+      },
+    },
+  },
+})

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

@@ -1,20 +0,0 @@
-<?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

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

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

@@ -1,75 +0,0 @@
-#
-# 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

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

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

@@ -1,87 +0,0 @@
-#
-# 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

@@ -1,138 +0,0 @@
-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/tests/vitest.config.js

@@ -1,33 +0,0 @@
-import { defineConfig } from "vitest/config"
-import { defineVitestProject } from "@nuxt/test-utils/config"
-
-export default defineConfig({
-  test: {
-    projects: [
-      await defineVitestProject({
-        test: {
-          name: "unit",
-          include: ["tests/unit/**/*.test.js"],
-          environment: "nuxt",
-          server: {
-            deps: {
-              inline: ["vuetify"],
-            },
-          },
-        },
-      }),
-      await defineVitestProject({
-        test: {
-          name: "integration",
-          include: ["tests/integration/**/*.test.js"],
-          environment: "nuxt",
-          server: {
-            deps: {
-              inline: ["vuetify"],
-            },
-          },
-        },
-      }),
-    ],
-  },
-})