@geode/opengeodeweb-front 6.2.1 → 6.3.0

package/.github/workflows/CD.yml

@@ -7,6 +7,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Unit tests
+        run: |
+          npm install
+          npm run test
       - uses: actions/checkout@v3
       - name: Semantic Release
         uses: cycjimmy/semantic-release-action@v3

package/assets/geode_objects.js

@@ -1,119 +1,119 @@
-import brep from "@/assets/img/geode_objects/BRep.svg"
-import cross_section from "@/assets/img/geode_objects/cross_section.svg"
-import edged_curve2d from "@/assets/img/geode_objects/edged_curve2d.svg"
-import edged_curve3d from "@/assets/img/geode_objects/edged_curve3d.svg"
-import edged_curve from "@/assets/img/geode_objects/edged_curve.svg"
-import hybrid_solid from "@/assets/img/geode_objects/hybrid_solid.svg"
-import light_regular_grid2d from "@/assets/img/geode_objects/light_regular_grid2d.svg"
-import light_regular_grid3d from "@/assets/img/geode_objects/light_regular_grid3d.svg"
-import point_set2d from "@/assets/img/geode_objects/point_set2d.svg"
-import point_set3d from "@/assets/img/geode_objects/point_set3d.svg"
-import polygonal_surface2d from "@/assets/img/geode_objects/polygonal_surface2d.svg"
-import polygonal_surface3d from "@/assets/img/geode_objects/polygonal_surface3d.svg"
-import polyhedral_solid from "@/assets/img/geode_objects/polyhedral_solid.svg"
-import raster_image2d from "@/assets/img/geode_objects/raster_image2d.svg"
-import raster_image3d from "@/assets/img/geode_objects/raster_image3d.svg"
-import regular_grid2d from "@/assets/img/geode_objects/regular_grid2d.svg"
-import regular_grid3d from "@/assets/img/geode_objects/regular_grid3d.svg"
-import section from "@/assets/img/geode_objects/section.svg"
-import structural_model from "@/assets/img/geode_objects/structural_model.svg"
-import tetrahedral_solid from "@/assets/img/geode_objects/tetrahedral_solid.svg"
-import triangulated_surface2d from "@/assets/img/geode_objects/triangulated_surface2d.svg"
-import triangulated_surface3d from "@/assets/img/geode_objects/triangulated_surface3d.svg"
-import vertex_set from "@/assets/img/geode_objects/vertex_set.svg"
+import BRep from "@/assets/img/geode_objects/BRep.svg"
+import CrossSection from "@/assets/img/geode_objects/CrossSection.svg"
+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 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"
+import PointSet3D from "@/assets/img/geode_objects/PointSet3D.svg"
+import PolygonalSurface2D from "@/assets/img/geode_objects/PolygonalSurface2D.svg"
+import PolygonalSurface3D from "@/assets/img/geode_objects/PolygonalSurface3D.svg"
+import PolyhedralSolid3D from "@/assets/img/geode_objects/PolyhedralSolid3D.svg"
+import RasterImage2D from "@/assets/img/geode_objects/RasterImage2D.svg"
+import RasterImage3D from "@/assets/img/geode_objects/RasterImage3D.svg"
+import RegularGrid2D from "@/assets/img/geode_objects/RegularGrid2D.svg"
+import RegularGrid3D from "@/assets/img/geode_objects/RegularGrid3D.svg"
+import Section from "@/assets/img/geode_objects/Section.svg"
+import StructuralModel from "@/assets/img/geode_objects/StructuralModel.svg"
+import TetrahedralSolid3D from "@/assets/img/geode_objects/TetrahedralSolid3D.svg"
+import TriangulatedSurface2D from "@/assets/img/geode_objects/TriangulatedSurface2D.svg"
+import TriangulatedSurface3D from "@/assets/img/geode_objects/TriangulatedSurface3D.svg"
+import VertexSet from "@/assets/img/geode_objects/VertexSet.svg"
 
 const geode_objects = {
   BRep: {
     tooltip: "BRep",
-    image: brep,
+    image: BRep,
   },
   CrossSection: {
     tooltip: "CrossSection",
-    image: cross_section,
+    image: CrossSection,
   },
   EdgedCurve2D: {
     tooltip: "EdgedCurve2D",
-    image: edged_curve2d,
+    image: EdgedCurve2D,
   },
   EdgedCurve3D: {
     tooltip: "EdgedCurve3D",
-    image: edged_curve3d,
+    image: EdgedCurve3D,
   },
   Graph: {
     tooltip: "Graph",
-    image: edged_curve,
+    image: Graph,
   },
   HybridSolid3D: {
     tooltip: "HybridSolid3D",
-    image: hybrid_solid,
+    image: HybridSolid3D,
   },
   LightRegularGrid2D: {
     tooltip: "LightRegularGrid2D",
-    image: light_regular_grid2d,
+    image: LightRegularGrid2D,
   },
   LightRegularGrid3D: {
     tooltip: "LightRegularGrid3D",
-    image: light_regular_grid3d,
+    image: LightRegularGrid3D,
   },
   PointSet2D: {
     tooltip: "PointSet2D",
-    image: point_set2d,
+    image: PointSet2D,
   },
   PointSet3D: {
     tooltip: "PointSet3D",
-    image: point_set3d,
+    image: PointSet3D,
   },
   PolygonalSurface2D: {
     tooltip: "PolygonalSurface2D",
-    image: polygonal_surface2d,
+    image: PolygonalSurface2D,
   },
   PolygonalSurface3D: {
     tooltip: "PolygonalSurface3D",
-    image: polygonal_surface3d,
+    image: PolygonalSurface3D,
   },
   PolyhedralSolid3D: {
     tooltip: "PolyhedralSolid3D",
-    image: polyhedral_solid,
+    image: PolyhedralSolid3D,
   },
   RasterImage2D: {
     tooltip: "RasterImage2D",
-    image: raster_image2d,
+    image: RasterImage2D,
   },
   RasterImage3D: {
     tooltip: "RasterImage3D",
-    image: raster_image3d,
+    image: RasterImage3D,
   },
   RegularGrid2D: {
     tooltip: "RegularGrid2D",
-    image: regular_grid2d,
+    image: RegularGrid2D,
   },
   RegularGrid3D: {
     tooltip: "RegularGrid3D",
-    image: regular_grid3d,
+    image: RegularGrid3D,
   },
   Section: {
     tooltip: "Section",
-    image: section,
+    image: Section,
   },
   StructuralModel: {
     tooltip: "StructuralModel",
-    image: structural_model,
+    image: StructuralModel,
   },
   TetrahedralSolid3D: {
     tooltip: "TetrahedralSolid3D",
-    image: tetrahedral_solid,
+    image: TetrahedralSolid3D,
   },
   TriangulatedSurface2D: {
     tooltip: "TriangulatedSurface2D",
-    image: triangulated_surface2d,
+    image: TriangulatedSurface2D,
   },
   TriangulatedSurface3D: {
     tooltip: "TriangulatedSurface3D",
-    image: triangulated_surface3d,
+    image: TriangulatedSurface3D,
   },
   VertexSet: {
     tooltip: "VertexSet",
-    image: vertex_set,
+    image: VertexSet,
   },
 }
 

