Ende des Tages 26.05.

Reviewed-on: #1

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

@@ -40,7 +40,7 @@
 				</p>
 			</div>
 		{/if}
-		{#if data.user.admin}
+		<!--{#if data.user.admin}
 			<div class="group relative rounded-lg p-6 text-sm leading-6 hover:bg-gray-50 w-1/4">
 				<div
 					class="flex h-11 w-11 items-center justify-center rounded-lg bg-gray-50 group-hover:bg-white"
@@ -66,7 +66,7 @@
 				</a>
 				<p class="mt-1 text-gray-600">Stelle einen weiteren Tatort für die Anwendung bereit.</p>
 			</div>
-		{/if}
+		{/if}-->
 		{#if data.user.admin}
 			<div class="group relative rounded-lg p-6 text-sm leading-6 hover:bg-gray-50 w-1/4">
 				<div

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

@@ -4,14 +4,14 @@
 	}
 </style>
 
-<script>
+<script lang="ts">
 	import { onMount } from 'svelte';
 	import { page } from '$app/stores';
 
 	/**
 	 * @type any[]
 	 */
-	let list = [];
+	let list: any[] = [];
 	//$: list;
 
 	onMount(async () => {
@@ -36,11 +36,13 @@
 		}
 	});
 
-	async function delete_item(ev) {
+	async function delete_item(ev: Event) {
 		let delete_item = window.confirm("Bist du sicher?");
 
 		if (delete_item) {
-				let filename = event.currentTarget.id.split('del__')[1]
+				const target = ev.currentTarget as HTMLElement | null;
+				if (!target) return;
+				let filename = target.id.split('del__')[1]
 
 				// delete request
 				// --------------
@@ -56,7 +58,11 @@
 						setTimeout(() => {window.location.reload()}, 500)
 					}
 				} catch (error) {
-					console.log(error.message)
+					if (error instanceof Error) {
+						console.log(error.message);
+					} else {
+						console.log(error);
+					}
 				}
 
 			}
@@ -92,13 +98,14 @@
 								<span class="text-sm font-semibold leading-6 text-gray-900">{item.name}</span>
 								<!-- Delete button -->
 								<button
-								style="padding: 2px"
-								id="del__{item.name}"
-								on:click|preventDefault={delete_item}
-								>
-									<svg
-									height="20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z" fill="#373737" transform="translate(1 1)"/></svg>
-								</button>
+																style="padding: 2px"
+																id="del__{item.name}"
+																on:click|preventDefault={delete_item}
+																aria-label="Vorgang {item.name} löschen"
+																>
+																	<svg
+																	height="20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z" fill="#373737" transform="translate(1 1)"/></svg>
+																</button>
 							</div>
 						</div>
 						<div class="hidden sm:flex sm:flex-col sm:items-end">

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

@@ -4,7 +4,7 @@
 	}
 </style>
 
-<script>
+<script lang="ts">
 	import { onMount, tick } from 'svelte';
 	import shortenFileSize from '$lib/helper/shortenFileSize';
 	import { page } from '$app/stores';
@@ -19,12 +19,17 @@
 	import ModalFooter from '$lib/components/ui/Modal/ModalFooter.svelte';
 
 	/** @type {import('./$types').PageData} */
-	/** export let data; */
+	export let data;
 
-	/**
-	 * @type any[]
-	 */
-	let list = [];
+	interface ListItem {
+		name: string;
+		size: number;
+		lastModified: string | number | Date;
+		show_button?: boolean;
+		// add other properties as needed
+	}
+
+	let list: ListItem[] = [];
 	$: list;
 
 	let open = false;
@@ -69,27 +74,31 @@
 		open = false;
 	}
 
