1 Commits

21 changed files with 872 additions and 817 deletions

View File

@@ -1,5 +1,7 @@
# --- Build stage --- # --- Build stage ---
FROM node:22 AS build FROM node:22 AS build
ENV NODE_ENV=production
ENV ORIGIN=https://tatort.innovation-hub-niedersachsen.de
WORKDIR /app WORKDIR /app
COPY package*.json ./ COPY package*.json ./
RUN npm ci RUN npm ci
@@ -9,13 +11,7 @@ RUN npm run build
# --- Production stage --- # --- Production stage ---
FROM node:22-alpine3.20 FROM node:22-alpine3.20
WORKDIR /app COPY --from=build /app .
ENV NODE_ENV=production
ENV ORIGIN=https://tatort.innovation-hub-niedersachsen.de
COPY --from=build /app/build ./build
COPY --from=build /app/package*.json ./
COPY --from=build /app/config.json ./config.json
RUN npm ci --omit=dev
ENV HOST=0.0.0.0 ENV HOST=0.0.0.0
EXPOSE 3000 EXPOSE 3000
CMD ["node", "build/index.js"] CMD ["sh", "-c", "ORIGIN=https://tatort.innovation-hub-niedersachsen.de node build/index.js"]

View File

@@ -1,10 +1,10 @@
{ {
"minio": { "minio": {
"endPoint": "api-s3.innovation-hub-niedersachsen.de", "endPoint": "sws3.innovation-hub-niedersachsen.de",
"port": 443, "port": 443,
"useSSL": true, "useSSL": true,
"accessKey": "AbCdEfGhIjKlMnOpQrSt", "accessKey": "wjpKrmaqXra99rX3D61H",
"secretKey": "UvWxYz1234567890AbCdEfGhIjKlMnOpQrStUvWx" "secretKey": "fTPi0u0FR6Lv9Y9IKydWv6WM0EA5XrsK008HCt9u"
}, },
"jwt": { "jwt": {
"secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB", "secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB",
@@ -14,4 +14,4 @@
"admin": { "password": "A-InnoHUB_2025!", "admin": true }, "admin": { "password": "A-InnoHUB_2025!", "admin": true },
"user": { "password": "U-InnoHUB_2025!", "admin": false } "user": { "password": "U-InnoHUB_2025!", "admin": false }
} }
} }

View File

@@ -1,10 +1,10 @@
{ {
"minio": { "minio": {
"endPoint": "api-s3.innovation-hub-niedersachsen.de", "endPoint": "sws3.innovation-hub-niedersachsen.de",
"port": 443, "port": 443,
"useSSL": true, "useSSL": true,
"accessKey": "AbCdEfGhIjKlMnOpQrSt", "accessKey": "wjpKrmaqXra99rX3D61H",
"secretKey": "UvWxYz1234567890AbCdEfGhIjKlMnOpQrStUvWx" "secretKey": "fTPi0u0FR6Lv9Y9IKydWv6WM0EA5XrsK008HCt9u"
}, },
"jwt": { "jwt": {
"secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB", "secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB",
@@ -14,4 +14,4 @@
"admin": { "password": "A-InnoHUB_2025!", "admin": true }, "admin": { "password": "A-InnoHUB_2025!", "admin": true },
"user": { "password": "U-InnoHUB_2025!", "admin": false } "user": { "password": "U-InnoHUB_2025!", "admin": false }
} }
} }

View File

@@ -1,10 +1,10 @@
{ {
"minio": { "minio": {
"endPoint": "api-s3.innovation-hub-niedersachsen.de", "endPoint": "sws3.innovation-hub-niedersachsen.de",
"port": 443, "port": 443,
"useSSL": true, "useSSL": true,
"accessKey": "GxKhfnfkNvlDU7qzsz0D", "accessKey": "wjpKrmaqXra99rX3D61H",
"secretKey": "cqSM5rIRr4MPtqzu2sNKgmB9k2OghPbyxwAWogeM" "secretKey": "fTPi0u0FR6Lv9Y9IKydWv6WM0EA5XrsK008HCt9u"
}, },
"jwt": { "jwt": {
"secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB", "secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB",
@@ -14,4 +14,4 @@
"admin": { "password": "A-InnoHUB_2025!", "admin": true }, "admin": { "password": "A-InnoHUB_2025!", "admin": true },
"user": { "password": "U-InnoHUB_2025!", "admin": false } "user": { "password": "U-InnoHUB_2025!", "admin": false }
} }
} }

