@geode/opengeodeweb-front 10.13.0 → 10.13.1-rc.2

package/app/components/FetchingData.vue

@@ -1,12 +1,46 @@
+<script setup>
+const DEFAULT_SIZE = 22;
+const DEFAULT_WIDTH = 3;
+
+const {
+  text = "Fetching data...",
+  size = DEFAULT_SIZE,
+  width = DEFAULT_WIDTH,
+} = defineProps({
+  text: {
+    type: String,
+  },
+  size: {
+    type: [Number, String],
+  },
+  width: {
+    type: [Number, String],
+  },
+});
+</script>
+
 <template>
-  <Transition name="slide-fade" class="pa-0">
-    <v-row align="center" class="pa-0">
-      <v-col cols="auto" class="pa-0">
-        <v-progress-circular :size="22" :width="3" color="primary" indeterminate />
-      </v-col>
-      <v-col cols="auto">
-        <p>Fetching data...</p>
+  <Transition name="slide-fade">
+    <v-row align="center" justify="center" class="pa-0 ma-0 fill-height">
+      <v-col cols="auto" class="pa-0 d-flex flex-column align-center">
+        <v-progress-circular
+          :size="size"
+          :width="width"
+          color="primary"
+          indeterminate
+          class="ma-2"
+        />
+        <p v-if="text" class="text-body-2 text-medium-emphasis">
+          {{ text }}
+        </p>
       </v-col>
     </v-row>
   </Transition>
 </template>
+
+<style scoped>
+.fill-height {
+  height: 100%;
+  min-height: 100px;
+}
+</style>

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

@@ -1,4 +1,5 @@
 <script setup>
+import FetchingData from "@ogw_front/components/FetchingData.vue";
 import ObjectTreeControls from "@ogw_front/components/Viewer/ObjectTree/Base/Controls.vue";
 import ObjectTreeItemLabel from "@ogw_front/components/Viewer/ObjectTree/Base/ItemLabel.vue";
 import { compareSelections } from "@ogw_front/utils/treeview";
@@ -63,7 +64,10 @@ async function onSelectionChange(current) {
       @toggle-sort="toggleSort"
     />
 
+    <FetchingData v-if="items === undefined" :size="48" :width="4" text="" />
+
     <v-treeview
+      v-else
       :selected="mesh_components_selection"
       v-model:opened="opened"
       :items="processedItems"

package/app/composables/use_tree_filter.js

@@ -33,9 +33,12 @@ function useTreeFilter(rawItems, options = {}) {
   const sortType = ref(options.defaultSort || "name");
   const filterOptions = ref(options.defaultFilters || {});
 
-  const availableFilterOptions = computed(() =>
-    rawItems.value.map((category) => category.title || category.id),
-  );
+  const availableFilterOptions = computed(() => {
+    if (!rawItems.value) {
+      return [];
+    }
+    return rawItems.value.map((category) => category.title || category.id);
+  });
 
   watch(
     availableFilterOptions,
@@ -49,15 +52,18 @@ function useTreeFilter(rawItems, options = {}) {
     { immediate: true },
   );
 
-  const processedItems = computed(() =>
-    sortAndFormatItems(
+  const processedItems = computed(() => {
+    if (!rawItems.value) {
+      return [];
+    }
+    return sortAndFormatItems(
       rawItems.value.filter((category) => {
         const key = category.title || category.id;
         return filterOptions.value[key] !== false;
       }),
       sortType.value,
-    ),
-  );
+    );
+  });
 
   function toggleSort() {
     sortType.value = sortType.value === "name" ? "id" : "name";

package/app/stores/data.js

@@ -73,7 +73,7 @@ export const useDataStore = defineStore("data", () => {
         const unwrapped_id = unref(id);
         return formatedMeshComponents(unwrapped_id);
       }),
-      { initialValue: [] },
+      { initialValue: undefined },
     );
   }
 

package/internal/database/database.js

@@ -1,4 +1,5 @@
 import { BaseDatabase } from "./base_database";
+import { Dexie } from "dexie";
 import { ExtendedDatabase } from "./extended_database";
 
 class Database extends BaseDatabase {
@@ -51,6 +52,7 @@ class Database extends BaseDatabase {
   }
 }
 
+await Dexie.delete("Database");
 const databaseContainer = { instance: new Database() };
 
 const database = new Proxy(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.13.0",
+  "version": "10.13.1-rc.2",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {
@@ -34,8 +34,8 @@
     "build": ""
   },
   "dependencies": {
-    "@geode/opengeodeweb-back": "latest",
-    "@geode/opengeodeweb-viewer": "latest",
+    "@geode/opengeodeweb-back": "next",
+    "@geode/opengeodeweb-viewer": "next",
     "@google-cloud/run": "3.2.0",
     "@kitware/vtk.js": "33.3.0",
     "@mdi/font": "7.4.47",