Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Front into feat/toggle_visibility-in_hybrid_viewer

JulienChampagnol · JulienChampagnol · commit 847884c5f4f7 · 2025-08-14T10:06:36.000+02:00
diff --git a/.github/workflows/Branch-protection.yml b/.github/workflows/Branch-protection.yml
diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,11 @@
+name: Deploy
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    uses: Geode-solutions/actions/.github/workflows/js-deploy.yml@master
+    with:
+      repos: ${{ vars.REPOS }}
+    secrets: inherit
diff --git a/.github/workflows/merge_request.yml b/.github/workflows/merge_request.yml
@@ -0,0 +1,9 @@
+name: Merge request
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release:
+    uses: Geode-solutions/actions/.github/workflows/js-merge-request.yml@master
+    secrets: inherit
diff --git a/.github/workflows/pr_update.yml b/.github/workflows/pr_update.yml
@@ -0,0 +1,11 @@
+name: Pull request
+
+on:
+  pull_request:
+    types: [opened, reopened]
+    branches:
+      - master
+
+jobs:
+  update-branch:
+    uses: Geode-solutions/actions/.github/workflows/update-branch.yml@master
diff --git a/.github/workflows/prepare_deploy.yml b/.github/workflows/prepare_deploy.yml
@@ -0,0 +1,9 @@
+name: Prepare deploy
+
+on:
+  workflow_dispatch:
+
+jobs:
+  prepare:
+    uses: Geode-solutions/actions/.github/workflows/js-prepare-deploy.yml@master
+    secrets: inherit
diff --git a/.github/workflows/prepare_pr.yml b/.github/workflows/prepare_pr.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,14 @@
+name: Test
+
+on:
+  push:
+    branches-ignore:
+      - master
+      - next
+
+jobs:
+  test:
+    uses: Geode-solutions/actions/.github/workflows/js-test.yml@master
+    with:
+      repos: ${{ vars.REPOS }}
+    secrets: inherit
diff --git a/.github/workflows/test_pr.yml b/.github/workflows/test_pr.yml
@@ -0,0 +1,12 @@
+name: Test PR
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+  test:
+    uses: Geode-solutions/actions/.github/workflows/js-test-pr.yml@master
+    with:
+      repos: ${{ vars.REPOS }}
+    secrets: inherit
diff --git a/.releaserc b/.releaserc
@@ -6,7 +6,6 @@
   plugins: [
     '@semantic-release/commit-analyzer', 
     '@semantic-release/release-notes-generator', 
-    '@semantic-release/github',
-    '@semantic-release/npm'
+    '@semantic-release/github'
   ]
 }
diff --git a/commitlint.config.js b/commitlint.config.js
@@ -0,0 +1,16 @@
+export default {
+  extends: ["@commitlint/config-angular"],
+  rules: {
+    "scope-empty": [2, "never"],
+    "subject-empty": [2, "never"],
+    "subject-max-length": [0],
+    "body-leading-blank": [0],
+    "footer-leading-blank": [0],
+    "header-max-length": [0],
+    "scope-case": [0],
+    "subject-case": [0],
+    "subject-full-stop": [0],
+    "type-case": [0],
+    "type-empty": [0],
+  },
+}
diff --git a/components/ObjectSelector.vue b/components/ObjectSelector.vue
@@ -24,7 +24,7 @@
               <v-img
                 :src="geode_objects[key].image"
                 cover
-                :class="!value['is_loadable'] ? 'disabled' : ''"
+                :class="!value['is_loadable'] ? 'disabled' : undefined"
               />
             </v-card>
           </span>
@@ -66,44 +66,81 @@
   const allowed_objects = ref({})
   const toggle_loading = useToggle(loading)
 
