geode store & feedback corrected

Author: MaxNumerique

stores/feedback.js

@@ -1,7 +1,7 @@
 import { v4 as uuidv4 } from "uuid"
 
 
-export const use_feedback_store = define("feedback", () => {
+export const use_feedback_store = defineStore("feedback", () => {
   const feedbacks = ref([]);
   const server_error = ref(false);
   const feedbacks_timeout_miliseconds = ref(5000);

stores/geode.js

@@ -1,79 +1,91 @@
 import back_schemas from "@geode/opengeodeweb-back/schemas.json"
 import Status from "@ogw_f/utils/status.js"
 
-export const use_geode_store = defineStore("geode", {
-  state: () => ({
-    default_local_port: "5000",
-    request_counter: 0,
-    status: Status.NOT_CONNECTED,
-  }),
-  getters: {
-    protocol() {
-      if (use_infra_store().is_cloud) {
-        return "https"
-      }
-      return "http"
-    },
-    port() {
-      if (use_infra_store().is_cloud) {
-        return "443"
+export const use_geode_store = defineStore("geode", () => {
+  const default_local_port = "5000";
+  const request_counter = ref(0);
+  const status = ref(Status.NOT_CONNECTED);
+
+  function getProtocol() {
+    if (use_infra_store().is_cloud) {
+      return "https"
+    }
+    return "http"
+  }
+
+  function getPort() {
+    if (use_infra_store().is_cloud) {
+      return "443"
+    }
+    return default_local_port
+  }
+
+  function getBaseUrl() {
+    const infra_store = use_infra_store()
+    let geode_url = `${getProtocol()}://${infra_store.domain_name}:${getPort()}`
+    if (infra_store.is_cloud) {
+      if (infra_store.ID == "") {
+        throw new Error("ID must not be empty in cloud mode")
       }
-      return this.default_local_port
-    },
-    base_url() {
-      const infra_store = use_infra_store()
-      let geode_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
-      if (infra_store.is_cloud) {
-        if (infra_store.ID == "") {
-          throw new Error("ID must not be empty in cloud mode")
-        }
-        geode_url += `/${infra_store.ID}/geode`
+      geode_url += `/${infra_store.ID}/geode`
+    }
+    return geode_url
+  }
+
+  const is_busy = computed(() => {
+    return request_counter.value > 0
+  });
+
+  function ping_task() {
+    setInterval(() => {
+      if (status.value == Status.CONNECTED) {
+        do_ping()
       }
-      return geode_url
-    },
-    is_busy() {
-      return this.request_counter > 0
-    },
-  },
-  actions: {
-    ping_task() {
-      setInterval(() => {
-        if (this.status == Status.CONNECTED) {
-          this.do_ping()
+    }, 10 * 1000)
+  }
+
+  async function do_ping() {
+    const geode_store = this
+    const feedback_store = use_feedback_store()
+    return useFetch(back_schemas.opengeodeweb_back.ping.$id, {
+      baseURL: getBaseUrl(),
+      method: back_schemas.opengeodeweb_back.ping.methods[0],
+      body: {},
+      onRequestError({ error }) {
+        feedback_store.server_error = true
+        status.value = Status.NOT_CONNECTED
+      },
+      onResponse({ response }) {
+        if (response.ok) {
+          feedback_store.server_error = false
+          status.value = Status.CONNECTED
         }
-      }, 10 * 1000)
-    },
-    do_ping() {
-      const geode_store = this
-      const feedback_store = use_feedback_store()
-      return useFetch(back_schemas.opengeodeweb_back.ping.$id, {
-        baseURL: this.base_url,
-        method: back_schemas.opengeodeweb_back.ping.methods[0],
-        body: {},
-        onRequestError({ error }) {
-          feedback_store.server_error = true
-          geode_store.status = Status.NOT_CONNECTED
-        },
-        onResponse({ response }) {
-          if (response.ok) {
-            feedback_store.server_error = false
-            geode_store.status = Status.CONNECTED
-          }
-        },
-        onResponseError({ response }) {
-          feedback_store.server_error = true
-          geode_store.status = Status.NOT_CONNECTED
-        },
-      })
-    },
-    start_request() {
-      this.request_counter++
-    },
-    stop_request() {
-      this.request_counter--
-    },
-  },
-  share: {
-    omit: ["status"],
-  },
+      },
+      onResponseError({ response }) {
+        feedback_store.server_error = true
+        status.value = Status.NOT_CONNECTED
+      },
+    })
+  }
+
+  function start_request() {
+    request_counter.value++
+  }
+
+  function stop_request() {
+    request_counter.value--
+  }
+
+  return {
+    request_counter,
+    status,
+    getProtocol,
+    getPort,
+    getBaseUrl,
+    is_busy,
+    ping_task,
+    do_ping,
+    start_request,
+    stop_request,
+  }
 })