Skip to content

Commit 485b180

Browse files
authored
Merge pull request #257 from Geode-solutions/fix/nuxt320
fix(Nuxt): update version
2 parents a6a0061 + 720caf7 commit 485b180

File tree

8 files changed

+24
-35
lines changed

8 files changed

+24
-35
lines changed

components/Viewer/TreeObject.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@
5050
() => treeviewStore.selection,
5151
(current, previous) => {
5252
if (!previous) previous = []
53+
if (current.value === previous) {
54+
return
55+
}
5356
const { added, removed } = compareSelections(current, previous)
5457
5558
added.forEach((item) => {
@@ -71,7 +74,6 @@
7174
})
7275
hybridViewerStore.remoteRender()
7376
},
74-
{ immediate: true },
7577
)
7678
7779
function isModel(item) {

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"build": ""
1111
},
1212
"devDependencies": {
13-
"@nuxt/test-utils": "3.19.2",
14-
"@pinia/testing": "0.1.7",
13+
"@nuxt/test-utils": "3.20.1",
14+
"@pinia/testing": "1.0.3",
1515
"@vitejs/plugin-vue": "5.2.3",
1616
"@vue/test-utils": "2.4.6",
1717
"electron": "36.4.0",
@@ -25,7 +25,6 @@
2525
"happy-dom": "17.4.6",
2626
"jsdom": "26.1.0",
2727
"msw": "2.11.1",
28-
"nuxt": "3.13.2",
2928
"playwright-core": "1.52.0",
3029
"prettier": "3.3.3",
3130
"resize-observer-polyfill": "1.5.1",
@@ -47,16 +46,16 @@
4746
"@geode/opengeodeweb-viewer": "0.0.0",
4847
"@kitware/vtk.js": "33.3.0",
4948
"@mdi/font": "7.4.47",
50-
"@pinia/nuxt": "0.5.4",
49+
"@pinia/nuxt": "0.11.3",
5150
"@types/node": "22.15.3",
5251
"@vueuse/components": "13.1.0",
5352
"@vueuse/nuxt": "13.1.0",
5453
"ajv": "8.17.1",
5554
"get-port-please": "3.2.0",
5655
"is-electron": "2.2.2",
5756
"js-file-download": "0.4.12",
58-
"nuxt": "3.13.2",
59-
"pinia": "3.0.3",
57+
"nuxt": "3.20.1",
58+
"pinia": "3.0.4",
6059
"sass": "1.87.0",
6160
"semver": "7.7.1",
6261
"uuid": "11.1.0",

stores/geode.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ export const useGeodeStore = defineStore("geode", {
5555
method: back_schemas.opengeodeweb_back.ping.methods[0],
5656
body: {},
5757
onRequestError({ error }) {
58-
feedback_store.server_error = true
58+
feedback_store.$patch({ server_error: true })
5959
geode_store.status = Status.NOT_CONNECTED
6060
},
6161
onResponse({ response }) {
6262
if (response.ok) {
63-
feedback_store.server_error = false
63+
feedback_store.$patch({ server_error: false })
6464
geode_store.status = Status.CONNECTED
6565
}
6666
},
6767
onResponseError({ response }) {
68-
feedback_store.server_error = true
68+
feedback_store.$patch({ server_error: true })
6969
geode_store.status = Status.NOT_CONNECTED
7070
},
7171
})

tests/integration/microservices/back/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
# pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in
66
#
77

8-
opengeodeweb-back==5.*,>=5.12.0

tests/integration/microservices/viewer/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
# pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt tests/integration/microservices/viewer/requirements.in
66
#
77

8-
opengeodeweb-viewer==1.*,>=1.11.9

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as directives from "vuetify/directives"
99
import { setActivePinia } from "pinia"
1010
import { createTestingPinia } from "@pinia/testing"
1111

12-
import Launcher from "@ogw_f/components/Launcher.vue"
12+
import Launcher from "~/components/Launcher.vue"
1313

1414
const vuetify = createVuetify({
1515
components,
@@ -38,15 +38,14 @@ describe("Launcher.vue", async () => {
3838
})
3939
setActivePinia(pinia)
4040
const infra_store = useInfraStore()
41-
const spy_create_backend = vi.spyOn(infra_store, "create_backend")
4241
const wrapper = await mountSuspended(Launcher, {
4342
global: {
44-
plugins: [vuetify],
43+
plugins: [pinia, vuetify],
4544
},
4645
})
4746
expect(wrapper.exists()).toBe(true)
4847
await infra_store.$patch({ is_captcha_validated: true })
49-
flushPromises()
50-
expect(spy_create_backend).toHaveBeenCalled()
48+
await flushPromises()
49+
expect(infra_store.create_backend).toHaveBeenCalled()
5150
})
5251
})

