new version of opengeodeweb-font

Author: SpliiT

components/CrsSelector.json

@@ -1,38 +1,9 @@
 {
-  "$id": "/workflows/crs_selection",
+  "$id": "/tools/crs_selector/geographic_coordinate_systems",
   "type": "object",
   "properties": {
-    "search": {
+    "geode_object": {
       "type": "string"
-    },
-    "data_table_loading": {
-      "type": "boolean"
-    },
-    "crs_list": {
-      "type": "array",
-      "items": {
-        "$id": "/workflows/crs",
-        "type": "object",
-        "properties": {
-          "authority": {
-            "type": "string"
-          },
-          "code": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          }
-        },
-        "required": ["authority", "code", "name"]
-      }
-    },
-    "selected_crs": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      }
     }
-  },
-  "required": ["search", "data_table_loading", "crs_list", "selected_crs"]
-}
+  }
+}

components/CrsSelector.vue

@@ -27,7 +27,7 @@
   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 },
@@ -69,18 +69,12 @@
     await api_fetch(
       { 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/Header.json

@@ -1,56 +1,33 @@
 <template>
   <v-container justify="space-around">
     <v-row align-content="center" align="center">
-      <v-col v-if="!is_captcha_validated" cols="12" align-self="center" align="center">
-        <h4 class="pb-3">
-          Please complete the recaptcha to launch the app
-        </h4>
-        <vue-recaptcha ref="recaptcha" :sitekey="site_key" :loadRecaptchaScript="true"
-          @expired="is_captcha_validated = false" @verify="submit_recaptcha" align-self="center" />
+      <v-col
+        v-if="!is_captcha_validated"
+        cols="12"
+        align-self="center"
+        align="center"
+      >
+        <h4 class="pb-3">Please complete the recaptcha to launch the app</h4>
+        <Recaptcha />
       </v-col>
-      <v-col v-if="!is_cloud_running && is_connexion_launched">
+      <v-col
+        v-else-if="!cloud_store.is_running && cloud_store.is_connexion_launched"
+      >
         <Loading />
       </v-col>
     </v-row>
   </v-container>
 </template>
 
 <script setup>
-import { VueRecaptcha } from "vue-recaptcha"
+  const websocket_store = use_websocket_store()
+  const cloud_store = use_cloud_store()
+  const { is_captcha_validated } = storeToRefs(cloud_store)
 
-const websocket_store = use_websocket_store()
-const cloud_store = use_cloud_store()
-const { is_cloud_running, is_captcha_validated, is_connexion_launched } = storeToRefs(cloud_store)
-
-const site_key = useRuntimeConfig().public.RECAPTCHA_SITE_KEY
-
-watch(is_captcha_validated, async (value) => {
-  if (value === true && process.client) {
-    console.log('is_captcha_validated 2', is_captcha_validated.value)
-    await cloud_store.create_connexion()
-    console.log('is_captcha_validated 3', is_captcha_validated.value)
-    await websocket_store.ws_connect()
-    console.log('is_captcha_validated 4', is_captcha_validated.value)
-  }
-})
-
-onMounted(() => {
-  if (process.client) {
-    const config = useRuntimeConfig()
-    if (config.public.NODE_ENV !== 'production') {
-      cloud_store.$patch({ is_captcha_validated: true })
-      console.log('is_captcha_validated', is_captcha_validated.value)
+  watch(is_captcha_validated, async (value) => {
+    if (value === true && process.client) {
+      await cloud_store.create_connexion()
+      await websocket_store.ws_connect()
     }
-  }
-})
-
-async function submit_recaptcha (token) {
-  try {
-    const response = await $fetch.raw(`/.netlify/functions/recaptcha?token=${token}`)
-    cloud_store.$patch({ is_captcha_validated: response.status == 200 })
-    recaptcha.reset()
-  } catch (error) {
-    console.error(error)
-  }
-}
+  })
 </script>

components/Launcher.json

@@ -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

components/Launcher.vue

@@ -50,7 +50,7 @@
 
   onMounted(() => {
     console.log("mounted", is_running)
-    if (is_running.value === true) {
+    if (is_running.value) {
       console.log("mounted ??")
       get_packages_versions()
     }

components/ObjectSelector.vue

@@ -38,7 +38,6 @@
     </v-row>
     <Transition name="slide-fade">
       <v-col v-if="step_index == current_step_index">
-        {{ steps[step_index].component.component_options }}
         <component
           :is="steps[step_index].component.component_name"
           v-bind="steps[step_index].component.component_options"

components/PackagesVersions.vue

@@ -13,6 +13,8 @@ export function api_fetch(
 
   const ajv = new Ajv();
   console.log("schema", schema);
+
+  ajv.addKeyword("method")
   const valid = ajv.validate(schema, body);
   console.log("valid", schema.$id, valid);
   if (!valid) {
@@ -29,11 +31,16 @@ export function api_fetch(
   console.log(geode_store.base_url);
   console.log(schema.$id);
 
-  const request_options = {method: schema.method}
+  const request_options = {method: schema["method"]}
   console.log("body", body)
   if (!_.isEmpty(body)){
     request_options.body=body
   }
+
+  if (schema.max_retry) {
+    request_options.max_retry = schema.max_retry;
+  }
+
   console.log("request_options", request_options)
   console.log("schema.$id", schema.$id)
   return useFetch(schema.$id,{
@@ -45,7 +52,7 @@ export function api_fetch(
       // Log the error to a proper logging library
       errors_store.add_error({
         code: error.code,
-        route: request_url,
+        route: schema.$id,
         name: error.message,
         description: error.stack,
       });
@@ -68,7 +75,7 @@ export function api_fetch(
       geode_store.stop_request();
       errors_store.add_error({
         code: response.status,
-        route: request_url,
+        route: schema.$id,
         name: response._data.name,
         description: response._data.description,
       });