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

Author: JulienChampagnol

.github/workflows/schedule.yml

@@ -0,0 +1,18 @@
+name: Schedule
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        type: string
+        default: "next"
+  schedule:
+    - cron: 0 23 * * *
+
+jobs:
+  schedule:
+    uses: Geode-solutions/actions/.github/workflows/js-schedule.yml@master
+    with:
+      repos: ${{ vars.REPOS }}
+      branch: ${{ inputs.branch || 'next' }}
+    secrets: inherit

.gitignore

@@ -27,4 +27,5 @@ venv
 .pytest_cache
 __snapshots__
 coverage
-# package-lock.json
+*.db
+package-lock.json

.npmignore

@@ -0,0 +1 @@
+./tests

.oxlintrc.json

@@ -7,5 +7,29 @@
     "style": "error",
     "restriction": "error"
   },
-  "plugins": ["import", "node", "oxc", "promise", "unicorn", "vitest"]
+  "plugins": ["import", "node", "oxc", "promise", "unicorn", "vitest"],
+  "rules": {
+    "unicorn/filename-case": [
+      "error",
+      {
+        "case": "snakeCase"
+      }
+    ],
+    "eslint/func-style": [
+      "error",
+      {
+        "style:": "declaration"
+      }
+    ],
+    "eslint/sort-keys": "off",
+    "eslint/no-ternary": "off"
+  },
+  "overrides": [
+    {
+      "files": ["**/components/*"],
+      "rules": {
+        "unicorn/filename-case": "PascalCase"
+      }
+    }
+  ]
 }

components/Step.vue

@@ -90,4 +90,14 @@
   function decrement_step() {
     stepper_tree.current_step_index--
   }
+
+  const sortedChips = computed(() => {
+    const chips = steps.value[props.step_index]?.chips || []
+    return [...chips].sort((a, b) =>
+      a.localeCompare(b, undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }),
+    )
+  })
 </script>

components/Viewer/Generic/Mesh/EdgesOptions.vue

@@ -28,21 +28,22 @@
   const dataStyleStore = useDataStyleStore()
 
   const visibility = computed({
-    get: () => dataStyleStore.edgesVisibility(id.value),
-    set: (newValue) => dataStyleStore.setEdgesVisibility(id.value, newValue),
+    get: () => dataStyleStore.meshEdgesVisibility(id.value),
+    set: (newValue) =>
+      dataStyleStore.setMeshEdgesVisibility(id.value, newValue),
   })
   const size = computed({
     get: () => dataStyleStore.edgesSize(id.value),
     set: (newValue) => dataStyleStore.setEdgesSize(id.value, newValue),
   })
   const coloring_style_key = computed({
-    get: () => dataStyleStore.edgesActiveColoring(id.value),
+    get: () => dataStyleStore.meshEdgesActiveColoring(id.value),
     set: (newValue) => {
-      dataStyleStore.setEdgesActiveColoring(id.value, newValue)
+      dataStyleStore.setMeshEdgesActiveColoring(id.value, newValue)
     },
   })
   const color = computed({
-    get: () => dataStyleStore.edgesColor(id.value),
-    set: (newValue) => dataStyleStore.setEdgesColor(id.value, newValue),
+    get: () => dataStyleStore.meshEdgesColor(id.value),
+    set: (newValue) => dataStyleStore.setMeshEdgesColor(id.value, newValue),
   })
 </script>

components/Viewer/Generic/Mesh/PointsOptions.vue

@@ -49,25 +49,26 @@
   const id = toRef(() => props.itemProps.id)
 
   const visibility = computed({
-    get: () => dataStyleStore.pointsVisibility(id.value),
-    set: (newValue) => dataStyleStore.setPointsVisibility(id.value, newValue),
+    get: () => dataStyleStore.meshPointsVisibility(id.value),
+    set: (newValue) =>
+      dataStyleStore.setMeshPointsVisibility(id.value, newValue),
   })
   const size = computed({
-    get: () => dataStyleStore.pointsSize(id.value),
-    set: (newValue) => dataStyleStore.setPointsSize(id.value, newValue),
+    get: () => dataStyleStore.meshPointsSize(id.value),
+    set: (newValue) => dataStyleStore.setMeshPointsSize(id.value, newValue),
   })
   const coloring_style_key = computed({
-    get: () => dataStyleStore.pointsActiveColoring(id.value),
+    get: () => dataStyleStore.meshPointsActiveColoring(id.value),
     set: (newValue) =>
-      dataStyleStore.setPointsActiveColoring(id.value, newValue),
+      dataStyleStore.setMeshPointsActiveColoring(id.value, newValue),
   })
   const color = computed({
-    get: () => dataStyleStore.pointsColor(id.value),
-    set: (newValue) => dataStyleStore.setPointsColor(id.value, newValue),
+    get: () => dataStyleStore.meshPointsColor(id.value),
+    set: (newValue) => dataStyleStore.setMeshPointsColor(id.value, newValue),
   })
   const vertex_attribute = computed({
-    get: () => dataStyleStore.pointsVertexAttribute(id.value),
+    get: () => dataStyleStore.meshPointsVertexAttribute(id.value),
     set: (newValue) =>
-      dataStyleStore.setPointsVertexAttribute(id.value, newValue),
+      dataStyleStore.setMeshPointsVertexAttribute(id.value, newValue),
   })
 </script>