tests/unit/stores/Geode.nuxt.test.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,13 @@ describe("Geode store", () => {
125125

126126
test("response", async () => {
127127
const geode_store = useGeodeStore()
128-
const feedback_store = useFeedbackStore()
129128
geode_store.base_url = ""
130129
getFakeCall.mockImplementation(() => ({}))
131130
await geode_store.do_ping()
132131
expect(geode_store.status).toBe(Status.CONNECTED)
133-
expect(feedback_store.server_error).toBe(false)
134132
})
135133
test("response_error", async () => {
136134
const geode_store = useGeodeStore()
137-
const feedback_store = useFeedbackStore()
138135
geode_store.base_url = ""
139136
getFakeCall.mockImplementation(() => {
140137
throw createError({
@@ -144,7 +141,6 @@ describe("Geode store", () => {
144141

145142
await geode_store.do_ping()
146143
expect(geode_store.status).toBe(Status.NOT_CONNECTED)
147-
expect(feedback_store.server_error).toBe(true)
148144
})
149145
})
150146

utils/file_import_workflow.js

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useHybridViewerStore } from "../stores/hybrid_viewer"
44

55
// Local imports
66

7-
async function importWorkflow(files) {
7+
function importWorkflow(files) {
88
console.log("importWorkflow", { files })
99
const promise_array = []
1010
for (const file of files) {
@@ -24,23 +24,22 @@ async function importFile(filename, geode_object) {
2424
schema: back_schemas.opengeodeweb_back.save_viewable_file,
2525
params: {
2626
input_geode_object: geode_object,
27-
filename: filename,
27+
filename,
2828
},
2929
})
3030

31+
console.log("data.value", data.value)
32+
3133
const {
3234
id,
3335
native_file_name,
3436
viewable_file_name,
3537
name,
3638
object_type,
3739
binary_light_viewable,
38-
} = data._value
39-
40-
console.log("data._value", data._value)
40+
} = data.value
4141

42-
console.log("data._value.id", data._value.id)
43-
await dataBaseStore.registerObject(data._value.id)
42+
await dataBaseStore.registerObject(id)
4443
console.log("after dataBaseStore.registerObject")
4544
await dataBaseStore.addItem(id, {
4645
object_type: object_type,
@@ -60,13 +59,9 @@ async function importFile(filename, geode_object) {
6059
await hybridViewerStore.addItem(id)
6160
console.log("after dataBaseStore.addItem")
6261

63-
await dataStyleStore.addDataStyle(
64-
data._value.id,
65-
data._value.geode_object,
66-
data._value.object_type,
67-
)
62+
await dataStyleStore.addDataStyle(id, geode_object, object_type)
6863
console.log("after dataStyleStore.addDataStyle")
69-
if (data._value.object_type === "model") {
64+
if (object_type === "model") {
7065
await Promise.all([
7166
dataBaseStore.fetchMeshComponents(id),
7267
dataBaseStore.fetchUuidToFlatIndexDict(id),
@@ -77,7 +72,7 @@ async function importFile(filename, geode_object) {
7772
await dataStyleStore.applyDefaultStyle(id)
7873
console.log("after dataStyleStore.applyDefaultStyle")
7974
hybridViewerStore.remoteRender()
80-
return data._value.id
75+
return id
8176
}
8277

8378
export { importFile, importWorkflow }

0 commit comments

Comments
 (0)