diff --git a/.gitignore b/.gitignore index 4cb53835..7be0856e 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,5 @@ venv __snapshots__ coverage *.db -package-lock.json \ No newline at end of file +package-lock.json +VTK.txt \ No newline at end of file diff --git a/tests/integration/microservices/back/requirements.txt b/tests/integration/microservices/back/requirements.txt index 172f6b48..bd3a3ef5 100644 --- a/tests/integration/microservices/back/requirements.txt +++ b/tests/integration/microservices/back/requirements.txt @@ -5,4 +5,3 @@ # pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in # -opengeodeweb-back==5.*,>=5.13.0rc2 diff --git a/tests/integration/microservices/viewer/requirements.txt b/tests/integration/microservices/viewer/requirements.txt index c92a7de6..4d097394 100644 --- a/tests/integration/microservices/viewer/requirements.txt +++ b/tests/integration/microservices/viewer/requirements.txt @@ -5,4 +5,3 @@ # pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt tests/integration/microservices/viewer/requirements.in # -opengeodeweb-viewer==1.*,>=1.12.0rc2 diff --git a/utils/file_import_workflow.js b/utils/file_import_workflow.js index d813acc6..43ea9339 100644 --- a/utils/file_import_workflow.js +++ b/utils/file_import_workflow.js @@ -34,12 +34,7 @@ async function importItem(item) { const treeviewStore = useTreeviewStore() await dataBaseStore.registerObject(item.id) await dataBaseStore.addItem(item.id, { - object_type: item.object_type, - geode_object: item.geode_object, - native_filename: item.native_filename, - viewable_filename: item.viewable_filename, - displayed_name: item.displayed_name, - vtk_js: item.vtk_js, + ...item, }) await treeviewStore.addItem( @@ -79,10 +74,6 @@ async function importFile(filename, geode_object) { return importItem(item) } -async function importItemFromSnapshot(item) { - return importItem(item) -} - async function importWorkflowFromSnapshot(items) { console.log("[importWorkflowFromSnapshot] start", { count: items?.length }) const dataBaseStore = useDataBaseStore() @@ -92,7 +83,7 @@ async function importWorkflowFromSnapshot(items) { const ids = [] for (const item of items) { - const id = await importItemFromSnapshot( + const id = await importItem( item, dataBaseStore, treeviewStore, @@ -106,4 +97,4 @@ async function importWorkflowFromSnapshot(items) { return ids } -export { importFile, importWorkflow, importWorkflowFromSnapshot } +export { importFile, importWorkflow, importWorkflowFromSnapshot, importItem }