Merge pull request #83 from Geode-solutions/feat/improve_imports

JulienChampagnol · web-flow · commit 81186c34eca5 · 2024-02-29T11:25:40.000+01:00
Feat/improve imports
diff --git a/components/CrsSelector.vue b/components/CrsSelector.vue
@@ -66,13 +66,11 @@
   async function get_crs_table() {
     const params = { input_geode_object }
     toggle_loading()
-    console.log("get_crs_table")
     await api_fetch(
       { schema, params },
       {
         response_function: (response) => {
           crs_list.value = response._data.crs_list
-          console.log("crs_list", response._data.crs_list)
         },
       },
     )
diff --git a/components/FileSelector.vue b/components/FileSelector.vue
@@ -19,10 +19,10 @@
 
   const props = defineProps({
     multiple: { type: Boolean, required: true },
-    key: { type: String, required: false, default: "" },
+    supported_feature: { type: String, required: false, default: null },
   })
 
-  const { multiple, key } = props
+  const { multiple, supported_feature } = props
 
   const accept = ref("")
   const loading = ref(false)
@@ -38,7 +38,7 @@
 
   async function get_allowed_files() {
     toggle_loading()
-    const params = { key }
+    const params = { supported_feature }
     await api_fetch(
       { schema, params },
       {
diff --git a/components/MissingFilesSelector.vue b/components/MissingFilesSelector.vue
@@ -69,7 +69,6 @@
   const toggle_loading = useToggle(loading)
 
   function files_uploaded_event(value) {
-    console.log("update_values")
     emit("update_values", { additional_files: value })
     missing_files()
   }
diff --git a/components/ObjectSelector.vue b/components/ObjectSelector.vue
@@ -58,9 +58,9 @@
 
   const props = defineProps({
     filenames: { type: Array, required: true },
-    key: { type: String, required: false, default: null },
+    supported_feature: { type: String, required: false, default: null },
   })
-  const { filenames, key } = props
+  const { filenames, supported_feature } = props
 
   const loading = ref(false)
   const allowed_objects = ref({})
@@ -71,7 +71,7 @@
     allowed_objects.value = {}
     var promise_array = []
     for (const filename of filenames) {
-      const params = { filename, key }
+      const params = { filename, supported_feature }
       const promise = new Promise((resolve, reject) => {
         api_fetch(
           { schema, params },
diff --git a/composables/viewer_call.js b/composables/viewer_call.js
@@ -4,7 +4,6 @@ export function viewer_call(
   { schema, params = {} },
   { request_error_function, response_function, response_error_function } = {},
 ) {
-  console.log("viewer_call", schema.route, params)
   const errors_store = use_errors_store()
   const viewer_store = use_viewer_store()
 
@@ -38,26 +37,23 @@ export function viewer_call(
         .then(
           (value) => {
             if (response_function) {
-              console.log("response_function", value)
               response_function(value)
             }
             resolve()
           },
           (reason) => {
             if (request_error_function) {
-              console.log("request_error_function", reason)
               request_error_function(reason)
             }
             reject()
           },
         )
         .catch((error) => {
-          console.log("error : ", error)
           errors_store.add_error({
             code: error.code,
             route: schema.route,
-            name: error.data.message,
-            description: error.data.exception,
+            name: error.message,
+            description: error.message,
           })
           if (response_error_function) {
             response_error_function(error)
diff --git a/package.json b/package.json
@@ -21,11 +21,11 @@
     "happy-dom": "^13.6.2",
     "jsdom": "^24.0.0",
     "nuxt": "^3.10.3",
-    "playwright-core": "^1.41.2",
+    "playwright-core": "^1.42.0",
     "prettier": "3.2.5",
     "resize-observer-polyfill": "^1.5.1",
     "vite": "^5.1.4",
-    "vite-plugin-vuetify": "^2.0.1",
+    "vite-plugin-vuetify": "^2.0.2",
     "vitest": "^1.3.1",
     "vitest-environment-nuxt": "^1.0.0",
     "wslink": "^1.12.4"
@@ -38,14 +38,14 @@
   "version": "0.0.0-semantically-released",
   "main": "./nuxt.config.js",
   "dependencies": {
-    "@geode/opengeodeweb-back": "3.3.2",
-    "@kitware/vtk.js": "^29.7.2",
+    "@geode/opengeodeweb-back": "4.0.0",
+    "@kitware/vtk.js": "^29.7.3",
     "@mdi/font": "^7.4.47",
     "@pinia/nuxt": "^0.5.1",
-    "@types/node": "^20.11.20",
-    "@vueuse/components": "^10.8.0",
-    "@vueuse/core": "^10.8.0",
-    "@vueuse/nuxt": "^10.8.0",
+    "@types/node": "^20.11.22",
+    "@vueuse/components": "^10.9.0",
+    "@vueuse/core": "^10.9.0",
+    "@vueuse/nuxt": "^10.9.0",
     "ajv": "^8.12.0",
     "pinia": "^2.1.7",
     "sass": "^1.71.1",
diff --git a/stores/cloud.js b/stores/cloud.js
@@ -60,13 +60,11 @@ export const use_cloud_store = defineStore("cloud", {
         method: "POST",
       })
       if (data.value !== null) {
-        console.log("DATA", data)
         this.ID = data.value.ID
         localStorage.setItem("ID", data.value.ID)
         geode_store.$patch({ is_running: true })
         return geode_store.ping_task()
       } else {
-        console.log("error : ", error)
         errors_store.server_error = true
       }
     },
diff --git a/stores/viewer.js b/stores/viewer.js
@@ -43,63 +43,63 @@ export const use_viewer_store = defineStore("viewer", {
       this.picking_mode = false
     },
     ws_connect() {
-      const config = { application: "Viewer" }
-      config.sessionURL = this.base_url
+      if (process.env.NODE_ENV != "test") {
+        const config = { application: "Viewer" }
+        config.sessionURL = this.base_url
 
-      const { client } = this
-      if (this.is_running && client.isConnected()) {
-        client.disconnect(-1)
-        this.is_running = false
-      }
-      let clientToConnect = client
-      if (_.isEmpty(clientToConnect)) {
-        clientToConnect = vtkWSLinkClient.newInstance()
-      }
+        const { client } = this
+        if (this.is_running && client.isConnected()) {
+          client.disconnect(-1)
+          this.is_running = false
+        }
+        let clientToConnect = client
+        if (_.isEmpty(clientToConnect)) {
+          clientToConnect = vtkWSLinkClient.newInstance()
+        }
 
-      // Connect to busy store
-      clientToConnect.onBusyChange((count) => {
-        this.buzy = count
-      })
-      clientToConnect.beginBusy()
+        // Connect to busy store
+        clientToConnect.onBusyChange((count) => {
+          this.buzy = count
+        })
+        clientToConnect.beginBusy()
 
-      // Error
-      clientToConnect.onConnectionError((httpReq) => {
-        const message =
-          (httpReq && httpReq.response && httpReq.response.error) ||
-          `Connection error`
-        console.error(message)
-        console.log(httpReq)
-      })
+        // Error
+        clientToConnect.onConnectionError((httpReq) => {
+          const message =
+            (httpReq && httpReq.response && httpReq.response.error) ||
+            `Connection error`
+          console.error(message)
+        })
 
-      // Close
-      clientToConnect.onConnectionClose((httpReq) => {
-        const message =
-          (httpReq && httpReq.response && httpReq.response.error) ||
-          `Connection close`
-        console.error(message)
-        console.log(httpReq)
-      })
+        // Close
+        clientToConnect.onConnectionClose((httpReq) => {
+          const message =
+            (httpReq && httpReq.response && httpReq.response.error) ||
+            `Connection close`
+          console.error(message)
+        })
 
-      // Connect
-      clientToConnect
-        .connect(config)
-        .then((validClient) => {
-          connectImageStream(validClient.getConnection().getSession())
-          this.client = validClient
-          clientToConnect.endBusy()
+        // Connect
+        clientToConnect
+          .connect(config)
+          .then((validClient) => {
+            connectImageStream(validClient.getConnection().getSession())
+            this.client = validClient
+            clientToConnect.endBusy()
 
-          // Now that the client is ready let's setup the server for us
-          viewer_call({
-            schema: schemas.opengeodeweb_viewer.create_visualization,
+            // Now that the client is ready let's setup the server for us
+            viewer_call({
+              schema: schemas.opengeodeweb_viewer.create_visualization,
+            })
+            viewer_call({
+              schema: schemas.opengeodeweb_viewer.reset,
+            })
+            this.is_running = true
           })
-          viewer_call({
-            schema: schemas.opengeodeweb_viewer.reset,
+          .catch((error) => {
+            console.error(error)
           })
-          this.is_running = true
-        })
-        .catch((error) => {
-          console.error(error)
-        })
+      }
     },
     start_request() {
       this.request_counter++
diff --git a/test/components/CrsSelector.nuxt.test.js b/test/components/CrsSelector.nuxt.test.js
@@ -43,7 +43,6 @@ describe("CrsSelector.vue", async () => {
     const td = await wrapper.find("td")
     await wrapper.vm.$nextTick()
     const input = await td.find("input")
-    console.log("toto", input)
     await input.trigger("click")
     expect(wrapper.emitted()).toHaveProperty("update_values")
     expect(wrapper.emitted().update_values).toHaveLength(1)
diff --git a/test/components/FileSelector.nuxt.test.js b/test/components/FileSelector.nuxt.test.js
@@ -33,7 +33,7 @@ describe("FileSelector.vue", async () => {
       global: {
         plugins: [vuetify],
       },
-      props: { multiple: false, key: "test", route: "/upload" },
+      props: { multiple: false, supported_feature: "test" },
     })
 
     const file_uploader = wrapper.findComponent(FileUploader)
diff --git a/test/components/FileUploader.nuxt.test.js b/test/components/FileUploader.nuxt.test.js
@@ -29,7 +29,7 @@ describe("FileUploader.vue", async () => {
       global: {
         plugins: [vuetify],
       },
-      props: { multiple: false, accept: "*.txt", route: "/upload" },
+      props: { multiple: false, accept: "*.txt" },
     })
     const v_file_input = wrapper.findComponent(components.VFileInput)
     await v_file_input.trigger("click")
diff --git a/test/components/ObjectSelector.nuxt.test.js b/test/components/ObjectSelector.nuxt.test.js
@@ -34,7 +34,7 @@ describe("ObjectSelector.vue", async () => {
       global: {
         plugins: [vuetify],
       },
-      props: { filenames: ["test.toto"], key: "test" },
+      props: { filenames: ["test.toto"], supported_feature: "test" },
     })
     const v_card = wrapper.findComponent(components.VCard)
     const v_img = v_card.findComponent(components.VImg)
diff --git a/test/composables/upload_file.nuxt.test.js b/test/composables/upload_file.nuxt.test.js
@@ -1,51 +1,39 @@
 import { describe, expect, test, beforeEach } from "vitest"
 import { registerEndpoint } from "@nuxt/test-utils/runtime"
+import { upload_file } from "@/composables/upload_file"
+import schemas from "@geode/opengeodeweb-back/schemas.json"
+const schema = schemas.opengeodeweb_back.upload_file
 
 describe("upload_file.js", () => {
-  const route = "/upload_file"
   const errors_store = use_errors_store()
   beforeEach(async () => {
     await errors_store.$patch({ errors: [] })
   })
 
   test("Throw error", async () => {
     var file = "toto"
+
     expect(async () => {
-      await upload_file({ route, file })
+      await upload_file({ route: schema.$id, file })
     }).rejects.toThrowError("file must be a instance of File")
   })
 
-  // test("onResponseError", async () => {
-  //   var file = new FileReader()
-  //   var response_error_value
-  //   await upload_file(
-  //     { route, file },
-  //     {
-  //       response_error_function: () => {
-  //         response_error_value = "error"
-  //       },
-  //     },
-  //   )
-  //   expect(errors_store.errors.length).toBe(1)
-  //   expect(response_error_value).toBe("error")
-  // })
-
-  // test("onResponse", async () => {
-  //   registerEndpoint(route, {
-  //     method: "PUT",
-  //     handler: () => ({ test: "ok" }),
-  //   })
-  //   var file = new FileReader()
-  //   var response_value
-  //   await upload_file(
-  //     { route, file },
-  //     {
-  //       response_function: (response) => {
-  //         response_value = response._data.test
-  //       },
-  //     },
-  //   )
-  //   expect(errors_store.errors.length).toBe(0)
-  //   expect(response_value).toBe("ok")
-  // })
+  test("onResponse", async () => {
+    registerEndpoint(schema.$id, {
+      method: "PUT",
+      handler: () => ({ test: "ok" }),
+    })
+    var file = new File(["fake_file"], "fake_file.txt")
+    var response_value
+    await upload_file(
+      { route: schema.$id, file },
+      {
+        response_function: (response) => {
+          response_value = response._data.test
+        },
+      },
+    )
+    expect(errors_store.errors.length).toBe(0)
+    expect(response_value).toBe("ok")
+  })
 })
diff --git a/test/stores/Viewer.nuxt.test.js b/test/stores/Viewer.nuxt.test.js
@@ -7,11 +7,11 @@ describe("Viewer Store", () => {
   })
   describe("getters", () => {
     test("base_url", () => {
-      const geode_store = use_geode_store()
+      const viewer_store = use_geode_store()
       const cloud_store = use_cloud_store()
       cloud_store.$patch({ ID: "123456" })
-      geode_store.start_request()
-      expect(geode_store.request_counter).toBe(1)
+      viewer_store.start_request()
+      expect(viewer_store.request_counter).toBe(1)
     })
     test("is_busy", () => {
       const viewer_store = use_viewer_store()

Original file line number	Diff line number	Diff line change
`@@ -66,13 +66,11 @@`
`66`	`66`	`async function get_crs_table() {`
`67`	`67`	`const params = { input_geode_object }`
`68`	`68`	`toggle_loading()`
`69`		`- console.log("get_crs_table")`
`70`	`69`	`await api_fetch(`
`71`	`70`	`{ schema, params },`
`72`	`71`	`{`
`73`	`72`	`response_function: (response) => {`
`74`	`73`	`crs_list.value = response._data.crs_list`
`75`		`- console.log("crs_list", response._data.crs_list)`
`76`	`74`	`},`
`77`	`75`	`},`
`78`	`76`	`)`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@`
`69`	`69`	`const toggle_loading = useToggle(loading)`
`70`	`70`
`71`	`71`	`function files_uploaded_event(value) {`
`72`		`- console.log("update_values")`
`73`	`72`	`emit("update_values", { additional_files: value })`
`74`	`73`	`missing_files()`
`75`	`74`	`}`