Skip to content

Commit f4f726c

Browse files
authored
Merge pull request #264 from Geode-solutions/feat/setup_plugin
fix:(File Import Workflow)
2 parents d17445b + 0905d95 commit f4f726c

File tree

4 files changed

+5
-15
lines changed

4 files changed

+5
-15
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ venv
2828
__snapshots__
2929
coverage
3030
*.db
31-
package-lock.json
31+
package-lock.json
32+
VTK.txt

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.13.0rc2

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.12.0rc2

utils/file_import_workflow.js

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,7 @@ async function importItem(item) {
3434
const treeviewStore = useTreeviewStore()
3535
await dataBaseStore.registerObject(item.id)
3636
await dataBaseStore.addItem(item.id, {
37-
object_type: item.object_type,
38-
geode_object: item.geode_object,
39-
native_filename: item.native_filename,
40-
viewable_filename: item.viewable_filename,
41-
displayed_name: item.displayed_name,
42-
vtk_js: item.vtk_js,
37+
...item,
4338
})
4439

4540
await treeviewStore.addItem(
@@ -79,10 +74,6 @@ async function importFile(filename, geode_object) {
7974
return importItem(item)
8075
}
8176

82-
async function importItemFromSnapshot(item) {
83-
return importItem(item)
84-
}
85-
8677
async function importWorkflowFromSnapshot(items) {
8778
console.log("[importWorkflowFromSnapshot] start", { count: items?.length })
8879
const dataBaseStore = useDataBaseStore()
@@ -92,7 +83,7 @@ async function importWorkflowFromSnapshot(items) {
9283

9384
const ids = []
9485
for (const item of items) {
95-
const id = await importItemFromSnapshot(
86+
const id = await importItem(
9687
item,
9788
dataBaseStore,
9889
treeviewStore,
@@ -106,4 +97,4 @@ async function importWorkflowFromSnapshot(items) {
10697
return ids
10798
}
10899

109-
export { importFile, importWorkflow, importWorkflowFromSnapshot }
100+
export { importFile, importWorkflow, importWorkflowFromSnapshot, importItem }

0 commit comments

Comments
 (0)