fix(Refactor): refactor functions in shared

app/components/ObjectSelector.vue

@@ -1,6 +1,7 @@
 <script setup>
 import FetchingData from "@ogw_front/components/FetchingData.vue";
 import { geode_objects } from "@ogw_front/assets/geode_objects";
+import { resolveAllowedObjects } from "@ogw_shared/utils/response_handlers/load.js.js";
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { useBackStore } from "@ogw_front/stores/back";
 
@@ -15,100 +16,49 @@ const { filenames } = defineProps({
 const backStore = useBackStore();
 
 const loading = ref(false);
-const allowed_objects = ref({});
-const toggle_loading = useToggle(loading);
-const multiple_files_no_common = ref(false);
+const allowedGeodeObjects = ref({});
+const toggleLoading = useToggle(loading);
+const multipleFilesNoCommon = ref(false);
 
-function select_geode_object(object_map) {
-  const object_keys = Object.keys(object_map);
-  if (object_keys.length === 0) {
-    return undefined;
-  }
-  if (object_keys.length === 1 && object_map[object_keys[0]].is_loadable > 0) {
-    return object_keys[0];
-  }
-  const highest_load_score = Math.max(...object_keys.map((key) => object_map[key].is_loadable));
-  if (highest_load_score <= 0) {
-    return undefined;
-  }
-  const best_score_objects = object_keys.filter(
-    (key) => object_map[key].is_loadable === highest_load_score,
-  );
-  if (best_score_objects.length === 1) {
-    return best_score_objects[0];
-  }
-  const highest_priority = Math.max(
-    ...best_score_objects.map((key) => object_map[key].object_priority ?? -Infinity),
-  );
-  const best_priority_objects = best_score_objects.filter(
-    (key) => object_map[key].object_priority === highest_priority,
-  );
-  if (highest_priority !== -Infinity && best_priority_objects.length === 1) {
-    return best_priority_objects[0];
-  }
-  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) => {
+async function fetchAllowedObjectsList() {
+  const promiseArray = 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)))];
-  const common_keys = all_keys.filter((key) => allowed_objects_list.every((obj) => key in obj));
+  const responses = await Promise.all(promiseArray);
+  return responses.map((response) => response.allowed_objects);
+}
 
