remove defineStore

Author: JulienChampagnol

stores/cloud.js

@@ -1,11 +1,9 @@
-import { defineStore } from 'pinia'
 import { useStorage } from '@vueuse/core'
 
 export const use_cloud_store = defineStore('cloud', {
   state: () => ({
     ID: useStorage('ID', ''),
     is_captcha_validated: false,
-    is_cloud_running: false,
     is_connexion_launched: false,
   }),
   getters: {
@@ -26,20 +24,20 @@ export const use_cloud_store = defineStore('cloud', {
       viewer_url = viewer_url + '/ws'
       return viewer_url
     },
-    is_cloud_running: (state) => {
-      const geode_store = use_geode_store()
-      const websocket_store = use_websocket_store()
-      return state.is_cloud_running
+    is_cloud_running: () => {
+      return use_geode_store().is_client_created && use_websocket_store().is_client_created
     },
-    is_cloud_busy: () => {
-      const geode_store = use_geode_store()
-      const websocket_store = use_websocket_store()
-      return geode_store.api_busy() && websocket_store.websocket_busy()
+    cloud_busy: () => {
+      const api_busy = use_geode_store().api_busy
+      const websocket_busy = use_geode_store().websocket_busy
+      const cloud_busy = api_busy || websocket_busy
+      return cloud_busy
     }
 
   },
   actions: {
     async create_connexion () {
+      const geode_store = use_geode_store()
       if (this.is_connexion_launched) { return }
       this.is_connexion_launched = true
       if (this.ID === '' || this.ID === null || typeof this.ID === 'undefined') {
@@ -48,22 +46,23 @@ export const use_cloud_store = defineStore('cloud', {
         const { data, error } = await useFetch(`${this.geode_url}/ping`, { method: 'POST' })
         console.log("error", error)
         if (data.value !== null) {
-          this.is_cloud_running = true
+          geode_store.is_client_created = true
           return this.ping_task()
         } else {
           return this.create_backend()
         }
       }
     },
     async create_backend () {
+      const geode_store = use_geode_store()
       const errors_store = use_errors_store()
       const config = useRuntimeConfig()
       const public_runtime_config = config.public
       const { data, error } = await useFetch(`${public_runtime_config.GEODE_PROTOCOL}://${public_runtime_config.API_URL}:${public_runtime_config.GEODE_PORT}${public_runtime_config.SITE_BRANCH}/${public_runtime_config.PROJECT}/createbackend`, { method: 'POST' })
       if (data.value !== null) {
         this.ID = data.value.ID
         localStorage.setItem('ID', data.value.ID)
-        this.is_cloud_running = true
+        geode_store.is_client_created = true
         return this.ping_task()
       } else {
         console.log("error : ", error)
@@ -75,10 +74,11 @@ export const use_cloud_store = defineStore('cloud', {
       setInterval(() => this.do_ping(), 10 * 1000)
     },
     async do_ping () {
+      const geode_store = use_geode_store()
       const errors_store = use_errors_store()
       const { data, error } = await useFetch(`${this.geode_url}/ping`, { method: 'POST' })
       if (data.value !== null) {
-        this.is_cloud_running = true
+        geode_store.is_client_created = true
       } else {
         errors_store.server_error = true
         console.log("error : ", error)

stores/errors.js

@@ -1,5 +1,3 @@
-import { defineStore } from 'pinia'
-
 export const use_errors_store = defineStore('errors', {
   state: () => ({
     errors: [],

stores/geode_store.js renamed to stores/geode.js

@@ -1,20 +1,19 @@
-import { defineStore } from 'pinia'
-
 export const use_geode_store = defineStore('geode', {
   state: () => ({
-    request_counter: 0
+    request_counter: 0,
+    is_client_created: false
   }),
   getters: {
     api_busy: (state) => {
       return state.request_counter > 0
     }
   },
   actions: {
-    start_request (state) {
-      state.request_counter++
+    start_request () {
+      this.request_counter++
     },
-    stop_request (state) {
-      state.request_counter--
+    stop_request () {
+      this.request_counter--
     }
   }
 })

stores/viewer.js

@@ -1,5 +1,3 @@
-import { defineStore } from 'pinia'
-
 export const use_viewer_store = defineStore('viewer', {
   state: () => ({
     picking_mode: false,

stores/websocket.js

@@ -1,4 +1,3 @@
-import { defineStore } from 'pinia'
 import _ from 'lodash'
 
 import vtkWSLinkClient from '@kitware/vtk.js/IO/Core/WSLinkClient'
@@ -96,10 +95,10 @@ export const use_websocket_store = defineStore('websocket', {
       }
     },
   },
-  start_request (state) {
-    state.request_counter++
+  start_request () {
+    this.request_counter++
   },
-  stop_request (state) {
-    state.request_counter--
+  stop_request () {
+    this.request_counter--
   }
 })