diff --git a/svelte/src/admin_panel/AbuseReport.svelte b/svelte/src/admin_panel/AbuseReport.svelte index 62182c8..6cb41f5 100644 --- a/svelte/src/admin_panel/AbuseReport.svelte +++ b/svelte/src/admin_panel/AbuseReport.svelte @@ -1,12 +1,17 @@ @@ -105,12 +110,12 @@ let set_status = async (action: string, report_type: string) => { {ip_report_count[user_report.ip_address]} {#if can_grant} - {/if} {#if can_reject} - {/if} diff --git a/svelte/src/admin_panel/AbuseReports.svelte b/svelte/src/admin_panel/AbuseReports.svelte index 47ee545..4c8ab42 100644 --- a/svelte/src/admin_panel/AbuseReports.svelte +++ b/svelte/src/admin_panel/AbuseReports.svelte @@ -185,8 +185,8 @@ onMount(() => { resolve_report(report.id, e.detail.action, e.detail.report_type)} - on:resolve_by_ip={e => resolve_by_ip(e.detail.ip, e.detail.action)} + on_resolve_report={(action, report_type) => resolve_report(report.id, action, report_type)} + on_resolve_by_ip={resolve_by_ip} /> {/each} diff --git a/svelte/src/admin_panel/EmailReporters.svelte b/svelte/src/admin_panel/EmailReporters.svelte index a6d85b0..445cf3b 100644 --- a/svelte/src/admin_panel/EmailReporters.svelte +++ b/svelte/src/admin_panel/EmailReporters.svelte @@ -116,7 +116,6 @@ const delete_reporter = async (reporter: Reporter) => { const index = reporters.indexOf(reporter) if (index > -1) { reporters.splice(index, 1) - reporters = reporters } try { @@ -175,29 +174,29 @@ onMount(get_reporters);

Pending reporters ({reporters_pending.length})

edit_reporter(e.detail)} - on:approve={e => approve_reporter(e.detail)} - on:spam={e => spam_reporter(e.detail)} - on:delete={e => delete_reporter(e.detail)}> + on_edit={edit_reporter} + on_approve={approve_reporter} + on_spam={spam_reporter} + on_delete={delete_reporter}>

Trusted reporters ({reporters_trusted.length})

edit_reporter(e.detail)} - on:approve={e => approve_reporter(e.detail)} - on:spam={e => spam_reporter(e.detail)} - on:delete={e => delete_reporter(e.detail)}> + on_edit={edit_reporter} + on_approve={approve_reporter} + on_spam={spam_reporter} + on_delete={delete_reporter}>

Rejected reporters ({reporters_rejected.length})

