Skip to content

Commit 6df6a45

Browse files
integration tests okay
1 parent 3c0b5ea commit 6df6a45

File tree

11 files changed

+24
-13
lines changed

11 files changed

+24
-13
lines changed

app/stores/data_base.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
// Third party imports
22
import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
33
import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
4+
import { useViewerStore } from "@ogw_front/stores/viewer"
5+
import { useGeodeStore } from "@ogw_front/stores/geode"
46

57
// Local constants
68
const back_model_schemas = back_schemas.opengeodeweb_back.models
79
const viewer_generic_schemas = viewer_schemas.opengeodeweb_viewer.generic
810

911
export const useDataBaseStore = defineStore("dataBase", () => {
12+
const viewerStore = useViewerStore()
13+
1014
const db = reactive({})
1115

1216
function itemMetaDatas(id) {
@@ -42,7 +46,6 @@ export const useDataBaseStore = defineStore("dataBase", () => {
4246
}
4347

4448
async function registerObject(id) {
45-
const viewerStore = useViewerStore()
4649
return viewerStore.request(viewer_generic_schemas.register, { id })
4750
}
4851

app/stores/data_style.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import { getDefaultStyle } from "../utils/default_styles.js"
2+
import { useDataBaseStore } from "@ogw_front/stores/data_base"
3+
import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
24
import useDataStyleState from "../internal/stores/data_style_state.js"
35
import useMeshStyle from "../internal/stores/mesh/index.js"
46
import useModelStyle from "../internal/stores/model/index.js"

app/stores/hybrid_viewer.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import vtkActor from "@kitware/vtk.js/Rendering/Core/Actor"
66

77
import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
88
import Status from "@ogw_front/utils/status.js"
9-
import { viewer_call } from "../../internal/utils/viewer_call.js"
9+
import { useViewerStore } from "@ogw_front/stores/viewer.js"
10+
import { useDataBaseStore } from "@ogw_front/stores/data_base.js"
1011

1112
export const useHybridViewerStore = defineStore("hybridViewer", () => {
1213
const viewerStore = useViewerStore()

app/utils/file_import_workflow.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
// Third party imports
22
import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
3-
import { useHybridViewerStore } from "../stores/hybrid_viewer"
3+
import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
4+
import { useGeodeStore } from "@ogw_front/stores/geode"
5+
import { useDataStyleStore } from "@ogw_front/stores/data_style"
6+
import { useDataBaseStore } from "@ogw_front/stores/data_base"
7+
import { useTreeviewStore } from "@ogw_front/stores/treeview"
48

59
// Local imports
610

internal/stores/mesh/cells.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Third party imports
22
import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
33

4-
import { useDataStyleStore } from "../data.js"
5-
import { useViewerStore } from "../viewer.js"
4+
import { useDataStyleStore } from "@ogw_front/stores/data_style.js"
5+
import { useViewerStore } from "@ogw_front/stores/viewer.js"
66

77
// Local constants
88
const mesh_cells_schemas = viewer_schemas.opengeodeweb_viewer.mesh.cells

internal/utils/api_fetch.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import _ from "lodash"
22
import validate_schema from "@ogw_front/utils/validate_schema"
3+
import { useFeedbackStore } from "@ogw_front/stores/feedback"
34

45
export function api_fetch(
56
microservice,

internal/utils/viewer_call.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import validate_schema from "@ogw_front/utils/validate_schema"
2+
import { useFeedbackStore } from "@ogw_front/stores/feedback"
23

34
export function viewer_call(
45
microservice,

nuxt.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { defineVitestProject } from "@nuxt/test-utils/config"
2+
13
export default defineNuxtConfig({
24
runtimeConfig: {
35
public: {

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"build": ""
1111
},
1212
"devDependencies": {
13-
"@nuxt/test-utils": "3.20.1",
13+
"@nuxt/test-utils": "3.21.0",
1414
"@pinia/testing": "1.0.3",
15-
"@vitejs/plugin-vue": "5.2.3",
15+
"@vitejs/plugin-vue": "5.2.4",
1616
"@vue/test-utils": "2.4.6",
1717
"electron": "36.4.0",
1818
"eslint": "9.26.0",
@@ -30,7 +30,7 @@
3030
"unplugin-auto-import": "20.0.0",
3131
"vite": "6.3.5",
3232
"vite-plugin-vuetify": "2.1.1",
33-
"vitest": "3.2.4",
33+
"vitest": "4.0.15",
3434
"vitest-environment-nuxt": "1.0.1"
3535
},
3636
"overrides": {

tests/integration/stores/data_style/mesh/cells.nuxt.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
kill_back,
1212
kill_viewer,
1313
} from "@ogw_front/utils/local"
14-
import { setupIntegrationTests } from "tests/integration/setup.js"
14+
import { setupIntegrationTests } from "../../../setup.js"
1515

1616
// Local constants
1717
const mesh_cells_schemas = viewer_schemas.opengeodeweb_viewer.mesh.cells

0 commit comments

Comments
 (0)