feat(microservices status): passing tests

Author: JulienChampagnol

components/Launcher.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script setup>
-  import Status from "../utils/status"
+  import Status from "@/utils/status.js"
 
   const viewer_store = use_viewer_store()
   const infra_store = use_infra_store()

components/RemoteRenderingView.vue

@@ -24,7 +24,7 @@
   import vtkRemoteView from "@kitware/vtk.js/Rendering/Misc/RemoteView"
   import { useElementSize, useWindowSize } from "@vueuse/core"
   import viewer_schemas from "@geode/opengeodeweb-viewer/schemas.json"
-  import Status from "../utils/status"
+  import Status from "@/utils/status.js"
 
   const viewer_store = use_viewer_store()
   const viewer = ref(null)

composables/run_function_when_infra_created.js renamed to composables/run_function_when_microservices_connected.js

@@ -1,11 +1,13 @@
+import Status from "@/utils/status.js"
+
 export function run_function_when_microservices_connected(function_to_run) {
   const infra_store = use_infra_store()
-  const { status } = storeToRefs(infra_store)
-  if (status === Status.CREATED) {
+  const { microservices_connected } = storeToRefs(infra_store)
+  if (microservices_connected.value) {
     function_to_run()
   } else {
-    watch(status, (value) => {
-      if (value === Status.CREATED) {
+    watch(microservices_connected, (value) => {
+      if (value) {
         function_to_run()
       }
     })

stores/geode.js

@@ -1,5 +1,5 @@
 import back_schemas from "@geode/opengeodeweb-back/schemas.json"
-import Status from "@/utils/status"
+import Status from "@/utils/status.js"
 
 export const use_geode_store = defineStore("geode", {
   state: () => ({

stores/infra.js

@@ -1,6 +1,6 @@
 import { useStorage } from "@vueuse/core"
 import isElectron from "is-electron"
-import Status from "../utils/status"
+import Status from "@/utils/status.js"
 
 export const use_infra_store = defineStore("infra", {
   state: () => ({
@@ -49,12 +49,13 @@ export const use_infra_store = defineStore("infra", {
     async create_backend() {
       console.log("create_backend", this.status)
       if (this.status === Status.CREATED) return
+      console.log("NAVIGATOR", navigator)
       navigator.locks.request("infra.create_backend", async (lock) => {
-        console.log("create_backend lock", this.status)
+        console.log("PASSED IN LOCK", this.status)
+        this.status = Status.CREATING
         if (this.status === Status.CREATED) return
         console.log("INFRA LOCK GRANTED !", lock)
         console.log("INFRA STATUS", this.status)
-        this.status = Status.CREATING
         const geode_store = use_geode_store()
         const viewer_store = use_viewer_store()
         const feedback_store = use_feedback_store()
@@ -69,13 +70,13 @@ export const use_infra_store = defineStore("infra", {
           const { data, error } = await useFetch(this.lambda_url, {
             method: "POST",
           })
-          if (data.value !== null) {
-            this.ID = data.value.ID
-            localStorage.setItem("ID", data.value.ID)
-          } else {
+          if (error.value || !data.value) {
+            this.status = Status.NOT_CREATED
             feedback_store.server_error = true
             return
           }
+          this.ID = data.value.ID
+          localStorage.setItem("ID", data.value.ID)
         }
         this.status = Status.CREATED
         return this.create_connection()

stores/viewer.js

@@ -2,7 +2,7 @@ import _ from "lodash"
 import vtkWSLinkClient from "@kitware/vtk.js/IO/Core/WSLinkClient"
 import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
 import schemas from "@geode/opengeodeweb-viewer/schemas.json"
-import Status from "../utils/status"
+import Status from "@/utils/status.js"
 
 export const use_viewer_store = defineStore("viewer", {
   state: () => ({

test/components/FileSelector.nuxt.test.js

@@ -123,7 +123,6 @@ describe("FileSelector.vue", async () => {
       await flushPromises()
 
       const file_uploader = wrapper.findComponent(FileUploader)
-      console.log("wrapper", wrapper)
       expect(wrapper.vm.props.files).toEqual(files)
       const upload_files = vi.spyOn(file_uploader.vm, "upload_files")
       expect(upload_files).not.toHaveBeenCalled()

test/composables/run_function_when_infra_created.nuxt.test.js renamed to test/composables/run_function_when_microservices_connected.test.js

@@ -1,7 +1,7 @@
 import { describe, expect, test, beforeEach, vi } from "vitest"
-import { Status } from "../utils/status"
+import Status from "@/utils/status.js"
 
-describe("run_function_when_infra_created", () => {
+describe("run_function_when_microservices_connected", () => {
   const geode_store = use_geode_store()
   const viewer_store = use_viewer_store()
 
@@ -14,10 +14,9 @@ describe("run_function_when_infra_created", () => {
   console.log("Status.CONNECTED", Status.CONNECTED)
   test("microservices connected", async () => {
     const spy = vi.spyOn(dumb_obj, "dumb_method")
+    run_function_when_microservices_connected(dumb_obj.dumb_method)
     await geode_store.$patch({ status: Status.CONNECTED })
     await viewer_store.$patch({ status: Status.CONNECTED })
-
-    await run_function_when_microservices_connected(dumb_obj.dumb_method)
     expect(spy).toHaveBeenCalled()
   })
 

test/stores/Infra.nuxt.test.js

@@ -1,10 +1,27 @@
-import { describe, test, expect, expectTypeOf, beforeEach } from "vitest"
+import { describe, test, expect, expectTypeOf, beforeEach, vi } from "vitest"
 import { registerEndpoint } from "@nuxt/test-utils/runtime"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
-import Status from "../utils/status"
+import Status from "@/utils/status.js"
+
+// Mock navigator.locks API
+const mockLockRequest = vi.fn().mockImplementation(async (name, callback) => {
+  return callback({ name })
+})
+
+vi.stubGlobal('navigator', {
+  ...navigator,
+  locks: {
+    request: mockLockRequest
+  }
+})
 
 describe("Infra Store", () => {
+  // const locksMock = {
+  //   locks: { request: vi.fn() },
+  // }
+  // global.navigator = locksMock // here
+
   const pinia = createTestingPinia({
     stubActions: false,
   })
@@ -62,6 +79,7 @@ describe("Infra Store", () => {
       test("test geode false & viewer false", () => {
         geode_store.$patch({ status: Status.NOT_CONNECTED })
         viewer_store.$patch({ status: Status.NOT_CONNECTED })
+        console.log("Status", Status)
         expect(infra_store.microservices_connected).toBe(false)
       })
       test("test geode true & viewer false", () => {
@@ -106,27 +124,24 @@ describe("Infra Store", () => {
   })
 
   describe("actions", () => {
-    describe("create_backend", () => {
-      test("test without end-point", async () => {
-        await infra_store.create_backend()
-        expect(infra_store.status).toBe(Status.NOT_CONNECTED)
-        expect(feedback_store.server_error).toBe(true)
-      })
-    })
     describe("create_backend", () => {
       test("test without end-point", async () => {
         await infra_store.create_backend()
         console.log("geode_store.status", geode_store.status)
+        expect(infra_store.status).toBe(Status.CREATING)
         expect(geode_store.status).toBe(Status.NOT_CONNECTED)
-        expect(feedback_store.server_error).toBe(true)
+        expect(viewer_store.status).toBe(Status.NOT_CONNECTED)
       })
       test("test with end-point", async () => {
         registerEndpoint(infra_store.lambda_url, {
           method: "POST",
           handler: () => ({ ID: "123456" }),
         })
         await infra_store.create_backend()
-        expect(geode_store.status).toBe(Status.CONNECTED)
+        expect(infra_store.status).toBe(Status.CREATING)
+        expect(geode_store.status).toBe(Status.NOT_CONNECTED)
+        expect(viewer_store.status).toBe(Status.NOT_CONNECTED)
+        expect(feedback_store.server_error).toBe(false)
       })
     })
   })

utils/status.js

@@ -7,4 +7,4 @@ const Status = {
   CONNECTED: "CONNECTED",
 }
 
-export default { Status }
+export default Status