@geode/opengeodeweb-front 10.4.0 → 10.4.1-rc.1

package/.oxlintrc.json

@@ -7,7 +7,7 @@
     "style": "error",
     "restriction": "error"
   },
-  "plugins": ["import", "node", "oxc", "promise", "unicorn", "vitest"],
+  "plugins": ["import", "node", "oxc", "promise", "unicorn", "vitest", "vue"],
   "rules": {
     "unicorn/filename-case": [
       "error",
@@ -15,26 +15,91 @@
         "case": "snakeCase"
       }
     ],
-    "eslint/func-style": [
+    "eslint/func-style": ["error", "declaration"],
+    "eslint/sort-keys": "off",
+    "eslint/no-ternary": "off", // A utiliser pour des opérations simples
+    "oxc/no-async-await": "off",
+    "oxc/no-rest-spread-properties": "off", // Enable if older browser support is needed
+    "eslint/max-statements": ["warn", 20],
+    "eslint/id-length": [
       "error",
       {
-        "style:": "declaration"
+        "exceptions": [
+          "x",
+          "y",
+          "z",
+          "i",
+          "j",
+          "k",
+          "r",
+          "g",
+          "b",
+          "id",
+          "ID",
+          "fs",
+          "os"
+        ],
+        "min": 3
       }
     ],
-    "eslint/sort-keys": "off",
-    "eslint/no-ternary": "off"
+    "eslint/no-console": "warn", // Disable for debugging. Disable later to not have browser logs
+    "sort-imports": ["error", { "allowSeparatedGroups": true }],
+    "eslint/no-undefined": "off", // Conflict with unicorn/no-typeof-undefined which prefers direct undefined comparison
+    "import/prefer-default-export": "off",
+    "import/no-named-export": "off",
+    "import/no-namespace": ["error", { "ignore": ["vuetify/*"] }],
+    "vue/max-props": ["error", { "maxProps": 8 }],
+    "oxc/no-optional-chaining": "off",
+    "node/no-process-env": "off",
+    "no-continue": "off",
+    "import/unambiguous": "off",
+    "max-params": ["warn", { "max": 4 }],
+    "import/no-nodejs-modules": "off",
+    "eslint/no-magic-numbers": [
+      "error",
+      {
+        "ignore": [-1, 0, 1, 2, 3, 4],
+        "ignoreArrayIndexes": true
+      }
+    ]
   },
   "overrides": [
     {
-      "files": ["**/components/*"],
+      "files": ["**/components/**"],
       "rules": {
         "unicorn/filename-case": [
           "error",
           {
-            "case": "PascalCase"
+            "case": "pascalCase"
           }
         ]
       }
+    },
+    {
+      "files": [
+        "app/plugins/**",
+        "node_scripts/**",
+        "server/**",
+        "*.config.js"
+      ],
+      "rules": {
+        "import/no-default-export": "off"
+      }
+    },
+    {
+      "files": ["tests/**"],
+      "rules": {
+        "vitest/require-hook": "off",
+        "vitest/no-hooks": "off",
+        "vitest/no-importing-vitest-globals": "off",
+        "import/no-relative-parent-imports": "warn"
+      }
+    },
+    {
+      "files": ["**/preload.js"],
+      "rules": {
+        "import/no-commonjs": "off"
+      }
     }
   ]
 }

package/app/components/Viewer/BreadCrumb.vue

@@ -13,7 +13,7 @@
 
   const model_id = computed(() => treeviewStore.model_id)
 
-  const metaDatas = computed(() => dataStore.getItem(model_id.value).value)
+  const metaDatas = dataStore.refItem(model_id.value)
 </script>
 
 <template>

package/app/components/Viewer/ContextMenu.vue

@@ -1,5 +1,4 @@
 <script setup>
-  import { useDataStore } from "@ogw_front/stores/data"
   import { useEventListener } from "@vueuse/core"
   import { useMenuStore } from "@ogw_front/stores/menu"
 
@@ -16,7 +15,6 @@
   const CLOSE_DELAY = 100
 
   const menuStore = useMenuStore()
-  const dataStore = useDataStore()
 
   const { id, x, y, containerWidth, containerHeight } = defineProps({
     id: { type: String, required: true },
@@ -26,13 +24,7 @@
     containerHeight: { type: Number, required: true },
   })
 
