Remove Svelte upgrade compatibility code
This commit is contained in:
1 parent
1956790dde
commit
672a19f8f6
19 files changed
+96
-101
No files matched your search
@@ -1,12 +1,17 @@
|
||||
<script lang="ts">
|
||||
import { formatDate, formatNumber } from "util/Formatting";
|
||||
import Expandable from "util/Expandable.svelte";
|
||||
import { createEventDispatcher } from "svelte";
|
||||
let dispatch = createEventDispatcher()
|
||||
|
||||
let {
|
||||
report,
|
||||
ip_report_count
|
||||
ip_report_count,
|
||||
on_resolve_report,
|
||||
on_resolve_by_ip,
|
||||
}: {
|
||||
report: any
|
||||
ip_report_count: {[key: string]: number}
|
||||
on_resolve_report: (action: string, report_type: string) => void
|
||||
on_resolve_by_ip: (ip: string, action: string) => void
|
||||
} = $props();
|
||||
let preview = $state(false)
|
||||
|
||||
@@ -14,7 +19,7 @@ let can_grant = $derived(report.status !== "granted")
|
||||
let can_reject = $derived(report.status !== "rejected")
|
||||
|
||||
let set_status = async (action: string, report_type: string) => {
|
||||
dispatch("resolve_report", {action: action, report_type: report_type})
|
||||
on_resolve_report(action, report_type)
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -105,12 +110,12 @@ let set_status = async (action: string, report_type: string) => {
|
||||
<td>{ip_report_count[user_report.ip_address]}</td>
|
||||
<td>
|
||||
{#if can_grant}
|
||||
<button onclick={() => dispatch("resolve_by_ip", {ip: user_report.ip_address, action: "grant"})}>
|
||||
<button onclick={() => on_resolve_by_ip(user_report.ip_address, "grant")}>
|
||||
Accept all
|
||||
</button>
|
||||
{/if}
|
||||
{#if can_reject}
|
||||
<button onclick={() => dispatch("resolve_by_ip", {ip: user_report.ip_address, action: "reject"})}>
|
||||
<button onclick={() => on_resolve_by_ip(user_report.ip_address, "reject")}>
|
||||
Ignore all
|
||||
</button>
|
||||
{/if}
|
||||
|
||||
@@ -185,8 +185,8 @@ onMount(() => {
|
||||
<AbuseReport
|
||||
report={report}
|
||||
ip_report_count={ip_report_count}
|
||||
on:resolve_report={e => 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}
|
||||
</section>
|
||||
|
||||
@@ -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);
|
||||
<h2>Pending reporters ({reporters_pending.length})</h2>
|
||||
<EmailReportersTable
|
||||
reporters={reporters_pending}
|
||||
on:edit={e => 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}>
|
||||
</EmailReportersTable>
|
||||
|
||||
|
||||
<h2>Trusted reporters ({reporters_trusted.length})</h2>
|
||||
<EmailReportersTable
|
||||
reporters={reporters_trusted}
|
||||
on:edit={e => 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}>
|
||||
</EmailReportersTable>
|
||||
|
||||
<h2>Rejected reporters ({reporters_rejected.length})</h2>
|
||||
<EmailReportersTable
|
||||
reporters={reporters_rejected}
|
||||
on:edit={e => 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}>
|
||||
</EmailReportersTable>
|
||||
<br/>
|
||||
|
||||
|
||||
@@ -1,44 +1,42 @@
|
||||
<script lang="ts">
|
||||
import { run, preventDefault } from 'svelte/legacy';
|
||||
import { createEventDispatcher } from "svelte";
|
||||
import { formatDate } from "util/Formatting";
|
||||
import Modal from "util/Modal.svelte"
|
||||
import SortButton from "layout/SortButton.svelte";
|
||||
import { flip } from "svelte/animate";
|
||||
|
||||
const dispatch = createEventDispatcher()
|
||||
|
||||
let { reporters = $bindable([]) } = $props();
|
||||
|
||||
const update_table = (reporters) => sort("")
|
||||
let { reporters = [], on_edit, on_approve, on_spam, on_delete }: {
|
||||
reporters?: any[];
|
||||
on_edit: (reporter: any) => void;
|
||||
on_approve: (reporter: any) => void;
|
||||
on_spam: (reporter: any) => void;
|
||||
on_delete: (reporter: any) => void;
|
||||
} = $props();
|
||||
|
||||
let sort_field = $state("last_used")
|
||||
let asc = $state(false)
|
||||
const sort = (field) => {
|
||||
if (field !== "" && field === sort_field) asc = !asc
|
||||
if (field === "") field = sort_field
|
||||
const sort = (field: string) => {
|
||||
if (field === sort_field) asc = !asc
|
||||
sort_field = field
|
||||
|
||||
console.log("sorting by", field, "asc", asc)
|
||||
reporters.sort((a, b) => {
|
||||
if (typeof (a[field]) === "number") {
|
||||
}
|
||||
|
||||
let sorted = $derived([...reporters].sort((a, b) => {
|
||||
if (typeof (a[sort_field]) === "number") {
|
||||
// Sort ints from high to low
|
||||
if (asc) {
|
||||
return a[field] - b[field]
|
||||
return a[sort_field] - b[sort_field]
|
||||
} else {
|
||||
return b[field] - a[field]
|
||||
return b[sort_field] - a[sort_field]
|
||||
}
|
||||
} else {
|
||||
// Sort strings alphabetically
|
||||
if (asc) {
|
||||
return a[field].localeCompare(b[field])
|
||||
return a[sort_field].localeCompare(b[sort_field])
|
||||
} else {
|
||||
return b[field].localeCompare(a[field])
|
||||
return b[sort_field].localeCompare(a[sort_field])
|
||||
}
|
||||
}
|
||||
})
|
||||
reporters = reporters
|
||||
}
|
||||
}))
|
||||
|
||||
let modal: Modal = $state()
|
||||
let preview_subject = $state("")
|
||||
@@ -50,9 +48,6 @@ const toggle_preview = (rep) => {
|
||||
preview_html = rep.last_message_html
|
||||
modal.show()
|
||||
}
|
||||
run(() => {
|
||||
update_table(reporters)
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="table_scroll">
|
||||
@@ -69,7 +64,7 @@ run(() => {
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{#each reporters as rep (rep.from_address)}
|
||||
{#each sorted as rep (rep.from_address)}
|
||||
<tr animate:flip={{duration: 500}}>
|
||||
<td>{rep.from_address}</td>
|
||||
<td>{rep.name}</td>
|
||||
@@ -78,23 +73,23 @@ run(() => {
|
||||
<td>{formatDate(rep.last_used, true, true, false)}</td>
|
||||
<td>{formatDate(rep.created, false, false, false)}</td>
|
||||
<td>
|
||||
<button onclick={preventDefault(() => toggle_preview(rep))} class="button round">
|
||||
<button onclick={e => {e.preventDefault(); toggle_preview(rep)}} class="button round">
|
||||
<i class="icon">email</i>
|
||||
</button>
|
||||
<button onclick={preventDefault(() => {dispatch("edit", rep)})} class="button round">
|
||||
<button onclick={e => {e.preventDefault(); on_edit(rep)}} class="button round">
|
||||
<i class="icon">edit</i>
|
||||
</button>
|
||||
{#if rep.status !== "trusted"}
|
||||
<button onclick={preventDefault(() => {dispatch("approve", rep)})} class="button button_highlight round">
|
||||
<button onclick={e => {e.preventDefault(); on_approve(rep)}} class="button button_highlight round">
|
||||
<i class="icon">check</i>
|
||||
</button>
|
||||
{/if}
|
||||
{#if rep.status !== "rejected"}
|
||||
<button onclick={preventDefault(() => {dispatch("spam", rep)})} class="button button_red round">
|
||||
<button onclick={e => {e.preventDefault(); on_spam(rep)}} class="button button_red round">
|
||||
<i class="icon">block</i>
|
||||
</button>
|
||||
{/if}
|
||||
<button onclick={preventDefault(() => {dispatch("delete", rep)})} class="button button_red round">
|
||||
<button onclick={e => {e.preventDefault(); on_delete(rep)}} class="button button_red round">
|
||||
<i class="icon">delete</i>
|
||||
</button>
|
||||
</td>
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<script>
|
||||
import { stopPropagation } from 'svelte/legacy';
|
||||
import { onMount } from "svelte";
|
||||
import { formatDate } from "util/Formatting";
|
||||
import Expandable from "util/Expandable.svelte";
|
||||
@@ -142,7 +141,7 @@ onMount(get_bans);
|
||||
Date<br/>
|
||||
{formatDate(row.offences[0].ban_time, false, false, false)}
|
||||
</div>
|
||||
<button onclick={stopPropagation(() => {delete_ban(row.user_id)})} class="button button_red" style="align-self: center;">
|
||||
<button onclick={e => {e.stopPropagation(); delete_ban(row.user_id)}} class="button button_red" style="align-self: center;">
|
||||
<i class="icon">delete</i>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@@ -6,6 +6,7 @@ import { fs_path_url, fs_share_hotlink_url, fs_share_url, fs_timeseries, type FS
|
||||
import { color_by_name } from "util/Util";
|
||||
import CopyButton from "layout/CopyButton.svelte";
|
||||
import type { FSNavigator } from "./FSNavigator";
|
||||
import { untrack } from "svelte";
|
||||
|
||||
let {
|
||||
nav,
|
||||
@@ -19,9 +20,12 @@ export const toggle = () => visible = !visible
|
||||
|
||||
$effect(() => {
|
||||
// Only update the chart if the details modal is open. Else the chart is
|
||||
// rendered for nothing
|
||||
if (visible) {
|
||||
update_chart($nav.base, chart_timespan, chart_interval)
|
||||
// rendered for nothing. The chart is not there until it's downloaded,
|
||||
// reading it here makes this run again when it's ready. The timespan is not
|
||||
// a dependency, update_chart sets it and that would fetch the data twice
|
||||
if (visible && chart) {
|
||||
const base = $nav.base
|
||||
untrack(() => update_chart(base, chart_timespan, chart_interval))
|
||||
}
|
||||
})
|
||||
|
||||
@@ -42,8 +46,6 @@ let total_downloads = $state(0)
|
||||
let total_egress = $state(0)
|
||||
|
||||
let update_chart = async (base: FSNode, timespan: number, interval: number) => {
|
||||
// The chart is not there until it's downloaded. The $effect above reads it
|
||||
// through this function, so it calls this function again when it's ready
|
||||
if (!visible || base.type !== "file" || !chart) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -16,6 +16,10 @@ export class FSNavigator {
|
||||
// Initialized will be set to true when the first file or directory is loaded
|
||||
initialized = false
|
||||
shuffle = false
|
||||
toggle_shuffle = () => {
|
||||
this.shuffle = !this.shuffle
|
||||
this.notify_subscribers()
|
||||
}
|
||||
|
||||
// Whether navigation events should update the browser history
|
||||
history_enabled = true
|
||||
|
||||
@@ -79,7 +79,7 @@ const keydown = (e: KeyboardEvent) => {
|
||||
nav.download()
|
||||
break;
|
||||
case "r":
|
||||
nav.shuffle = !nav.shuffle
|
||||
nav.toggle_shuffle()
|
||||
break;
|
||||
case "a":
|
||||
case "ArrowLeft":
|
||||
|
||||
@@ -44,7 +44,7 @@ export const copy_link = () => {
|
||||
<button onclick={() => {nav.open_sibling(-1)}}>
|
||||
<i class="icon">skip_previous</i>
|
||||
</button>
|
||||
<button onclick={() => {nav.shuffle = !nav.shuffle}} class:button_highlight={nav.shuffle}>
|
||||
<button onclick={nav.toggle_shuffle} class:button_highlight={$nav.shuffle}>
|
||||
<i class="icon">shuffle</i>
|
||||
</button>
|
||||
<button onclick={() => {nav.open_sibling(1)}}>
|
||||
|
||||
@@ -22,7 +22,6 @@ const add_user = (e: SubmitEvent) => {
|
||||
}
|
||||
const del_user = (id: string) => {
|
||||
delete options.user_permissions[id]
|
||||
options.user_permissions = options.user_permissions
|
||||
}
|
||||
|
||||
let new_password = $state("")
|
||||
@@ -49,7 +48,6 @@ const generate_password = () => {
|
||||
let revealed: {[password: string]: boolean} = $state({})
|
||||
const del_password = (pass: string) => {
|
||||
delete options.password_permissions[pass]
|
||||
options.password_permissions = options.password_permissions
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
<script lang="ts">
|
||||
import type { FSNode } from 'lib/FilesystemAPI.svelte';
|
||||
import { run } from 'svelte/legacy';
|
||||
|
||||
let { path = [] }: {path: FSNode[]} = $props();
|
||||
|
||||
let image_uri: string = $state()
|
||||
let image_link: string = $state()
|
||||
const update_links = (path: FSNode[]) => {
|
||||
image_uri = null
|
||||
image_link = null
|
||||
let { image_uri, image_link } = $derived.by(() => {
|
||||
let image_uri: string = null
|
||||
let image_link: string = null
|
||||
for (let node of path) {
|
||||
if (node.properties && node.properties.branding_enabled === "true") {
|
||||
if (node.properties.brand_header_image) {
|
||||
@@ -19,10 +16,8 @@ const update_links = (path: FSNode[]) => {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
run(() => {
|
||||
update_links(path)
|
||||
});
|
||||
return { image_uri, image_link }
|
||||
})
|
||||
</script>
|
||||
|
||||
{#if image_uri}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<script lang="ts">
|
||||
import { preventDefault } from 'svelte/legacy';
|
||||
import { countries } from "country-data-list";
|
||||
import { get_misc_vat_rate, put_user } from "lib/NovaAPI";
|
||||
import { payment_providers, type CheckoutState } from "./CheckoutLib";
|
||||
@@ -59,7 +58,7 @@ const format_country = (c: typeof countries.all[0]) => {
|
||||
Please pick your country of residence
|
||||
</div>
|
||||
<div>
|
||||
<form onsubmit={preventDefault(set_country)} class="country_form">
|
||||
<form onsubmit={set_country} class="country_form">
|
||||
<div class="country_search">
|
||||
<datalist id="country_picker">
|
||||
{#each countries.all.filter(c => c.status === "assigned") as c}
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
<script lang="ts">
|
||||
import { createEventDispatcher, onMount } from "svelte";
|
||||
import { onMount } from "svelte";
|
||||
import Form, { type FormConfig } from "util/Form.svelte"
|
||||
import { check_response, get_endpoint } from "lib/NovaAPI";
|
||||
|
||||
let dispatch = createEventDispatcher()
|
||||
let { on_login }: {
|
||||
on_login?: (login: {key: string}) => void;
|
||||
} = $props();
|
||||
|
||||
const form_login: FormConfig = {
|
||||
fields: [
|
||||
@@ -100,7 +102,7 @@ const login = async (e?: SubmitEvent) => {
|
||||
}
|
||||
}
|
||||
|
||||
dispatch("login", {key: resp.auth_key})
|
||||
on_login?.({key: resp.auth_key})
|
||||
|
||||
if (typeof login_redirect === "string" && login_redirect.startsWith("/")) {
|
||||
console.debug("redirecting user to requested path", login_redirect)
|
||||
|
||||
@@ -22,9 +22,9 @@ let page = $state("login")
|
||||
|
||||
<div class="page_content">
|
||||
{#if page === "login"}
|
||||
<Login on:login={finish_login}/>
|
||||
<Login on_login={finish_login}/>
|
||||
{:else if page === "register"}
|
||||
<Register on:login={finish_login}/>
|
||||
<Register/>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
<script lang="ts">
|
||||
import { stopPropagation } from 'svelte/legacy';
|
||||
|
||||
export const toggle = () => {
|
||||
expanded = !expanded
|
||||
}
|
||||
@@ -62,7 +60,7 @@ let {
|
||||
{@render header?.()}
|
||||
</div>
|
||||
|
||||
<button class="bucket_expand" onclick={stopPropagation(toggle)}>
|
||||
<button class="bucket_expand" onclick={e => {e.stopPropagation(); toggle()}}>
|
||||
{#if expanded}
|
||||
<i class="icon">expand_less</i>
|
||||
{:else}
|
||||
|
||||
Reference in new issue
Block a user