Überarbeitung des Pull Request, für Chico bitte offen lassen.
This commit is contained in:
@@ -41,10 +41,10 @@
|
|||||||
|
|
||||||
function commitIfValid() {
|
function commitIfValid() {
|
||||||
if (!error && !wasCancelled && localName != currentName) {
|
if (!error && !wasCancelled && localName != currentName) {
|
||||||
editedName = localName.trim();
|
const trimmedName: string = localName.trim();
|
||||||
inputRef?.blur();
|
inputRef?.blur();
|
||||||
isEditing = false;
|
isEditing = false;
|
||||||
onSave(editedName, currentName);
|
onSave(trimmedName, currentName);
|
||||||
} else {
|
} else {
|
||||||
localName = currentName;
|
localName = currentName;
|
||||||
resetEdit();
|
resetEdit();
|
||||||
|
|||||||
@@ -15,9 +15,6 @@
|
|||||||
if (!target) return;
|
if (!target) return;
|
||||||
let filename = target.id.split('del__')[1];
|
let filename = target.id.split('del__')[1];
|
||||||
|
|
||||||
// delete request
|
|
||||||
// --------------
|
|
||||||
|
|
||||||
let url = `/api/list/${filename}`;
|
let url = `/api/list/${filename}`;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -46,13 +43,16 @@
|
|||||||
<ul role="list" class="divide-y divide-gray-100">
|
<ul role="list" class="divide-y divide-gray-100">
|
||||||
{#each vorgangList as vorgangItem}
|
{#each vorgangList as vorgangItem}
|
||||||
<li>
|
<li>
|
||||||
<a href="/list/{vorgangItem.vorgangToken}?pin={vorgangItem.vorgangPIN}" class="flex justify-between gap-x-6 py-5">
|
<a
|
||||||
|
href="/list/{vorgangItem.vorgangToken}?pin={vorgangItem.vorgangPIN}"
|
||||||
|
class="flex justify-between gap-x-6 py-5"
|
||||||
|
>
|
||||||
<div class="flex gap-x-4">
|
<div class="flex gap-x-4">
|
||||||
<!-- Ordner -->
|
|
||||||
<Folder />
|
<Folder />
|
||||||
<div class="min-w-0 flex-auto">
|
<div class="min-w-0 flex-auto">
|
||||||
<span class="text-sm font-semibold leading-6 text-gray-900">{vorgangItem.vorgangName}</span>
|
<span class="text-sm font-semibold leading-6 text-gray-900"
|
||||||
<!-- Delete button -->
|
>{vorgangItem.vorgangName}</span
|
||||||
|
>
|
||||||
<button
|
<button
|
||||||
style="padding: 2px"
|
style="padding: 2px"
|
||||||
id="del__{vorgangItem.vorgangToken}"
|
id="del__{vorgangItem.vorgangToken}"
|
||||||
|
|||||||
@@ -63,13 +63,16 @@
|
|||||||
const msg = await res.text();
|
const msg = await res.text();
|
||||||
console.error('❌ Fehler beim Umbenennen:', msg);
|
console.error('❌ Fehler beim Umbenennen:', msg);
|
||||||
isError = true;
|
isError = true;
|
||||||
|
inProgress = false;
|
||||||
} else {
|
} else {
|
||||||
await invalidateAll();
|
await invalidateAll();
|
||||||
crimesList = data.crimesList;
|
crimesList = data.crimesList;
|
||||||
open = false;
|
open = false;
|
||||||
|
inProgress = false;
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('⚠️ Netzwerkfehler:', err);
|
console.error('⚠️ Netzwerkfehler:', err);
|
||||||
|
inProgress = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,10 +105,12 @@
|
|||||||
} else {
|
} else {
|
||||||
console.log('🗑️ Erfolgreich gelöscht:', url.pathname);
|
console.log('🗑️ Erfolgreich gelöscht:', url.pathname);
|
||||||
await invalidateAll();
|
await invalidateAll();
|
||||||
|
|
||||||
crimesList = data.crimesList;
|
crimesList = data.crimesList;
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
isError = true;
|
isError = true;
|
||||||
|
inProgress = false;
|
||||||
console.error('⚠️ Netzwerkfehler beim Löschen:', err);
|
console.error('⚠️ Netzwerkfehler beim Löschen:', err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -201,7 +206,7 @@
|
|||||||
{:else if isError}
|
{:else if isError}
|
||||||
<Alert class="w-full" type="error">Fehler beim Umbenennen</Alert>
|
<Alert class="w-full" type="error">Fehler beim Umbenennen</Alert>
|
||||||
{:else}
|
{:else}
|
||||||
<Alert class="w-full">Upload erfolgreich</Alert>
|
<Alert class="w-full">Umbenennen erfolgreich</Alert>
|
||||||
{/if}
|
{/if}
|
||||||
</ModalContent>
|
</ModalContent>
|
||||||
<ModalFooter><Button disabled={inProgress} on:click={closeModal}>Ok</Button></ModalFooter>
|
<ModalFooter><Button disabled={inProgress} on:click={closeModal}>Ok</Button></ModalFooter>
|
||||||
|
|||||||
@@ -39,9 +39,7 @@ export async function DELETE({ request }: { request: Request }) {
|
|||||||
export async function PUT({ params, request }) {
|
export async function PUT({ params, request }) {
|
||||||
const data = await request.json();
|
const data = await request.json();
|
||||||
|
|
||||||
// Vorgang
|
|
||||||
const vorgangToken = params.vorgang;
|
const vorgangToken = params.vorgang;
|
||||||
//const vorgangToken = getVorgangByName(vorgangName)?.token;
|
|
||||||
|
|
||||||
|
|
||||||
// prepare copy, incl. check if new name exists already
|
// prepare copy, incl. check if new name exists already
|
||||||
@@ -57,14 +55,10 @@ export async function PUT({ params, request }) {
|
|||||||
await client.statObject('tatort', crimeNewName);
|
await client.statObject('tatort', crimeNewName);
|
||||||
return json({ msg: 'Die Datei existiert bereits.' }, { status: 400 });
|
return json({ msg: 'Die Datei existiert bereits.' }, { status: 400 });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// continue operation
|
|
||||||
console.log(error, 'continue operation');
|
console.log(error, 'continue operation');
|
||||||
}
|
}
|
||||||
|
|
||||||
// actual copy operation
|
|
||||||
await client.copyObject('tatort', crimeNewName, crimeS3FullBucketPathOld);
|
await client.copyObject('tatort', crimeNewName, crimeS3FullBucketPathOld);
|
||||||
|
|
||||||
// delete
|
|
||||||
await client.removeObject('tatort', `${vorgangToken}/${crimeOldName}`);
|
await client.removeObject('tatort', `${vorgangToken}/${crimeOldName}`);
|
||||||
|
|
||||||
return json({ success: 'success' }, { status: 200 });
|
return json({ success: 'success' }, { status: 200 });
|
||||||
|
|||||||
Reference in New Issue
Block a user