package/assets/img/geode_objects/{section.svg → Section.svg}

@@ -15,7 +15,7 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="section.svg">
+   sodipodi:docname="Section.svg">
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"

package/components/Carousel.vue

@@ -27,7 +27,7 @@
     items: { type: Array, required: true },
   })
 
-  const { name } = toRefs(useDisplay())
+  const { name } = useDisplay()
   const nb_items_to_display = ref(3)
   watch(
     name,
@@ -60,10 +60,6 @@
     transition: 1000,
     wrapAround: true,
   })
-
-  onMounted(() => {
-    console.log(carrousel_settings)
-  })
 </script>
 
 <style scoped>

package/components/CrsSelector.vue

@@ -24,7 +24,9 @@
 </template>
 
 <script setup>
-  import schema from "@/assets/schemas/CrsSelector.json"
+  import schemas from "@geode/opengeodeweb-back/schemas.json"
+  const schema = schemas.opengeodeweb_back.geographic_coordinate_systems
+
   const emit = defineEmits([
     "update_values",
     "increment_step",
@@ -64,11 +66,13 @@
   async function get_crs_table() {
     const params = { input_geode_object }
     toggle_loading()
+    console.log("get_crs_table")
     await api_fetch(
       { schema, params },
       {
         response_function: (response) => {
           crs_list.value = response._data.crs_list
+          console.log("crs_list", response._data.crs_list)
         },
       },
     )
@@ -86,7 +90,5 @@
     { title: "Name", align: "end", key: "name" },
   ]
 
-  onMounted(() => {
-    get_crs_table()
-  })
+  await get_crs_table()
 </script>

package/components/ExtensionSelector.vue

@@ -1,62 +1,66 @@
 <template>
   <FetchingData v-if="loading" />
-  <v-row
-    v-for="(
-      output_extensions, output_geode_object
-    ) in geode_objects_and_output_extensions"
-    :key="output_geode_object"
-    class="justify-left"
-  >
-    <v-card class="card ma-2 pa-2" width="100%">
-      <v-tooltip :text="`Export as a ${output_geode_object}`" location="bottom">
-        <template v-slot:activator="{ props }">
-          <v-card-title v-bind="props">
-            {{ output_geode_object }}
-          </v-card-title>
-        </template>
-      </v-tooltip>
-      <v-card-text>
-        <v-row>
-          <v-col
-            v-for="(extension, output_extension) in output_extensions"
-            :key="output_extension"
-            cols="auto"
-            class="pa-0"
-          >
-            <v-tooltip
-              :disabled="extension.is_saveable"
-              text="Data not saveable with this file extension"
-              location="bottom"
+  <v-row v-else class="justify-left">
+    <v-col
+      v-for="(
+        output_extensions, output_geode_object
+      ) in geode_objects_and_output_extensions"
+      :key="output_geode_object"
+      class="justify-left"
+    >
+      <v-card class="card ma-2 pa-2" width="100%">
+        <v-tooltip
+          :text="`Export as a ${output_geode_object}`"
+          location="bottom"
+        >
+          <template v-slot:activator="{ props }">
+            <v-card-title v-bind="props">
+              {{ output_geode_object }}
+            </v-card-title>
+          </template>
+        </v-tooltip>
+        <v-card-text>
+          <v-row>
+            <v-col
+              v-for="(extension, output_extension) in output_extensions"
+              :key="output_extension"
+              cols="auto"
+              class="pa-0"
             >
