fixes admin ui templates

Signed-off-by: Max Thonagel <12283268+thoniTUB@users.noreply.github.com>
ingef · Apr 25, 2024 · cdcb67b · cdcb67b
1 parent 849028c
commit cdcb67b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/web/csrf/CsrfTokenSetFilter.java b/backend/src/main/java/com/bakdata/conquery/models/auth/web/csrf/CsrfTokenSetFilter.java
@@ -27,7 +27,7 @@ public class CsrfTokenSetFilter implements ContainerRequestFilter, ContainerResp
 	public static final String CSRF_TOKEN_PROPERTY = "csrf_token";
 	public static final int TOKEN_LENGTH = 30;
 
-	Random random = new SecureRandom();
+	private final Random random = new SecureRandom();
 
 	@Override
 	public void filter(ContainerRequestContext requestContext) throws IOException {

diff --git a/backend/src/main/resources/assets/custom/js/script.js b/backend/src/main/resources/assets/custom/js/script.js
@@ -163,10 +163,9 @@ function postFile(event, url) {
 		let reader = new FileReader();
 		reader.onload = function () {
 			let json = reader.result;
-			fetch(url, {
-				method: 'post', credentials: 'same-origin', body: json, headers: {
-					"Content-Type": "application/json"
-				}
+			rest(url, {
+				method: 'post',
+				body: json
 			})
 				.then(function (response) {
 					if (response.ok) {
@@ -230,7 +229,11 @@ const uploadFormMapping = {
 		uri: "internToExtern",
 		accept: "*.mapping.json",
 	},
-	table: { name: "table_schema", uri: "tables", accept: "*.table.json" },
+	table: {
+		name: "table_schema",
+		uri: "tables",
+		accept: "*.table.json"
+	},
 	concept: {
 		name: "concept_schema",
 		uri: "concepts",
@@ -243,7 +246,7 @@ const uploadFormMapping = {
 	},
 };
 
-function updateDatasetUploadForm(select) {
+function updateDatasetUploadForm(select, datasetId) {
 	const data = uploadFormMapping[select.value];
 	const fileInput = $(select).next();
 	fileInput.value = "";
@@ -253,7 +256,7 @@ function updateDatasetUploadForm(select) {
 		.parent()
 		.attr(
 			"onsubmit",
-			"postFile(event, '/admin/datasets/${c.ds.id}/" + data.uri + "')"
+			`postFile(event, '/admin/datasets/${datasetId}/${data.uri}')`
 		);
 }
 

diff --git a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/dataset.html.ftl b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/dataset.html.ftl
@@ -49,7 +49,7 @@
             <select
               class="custom-select"
               data-test-id="upload-select"
-              onchange="updateDatasetUploadForm(this)"
+              onchange="updateDatasetUploadForm(this, '${c.ds.id}')"
               required
             >
               <option value="mapping" selected>Mapping JSON</option>