@geode/opengeodeweb-front 10.22.0 → 10.22.1-rc.2

package/app/components/CrsSelector.vue

@@ -38,11 +38,14 @@ function get_selected_crs(crs_code) {
 async function get_crs_table() {
   const params = { geode_object_type };
   toggle_loading();
-  await backStore.request(schema, params, {
-    response_function: (response) => {
-      crs_list.value = response.crs_list;
+  await backStore.request(
+    { schema, params },
+    {
+      response_function: (response) => {
+        crs_list.value = response.crs_list;
+      },
     },
-  });
+  );
   toggle_loading();
 }
 

package/app/components/ExtensionSelector.vue

@@ -22,10 +22,8 @@ async function get_output_file_extensions() {
   const backStore = useBackStore();
   const values = await Promise.all(
     filenames.map(async (filename) => {
-      const response = await backStore.request(schema, {
-        geode_object_type,
-        filename,
-      });
+      const params = { geode_object_type, filename };
+      const response = await backStore.request({ schema, params });
       return response.geode_objects_and_output_extensions;
     }),
   );

package/app/components/FileSelector.vue

@@ -47,7 +47,7 @@ function files_uploaded_event(value) {
 async function get_allowed_files() {
   toggle_loading();
   const backStore = useBackStore();
-  const response = await backStore.request(schema, {});
+  const response = await backStore.request({ schema });
   accept.value = response.extensions.map((extension) => `.${extension}`).join(",");
   toggle_loading();
 }

package/app/components/Inspector/InspectionButton.vue

@@ -20,14 +20,17 @@ async function get_inspection_results() {
   };
   const backStore = useBackStore();
 
-  await backStore.request(schema, params, {
-    response_function: (response) => {
-      emit("update_values", {
-        inspection_result: [response.inspection_result],
-      });
-      emit("increment_step");
+  await backStore.request(
+    { schema, params },
+    {
+      response_function: (response) => {
+        emit("update_values", {
+          inspection_result: [response.inspection_result],
+        });
+        emit("increment_step");
+      },
     },
-  });
+  );
   toggle_loading();
 }
 </script>

package/app/components/MissingFilesSelector.vue

@@ -28,6 +28,10 @@ function files_uploaded_event(value) {
   emit("increment_step");
 }
 
+function isCsvFile(filename) {
+  return filename.toLowerCase().endsWith(".csv") || filename.toLowerCase().endsWith(".csv.json");
+}
+
 async function missing_files() {
   toggle_loading();
   has_missing_files.value = false;
@@ -36,16 +40,15 @@ async function missing_files() {
   const backStore = useBackStore();
 
   const promise_array = filenames.map((filename) => {
-    const isCsvFile =
-      filename.toLowerCase().endsWith(".csv") || filename.toLowerCase().endsWith(".csv.json");
-    if (isCsvFile) {
+    if (isCsvFile(filename)) {
       return Promise.resolve({
         has_missing_files: false,
         mandatory_files: [],
         additional_files: [],
       });
     }
-    return backStore.request(schema, { geode_object_type, filename });
+    const params = { geode_object_type, filename };
+    return backStore.request({ schema, params });
   });
   const values = await Promise.all(promise_array);
   for (const value of values) {
@@ -55,11 +58,7 @@ async function missing_files() {
     mandatory_files.value = [...mandatory_files.value, ...value.mandatory_files];
     additional_files.value = [...additional_files.value, ...value.additional_files];
   }
-  const unconfigured_csvs = files.filter(
-    (file) =>
-      (file.name.toLowerCase().endsWith(".csv") || file.name.toLowerCase().endsWith(".csv.json")) &&
-      !file.isConfigured,
-  );
+  const unconfigured_csvs = files.filter((file) => isCsvFile(file.name) && !file.isConfigured);
   if (unconfigured_csvs.length > 0) {
     has_missing_files.value = true;
     if (accept.value === "") {

package/app/components/ObjectSelector.vue

@@ -49,12 +49,19 @@ function select_geode_object(object_map) {
   return undefined;
 }
 
+function isCsvFile(filename) {
+  return filename.toLowerCase().endsWith(".csv") || filename.toLowerCase().endsWith(".csv.json");
+}
+
 async function get_allowed_objects() {
   toggle_loading();
   allowed_objects.value = {};
   multiple_files_no_common.value = false;
 
-  const promise_array = filenames.map((filename) => backStore.request(schema, { filename }));
+  const promise_array = filenames.map((filename) => {
+    const params = { filename };
+    return backStore.request({ schema, params });
+  });
   const responses = await Promise.all(promise_array);
   const allowed_objects_list = responses.map((response) => response.allowed_objects);
   const all_keys = [...new Set(allowed_objects_list.flatMap((obj) => Object.keys(obj)))];
@@ -75,10 +82,7 @@ async function get_allowed_objects() {
       final_object[key].object_priority = Math.max(...priorities);
     }
   }
-  const isCsv = filenames.some(
-    (filename) =>
-      filename.toLowerCase().endsWith(".csv") || filename.toLowerCase().endsWith(".csv.json"),
-  );
+  const isCsv = filenames.some((filename) => isCsvFile(filename));
   if (isCsv && !final_object["PointSet3D"]) {
     final_object["PointSet3D"] = { is_loadable: 1, object_priority: 100 };
   }

package/app/components/PackagesVersions.vue

@@ -11,8 +11,7 @@ const packages_versions = ref([]);
 
 async function get_packages_versions() {
   await backStore.request(
-    schema,
-    {},
+    { schema },
     {
       response_function: (response) => {
         packages_versions.value = response.versions;

package/app/components/RemoteRenderingView.vue

@@ -20,10 +20,9 @@ function get_x_y(event) {
   if (viewerStore.picking_mode.value === true) {
     const { offsetX, offsetY } = event;
     viewerStore.set_picked_point(offsetX, offsetY);
-    viewerStore.request(viewer_schemas.opengeodeweb_viewer.viewer.get_point_position, {
-      x: offsetX,
-      y: offsetY,
-    });
+    const schema = viewer_schemas.opengeodeweb_viewer.viewer.get_point_position;
+    const params = { x: offsetX, y: offsetY };
+    viewerStore.request({ schema, params });
   }
 }
 

package/app/components/Screenshot.vue

@@ -23,12 +23,16 @@ async function takeScreenshot() {
   const viewerStore = useViewerStore();
   const feedbackStore = useFeedbackStore();
   const current_filename = screenshot_type.value === "file" ? filename.value : "screenshot";
+  const schema = viewer_schemas.opengeodeweb_viewer.viewer.take_screenshot;
+  const params = {
+    filename: current_filename,
+    output_extension: output_extension.value,
+    include_background: include_background.value,
+  };
   await viewerStore.request(
-    viewer_schemas.opengeodeweb_viewer.viewer.take_screenshot,
     {
-      filename: current_filename,
-      output_extension: output_extension.value,
-      include_background: include_background.value,
+      schema,
+      params,
     },
     {
       response_function: async (response) => {

package/app/components/ViewToolbar.vue

@@ -118,9 +118,13 @@ const camera_options = computed(() => [
     icon: "mdi-ruler-square",
     color: grid_scale.value ? "primary" : undefined,
     action: () => {
+      const schema = schemas.opengeodeweb_viewer.viewer.grid_scale;
+      const params = { visibility: !grid_scale.value };
       viewerStore.request(
-        schemas.opengeodeweb_viewer.viewer.grid_scale,
-        { visibility: !grid_scale.value },
+        {
+          schema,
+          params,
+        },
         {
           response_function: () => {
             grid_scale.value = !grid_scale.value;

package/app/components/Viewer/Options/AttributeSelector.vue

@@ -49,9 +49,9 @@ function resetRange() {
 }
 
 function getAttributes() {
+  const params = { id };
   backStore.request(
-    schema,
-    { id },
+    { schema, params },
     {
       response_function: (response) => {
         attributes.value = response.attributes;

package/app/components/Viewer/Options/TextureItem.vue

@@ -25,9 +25,10 @@ onMounted(() => {
 });
 
 function getTextureCoordinates() {
+  const schema = back_schemas.opengeodeweb_back.texture_coordinates;
+  const params = { id };
   backStore.request(
-    back_schemas.opengeodeweb_back.texture_coordinates,
-    { id },
+    { schema, params },
     {
       response_function: (response) => {
         texture_coordinates.value = response.texture_coordinates;
@@ -38,15 +39,13 @@ function getTextureCoordinates() {
 
 async function files_uploaded_event(value) {
   if (value.length > 0) {
+    const schema = back_schemas.opengeodeweb_back.save_viewable_file;
+    const params = {
+      geode_object_type: "RasterImage2D",
+      filename: value[0].name,
+    };
     await backStore.request(
-      back_schemas.opengeodeweb_back.save_viewable_file,
-      {
-        schema: back_schemas.opengeodeweb_back.save_viewable_file,
-        params: {
-          geode_object_type: "RasterImage2D",
-          filename: value[0].name,
-        },
-      },
+      { schema, params },
       {
         response_function: (response) => {
           texture_id.value = response.id;

package/app/composables/hover_highlight.js

@@ -41,7 +41,7 @@ export function useHoverhighlight() {
         ...(type === "model" && { block_ids }),
       };
       try {
-        await viewerStore.request(schema, params);
+        await viewerStore.request({ schema, params });
       } catch (error) {
         console.error(`Highlight failed for ${type} ${id}:`, error);
       }
@@ -67,7 +67,7 @@ export function useHoverhighlight() {
         ...(currentType === "model" && { block_ids: [] }),
       };
       try {
-        viewerStore.request(schema, params);
+        viewerStore.request({ schema, params });
       } catch (error) {
         console.error(`Unhighlight failed for ${currentType} ${id}:`, error);
       }

package/app/composables/project_manager.js

@@ -43,12 +43,9 @@ async function importProject(file) {
   if (client && client.getConnection && client.getConnection().getSession) {
     await client.getConnection().getSession().call("opengeodeweb_viewer.release_database", [{}]);
   }
-
-  await viewerStore.request(
-    viewer_schemas.opengeodeweb_viewer.viewer.reset_visualization,
-    {},
-    undefined,
-  );
+  const schema = viewer_schemas.opengeodeweb_viewer.viewer.reset_visualization;
+  const timeout = undefined;
+  await viewerStore.request({ schema, timeout });
 
   treeviewStore.clear();
   dataStore.clear();

package/app/composables/use_overlapping_picker.js

@@ -69,10 +69,13 @@ export function useOverlappingPicker() {
 
     const result = { id: undefined, viewer_id: undefined };
     let pickedResponse = undefined;
-
+    const schema = viewer_schemas.opengeodeweb_viewer.viewer.picked_ids;
+    const params = { x, y, ids };
     await viewerStore.request(
-      viewer_schemas.opengeodeweb_viewer.viewer.picked_ids,
-      { x, y, ids },
+      {
+        schema,
+        params,
+      },
       {
         response_function: (response) => {
           pickedResponse = response;

package/app/stores/app.js

@@ -217,13 +217,13 @@ export const useAppStore = defineStore("app", () => {
     );
   }
 
-  function request(schema, params, callbacks = {}) {
+  function request({ schema, params }, callbacks = {}) {
     console.log("[APP] Request:", schema.$id);
 
     const store = useAppStore();
     return api_fetch(
       store,
-      { schema, params },
+      { schema, params, headers: {} },
       {
         ...callbacks,
         response_function: async (response) => {
@@ -256,12 +256,15 @@ export const useAppStore = defineStore("app", () => {
       additionalProperties: true,
     };
     const params = { PROJECT };
-    return request(schema, params, {
-      response_function: (response) => {
-        console.log(`[APP] ${response.projectFolderPath} created`);
-        projectFolderPath.value = response.projectFolderPath;
+    return request(
+      { schema, params },
+      {
+        response_function: (response) => {
+          console.log(`[APP] ${response.projectFolderPath} created`);
+          projectFolderPath.value = response.projectFolderPath;
+        },
       },
-    });
+    );
   }
 
   return {

package/app/stores/back.js

@@ -51,9 +51,9 @@ export const useBackStore = defineStore("back", {
     },
     ping() {
       const feedbackStore = useFeedbackStore();
+      const schema = back_schemas.opengeodeweb_back.ping;
       return this.request(
-        back_schemas.opengeodeweb_back.ping,
-        {},
+        { schema },
         {
           request_error_function: () => {
             feedbackStore.$patch({ server_error: true });
@@ -94,25 +94,28 @@ export const useBackStore = defineStore("back", {
       const params = { COMMAND_BACK, NUXT_ROOT_PATH, args };
 
       console.log("[GEODE] params", params);
-      return appStore.request(schema, params, {
-        response_function: (response) => {
-          console.log(`[GEODE] Back launched on port ${response.port}`);
-          this.default_local_port = response.port;
+      return appStore.request(
+        { schema, params },
+        {
+          response_function: (response) => {
+            console.log(`[GEODE] Back launched on port ${response.port}`);
+            this.default_local_port = response.port;
+          },
         },
-      });
+      );
     },
     connect() {
       console.log("[GEODE] Connecting to geode microservice...");
       this.set_ping();
       return Promise.resolve();
     },
-    request(schema, params, callbacks = {}) {
+    request({ schema, params = {} }, callbacks = {}) {
       console.log("[GEODE] Request:", schema.$id);
       const start = Date.now();
 
       return api_fetch(
         this,
-        { schema, params },
+        { schema, params, headers: {} },
         {
           ...callbacks,
           response_function: async (response) => {
@@ -154,8 +157,7 @@ export const useBackStore = defineStore("back", {
         return;
       }
       return this.request(
-        schema,
-        {},
+        { schema },
         {
           response_function: (response) => {
             this.version = response.microservice_version;

package/app/stores/camera_manager.js

@@ -32,9 +32,9 @@ export const useCameraManagerStore = defineStore("camera_manager", () => {
   async function restoreCameraPosition(id) {
     const position = await camera_positions_db.get(id);
     if (position) {
-      await viewerStore.request(viewer_schemas.opengeodeweb_viewer.viewer.update_camera, {
-        camera_options: position.camera_options,
-      });
+      const schema = viewer_schemas.opengeodeweb_viewer.viewer.update_camera;
+      const params = { camera_options: position.camera_options };
+      await viewerStore.request({ schema, params });
     }
   }
 

package/app/stores/cloud.js

@@ -31,25 +31,28 @@ export const useCloudStore = defineStore("cloud", {
       console.log("[CLOUD] params", params);
       const appStore = useAppStore();
       const feedbackStore = useFeedbackStore();
-      return appStore.request(schema, params, {
-        request_error_function: () => {
-          feedbackStore.$patch({ server_error: true });
-          this.status = Status.NOT_CONNECTED;
+      return appStore.request(
+        { schema, params },
+        {
+          request_error_function: () => {
+            feedbackStore.$patch({ server_error: true });
+            this.status = Status.NOT_CONNECTED;
+          },
+          response_function: (response) => {
+            feedbackStore.$patch({ server_error: false });
+            console.log(`[CLOUD] Cloud launched on ${response.url}`);
+            this.status = Status.CONNECTED;
+            const infraStore = useInfraStore();
+            infraStore.$patch({
+              domain_name: response.url,
+            });
+          },
+          response_error_function: () => {
+            feedbackStore.$patch({ server_error: true });
+            this.status = Status.NOT_CONNECTED;
+          },
         },
-        response_function: (response) => {
-          feedbackStore.$patch({ server_error: false });
-          console.log(`[CLOUD] Cloud launched on ${response.url}`);
-          this.status = Status.CONNECTED;
-          const infraStore = useInfraStore();
-          infraStore.$patch({
-            domain_name: response.url,
-          });
-        },
-        response_error_function: () => {
-          feedbackStore.$patch({ server_error: true });
-          this.status = Status.NOT_CONNECTED;
-        },
-      });
+      );
     },
     connect() {
       console.log("[CLOUD] Cloud connected");

package/app/stores/data.js

@@ -74,11 +74,15 @@ export const useDataStore = defineStore("data", () => {
   }
 
   async function registerObject(id) {
-    return await viewerStore.request(viewer_generic_schemas.register, { id });
+    const schema = viewer_generic_schemas.register;
+    const params = { id };
+    return await viewerStore.request({ schema, params });
   }
 
   async function deregisterObject(id) {
-    return await viewerStore.request(viewer_generic_schemas.deregister, { id });
+    const schema = viewer_generic_schemas.deregister;
+    const params = { id };
+    return await viewerStore.request({ schema, params });
   }
 
   function addItem(new_item) {

package/app/stores/hybrid_viewer.js

@@ -2,6 +2,16 @@ import {
   ACTOR_COLOR,
   BACKGROUND_COLOR,
   WHEEL_TIME_OUT_MS,
+} from "@ogw_internal/stores/hybrid_viewer_constants";
+import {
+  applySnapshot,
+  getCameraOptions,
+  performCameraOrientation,
+  performFocusCameraOnObject,
+  performSetCamera,
+  performSyncRemoteCamera,
+} from "@ogw_internal/stores/hybrid_viewer_camera";
+import {
   computeAverageBrightness,
   performAddItem,
   performClear,
@@ -12,14 +22,6 @@ import {
   performSetVisibility,
   performSetZScaling,
 } from "@ogw_internal/stores/hybrid_viewer";
-import {
-  applySnapshot,
-  getCameraOptions,
-  performCameraOrientation,
-  performFocusCameraOnObject,
-  performSetCamera,
-  performSyncRemoteCamera,
-} from "@ogw_internal/stores/hybrid_viewer_camera";
 import {
   createClearHoverData,
   createHoverHighlight,
@@ -35,7 +37,7 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
-// oxlint-disable max-lines-per-function max-statements
+// oxlint-disable max-lines-per-function, max-statements
 export const useHybridViewerStore = defineStore("hybridViewer", () => {
   const dataStore = useDataStore();
   const hybridDb = reactive({});
@@ -183,7 +185,8 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
   }
 
   function remoteRender() {
-    return viewerStore.request(viewer_schemas.opengeodeweb_viewer.viewer.render);
+    const schema = viewer_schemas.opengeodeweb_viewer.viewer.render;
+    return viewerStore.request({ schema });
   }
 
   const hoverTimeoutRef = ref(undefined);

package/app/stores/viewer.js

@@ -20,7 +20,7 @@ const request_timeout = MS_PER_SECOND * SECONDS_PER_REQUEST;
 
 export const useViewerStore = defineStore(
   "viewer",
-  // oxlint-disable-next-line max-lines-per-function max-statements
+  // oxlint-disable-next-line max-lines-per-function, max-statements
   () => {
     const infraStore = useInfraStore();
     const default_local_port = ref("1234");
@@ -63,10 +63,9 @@ export const useViewerStore = defineStore(
     }
 
     async function set_picked_point(x, y) {
-      const response = await request(schemas.opengeodeweb_viewer.viewer.get_point_position, {
-        x: Math.round(x),
-        y: Math.round(y),
-      });
+      const schema = schemas.opengeodeweb_viewer.viewer.get_point_position;
+      const params = { x: Math.round(x), y: Math.round(y) };
+      const response = await request({ schema, params });
       const { x: world_x, y: world_y, z: world_z } = response;
       picked_point.value = { x: world_x, y: world_y, z: world_z };
     }
@@ -108,7 +107,9 @@ export const useViewerStore = defineStore(
           });
           connectImageStream(client.value.getConnection().getSession());
           client.value.endBusy();
-          await request(schemas.opengeodeweb_viewer.viewer.reset_visualization, {}, {}, undefined);
+          const schema = schemas.opengeodeweb_viewer.viewer.reset_visualization;
+          const timeout = undefined;
+          await request({ schema, timeout });
           status.value = Status.CONNECTED;
         } catch (error) {
           console.error("ws_connect error", error);
@@ -143,12 +144,15 @@ export const useViewerStore = defineStore(
       const params = { COMMAND_VIEWER, NUXT_ROOT_PATH, args };
       console.log("[VIEWER] params", params);
 
-      return appStore.request(schema, params, {
-        response_function: (response) => {
-          console.log(`[VIEWER] Viewer launched on port ${response.port}`);
-          default_local_port.value = response.port;
+      return appStore.request(
+        { schema, params },
+        {
+          response_function: (response) => {
+            console.log(`[VIEWER] Viewer launched on port ${response.port}`);
+            default_local_port.value = response.port;
+          },
         },
-      });
+      );
     }
 
     async function connect() {
@@ -157,7 +161,7 @@ export const useViewerStore = defineStore(
       console.log("[VIEWER] Viewer connected successfully");
     }
 
-    function request(schema, params = {}, callbacks = {}, timeout = request_timeout) {
+    function request({ schema, params = {}, timeout = request_timeout }, callbacks = {}) {
       console.log("[VIEWER] Request:", schema.$id);
       const start = Date.now();
 
@@ -166,7 +170,7 @@ export const useViewerStore = defineStore(
 
       return viewer_call(
         store,
-        { schema, params },
+        { schema, params, timeout },
         {
           ...callbacks,
           response_function: async (response) => {
@@ -182,7 +186,6 @@ export const useViewerStore = defineStore(
             }
           },
         },
-        timeout,
       );
     }
 
@@ -191,8 +194,7 @@ export const useViewerStore = defineStore(
         return;
       }
       return request(
-        schema,
-        {},
+        { schema },
         {
           response_function: (response) => {
             version.value = response.microservice_version;

package/app/utils/extension.js

@@ -96,7 +96,7 @@ function runExtensions() {
     additionalProperties: false,
   };
 
-  return appStore.request(schema, params);
+  return appStore.request({ schema, params });
 }
 
 export {

package/app/utils/import_workflow.js

@@ -83,11 +83,12 @@ async function importItem(item) {
 
 async function importFile(filename, geode_object_type) {
   const backStore = useBackStore();
-  const response = await backStore.request(back_schemas.opengeodeweb_back.save_viewable_file, {
+  const schema = back_schemas.opengeodeweb_back.save_viewable_file;
+  const params = {
     geode_object_type,
     filename,
-  });
-
+  };
+  const response = await backStore.request({ schema, params });
   const item = buildImportItemFromPayloadApi(response, geode_object_type);
   return importItem(item);
 }