Merge pull request #49 from Geode-solutions/feat_validation

Feat validation

Author: JulienChampagnol

components/CrsSelector.json

@@ -0,0 +1,9 @@
+{
+  "$id": "/tools/crs_selector/geographic_coordinate_systems",
+  "type": "object",
+  "properties": {
+    "geode_object": {
+      "type": "string"
+    }
+  }
+}

components/CrsSelector.vue

@@ -27,14 +27,15 @@
   import { useToggle } from "@vueuse/core"
 
   const stepper_tree = inject("stepper_tree")
-  const { geode_object, route_prefix } = stepper_tree
+  const { geode_object } = stepper_tree
 
   const props = defineProps({
     variable_to_update: { type: String, required: true },
     variable_to_increment: { type: String, required: true },
+    schema: { type: Object, required: true },
   })
 
-  const { variable_to_update, variable_to_increment } = props
+  const { variable_to_update, variable_to_increment, schema } = props
 
   const search = ref("")
   const data_table_loading = ref(false)
@@ -61,25 +62,19 @@
   }
 
   async function get_crs_table() {
-    let params = new FormData()
-    params.append("geode_object", geode_object)
+    let params = {
+      geode_object: geode_object,
+    }
     toggle_loading()
     await api_fetch(
-      `${route_prefix}/geographic_coordinate_systems`,
-      { method: "POST", body: params },
+      { schema, params },
       {
-        request_error_function: () => {
-          toggle_loading()
-        },
         response_function: (response) => {
-          toggle_loading()
           crs_list.value = response._data.crs_list
         },
-        response_error_function: () => {
-          toggle_loading()
-        },
       },
     )
+    toggle_loading()
   }
 
   const headers = [

components/ExtensionSelector.vue

@@ -21,22 +21,21 @@
 
 <script setup>
   const stepper_tree = inject("stepper_tree")
-  const { geode_object, route_prefix } = stepper_tree
+  const { geode_object } = stepper_tree
 
   const props = defineProps({
     variable_to_update: { type: String, required: true },
     variable_to_increment: { type: String, required: true },
+    schema: { type: Object, required: true },
   })
-  const { variable_to_update, variable_to_increment } = props
+  const { variable_to_update, variable_to_increment, schema } = props
 
   const file_extensions = ref([])
 
   async function get_output_file_extensions() {
-    const params = new FormData()
-    params.append("geode_object", geode_object)
+    const params = { geode_object: geode_object }
     await api_fetch(
-      `${route_prefix}/output_file_extensions`,
-      { method: "POST", body: params },
+      { schema, params },
       {
         response_function: (response) => {
           file_extensions.value = response._data.output_file_extensions

components/FileSelector.vue

@@ -15,15 +15,16 @@
 
 <script setup>
   const stepper_tree = inject("stepper_tree")
-  const { route_prefix } = stepper_tree
 
   const props = defineProps({
     multiple: { type: Boolean, required: true },
     label: { type: String, required: true },
     variable_to_update: { type: String, required: true },
     variable_to_increment: { type: String, required: true },
+    schema: { type: Object, required: true },
   })
-  const { multiple, label, variable_to_update, variable_to_increment } = props
+  const { multiple, label, variable_to_update, variable_to_increment, schema } =
+    props
 
   const accept = ref("")
   const files = ref([])
@@ -41,10 +42,8 @@
   }
 
   async function get_allowed_files() {
-    const route = `${route_prefix}/allowed_files`
     await api_fetch(
-      route,
-      { method: "GET" },
+      { schema },
       {
         response_function: (response) => {
           fill_extensions(response)

components/Launcher.json

@@ -0,0 +1,24 @@
+{
+  "$id": "/workflows/captcha_validation",
+  "type": "object",
+  "properties": {
+    "is_captcha_validated": {
+      "type": "boolean"
+    },
+    "is_cloud_running": {
+      "type": "boolean"
+    },
+    "is_connexion_launched": {
+      "type": "boolean"
+    },
+    "site_key": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "is_captcha_validated",
+    "is_cloud_running",
+    "is_connexion_launched",
+    "site_key"
+  ]
+}

components/ObjectSelector.vue

@@ -17,7 +17,10 @@
     <v-card class="card" variant="tonal" elevation="5" rounded>
       <v-card-text>
         This file format isn't supported! Please check the
-        <a href="https://docs.geode-solutions.com/formats/" target="_blank">
+        <a
+          href="https://docs.geode-solutions.com/guides/formats/"
+          target="_blank"
+        >
           supported file formats documentation</a
         >
         for more information
@@ -30,24 +33,22 @@
   import geode_objects from "@/assets/geode_objects"
 
   const stepper_tree = inject("stepper_tree")
-  const { files, route_prefix } = stepper_tree
+  const { files } = stepper_tree
 
   const props = defineProps({
     variable_to_update: { type: String, required: true },
     variable_to_increment: { type: String, required: true },
+    schema: { type: Object, required: true },
   })
 
-  const { variable_to_update, variable_to_increment } = props
+  const { variable_to_update, variable_to_increment, schema } = props
 
   const allowed_objects = ref([])
 
   async function get_allowed_objects() {
-    const params = new FormData()
-    params.append("filename", files[0].name)
-
+    const params = { filename: files[0].name }
     await api_fetch(
-      `${route_prefix}/allowed_objects`,
-      { method: "POST", body: params },
+      { schema, params },
       {
         response_function: (response) => {
           allowed_objects.value = response._data.allowed_objects

components/PackagesVersions.json

@@ -0,0 +1,7 @@
+{
+  "$id": "/tools/file_converter/versions",
+  "method": "GET",
+  "type": "object",
+  "properties": {},
+  "additionalProperties": false
+}

components/PackagesVersions.vue

@@ -19,19 +19,19 @@
 </template>
 
 <script setup>
+  const cloud_store = use_cloud_store()
+  const { is_running } = storeToRefs(cloud_store)
+
   const props = defineProps({
-    route_prefix: { type: String, required: true },
+    schema: { type: Object, required: true },
   })
-  const { route_prefix } = props
-
-  const cloud_store = use_cloud_store()
+  const { schema } = props
 
   const packages_versions = ref([])
 
-  async function get_packages_versions() {
-    await api_fetch(
-      `${route_prefix}/versions`,
-      { method: "GET" },
+  function get_packages_versions() {
+    api_fetch(
+      { schema },
       {
         response_function: (response) => {
           packages_versions.value = response._data.versions
@@ -40,20 +40,20 @@
     )
   }
 
-  watch(cloud_store.is_running, (value) => {
+  watch(is_running, (value) => {
     if (value === true) {
       get_packages_versions()
     }
   })
 
   onMounted(() => {
-    if (cloud_store.is_running === true) {
+    if (is_running.value) {
       get_packages_versions()
     }
   })
 
   onActivated(() => {
-    if (cloud_store.is_running === true) {
+    if (is_running.value === true) {
       get_packages_versions()
     }
   })

components/RemoteRenderingView.client.vue components/RemoteRenderingView.vuecomponents/RemoteRenderingView.client.vue renamed to components/RemoteRenderingView.vue

@@ -1,21 +1,23 @@
 <template>
-  <div style="position: relative; width: 100%; height: 100%">
-    <view-toolbar />
-    <v-col
-      style="
-        overflow: hidden;
-        position: relative;
-        z-index: 0;
-        height: 100%;
-        width: 100%;
-      "
-      ref="viewer"
-      @click="get_x_y"
-      @keydown.esc="app_store.toggle_picking_mode(false)"
-      class="pa-0"
-    >
-    </v-col>
-  </div>
+  <ClientOnly>
+    <div style="position: relative; width: 100%; height: 100%">
+      <view-toolbar />
+      <v-col
+        style="
+          overflow: hidden;
+          position: relative;
+          z-index: 0;
+          height: 100%;
+          width: 100%;
+        "
+        ref="viewer"
+        @click="get_x_y"
+        @keydown.esc="app_store.toggle_picking_mode(false)"
+        class="pa-0"
+      >
+      </v-col>
+    </div>
+  </ClientOnly>
 </template>
 
 <script setup>
@@ -25,7 +27,7 @@
   const viewer_store = use_viewer_store()
   const { picking_mode } = storeToRefs(viewer_store)
   const websocket_store = use_websocket_store()
-  const { client } = storeToRefs(websocket_store)
+  const { client, is_running } = storeToRefs(websocket_store)
 
   function get_x_y(event) {
     if (picking_mode.value === true) {
@@ -89,7 +91,7 @@
   })
 
   function connect() {
-    if (!websocket_store.is_running) {
+    if (!is_running.value) {
       return
     }
     console.log("connecting", client.value)

components/Wrapper.vue

@@ -11,7 +11,7 @@
         <Stepper />
       </v-col>
       <v-col v-if="cloud_store.is_running">
-        <PackagesVersions :route_prefix="route_prefix" />
+        <PackagesVersions :schema="versions_schema" />
       </v-col>
     </v-row>
   </v-container>
@@ -21,10 +21,11 @@
   const cloud_store = use_cloud_store()
 
   const props = defineProps({
+    versions_schema: { type: Object, required: true },
     cards_list: { type: Array, required: true },
   })
-  const { cards_list } = props
+  const { cards_list, versions_schema } = props
 
   const stepper_tree = inject("stepper_tree")
-  const { tool_name, route_prefix } = stepper_tree
+  const { tool_name } = stepper_tree
 </script>