-  const meta_data = computed(() => {
-    const itemId = id || menuStore.current_id
-    if (!itemId) {
-      return {}
-    }
-    return dataStore.getItem(itemId).value || {}
-  })
+  const meta_data = computed(() => menuStore.current_meta_data || {})
 
   const show_menu = ref(true)
   const isDragging = ref(false)

package/app/stores/data.js

@@ -15,17 +15,18 @@ const viewer_generic_schemas = viewer_schemas.opengeodeweb_viewer.generic
 export const useDataStore = defineStore("data", () => {
   const viewerStore = useViewerStore()
 
-  function getItem(id) {
-    if (!id) {
-      return ref({})
-    }
+  function item(id) {
+    return database.data.get(id)
+  }
+
+  function refItem(id) {
     return useObservable(
       liveQuery(() => database.data.get(id)),
       { initialValue: {} },
     )
   }
 
-  function getAllItems() {
+  function refAllItems() {
     return useObservable(
       liveQuery(() => database.data.toArray()),
       { initialValue: [] },
@@ -181,8 +182,9 @@ export const useDataStore = defineStore("data", () => {
   }
 
   return {
-    getAllItems,
-    getItem,
+    refAllItems,
+    item,
+    refItem,
     meshComponentType,
     formatedMeshComponents,
     registerObject,

package/app/stores/data_style.js

@@ -61,11 +61,11 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
     }
   }
 
-  function applyAllStylesFromState() {
+  async function applyAllStylesFromState() {
     const ids = Object.keys(dataStyleState.styles || {})
     const promises = []
     for (const id of ids) {
-      const meta = dataStore.getItem(id).value
+      const meta = await dataStore.item(id)
       const viewerType = meta?.viewer_type
       const style = dataStyleState.styles[id]
       if (style && viewerType === "mesh") {

package/app/stores/menu.js

@@ -132,6 +132,7 @@ export const useMenuStore = defineStore("menu", () => {
   const containerTop = ref(0)
   const containerLeft = ref(0)
   const active_item_index = ref(undefined)
+  const current_meta_data = ref({})
 
   function getMenuItems(objectType, geodeObject) {
     if (!objectType || !geodeObject || !menus.value[objectType]) {
@@ -143,6 +144,7 @@ export const useMenuStore = defineStore("menu", () => {
   function closeMenu() {
     active_item_index.value = undefined
     current_id.value = undefined
+    current_meta_data.value = {}
     menuX.value = 0
     menuY.value = 0
     display_menu.value = false
@@ -162,6 +164,7 @@ export const useMenuStore = defineStore("menu", () => {
     }
 
     current_id.value = id
+    current_meta_data.value = meta_data || {}
 
     if (x !== undefined && y !== undefined) {
       menuX.value = x
@@ -202,6 +205,7 @@ export const useMenuStore = defineStore("menu", () => {
   return {
     display_menu,
     current_id,
+    current_meta_data,
     menuX,
     menuY,
     containerWidth,

package/internal/stores/data_style/model/index.js

@@ -171,9 +171,9 @@ export default function useModelStyle() {
     return Promise.all(promise_array)
   }
 
-  function setModelMeshComponentsDefaultStyle(id) {
-    const item = dataStore.getItem(id)
-    const { mesh_components } = item.value
+  async function setModelMeshComponentsDefaultStyle(id) {
+    const item = await dataStore.item(id)
+    const { mesh_components } = item
     const promise_array = []
     if ("Corner" in mesh_components) {
       promise_array.push(modelCornersStyleStore.setModelCornersDefaultStyle(id))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.4.0",
+  "version": "10.4.1-rc.1",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {
@@ -31,8 +31,8 @@
     "build": ""
   },
   "dependencies": {
-    "@geode/opengeodeweb-back": "latest",
-    "@geode/opengeodeweb-viewer": "latest",
+    "@geode/opengeodeweb-back": "next",
+    "@geode/opengeodeweb-viewer": "next",
     "@kitware/vtk.js": "33.3.0",
     "@mdi/font": "7.4.47",
     "@pinia/nuxt": "0.11.3",

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

@@ -5,4 +5,4 @@
 #    pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in
 #
 
-opengeodeweb-back==6.*,>=6.2.0rc2
+opengeodeweb-back==6.*,>=6.3.0

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

@@ -5,4 +5,4 @@
 #    pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt tests/integration/microservices/viewer/requirements.in
 #
 
-opengeodeweb-viewer==1.*,>=1.15.4rc1
+opengeodeweb-viewer==1.*,>=1.15.5rc1