From 965fe67af3384b17f7a0e236c2b3c219b3168536 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 20 Nov 2023 21:56:58 +0100
Subject: [PATCH] Updated config for better central vars
---
dbrepo-gateway-service/dbrepo.conf | 2 ++
dbrepo-ui/api/upload.service.js | 5 +++++
dbrepo-ui/pages/database/_database_id/table/import.vue | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/dbrepo-gateway-service/dbrepo.conf b/dbrepo-gateway-service/dbrepo.conf
index 944cab0938..38f846d0c6 100644
--- a/dbrepo-gateway-service/dbrepo.conf
+++ b/dbrepo-gateway-service/dbrepo.conf
@@ -87,6 +87,8 @@ server {
}
location /api/upload {
+# allow 128.130.0.0/16;
+# deny all;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/dbrepo-ui/api/upload.service.js b/dbrepo-ui/api/upload.service.js
index 4036295906..c5499bbc07 100644
--- a/dbrepo-ui/api/upload.service.js
+++ b/dbrepo-ui/api/upload.service.js
@@ -7,6 +7,11 @@ class UploadService {
return new Promise((resolve, reject) => {
const protocol = config.api.useSsl ? 'https' : 'http'
const baseUrl = `${protocol}://${config.api.endpoint}:${config.api.port}`
+ if (!tus.isSupported) {
+ console.error('Your browser does not support uploads!')
+ Vue.$toast.error('Your browser does not support uploads!')
+ return
+ }
const upload = new tus.Upload(file, {
endpoint: `${baseUrl}/api/upload/files`,
retryDelays: [0, 3000, 5000, 10000, 20000],
diff --git a/dbrepo-ui/pages/database/_database_id/table/import.vue b/dbrepo-ui/pages/database/_database_id/table/import.vue
index dfd826ba9e..fdcf96391e 100644
--- a/dbrepo-ui/pages/database/_database_id/table/import.vue
+++ b/dbrepo-ui/pages/database/_database_id/table/import.vue
@@ -341,7 +341,7 @@ export default {
})
.catch((error) => {
this.loading = false
- this.$toast.error(`Failed to upload file: ${error}`)
+ this.$toast.error('Failed to upload file')
reject(error)
})
.finally(() => {
--
GitLab