@geode/opengeodeweb-front 9.7.0 → 9.7.1-rc.1

package/.github/workflows/CICD.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Unit tests
         run: |
-          npm i
+          npm ci
           npm run test
 
   build:

package/components/FileUploader.vue

@@ -80,6 +80,7 @@
     await Promise.all(promise_array)
     files_uploaded.value = true
     emit("files_uploaded", internal_files.value)
+
     toggle_loading()
   }
 

package/components/ObjectSelector.vue

@@ -72,25 +72,14 @@
     var promise_array = []
     for (const filename of filenames) {
       const params = { filename, supported_feature }
-      const promise = new Promise((resolve, reject) => {
-        api_fetch(
-          { schema, params },
-          {
-            request_error_function: () => {
-              reject()
-            },
-            response_function: (response) => {
-              resolve(response._data.allowed_objects)
-            },
-            response_error_function: () => {
-              reject()
-            },
-          },
-        )
-      })
+      const promise = api_fetch({ schema, params })
       promise_array.push(promise)
     }
-    const values = await Promise.all(promise_array)
+    const responses = await Promise.all(promise_array)
+    let values = []
+    for (const response of responses) {
+      values.push(response.data.value.allowed_objects)
+    }
     const all_keys = [...new Set(values.flatMap((value) => Object.keys(value)))]
     const common_keys = all_keys.filter(
       (i) => !values.some((j) => !Object.keys(j).includes(i)),
@@ -119,7 +108,6 @@
       emit("increment_step")
     }
   }
-
   await get_allowed_objects()
 </script>
 

package/components/Recaptcha.vue