components/Viewer/Generic/Mesh/PolygonsOptions.vue

@@ -32,34 +32,34 @@
   const id = toRef(() => props.itemProps.id)
 
   const visibility = computed({
-    get: () => dataStyleStore.polygonsVisibility(id.value),
-    set: (newValue) => dataStyleStore.setPolygonsVisibility(id.value, newValue),
+    get: () => dataStyleStore.meshPolygonsVisibility(id.value),
+    set: (newValue) =>
+      dataStyleStore.setMeshPolygonsVisibility(id.value, newValue),
   })
   const coloring_style_key = computed({
-    get: () => dataStyleStore.polygonsActiveColoring(id.value),
+    get: () => dataStyleStore.meshPolygonsActiveColoring(id.value),
     set: (newValue) =>
-      dataStyleStore.setPolygonsActiveColoring(id.value, newValue),
+      dataStyleStore.setMeshPolygonsActiveColoring(id.value, newValue),
   })
   const color = computed({
-    get: () => dataStyleStore.polygonsColor(id.value),
-    set: (newValue) => dataStyleStore.setPolygonsColor(id.value, newValue),
+    get: () => dataStyleStore.meshPolygonsColor(id.value),
+    set: (newValue) => dataStyleStore.setMeshPolygonsColor(id.value, newValue),
   })
   const textures = computed({
-    get: () => dataStyleStore.polygonsTextures(id.value),
-    set: (newValue) => dataStyleStore.setPolygonsTextures(id.value, newValue),
+    get: () => dataStyleStore.meshPolygonsTextures(id.value),
+    set: (newValue) =>
+      dataStyleStore.setMeshPolygonsTextures(id.value, newValue),
   })
   const vertex_attribute = computed({
-    get: () => dataStyleStore.polygonsVertexAttribute(id.value),
+    get: () => dataStyleStore.meshPolygonsVertexAttribute(id.value),
     set: (newValue) => {
-      console.log("setPolygonsVertexAttribute", id.value, newValue)
-      dataStyleStore.setPolygonsVertexAttribute(id.value, newValue)
+      dataStyleStore.setMeshPolygonsVertexAttribute(id.value, newValue)
     },
   })
   const polygon_attribute = computed({
-    get: () => dataStyleStore.polygonsPolygonAttribute(id.value),
+    get: () => dataStyleStore.meshPolygonsPolygonAttribute(id.value),
     set: (newValue) => {
-      console.log("setPolygonsPolygonAttribute", id.value, newValue)
-      dataStyleStore.setPolygonsPolygonAttribute(id.value, newValue)
+      dataStyleStore.setMeshPolygonsPolygonAttribute(id.value, newValue)
     },
   })
 </script>

components/Viewer/Generic/Mesh/PolyhedraOptions.vue

@@ -32,18 +32,18 @@
   const id = toRef(() => props.itemProps.id)
 
   const visibility = computed({
-    get: () => dataStyleStore.polyhedraVisibility(id.value),
+    get: () => dataStyleStore.meshPolyhedraVisibility(id.value),
     set: (newValue) =>
-      dataStyleStore.setPolyhedraVisibility(id.value, newValue),
+      dataStyleStore.setMeshPolyhedraVisibility(id.value, newValue),
   })
   const coloring_style_key = computed({
-    get: () => dataStyleStore.polyhedraActiveColoring(id.value),
+    get: () => dataStyleStore.meshPolyhedraActiveColoring(id.value),
     set: (newValue) =>
-      dataStyleStore.setPolyhedraActiveColoring(id.value, newValue),
+      dataStyleStore.setMeshPolyhedraActiveColoring(id.value, newValue),
   })
   const color = computed({
-    get: () => dataStyleStore.polyhedraColor(id.value),
-    set: (newValue) => dataStyleStore.setPolyhedraColor(id.value, newValue),
+    get: () => dataStyleStore.meshPolyhedraColor(id.value),
+    set: (newValue) => dataStyleStore.setMeshPolyhedraColor(id.value, newValue),
   })
   const vertex_attribute = computed({
     get: () => dataStyleStore.polyhedraVertexAttribute(id.value),

components/Viewer/Options/TextureItem.vue

@@ -42,15 +42,15 @@
 
   const props = defineProps({
     id: { type: String, required: true },
+    texture_id: { type: String, required: true },
     texture_name: { type: String, required: true },
-    texture_file_name: { type: String, required: true },
   })
 
   const texture_name = ref("")
   texture_name.value = props.texture_name
 
-  const texture_file_name = ref("")
-  texture_file_name.value = props.texture_file_name
+  const texture_id = ref("")
+  texture_id.value = props.texture_id
 
   const texture_coordinates = ref([])
 
@@ -86,7 +86,7 @@
         },
         {
           response_function: async (response) => {
-            texture_file_name.value = response._data.viewable_file_name
+            texture_id.value = response._data.id
           },
         },
       )
@@ -97,8 +97,8 @@
     emit("update_value", { key: "texture_name", value })
   })
 
-  watch(texture_file_name, (value) => {
-    emit("update_value", { key: "texture_file_name", value })
+  watch(texture_id, (value) => {
+    emit("update_value", { key: "id", value })
   })
 </script>