Skip to content

Commit 7812125

Browse files
committed
test delta
1 parent b686f44 commit 7812125

File tree

3 files changed

+25
-41
lines changed

3 files changed

+25
-41
lines changed

stores/data_base.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,6 @@ export const useDataBaseStore = defineStore("dataBase", () => {
7373
await fetchMeshComponents(id)
7474
await fetchUuidToFlatIndexDict(id)
7575
}
76-
77-
treeviewStore.addItem(
78-
value.geode_object,
79-
value.displayed_name,
80-
id,
81-
value.object_type,
82-
)
83-
console.log("[DataBase] addItem -> treeview.addItem done", id)
84-
85-
console.log("[DataBase] addItem -> hybridViewer.addItem start", id)
86-
await hybridViewerStore.addItem(id)
87-
console.log("[DataBase] addItem -> hybridViewer.addItem done", id)
8876
}
8977

9078
async function fetchMeshComponents(id) {

stores/hybrid_viewer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
118118
params,
119119
},
120120
{
121-
response_fonction: () => {
121+
response_function: () => {
122122
for (const key in params.camera_options) {
123123
camera_options[key] = params.camera_options[key]
124124
}

utils/file_import_workflow.js

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
// Third party imports
22
import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
3-
import { useHybridViewerStore } from "../stores/hybrid_viewer"
43

54
// Local imports
65

76
async function importWorkflow(files) {
87
console.log("importWorkflow", { files })
9-
const results = []
8+
const promise_array = []
109
for (const { filename, geode_object } of files) {
1110
console.log({ filename }, { geode_object })
1211
const id = await importFile(filename, geode_object)
13-
results.push(id)
12+
promise_array.push(id)
1413
}
15-
return results
14+
return promise_array
1615
}
1716

1817
async function importFile(filename, geode_object) {
1918
const dataBaseStore = useDataBaseStore()
2019
const dataStyleStore = useDataStyleStore()
21-
const hybridViewerStore = useHybridViewerStore()
2220
const treeviewStore = useTreeviewStore()
21+
const hybridViewerStore = useHybridViewerStore()
2322
const { data } = await api_fetch({
2423
schema: back_schemas.opengeodeweb_back.save_viewable_file,
2524
params: {
@@ -37,47 +36,41 @@ async function importFile(filename, geode_object) {
3736
binary_light_viewable,
3837
} = data._value
3938

40-
console.log("data._value", data._value)
39+
console.log("[importFile] response", {
40+
id,
41+
geode_object,
42+
input_file: data._value?.input_file,
43+
name,
44+
})
4145

42-
console.log("data._value.id", data._value.id)
43-
await dataBaseStore.registerObject(data._value.id)
44-
console.log("after dataBaseStore.registerObject")
46+
await dataBaseStore.registerObject(id)
4547
await dataBaseStore.addItem(id, {
46-
object_type: object_type,
47-
geode_object: geode_object,
48+
object_type,
49+
geode_object,
4850
native_filename: native_file_name,
4951
viewable_filename: viewable_file_name,
5052
displayed_name: name,
51-
vtk_js: {
52-
binary_light_viewable,
53-
},
53+
vtk_js: { binary_light_viewable },
5454
})
5555

56-
// await treeviewStore.addItem(geode_object, name, id, object_type)
57-
// await hybridViewerStore.addItem(id)
58-
// console.log("after dataBaseStore.addItem")
56+
await treeviewStore.addItem(geode_object, name, id, object_type)
57+
await hybridViewerStore.addItem(id)
5958

60-
await dataStyleStore.addDataStyle(
61-
data._value.id,
62-
data._value.geode_object,
63-
data._value.object_type,
64-
)
65-
console.log("after dataStyleStore.addDataStyle")
66-
if (data._value.object_type === "model") {
59+
await dataStyleStore.addDataStyle(id, geode_object, object_type)
60+
if (object_type === "model") {
6761
await Promise.all([
6862
dataBaseStore.fetchMeshComponents(id),
6963
dataBaseStore.fetchUuidToFlatIndexDict(id),
7064
])
71-
console.log("after dataBaseStore.fetchMeshComponents")
72-
console.log("after dataBaseStore.fetchUuidToFlatIndexDict")
7365
}
7466
await dataStyleStore.applyDefaultStyle(id)
75-
console.log("after dataStyleStore.applyDefaultStyle")
76-
return data._value.id
67+
return id
7768
}
7869

7970
async function importWorkflowFromSnapshot(items) {
8071
const dataBaseStore = useDataBaseStore()
72+
const treeviewStore = useTreeviewStore()
73+
const hybridViewerStore = useHybridViewerStore()
8174
const ids = []
8275
for (const item of items) {
8376
const {
@@ -100,6 +93,9 @@ async function importWorkflowFromSnapshot(items) {
10093
vtk_js,
10194
})
10295

96+
await treeviewStore.addItem(geode_object, displayed_name, id, object_type)
97+
await hybridViewerStore.addItem(id)
98+
10399
ids.push(id)
104100
}
105101
return ids

0 commit comments

Comments
 (0)