@geode/opengeodeweb-front 10.14.0-rc.2 → 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/app/utils/local/microservices.js

@@ -13,7 +13,7 @@ import { commandExistsSync, waitForReady } from "./scripts.js";
 import { executableName, executablePath } from "./path.js";
 import { microservicesMetadatasPath, projectMicroservices } from "./cleanup.js";
 
-const DEFAULT_TIMEOUT_SECONDS = 30;
+const DEFAULT_TIMEOUT_SECONDS = 60;
 const MILLISECONDS_PER_SECOND = 1000;
 
 function getAvailablePort() {

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/internal/utils/api_fetch.js

@@ -7,7 +7,7 @@ const ERROR_400 = 400;
 export function api_fetch(
   microservice,
   { schema, params },
-  { request_error_function, response_function, response_error_function } = {},
+  { request_error_function, response_function, response_error_function, timeout } = {},
 ) {
   const feedbackStore = useFeedbackStore();
 
@@ -36,30 +36,42 @@ export function api_fetch(
   if (schema.max_retry) {
     request_options.max_retry = schema.max_retry;
   }
-  return $fetch(schema.$id, {
-    baseURL: microservice.base_url,
-    ...request_options,
-    onRequestError({ error }) {
-      microservice.stop_request();
-      feedbackStore.add_error(error.code, schema.$id, error.message, error.stack);
-      if (request_error_function) {
-        request_error_function(error);
-      }
-    },
-    onResponse({ response }) {
-      if (response.ok) {
+
+  function performFetch() {
+    return $fetch(schema.$id, {
+      baseURL: microservice.base_url,
+      ...request_options,
+      onRequestError({ error }) {
+        microservice.stop_request();
+        feedbackStore.add_error(error.code, schema.$id, error.message, error.stack);
+        if (request_error_function) {
+          request_error_function(error);
+        }
+      },
+      onResponse({ response }) {
+        if (response.ok) {
+          microservice.stop_request();
+          if (response_function) {
+            response_function(response._data);
+          }
+        }
+      },
+      onResponseError({ response }) {
         microservice.stop_request();
-        if (response_function) {
-          response_function(response._data);
+        feedbackStore.add_error(response.status, schema.$id, response.name, response.description);
+        if (response_error_function) {
+          response_error_function(response);
         }
-      }
-    },
-    onResponseError({ response }) {
-      microservice.stop_request();
-      feedbackStore.add_error(response.status, schema.$id, response.name, response.description);
-      if (response_error_function) {
-        response_error_function(response);
-      }
-    },
-  });
+      },
+    });
+  }
+
+  if (timeout !== undefined && timeout > 0) {
+    return pTimeout(performCall(), {
+      milliseconds: timeout,
+      message: `${schema.$id}: Timed out after ${timeout}ms`,
+    });
+  }
+
+  return performFetch();
 }

package/internal/utils/viewer_call.js

@@ -4,7 +4,7 @@ import { validate_schema } from "@ogw_front/utils/validate_schema";
 
 const ERROR_400 = 400;
 
-export async function viewer_call(
+export function viewer_call(
   microservice,
   { schema, params = {} },
   { request_error_function, response_function, response_error_function, timeout } = {},
@@ -50,11 +50,11 @@ export async function viewer_call(
   }
 
   if (timeout !== undefined && timeout > 0) {
-    return await pTimeout(performCall(), {
+    return pTimeout(performCall(), {
       milliseconds: timeout,
       message: `${schema.$id}: Timed out after ${timeout}ms`,
     });
   }
 
-  return await performCall();
+  return performCall();
 }

package/nuxt.config.js

@@ -5,7 +5,6 @@ import path from "node:path";
 import package_json from "./package.json";
 
 const __dirname = import.meta.dirname;
-const oneMinute = 60_000;
 
 export default defineNuxtConfig({
   runtimeConfig: {
@@ -38,12 +37,6 @@ export default defineNuxtConfig({
     transpile: ["vuetify"],
   },
 
-  nitro: {
-    routeRules: {
-      "/api/**": { timeout: oneMinute },
-    },
-  },
-
   vuetify: {
     vuetifyOptions: {
       defaults: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.14.0-rc.2",
+  "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"