@@ -22,7 +22,7 @@
   onMounted(() => {
     if (process.client) {
       const config = useRuntimeConfig()
-      if (config.public.NODE_ENV !== "production") {
+      if (config.public.NODE_ENV !== "production" || !infra_store.is_cloud) {
         infra_store.$patch({ is_captcha_validated: true })
       }
     }

package/composables/api_fetch.js

@@ -29,46 +29,41 @@ export function api_fetch(
   if (schema.max_retry) {
     request_options.max_retry = schema.max_retry
   }
-  return new Promise((resolve, reject) => {
-    useFetch(schema.$id, {
-      baseURL: geode_store.base_url,
-      ...request_options,
-      async onRequestError({ error }) {
+  return useFetch(schema.$id, {
+    baseURL: geode_store.base_url,
+    ...request_options,
+    async onRequestError({ error }) {
+      await geode_store.stop_request()
+      await feedback_store.add_error(
+        error.code,
+        schema.$id,
+        error.message,
+        error.stack,
+      )
+      if (request_error_function) {
+        await request_error_function(error)
+      }
+    },
+    async onResponse({ response }) {
+      if (response.ok) {
         await geode_store.stop_request()
-        await feedback_store.add_error(
-          error.code,
-          schema.$id,
-          error.message,
-          error.stack,
-        )
-        if (request_error_function) {
-          await request_error_function(error)
+        if (response_function) {
+          await response_function(response)
         }
-        reject(error)
-      },
-      async onResponse({ response }) {
-        if (response.ok) {
-          await geode_store.stop_request()
-          if (response_function) {
-            await response_function(response)
-          }
-          resolve(response)
-        }
-      },
-      async onResponseError({ response }) {
-        await geode_store.stop_request()
-        await feedback_store.add_error(
-          response.status,
-          schema.$id,
-          response._data.name,
-          response._data.description,
-        )
-        if (response_error_function) {
-          await response_error_function(response)
-        }
-        reject(response)
-      },
-    })
+      }
+    },
+    async onResponseError({ response }) {
+      await geode_store.stop_request()
+      await feedback_store.add_error(
+        response.status,
+        schema.$id,
+        response._data.name,
+        response._data.description,
+      )
+      if (response_error_function) {
+        await response_error_function(response)
+      }
+    },
   })
 }
 

package/composables/upload_file.js

@@ -1,7 +1,10 @@
+import { useAppConfig } from "nuxt/app"
+
 export async function upload_file(
   { route, file },
   { request_error_function, response_function, response_error_function } = {},
 ) {
+  console.log("upload_file", route, file)
   const feedback_store = use_feedback_store()
   const geode_store = use_geode_store()
   if (!(file instanceof File)) {
@@ -17,10 +20,14 @@ export async function upload_file(
   }
 
   geode_store.start_request()
-  return useFetch(route, {
+  return $fetch(route, {
     baseURL: geode_store.base_url,
     ...request_options,
+    onRequest({ request }) {
+      console.log("onRequest", request)
+    },
     onRequestError({ error }) {
+      console.log("onRequestError", error)
       geode_store.stop_request()
       feedback_store.add_error(error.code, route, error.message, error.stack)
       if (request_error_function) {
@@ -28,6 +35,7 @@ export async function upload_file(
       }
     },
     onResponse({ response }) {
+      console.log("onResponse", response)
       if (response.ok) {
         geode_store.stop_request()
         if (response_function) {
@@ -36,6 +44,7 @@ export async function upload_file(
       }
     },
     onResponseError({ response }) {
+      console.log("onResponseError", response)
       geode_store.stop_request()
       feedback_store.add_error(
         response.status,

package/eslint.config.cjs

@@ -0,0 +1,13 @@
+module.exports = {
+  env: {
+    node: true,
+    browser: true,
+    es2021: true,
+  },
+  extends: [
+    "eslint:recommended",
+    "plugin:vue/recommended",
+    "plugin:vuetify/recommended",
+    "plugin:nuxt/recommended",
+  ],
+}

package/package.json

@@ -7,29 +7,28 @@
     "geode_objects": "node scripts/generate_geode_objects.js && prettier ./assets/geode_objects.js --write"
   },
   "devDependencies": {
-    "@nuxt/test-utils": "^3.15.1",
-    "@pinia/testing": "^0.1.7",
-    "@vitejs/plugin-vue": "^5.2.1",
-    "@vitest/coverage-v8": "^3.0.8",
+    "@nuxt/test-utils": "^3.18.0",
+    "@pinia/testing": "^1.0.1",
+    "@vitejs/plugin-vue": "^5.2.3",
     "@vue/test-utils": "^2.4.6",
-    "eslint": "^8.57.0",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint": "^9.26.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-nuxt": "^4.0.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-prettier": "^5.4.0",
     "eslint-plugin-prettier-vue": "^5.0.0",
-    "eslint-plugin-vue": "^9.33.0",
-    "eslint-plugin-vuetify": "^2.4.0",
-    "happy-dom": "^15.11.7",
-    "jsdom": "^24.1.3",
-    "nuxt": "^3.13.2",
-    "playwright-core": "^1.44.1",
-    "prettier": "3.3.2",
+    "eslint-plugin-vue": "^10.1.0",
+    "eslint-plugin-vuetify": "^2.5.2",
+    "happy-dom": "^17.4.6",
+    "jsdom": "^26.1.0",
+    "nuxt": "3.17.2",
+    "playwright-core": "^1.52.0",
+    "prettier": "3.3.3",
     "resize-observer-polyfill": "^1.5.1",
-    "vite": "^6.2.1",
-    "vite-plugin-vuetify": "^2.0.4",
-    "vitest": "^3.0.8",
+    "vite": "^6.3.5",
+    "vite-plugin-vuetify": "^2.1.1",
+    "vitest": "^3.1.2",
     "vitest-environment-nuxt": "^1.0.1",
-    "vuetify": "^3.7.5",
+    "vuetify": "^3.8.3",
     "wslink": "1.12.4"
   },
   "overrides": {
@@ -37,23 +36,23 @@
   },
   "description": "OpenSource Vue/Vuetify framework for web applications",
   "type": "module",
-  "version": "9.7.0",
+  "version": "9.7.1-rc.1",
   "main": "./nuxt.config.js",
   "dependencies": {
-    "@geode/opengeodeweb-back": "5.6.3",
-    "@geode/opengeodeweb-viewer": "1.6.1",
+    "@geode/opengeodeweb-back": "5.7.0",
+    "@geode/opengeodeweb-viewer": "1.6.3",
     "@kitware/vtk.js": "30.3.1",
     "@mdi/font": "^7.4.47",
-    "@pinia/nuxt": "^0.5.4",
-    "@types/node": "^22.5.1",
-    "@vueuse/components": "^11.0.3",
-    "@vueuse/nuxt": "^11.0.3",
+    "@pinia/nuxt": "^0.11.0",
+    "@types/node": "^22.15.3",
+    "@vueuse/components": "^13.1.0",
+    "@vueuse/nuxt": "^13.1.0",
     "ajv": "^8.17.1",
     "is-electron": "^2.2.2",
     "js-file-download": "^0.4.12",
-    "pinia": "^2.2.2",
-    "sass": "^1.77.8",
-    "semver": "^7.6.3",
+    "pinia": "^3.0.2",
+    "sass": "^1.87.0",
+    "semver": "^7.7.1",
     "uuid": "^11.1.0",
     "vue-recaptcha": "^2.0.3",
     "vue3-carousel": "^0.3.3"

package/test/components/CrsSelector.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 

package/test/components/ExtensionSelector.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 

package/test/components/FeedBack/ErrorsBanner.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test, vi } from "vitest"
 import { mount } from "@vue/test-utils"
 import { createVuetify } from "vuetify"

package/test/components/FeedBack/Snackers.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test } from "vitest"
 import { mount } from "@vue/test-utils"
 import { createVuetify } from "vuetify"

package/test/components/FileSelector.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test, vi } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 import { flushPromises } from "@vue/test-utils"
@@ -60,6 +58,7 @@ describe("FileSelector.vue", async () => {
     const v_btn = wrapper.findComponent(components.VBtn)
     await v_btn.trigger("click")
     await flushPromises()
+    await flushPromises()
     expect(wrapper.emitted()).toHaveProperty("update_values")
     expect(wrapper.emitted().update_values).toHaveLength(1)
     expect(wrapper.emitted().update_values[0][0]).toEqual({
@@ -83,7 +82,6 @@ describe("FileSelector.vue", async () => {
 
     const files = [new File(["fake_file"], "fake_file.txt")]
     test("auto_upload true", async () => {
-      const auto_upload = true
       const wrapper = await mountSuspended(FileSelector, {
         global: {
           plugins: [vuetify, pinia],
@@ -92,7 +90,7 @@ describe("FileSelector.vue", async () => {
           multiple: false,
           supported_feature: "test",
           files: files,
-          auto_upload,
+          auto_upload: true,
         },
       })
 
@@ -107,7 +105,6 @@ describe("FileSelector.vue", async () => {
     })
 
     test("auto_upload false", async () => {
-      const auto_upload = false
       const wrapper = await mountSuspended(FileSelector, {
         global: {
           plugins: [vuetify, pinia],
@@ -116,7 +113,7 @@ describe("FileSelector.vue", async () => {
           multiple: false,
           supported_feature: "test",
           files: files,
-          auto_upload,
+          auto_upload: false,
         },
       })
 

package/test/components/FileUploader.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 import { flushPromises } from "@vue/test-utils"
@@ -56,6 +54,7 @@ describe("FileUploader.vue", async () => {
 
       await v_btn.trigger("click")
       await flushPromises()
+      await flushPromises()
       expect(wrapper.emitted().files_uploaded[0][0]).toEqual(files)
     })
 

package/test/components/Inspector/InspectionButton.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 import { flushPromises } from "@vue/test-utils"

package/test/components/Inspector/ResultPanel.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test } from "vitest"
 import { mountSuspended } from "@nuxt/test-utils/runtime"
 

package/test/components/Launcher.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test, vi } from "vitest"
 import { flushPromises } from "@vue/test-utils"
 import { mountSuspended } from "@nuxt/test-utils/runtime"

package/test/components/MissingFilesSelector.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 import { flushPromises } from "@vue/test-utils"
@@ -65,6 +63,7 @@ describe("MissingFilesSelector.vue", async () => {
     })
     await v_btn.trigger("click")
     await flushPromises()
+    await flushPromises()
     expect(wrapper.emitted()).toHaveProperty("update_values")
     expect(wrapper.emitted().update_values).toHaveLength(1)
     expect(wrapper.emitted().update_values[0][0]).toEqual({

package/test/components/ObjectSelector.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 import { flushPromises } from "@vue/test-utils"
@@ -74,7 +72,11 @@ describe("ObjectSelector.vue", async () => {
     const v_card = wrapper.findComponent(components.VCard)
     const v_img = v_card.findComponent(components.VImg)
     expect(v_img.vm.src).toContain(`${geode_object_1}.svg`)
+    await flushPromises()
+    await flushPromises()
     await v_card.trigger("click")
+    await flushPromises()
+    await flushPromises()
     expect(wrapper.emitted()).toHaveProperty("update_values")
     expect(wrapper.emitted().update_values).toHaveLength(1)
     expect(wrapper.emitted().update_values[0][0]).toEqual({

package/test/components/PackagesVersions.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test } from "vitest"
 import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime"
 

package/test/components/Step.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test } from "vitest"
 import { mount } from "@vue/test-utils"
 

package/test/components/Stepper.nuxt.test.js

@@ -1,5 +1,3 @@
-// @vitest-environment nuxt
-
 import { describe, expect, test } from "vitest"
 import { mountSuspended } from "@vue/test-utils"
 

package/test/components/Wrapper.nuxt.test.js

@@ -1,6 +1,4 @@
-// // @vitest-environment nuxt
-
-// import { describe, expect, test } from "vitest"
+// // import { describe, expect, test } from "vitest"
 // import { mountSuspended } from "@nuxt/test-utils/runtime"
 
 // import { createVuetify } from "vuetify"