edit_reporter(e.detail)} - on:approve={e => approve_reporter(e.detail)} - on:spam={e => spam_reporter(e.detail)} - on:delete={e => delete_reporter(e.detail)}> + on_edit={edit_reporter} + on_approve={approve_reporter} + on_spam={spam_reporter} + on_delete={delete_reporter}>
diff --git a/svelte/src/admin_panel/EmailReportersTable.svelte b/svelte/src/admin_panel/EmailReportersTable.svelte index 8019f6b..af8babd 100644 --- a/svelte/src/admin_panel/EmailReportersTable.svelte +++ b/svelte/src/admin_panel/EmailReportersTable.svelte @@ -1,45 +1,43 @@
@@ -69,7 +64,7 @@ run(() => { - {#each reporters as rep (rep.from_address)} + {#each sorted as rep (rep.from_address)} {rep.from_address} {rep.name} @@ -78,23 +73,23 @@ run(() => { {formatDate(rep.last_used, true, true, false)} {formatDate(rep.created, false, false, false)} - - {#if rep.status !== "trusted"} - {/if} {#if rep.status !== "rejected"} - {/if} - diff --git a/svelte/src/admin_panel/MollieSettlement.svelte b/svelte/src/admin_panel/MollieSettlement.svelte index d3b89d6..9e0ba32 100644 --- a/svelte/src/admin_panel/MollieSettlement.svelte +++ b/svelte/src/admin_panel/MollieSettlement.svelte @@ -8,7 +8,7 @@ import { loading_finish, loading_start } from "lib/Loading"; let { settlement = {} } = $props(); let payments = $state([]) -let per_country = $state({}) +let per_country: {[country: string]: any} = $state({}) let totals = $state({ count: 0, vat: 0, @@ -79,7 +79,7 @@ const get_payments = async () => { {} ) - console.log(per_country) + console.log($state.snapshot(per_country)) } catch (err) { alert(err); } finally { diff --git a/svelte/src/admin_panel/user_bans/UserBans.svelte b/svelte/src/admin_panel/user_bans/UserBans.svelte index b6eadb9..7b4b3ae 100644 --- a/svelte/src/admin_panel/user_bans/UserBans.svelte +++ b/svelte/src/admin_panel/user_bans/UserBans.svelte @@ -1,5 +1,4 @@ diff --git a/svelte/src/filesystem/edit_window/EditWindow.svelte b/svelte/src/filesystem/edit_window/EditWindow.svelte index 2d87ce5..2c741c1 100644 --- a/svelte/src/filesystem/edit_window/EditWindow.svelte +++ b/svelte/src/filesystem/edit_window/EditWindow.svelte @@ -35,7 +35,7 @@ export const edit = (f: FSNode, oae = false, open_tab = "") => { tab = open_tab } - console.log("Editing file", file) + console.log("Editing file", $state.snapshot(file)) // We save the name in a separate field because we need both the original // name and the new name for the rename operation diff --git a/svelte/src/filesystem/viewers/CustomBanner.svelte b/svelte/src/filesystem/viewers/CustomBanner.svelte index d649bb6..7473cea 100644 --- a/svelte/src/filesystem/viewers/CustomBanner.svelte +++ b/svelte/src/filesystem/viewers/CustomBanner.svelte @@ -1,14 +1,11 @@ {#if image_uri} diff --git a/svelte/src/filesystem/viewers/Zip.svelte b/svelte/src/filesystem/viewers/Zip.svelte index 184ba9c..8cee10b 100644 --- a/svelte/src/filesystem/viewers/Zip.svelte +++ b/svelte/src/filesystem/viewers/Zip.svelte @@ -48,19 +48,22 @@ export const update = async () => { return } - zip = await resp.json() as ZipEntry + const z = await resp.json() as ZipEntry // Check if the zip has the property which allows separate files to be - // downloaded. If so then we set the download URL for each file - if (zip.properties !== undefined) { - if (zip.properties.includes("read_individual_files")) { + // downloaded. If so then we set the download URL for each file. This + // happens before the zip becomes state, else every file in the archive + // would get a state proxy instead of only the ones which are rendered + if (z.properties !== undefined) { + if (z.properties.includes("read_individual_files")) { // Set the download URL for each file in the zip - recursive_set_url(fs_path_url(node.path)+"?zip_file=", zip) + recursive_set_url(fs_path_url(node.path)+"?zip_file=", z) } - truncated = zip.properties.includes("truncated") + truncated = z.properties.includes("truncated") } - uncomp_size = recursive_size(zip) + uncomp_size = recursive_size(z) + zip = z comp_ratio = (uncomp_size / node.file_size) status = "finished" } catch (err) { diff --git a/svelte/src/layout/SortableTable.svelte b/svelte/src/layout/SortableTable.svelte index cb137d3..602d1e8 100644 --- a/svelte/src/layout/SortableTable.svelte +++ b/svelte/src/layout/SortableTable.svelte @@ -23,30 +23,27 @@ import { formatDataVolume, formatDataVolumeBits, formatThousands } from "util/Fo let { index_field = "", - rows = $bindable([]), + rows = [], columns = [], - sort_field = $bindable(index_field), + sort_field = index_field, totals = false }: { index_field?: string; - rows?: any; + rows?: any[]; columns?: SortColumn[]; - sort_field?: any; + sort_field?: string; totals?: boolean; } = $props(); let asc = $state(true) const sort = (field: string) => { - if (field !== "" && field === sort_field) { + if (field === sort_field) { asc = !asc } - if (field === "") { - field = sort_field - } sort_field = field console.log("sorting by", field, "asc", asc) - rows.sort((a, b) => { + rows = [...rows].sort((a, b) => { if (typeof (a[field]) === "number") { // Sort ints from high to low if (asc) { @@ -63,7 +60,6 @@ const sort = (field: string) => { } } }) - rows = rows } diff --git a/svelte/src/layout/checkout/PickCountry.svelte b/svelte/src/layout/checkout/PickCountry.svelte index fb55cca..d6ca405 100644 --- a/svelte/src/layout/checkout/PickCountry.svelte +++ b/svelte/src/layout/checkout/PickCountry.svelte @@ -1,5 +1,4 @@