-              <template v-slot:activator="{ props }">
-                <span v-bind="props">
-                  <v-card
-                    class="card ma-2"
-                    :color="extension.is_saveable ? 'primary' : 'grey'"
-                    hover
-                    @click="
-                      set_variables(output_geode_object, output_extension)
-                    "
-                    :disabled="!extension.is_saveable"
-                  >
-                    <v-card-title align="center">
-                      {{ output_extension }}
-                    </v-card-title>
-                  </v-card>
-                </span>
-              </template>
-            </v-tooltip>
-          </v-col>
-        </v-row>
-      </v-card-text>
-    </v-card>
+              <v-tooltip
+                :disabled="extension.is_saveable"
+                text="Data not saveable with this file extension"
+                location="bottom"
+              >
+                <template v-slot:activator="{ props }">
+                  <span v-bind="props">
+                    <v-card
+                      class="card ma-2"
+                      :color="extension.is_saveable ? 'primary' : 'grey'"
+                      hover
+                      @click="
+                        set_variables(output_geode_object, output_extension)
+                      "
+                      :disabled="!extension.is_saveable"
+                    >
+                      <v-card-title align="center">
+                        {{ output_extension }}
+                      </v-card-title>
+                    </v-card>
+                  </span>
+                </template>
+              </v-tooltip>
+            </v-col>
+          </v-row>
+        </v-card-text>
+      </v-card>
+    </v-col>
   </v-row>
 </template>
 
 <script setup>