-  if (filenames.length > 1 && all_keys.length > 0 && common_keys.length === 0) {
-    multiple_files_no_common.value = true;
-  }
+async function getAllowedGeodeObjects() {
+  toggleLoading();
+  allowedGeodeObjects.value = {};
+  multipleFilesNoCommon.value = false;
 
-  const final_object = {};
-  for (const key of common_keys) {
-    const load_scores = allowed_objects_list.map((obj) => obj[key].is_loadable);
-    const priorities = allowed_objects_list
-      .map((obj) => obj[key].object_priority)
-      .filter((priority) => priority !== undefined);
-    final_object[key] = { is_loadable: Math.min(...load_scores) };
-    if (priorities.length > 0) {
-      final_object[key].object_priority = Math.max(...priorities);
-    }
-  }
-  const isCsv = filenames.some((filename) => isCsvFile(filename));
-  if (isCsv && !final_object["PointSet3D"]) {
-    final_object["PointSet3D"] = { is_loadable: 1, object_priority: 100 };
-  }
+  const allowedGeodeObjectsList = await fetchAllowedObjectsList();
+  const resolved = resolveAllowedObjects(filenames, allowedGeodeObjectsList);
 
-  allowed_objects.value = final_object;
-  const selected_object = select_geode_object(final_object);
-  if (selected_object) {
-    set_geode_object(selected_object);
+  allowedGeodeObjects.value = resolved.allowedGeodeObjects;
+  multipleFilesNoCommon.value = resolved.multipleFilesNoCommon;
+  if (resolved.selectedGeodeObject) {
+    setGeodeObject(resolved.selectedGeodeObject);
   }
-  toggle_loading();
+  toggleLoading();
 }
 
-function set_geode_object(geode_object_type) {
+function setGeodeObject(geode_object_type) {
   if (geode_object_type) {
     emit("update_values", { geode_object_type });
     emit("increment_step");
   }
 }
 // oxlint-disable-next-line no-top-level-await
-await get_allowed_objects();
+await getAllowedGeodeObjects();
 </script>
 
 <template>
   <FetchingData v-if="loading" />
-  <v-row v-else-if="Object.keys(allowed_objects).length" class="justify-left">
-    <v-col v-for="(value, key) in allowed_objects" :key="key" cols="3" md="4">
+  <v-row v-else-if="Object.keys(allowedGeodeObjects).length" class="justify-left">
+    <v-col v-for="(value, key) in allowedGeodeObjects" :key="key" cols="3" md="4">
       <v-tooltip
         :text="
           value['is_loadable']
@@ -124,7 +74,7 @@ await get_allowed_objects();
               class="card ma-2"
               hover
               rounded
-              @click="set_geode_object(key)"
+              @click="setGeodeObject(key)"
               :disabled="!value['is_loadable']"
               :elevation="value['is_loadable'] ? 5 : 3"
             >
@@ -139,7 +89,7 @@ await get_allowed_objects();
       </v-tooltip>
     </v-col>
   </v-row>
-  <v-row v-else-if="multiple_files_no_common" class="pa-5">
+  <v-row v-else-if="multipleFilesNoCommon" class="pa-5">
     <v-card class="card" variant="tonal" rounded>
       <v-card-text>
         These files cannot be loaded together because they don't share a common data type.

app/stores/app.js

@@ -1,4 +1,5 @@
 // Local imports
+import { getRestApiPort, getRestApiProtocol, isCloudMode } from "@ogw_front/utils/stores.js";
 import { api_fetch } from "@ogw_internal/utils/api_fetch.js";
 import { upload_file } from "@ogw_internal/utils/upload_file.js";
 
@@ -8,6 +9,20 @@ import { useInfraStore } from "@ogw_front/stores/infra";
 // oxlint-disable-next-line max-lines-per-function, max-statements
 export const useAppStore = defineStore("app", () => {
   const stores = [];
+  const default_local_port = ref("3000");
+
+  const protocol = computed(() => getRestApiProtocol());
+
+  const port = computed(() => getRestApiPort(default_local_port.value));
+
+  const base_url = computed(() => {
+    const infraStore = useInfraStore();
+    let app_url = `${protocol.value}://${infraStore.domain_name}:${port.value}`;
+    if (isCloudMode()) {
+      app_url += `/server`;
+    }
+    return app_url;
+  });
 
   function registerStore(store) {
     const isAlreadyRegistered = stores.some((registeredStore) => registeredStore.$id === store.$id);
@@ -91,7 +106,7 @@ export const useAppStore = defineStore("app", () => {
     return loadedExtensions.value.get(id);
   }
 
-  async function loadExtension(path, port, backendPath = undefined) {
+  async function loadExtension(path, extensionPort, backendPath = undefined) {
     try {
       let finalURL = path;
 
@@ -108,7 +123,7 @@ export const useAppStore = defineStore("app", () => {
       // oxlint-disable-next-line no-inline-comments
       const extensionModule = await import(/* @vite-ignore */ finalURL);
       const store = extensionModule.metadata.store();
-      store.$patch({ default_local_port: port });
+      store.$patch({ default_local_port: extensionPort });
 
       if (finalURL !== path && finalURL.startsWith("blob:")) {
         URL.revokeObjectURL(finalURL);
@@ -200,7 +215,7 @@ export const useAppStore = defineStore("app", () => {
     const store = useAppStore();
     return upload_file(
       store,
-      { route, file },
+      { schema, file },
       {
         ...callbacks,
         response_function: async (response) => {
@@ -214,16 +229,13 @@ export const useAppStore = defineStore("app", () => {
   }
 
   function request({ schema, params }, callbacks = {}) {
-    console.log("[APP] Request:", schema.$id);
-
     const store = useAppStore();
     return api_fetch(
       store,
-      { schema, params, headers: {} },
+      { schema, params },
       {
         ...callbacks,
         response_function: async (response) => {
-          console.log("[APP] Request completed:", schema.$id);
           if (callbacks.response_function) {
             await callbacks.response_function(response);
           }
@@ -239,6 +251,7 @@ export const useAppStore = defineStore("app", () => {
   function stop_request() {
     request_counter.value -= 1;
   }
+  const is_busy = computed(() => request_counter.value > 0);
 
   const projectFolderPath = ref("");
   function createProjectFolder() {
@@ -265,6 +278,7 @@ export const useAppStore = defineStore("app", () => {
 
   return {
     stores,
+    base_url,
     registerStore,
     exportStores,
     importStores,
@@ -285,5 +299,6 @@ export const useAppStore = defineStore("app", () => {
     createProjectFolder,
     start_request,
     stop_request,
+    is_busy,
   };
 });

app/stores/back.js

@@ -1,12 +1,13 @@
 import { Status } from "@ogw_front/utils/status";
 import { api_fetch } from "@ogw_internal/utils/api_fetch";
-import { appMode } from "@ogw_front/utils/local/app_mode";
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { upload_file } from "@ogw_internal/utils/upload_file.js";
 import { useAppStore } from "@ogw_front/stores/app";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
+import { getRestApiPort, getRestApiProtocol, isCloudMode } from "@ogw_front/utils/stores";
+
 const MILLISECONDS_IN_SECOND = 1000;
 const DEFAULT_PING_INTERVAL_SECONDS = 10;
 
@@ -19,24 +20,18 @@ export const useBackStore = defineStore("back", {
   }),
   getters: {
     protocol() {
-      if (useInfraStore().app_mode === appMode.CLOUD) {
-        return "https";
-      }
-      return "http";
+      return getRestApiProtocol();
     },
     port() {
-      if (useInfraStore().app_mode === appMode.CLOUD) {
-        return "443";
-      }
-      return this.default_local_port;
+      return getRestApiPort(this.default_local_port);
     },
     base_url() {
       const infraStore = useInfraStore();
-      let geode_url = `${this.protocol}://${infraStore.domain_name}:${this.port}`;
-      if (infraStore.app_mode === appMode.CLOUD) {
-        geode_url += `/geode`;
+      let back_url = `${this.protocol}://${infraStore.domain_name}:${this.port}`;
+      if (isCloudMode()) {
+        back_url += `/geode`;
       }
-      return geode_url;
+      return back_url;
     },
     is_busy() {
       return this.request_counter > 0;
@@ -110,22 +105,12 @@ export const useBackStore = defineStore("back", {
       return Promise.resolve();
     },
     request({ schema, params = {} }, callbacks = {}) {
-      console.log("[GEODE] Request:", schema.$id);
-      const start = Date.now();
-
       return api_fetch(
         this,
         { schema, params, headers: {} },
         {
           ...callbacks,
           response_function: async (response) => {
-            console.log(
-              "[GEODE] Request completed:",
-              schema.$id,
-              "in",
-              (Date.now() - start) / MILLISECONDS_IN_SECOND,
-              "s",
-            );
             if (callbacks.response_function) {
               await callbacks.response_function(response);
             }
@@ -134,17 +119,16 @@ export const useBackStore = defineStore("back", {
       );
     },
     upload(file, callbacks = {}) {
-      const route = back_schemas.opengeodeweb_back.upload_file.$id;
+      const schema = back_schemas.opengeodeweb_back.upload_file;
       return upload_file(
         this,
         {
-          route,
+          schema,
           file,
         },
         {
           ...callbacks,
           response_function: async (response) => {
-            console.log("[GEODE] Request completed:", route);
             if (callbacks.response_function) {
               await callbacks.response_function(response);
             }

app/stores/infra.js

@@ -77,11 +77,6 @@ export const useInfraStore = defineStore("infra", {
     },
     async create_connection() {
       console.log("[INFRA] Starting create_connection");
-      console.log(
-        "[INFRA] Connecting microservices:",
-        this.microservices.map((store) => store.$id),
-      );
-
       await Promise.all(
         this.microservices.map(async (store) => {
           console.log("[INFRA] Connecting to microservice:", store.$id);