@geode/opengeodeweb-front 10.36.0-rc.4 → 10.36.0-rc.5

package/app/components/Viewer/ObjectTree/Base/ItemLabel.vue

@@ -29,6 +29,7 @@ const { width: containerWidth } = useElementSize(labelContainer);
 // The item prop can be either a DisplayItem wrapper (with a `.raw` domain object) or the domain object itself when this component is used outside CommonTreeView's slot machinery; the domain object always carries an id/title at runtime.
 interface LabeledItem {
   id: string;
+  geode_id?: string;
   title?: string;
   is_active?: boolean;
   category?: string;
@@ -96,9 +97,9 @@ async function copyToClipboard(text: string, label: string): Promise<void> {
       </template>
 
       <div class="d-flex flex-column ga-1">
-        <span class="text-caption d-flex align-center">
+        <span v-if="actualItem.geode_id" class="text-caption d-flex align-center">
           <strong class="text-white mr-1">ID:</strong>
-          <span data-testid="tooltipIdValue">{{ actualItem.id }}</span>
+          <span data-testid="tooltipIdValue">{{ actualItem.geode_id }}</span>
           <v-btn
             data-testid="copyIdBtn"
             icon
@@ -106,7 +107,7 @@ async function copyToClipboard(text: string, label: string): Promise<void> {
             density="compact"
             class="ml-1 text-white"
             style="width: 18px; height: 18px; min-width: 18px; min-height: 18px"
-            @click.stop="copyToClipboard(actualItem.id, 'ID')"
+            @click.stop="copyToClipboard(actualItem.geode_id, 'ID')"
           >
             <v-icon size="12">mdi-content-copy</v-icon>
           </v-btn>

package/app/composables/tree_filter.ts

@@ -7,6 +7,8 @@ type ReadonlyMaybeRefOrGetter<Value> = Value | Ref<Value> | (() => Value);
 interface FilterableItem {
   readonly id: unknown;
   readonly title?: string;
+  // Present on geode objects (data and model components), absent on group nodes.
+  readonly geode_id?: string;
   readonly children?: readonly FilterableItem[];
 }
 
@@ -46,15 +48,15 @@ function customFilter(
     return false;
   }
   const query = searchQuery.toLowerCase();
-  const { title = "", id = value } = item.raw;
-  return [title, id].some((field) => String(field).toLowerCase().includes(query));
+  const { title = "", id = value, geode_id: geodeId } = item.raw;
+  return [title, id, geodeId].some((field) => String(field).toLowerCase().includes(query));
 }
 
 // Extracted so we never call String() directly on a value typed as `unknown`/`any`.
 // The `id` field can be anything at runtime, so only stringify primitives that have a sane toString.
 // Anything else falls back to "" instead of risking "[object Object]".
 function toSortKey(item: FilterableItem, field: "title" | "id"): string {
-  const raw = item[field] ?? item.id ?? "";
+  const raw = (field === "id" ? item.geode_id : item.title) ?? item.id ?? "";
   if (typeof raw === "string" || typeof raw === "number" || typeof raw === "boolean") {
     return String(raw);
   }
@@ -136,7 +138,7 @@ function useTreeFilter(
       const children = (category.children ?? []).filter((child) =>
         customFilter(child.id, search.value, { raw: child }),
       );
-      if (children.length > 0 || customFilter(category.id, search.value, { raw: category })) {
+      if (children.length > 0) {
         result.push({ ...category, children });
       }
     }

package/app/stores/data.ts

@@ -13,6 +13,7 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 
 interface DataItem {
   id: string;
+  geode_id: string;
   name: string;
   viewer_type: string;
   geode_object_type: string;
@@ -35,6 +36,7 @@ interface ModelComponentInput {
 
 interface NewDataItem {
   id: string;
+  geode_id: string;
   name?: string;
   viewer_type: string;
   geode_object_type: string;
@@ -199,6 +201,7 @@ export const useDataStore = defineStore("data", () => {
   async function addItem(new_item: NewDataItem): Promise<string> {
     const itemData: DataItem = {
       id: new_item.id,
+      geode_id: new_item.geode_id,
       name: new_item.name ?? new_item.id,
       viewer_type: new_item.viewer_type,
       geode_object_type: new_item.geode_object_type,

package/app/stores/data_helpers/collections.ts

@@ -59,6 +59,7 @@ export function useDataCollections(): {
       .filter((component: ModelComponentRecord) => !MESH_COMPONENT_TYPES.includes(component.type))
       .map((component: ModelComponentRecord) => ({
         id: component.geode_id,
+        geode_id: component.geode_id,
         title: component.name,
         category: component.type,
         viewer_id: Number(component.viewer_id),

package/app/stores/data_helpers/mesh.ts

@@ -14,6 +14,7 @@ interface ModelComponentRecord {
 
 interface FormattedComponent {
   readonly id: string;
+  readonly geode_id: string;
   readonly title: string;
   readonly category: string;
   readonly viewer_id: number;
@@ -29,6 +30,7 @@ interface FormattedComponentGroup {
 function toFormattedComponent(meshComponent: ModelComponentRecord): FormattedComponent {
   return {
     id: meshComponent.geode_id,
+    geode_id: meshComponent.geode_id,
     title: meshComponent.name,
     category: meshComponent.type,
     viewer_id: Math.trunc(Number(meshComponent.viewer_id)),

package/app/stores/treeview.ts

@@ -25,6 +25,7 @@ interface OpenedView {
 interface TreeviewChild {
   title: string;
   id: string;
+  geode_id: string;
   viewer_type: string;
   geode_object_type: string;
 }
@@ -170,10 +171,17 @@ export const useTreeviewStore = defineStore("treeview", () => {
     }
   }
 
-  function addItem(geodeObjectType: string, name: string, id: string, viewer_type: string): void {
+  function addItem(
+    geodeObjectType: string,
+    name: string,
+    id: string,
+    geode_id: string,
+    viewer_type: string,
+  ): void {
     const child: TreeviewChild = {
       title: name,
       id,
+      geode_id,
       viewer_type,
       geode_object_type: geodeObjectType,
     };

package/app/utils/import_workflow.ts

@@ -38,7 +38,13 @@ async function importItem(item: NewDataItem): Promise<string> {
     item.viewer_type === "model" ? dataStore.addComponents(item) : Promise.resolve();
   const addDataRelationsTask =
     item.viewer_type === "model" ? dataStore.addComponentRelations(item) : Promise.resolve();
-  treeviewStore.addItem(item.geode_object_type, item.name ?? item.id, item.id, item.viewer_type);
+  treeviewStore.addItem(
+    item.geode_object_type,
+    item.name ?? item.id,
+    item.id,
+    item.geode_id,
+    item.viewer_type,
+  );
   const addDataStyleTask = dataStyleStore.addDataStyle(item.id, item.geode_object_type);
   const addViewerTask = addDataTask.then(async () => {
     if (!(await dataStore.isItemViewable(item))) {

package/internal/database/tables/data.ts

@@ -2,5 +2,6 @@ import type { TableDefinition } from "./table_definition";
 
 export const dataTable: TableDefinition = {
   name: "data",
-  schema: "id, name, viewer_type, geode_object_type, visible, created_at, binary_light_viewable",
+  schema:
+    "id, geode_id, name, viewer_type, geode_object_type, visible, created_at, binary_light_viewable",
 };

package/package.json

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