@geode/opengeodeweb-front 10.3.0 → 10.3.1

package/app/stores/infra.js

@@ -1,5 +1,5 @@
-import Status from "@ogw_front/utils/status"
 import { appMode, getAppMode } from "@ogw_front/utils/app_mode"
+import Status from "@ogw_front/utils/status"
 import { useLambdaStore } from "@ogw_front/stores/lambda"
 
 export const useInfraStore = defineStore("infra", {
@@ -12,7 +12,7 @@ export const useInfraStore = defineStore("infra", {
   }),
   getters: {
     domain_name() {
-      if (this.app_mode == appMode.CLOUD) {
+      if (this.app_mode === appMode.CLOUD) {
         return useRuntimeConfig().public.API_URL
       }
       return "localhost"
@@ -44,14 +44,18 @@ export const useInfraStore = defineStore("infra", {
         this.microservices.map((store) => store.$id),
       )
 
-      if (this.status === Status.CREATED) return
+      if (this.status === Status.CREATED) {
+        return
+      }
 
-      return navigator.locks.request("infra.create_backend", async (lock) => {
+      return navigator.locks.request("infra.create_backend", async () => {
         this.status = Status.CREATING
-        if (this.status === Status.CREATED) return
+        if (this.status === Status.CREATED) {
+          return
+        }
         console.log("[INFRA] Lock granted for create_backend")
 
-        if (this.app_mode == appMode.DESKTOP) {
+        if (this.app_mode === appMode.DESKTOP) {
           console.log("[INFRA] DESKTOP mode - Launching microservices...")
           const microservices_with_launch = this.microservices.filter(
             (store) => store.launch,
@@ -62,10 +66,10 @@ export const useInfraStore = defineStore("infra", {
           )
           const ports = await Promise.all(port_promises)
 
-          microservices_with_launch.forEach((store, index) => {
+          for (const [index, store] of microservices_with_launch.entries()) {
             store.$patch({ default_local_port: ports[index] })
-          })
-        } else if (this.app_mode == appMode.CLOUD) {
+          }
+        } else if (this.app_mode === appMode.CLOUD) {
           console.log("[INFRA] CLOUD mode - Launching lambda...")
           const lambdaStore = useLambdaStore()
           this.ID = await lambdaStore.launch()
@@ -84,15 +88,13 @@ export const useInfraStore = defineStore("infra", {
         this.microservices.map((store) => store.$id),
       )
 
-      const connection_promises = this.microservices.map((store) => {
-        return store.connect().then(() => {
+      await Promise.all(
+        this.microservices.map(async (store) => {
+          await store.connect()
           console.log("[INFRA] Microservice connected:", store.$id)
-        })
-      })
-
-      await Promise.all(connection_promises)
+        }),
+      )
       console.log("[INFRA] All microservices connected")
-      return
     },
   },
   share: {

package/app/stores/lambda.js

@@ -15,15 +15,7 @@ export const useLambdaStore = defineStore("lambda", {
     base_url() {
       const public_runtime_config = useRuntimeConfig().public
       const domain_name = public_runtime_config.API_URL
-      const url =
-        this.protocol +
-        "://" +
-        domain_name +
-        ":" +
-        this.port +
-        public_runtime_config.SITE_BRANCH +
-        public_runtime_config.PROJECT +
-        "/createbackend"
+      const url = `${this.protocol}://${domain_name}:${this.port}${public_runtime_config.SITE_BRANCH}${public_runtime_config.PROJECT}/createbackend`
       return url
     },
     is_busy() {

package/app/stores/menu.js

@@ -2,39 +2,39 @@
 import PointSetPointsOptions from "@ogw_front/components/Viewer/PointSet/SpecificPointsOptions"
 
 // EdgedCurve components
-import EdgedCurvePointsOptions from "@ogw_front/components/Viewer/EdgedCurve/PointsOptions"
 import EdgedCurveEdgesOptions from "@ogw_front/components/Viewer/EdgedCurve/SpecificEdgesOptions"
+import EdgedCurvePointsOptions from "@ogw_front/components/Viewer/EdgedCurve/PointsOptions"
 
 // PolygonalSurface components
-import PolygonalSurfacePointsOptions from "@ogw_front/components/Viewer/PolygonalSurface/PointsOptions"
 import PolygonalSurfaceEdgesOptions from "@ogw_front/components/Viewer/PolygonalSurface/EdgesOptions"
+import PolygonalSurfacePointsOptions from "@ogw_front/components/Viewer/PolygonalSurface/PointsOptions"
 import PolygonalSurfacePolygonsOptions from "@ogw_front/components/Viewer/PolygonalSurface/SpecificPolygonsOptions"
 
 // TriangulatedSurface components
-import TriangulatedSurfacePointsOptions from "@ogw_front/components/Viewer/TriangulatedSurface/PointsOptions"
 import TriangulatedSurfaceEdgesOptions from "@ogw_front/components/Viewer/TriangulatedSurface/EdgesOptions"
+import TriangulatedSurfacePointsOptions from "@ogw_front/components/Viewer/TriangulatedSurface/PointsOptions"
 import TriangulatedSurfaceTrianglesOptions from "@ogw_front/components/Viewer/TriangulatedSurface/TrianglesOptions"
 
 // Grid 2D components
-import Grid2DPointsOptions from "@ogw_front/components/Viewer/Grid/2D/PointsOptions"
-import Grid2DEdgesOptions from "@ogw_front/components/Viewer/Grid/2D/EdgesOptions"
 import Grid2DCellsOptions from "@ogw_front/components/Viewer/Grid/2D/CellsOptions"
+import Grid2DEdgesOptions from "@ogw_front/components/Viewer/Grid/2D/EdgesOptions"
+import Grid2DPointsOptions from "@ogw_front/components/Viewer/Grid/2D/PointsOptions"
 
 // Grid 3D components
-import Grid3DPointsOptions from "@ogw_front/components/Viewer/Grid/3D/PointsOptions"
 import Grid3DEdgesOptions from "@ogw_front/components/Viewer/Grid/3D/EdgesOptions"
+import Grid3DPointsOptions from "@ogw_front/components/Viewer/Grid/3D/PointsOptions"
 // import Grid3DFacetsOptions from "@ogw_front/components/Viewer/Grid/3D/FacetsOptions"
 import Grid3DCellsOptions from "@ogw_front/components/Viewer/Grid/3D/CellsOptions"
 
 // Solid components
-import SolidPointsOptions from "@ogw_front/components/Viewer/Solid/PointsOptions"
 import SolidEdgesOptions from "@ogw_front/components/Viewer/Solid/EdgesOptions"
+import SolidPointsOptions from "@ogw_front/components/Viewer/Solid/PointsOptions"
 import SolidPolygonsOptions from "@ogw_front/components/Viewer/Solid/PolygonsOptions"
 import SolidPolyhedraOptions from "@ogw_front/components/Viewer/Solid/SpecificPolyhedraOptions"
 
 // TetrahedralSolid components
-import TetrahedralSolidTrianglesOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TrianglesOptions"
 import TetrahedralSolidTetrahedraOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TetrahedraOptions"
+import TetrahedralSolidTrianglesOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TrianglesOptions"
 
 // Model components
 import ModelEdgesOptions from "@ogw_front/components/Viewer/Generic/Model/EdgesOptions"
@@ -124,14 +124,14 @@ const menusData = {
 export const useMenuStore = defineStore("menu", () => {
   const menus = shallowRef(menusData)
   const display_menu = ref(false)
-  const current_id = ref(null)
+  const current_id = ref(undefined)
   const menuX = ref(0)
   const menuY = ref(0)
   const containerWidth = ref(window.innerWidth)
   const containerHeight = ref(window.innerHeight)
   const containerTop = ref(0)
   const containerLeft = ref(0)
-  const active_item_index = ref(null)
+  const active_item_index = ref(undefined)
 
   function getMenuItems(objectType, geodeObject) {
     if (!objectType || !geodeObject || !menus.value[objectType]) {
@@ -141,8 +141,8 @@ export const useMenuStore = defineStore("menu", () => {
   }
 
   function closeMenu() {
-    active_item_index.value = null
-    current_id.value = null
+    active_item_index.value = undefined
+    current_id.value = undefined
     menuX.value = 0
     menuY.value = 0
     display_menu.value = false
@@ -183,7 +183,7 @@ export const useMenuStore = defineStore("menu", () => {
 
   function toggleItemOptions(index) {
     if (active_item_index.value === index) {
-      active_item_index.value = null
+      active_item_index.value = undefined
     } else {
       active_item_index.value = index
     }

package/app/stores/treeview.js

@@ -1,12 +1,14 @@
 export const useTreeviewStore = defineStore("treeview", () => {
+  const PANEL_WIDTH = 300
+
   const items = ref([])
   const selection = ref([])
   const components_selection = ref([])
   const isAdditionnalTreeDisplayed = ref(false)
-  const panelWidth = ref(300)
+  const panelWidth = ref(PANEL_WIDTH)
   const model_id = ref("")
   const isTreeCollection = ref(false)
-  const selectedTree = ref(null)
+  const selectedTree = ref(undefined)
   const isImporting = ref(false)
   const pendingSelectionIds = ref([])
 
@@ -14,11 +16,11 @@ export const useTreeviewStore = defineStore("treeview", () => {
   function addItem(geode_object_type, name, id, viewer_type) {
     const child = { title: name, id, viewer_type }
 
-    for (let i = 0; i < items.value.length; i++) {
+    for (let i = 0; i < items.value.length; i += 1) {
       if (items.value[i].title === geode_object_type) {
         items.value[i].children.push(child)
-        items.value[i].children.sort((a, b) =>
-          a.title.localeCompare(b.title, undefined, {
+        items.value[i].children.sort((element1, element2) =>
+          element1.title.localeCompare(element2.title, undefined, {
             numeric: true,
             sensitivity: "base",
           }),
@@ -28,8 +30,8 @@ export const useTreeviewStore = defineStore("treeview", () => {
       }
     }
     items.value.push({ title: geode_object_type, children: [child] })
-    items.value.sort((a, b) =>
-      a.title.localeCompare(b.title, undefined, {
+    items.value.sort((element1, element2) =>
+      element1.title.localeCompare(element2.title, undefined, {
         numeric: true,
         sensitivity: "base",
       }),
@@ -59,7 +61,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
   }
 
   function exportStores() {
-    const selectionIds = selection.value.map((c) => c.id)
+    const selectionIds = selection.value.map((store) => store.id)
     return {
       isAdditionnalTreeDisplayed: isAdditionnalTreeDisplayed.value,
       panelWidth: panelWidth.value,
@@ -73,14 +75,14 @@ export const useTreeviewStore = defineStore("treeview", () => {
   async function importStores(snapshot) {
     isAdditionnalTreeDisplayed.value =
       snapshot?.isAdditionnalTreeDisplayed || false
-    panelWidth.value = snapshot?.panelWidth || 300
+    panelWidth.value = snapshot?.panelWidth || PANEL_WIDTH
     model_id.value = snapshot?.model_id || ""
     isTreeCollection.value = snapshot?.isTreeCollection || false
-    selectedTree.value = snapshot?.selectedTree || null
+    selectedTree.value = snapshot?.selectedTree || undefined
 
     pendingSelectionIds.value =
       snapshot?.selectionIds ||
-      (snapshot?.selection || []).map((c) => c.id) ||
+      (snapshot?.selection || []).map((store) => store.id) ||
       []
   }
 
@@ -107,7 +109,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
   }
 
   function removeItem(id) {
-    for (let i = 0; i < items.value.length; i++) {
+    for (let i = 0; i < items.value.length; i += 1) {
       const group = items.value[i]
       const childIndex = group.children.findIndex((child) => child.id === id)
 
@@ -130,7 +132,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
     }
   }
 
-  const clear = () => {
+  function clear() {
     items.value = []
     selection.value = []
     components_selection.value = []

package/app/stores/viewer.js

@@ -1,13 +1,19 @@
+import vtkWSLinkClient, {
+  newInstance,
+} from "@kitware/vtk.js/IO/Core/WSLinkClient"
+// oxlint-disable-next-line id-length
 import _ from "lodash"
-import vtkWSLinkClient from "@kitware/vtk.js/IO/Core/WSLinkClient"
+// oxlint-disable-next-line no-unassigned-import
 import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
-import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 import Status from "@ogw_front/utils/status"
 import { appMode } from "@ogw_front/utils/app_mode"
-import { viewer_call } from "../../internal/utils/viewer_call"
+import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 import { useInfraStore } from "@ogw_front/stores/infra"
+import { viewer_call } from "../../internal/utils/viewer_call"
 
-const request_timeout = 10 * 1000
+const MS_PER_SECOND = 1000
+const SECONDS_PER_REQUEST = 10
+const request_timeout = MS_PER_SECOND * SECONDS_PER_REQUEST
 
 export const useViewerStore = defineStore(
   "viewer",
@@ -16,27 +22,26 @@ export const useViewerStore = defineStore(
 
     const default_local_port = ref("1234")
     const client = ref({})
-    const config = ref(null)
+    const config = ref(undefined)
     const picking_mode = ref(false)
-    const picked_point = ref({ x: null, y: null })
+    const picked_point = ref({ x: undefined, y: undefined })
     const request_counter = ref(0)
     const status = ref(Status.NOT_CONNECTED)
     const buzy = ref(0)
 
     const protocol = computed(() => {
-      if (useInfraStore().app_mode == appMode.CLOUD) {
+      if (infraStore.app_mode === appMode.CLOUD) {
         return "wss"
-      } else {
-        return "ws"
       }
+      return "ws"
     })
 
     const port = computed(() => {
-      if (useInfraStore().app_mode == appMode.CLOUD) {
+      if (infraStore.app_mode === appMode.CLOUD) {
         return "443"
       }
-      const VIEWER_PORT = useRuntimeConfig().public.VIEWER_PORT
-      if (VIEWER_PORT != null && VIEWER_PORT !== "") {
+      const { VIEWER_PORT } = useRuntimeConfig().public
+      if (VIEWER_PORT !== undefined && VIEWER_PORT !== "") {
         return VIEWER_PORT
       }
       return default_local_port.value
@@ -44,8 +49,8 @@ export const useViewerStore = defineStore(
 
     const base_url = computed(() => {
       let viewer_url = `${protocol.value}://${infraStore.domain_name}:${port.value}`
-      if (infraStore.app_mode == appMode.CLOUD) {
-        if (infraStore.ID == "") {
+      if (infraStore.app_mode === appMode.CLOUD) {
+        if (infraStore.ID === "") {
           throw new Error("ID must not be empty in cloud mode")
         }
         viewer_url += `/${infraStore.ID}/viewer`
@@ -54,16 +59,17 @@ export const useViewerStore = defineStore(
       return viewer_url
     })
 
-    const is_busy = computed(() => {
-      return request_counter.value > 0
-    })
+    const is_busy = computed(() => request_counter.value > 0)
 
     function toggle_picking_mode(value) {
       picking_mode.value = value
     }
 
     async function set_picked_point(x, y) {
-      const response = await get_point_position({ x, y })
+      const response = await request(
+        schemas.opengeodeweb_viewer.generic.get_point_position,
+        { x, y },
+      )
       const { x: world_x, y: world_y } = response
       picked_point.value.x = world_x
       picked_point.value.y = world_y
@@ -71,14 +77,18 @@ export const useViewerStore = defineStore(
     }
 
     async function ws_connect() {
-      if (status.value === Status.CONNECTED) return
-
+      if (status.value === Status.CONNECTED) {
+        return
+      }
       return navigator.locks.request("viewer.ws_connect", async (lock) => {
-        if (status.value === Status.CONNECTED) return
+        if (status.value === Status.CONNECTED) {
+          return
+        }
         try {
           console.log("VIEWER LOCK GRANTED !", lock)
           status.value = Status.CONNECTING
-          const SmartConnect = await import("wslink/src/SmartConnect")
+          const { default: SmartConnect } =
+            await import("wslink/src/SmartConnect")
           vtkWSLinkClient.setSmartConnectClass(SmartConnect)
 
           const config_obj = { application: "Viewer" }
@@ -90,7 +100,7 @@ export const useViewerStore = defineStore(
           }
           let clientToConnect = client.value
           if (_.isEmpty(clientToConnect)) {
-            clientToConnect = vtkWSLinkClient.newInstance()
+            clientToConnect = newInstance()
           }
 
           // Connect to busy store
@@ -101,17 +111,13 @@ export const useViewerStore = defineStore(
 
           // Error
           clientToConnect.onConnectionError((httpReq) => {
-            const message =
-              (httpReq && httpReq.response && httpReq.response.error) ||
-              `Connection error`
+            const message = httpReq?.response?.error || `Connection error`
             console.error(message)
           })
 
           // Close
           clientToConnect.onConnectionClose((httpReq) => {
-            const message =
-              (httpReq && httpReq.response && httpReq.response.error) ||
-              `Connection close`
+            const message = httpReq?.response?.error || `Connection close`
             console.error(message)
           })
 
@@ -120,7 +126,7 @@ export const useViewerStore = defineStore(
             await import("@kitware/vtk.js/Rendering/Misc/RemoteView")
           client.value = await clientToConnect.connect(config_obj)
           connectImageStream(client.value.getConnection().getSession())
-          client.value.endBusy()
+          clientToConnect.endBusy()
           await request(
             schemas.opengeodeweb_viewer.viewer.reset_visualization,
             {},
@@ -137,16 +143,16 @@ export const useViewerStore = defineStore(
     }
 
     function start_request() {
-      request_counter.value++
+      request_counter.value += 1
     }
 
     function stop_request() {
-      request_counter.value--
+      request_counter.value -= 1
     }
 
     async function launch() {
       console.log("[VIEWER] Launching viewer microservice...")
-      const port = await window.electronAPI.run_viewer()
+      const port = await globalThis.electronAPI.run_viewer()
       console.log("[VIEWER] Viewer launched on port:", port)
       return port
     }

package/app/utils/app_mode.js

@@ -1,12 +1,12 @@
 import isElectron from "is-electron"
 
-export const appMode = {
+const appMode = {
   DESKTOP: "DESKTOP",
   BROWSER: "BROWSER",
   CLOUD: "CLOUD",
 }
 
-export function getAppMode() {
+function getAppMode() {
   if (isElectron()) {
     return appMode.DESKTOP
   }
@@ -15,4 +15,5 @@ export function getAppMode() {
   }
   return appMode.CLOUD
 }
-export default { appMode, getAppMode }
+
+export { appMode, getAppMode }