-  import _ from "lodash"
-  import schema from "@/assets/schemas/ExtensionSelector.json"
-
+  import schemas from "@geode/opengeodeweb-back/schemas.json"
+  const schema = schemas.opengeodeweb_back.geode_objects_and_output_extensions
   const emit = defineEmits([
     "update_values",
     "increment_step",
@@ -75,7 +79,7 @@
 
   async function get_output_file_extensions() {
     toggle_loading()
-    geode_objects_and_output_extensions.vaue = {}
+    geode_objects_and_output_extensions.value = {}
     var promise_array = []
     for (const filename of filenames) {
       const params = { input_geode_object, filename }
@@ -87,26 +91,7 @@
               reject()
             },
             response_function: (response) => {
-              const data = response._data.geode_objects_and_output_extensions
-              if (_.isEmpty(geode_objects_and_output_extensions.value)) {
-                geode_objects_and_output_extensions.value = data
-              } else {
-                for (const [geode_object, geode_object_value] of Object.entries(
-                  data,
-                )) {
-                  for (const [
-                    output_extension,
-                    output_extension_value,
-                  ] of Object.entries(geode_object_value)) {
-                    if (!output_extension_value["is_saveable"]) {
-                      geode_objects_and_output_extensions.value[geode_object][
-                        output_extension
-                      ]["is_saveable"] = false
-                    }
-                  }
-                }
-              }
-              resolve()
+              resolve(response._data.geode_objects_and_output_extensions)
             },
             response_error_function: () => {
               reject()
@@ -116,7 +101,25 @@
       })
       promise_array.push(promise)
     }
-    await Promise.all(promise_array)
+    const values = await Promise.all(promise_array)
+    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)),
+    )
+    var final_object = {}
+    for (const key of common_keys) {
+      final_object[key] = {}
+      for (const value of values) {
+        for (const extension of Object.keys(value[key])) {
+          if (value[key][extension].is_saveable == false) {
+            final_object[key][extension] = { is_saveable: false }
+          } else {
+            final_object[key][extension] = { is_saveable: true }
+          }
+        }
+      }
+    }
+    geode_objects_and_output_extensions.value = final_object
     toggle_loading()
   }
 
@@ -131,7 +134,5 @@
     }
   }
 
-  onMounted(() => {
-    get_output_file_extensions()
-  })
+  await get_output_file_extensions()
 </script>

package/components/FileSelector.vue

@@ -2,14 +2,15 @@
   <FetchingData v-if="loading" />
   <FileUploader
     v-else
-    v-bind="{ multiple, accept, route }"
+    v-bind="{ multiple, accept }"
     @files_uploaded="files_uploaded_event"
   />
 </template>
 
 <script setup>
-  import schema from "@/assets/schemas/FileSelector.json"
+  import schemas from "@geode/opengeodeweb-back/schemas.json"
 
+  const schema = schemas.opengeodeweb_back.allowed_files
   const emit = defineEmits([
     "update_values",
     "increment_step",
@@ -19,10 +20,9 @@
   const props = defineProps({
     multiple: { type: Boolean, required: true },
     key: { type: String, required: false, default: "" },
-    route: { type: String, required: false, default: "" },
   })
 
-  const { multiple, key, route } = props
+  const { multiple, key } = props
 
   const accept = ref("")
   const loading = ref(false)
@@ -51,7 +51,6 @@
     )
     toggle_loading()
   }
-  onMounted(() => {
-    get_allowed_files()
-  })
+
+  await get_allowed_files()
 </script>

package/components/FileUploader.vue

@@ -18,27 +18,28 @@
   <v-row>
     <v-col cols="auto">
       <v-btn
-        @click="upload_files()"
+        @click="upload_files"
         color="primary"
         :disabled="!files.length && !files_uploaded"
         :loading="loading"
         class="pa-2"
