Skip to content

Commit 54ea703

Browse files
JulienChampagnolJulienChampagnol
committed
rename stores function use<Name>Store
1 parent 670a1cb commit 54ea703

26 files changed

+139
-66
lines changed

‎composables/api_fetch.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ export function api_fetch(
44
{ schema, params },
55
{ request_error_function, response_function, response_error_function } = {},
66
) {
7-
const feedback_store = use_feedback_store()
8-
const geode_store = use_geode_store()
7+
const feedback_store = useFeedbackStore()
8+
const geode_store = useGeodeStore()
99

1010
const body = params || {}
1111

‎composables/run_function_when_microservices_connected.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export function run_function_when_microservices_connected(function_to_run) {
2-
const infra_store = use_infra_store()
2+
const infra_store = useInfraStore()
33
const { microservices_connected } = storeToRefs(infra_store)
44
if (microservices_connected.value) {
55
function_to_run()

‎composables/upload_file.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ export async function upload_file(
22
{ route, file },
33
{ request_error_function, response_function, response_error_function } = {},
44
) {
5-
const feedback_store = use_feedback_store()
6-
const geode_store = use_geode_store()
5+
const feedback_store = useFeedbackStore()
6+
const geode_store = useGeodeStore()
77
if (!(file instanceof File)) {
88
throw new Error("file must be a instance of File")
99
}

‎stores/geode.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
22
import Status from "@ogw_f/utils/status.js"
33

4-
export const use_geode_store = defineStore("geode", {
4+
export const useGeodeStore = defineStore("geode", {
55
state: () => ({
66
default_local_port: "5000",
77
request_counter: 0,
88
status: Status.NOT_CONNECTED,
99
}),
1010
getters: {
1111
protocol() {
12-
if (use_infra_store().app_mode == appMode.appMode.CLOUD) {
12+
if (useInfraStore().app_mode == appMode.appMode.CLOUD) {
1313
return "https"
1414
}
1515
return "http"
1616
},
1717
port() {
18-
if (use_infra_store().app_mode == appMode.appMode.CLOUD) {
18+
if (useInfraStore().app_mode == appMode.appMode.CLOUD) {
1919
return "443"
2020
}
2121
const GEODE_PORT = useRuntimeConfig().public.GEODE_PORT
@@ -25,7 +25,7 @@ export const use_geode_store = defineStore("geode", {
2525
return this.default_local_port
2626
},
2727
base_url() {
28-
const infra_store = use_infra_store()
28+
const infra_store = useInfraStore()
2929
let geode_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
3030
if (infra_store.app_mode == appMode.appMode.CLOUD) {
3131
if (infra_store.ID == "") {
@@ -49,7 +49,7 @@ export const use_geode_store = defineStore("geode", {
4949
},
5050
do_ping() {
5151
const geode_store = this
52-
const feedback_store = use_feedback_store()
52+
const feedback_store = useFeedbackStore()
5353
return useFetch(back_schemas.opengeodeweb_back.ping.$id, {
5454
baseURL: this.base_url,
5555
method: back_schemas.opengeodeweb_back.ping.methods[0],

‎stores/hybrid_viewer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
88
import Status from "@ogw_f/utils/status.js"
99

1010
export const useHybridViewerStore = defineStore("hybridViewer", () => {
11-
const viewer_store = use_viewer_store()
11+
const viewer_store = useViewerStore()
1212
const db = reactive({})
1313
const status = ref(Status.NOT_CREATED)
1414
const camera_options = reactive({})

‎stores/infra.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useStorage } from "@vueuse/core"
22
import Status from "@ogw_f/utils/status.js"
33

4-
export const use_infra_store = defineStore("infra", {
4+
export const useInfraStore = defineStore("infra", {
55
state: () => ({
66
app_mode: getAppMode(),
77
ID: useStorage("ID", ""),
@@ -16,7 +16,7 @@ export const use_infra_store = defineStore("infra", {
1616
return "localhost"
1717
},
1818
lambda_url() {
19-
const geode_store = use_geode_store()
19+
const geode_store = useGeodeStore()
2020
const public_runtime_config = useRuntimeConfig().public
2121
const url =
2222
geode_store.protocol +
@@ -31,12 +31,12 @@ export const use_infra_store = defineStore("infra", {
3131
},
3232
microservices_connected() {
3333
return (
34-
use_geode_store().status == Status.CONNECTED &&
35-
use_viewer_store().status == Status.CONNECTED
34+
useGeodeStore().status == Status.CONNECTED &&
35+
useViewerStore().status == Status.CONNECTED
3636
)
3737
},
3838
microservices_busy() {
39-
return use_geode_store().is_busy || use_viewer_store().is_busy
39+
return useGeodeStore().is_busy || useViewerStore().is_busy
4040
},
4141
},
4242
actions: {
@@ -48,8 +48,8 @@ export const use_infra_store = defineStore("infra", {
4848
if (this.status === Status.CREATED) return
4949
console.log("LOCK GRANTED !", lock)
5050
if (this.app_mode == appMode.appMode.DESKTOP) {
51-
const viewer_store = use_viewer_store()
52-
const geode_store = use_geode_store()
51+
const viewer_store = useViewerStore()
52+
const geode_store = useGeodeStore()
5353
const back_port = await window.electronAPI.run_back(
5454
geode_store.default_local_port,
5555
)
@@ -64,7 +64,7 @@ export const use_infra_store = defineStore("infra", {
6464
})
6565
if (error.value || !data.value) {
6666
this.status = Status.NOT_CREATED
67-
const feedback_store = use_feedback_store()
67+
const feedback_store = useFeedbackStore()
6868
feedback_store.server_error = true
6969
return
7070
}
@@ -77,8 +77,8 @@ export const use_infra_store = defineStore("infra", {
7777
},
7878
async create_connection() {
7979
console.log("create_connection")
80-
await use_viewer_store().ws_connect()
81-
await use_geode_store().do_ping()
80+
await useViewerStore().ws_connect()
81+
await useGeodeStore().do_ping()
8282
return
8383
},
8484
},

‎stores/viewer.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
44
import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
55
import Status from "@ogw_f/utils/status.js"
66

7-
export const use_viewer_store = defineStore("viewer", {
7+
export const useViewerStore = defineStore("viewer", {
88
state: () => ({
99
default_local_port: "1234",
1010
client: {},
@@ -16,14 +16,14 @@ export const use_viewer_store = defineStore("viewer", {
1616
}),
1717
getters: {
1818
protocol() {
19-
if (use_infra_store().app_mode == appMode.appMode.CLOUD) {
19+
if (useInfraStore().app_mode == appMode.appMode.CLOUD) {
2020
return "wss"
2121
} else {
2222
return "ws"
2323
}
2424
},
2525
port() {
26-
if (use_infra_store().app_mode == appMode.appMode.CLOUD) {
26+
if (useInfraStore().app_mode == appMode.appMode.CLOUD) {
2727
return "443"
2828
}
2929
const VIEWER_PORT = useRuntimeConfig().public.VIEWER_PORT
@@ -33,7 +33,7 @@ export const use_viewer_store = defineStore("viewer", {
3333
return this.default_local_port
3434
},
3535
base_url() {
36-
const infra_store = use_infra_store()
36+
const infra_store = useInfraStore()
3737
let viewer_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
3838
if (infra_store.app_mode == appMode.appMode.CLOUD) {
3939
if (infra_store.ID == "") {
@@ -125,7 +125,7 @@ export const use_viewer_store = defineStore("viewer", {
125125
resolve()
126126
})
127127
.catch((error) => {
128-
console.error(error)
128+
console.error("error", error)
129129
viewer_store.status = Status.NOT_CONNECTED
130130
reject(error)
131131
})

‎tests/integration/stores/DataStyle/mesh/Edges.nuxt.test.js‎

Lines changed: 83 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,70 @@
1-
// Global imports
21
import path from "path"
32

4-
// Third party imports
53
import { setActivePinia } from "pinia"
64
import { createTestingPinia } from "@pinia/testing"
7-
85
import {
6+
afterAll,
97
afterEach,
8+
beforeAll,
109
beforeEach,
1110
describe,
1211
expect,
13-
expectTypeOf,
1412
test,
1513
vi,
1614
} from "vitest"
1715

18-
// Local imports
1916
import {
2017
executable_name,
2118
executable_path,
2219
kill_processes,
2320
run_viewer,
2421
} from "@ogw_f/utils/local"
22+
23+
// import viewer_call from "@ogw_f/composables/viewer_call"
2524
import { useDataStyleStore } from "@ogw_f/stores/data_style"
25+
import { useDataBaseStore } from "@ogw_f/stores/data_base"
26+
import { useViewerStore } from "@ogw_f/stores/viewer"
27+
import { useInfraStore } from "@ogw_f/stores/infra"
28+
29+
import viewer_call from "@ogw_f/composables/viewer_call"
2630

27-
describe("DataStyle Store", () => {
31+
import { WebSocket } from "ws"
32+
33+
const mockLockRequest = vi.fn().mockImplementation(async (name, callback) => {
34+
return callback({ name })
35+
})
36+
37+
vi.stubGlobal("navigator", {
38+
...navigator,
39+
locks: {
40+
request: mockLockRequest,
41+
},
42+
})
43+
44+
beforeAll(() => {
45+
global.WebSocket = WebSocket
46+
})
47+
48+
afterAll(() => {
49+
delete global.WebSocket
50+
})
51+
52+
const id = "fake_id"
53+
const file_name = "edged_curve.vtp"
54+
const geode_object = "EdgedCurve2D"
55+
const object_type = "mesh"
56+
57+
describe("Mesh edges", () => {
2858
const pinia = createTestingPinia({
2959
stubActions: false,
3060
createSpy: vi.fn,
3161
})
3262

3363
const dataStyleStore = useDataStyleStore()
64+
const dataBaseStore = useDataBaseStore()
65+
const viewerStore = useViewerStore()
66+
const infraStore = useInfraStore()
67+
infraStore.app_mode = appMode.appMode.BROWSER
3468
beforeEach(async () => {
3569
setActivePinia(pinia)
3670
console.log("__dirname", __dirname)
@@ -40,16 +74,55 @@ describe("DataStyle Store", () => {
4074
),
4175
executable_name("opengeodeweb_viewer"),
4276
)
43-
await run_viewer(viewer_path, { port: 1234, data_folder_path: "./data" })
77+
const viewer_port = await run_viewer(viewer_path, {
78+
port: 1234,
79+
data_folder_path: path.join(__dirname, "..", "..", "..", "data"),
80+
})
81+
82+
viewerStore.default_local_port = viewer_port
83+
await viewerStore.ws_connect()
84+
await dataBaseStore.registerObject(id, file_name, object_type)
85+
await dataStyleStore.addDataStyle(id, geode_object, object_type)
86+
expect(viewerStore.status).toBe("CONNECTED")
4487
})
4588

4689
afterEach(() => {
4790
kill_processes()
4891
})
4992

50-
describe("state", () => {
51-
test("initial state", () => {
52-
expectTypeOf(true).toBeBoolean()
93+
// describe("Edges visibility", () => {
94+
// test("test visibility true", async () => {
95+
// // dataStyleStore.addDataStyle(id, geode_object, object_type)
96+
// await dataStyleStore.setEdgesVisibility(id, true)
97+
// expect(dataStyleStore.edgesVisibility(id)).toBe(true)
98+
// })
99+
// })
100+
101+
// describe("Edges active coloring", () => {
102+
// test("test color", async () => {
103+
// const id = "fake_id"
104+
// const geodeObject = "EdgedCurve2D"
105+
// const object_type = "mesh"
106+
107+
// const coloringTypes = ["color"]
108+
// for (let i = 0; i < coloringTypes.length; i++) {
109+
// dataStyleStore.addDataStyle(id, geodeObject, object_type)
110+
// dataStyleStore.setEdgesActiveColoring(id, coloringTypes[i])
111+
// expect(dataStyleStore.edgesActiveColoring(id)).toBe(coloringTypes[i])
112+
// }
113+
// })
114+
// })
115+
describe("Edges color", () => {
116+
test("test red", async () => {
117+
const color = { r: 255, g: 0, b: 0 }
118+
// const spy = vi.spyOn(viewer_call, "viewer_call")
119+
await dataStyleStore.setEdgesColor(id, color)
120+
// expect(spy).toHaveBeenCalledWith({
121+
// schema: mesh_edges_schemas.color,
122+
// params: { id, color },
123+
// })
124+
expect(dataStyleStore.edgesColor(id)).toStrictEqual(color)
125+
expect(viewerStore.status).toBe(status.CONNECTED)
53126
})
54127
})
55128
})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const vuetify = createVuetify({
2020
describe("CrsSelector.vue", () => {
2121
const pinia = createTestingPinia()
2222
setActivePinia(pinia)
23-
const geode_store = use_geode_store()
23+
const geode_store = useGeodeStore()
2424
geode_store.base_url = ""
2525

2626
test(`Default behavior`, async () => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const vuetify = createVuetify({
2121
describe("ExtensionSelector.vue", async () => {
2222
const pinia = createTestingPinia()
2323
setActivePinia(pinia)
24-
const geode_store = use_geode_store()
24+
const geode_store = useGeodeStore()
2525
geode_store.base_url = ""
2626

2727
test(`Select geode_object & extension`, async () => {

0 commit comments

Comments
 (0)