fixed merge conflicts

src/routes/(angemeldet)/list/+page.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	import { page } from '$app/stores';
 	import Trash from '$lib/icons/Trash.svelte';
 	import Folder from '$lib/icons/Folder.svelte';
 
@@ -27,25 +26,30 @@
 				.filter((i) => i.length > 0)
 				.map((i) => JSON.parse(i));
 
-			console.log(objs);
 			list = list.concat(objs);
 		}
 	});
 
 	async function delete_item(ev: Event) {
 		let delete_item = window.confirm('Bist du sicher?');
+		let delete_item = window.confirm('Bist du sicher?');
 
 		if (delete_item) {
 			const target = ev.currentTarget as HTMLElement | null;
 			if (!target) return;
 			let filename = target.id.split('del__')[1];
+			const target = ev.currentTarget as HTMLElement | null;
+			if (!target) return;
+			let filename = target.id.split('del__')[1];
 
+			// delete request
+			// --------------
 			// delete request
 			// --------------
 
+			let url = `/api/list/${filename}`;
 			let url = `/api/list/${filename}`;
 
-			console.log(`--- ${filename} + ${url}`);
 			try {
 				const response = await fetch(url, { method: 'DELETE' });
 				if (response.status == 204) {
@@ -104,3 +108,9 @@
 		min-width: 24rem;
 	}
 </style>
+
+<style>
+	ul {
+		min-width: 24rem;
+	}
+</style>

src/routes/(angemeldet)/list/[vorgang]/+page.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { onMount, tick } from 'svelte';
+	import { onMount } from 'svelte';
 	import shortenFileSize from '$lib/helper/shortenFileSize';
 	import { page } from '$app/stores';
 
@@ -15,6 +15,7 @@
 	import Edit from '$lib/icons/Edit.svelte';
 	import Trash from '$lib/icons/Trash.svelte';
 
+	/** export let data; */
 	/** @type {import('./$types').PageData} */
 	export let data;
 
@@ -56,7 +57,6 @@
 				.filter((i) => i.length > 0)
 				.map((i) => JSON.parse(i));
 
-			console.log(objs);
 			list = list.concat(objs);
 
 			list = list.map((item) => {
@@ -67,7 +67,6 @@
 	});
 
 	function uploadSuccessful() {
-		console.log('reset');
 		open = false;
 	}
 
@@ -93,6 +92,7 @@
 
 			let text_field = document.getElementById(text_field_id);
 			if (text_field) {
+				text_field.setAttribute('contenteditable', 'false');
 				text_field.setAttribute('contenteditable', 'false');
 				text_field.textContent = item.name;
 			}
@@ -102,7 +102,6 @@
 			return;
 		}
 		if (ev.key == 'Enter') {
-			console.log('--- hitted');
 			let name_field = ev.currentTarget as HTMLElement | null;
 			let new_name = name_field
 				? name_field.textContent || (name_field as any).innerText || ''
@@ -142,7 +141,6 @@
 				err = true;
 				if (response.status == 400) {
 					let json_res = await response.json();
-					// alert(json_res['msg'])
 					return;
 				}
 				throw new Error(`Fehlgeschlagen: ${response.status}`);

src/routes/(angemeldet)/list/[vorgang]/+server.ts

@@ -3,25 +3,24 @@ import { json } from '@sveltejs/kit';
 
 
 // rename operation
-export async function PUT({ request }) {
+export async function PUT({ request }: {request: Request}) {
     const data = await request.json();
 
-    console.log(`--- ${request.url.split('/').at(-1)} +++ ${JSON.stringify(data)}`);
 
     // Vorgang
-    let vorgang = request.url.split('/').at(-1)
+    const vorgang = request.url.split('/').at(-1);
 
     // prepare copy, incl. check if new name exists already
-    let old_name = data["old_name"]
-    let src_full_path = `/tatort/${vorgang}/${old_name}`
-    let new_name = `${vorgang}/${data["new_name"]}`
+    const old_name = data["old_name"];
+    const src_full_path = `/tatort/${vorgang}/${old_name}`;
+    const new_name = `${vorgang}/${data["new_name"]}`;
 
     try {
-        let file_stats = await client.statObject('tatort', new_name)
-        return json({ msg: 'Die Datei existiert bereits.' }, { status: 400 })
+        await client.statObject('tatort', new_name);
+        return json({ msg: 'Die Datei existiert bereits.' }, { status: 400 });
     } catch (error) {
         // continue operation
-        console.log('continue operation')
+        console.log(error, 'continue operation');
     }
 
     // actual copy operation

src/routes/(angemeldet)/list/[vorgang]/[tatort]/+server.js

@@ -1,13 +0,0 @@
-import { client } from '$lib/minio';
-import { json } from '@sveltejs/kit';
-
-export async function DELETE({ request }) {
-
-    let url_fragments = request.url.split('/')
-    let item = url_fragments.at(-1);
-    let vorgang = url_fragments.at(-2);
-
-    await client.removeObject('tatort', `${vorgang}/${item}`)
-
-    return new Response(null, { status: 204 });
-};

src/routes/(angemeldet)/list/[vorgang]/[tatort]/+server.ts

@@ -0,0 +1,11 @@
+import { client } from '$lib/minio';
+
+export async function DELETE({ request }: { request: Request }) {
+	const url_fragments = request.url.split('/');
+	const item = url_fragments.at(-1);
+	const vorgang = url_fragments.at(-2);
+
+	await client.removeObject('tatort', `${vorgang}/${item}`);
+
+	return new Response(null, { status: 204 });
+}