@geode/opengeodeweb-front 10.29.0 → 10.29.1

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

@@ -127,10 +127,10 @@ function expandAll() {
 }
 
 function extractIds(node) {
-  if (node.children && node.children.length > 0) {
+  if (node.children) {
     return node.children.flatMap((child) => extractIds(child));
   }
-  if (node.viewer_id !== undefined && node.viewer_id !== null) {
+  if (Number.isInteger(node.viewer_id)) {
     return [node.viewer_id];
   }
   return [];
@@ -187,7 +187,7 @@ function getLeafViewerIds(item) {
 
       <template #append="{ item }">
         <v-btn
-          v-if="item.category || (item.children && item.children.length > 0)"
+          v-if="getLeafViewerIds(item).length > 0"
           icon="mdi-target"
           size="medium"
           variant="text"

package/app/composables/virtual_tree.js

@@ -33,7 +33,7 @@ export function useVirtualTree(propsIn, emit) {
 
   function getLeafChildrenIds(item, ids = []) {
     const children = item[actualItemProps.value.children];
-    if (children && children.length > 0) {
+    if (children) {
       for (const child of children) {
         getLeafChildrenIds(child, ids);
       }

package/app/stores/data_helpers/collections.js

@@ -1,8 +1,16 @@
+import { MESH_COMPONENT_TYPES } from "@ogw_front/utils/default_styles";
 import { database } from "@ogw_internal/database/database.js";
 import { liveQuery } from "dexie";
 import { useDataMesh } from "./mesh.js";
 import { useObservable } from "@vueuse/rxjs";
 
+function pluralize(type) {
+  if (type.endsWith("y")) {
+    return `${type.slice(0, -1)}ies`;
+  }
+  return `${type}s`;
+}
+
 export function useDataCollections() {
   const model_components_db = database.model_components;
   const model_components_relation_db = database.model_components_relation;
@@ -12,11 +20,7 @@ export function useDataCollections() {
     const count = await model_components_db
       .where("id")
       .equals(modelId)
-      .and((component) =>
-        ["Horizon", "Fault", "FaultBlock", "StratigraphicUnit", "ModelBoundary"].includes(
-          component.type,
-        ),
-      )
+      .and((component) => !MESH_COMPONENT_TYPES.includes(component.type))
       .count();
     return count > 0;
   }
@@ -24,11 +28,7 @@ export function useDataCollections() {
   async function getAllCollectionComponents(modelId) {
     const items = await model_components_db.where("id").equals(modelId).toArray();
     return items
-      .filter((component) =>
-        ["Horizon", "Fault", "FaultBlock", "StratigraphicUnit", "ModelBoundary"].includes(
-          component.type,
-        ),
-      )
+      .filter((component) => !MESH_COMPONENT_TYPES.includes(component.type))
       .map((component) => ({
         id: component.geode_id,
         title: component.name,
@@ -68,19 +68,13 @@ export function useDataCollections() {
 
   async function formatedCollectionComponents(modelId) {
     const byType = await fetchAllCollectionComponents(modelId);
-    const collectionTitles = {
-      Horizon: "Horizons",
-      Fault: "Faults",
-      FaultBlock: "FaultBlocks",
-      StratigraphicUnit: "StratigraphicUnits",
-      ModelBoundary: "ModelBoundaries",
-    };
+    const collectionTypes = Object.keys(byType);
 
-    return Object.keys(collectionTitles)
+    return collectionTypes
       .filter((type) => byType[type] && byType[type].length > 0)
       .map((type) => ({
         id: type,
-        title: collectionTitles[type],
+        title: pluralize(type),
         children: byType[type],
       }));
   }

package/internal/database/tables/model_components.js

@@ -1,4 +1,4 @@
 export const modelComponentsTable = {
   name: "model_components",
-  schema: "[id+geode_id], [id+type], viewer_id, name, is_active",
+  schema: "[id+geode_id], id, [id+type], viewer_id, name, is_active",
 };

package/internal/database/tables/model_components_relation.js

@@ -1,4 +1,4 @@
 export const modelComponentsRelationTable = {
   name: "model_components_relation",
-  schema: "[id+parent+child], type",
+  schema: "[id+parent+child], id, type",
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.29.0",
+  "version": "10.29.1",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {

package/tests/unit/composables/virtual_tree.nuxt.test.js

@@ -0,0 +1,63 @@
+// Third party imports
+import { describe, expect, test, vi } from "vitest";
+import { ref } from "vue";
+
+// Local imports
+import { useVirtualTree } from "@ogw_front/composables/virtual_tree";
+
+describe("virtual tree composable", () => {
+  test("correctly handles empty collections without treating them as leaf nodes", () => {
+    // Structure:
+    // ModelBoundaries (category)
+    //  ├── empty_collection (empty collection component)
+    //  └── non_empty_collection (non-empty collection component)
+    //       └── mesh1 (leaf mesh component)
+    const items = [
+      {
+        id: "ModelBoundaries",
+        title: "Model Boundaries",
+        children: [
+          {
+            id: "empty_collection",
+            title: "Empty Collection",
+            children: [],
+          },
+          {
+            id: "non_empty_collection",
+            title: "Non-empty Collection",
+            children: [
+              {
+                id: "mesh1",
+                title: "Mesh 1",
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    const props = ref({
+      items,
+      opened: [],
+      selected: ["mesh1"],
+      selection: { selectable: true, strategy: "classic" },
+    });
+
+    const emit = vi.fn();
+    const { isSelected, getIndeterminate } = useVirtualTree(props, emit);
+
+    // 1. The empty collection has no leaf children, so it should not be considered selected
+    expect(isSelected(items[0].children[0])).toBe(false);
+
+    // 2. The non-empty collection has "mesh1" as a child (which is in the selected set), so it is selected
+    expect(isSelected(items[0].children[1])).toBe(true);
+
+    // 3. The category root (ModelBoundaries) only has "mesh1" as an active leaf descendant.
+    // Since "mesh1" is selected, the category root must evaluate to selected (true).
+    // (If the bug were present, it would look for both "empty_collection" and "mesh1" in selected, resulting in false)
+    expect(isSelected(items[0])).toBe(true);
+
+    // 4. ModelBoundaries should not be indeterminate since all its leaf descendants are selected
+    expect(getIndeterminate(items[0])).toBe(false);
+  });
+});

package/tests/unit/stores/data.nuxt.test.js

@@ -0,0 +1,127 @@
+// Third party imports
+import { beforeEach, describe, expect, test } from "vitest";
+
+// Local imports
+import { setupActivePinia } from "@ogw_tests/utils";
+import { useDataStore } from "@ogw_front/stores/data";
+
+describe("useDataStore - collections", () => {
+  setupActivePinia();
+
+  beforeEach(async () => {
+    const dataStore = useDataStore();
+    await dataStore.clear();
+  });
+
+  test("correctly recognizes, formats, and pluralizes any collection component type not in MESH_COMPONENT_TYPES", async () => {
+    const dataStore = useDataStore();
+    const modelId = "test_model_id";
+
+    // 1. Add model item
+    await dataStore.addItem({
+      id: modelId,
+      name: "Test Model",
+      viewer_type: "model",
+    });
+
+    // 2. Add mesh components and collection components (including a custom type like "MyCustomCollection")
+    await dataStore.addComponents({
+      id: modelId,
+      mesh_components: [
+        {
+          geode_id: "mesh_corner",
+          name: "Corner 1",
+          type: "Corner",
+          viewer_id: 1,
+          is_active: true,
+        },
+        {
+          geode_id: "mesh_surface",
+          name: "Surface 1",
+          type: "Surface",
+          viewer_id: 2,
+          is_active: true,
+        },
+      ],
+      collection_components: [
+        // Standard collection type
+        { geode_id: "fault1", name: "Fault 1", type: "Fault", viewer_id: 3, is_active: true },
+        // Custom collection type (not previously hardcoded)
+        {
+          geode_id: "custom1",
+          name: "Custom 1",
+          type: "MyCustomCollection",
+          viewer_id: 4,
+          is_active: true,
+        },
+      ],
+    });
+
+    // Add component relations
+    await dataStore.addComponentRelations({
+      id: modelId,
+      collection_components: [
+        { geode_id: "fault1", items: ["mesh_surface"] },
+        { geode_id: "custom1", items: [] },
+      ],
+    });
+
+    // 3. Verify hasCollectionComponents is true
+    const hasCollections = await dataStore.hasCollectionComponents(modelId);
+    expect(hasCollections).toBe(true);
+
+    // 4. Verify getAllCollectionComponents returns both Fault and MyCustomCollection
+    const allCollections = await dataStore.getAllCollectionComponents(modelId);
+    expect(allCollections).toStrictEqual([
+      {
+        id: "custom1",
+        title: "Custom 1",
+        category: "MyCustomCollection",
+        viewer_id: 4,
+        is_active: true,
+      },
+      { id: "fault1", title: "Fault 1", category: "Fault", viewer_id: 3, is_active: true },
+    ]);
+
+    // 5. Verify formatedCollectionComponents groups them and pluralizes the titles
+    const formatted = await dataStore.formatedCollectionComponents(modelId);
+    expect(formatted).toStrictEqual([
+      {
+        id: "MyCustomCollection",
+        title: "MyCustomCollections",
+        children: [
+          {
+            id: "custom1",
+            title: "Custom 1",
+            category: "MyCustomCollection",
+            viewer_id: 4,
+            is_active: true,
+            children: [],
+          },
+        ],
+      },
+      {
+        id: "Fault",
+        title: "Faults",
+        children: [
+          {
+            id: "fault1",
+            title: "Fault 1",
+            category: "Fault",
+            viewer_id: 3,
+            is_active: true,
+            children: [
+              {
+                id: "mesh_surface",
+                title: "Surface 1",
+                category: "Surface",
+                viewer_id: 2,
+                is_active: true,
+              },
+            ],
+          },
+        ],
+      },
+    ]);
+  });
+});