{#if admin}
Fehler beim Umbenennen
{/if}
-
+
{/if}
diff --git a/src/routes/(token-based)/list/[vorgang]/+page.ts b/src/routes/(token-based)/list/[vorgang]/+page.ts
new file mode 100644
index 0000000..ab4cfaf
--- /dev/null
+++ b/src/routes/(token-based)/list/[vorgang]/+page.ts
@@ -0,0 +1,27 @@
+import { redirect } from '@sveltejs/kit';
+
+export async function load({fetch, params, url}){
+ const vorgangResponse = await fetch(`/api/list`);
+ const vorgangList = await vorgangResponse.json()
+ const vorgangToken = params.vorgang;
+ const crimesListResponse = await fetch(`/api/list/${vorgangToken}`)
+ const crimesList = await crimesListResponse.json();
+ const vorgang = vorgangList.find(v => v.vorgangToken === vorgangToken); //vorgang sollte ein eigener Typ werden, und dann kann man es hier vernünftig typisieren
+ if(!vorgang || !crimesList){
+ throw new Error(`Fehlgeschlagen, es wurden keine Daten zum token gefunden`);
+ }
+
+ //Variabeln für EditableItem
+ const crimeNames: string[] = crimesList.map((l) => l.name);
+
+ if (crimesList.length === 0) {
+ throw redirect(302, '/upload'); // weiterleiten auf die hinzufügen seite
+ }
+ return {
+ vorgang,
+ vorgangList,
+ crimesList,
+ url,
+ crimeNames
+ }
+}
diff --git a/src/routes/(token-based)/list/[vorgang]/+server.ts b/src/routes/(token-based)/list/[vorgang]/+server.ts
deleted file mode 100644
index b422976..0000000
--- a/src/routes/(token-based)/list/[vorgang]/+server.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { client } from '$lib/minio';
-import { json } from '@sveltejs/kit';
-
-
-// rename operation for crimes
-export async function PUT({ request }: {request: Request}) {
- const data = await request.json();
-
- // Vorgang
- const vorgangToken = request.url.split('/').at(-1);
-
- // prepare copy, incl. check if new name exists already
- const crimeOldName = data["old_name"];
- const crimeS3FullBucketPathOld = `/tatort/${vorgangToken}/${crimeOldName}`;
- const crimeNewName = `${vorgangToken}/${data["new_name"]}`;
-
- try {
- await client.statObject('tatort', crimeNewName);
- return json({ msg: 'Die Datei existiert bereits.' }, { status: 400 });
- } catch (error) {
- // continue operation
- console.log(error, 'continue operation');
- }
-
- // actual copy operation
- await client.copyObject('tatort', crimeNewName, crimeS3FullBucketPathOld)
-
- // delete
- await client.removeObject('tatort', `${vorgangToken}/${crimeOldName}`)
-
- // return success or failure
-
- return json({ success: 'success' }, { status: 200 });
-};
diff --git a/src/routes/api/list/[vorgang]/[tatort]/+server.ts b/src/routes/api/list/[vorgang]/[tatort]/+server.ts
index e48da78..28db96c 100644
--- a/src/routes/api/list/[vorgang]/[tatort]/+server.ts
+++ b/src/routes/api/list/[vorgang]/[tatort]/+server.ts
@@ -1,5 +1,5 @@
import { BUCKET, client } from '$lib/minio';
-import { json, type RequestHandler } from '@sveltejs/kit';
+import { json } from '@sveltejs/kit';
import { getVorgangByName } from '$lib/server/vorgangService';
export async function GET() {
@@ -36,12 +36,13 @@ export async function DELETE({ request }: { request: Request }) {
}
// rename operation for crimes
-export async function PUT({ params, request }: { params: RequestHandler; request: Request }) {
+export async function PUT({ params, request }) {
const data = await request.json();
// Vorgang
- const vorgangName = params.vorgang;
- const vorgangToken = getVorgangByName(vorgangName)?.token;
+ const vorgangToken = params.vorgang;
+ //const vorgangToken = getVorgangByName(vorgangName)?.token;
+
// prepare copy, incl. check if new name exists already
const crimeOldName = data['oldName'];