-	function defocus_element(i) {
+	function defocus_element(i: number) {
 		let item = list[i]
 		let text_field_id = `label__${item.name}`
 
 		let text_field = document.getElementById(text_field_id)
-		text_field.setAttribute("contenteditable", false)
-		text_field.textContent = item.name;
+		if (text_field) {
+			text_field.setAttribute("contenteditable", "false")
+			text_field.textContent = item.name;
+		}
 
 		// reshow button
 		list[i].show_button = true;
 		return;
 	}
 
-	async function handle_input(ev, i) {
+	async function handle_input(ev: KeyboardEvent, i: number) {
 		let item = list[i]
 		if (ev.key == "Escape") {
 			let text_field_id = `label__${item.name}`
 
 			let text_field = document.getElementById(text_field_id)
-			text_field.setAttribute("contenteditable", false)
-			text_field.textContent = item.name;
+			if (text_field) {
+				text_field.setAttribute("contenteditable", "false");
+				text_field.textContent = item.name;
+			}
 
 			// reshow button
 			item.show_button = true
@@ -97,8 +106,8 @@
 		}
 		if (ev.key == "Enter") {
 			console.log('--- hitted')
-			let name_field = ev.currentTarget
-			let new_name = name_field.textContent || name_field.innerText || '';
+			let name_field = ev.currentTarget as HTMLElement | null;
+			let new_name = name_field ? (name_field.textContent || (name_field as any).innerText || '') : '';
 
 
 			if (new_name == '') {
@@ -117,9 +126,9 @@
 			const url = $page.url
 			console.log(url);
 
-			let data_obj = {}
+			let data_obj: { new_name: string; old_name: string } = { new_name: '', old_name: '' };
 			data_obj["new_name"] = new_name
-			data_obj["old_name"] = ev.currentTarget.id.split('__')[1]
+			data_obj["old_name"] = ev.currentTarget && (ev.currentTarget as HTMLElement).id ? (ev.currentTarget as HTMLElement).id.split('__')[1] : ''
 
 
 			open = true;
@@ -181,80 +190,93 @@
 							</svg>
 							<div class="min-w-0 flex-auto">
 								<span
-								style="display: inline-block; min-width: 5px;"
-								id="label__{item.name}"
-								class="text-sm font-semibold leading-6 text-gray-900"
-								contenteditable={! item.show_button}
-								on:focusout={() => {
-									defocus_element(i);
-								}}
-								on:keydown|stopPropagation={
-									// event needed to identify ID
-									// TO-DO: check if event is needed or if index is sufficient
-									async (ev) => {handle_input(ev, i)}
-								}
-
-								>{item.name}</span>
+																style="display: inline-block; min-width: 5px;"
+																id="label__{item.name}"
+																class="text-sm font-semibold leading-6 text-gray-900"
+																contenteditable={! item.show_button}
+																role="textbox"
+																tabindex="0"
+																aria-label="Dateiname bearbeiten"
+																on:focusout={() => {
+																	defocus_element(i);
+																}}
+																on:keydown|stopPropagation={
+																	// event needed to identify ID
+																	// TO-DO: check if event is needed or if index is sufficient
+																	async (ev) => {handle_input(ev, i)}
+																}
+								
+																>{item.name}</span>
 								<!-- https://iconduck.com/icons/192863/edit-rename -->
 
 								{#if item.show_button}
 								<button
-								style="padding: 2px"
-								id="edit__{item.name}"
-								on:click|preventDefault={(ev) => {
-									let text_field_id = `label__${item.name}`
-
-									let text_field = document.getElementById(text_field_id)
-									text_field.setAttribute("contenteditable", true)
-									text_field.focus();
-									text_field.textContent = '';
-
-									// hide button
-									item.show_button = false
-								}}
-								>
-									<svg
-									height="20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="m14.996094 3-11.9921878 11.992188h-.0039062v4.007812h1 2 1.0078125v-.0039l11.9921875-11.9921938-.001953-.0019531.001953-.0019531-4-4-.002.00195zm-1.998047 3.4121094 2.589844 2.5898437-7.587891 7.5878909v-1.589844h-1-1v-1-.589844zm-7.998047 7.9980466v1.589844h1 1v1 .589844l-.4101562.410156h-1.5898438l-1-1v-1.589844z" fill="#373737" transform="translate(1 1)"/></svg>
-								</button>
+																style="padding: 2px"
+																id="edit__{item.name}"
+																aria-label="Datei umbenennen"
+																on:click|preventDefault={(ev) => {
+																	let text_field_id = `label__${item.name}`
+								
+																	let text_field = document.getElementById(text_field_id)
+																	if (text_field) {
+																		text_field.setAttribute("contenteditable", "true");
+																		text_field.focus();
+																		text_field.textContent = '';
+																	}
+								
+																	// hide button
+																	item.show_button = false
+																}}
+																>
+																	<svg
+																	height="20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="m14.996094 3-11.9921878 11.992188h-.0039062v4.007812h1 2 1.0078125v-.0039l11.9921875-11.9921938-.001953-.0019531.001953-.0019531-4-4-.002.00195zm-1.998047 3.4121094 2.589844 2.5898437-7.587891 7.5878909v-1.589844h-1-1v-1-.589844zm-7.998047 7.9980466v1.589844h1 1v1 .589844l-.4101562.410156h-1.5898438l-1-1v-1.589844z" fill="#373737" transform="translate(1 1)"/></svg>
+																</button>
 								{/if}
-								<!-- Delete button -->
 								<button
-								style="padding: 2px"
-								id="del__{item.name}"
-								on:click|preventDefault={async (ev) => {
-									let delete_item = window.confirm("Bist du sicher?");
-
-									if (delete_item) {
-										// bucket: tatort, name: <vorgang>/item-name
-										let vorgang = $page.params.vorgang
-										let filename = event.currentTarget.id.split('del__')[1]
-
-
-
-										// delete request
-										// --------------
-
-										let url = $page.url
-										url += `/${filename}`
-
-										console.log(`--- ${vorgang} + ${filename} + ${url}`)
-										try {
-											const response = await fetch(url,
-												{method: 'DELETE'}
-											)
-											if (response.status == 204) {
-												setTimeout(() => {window.location.reload()}, 500)
-											}
-										} catch (error) {
-											console.log(error.message)
-										}
-
-									}
-								}}
-								>
-									<svg
-									height="20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z" fill="#373737" transform="translate(1 1)"/></svg>
-								</button>
+																style="padding: 2px"
+																id="del__{item.name}"
+																on:click|preventDefault={async (ev) => {
+																	let delete_item = window.confirm("Bist du sicher?");
+								
+																	if (delete_item) {
+																		// bucket: tatort, name: <vorgang>/item-name
+																		let vorgang = $page.params.vorgang
+																		let filename = '';
+																		if (ev && ev.currentTarget && (ev.currentTarget as HTMLElement).id) {
+																			filename = (ev.currentTarget as HTMLElement).id.split('del__')[1];
+																		}
+								
+								
+								
+																		// delete request
+																		// --------------
+								
+																		let url = new URL($page.url);
+																		url.pathname += `/${filename}`;
+								
+																		console.log(`--- ${vorgang} + ${filename} + ${url}`)
+																		try {
+																			const response = await fetch(url,
+																				{method: 'DELETE'}
+																			)
+																			if (response.status == 204) {
+																				setTimeout(() => {window.location.reload()}, 500)
+																			}
+																		} catch (error) {
+																			if (error instanceof Error) {
+																				console.log(error.message)
+																			} else {
+																				console.log(error)
+																			}
+																		}
+								
+																	}
+																}}
+																aria-label="Datei löschen"
+																>
+																	<svg
+																	height="20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="m8 3v1 1h1v-1h4v1h1v-1-1zm-4 3v1h14v-1zm2 2v11h1 9v-1-10h-1v10h-8v-10z" fill="#373737" transform="translate(1 1)"/></svg>
+																</button>
 								<p class="mt-1 truncate text-xs leading-5 text-gray-500">
 									{shortenFileSize(item.size)}
 								</p>

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

@@ -73,8 +73,24 @@
 							<p class="block text-sm leading-6 text-red-900 mt-2">{form.error.description}</p>
 						{/if}
 					</div>
+
+					<label for="code">
+					<span >Zugangscode (optional) </span>
+					</label>
+
+					<div class="mt-2">
+					<div
+					>
+						<input
+							type="text"
+							id="code"
+						/>
+					</div>
+					</div>
+
 				</div>
 			</div>
+
 			<div class="mt-6 flex items-center justify-end gap-x-6">
 				<button type="button" class="text-sm font-semibold leading-6 text-gray-900">Cancel</button>
 				<Button

src/routes/(angemeldet)/upload/+page.server.js

@@ -22,6 +22,7 @@ export const actions = {
 		const vorgang = data.get('vorgang');
 		const name = data.get('name');
 		const type = data.get('type');
+		const code = data.get('zugangscode');
 		const fileName = data.get('fileName');
 
 		let objectName = `${vorgang}/${name}`;
@@ -35,6 +36,8 @@ export const actions = {
 
 		const url = await client.presignedPutObject('tatort', objectName);
 
+		// enter code
+
 		return { url };
 	},
 	validate: async ({ request }) => {
@@ -42,6 +45,7 @@ export const actions = {
 		const data = Object.fromEntries(requestData);
 		const vorgang = data.vorgang;
 		const name = data.name;
+		const zugangscode = data.zugangscode;
 		let success = true;
 		let err = {};
 
@@ -57,6 +61,12 @@ export const actions = {
 			success = false;
 		}
 
+		if (isRequiredFieldValid(zugangscode)) err.zugangscode = null;
+		else {
+			err.zugangscode = 'Das Feld Zugangscode darf nicht leer bleiben.';
+			success = false;
+		}
+
 		if (success) return { success };
 
 		return fail(400, err);
@@ -99,5 +109,8 @@ export const actions = {
 
 		return { etag, error };
 		//await writeFile(filePath, Buffer.from(await data.file.arrayBuffer()));
+	},
+	get_code: async ({ request }) => {
+		console.log('TO-DO');
 	}
 };

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

@@ -14,6 +14,16 @@
 	let open = false;
 	let inProgress = false;
 	let vorgang = '';
+	const code_len = 8;
+	let zugangscode = ''
+	let zugangscode_prev = '';
+
+	$: zugangscode = Math.random().toString(36).slice(2, 2+code_len);
+
+
+	let case_existing = undefined;
+	$: case_existing = false;
+
 	let name = '';
 	/** @type {?string}*/
 	let etag = null;
@@ -29,6 +39,7 @@
 		let data = new FormData();
 		data.append('vorgang', vorgang);
 		data.append('name', name);
+		data.append('zugangscode', zugangscode)
 		const response = await fetch('?/validate', { method: 'POST', body: data });
 		/** @type {import('@sveltejs/kit').ActionResult} */
 		const result = deserialize(await response.text());
@@ -59,6 +70,7 @@
 		let data = new FormData();
 		data.append('vorgang', vorgang);
 		data.append('name', name);
+		data.append('zugangscode', zugangscode)
 		if (files?.length === 1) {
 			data.append('type', files[0].type);
 			data.append('fileName', files[0].name);
@@ -143,6 +155,33 @@
 
 	}
 
+	// return true or false
+	async function case_exists(case_no) {
+		// ping `/(angemeldet)/view` with caseNumber in POST body
+		let url = '/view'
+		let data = new FormData();
+		data.append('caseNumber', case_no);
+		const response = await fetch(url, {
+			method: 'POST',
+			body: data,
+			redirect: 'error'
+			})
+
+		const res_json = await response.json();
+		const status = res_json.status;
+
+		// aktualisiere Zugangscode mit
+		if (status == 303) {
+			// TO-DO: check existing code
+
+			console.log(`+ existiert`)
+			case_existing = true;
+			return;
+		}
+
+		case_existing = false;
+	}
+
 </script>
 
 <div class="mx-auto max-w-2xl">
@@ -177,12 +216,18 @@
 									id="vorgang"
 									autocomplete={vorgang}
 									class="block flex-1 border-0 bg-transparent py-1.5 pl-1 text-gray-900 placeholder:text-gray-400 focus:ring-0 sm:text-sm sm:leading-6"
+									on:input={() => case_exists(vorgang)}
 								/>
 							</div>
 						</div>
 						{#if formErrors?.vorgang}
 							<p class="block text-sm leading-6 text-red-900 mt-2">{formErrors.vorgang}</p>
 						{/if}
+						{#if case_existing && (vorgang.length > 0) }
+							<span>Datei wird zum existierenden Vorgang hinzugefügt.</span>
+						{:else if (vorgang.length > 0) }
+							<span>Neuer Vorgang wird angelegt.</span>
+						{/if}
 					</div>
 
 					<div>
@@ -212,6 +257,32 @@
 						{/if}
 					</div>
 
+					<div>
+						<label for="zugangscode" class="block text-sm font-medium leading-6 text-gray-900"
+							><span class="flex"
+								>{#if formErrors?.zugangscode}
+									<span class="inline-block mr-1"><Exclamation /></span>
+								{/if} Zugangscode</span
+							></label
+						>
+						<div class="mt-2">
+							<div
+								class="flex rounded-md shadow-sm ring-1 ring-inset ring-gray-300 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-600"
+							>
+								<input
+									bind:value={zugangscode}
+									type="text"
+									name="zugangscode"
+									id="zugangscode"
+									class="block flex-1 border-0 bg-transparent py-1.5 pl-1 text-gray-900 placeholder:text-gray-400 focus:ring-0 sm:text-sm sm:leading-6"
+								/>
+							</div>
+						</div>
+						{#if formErrors?.code}
+							<p class="block text-sm leading-6 text-red-900 mt-2">{formErrors.code}</p>
+						{/if}
+					</div>
+
 					<div class="col-span-full">
 						<label for="file" class="block text-sm font-medium leading-6 text-gray-900"
 							><span class="flex"

src/routes/(angemeldet)/view/+page.server.js

@@ -22,6 +22,6 @@ export const actions = {
 				error: { caseNumber: 'Die Vorgangsnummer existiert in dieser Anwendung nicht.' }
 			});
 		}
-		throw redirect(303, `/list/${caseNumber}`);
+		redirect(303, `/list/${caseNumber}`);
 	}
 };