@geode/opengeodeweb-front 10.0.4 → 10.0.5-rc.2

package/app/stores/treeview.js

@@ -28,6 +28,12 @@ export const useTreeviewStore = defineStore("treeview", () => {
       }
     }
     items.value.push({ title: geode_object_type, children: [child] })
+    items.value.sort((a, b) =>
+      a.title.localeCompare(b.title, undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }),
+    )
     selection.value.push(child)
   }
 

package/package.json

@@ -38,11 +38,11 @@
   },
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "type": "module",
-  "version": "10.0.4",
+  "version": "10.0.5-rc.2",
   "main": "./nuxt.config.js",
   "dependencies": {
-    "@geode/opengeodeweb-back": "latest",
-    "@geode/opengeodeweb-viewer": "latest",
+    "@geode/opengeodeweb-back": "next",
+    "@geode/opengeodeweb-viewer": "next",
     "@kitware/vtk.js": "33.3.0",
     "@mdi/font": "7.4.47",
     "@pinia/nuxt": "0.11.3",

package/tests/integration/microservices/back/requirements.txt

@@ -5,4 +5,4 @@
 #    pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in
 #
 
-opengeodeweb-back==5.*,>=5.14.3rc1
+opengeodeweb-back==5.*,>=5.14.3

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

@@ -1,25 +1,17 @@
-import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
-
+import { mountSuspended } from "@nuxt/test-utils/runtime"
 import { describe, expect, test, vi } from "vitest"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
-import { createVuetify } from "vuetify"
-import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
 
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
-
 import CrsSelector from "@ogw_front/components/CrsSelector"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 
+import { vuetify } from "../../utils"
+
 const crs_selector_schema =
   schemas.opengeodeweb_back.geographic_coordinate_systems
 
-const vuetify = createVuetify({
-  components,
-  directives,
-})
-
 describe("CrsSelector", () => {
   const pinia = createTestingPinia({
     stubActions: false,

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

@@ -1,25 +1,16 @@
 import { describe, expect, test, vi } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
-
-import { createVuetify } from "vuetify"
-import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
+import * as components from "vuetify/components"
 
+import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import ExtensionSelector from "@ogw_front/components/ExtensionSelector"
-
 import { useGeodeStore } from "@ogw_front/stores/geode"
-
-import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
+import { vuetify } from "../../utils"
 
 const schema = schemas.opengeodeweb_back.geode_objects_and_output_extensions
 
-const vuetify = createVuetify({
-  components,
-  directives,
-})
-
 describe("ExtensionSelector", async () => {
   const pinia = createTestingPinia({
     stubActions: false,

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

@@ -1,18 +1,11 @@
 import { describe, expect, test, vi } from "vitest"
 import { mount } from "@vue/test-utils"
-import { createVuetify } from "vuetify"
-import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
 import { createTestingPinia } from "@pinia/testing"
 import { setActivePinia } from "pinia"
 
 import FeedBackErrorBanner from "@ogw_front/components/FeedBack/ErrorBanner"
 import { useFeedbackStore } from "@ogw_front/stores/feedback"
-
-const vuetify = createVuetify({
-  components,
-  directives,
-})
+import { vuetify } from "../../../utils"
 
 describe("FeedBackErrorBanner", async () => {
   ;(test(`Test reload`, async () => {

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

@@ -2,20 +2,13 @@
 vi.stubGlobal("visualViewport", new EventTarget())
 import { describe, expect, test, vi } from "vitest"
 import { mount } from "@vue/test-utils"
-import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
-
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
 import FeedBackSnackers from "@ogw_front/components/FeedBack/Snackers"
 import { useFeedbackStore } from "@ogw_front/stores/feedback"
-
-const vuetify = createVuetify({
-  components,
-  directives,
-})
+import { vuetify } from "../../../utils"
 
 describe("FeedBackSnackers", async () => {
   test(`Test delete error`, async () => {

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

@@ -1,10 +1,7 @@
 import { describe, expect, test, vi } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 import { flushPromises } from "@vue/test-utils"
-
-import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
 
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
@@ -14,15 +11,11 @@ import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import FileSelector from "@ogw_front/components/FileSelector"
 import FileUploader from "@ogw_front/components/FileUploader"
 import { useGeodeStore } from "@ogw_front/stores/geode"
+import { vuetify } from "../../utils"
 
 const allowed_files_schema = schemas.opengeodeweb_back.allowed_files
 const upload_file_schema = schemas.opengeodeweb_back.upload_file
 
-const vuetify = createVuetify({
-  components,
-  directives,
-})
-
 describe("FileSelector", async () => {
   const pinia = createTestingPinia({
     stubActions: false,

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

@@ -1,10 +1,7 @@
 import { describe, expect, test, vi } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 import { flushPromises } from "@vue/test-utils"
-
-import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
@@ -13,12 +10,9 @@ import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import FileUploader from "@ogw_front/components/FileUploader"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 
-const upload_file_schema = schemas.opengeodeweb_back.upload_file
+import { vuetify } from "../../utils"
 
-const vuetify = createVuetify({
-  components,
-  directives,
-})
+const upload_file_schema = schemas.opengeodeweb_back.upload_file
 
 describe("FileUploader", async () => {
   const pinia = createTestingPinia({

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

@@ -1,22 +1,16 @@
 import { describe, expect, test, vi } from "vitest"
-import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
+import { mountSuspended } from "@nuxt/test-utils/runtime"
 import { flushPromises } from "@vue/test-utils"
-
-import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import InspectorInspectionButton from "@ogw_front/components/Inspector/InspectionButton"
 import { useGeodeStore } from "@ogw_front/stores/geode"
-const schema = schemas.opengeodeweb_back.inspect_file
+import { vuetify } from "../../../utils"
 
-const vuetify = createVuetify({
-  components,
-  directives,
-})
+const schema = schemas.opengeodeweb_back.inspect_file
 
 describe("Inspector/InspectionButton", async () => {
   const pinia = createTestingPinia({

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

@@ -1,16 +1,8 @@
 import { describe, expect, test } from "vitest"
 import { mountSuspended } from "@nuxt/test-utils/runtime"
 
-import { createVuetify } from "vuetify"
-import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
-
 import InspectorResultPanel from "@ogw_front/components/Inspector/ResultPanel"
-
-const vuetify = createVuetify({
-  components,
-  directives,
-})
+import { vuetify } from "../../../utils"
 
 describe("Inspector/ResultPanel", async () => {
   test(`Test with issues`, async () => {

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

@@ -1,22 +1,13 @@
 import { describe, expect, test, vi } from "vitest"
 import { flushPromises } from "@vue/test-utils"
 import { mountSuspended } from "@nuxt/test-utils/runtime"
-
-import { createVuetify } from "vuetify"
-import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
-
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
 import Launcher from "@ogw_front/components/Launcher"
 
 import { useInfraStore } from "@ogw_front/stores/infra"
-
-const vuetify = createVuetify({
-  components,
-  directives,
-})
+import { vuetify } from "../../utils"
 
 // Mock navigator.locks API
 const mockLockRequest = vi.fn().mockImplementation(async (name, callback) => {

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

@@ -1,10 +1,7 @@
 import { describe, expect, test, vi } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 import { flushPromises } from "@vue/test-utils"
-
-import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
@@ -14,14 +11,11 @@ import MissingFilesSelector from "@ogw_front/components/MissingFilesSelector"
 import FileUploader from "@ogw_front/components/FileUploader"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 
+import { vuetify } from "../../utils"
+
 const missing_files_schema = schemas.opengeodeweb_back.missing_files
 const upload_file_schema = schemas.opengeodeweb_back.upload_file
 
-const vuetify = createVuetify({
-  components,
-  directives,
-})
-
 describe("MissingFilesSelector", async () => {
   const pinia = createTestingPinia({
     stubActions: false,

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

@@ -1,26 +1,17 @@
 import { describe, expect, test, vi } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 import { flushPromises } from "@vue/test-utils"
-
-import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
+import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import ObjectSelector from "@ogw_front/components/ObjectSelector"
-
 import { useGeodeStore } from "@ogw_front/stores/geode"
-
-import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
+import { vuetify } from "../../utils"
 
 const allowed_objects = schemas.opengeodeweb_back.allowed_objects
 
-const vuetify = createVuetify({
-  components,
-  directives,
-})
-
 describe("ObjectSelector", async () => {
   const pinia = createTestingPinia({
     stubActions: false,

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

@@ -1,20 +1,11 @@
 import { describe, expect, test, vi } from "vitest"
 import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime"
-
-import { createVuetify } from "vuetify"
-import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
-
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 
 import PackagesVersions from "@ogw_front/components/PackagesVersions"
 import { useGeodeStore } from "@ogw_front/stores/geode"
-
-const vuetify = createVuetify({
-  components,
-  directives,
-})
+import { vuetify } from "../../utils"
 
 describe("PackagesVersions", async () => {
   test(`Mount`, async () => {

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

@@ -1,17 +1,9 @@
 import { describe, expect, test } from "vitest"
 import { mount } from "@vue/test-utils"
-
-import { createVuetify } from "vuetify"
-import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
-
 import Step from "@ogw_front/components/Step"
 import ObjectSelector from "@ogw_front/components/ObjectSelector"
 
-const vuetify = createVuetify({
-  components,
-  directives,
-})
+import { vuetify } from "../../utils"
 
 global.ResizeObserver = require("resize-observer-polyfill")
 

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

@@ -1,18 +1,10 @@
 import { describe, expect, test } from "vitest"
 import { mountSuspended } from "@vue/test-utils"
 
-import { createVuetify } from "vuetify"
-import * as components from "vuetify/components"
-import * as directives from "vuetify/directives"
-
 import Stepper from "@ogw_front/components/Stepper"
 import ObjectSelector from "@ogw_front/components/ObjectSelector"
 import { mountSuspended } from "@nuxt/test-utils/runtime"
-
-const vuetify = createVuetify({
-  components,
-  directives,
-})
+import { vuetify } from "../../utils"
 
 global.ResizeObserver = require("resize-observer-polyfill")
 

package/tests/unit/stores/Treeview.nuxt.test.js

@@ -0,0 +1,66 @@
+import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest"
+import { createTestingPinia } from "@pinia/testing"
+import { setActivePinia } from "pinia"
+
+import { useTreeviewStore } from "@ogw_front/stores/treeview"
+
+beforeEach(async () => {
+  const pinia = createTestingPinia({
+    stubActions: false,
+    createSpy: vi.fn,
+  })
+  setActivePinia(pinia)
+})
+
+describe("Treeview Store", () => {
+  describe("state", () => {
+    test("initial state", () => {
+      const treeviewStore = useTreeviewStore()
+      expectTypeOf(treeviewStore.items).toBeArray()
+    })
+  })
+
+  describe("actions", () => {
+    describe("addItem", () => {
+      test("test items sorted", () => {
+        const treeviewStore = useTreeviewStore()
+
+        const testItems = [
+          {
+            geode_object_type: "BRep",
+            name: "test_brep.og_brep",
+            id: "1",
+            viewer_type: "model",
+          },
+          {
+            geode_object_type: "BRep",
+            name: "test_brep_2.og_brep",
+            id: "2",
+            viewer_type: "model",
+          },
+          {
+            geode_object_type: "EdgedCurve2D",
+            name: "test_edgedcurve.og_edc2d",
+            id: "2",
+            viewer_type: "mesh",
+          },
+        ]
+
+        for (let i = 0; i < testItems.length; i++) {
+          treeviewStore.addItem(
+            testItems[i].geode_object_type,
+            testItems[i].name,
+            testItems[i].id,
+            testItems[i].viewer_type,
+          )
+          expect(treeviewStore.items.sort()).toBe(treeviewStore.items)
+          for (let i = 0; i < treeviewStore.items.length; i++) {
+            expect(treeviewStore.items[i].children.sort()).toBe(
+              treeviewStore.items[i].children,
+            )
+          }
+        }
+      })
+    })
+  })
+})

package/tests/utils.js

@@ -0,0 +1,6 @@
+import { createVuetify } from "vuetify"
+import * as components from "vuetify/components"
+import * as directives from "vuetify/directives"
+const vuetify = createVuetify({ components, directives })
+
+export { vuetify }

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

@@ -1,59 +0,0 @@
-import { describe, expect, test } from "vitest"
-// import { mountSuspended } from "@nuxt/test-utils/runtime"
-
-// import { createVuetify } from "vuetify"
-// import * as components from "vuetify/components"
-// import * as directives from "vuetify/directives"
-
-// // import Wrapper from "@ogw_front/components/Wrapper"
-// import ObjectSelector from "@ogw_front/components/ObjectSelector"
-
-// const vuetify = createVuetify({
-//   components,
-//   directives,
-// })
-
-// global.ResizeObserver = require("resize-observer-polyfill")
-
-// describe("Step", async () => {
-//   test(`Mount`, async () => {
-//     const geode_object_type = ref("BRep")
-//     const files = ref([])
-//     const stepper_tree = reactive({
-//       current_step_index: ref(0),
-//       geode_object_type,
-//       steps: [
-//         {
-//           step_title: "Confirm the data type",
-//           component: {
-//             component_name: shallowRef(ObjectSelector),
-//             component_options: {
-//               filenames: computed(() => {
-//                 return files.value.map((file) => file.name)
-//               }),
-//               key: "",
-//             },
-//           },
-//           chips: computed(() => {
-//             if (geode_object_type.value === "") {
-//               return []
-//             } else {
-//               return [geode_object_type.value]
-//             }
-//           }),
-//         },
-//       ],
-//     })
-//     // const wrapper = await mountSuspended(Wrapper, {
-//     //   global: {
-//     //     plugins: [vuetify],
-//     //     provide: { stepper_tree },
-//     //   },
-//     //   props: { versions_schema: {} },
-//     // })
-//     // expect(wrapper.exists()).toBe(true)
-//   })
-// })
-describe("Fake", async () => {
-  test(`Fake`, async () => {})
-})