Merge pull request #146 from Geode-solutions/next

Next

Author: JulienChampagnol

components/RemoteRenderingView.vue

@@ -2,6 +2,18 @@
   <ClientOnly>
     <div style="position: relative; width: 100%; height: 100%">
       <view-toolbar />
+      <div
+        style="
+          position: absolute;
+          z-index: 2;
+          left: 0;
+          top: 0;
+          background-color: transparent;
+          border-radius: 16px;
+        "
+      >
+        <slot name="tree-object"></slot>
+      </div>
       <v-col
         ref="viewer"
         style="
@@ -103,3 +115,14 @@
     view.render()
   }
 </script>
+
+<style scoped>
+  .list {
+    position: absolute;
+    z-index: 2;
+    left: 0;
+    top: 0;
+    background-color: transparent;
+    border-radius: 16px;
+  }
+</style>

package.json

@@ -7,9 +7,9 @@
     "geode_objects": "node scripts/generate_geode_objects.js && prettier ./assets/geode_objects.js --write"
   },
   "devDependencies": {
-    "@nuxt/test-utils": "^3.14.1",
-    "@pinia/testing": "^0.1.5",
-    "@vitejs/plugin-vue": "^5.1.3",
+    "@nuxt/test-utils": "^3.14.3",
+    "@pinia/testing": "^0.1.6",
+    "@vitejs/plugin-vue": "^5.1.4",
     "@vitest/coverage-v8": "^1.6.0",
     "@vue/test-utils": "^2.4.6",
     "eslint": "^8.57.0",
@@ -21,15 +21,15 @@
     "eslint-plugin-vuetify": "^2.4.0",
     "happy-dom": "^14.12.0",
     "jsdom": "^24.1.0",
-    "nuxt": "^3.12.1",
+    "nuxt": "^3.13.2",
     "playwright-core": "^1.44.1",
     "prettier": "3.3.2",
     "resize-observer-polyfill": "^1.5.1",
     "vite": "^5.2.13",
     "vite-plugin-vuetify": "^2.0.3",
     "vitest": "^1.6.0",
     "vitest-environment-nuxt": "^1.0.0",
-    "vuetify": "^3.6.9",
+    "vuetify": "^3.7.2",
     "wslink": "1.12.4"
   },
   "overrides": {

stores/geode.js

@@ -10,20 +10,18 @@ export const use_geode_store = defineStore("geode", {
     protocol() {
       if (use_infra_store().is_cloud) {
         return "https"
-      } else {
-        return "http"
       }
+      return "http"
     },
     port() {
       if (use_infra_store().is_cloud) {
         return "443"
-      } else {
-        return this.default_local_port
       }
+      return this.default_local_port
     },
     base_url() {
       const infra_store = use_infra_store()
-      var geode_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
+      let geode_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
       if (infra_store.is_cloud) {
         if (infra_store.ID == "") {
           throw new Error("ID must not be empty in cloud mode")
@@ -44,26 +42,26 @@ export const use_geode_store = defineStore("geode", {
         }
       }, 10 * 1000)
     },
-    async do_ping() {
+    do_ping() {
+      const geode_store = this
       const feedback_store = use_feedback_store()
-      return new Promise((resolve, reject) => {
-        useFetch(back_schemas.opengeodeweb_back.ping.$id, {
-          baseURL: this.base_url,
-          method: back_schemas.opengeodeweb_back.ping.methods[0],
-          async onRequestError() {
-            await feedback_store.$patch({ server_error: true })
-            this.is_running = false
-            reject()
-          },
-          async onResponse() {
-            resolve()
-          },
-          async onResponseError() {
-            await feedback_store.$patch({ server_error: true })
-            this.is_running = false
-            reject()
-          },
-        })
+      return useFetch(back_schemas.opengeodeweb_back.ping.$id, {
+        baseURL: this.base_url,
+        method: back_schemas.opengeodeweb_back.ping.methods[0],
+        onRequestError({ error }) {
+          feedback_store.server_error = true
+          geode_store.is_running = false
+        },
+        onResponse({ response }) {
+          if (response.ok) {
+            feedback_store.server_error = false
+            geode_store.is_running = true
+          }
+        },
+        onResponseError({ response }) {
+          feedback_store.server_error = true
+          geode_store.is_running = false
+        },
       })
     },
     start_request() {

test/components/CrsSelector.nuxt.test.js

@@ -20,7 +20,7 @@ const vuetify = createVuetify({
   directives,
 })
 
-describe("CrsSelector.vue", async () => {
+describe("CrsSelector.vue", () => {
   const pinia = createTestingPinia()
   setActivePinia(pinia)
   const geode_store = use_geode_store()

test/stores/Geode.nuxt.test.js

@@ -1,6 +1,6 @@
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
-import { describe, test, expect, expectTypeOf, beforeEach } from "vitest"
+import { describe, test, expect, expectTypeOf, beforeEach, vi } from "vitest"
 import { registerEndpoint } from "@nuxt/test-utils/runtime"
 import back_schemas from "@geode/opengeodeweb-back/schemas.json"
 
@@ -20,7 +20,7 @@ describe("Geode Store", () => {
   })
 
   describe("state", () => {
-    test("initial state", async () => {
+    test("initial state", () => {
       expectTypeOf(geode_store.default_local_port).toBeString()
       expectTypeOf(geode_store.request_counter).toBeNumber()
       expectTypeOf(geode_store.is_running).toBeBoolean()
@@ -52,8 +52,8 @@ describe("Geode Store", () => {
 
       test("test override default_local_port", () => {
         infra_store.is_cloud = false
-        geode_store.default_local_port = "8080"
-        expect(geode_store.port).toBe("8080")
+        geode_store.default_local_port = "12"
+        expect(geode_store.port).toBe("12")
       })
     })
 
@@ -63,17 +63,15 @@ describe("Geode Store", () => {
         infra_store.domain_name = "localhost"
         expect(geode_store.base_url).toBe("http://localhost:5000")
       })
-
-      test("test is_cloud true", async () => {
+      test("test is_cloud true", () => {
         infra_store.is_cloud = true
         infra_store.ID = "123456"
         infra_store.domain_name = "example.com"
         expect(geode_store.base_url).toBe(
           "https://example.com:443/123456/geode",
         )
       })
-
-      test("test is_cloud true, ID empty", async () => {
+      test("test is_cloud true, ID empty", () => {
         infra_store.is_cloud = true
         infra_store.ID = ""
         infra_store.domain_name = "example.com"
@@ -97,28 +95,28 @@ describe("Geode Store", () => {
 
   describe("actions", () => {
     describe("do_ping", () => {
-      test("request_error", async () => {
-        geode_store.base_url = ""
-        try {
-          await geode_store.do_ping()
-        } catch (e) {
-          console.log("e", e)
-        }
-        expect(geode_store.is_running).toBe(false)
-        expect(feedback_store.server_error).toBe(true)
-      })
+      const getFakeCall = vi.fn()
+      registerEndpoint(back_schemas.opengeodeweb_back.ping.$id, getFakeCall)
 
       test("response", async () => {
         geode_store.base_url = ""
-        geode_store.is_running = true
-        registerEndpoint(back_schemas.opengeodeweb_back.ping.$id, {
-          method: "POST",
-          handler: () => ({}),
-        })
+        getFakeCall.mockImplementation(() => ({}))
         await geode_store.do_ping()
         expect(geode_store.is_running).toBe(true)
         expect(feedback_store.server_error).toBe(false)
       })
+      test("response_error", async () => {
+        geode_store.base_url = ""
+        getFakeCall.mockImplementation(() => {
+          throw createError({
+            status: 500,
+          })
+        })
+
+        await geode_store.do_ping()
+        expect(geode_store.is_running).toBe(false)
+        expect(feedback_store.server_error).toBe(true)
+      })
     })
 
     describe("start_request", () => {

test/stores/Infra.nuxt.test.js

@@ -105,14 +105,14 @@ describe("Infra Store", () => {
   })
 
   describe("actions", () => {
-    describe("create_connexion", async () => {
+    describe("create_connexion", () => {
       test("test without end-point", async () => {
         await infra_store.create_connexion()
         expect(infra_store.is_connexion_launched).toBe(true)
         expect(feedback_store.server_error).toBe(true)
       })
     })
-    describe("create_backend", async () => {
+    describe("create_backend", () => {
       test("test without end-point", async () => {
         await infra_store.create_backend()
         expect(geode_store.is_running).toBe(false)

test/stores/Viewer.nuxt.test.js

@@ -64,7 +64,7 @@ describe("Viewer Store", () => {
         expect(viewer_store.base_url).toBe("ws://localhost:1234/ws")
       })
 
-      test("test is_cloud true", async () => {
+      test("test is_cloud true", () => {
         infra_store.is_cloud = true
         infra_store.ID = "123456"
         infra_store.domain_name = "example.com"
@@ -73,7 +73,7 @@ describe("Viewer Store", () => {
         )
       })
 
-      test("test is_cloud true, ID empty", async () => {
+      test("test is_cloud true, ID empty", () => {
         infra_store.is_cloud = true
         infra_store.ID = ""
         infra_store.domain_name = "example.com"
@@ -95,7 +95,7 @@ describe("Viewer Store", () => {
   })
   describe("actions", () => {
     // MISSING TEST ws_connect()
-    describe("toggle_picking_mode", async () => {
+    describe("toggle_picking_mode", () => {
       test("test true", async () => {
         await viewer_store.toggle_picking_mode(true)
         expect(viewer_store.picking_mode).toBe(true)