Merge pull request #273 from Geode-solutions/fix/harmonize_microservices_requests

Fix/harmonize microservices requests

Author: BotellaA

app/components/CrsSelector.vue

@@ -45,6 +45,7 @@
   const crs_list = ref([])
   const selected_crs = ref([])
   const toggle_loading = useToggle(data_table_loading)
+  const geodeStore = useGeodeStore()
 
   watch(selected_crs, (new_value) => {
     const crs = get_selected_crs(new_value[0])
@@ -66,14 +67,11 @@
   async function get_crs_table() {
     const params = { geode_object_type }
     toggle_loading()
-    await api_fetch(
-      { schema, params },
-      {
-        response_function: (response) => {
-          crs_list.value = response._data.crs_list
-        },
+    await geodeStore.request(schema, params, {
+      response_function: (response) => {
+        crs_list.value = response._data.crs_list
       },
-    )
+    })
     toggle_loading()
   }
 

app/components/ExtensionSelector.vue

@@ -79,27 +79,22 @@
   async function get_output_file_extensions() {
     toggle_loading()
     geode_objects_and_output_extensions.value = {}
-    var promise_array = []
-    for (const filename of filenames) {
-      const params = { geode_object_type, filename }
-      const promise = new Promise((resolve, reject) => {
-        api_fetch(
-          { schema, params },
-          {
-            request_error_function: () => {
-              reject()
-            },
-            response_function: (response) => {
-              resolve(response._data.geode_objects_and_output_extensions)
-            },
-            response_error_function: () => {
-              reject()
-            },
+    const geodeStore = useGeodeStore()
+    const promise_array = filenames.map((filename) => {
+      return new Promise((resolve, reject) => {
+        const params = {
+          geode_object_type,
+          filename,
+        }
+        geodeStore.request(schema, params, {
+          request_error_function: () => reject(),
+          response_function: (response) => {
+            resolve(response._data.geode_objects_and_output_extensions)
           },
-        )
+          response_error_function: () => reject(),
+        })
       })
-      promise_array.push(promise)
-    }
+    })
     const values = await Promise.all(promise_array)
     const all_keys = [...new Set(values.flatMap((value) => Object.keys(value)))]
     const common_keys = all_keys.filter(

app/components/FileSelector.vue

@@ -55,16 +55,11 @@
 
   async function get_allowed_files() {
     toggle_loading()
-    await api_fetch(
-      { schema },
-      {
-        response_function: (response) => {
-          accept.value = response._data.extensions
-            .map((extension) => "." + extension)
-            .join(",")
-        },
-      },
-    )
+    const geodeStore = useGeodeStore()
+    const response = await geodeStore.request(schema, {})
+    accept.value = response.data.value.extensions
+      .map((extension) => "." + extension)
+      .join(",")
     toggle_loading()
   }
   await get_allowed_files()

app/components/FileUploader.vue

@@ -34,6 +34,7 @@
 
 <script setup>
   import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
+  import { upload_file } from "@ogw_front/utils/upload_file.js"
   const schema = schemas.opengeodeweb_back.upload_file
 
   const emit = defineEmits(["files_uploaded", "decrement_step"])

app/components/Inspector/InspectionButton.vue

@@ -33,18 +33,16 @@
   async function get_inspection_results(geode_object_type, filename) {
     toggle_loading()
     const params = { geode_object_type, filename }
+    const geodeStore = useGeodeStore()
 
-    await api_fetch(
-      { schema, params },
-      {
-        response_function: (response) => {
-          emit("update_values", {
-            inspection_result: [response._data.inspection_result],
-          })
-          emit("increment_step")
-        },
+    await geodeStore.request(schema, params, {
+      response_function: (response) => {
+        emit("update_values", {
+          inspection_result: [response._data.inspection_result],
+        })
+        emit("increment_step")
       },
-    )
+    })
     toggle_loading()
   }
 </script>

app/components/MissingFilesSelector.vue

@@ -81,28 +81,18 @@
     has_missing_files.value = false
     mandatory_files.value = []
     additional_files.value = []
-    var promise_array = []
+    const geodeStore = useGeodeStore()
 
-    for (const filename of filenames) {
+    const promise_array = filenames.map((filename) => {
       const params = { geode_object_type, filename }
-      const promise = new Promise((resolve, reject) => {
-        api_fetch(
-          { schema, params },
-          {
-            request_error_function: () => {
-              reject()
-            },
-            response_function: (response) => {
-              resolve(response._data)
-            },
-            response_error_function: () => {
-              reject()
-            },
-          },
-        )
+      return new Promise((resolve, reject) => {
+        geodeStore.request(schema, params, {
+          request_error_function: () => reject(),
+          response_function: (response) => resolve(response._data),
+          response_error_function: () => reject(),
+        })
       })
-      promise_array.push(promise)
-    }
+    })
     const values = await Promise.all(promise_array)
     for (const value of values) {
       has_missing_files.value = value.has_missing_files

app/components/ObjectSelector.vue

@@ -108,13 +108,13 @@
   async function get_allowed_objects() {
     toggle_loading()
     allowed_objects.value = {}
+    const geodeStore = useGeodeStore()
     const promise_array = filenames.map((filename) => {
-      const params = { filename }
-      return api_fetch({ schema, params })
+      return geodeStore.request(schema, { filename })
     })
     const responses = await Promise.all(promise_array)
     const allowed_objects_list = responses.map(
-      (response) => response.data.value.allowed_objects,
+      (r) => r.data.value.allowed_objects,
     )
     const all_keys = [...new Set(allowed_objects_list.flatMap(Object.keys))]
     const common_keys = all_keys.filter((key) =>

app/components/PackagesVersions.vue

@@ -25,35 +25,23 @@
     schema: { type: Object, required: true },
   })
 
-  const geode_store = useGeodeStore()
+  const geodeStore = useGeodeStore()
   const packages_versions = ref([])
 
   async function get_packages_versions() {
-    const array_promise = []
-
-    const promise = new Promise((resolve, reject) => {
-      api_fetch(
-        { schema: props.schema },
-        {
-          request_error_function: () => {
-            reject()
-          },
-          response_function: (response) => {
-            packages_versions.value = response._data.versions
-            resolve()
-          },
-          response_error_function: () => {
-            reject()
-          },
+    await geodeStore.request(
+      props.schema,
+      {},
+      {
+        response_function: (response) => {
+          packages_versions.value = response._data.versions
         },
-      )
-    })
-    array_promise.push(promise)
-    await Promise.all(array_promise)
+      },
+    )
   }
 
   watch(
-    () => geode_store.status,
+    () => geodeStore.status,
     (value) => {
       if (value == Status.CONNECTED) get_packages_versions()
     },

app/components/RemoteRenderingView.vue

@@ -14,7 +14,7 @@
         "
         class="pa-0"
         @click="get_x_y"
-        @keydown.esc="viewer_store.toggle_picking_mode(false)"
+        @keydown.esc="viewerStore.toggle_picking_mode(false)"
       />
     </div>
   </ClientOnly>
@@ -32,20 +32,20 @@
     viewId: { type: String, default: "-1" },
   })
 
-  const viewer_store = useViewerStore()
+  const viewerStore = useViewerStore()
   const viewer = useTemplateRef("viewer")
   const { width, height } = useElementSize(viewer)
 
   const { width: windowWidth, height: windowHeight } = useWindowSize()
 
   function get_x_y(event) {
-    if (viewer_store.picking_mode.value === true) {
+    if (viewerStore.picking_mode.value === true) {
       const { offsetX, offsetY } = event
-      viewer_store.set_picked_point(offsetX, offsetY)
-      viewer_call({
-        schema: viewer_schemas.opengeodeweb_viewer.viewer.get_point_position,
-        params: { x: offsetX, y: offsetY },
-      })
+      viewerStore.set_picked_point(offsetX, offsetY)
+      viewerStore.request(
+        viewer_schemas.opengeodeweb_viewer.viewer.get_point_position,
+        { x: offsetX, y: offsetY },
+      )
     }
   }
 
@@ -70,7 +70,7 @@
   })
 
   watch(
-    () => viewer_store.picking_mode,
+    () => viewerStore.picking_mode,
     (value) => {
       const cursor = value ? "crosshair" : "pointer"
       view.getCanvasView().setCursor(cursor)
@@ -82,7 +82,7 @@
   })
 
   watch(
-    () => viewer_store.client,
+    () => viewerStore.client,
     () => {
       connect()
     },
@@ -99,10 +99,10 @@
   )
 
   function connect() {
-    if (viewer_store.status !== Status.CONNECTED) {
+    if (viewerStore.status !== Status.CONNECTED) {
       return
     }
-    const session = viewer_store.client.getConnection().getSession()
+    const session = viewerStore.client.getConnection().getSession()
     view.setSession(session)
     view.setViewId(props.viewId)
     connected.value = true

app/components/Screenshot.vue

@@ -79,14 +79,13 @@
   const include_background = ref(true)
 
   async function takeScreenshot() {
-    await viewer_call(
+    const viewerStore = useViewerStore()
+    await viewerStore.request(
+      viewer_schemas.opengeodeweb_viewer.viewer.take_screenshot,
       {
-        schema: viewer_schemas.opengeodeweb_viewer.viewer.take_screenshot,
-        params: {
-          filename: filename.value,
-          output_extension: output_extension.value,
-          include_background: include_background.value,
-        },
+        filename: filename.value,
+        output_extension: output_extension.value,
+        include_background: include_background.value,
       },
       {
         response_function: async (response) => {