+  function select_geode_object(object_map) {
+    const object_keys = Object.keys(object_map)
+    if (!object_keys.length) {
+      return undefined
+    }
+    if (
+      object_keys.length === 1 &&
+      object_map[object_keys[0]].is_loadable > 0
+    ) {
+      return object_keys[0]
+    }
+    const highest_load_score = Math.max(
+      ...object_keys.map((key) => object_map[key].is_loadable),
+    )
+    if (highest_load_score <= 0) {
+      return undefined
+    }
+    const best_score_objects = object_keys.filter(
+      (key) => object_map[key].is_loadable === highest_load_score,
+    )
+    if (best_score_objects.length === 1) {
+      return best_score_objects[0]
+    }
+    const highest_priority = Math.max(
+      ...best_score_objects.map(
+        (key) => object_map[key].object_priority ?? -Infinity,
+      ),
+    )
+    const best_priority_objects = best_score_objects.filter(
+      (key) => object_map[key].object_priority === highest_priority,
+    )
+    if (highest_priority !== -Infinity && best_priority_objects.length === 1) {
+      return best_priority_objects[0]
+    }
+    return undefined
+  }
+
   async function get_allowed_objects() {
     toggle_loading()
     allowed_objects.value = {}
-    var promise_array = []
-    for (const filename of filenames) {
+    const promise_array = filenames.map((filename) => {
       const params = { filename, supported_feature }
-      const promise = api_fetch({ schema, params })
-      promise_array.push(promise)
-    }
+      return api_fetch({ schema, params })
+    })
     const responses = await Promise.all(promise_array)
-    let values = []
-    for (const response of responses) {
-      values.push(response.data.value.allowed_objects)
-    }
-    const all_keys = [...new Set(values.flatMap((value) => Object.keys(value)))]
-    const common_keys = all_keys.filter(
-      (i) => !values.some((j) => !Object.keys(j).includes(i)),
+    const allowed_objects_list = responses.map(
+      (response) => response.data.value.allowed_objects,
+    )
+    const all_keys = [...new Set(allowed_objects_list.flatMap(Object.keys))]
+    const common_keys = all_keys.filter((key) =>
+      allowed_objects_list.every((obj) => key in obj),
     )
-    var final_object = {}
+    const final_object = {}
     for (const key of common_keys) {
-      for (const value of values) {
-        if (value[key].is_loadable == false) {
-          final_object[key] = { is_loadable: false }
-        } else {
-          final_object[key] = { is_loadable: true }
-        }
+      const load_scores = allowed_objects_list.map(
+        (obj) => obj[key].is_loadable,
+      )
+      const priorities = allowed_objects_list
+        .map((obj) => obj[key].object_priority)
+        .filter((p) => p !== undefined && p !== null)
+      final_object[key] = { is_loadable: Math.min(...load_scores) }
+      if (priorities.length) {
+        final_object[key].object_priority = Math.max(...priorities)
       }
     }
-
     allowed_objects.value = final_object
-    if (Object.keys(allowed_objects.value).length == 1) {
-      set_geode_object(Object.keys(allowed_objects.value)[0])
+    const selected_object = select_geode_object(final_object)
+    if (selected_object) {
+      set_geode_object(selected_object)
     }
     toggle_loading()
   }
 
   function set_geode_object(input_geode_object) {
-    if (input_geode_object != "") {
+    if (input_geode_object) {
       emit("update_values", { input_geode_object })
       emit("increment_step")
     }
diff --git a/components/Viewer/ContextMenu.vue b/components/Viewer/ContextMenu.vue
diff --git a/components/Viewer/ContextMenuItem.vue b/components/Viewer/ContextMenuItem.vue
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,8 @@
     "lint": "eslint --fix --ext .js,.vue --ignore-path .gitignore .",
     "test": "vitest",
     "coverage": "vitest run --coverage",
-    "geode_objects": "node scripts/generate_geode_objects.js && prettier ./assets/geode_objects.js --write"
+    "geode_objects": "node scripts/generate_geode_objects.js && prettier ./assets/geode_objects.js --write",
+    "build": ""
   },
   "devDependencies": {
     "@nuxt/test-utils": "3.18.0",
@@ -34,11 +35,11 @@
   },
   "description": "OpenSource Vue/Vuetify framework for web applications",
   "type": "module",
-  "version": "0.0.0-semantically-released",
+  "version": "0.0.0",
   "main": "./nuxt.config.js",
   "dependencies": {
-    "@geode/opengeodeweb-back": "5.8.7",
-    "@geode/opengeodeweb-viewer": "1.10.1",
+    "@geode/opengeodeweb-back": "latest",
+    "@geode/opengeodeweb-viewer": "latest",
     "@kitware/vtk.js": "33.3.0",
     "@mdi/font": "7.4.47",
     "@pinia/nuxt": "0.5.4",
diff --git a/stores/data_base.js b/stores/data_base.js
@@ -74,6 +74,7 @@ export const useDataBaseStore = defineStore("dataBase", () => {
       {
         schema: back_schemas.opengeodeweb_back.models.mesh_components,
         params: {
+          id,
           filename: native_filename,
           geode_object,
         },
diff --git a/test/components/ObjectSelector.nuxt.test.js b/test/components/ObjectSelector.nuxt.test.js
@@ -83,4 +83,33 @@ describe("ObjectSelector.vue", async () => {
       input_geode_object: geode_object_1,
     })
   })
+
+  test(`test object_priority when is_loadable scores equal`, async () => {
+    var response = { allowed_objects: {} }
+    const geode_object_1 = "BRep"
+    const geode_object_2 = "EdgedCurve3D"
+    response["allowed_objects"][geode_object_1] = {
+      is_loadable: 1.0,
+      object_priority: 2,
+    }
+    response["allowed_objects"][geode_object_2] = {
+      is_loadable: 1.0,
+      object_priority: 1,
+    }
+    registerEndpoint(allowed_objects.$id, {
+      method: allowed_objects.methods[0],
+      handler: () => response,
+    })
+    const wrapper = await mountSuspended(ObjectSelector, {
+      global: {
+        plugins: [vuetify, pinia],
+      },
+      props: { filenames: ["test.toto"], supported_feature: "test" },
+    })
+    expect(wrapper.emitted()).toHaveProperty("update_values")
+    expect(wrapper.emitted().update_values).toHaveLength(1)
+    expect(wrapper.emitted().update_values[0][0]).toEqual({
+      input_geode_object: geode_object_1,
+    })
+  })
 })

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`plugins: [`
`7`	`7`	`'@semantic-release/commit-analyzer',`
`8`	`8`	`'@semantic-release/release-notes-generator',`
`9`		`- '@semantic-release/github',`
`10`		`- '@semantic-release/npm'`
	`9`	`+ '@semantic-release/github'`
`11`	`10`	`]`
`12`	`11`	`}`