-      >
-        Upload file(s)</v-btn
+        >Upload file(s)</v-btn
       >
     </v-col>
   </v-row>
 </template>
 
 <script setup>
+  import schemas from "@geode/opengeodeweb-back/schemas.json"
+  const schema = schemas.opengeodeweb_back.upload_file
+
   const emit = defineEmits(["files_uploaded", "decrement_step"])
 
   const props = defineProps({
     multiple: { type: Boolean, required: true },
     accept: { type: String, required: true },
-    route: { type: String, required: true },
   })
-  const { multiple, accept, route } = toRefs(props)
+  const { multiple, accept } = toRefs(props)
 
   const label = multiple ? "Please select file(s)" : "Please select a file"
   const files = ref([])
@@ -53,7 +54,7 @@
     for (const file of files.value) {
       const promise = new Promise((resolve, reject) => {
         upload_file(
-          { route, file },
+          { route: schema.$id, file },
           {
             request_error_function: () => {
               reject()

package/components/MissingFilesSelector.vue

@@ -26,8 +26,8 @@
     <v-row>
       <v-col cols="12">
         <FileUploader
-          v-bind="{ multiple, accept, route }"
-          @files_uploaded="files_uploaded"
+          v-bind="{ multiple, accept }"
+          @files_uploaded="files_uploaded_event"
         />
       </v-col>
     </v-row>
@@ -36,14 +36,16 @@
         v-if="!mandatory_files.length && additional_files.length"
         cols="auto"
       >
-        <v-btn @click="skip_step()" color="warning"> Skip step </v-btn>
+        <v-btn @click="emit('increment_step')" color="warning">Skip step</v-btn>
       </v-col>
     </v-row>
   </v-container>
 </template>
 
 <script setup>
-  import schema from "@/assets/schemas/MissingFilesSelector.json"
+  import schemas from "@geode/opengeodeweb-back/schemas.json"
+
+  const schema = schemas.opengeodeweb_back.missing_files
 
   const emit = defineEmits([
     "update_values",
@@ -55,10 +57,9 @@
     multiple: { type: Boolean, required: true },
     input_geode_object: { type: String, required: true },
     filenames: { type: Array, required: true },
-    route: { type: String, required: true },
   })
 
-  const { multiple, input_geode_object, filenames, route } = props
+  const { multiple, input_geode_object, filenames } = props
 
   const accept = ref("")
   const loading = ref(false)
@@ -67,7 +68,8 @@
   const additional_files = ref([])
   const toggle_loading = useToggle(loading)
 
-  function files_uploaded(value) {
+  function files_uploaded_event(value) {
+    console.log("update_values")
     emit("update_values", { additional_files: value })
     missing_files()
   }
@@ -89,18 +91,7 @@
               reject()
             },
             response_function: (response) => {
-              has_missing_files.value = response._data.has_missing_files
-                ? true
-                : has_missing_files.value
-              mandatory_files.value = [].concat(
-                mandatory_files.value,
-                response._data.mandatory_files,
-              )
-              additional_files.value = [].concat(
-                additional_files.value,
-                response._data.additional_files,
-              )
-              resolve()
+              resolve(response._data)
             },
             response_error_function: () => {
               reject()
@@ -110,7 +101,20 @@
       })
       promise_array.push(promise)
     }
-    await Promise.all(promise_array)
+    const values = await Promise.all(promise_array)
+    for (const value of values) {
+      has_missing_files.value = value.has_missing_files
+        ? true
+        : has_missing_files.value
+      mandatory_files.value = [].concat(
+        mandatory_files.value,
+        value.mandatory_files,
+      )
+      additional_files.value = [].concat(
+        additional_files.value,
+        value.additional_files,
+      )
+    }
     if (!has_missing_files.value) {
       emit("increment_step")
     } else {
@@ -122,7 +126,5 @@
     toggle_loading()
   }
 
-  onMounted(() => {
-    missing_files()
-  })
+  await missing_files()
 </script>