Merge branch 'next' into feat/opengeodeweb-viewer

Author: JulienChampagnol

components/Recaptcha.vue

@@ -2,7 +2,7 @@
   <ClientOnly>
     <vue-recaptcha
       ref="recaptcha"
-      sitekey="6Lce72wgAAAAAOXrHyDxRQBhk6NDTD80MrXOlgbC"
+      :sitekey="site_key"
       :load-recaptcha-script="true"
       align-self="center"
       @expired="is_captcha_validated = false"

stores/viewer.js

@@ -1,12 +1,9 @@
 import _ from "lodash"
 import vtkWSLinkClient from "@kitware/vtk.js/IO/Core/WSLinkClient"
-import SmartConnect from "wslink/src/SmartConnect"
 import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
 import { connectImageStream } from "@kitware/vtk.js/Rendering/Misc/RemoteView"
 import schemas from "@geode/opengeodeweb-viewer/schemas.json"
 
-vtkWSLinkClient.setSmartConnectClass(SmartConnect)
-
 export const use_viewer_store = defineStore("viewer", {
   state: () => ({
     client: {},
@@ -42,64 +39,71 @@ export const use_viewer_store = defineStore("viewer", {
       this.picked_point.y = world_y
       this.picking_mode = false
     },
-    ws_connect() {
-      if (process.env.NODE_ENV != "test") {
-        const config = { application: "Viewer" }
-        config.sessionURL = this.base_url
+    async ws_connect() {
+      if (process.env.NODE_ENV == "test") {
+        return
+      }
+      const SmartConnect = await import("wslink/src/SmartConnect")
+      vtkWSLinkClient.setSmartConnectClass(SmartConnect)
 
-        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 config = { application: "Viewer" }
+      config.sessionURL = this.base_url
 
-        // Connect to busy store
-        clientToConnect.onBusyChange((count) => {
-          this.buzy = count
-        })
-        clientToConnect.beginBusy()
+      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()
+      }
 
-        // Error
-        clientToConnect.onConnectionError((httpReq) => {
-          const message =
-            (httpReq && httpReq.response && httpReq.response.error) ||
-            `Connection error`
-          console.error(message)
-        })
+      // Connect to busy store
+      clientToConnect.onBusyChange((count) => {
+        this.buzy = count
+      })
+      clientToConnect.beginBusy()
 
-        // Close
-        clientToConnect.onConnectionClose((httpReq) => {
-          const message =
-            (httpReq && httpReq.response && httpReq.response.error) ||
-            `Connection close`
-          console.error(message)
-        })
+      // 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)
+      })
 
-        // Connect
-        clientToConnect
-          .connect(config)
-          .then((validClient) => {
-            connectImageStream(validClient.getConnection().getSession())
-            this.client = validClient
-            clientToConnect.endBusy()
+      // Connect
+      const { connectImageStream } = await import(
+        "@kitware/vtk.js/Rendering/Misc/RemoteView"
+      )
+      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,
-            })
-            viewer_call({
-              schema: schemas.opengeodeweb_viewer.reset,
-            })
-            this.is_running = true
+          // Now that the client is ready let's setup the server for us
+          viewer_call({
+            schema: schemas.opengeodeweb_viewer.create_visualization,
           })
-          .catch((error) => {
-            console.error(error)
+          viewer_call({
+            schema: schemas.opengeodeweb_viewer.reset,
           })
-      }
+          this.is_running = true
+        })
+        .catch((error) => {
+          console.error(error)
+        })
     },
     start_request() {
       this.request_counter++