Merge pull request #87 from Geode-solutions/next

Next

Author: JulienChampagnol

components/CrsSelector.vue

@@ -66,13 +66,11 @@
   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)
         },
       },
     )

components/Errors/Banner.vue

@@ -6,7 +6,7 @@
     position="fixed"
   >
     <v-row>
-      <v-col cols="auto" class="white--text text-center">
+      <v-col cols="auto" class="text-white text-center">
         <v-tooltip location="end">
           <span>
             We turn off our server automatically after 5 minutes of inactivity
@@ -18,22 +18,22 @@
           </template>
         </v-tooltip>
       </v-col>
-      <v-col cols="auto" class="text-white font-weight-bold"
-        >Server timed out due to inactivity, please reload this page or click
+      <v-col cols="auto" class="text-white font-weight-bold">
+        Server timed out due to inactivity, please reload this page or click
         here:
       </v-col>
-      <v-col cols="auto" align-items="center">
-        <v-btn @click="reload()" color="grey" density="compact"> Reload </v-btn>
+      <v-col class="align-items" cols="auto">
+        <v-btn color="grey" density="compact" @click="reload()"> Reload </v-btn>
       </v-col>
       <v-spacer />
       <v-col cols="auto">
         <v-btn
           icon
-          flat
+          variant="flat"
           size="20"
-          @click="errors_store.delete_server_error()"
           color="grey"
           class=".align-center"
+          @click="errors_store.delete_server_error()"
         >
           <v-icon icon="mdi-close" size="20" color="white" />
         </v-btn>

components/Errors/Snackers.vue

@@ -1,9 +1,9 @@
 <template>
   <v-snackbar
-    :style="{ 'margin-bottom': calc_margin(index) }"
     v-for="(error, index) in errors"
     :key="index"
     v-model="show"
+    :style="{ 'margin-bottom': calc_margin(index) }"
     color="error"
     location="bottom right"
     transition="slide-x-reverse-transition"
@@ -42,10 +42,10 @@
       <v-col cols="auto">
         <v-btn
           icon
-          flat
+          variant="flat"
           size="20"
-          @click="errors_store.delete_error(index)"
           color="error"
+          @click="errors_store.delete_error(index)"
         >
           <v-icon icon="mdi-close" size="20" color="white" />
         </v-btn>

components/FileSelector.vue

@@ -19,10 +19,10 @@
 
   const props = defineProps({
     multiple: { type: Boolean, required: true },
-    key: { type: String, required: false, default: "" },
+    supported_feature: { type: String, required: false, default: null },
   })
 
-  const { multiple, key } = props
+  const { multiple, supported_feature } = props
 
   const accept = ref("")
   const loading = ref(false)
@@ -38,7 +38,7 @@
 
   async function get_allowed_files() {
     toggle_loading()
-    const params = { key }
+    const params = { supported_feature }
     await api_fetch(
       { schema, params },
       {

components/FileUploader.vue

@@ -18,13 +18,14 @@
   <v-row>
     <v-col cols="auto">
       <v-btn
-        @click="upload_files"
         color="primary"
         :disabled="!files.length && !files_uploaded"
         :loading="loading"
         class="pa-2"
-        >Upload file(s)</v-btn
+        @click="upload_files"
       >
+        Upload file(s)
+      </v-btn>
     </v-col>
   </v-row>
 </template>

components/Launcher.vue

@@ -1,11 +1,11 @@
 <template>
-  <v-container justify="space-around">
+  <v-container class="justify">
     <v-row align-content="center" align="center">
       <v-col
         v-if="!is_captcha_validated"
+        class="align"
         cols="12"
         align-self="center"
-        align="center"
       >
         <h4 class="pb-3">Please complete the recaptcha to launch the app</h4>
         <Recaptcha :site_key="site_key" />
@@ -18,7 +18,7 @@
 </template>
 
 <script setup>
-  const websocket_store = use_websocket_store()
+  const viewer_store = use_viewer_store()
   const cloud_store = use_cloud_store()
   const { is_captcha_validated, is_connexion_launched, is_running } =
     storeToRefs(cloud_store)
@@ -28,7 +28,7 @@
   watch(is_captcha_validated, async (value) => {
     if (value === true && process.client) {
       await cloud_store.create_connexion()
-      await websocket_store.ws_connect()
+      await viewer_store.ws_connect()
     }
   })
 </script>

components/MissingFilesSelector.vue

@@ -69,7 +69,6 @@
   const toggle_loading = useToggle(loading)
 
   function files_uploaded_event(value) {
-    console.log("update_values")
     emit("update_values", { additional_files: value })
     missing_files()
   }

components/ObjectSelector.vue

@@ -58,9 +58,9 @@
 
   const props = defineProps({
     filenames: { type: Array, required: true },
-    key: { type: String, required: false, default: null },
+    supported_feature: { type: String, required: false, default: null },
   })
-  const { filenames, key } = props
+  const { filenames, supported_feature } = props
 
   const loading = ref(false)
   const allowed_objects = ref({})
@@ -71,7 +71,7 @@
     allowed_objects.value = {}
     var promise_array = []
     for (const filename of filenames) {
-      const params = { filename, key }
+      const params = { filename, supported_feature }
       const promise = new Promise((resolve, reject) => {
         api_fetch(
           { schema, params },

components/Recaptcha.vue

@@ -2,11 +2,11 @@
   <ClientOnly>
     <vue-recaptcha
       ref="recaptcha"
-      sitekey="6Lce72wgAAAAAOXrHyDxRQBhk6NDTD80MrXOlgbC"
-      :loadRecaptchaScript="true"
+      :sitekey="site_key"
+      :load-recaptcha-script="true"
+      align-self="center"
       @expired="is_captcha_validated = false"
       @verify="submit_recaptcha"
-      align-self="center"
     />
   </ClientOnly>
 </template>

components/RemoteRenderingView.vue

@@ -3,36 +3,38 @@
     <div style="position: relative; width: 100%; height: 100%">
       <view-toolbar />
       <v-col
+        ref="viewer"
         style="
           overflow: hidden;
           position: relative;
           z-index: 0;
           height: 100%;
           width: 100%;
         "
-        ref="viewer"
+        class="pa-0"
         @click="get_x_y"
         @keydown.esc="app_store.toggle_picking_mode(false)"
-        class="pa-0"
-      >
-      </v-col>
+      />
     </div>
   </ClientOnly>
 </template>
 
 <script setup>
   import vtkRemoteView from "@kitware/vtk.js/Rendering/Misc/RemoteView"
   import { useElementSize } from "@vueuse/core"
+  import schemas from "@geode/opengeodeweb-viewer/schemas.json"
 
   const viewer_store = use_viewer_store()
-  const { picking_mode } = storeToRefs(viewer_store)
-  const websocket_store = use_websocket_store()
-  const { client, is_running } = storeToRefs(websocket_store)
+  const { client, is_running, picking_mode } = storeToRefs(viewer_store)
 
   function get_x_y(event) {
     if (picking_mode.value === true) {
       const { offsetX, offsetY } = event
       viewer_store.set_picked_point(offsetX, offsetY)
+      viewer_call({
+        schema: schemas.opengeodeweb_viewer.set_picked_point,
+        params: { offsetX, offsetY },
+      })
     }
   }