Merge branch 'next' into fix/object_selector_card_size

assets/geode_objects.js

@@ -4,6 +4,8 @@ import EdgedCurve2D from "@/assets/img/geode_objects/EdgedCurve2D.svg"
 import EdgedCurve3D from "@/assets/img/geode_objects/EdgedCurve3D.svg"
 import Graph from "@/assets/img/geode_objects/Graph.svg"
 import HybridSolid3D from "@/assets/img/geode_objects/HybridSolid3D.svg"
+import ImplicitCrossSection from "@/assets/img/geode_objects/ImplicitCrossSection.svg"
+import ImplicitStructuralModel from "@/assets/img/geode_objects/ImplicitStructuralModel.svg"
 import LightRegularGrid2D from "@/assets/img/geode_objects/LightRegularGrid2D.svg"
 import LightRegularGrid3D from "@/assets/img/geode_objects/LightRegularGrid3D.svg"
 import PointSet2D from "@/assets/img/geode_objects/PointSet2D.svg"
@@ -47,6 +49,14 @@ const geode_objects = {
     tooltip: "HybridSolid3D",
     image: HybridSolid3D,
   },
+  ImplicitCrossSection: {
+    tooltip: "ImplicitCrossSection",
+    image: ImplicitCrossSection,
+  },
+  ImplicitStructuralModel: {
+    tooltip: "ImplicitStructuralModel",
+    image: ImplicitStructuralModel,
+  },
   LightRegularGrid2D: {
     tooltip: "LightRegularGrid2D",
     image: LightRegularGrid2D,

components/FileUploader.vue

@@ -44,7 +44,9 @@
 
   const { multiple, accept } = toRefs(props)
 
-  const label = multiple ? "Please select file(s)" : "Please select a file"
+  const label = multiple
+    ? "Please select file(s) to import"
+    : "Please select a file to import"
   const files = ref([])
   const loading = ref(false)
   const files_uploaded = ref(false)

components/RemoteRenderingView.vue

@@ -2,6 +2,18 @@
   <ClientOnly>
     <div style="position: relative; width: 100%; height: 100%">
       <view-toolbar />
+      <div
+        style="
+          position: absolute;
+          z-index: 2;
+          left: 0;
+          top: 0;
+          background-color: transparent;
+          border-radius: 16px;
+        "
+      >
+        <slot name="tree-object"></slot>
+      </div>
       <v-col
         ref="viewer"
         style="
@@ -103,3 +115,14 @@
     view.render()
   }
 </script>
+
+<style scoped>
+  .list {
+    position: absolute;
+    z-index: 2;
+    left: 0;
+    top: 0;
+    background-color: transparent;
+    border-radius: 16px;
+  }
+</style>

package.json

@@ -7,9 +7,9 @@
     "geode_objects": "node scripts/generate_geode_objects.js && prettier ./assets/geode_objects.js --write"
   },
   "devDependencies": {
-    "@nuxt/test-utils": "^3.14.1",
-    "@pinia/testing": "^0.1.5",
-    "@vitejs/plugin-vue": "^5.1.3",
+    "@nuxt/test-utils": "^3.14.3",
+    "@pinia/testing": "^0.1.6",
+    "@vitejs/plugin-vue": "^5.1.4",
     "@vitest/coverage-v8": "^1.6.0",
     "@vue/test-utils": "^2.4.6",
     "eslint": "^8.57.0",
@@ -21,15 +21,15 @@
     "eslint-plugin-vuetify": "^2.4.0",
     "happy-dom": "^14.12.0",
     "jsdom": "^24.1.0",
-    "nuxt": "^3.12.1",
+    "nuxt": "^3.13.2",
     "playwright-core": "^1.44.1",
     "prettier": "3.3.2",
     "resize-observer-polyfill": "^1.5.1",
     "vite": "^5.2.13",
     "vite-plugin-vuetify": "^2.0.3",
     "vitest": "^1.6.0",
     "vitest-environment-nuxt": "^1.0.0",
-    "vuetify": "^3.6.9",
+    "vuetify": "^3.7.2",
     "wslink": "1.12.4"
   },
   "overrides": {
@@ -40,7 +40,7 @@
   "version": "0.0.0-semantically-released",
   "main": "./nuxt.config.js",
   "dependencies": {
-    "@geode/opengeodeweb-back": "5.1.0",
+    "@geode/opengeodeweb-back": "5.3.0",
     "@geode/opengeodeweb-viewer": "0.2.0",
     "@kitware/vtk.js": "30.3.1",
     "@mdi/font": "^7.4.47",

stores/geode.js

@@ -10,20 +10,18 @@ export const use_geode_store = defineStore("geode", {
     protocol() {
       if (use_infra_store().is_cloud) {
         return "https"
-      } else {
-        return "http"
       }
+      return "http"
     },
     port() {
       if (use_infra_store().is_cloud) {
         return "443"
-      } else {
-        return this.default_local_port
       }
+      return this.default_local_port
     },
     base_url() {
       const infra_store = use_infra_store()
-      var geode_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
+      let geode_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
       if (infra_store.is_cloud) {
         if (infra_store.ID == "") {
           throw new Error("ID must not be empty in cloud mode")
@@ -44,7 +42,8 @@ export const use_geode_store = defineStore("geode", {
         }
       }, 10 * 1000)
     },
-    async do_ping() {
+    do_ping() {
+      const geode_store = this
       const feedback_store = use_feedback_store()
       const geode_store = use_geode_store()
       return new Promise((resolve, reject) => {

test/components/CrsSelector.nuxt.test.js

@@ -20,7 +20,7 @@ const vuetify = createVuetify({
   directives,
 })
 
-describe("CrsSelector.vue", async () => {
+describe("CrsSelector.vue", () => {
   const pinia = createTestingPinia()
   setActivePinia(pinia)
   const geode_store = use_geode_store()