1107
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -22,7 +22,6 @@
<div data-testid="expand-container" class="flex flex-col items-center"> <div data-testid="expand-container" class="flex flex-col items-center">
<!-- + / × button --> <!-- + / × button -->
<button <button
data-testid="expand-button"
class="flex items-center justify-center w-12 h-12 rounded-full bg-blue-600 text-white text-2xl font-bold hover:bg-blue-700 transition" class="flex items-center justify-center w-12 h-12 rounded-full bg-blue-600 text-white text-2xl font-bold hover:bg-blue-700 transition"
on:click={toggle} on:click={toggle}
aria-expanded={expanded} aria-expanded={expanded}

View File

@@ -13,9 +13,8 @@
// props, old syntax // props, old syntax
export let list: ListItem[] = []; export let list: ListItem[] = [];
export let currentName: string; export let currentName: string;
export let vorgangToken: string | null; export let onSave: (n: string, o: string) => unknown = () => {};
export let onSave: (n: string, o: string, t?: string) => unknown = () => {}; export let onDelete: (n: string) => unknown = () => {};
export let onDelete: ((n: string) => unknown) | null = () => {};
let localName = currentName; let localName = currentName;
let isEditing = false; let isEditing = false;
@@ -44,10 +43,8 @@
} }
function commitEdit() { function commitEdit() {
if (!error && localName != currentName) onSave(localName, currentName, vorgangToken); if (!error && localName != currentName) onSave(localName, currentName);
// restore original value
if (error) { localName = currentName }
isEditing = false; isEditing = false;
} }
@@ -57,60 +54,30 @@
} }
function handleDeleteClick() { function handleDeleteClick() {
// vorgangToken defined when deleting Vorgang, otherwise Crime onDelete(currentName);
onDelete(vorgangToken || currentName);
} }
</script> </script>
<div data-testid="test-nameItemEditor" class="flex flex-col gap-1"> <div data-testid="test-nameItemEditor">
{#if isEditing} {#if isEditing}
<div class="flex items-center gap-1"> <input
<input data-testid="test-input"
data-testid="test-input" bind:this={inputRef}
bind:this={inputRef} bind:value={localName}
bind:value={localName} onkeydown={handleKeydown}
onkeydown={handleKeydown} />
class="flex-1 border border-gray-300 rounded px-1.5 py-0.5 text-sm focus:outline-none focus:ring-1 focus:ring-blue-500"
/>
<button
data-testid="commit-button"
disabled={!!error || localName === currentName}
onclick={commitEdit}
class="text-gray-500 hover:text-green-600 transition disabled:opacity-40"
>
<Check class="w-4 h-4" />
</button>
<button
data-testid="cancel-button"
onclick={cancelEdit}
class="text-gray-500 hover:text-red-600 transition"
>
<X class="w-4 h-4" />
</button>
</div>
{:else}
<div class="flex items-center gap-1">
<span class="text-sm font-medium text-gray-900 truncate">{localName}</span>
<button
data-testid="edit-button"
onclick={startEdit}
class="text-gray-500 hover:text-blue-600 transition"
>
<Edit class="w-4 h-4" />
</button>
{#if onDelete}
<button <button
data-testid="delete-button" data-testid="commit-button"
onclick={handleDeleteClick} disabled={!!error || localName === currentName}
class="text-gray-500 hover:text-red-600 transition" onclick={commitEdit}><Check /></button
> >
<Trash class="w-4 h-4" /> <button data-testid="cancel-button" onclick={cancelEdit}><X /></button>
</button> {:else}
{/if} <span>{localName}</span>
</div> <button data-testid="edit-button" onclick={startEdit}><Edit /></button>
{/if} <button data-testid="delete-button" onclick={handleDeleteClick}><Trash /></button>
{/if}
{#if error} {#if error}
<p class="text-xs text-red-500 mt-1">{error}</p> <p class="text-red-500">{error}</p>
{/if} {/if}
</div> </div>

View File

@@ -1,3 +1,3 @@
import { readFileSync } from 'fs'; import { readFileSync } from 'fs';
export default JSON.parse(readFileSync('./config.json').toString()); export default JSON.parse(readFileSync('./config_prod.json').toString());

View File

@@ -234,27 +234,3 @@ export const vorgangPINValidation = function (vorgangToken: string, vorgangPIN:
return true; return true;
}; };
/**
* Change VorgangName or VorgangPIN
* @param vorgangToken
* @param newValue
* @returns {int} number of affected lines
*/
export const updateVorgangAttrByToken = function (vorgangToken: string,
newValue: string,
column: string) {
const renameSQLStmt = `UPDATE cases set ${column} = ? WHERE token = ?`;
const statement = db.prepare(renameSQLStmt);
let info;
try {
info = statement.run(newValue, vorgangToken);
} catch (err) {
console.log(`error: ${err}`)
return 0;
}
return info.changes;
};

View File

@@ -1,6 +1,8 @@
import { type ServerLoadEvent } from '@sveltejs/kit'; import { type ServerLoadEvent } from '@sveltejs/kit';
import type { PageServerLoad } from '../anmeldung/$types'; import type { PageServerLoad } from '../anmeldung/$types';
import { ROUTE_NAMES } from '..';
export const load: PageServerLoad = (event: ServerLoadEvent) => { export const load: PageServerLoad = (event: ServerLoadEvent) => {
if (event.locals.user) { if (event.locals.user) {
return { return {

View File

@@ -3,35 +3,12 @@
import Trash from '$lib/icons/Trash.svelte'; import Trash from '$lib/icons/Trash.svelte';
import Folder from '$lib/icons/Folder.svelte'; import Folder from '$lib/icons/Folder.svelte';
import EmptyList from '$lib/components/EmptyList.svelte'; import EmptyList from '$lib/components/EmptyList.svelte';
import NameItemEditor from '$lib/components/NameItemEditor.svelte';
import Alert from '$lib/components/Alert.svelte';
import Button from '$lib/components/Button.svelte';
import Modal from '$lib/components/Modal/Modal.svelte';
import ModalTitle from '$lib/components/Modal/ModalTitle.svelte';
import ModalContent from '$lib/components/Modal/ModalContent.svelte';
import ModalFooter from '$lib/components/Modal/ModalFooter.svelte';
import { API_ROUTES, ROUTE_NAMES } from '../../index.js'; import { API_ROUTES, ROUTE_NAMES } from '../../index.js';
import { invalidateAll } from '$app/navigation';
let { data, form } = $props(); let { data, form } = $props();
let vorgangList = $state(data.vorgangList); let vorgangList = data.vorgangList;
// same as `vorgangList` but with one different property to be used
// with ´NameItemEditor`
const derivedList = $derived.by(
() => {
return vorgangList.map(
({ vorgangName, ...rest }) => (
{
name: vorgangName,
...rest
}
)
)
}
);
let isEmptyList = vorgangList.length === 0; let isEmptyList = vorgangList.length === 0;
let vorgangName = $state(''); let vorgangName = $state('');
@@ -84,12 +61,16 @@
return true; return true;
} }
async function deleteVorgang(vorgangToken: string) { 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) { if (delete_item) {
let url = API_ROUTES.VORGANG(vorgangToken); const target = ev.currentTarget as HTMLElement | null;
if (!target) return;
let filename = target.id.split('del__')[1];
let url = API_ROUTES.VORGANG(filename);
try { try {
const response = await fetch(url, { method: 'DELETE' }); const response = await fetch(url, { method: 'DELETE' });
if (response.status == 204) { if (response.status == 204) {
@@ -106,46 +87,6 @@
} }
} }
} }
//Variablen für Modal
let open = $state(false);
let inProgress = $state(false);
let isError = $state(false);
async function handleSave(newName: string, oldName: string, vorgangToken: string) {
open = true;
inProgress = true;
isError = false;
try {
const res = await fetch(API_ROUTES.VORGANG(vorgangToken), {
method: 'PUT',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({ vorgangToken, oldName, newName })
});
if (!res.ok) {
throw new Error('Fehler beim Speichern');
}
await invalidateAll();
vorgangList = data.vorgangList;
open = false;
} catch (err) {
console.error('⚠️ Netzwerkfehler beim Speichern', err);
isError = true;
} finally {
inProgress = false;
}
}
async function closeModal() {
open = false;
isError = false;
}
</script> </script>
<div class="-z-10 bg-white"> <div class="-z-10 bg-white">
@@ -159,21 +100,30 @@
{:else} {:else}
{#each vorgangList as vorgangItem} {#each vorgangList as vorgangItem}
<li data-testid="test-list-item"> <li data-testid="test-list-item">
<div class="flex items-center justify-center gap-3">
<a <a
href="{ROUTE_NAMES.VORGANG(vorgangItem.vorgangToken)}" href="{ROUTE_NAMES.VORGANG(vorgangItem.vorgangToken)}"
class="flex flex-col items-center justify-center gap-2 py-4 rounded-lg hover:bg-gray-50 transition text-center" class="flex justify-between gap-x-6 py-5"
> >
<Folder class="w-6 h-6 text-gray-600" /> <div class="flex gap-x-4">
<Folder />
<div class="min-w-0 flex-auto">
<span class="text-sm font-semibold leading-6 text-gray-900"
>{vorgangItem.vorgangName}</span
>
<button
style="padding: 2px"
id="del__{vorgangItem.vorgangToken}"
on:click|preventDefault={delete_item}
aria-label="Vorgang {vorgangItem.name} löschen"
>
<Trash />
</button>
</div>
</div>
<div class="hidden sm:flex sm:flex-col sm:items-end">
<p class="text-sm leading-6 text-gray-900">Vorgang</p>
</div>
</a> </a>
<NameItemEditor
list={derivedList}
currentName={vorgangItem.vorgangName}
vorgangToken={vorgangItem.vorgangToken}
onSave={handleSave}
onDelete={deleteVorgang}
/>
</div>
</li> </li>
{/each} {/each}
{/if} {/if}
@@ -243,22 +193,8 @@
</ExpandableForm> </ExpandableForm>
<Modal {open}
><ModalTitle>Umbenennen</ModalTitle><ModalContent>
{#if inProgress}
<p class="py-2 mb-1">Vorgang läuft...</p>
{:else if isError}
<Alert class="w-full" type="error">Fehler beim Umbenennen</Alert>
{:else}
<Alert class="w-full">Umbenennen erfolgreich</Alert>
{/if}
</ModalContent>
<ModalFooter><Button disabled={inProgress} on:click={closeModal}>Ok</Button></ModalFooter>
</Modal>
<style> <style>
ul { ul {
min-width: 24rem; min-width: 24rem;
} }
</style> </style>

View File

@@ -1,8 +1,10 @@
import { Readable } from 'stream'; import { Readable } from 'stream';
import { BUCKET, client } from '$lib/minio'; import { BUCKET, client } from '$lib/minio';
import { fail, error } from '@sveltejs/kit'; import { fail, error } from '@sveltejs/kit';
import { v4 as uuidv4 } from 'uuid';
import { getVorgangByName } from '$lib/server/vorgangService'; import { db } from '$lib/server/dbService';
import { getVorgangByName, vorgangNameExists } from '$lib/server/vorgangService';
const isRequiredFieldValid = (value: unknown) => { const isRequiredFieldValid = (value: unknown) => {
if (value == null) return false; if (value == null) return false;

View File

@@ -1,5 +1,4 @@
<script lang="ts"> <script lang="ts">
import { fade } from 'svelte/transition';
import shortenFileSize from '$lib/helper/shortenFileSize'; import shortenFileSize from '$lib/helper/shortenFileSize';
import timeElapsed from '$lib/helper/timeElapsed'; import timeElapsed from '$lib/helper/timeElapsed';
import { deserialize } from '$app/forms'; import { deserialize } from '$app/forms';
@@ -42,14 +41,10 @@
let formErrors: Record<string, any> | null = $state(null); let formErrors: Record<string, any> | null = $state(null);
let etag: string | null = $state(null); let etag: string | null = $state(null);
let files: FileList | null = $state(null); let files: FileList | null = $state(null);
let fileInput = $state(null);
// Model Variablen für Upload // Model Variablen für Upload
let openUL = $state(false); let openUL = $state(false);
let inProgressUL = $state(form === null); let inProgressUL = $state(form === null);
// Variablen für Copy-Funktion
let copied = $state(false);
async function buttonClick(event: MouseEvent) { async function buttonClick(event: MouseEvent) {
if (!(await validateForm())) { if (!(await validateForm())) {
@@ -103,7 +98,6 @@
openUL = false; openUL = false;
name = ''; name = '';
files = null; files = null;
fileInput.value = "";
await invalidateAll(); await invalidateAll();
crimesList = data.crimesList; crimesList = data.crimesList;
} }
@@ -134,17 +128,17 @@
// big endian! // big endian!
let file = files[0]; let file = files[0];
const fileHeader = file.slice(0, 4); let file_header = file.slice(0, 4);
const buffer = await fileHeader.arrayBuffer(); console.log(file_header);
console.log(fileHeader); let header_bytes = await file_header.bytes();
let headerBytes = new Uint8Array(buffer); let file_header_hex = '0x' + header_bytes.toHex().toString();
let fileHeaderHex = '0x' + headerBytes.toHex().toString();
if (GLD_MAGIC == swap_endian(fileHeaderHex)) { if (GLD_MAGIC == swap_endian(file_header_hex)) {
return true; return true;
} else { } else {
return false; return false;
} }
return true;
} }
async function getUrl() { async function getUrl() {
@@ -196,39 +190,11 @@
} }
} }
async function savePIN(newVorgangPIN: string, oldVorgangPIN: string) {
open = true;
inProgress = true;
isError = false;
try {
const res = await fetch(API_ROUTES.VORGANG(vorgangToken), {
method: 'PUT',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({ vorgangToken, oldVorgangPIN, newVorgangPIN,
changePIN: true})
});
if (!res.ok) {
throw new Error('Fehler beim Speichern');
}
await invalidateAll();
crimesList = data.crimesList;
open = false;
} catch (err) {
console.error('⚠️ Netzwerkfehler beim Speichern', err);
isError = true;
} finally {
inProgress = false;
}
}
async function handleDelete(tatort: string) { async function handleDelete(tatort: string) {
open = true; open = true;
inProgress = true; inProgress = true;
isError = false; isError = false;
let path = API_ROUTES.CRIME(vorgangToken, tatort) let path = API_ROUTES.CRIME(vorgangToken, tatort);
try { try {
const res = await fetch(path, { const res = await fetch(path, {
@@ -254,8 +220,9 @@
} }
} }
async function copyAndOpenMail() { function constructMailToLink() {
const subject = 'Link zum Tatvorgang'; const subject = 'Link zum Tatvorgang';
const link = data.url.origin + data.url.pathname; const link = data.url.origin + data.url.pathname;
const body = `Hallo, const body = `Hallo,
@@ -267,75 +234,27 @@ Der Zugangs-PIN wird zur Sicherheit über einen zweiten Kommunikationskanal übe
Mit freundlichen Grüßen, Mit freundlichen Grüßen,
`; `;
try { const mailtoLink = `mailto:?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(body)}`;
await navigator.clipboard.writeText(body);
copied = true;
// Kurz warten, dann Mail öffnen return mailtoLink;
setTimeout(() => { }
const mailtoLink = `mailto:?subject=${encodeURIComponent(subject)}`;
window.location.href = mailtoLink;
}, 1000);
setTimeout(() => copied = false, 2000);
} catch (err) {
console.error('Clipboard-Fehler:', err);
error = 'Konnte Text nicht kopieren. Bitte manuell markieren und kopieren.';
}
}
function closeModal() { function closeModal() {
open = false; open = false;
isError = false; isError = false;
} }
// drag and drop functionality
let isDragging = $state(false);
async function handleDrop(event) {
event.preventDefault();
isDragging = false;
if (event.dataTransfer?.files?.length) {
files = event.dataTransfer.files;
}
if (!(await check_valid_glb_file())) {
formErrors = { file: 'Keine gültige .GLD-Datei' }
// reset form fields etc.
files = null;
fileInput.value = '';
} else {
formErrors = { ...formErrors, file: ''}
};
}
</script> </script>
<svelte:window
on:dragover|preventDefault
on:drop|preventDefault
/>
{#if data.vorgang && crimesList} {#if data.vorgang && crimesList}
<div class="-z-10 bg-white"> <div class="-z-10 bg-white">
<div class="flex flex-col items-center justify-center w-full"> <div class="flex flex-col items-center justify-center w-full">
<h1 class="text-xl">{vorgangName}</h1> <h1 class="text-xl">Vorgang {vorgangName}</h1>
{#if admin} {#if admin}
<div class="flex items-center gap-2"> Zugangs-PIN: {vorgangPIN}
Zugangs-PIN: <a class="pt-2 pb-6" href={constructMailToLink()}
<NameItemEditor ><Button disabled={isEmptyList}>Share Link</Button></a
list={[]} >
currentName={vorgangPIN}
onSave={savePIN}
onDelete={null}
/>
</div>
<Button variant="secondary" on:click={copyAndOpenMail} disabled={isEmptyList}>Link kopieren und Mail verfassen</Button>
{#if copied}
<p transition:fade>✔ Kopiert! Per Ctrl+V einfügen.</p>
{/if}
{/if} {/if}
</div> </div>
<div class="mx-auto flex justify-center max-w-7xl h-full"> <div class="mx-auto flex justify-center max-w-7xl h-full">
@@ -344,57 +263,51 @@ Mit freundlichen Grüßen,
<EmptyList></EmptyList> <EmptyList></EmptyList>
{:else} {:else}
{#each crimesList as item (item.name)} {#each crimesList as item (item.name)}
<li <li data-testid="test-list-item">
data-testid="test-list-item" <div class=" flex gap-x-4">
class="flex items-center justify-between gap-6 py-4 px-2 hover:bg-gray-50 rounded-lg transition" <a
> data-testid="crime-link"
<div class="flex items-center gap-4 flex-1"> href={ROUTE_NAMES.CRIME(vorgangToken, item.name, vorgangPIN)}
<a class=" flex justify-between gap-x-6 py-5"
data-testid="crime-link" aria-label={ROUTE_NAMES.CRIME(vorgangToken, item.name, vorgangPIN)}
href="{ROUTE_NAMES.CRIME(vorgangToken, item.name, vorgangPIN)}" title={item.name}
class="flex items-center justify-center w-8 h-8 text-gray-600 hover:text-blue-600 transition" >
aria-label="{ROUTE_NAMES.CRIME(vorgangToken, item.name, vorgangPIN)}" <Cube />
title={item.name} </a>
> <div class="min-w-0 flex-auto">
<Cube class="w-5 h-5" /> {#if admin}
</a> <NameItemEditor
list={crimesList}
<div class="flex flex-col flex-1 min-w-0"> currentName={item.name}
{#if admin} onSave={handleSave}
<NameItemEditor onDelete={handleDelete}
list={crimesList} ></NameItemEditor>
currentName={item.name} {:else}
onSave={handleSave} <p
onDelete={handleDelete} data-testid="test-nameItem-p"
/> class="text-sm font-semibold leading-6 text-gray-900 inline-block min-w-1"
{:else} >
<p {item.name}
data-testid="test-nameItem-p" </p>
class="text-sm font-semibold leading-6 text-gray-900 truncate" {/if}
> {#if item.size}
{item.name} <p class="mt-1 truncate text-xs leading-5 text-gray-500">
</p> {shortenFileSize(item.size)}
{/if} </p>
{/if}
<!-- size left, last modified right --> </div>
<div class="flex items-center justify-between mt-1 text-xs leading-5 text-gray-500"> </div>
{#if item.size} <div class="hidden sm:flex sm:flex-col sm:items-end">
<span>{shortenFileSize(item.size)}</span> <p class="text-sm leading-6 text-gray-900">3D Tatort</p>
{:else} {#if item.lastModified}
<span></span> <p class="mt-1 text-xs leading-5 text-gray-500">
{/if} Zuletzt geändert <time datetime="2023-01-23T13:23Z"
{#if item.lastModified} >{timeElapsed(new Date(item.lastModified))}</time
<span> >
Zuletzt geändert </p>
<time datetime={item.lastModified}> {/if}
{timeElapsed(new Date(item.lastModified))} </div>
</time> </li>
</span>
{/if}
</div>
</div>
</div>
</li>
{/each} {/each}
{/if} {/if}
</ul> </ul>
@@ -443,13 +356,7 @@ Mit freundlichen Grüßen,
</span> </span>
</label> </label>
<div <div
class="mt-2 flex justify-center rounded-lg border border-dashed px-6 py-10 class="mt-2 flex justify-center rounded-lg border border-dashed border-gray-900/25 px-6 py-10"
{isDragging
? 'border-blue-500 bg-blue-50'
: 'border-gray-900/25'}"
on:dragover|preventDefault={() => (isDragging = true)}
on:dragleave={() => (isDragging = false)}
on:drop={handleDrop}
> >
<div class="text-center"> <div class="text-center">
<FileRect /> <FileRect />
@@ -459,7 +366,7 @@ Mit freundlichen Grüßen,
class="relative cursor-pointer rounded-md bg-white font-semibold text-indigo-600 focus-within:outline-none focus-within:ring-2 focus-within:ring-indigo-600 focus-within:ring-offset-2 hover:text-indigo-500" class="relative cursor-pointer rounded-md bg-white font-semibold text-indigo-600 focus-within:outline-none focus-within:ring-2 focus-within:ring-indigo-600 focus-within:ring-offset-2 hover:text-indigo-500"
> >
<span>Wähle eine Datei aus</span> <span>Wähle eine Datei aus</span>
<input id="file" bind:this={fileInput} bind:files name="file" type="file" class="sr-only" /> <input id="file" bind:files name="file" type="file" class="sr-only" />
</label> </label>
<p class="pl-1">oder ziehe sie ins Feld</p> <p class="pl-1">oder ziehe sie ins Feld</p>
</div> </div>

View File

@@ -1,4 +1,5 @@
import { getVorgaenge } from '$lib/server/vorgangService'; import { getVorgaenge } from '$lib/server/vorgangService';
import { json } from '@sveltejs/kit';
export async function GET() { export async function GET() {
const vorgaenge = getVorgaenge(); const vorgaenge = getVorgaenge();
@@ -6,4 +7,4 @@ export async function GET() {
return new Response(JSON.stringify(vorgaenge), { return new Response(JSON.stringify(vorgaenge), {
status: 200 status: 200
}); });
} }

View File

@@ -3,8 +3,7 @@ import { json } from '@sveltejs/kit';
import { import {
deleteVorgangByToken, deleteVorgangByToken,
getCrimesListByToken, getCrimesListByToken,
vorgangNameExists, vorgangNameExists
updateVorgangAttrByToken
} from '$lib/server/vorgangService'; } from '$lib/server/vorgangService';
export async function DELETE({ params }) { export async function DELETE({ params }) {
@@ -58,31 +57,3 @@ export async function GET({ params }) {
return new Response(null, { status: 500 }); return new Response(null, { status: 500 });
} }
} }
// change Vorgang properties
export async function PUT({ request }) {
const data = await request.json();
const vorgangToken = data['vorgangToken'];
const changePIN = data['changePIN'];
let attrChanged;
let newValue;
if (changePIN) {
attrChanged = 'pin';
newValue = data['newVorgangPIN']
} else {
attrChanged = 'name';
newValue = data['newName']
}
const res = updateVorgangAttrByToken(vorgangToken, newValue, attrChanged);
if (!res) {
return json({ msg: 'Fehler beim Umbenennen' }, { status: 400 });
}
return json({ success: 'success' }, { status: 200 });
}

View File

@@ -1,3 +1,4 @@
import { json } from '@sveltejs/kit';
import { deleteUser } from '$lib/server/userService'; import { deleteUser } from '$lib/server/userService';
export async function DELETE({ params }) { export async function DELETE({ params }) {

View File

@@ -87,7 +87,7 @@ describe('NameItemEditor - Funktionalität', () => {
expect(onSave).not.toHaveBeenCalled(); expect(onSave).not.toHaveBeenCalled();
}); });
it('ruft onSave korrekt auf bei gültigem Namen: Tatort/Crime', async () => { it('ruft onSave korrekt auf bei gültigem Namen', async () => {
render(NameItemEditor, { props: baseProps }); render(NameItemEditor, { props: baseProps });
await fireEvent.click(screen.getByTestId('edit-button')); await fireEvent.click(screen.getByTestId('edit-button'));
@@ -95,7 +95,7 @@ describe('NameItemEditor - Funktionalität', () => {
await fireEvent.input(input, { target: { value: testLocalName } }); await fireEvent.input(input, { target: { value: testLocalName } });
await fireEvent.click(screen.getByTestId('commit-button')); await fireEvent.click(screen.getByTestId('commit-button'));
expect(onSave).toHaveBeenCalledWith(testLocalName, testCurrentName, undefined); expect(onSave).toHaveBeenCalledWith(testLocalName, testCurrentName);
}); });
it('ruft onDelete korrekt auf', async () => { it('ruft onDelete korrekt auf', async () => {
@@ -117,7 +117,7 @@ describe('NameItemEditor - Funktionalität', () => {
expect(screen.getByTestId('edit-button')).toBeInTheDocument(); expect(screen.getByTestId('edit-button')).toBeInTheDocument();
}); });
it('triggert Save bei Enter-Taste: Tatort/Crime', async () => { it('triggert Save bei Enter-Taste', async () => {
render(NameItemEditor, { props: baseProps }); render(NameItemEditor, { props: baseProps });
await fireEvent.click(screen.getByTestId('edit-button')); await fireEvent.click(screen.getByTestId('edit-button'));
@@ -125,7 +125,7 @@ describe('NameItemEditor - Funktionalität', () => {
await fireEvent.input(input, { target: { value: 'ViaEnter' } }); await fireEvent.input(input, { target: { value: 'ViaEnter' } });
await fireEvent.keyDown(input, { key: 'Enter' }); await fireEvent.keyDown(input, { key: 'Enter' });
expect(onSave).toHaveBeenCalledWith('ViaEnter', testCurrentName, undefined); expect(onSave).toHaveBeenCalledWith('ViaEnter', testCurrentName);
}); });
it('bricht ab bei Escape-Taste', async () => { it('bricht ab bei Escape-Taste', async () => {

View File

@@ -133,7 +133,7 @@ describe('Hinzufügen Button', () => {
console.log(`test: input field validation`); console.log(`test: input field validation`);
}); });
it.todo('Create Tatort successful', async () => { it.skip('Create Tatort successful', async () => {
console.log(`test: tatort upload`); console.log(`test: tatort upload`);
}); });
}); });

View File

@@ -100,16 +100,4 @@ describe('Seite: Vorgangsansicht', () => {
expect(linkElement).toHaveAttribute('href', expectedURL); expect(linkElement).toHaveAttribute('href', expectedURL);
}); });
}); });
describe('PIN Anzeige & Button', () => {
it('Teste korrekte Anzeige von PIN Komponente', () => {
const testData = { ...baseData};
render(TatortListPage, { props: { data: testData } });
const vorgObj = baseData.vorgangList[0]
// PIN is being displayed within ´NameItemEditor´
let label = screen.queryByText(vorgObj.vorgangPIN);
expect(label).toBeInTheDocument();
});
});
}); });

View File

@@ -6,14 +6,6 @@ import { ROUTE_NAMES } from '../../src/routes';
import { actions } from '../../src/routes/(angemeldet)/list/+page.server'; import { actions } from '../../src/routes/(angemeldet)/list/+page.server';
import { createVorgang } from '$lib/server/vorgangService'; import { createVorgang } from '$lib/server/vorgangService';
// mock animation features of the browser
window.HTMLElement.prototype.scrollIntoView = vi.fn();
window.HTMLElement.prototype.animate = vi.fn(() => ({
finished: Promise.resolve(),
cancel: vi.fn(),
}))
describe('Vorgänge Liste Page EmptyList-Komponente View', () => { describe('Vorgänge Liste Page EmptyList-Komponente View', () => {
it('zeigt EmptyList-Komponente an, wenn Liste leer ist', () => { it('zeigt EmptyList-Komponente an, wenn Liste leer ist', () => {
const testData = { ...baseData, vorgangList: [] }; const testData = { ...baseData, vorgangList: [] };
@@ -55,8 +47,16 @@ describe('Teste Links auf Korrektheit', () => {
}); });
async function clickPlusButton() { async function clickPlusButton() {
// mock animation features of the browser
window.HTMLElement.prototype.scrollIntoView = vi.fn();
window.HTMLElement.prototype.animate = vi.fn(() => ({
finished: Promise.resolve(),
cancel: vi.fn(),
}))
// button is visible // button is visible
const button = screen.getByTestId('expand-button') const button = screen.getByRole('button')
expect(button).toBeInTheDocument(); expect(button).toBeInTheDocument();
await fireEvent.click(button) await fireEvent.click(button)
@@ -171,14 +171,4 @@ describe('Hinzufügen Buton', () => {
const result = await actions.default(event); const result = await actions.default(event);
expect(result).toEqual({ token: testVorgangToken }); expect(result).toEqual({ token: testVorgangToken });
}); });
});
describe('Vorgang-Operationen', () => {
it('Teste korrekte Anzeige von Vorgang-Input Komponente', () => {
const testData = { ...baseData};
const { getAllByTestId } = render(VorgangListPage, { props: { data: testData } });
let buttons = getAllByTestId('edit-button')
expect(buttons.length).toBeGreaterThan(1);
});
}); });