From 4d23edbd10efaf9f8aac5ef7ef6eff72db414fcd Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 28 Feb 2022 16:13:06 +0100
Subject: [PATCH] Fixed a lot of stuff
Former-commit-id: e15de21f2a62065a80242ba7fc4580b378cfd128
---
fda-analyse-service/requirements.txt | 7 ++++---
.../database/_database_id/table/_table_id/import.vue | 4 ++--
fda-units-service/requirements.txt | 1 +
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/fda-analyse-service/requirements.txt b/fda-analyse-service/requirements.txt
index 36c3c8b70b..9ab734e613 100644
--- a/fda-analyse-service/requirements.txt
+++ b/fda-analyse-service/requirements.txt
@@ -1,11 +1,12 @@
messytables==0.15.2
pandas==1.2.3
-flask==1.1.2
+flask==1.1.4
flasgger==0.9.5
psycopg2-binary==2.8.6
py-eureka-client==0.9.1
docker==5.0.0
sqlalchemy==1.4.15
-gevent==21.8.0
requests==2.26.0
-gevent==21.8.0
\ No newline at end of file
+gevent==21.8.0
+markupsafe===2.0.1
+
diff --git a/fda-ui/pages/container/_container_id/database/_database_id/table/_table_id/import.vue b/fda-ui/pages/container/_container_id/database/_database_id/table/_table_id/import.vue
index 726210d0e6..08b02651cd 100644
--- a/fda-ui/pages/container/_container_id/database/_database_id/table/_table_id/import.vue
+++ b/fda-ui/pages/container/_container_id/database/_database_id/table/_table_id/import.vue
@@ -160,10 +160,10 @@ export default {
console.error('Could not upload data.', err)
return
}
- const insertUrl = `/api/container/${this.$route.params.container_id}/database/${this.databaseId}/table/${this.tableId}/data?location=${encodeURI('/tmp/' + this.fileLocation)}`
+ const insertUrl = `/api/container/${this.$route.params.container_id}/database/${this.databaseId}/table/${this.tableId}/data/import`
let insertResult
try {
- insertResult = await this.$axios.post(insertUrl, new FormData(), {
+ insertResult = await this.$axios.post(insertUrl, { location: '/tmp/' + this.fileLocation }, {
headers: { Authorization: `Bearer ${this.token}` }
})
console.debug('inserted table', insertResult.data)
diff --git a/fda-units-service/requirements.txt b/fda-units-service/requirements.txt
index e714c83cac..049b9b205f 100644
--- a/fda-units-service/requirements.txt
+++ b/fda-units-service/requirements.txt
@@ -5,3 +5,4 @@ docker==5.0.0
gevent==21.8.0
rdflib==6.0.2
psycopg2-binary==2.8.6
+itsdangerous==2.0.1
--
GitLab