Skip to content

Commit 5f37f54

Browse files
LucHeartLucHeart
committed
fix warnings and format
1 parent 0e428b1 commit 5f37f54

15 files changed

Lines changed: 116 additions & 108 deletions

File tree

‎src/lib/components/confirm-dialog/dialog-confirm.svelte‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts" generics="T">
2+
import { LoaderCircle } from '@lucide/svelte';
23
import Button from '$lib/components/ui/button/button.svelte';
34
import * as Dialog from '$lib/components/ui/dialog';
4-
import { LoaderCircle } from '@lucide/svelte';
55
import type { Snippet } from 'svelte';
66
77
interface Props {
@@ -10,23 +10,29 @@
1010
onConfirm: (value: T) => Promise<void> | void;
1111
title: string;
1212
desc?: string;
13-
confirmButtonText: string;
13+
confirmButtonText?: string;
1414
descSnippet?: Snippet<[T]>;
1515
}
1616
17-
let { open = $bindable(), data, onConfirm, title, desc, confirmButtonText, descSnippet }: Props = $props();
17+
let {
18+
open = $bindable(),
19+
data,
20+
onConfirm,
21+
title,
22+
desc,
23+
confirmButtonText,
24+
descSnippet,
25+
}: Props = $props();
1826
let promiseRunning = $state(false);
19-
27+
2028
function click() {
2129
promiseRunning = true;
2230
23-
Promise.resolve(onConfirm(data))
24-
.finally(() => {
25-
open = false;
26-
promiseRunning = false;
27-
});
31+
Promise.resolve(onConfirm(data)).finally(() => {
32+
open = false;
33+
promiseRunning = false;
34+
});
2835
}
29-
3036
</script>
3137

