@geode/opengeodeweb-front 10.14.0-rc.3 → 10.14.0-rc.4

package/app/components/Viewer/ObjectTree/Views/GlobalObjects.vue

@@ -84,6 +84,7 @@ function isModel(item) {
       item-value="id"
       select-strategy="classic"
       selectable
+      items-registration="props"
     >
       <template #title="{ item }">
         <ObjectTreeItemLabel

package/app/components/Viewer/ObjectTree/Views/ModelComponents.vue

@@ -23,8 +23,8 @@ const opened = computed({
   set: (val) => treeviewStore.setOpened(viewId, val),
 });
 
-const items = dataStore.refFormatedMeshComponents(toRef(() => viewId));
-const mesh_components_selection = dataStyleStore.visibleMeshComponents(toRef(() => viewId));
+const items = dataStore.refFormatedMeshComponents(viewId);
+const mesh_components_selection = dataStyleStore.visibleMeshComponents(viewId);
 
 const {
   search,
@@ -88,6 +88,7 @@ function showContextMenu(event, item) {
       item-value="id"
       select-strategy="independent"
       selectable
+      items-registration="props"
       @update:selected="onSelectionChange"
     >
       <template #title="{ item }">

package/app/stores/data.js

@@ -9,6 +9,7 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 
 const viewer_generic_schemas = viewer_schemas.opengeodeweb_viewer.generic;
 
+// oxlint-disable-next-line max-lines-per-function, max-statements
 export const useDataStore = defineStore("data", () => {
   const viewerStore = useViewerStore();
 
@@ -67,12 +68,9 @@ export const useDataStore = defineStore("data", () => {
       }));
   }
 
-  function refFormatedMeshComponents(id) {
+  function refFormatedMeshComponents(modelId) {
     return useObservable(
-      liveQuery(() => {
-        const unwrapped_id = unref(id);
-        return formatedMeshComponents(unwrapped_id);
-      }),
+      liveQuery(() => formatedMeshComponents(modelId)),
       { initialValue: undefined },
     );
   }

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

@@ -10,6 +10,7 @@ import { useModelSelection } from "./selection";
 import { useModelSurfacesStyle } from "./surfaces";
 import { useModelVisibilityStyle } from "./visibility";
 
+// oxlint-disable-next-line max-lines-per-function, max-statements
 function useModelStyle() {
   const dataStore = useDataStore();
   const dataStyleState = useDataStyleState();

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

@@ -1,6 +1,7 @@
 import { MESH_TYPES } from "@ogw_front/utils/default_styles";
 import { database } from "@ogw_internal/database/database";
 import { liveQuery } from "dexie";
+import { useObservable } from "@vueuse/rxjs";
 
 function buildSelection(modelId, components, stylesMap, typeStylesMap, dataStyleState) {
   const componentsByType = Object.fromEntries(
@@ -40,44 +41,24 @@ function buildSelection(modelId, components, stylesMap, typeStylesMap, dataStyle
   return selection;
 }
 
-function useModelSelection(id_ref, dataStyleState) {
-  const selection = ref([]);
-  watch(
-    () => unref(id_ref),
-    (modelId, _prev, onCleanup) => {
-      if (!modelId) {
-        selection.value = [];
-        return;
+function useModelSelection(modelId, dataStyleState) {
+  return useObservable(
+    liveQuery(async () => {
+      const [allComponents, componentStyles, typeStyles] = await Promise.all([
+        database.model_components.where("id").equals(modelId).toArray(),
+        database.model_component_datastyle.where("id_model").equals(modelId).toArray(),
+        database.model_component_type_datastyle.where("id_model").equals(modelId).toArray(),
+      ]);
+      if (allComponents.length === 0) {
+        return [];
       }
-      const observable = liveQuery(async () => {
-        const [allComponents, componentStyles, typeStyles] = await Promise.all([
-          database.model_components.where("id").equals(modelId).toArray(),
-          database.model_component_datastyle.where("id_model").equals(modelId).toArray(),
-          database.model_component_type_datastyle.where("id_model").equals(modelId).toArray(),
-        ]);
-
-        if (allComponents.length === 0) {
-          return [];
-        }
-
-        const stylesMap = Object.fromEntries(
-          componentStyles.map((style) => [style.id_component, style]),
-        );
-        const typeStylesMap = Object.fromEntries(typeStyles.map((style) => [style.type, style]));
-
-        return buildSelection(modelId, allComponents, stylesMap, typeStylesMap, dataStyleState);
-      });
-
-      const subscription = observable.subscribe({
-        next: (val) => {
-          selection.value = val;
-        },
-      });
-      onCleanup(() => subscription.unsubscribe());
-    },
-    { immediate: true },
+      const stylesMap = Object.fromEntries(
+        componentStyles.map((style) => [style.id_component, style]),
+      );
+      const typeStylesMap = Object.fromEntries(typeStyles.map((style) => [style.type, style]));
+      return buildSelection(modelId, allComponents, stylesMap, typeStylesMap, dataStyleState);
+    }),
   );
-  return selection;
 }
 
 export { buildSelection, useModelSelection };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.14.0-rc.3",
+  "version": "10.14.0-rc.4",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {
@@ -63,7 +63,7 @@
     "sass": "1.87.0",
     "semver": "7.7.1",
     "uuid": "11.1.0",
-    "vuetify": "3.10.11",
+    "vuetify": "3.12.5",
     "vuetify-nuxt-module": "0.18.7",
     "ws": "8.18.3",
     "wslink": "1.12.4"