3238
<Dialog.Root bind:open={() => open, (o) => (open = o)}>
@@ -40,6 +46,10 @@
4046
{/if}
4147
</Dialog.Description>
4248
</Dialog.Header>
43-
<Button disabled={promiseRunning} variant="destructive" onclick={click}>{#if promiseRunning}<LoaderCircle class="animate-spin" />{/if}{confirmButtonText ? confirmButtonText : 'Confirm'}</Button>
49+
<Button disabled={promiseRunning} variant="destructive" onclick={click}
50+
>{#if promiseRunning}<LoaderCircle class="animate-spin" />{/if}{confirmButtonText
51+
? confirmButtonText
52+
: 'Confirm'}</Button
53+
>
4454
</Dialog.Content>
45-
</Dialog.Root>
55+
</Dialog.Root>

‎src/lib/components/confirm-dialog/dialog-manager.svelte‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
<script lang="ts">
2-
import { ConfirmDialogStore, type ConfirmDialogContext } from '$lib/stores/ConfirmDialogStore';
2+
import { type ConfirmDialogContext, ConfirmDialogStore } from '$lib/stores/ConfirmDialogStore';
33
import { onMount } from 'svelte';
44
import DialogConfirm from './dialog-confirm.svelte';
55
66
let dialogData: ConfirmDialogContext<any> | null = $state(null);
77
let dialogCounter = $state(0);
88
let dialogOpen = $state(false);
99
10-
onMount(()=> {
10+
onMount(() => {
1111
const sub = ConfirmDialogStore.subscribe((value) => {
1212
dialogData = value;
1313
dialogCounter += 1;
1414
dialogOpen = true;
15-
})
15+
});
1616
return () => sub();
1717
});
18-
1918
</script>
2019

2120
{#key dialogCounter}
22-
{#if dialogData}
23-
<DialogConfirm {...dialogData} bind:open={dialogOpen} />
24-
{/if}
25-
{/key}
21+
{#if dialogData}
22+
<DialogConfirm {...dialogData} bind:open={dialogOpen} />
23+
{/if}
24+
{/key}

‎src/lib/errorhandling/apiErrorHandling.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { dev } from '$app/environment';
12
import { type ProblemDetails, isProblemDetails } from '$lib/errorhandling/ProblemDetails';
23
import {
34
isError,
@@ -8,7 +9,6 @@ import {
89
} from '$lib/typeguards/errorGuards';
910
import { toast } from 'svelte-sonner';
1011
import { isValidationError as isValidationProblem } from './ValidationProblemDetails';
11-
import { dev } from '$app/environment';
1212

1313
export type HandleProblemCallback = (problem: ProblemDetails) => boolean;
1414

‎src/lib/signalr/handlers/Log.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { dev } from '$app/environment';
12
import { isControlLog } from '$lib/signalr/models/ControlLog';
23
import { isControlLogSender } from '$lib/signalr/models/ControlLogSender';
34
import { TriggerEvent } from '$lib/stores/ShockEventListenerStore';
45
import { toast } from 'svelte-sonner';
56
import { ControlType } from '../models/ControlType';
6-
import { dev } from '$app/environment';
77

88
export function handleSignalrLog(sender: unknown, logs: unknown) {
99
if (!isControlLogSender(sender) || !Array.isArray(logs) || !logs.every(isControlLog)) {

‎src/lib/stores/ConfirmDialogStore.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ import type { Snippet } from 'svelte';
22
import { writable } from 'svelte/store';
33

44
export interface ConfirmDialogContext<T> {
5-
data: T;
6-
onConfirm: (value: T) => void;
7-
title: string;
8-
desc?: string;
9-
confirmButtonText?: string;
10-
descSnippet?: Snippet<[T]>;
5+
data: T;
6+
onConfirm: (value: T) => void;
7+
title: string;
8+
desc?: string;
9+
confirmButtonText?: string;
10+
descSnippet?: Snippet<[T]>;
1111
}
1212

1313
export const ConfirmDialogStore = writable<ConfirmDialogContext<any> | null>(null);
1414

1515
export function openConfirmDialog<T>(context: ConfirmDialogContext<T>) {
16-
ConfirmDialogStore.set(context);
16+
ConfirmDialogStore.set(context);
1717
}

‎src/lib/stores/UserSharesStore.ts‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,23 @@ import type { ShareInviteBaseDetails, V2UserShares } from '$lib/api/internal/v2'
33
import { handleApiError } from '$lib/errorhandling/apiErrorHandling';
44
import { writable } from 'svelte/store';
55

6-
76
export const UserShares = writable<V2UserShares>({ outgoing: [], incoming: [] });
87
export const OutgoingOutstandingInvites = writable<ShareInviteBaseDetails[]>([]);
98

109
export async function refreshUserShares() {
11-
try {
12-
UserShares.set(await shockerSharesV2Api.sharesGetSharesByUsers());
13-
} catch (error) {
14-
handleApiError(error);
15-
throw error;
16-
}
10+
try {
11+
UserShares.set(await shockerSharesV2Api.sharesGetSharesByUsers());
12+
} catch (error) {
13+
handleApiError(error);
14+
throw error;
15+
}
1716
}
1817

1918
export async function refreshOutgoingInvites() {
20-
try {
21-
OutgoingOutstandingInvites.set(await shockerSharesV2Api.sharesGetOutgoingInvitesList());
22-
} catch (error) {
23-
handleApiError(error);
24-
throw error;
25-
}
26-
}
19+
try {
20+
OutgoingOutstandingInvites.set(await shockerSharesV2Api.sharesGetOutgoingInvitesList());
21+
} catch (error) {
22+
handleApiError(error);
23+
throw error;
24+
}
25+
}

‎src/routes/(authenticated)/shares/user/+page.svelte‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<script lang="ts">
2-
import { onMount } from "svelte";
3-
import { goto } from "$app/navigation";
2+
import { goto } from '$app/navigation';
3+
import { onMount } from 'svelte';
44
5-
onMount(() => {
6-
// This page is just a redirector
7-
goto('/shares/user/outgoing');
8-
});
5+
onMount(() => {
6+
// This page is just a redirector
7+
goto('/shares/user/outgoing');
8+
});
99
</script>

‎src/routes/(authenticated)/shares/user/dialog-share-code-create.svelte‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<script lang="ts">
2+
import { Code, User } from '@lucide/svelte';
23
import { shockerSharesV2Api } from '$lib/api';
34
import { type BasicUserInfo, type ShockerPermLimitPair } from '$lib/api/internal/v1';
45
import Button from '$lib/components/ui/button/button.svelte';
56
import * as Dialog from '$lib/components/ui/dialog';
67
import MultiSelectCombobox from '$lib/components/ui/multi-select-combobox/multi-select-combobox.svelte';
78
import { handleApiError } from '$lib/errorhandling/apiErrorHandling';
89
import { OwnHubsStore } from '$lib/stores/HubsStore';
9-
import { Code, User } from '@lucide/svelte';
10+
import { refreshOutgoingInvites } from '$lib/stores/UserSharesStore';
1011
import RestrictionsSelector from './restrictions-selector.svelte';
1112
import UserSelector from './user-selector.svelte';
12-
import { refreshOutgoingInvites } from '$lib/stores/UserSharesStore';
1313
1414
let availableShockers = $derived(
1515
Array.from($OwnHubsStore)
@@ -80,7 +80,7 @@
8080
})),
8181
});
8282
83-
if(fetchedUser) {
83+
if (fetchedUser) {
8484
onInvitedUser(fetchedUser);
8585
} else {
8686
onCreatedCode(createdCode);

‎src/routes/(authenticated)/shares/user/outgoing/+page.svelte‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<script lang="ts">
2+
import LoadingCircle from '$lib/components/svg/LoadingCircle.svelte';
23
import * as Table from '$lib/components/ui/table';
4+
import { UserShares, refreshUserShares } from '$lib/stores/UserSharesStore';
35
import EditShare from './edit-share.svelte';
46
import UserShareItem from './user-share-item.svelte';
5-
import LoadingCircle from '$lib/components/svg/LoadingCircle.svelte';
6-
import { UserShares, refreshUserShares } from '$lib/stores/UserSharesStore';
77
88
let editShareDrawerOpen = $state(false);
99
let editShareDrawerOpenCount = $state(0);
1010
let editIndex = $state(0);
11-
let refreshPromise = $state(refreshUserShares())
11+
let refreshPromise = $state(refreshUserShares());
1212
1313
function openEditDrawer(userShareIndex: number) {
1414
editIndex = userShareIndex;
@@ -19,32 +19,24 @@
1919

2020
{#key editShareDrawerOpenCount}
2121
{#if $UserShares.outgoing[editIndex] !== undefined}
22-
<EditShare
23-
storeIndex={editIndex}
24-
bind:editDrawer={editShareDrawerOpen}
25-
/>
22+
<EditShare storeIndex={editIndex} bind:editDrawer={editShareDrawerOpen} />
2623
{/if}
2724
{/key}
2825

2926
{#await refreshPromise}
30-
<div class="flex justify-center items-center h-full w-full">
31-
<LoadingCircle />
32-
</div>
27+
<div class="flex justify-center items-center h-full w-full">
28+
<LoadingCircle />
29+
</div>
3330
{:then fetched}
34-
<div class="rounded-md border overflow-y-auto mb-6">
35-
<Table.Root>
36-
<Table.Body>
37-
{#each $UserShares.outgoing as userShare, i (userShare.id)}
38-
<UserShareItem
39-
storeIndex={i}
40-
onOpenEdit={() => openEditDrawer(i)}
41-
/>
42-
{/each}
43-
</Table.Body>
44-
</Table.Root>
45-
</div>
46-
31+
<div class="rounded-md border overflow-y-auto mb-6">
32+
<Table.Root>
33+
<Table.Body>
34+
{#each $UserShares.outgoing as userShare, i (userShare.id)}
35+
<UserShareItem storeIndex={i} onOpenEdit={() => openEditDrawer(i)} />
36+
{/each}
37+
</Table.Body>
38+
</Table.Root>
39+
</div>
4740
{:catch error}
4841
<div class="text-red-500">Failed to load shares: {error.message}</div>
4942
{/await}
50-

‎src/routes/(authenticated)/shares/user/outgoing/edit-share.svelte‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
2222
interface Props {
2323
storeIndex: number;
24-
sharedWithUserId: string;
2524
editDrawer: boolean;
2625
}
2726
@@ -168,7 +167,7 @@
168167
descSnippet: deleteConfirmDesc,
169168
data: shocker,
170169
onConfirm: deleteShockerShare,
171-
confirmButtonText: 'Remove'
170+
confirmButtonText: 'Remove',
172171
});
173172
}
174173
@@ -187,8 +186,11 @@
187186
});
188187
</script>
189188

190-
{#snippet deleteConfirmDesc (shocker: EditableShare)}
191-
<p>Are you sure you want to remove the shocker share <strong>{shocker.name}</strong> for <strong>{$userShare.name}</strong>?</p>
189+
{#snippet deleteConfirmDesc(shocker: EditableShare)}
190+
<p>
191+
Are you sure you want to remove the shocker share <strong>{shocker.name}</strong> for
192+
<strong>{$userShare.name}</strong>?
193+
</p>
192194
{/snippet}
193195

194196
<Drawer.Root bind:open={editDrawer} direction="right">
@@ -286,7 +288,11 @@
286288
});
287289
}}
288290
/>
289-
<Button variant="destructive" onclick={() => handleDeleteClick(shares[i])} class="ml-4">
291+
<Button
292+
variant="destructive"
293+
onclick={() => handleDeleteClick(shares[i])}
294+
class="ml-4"
295+
>
290296
<Trash />
291297
</Button>
292298
</span>

0 commit comments

Comments
 (0)