Claims settings

prisma/migrations/20231128030637_add_claim_show_name_config_option/migration.sql

@@ -0,0 +1 @@
+INSERT INTO system_config ("key", "value", "groupId") VALUES ('claims.showName', 'true', 'global');

src/ambient.d.ts

@@ -54,6 +54,9 @@ type Config = {
 		method: SuggestionMethod;
 	};
 	smtp: SMTPConfig;
+	claims: {
+		showName: boolean;
+	};
 };
 
 type Option = {

src/lib/components/admin/SettingsForm/Claims.svelte

@@ -0,0 +1,17 @@
+<script lang="ts">
+	export let enabled: boolean;
+</script>
+
+<div class="flex flex-col space-y-2">
+	<h2 class="h2">Claims</h2>
+	<label class="unstyled flex flex-row space-x-2">
+		<input
+			id="claimsShowName"
+			name="claimsShowName"
+			class="checkbox"
+			type="checkbox"
+			bind:checked={enabled}
+		/>
+		<span>Show Name</span>
+	</label>
+</div>

src/lib/components/admin/SettingsForm/index.svelte

@@ -5,6 +5,7 @@
 	import PublicSignup from "./PublicSignup.svelte";
 	import Suggestions from "./Suggestions.svelte";
 	import Smtp from "./SMTP.svelte";
+	import Claims from "./Claims.svelte";
 
 	export let config: Config;
 	$: form = $page.form;
@@ -33,7 +34,7 @@
 		};
 	}}
 >
-	<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+	<div class="grid grid-cols-1 gap-4 md:grid-cols-3">
 		<div class="col-span-1">
 			<PublicSignup bind:enabled={config.enableSignup} />
 		</div>
@@ -43,8 +44,11 @@
 				bind:method={config.suggestions.method}
 			/>
 		</div>
+		<div class="col-span-1">
+			<Claims bind:enabled={config.claims.showName} />
+		</div>
 
-		<div class="col-span-1 md:col-span-2">
+		<div class="col-span-1 md:col-span-3">
 			<Smtp
 				bind:enabled={config.smtp.enable}
 				bind:host={config.smtp.host}

src/lib/components/wishlists/ItemCard/ClaimButtons.svelte

@@ -5,6 +5,7 @@
 
 	export let item: FullItem;
 	export let user: PartialUser;
+	export let showName: boolean;
 
 	const dispatch = createEventDispatcher();
 </script>
@@ -30,8 +31,10 @@
 				<span>Purchased</span>
 			</label>
 		</div>
-	{:else}
+	{:else if showName}
 		<span>Claimed by {item.pledgedBy?.name}</span>
+	{:else}
+		<span>Claimed</span>
 	{/if}
 {:else}
 	<button class="variant-filled-secondary btn btn-sm md:btn" on:click={() => dispatch("claim")}>

src/lib/components/wishlists/ItemCard/ItemCard.svelte

@@ -20,6 +20,7 @@
 
 	export let item: FullItem;
 	export let user: PartialUser & { userId: string };
+	export let showClaimedName: boolean;
 	export let showFor = false;
 
 	const modalStore = getModalStore();
@@ -162,6 +163,7 @@
 	<footer class="card-footer flex flex-row justify-between">
 		<ClaimButtons
 			{item}
+			showName={showClaimedName}
 			{user}
 			on:claim={() => handleClaim()}
 			on:unclaim={() => handleClaim(true)}

src/lib/server/config.ts

@@ -13,10 +13,11 @@ export enum ConfigKey {
 	SMTP_USER = "smtp.user",
 	SMTP_PASS = "smtp.pass",
 	SMTP_FROM = "smtp.from",
-	SMTP_FROM_NAME = "smtp.fromName"
+	SMTP_FROM_NAME = "smtp.fromName",
+	CLAIMS_SHOW_NAME = "claims.showName"
 }
 
-type GroupConfig = Partial<Pick<Config, "suggestions">>;
+type GroupConfig = Partial<Pick<Config, "suggestions" | "claims">>;
 
 export const getConfig = async (groupId?: string): Promise<Config> => {
 	let configItems = await client.systemConfig.findMany({
@@ -69,10 +70,14 @@ export const getConfig = async (groupId?: string): Promise<Config> => {
 			method: (configMap[ConfigKey.SUGGESTIONS_METHOD] as SuggestionMethod) || "approval",
 			...groupConfig.suggestions
 		},
-		smtp: smtpConfig
+		smtp: smtpConfig,
+		claims: {
+			showName: configMap[ConfigKey.CLAIMS_SHOW_NAME] === "true",
+			...groupConfig.claims
+		}
 	};
 
-	return config as Config;
+	return config;
 };
 
 const getGroupConfig = async (groupId: string): Promise<GroupConfig> => {
@@ -92,6 +97,9 @@ const getGroupConfig = async (groupId: string): Promise<GroupConfig> => {
 			suggestions: {
 				enable: configMap[ConfigKey.SUGGESTIONS_ENABLE] === "true",
 				method: (configMap[ConfigKey.SUGGESTIONS_METHOD] as SuggestionMethod) || "approval"
+			},
+			claims: {
+				showName: configMap[ConfigKey.CLAIMS_SHOW_NAME] === "true"
 			}
 		};
 	}
@@ -107,6 +115,9 @@ const createDefaultConfig = async (): Promise<void> => {
 		},
 		smtp: {
 			enable: false
+		},
+		claims: {
+			showName: true
 		}
 	};
 
@@ -115,7 +126,6 @@ const createDefaultConfig = async (): Promise<void> => {
 
 export const writeConfig = async (config: Partial<Config>, groupId = GLOBAL) => {
 	const configMap: Record<string, string | null | undefined> = {};
-	if (config.enableSignup) configMap[ConfigKey.SIGNUP_ENABLE] = config?.enableSignup?.toString();
 
 	if (config.smtp) {
 		configMap[ConfigKey.SMTP_ENABLE] = config?.smtp?.enable.toString();
@@ -127,8 +137,10 @@ export const writeConfig = async (config: Partial<Config>, groupId = GLOBAL) =>
 		configMap[ConfigKey.SMTP_FROM_NAME] = config?.smtp?.fromName;
 	}
 
+	configMap[ConfigKey.SIGNUP_ENABLE] = config?.enableSignup?.toString();
 	configMap[ConfigKey.SUGGESTIONS_ENABLE] = config?.suggestions?.enable.toString();
 	configMap[ConfigKey.SUGGESTIONS_METHOD] = config?.suggestions?.method;
+	configMap[ConfigKey.CLAIMS_SHOW_NAME] = config?.claims?.showName.toString();
 
 	for (const [key, value] of Object.entries(configMap)) {
 		await client.systemConfig.upsert({

src/lib/validations.ts

@@ -36,5 +36,6 @@ export const settingSchema = z.object({
 	smtpUser: z.string().optional(),
 	smtpPass: z.string().optional(),
 	smtpFrom: z.string().optional(),
-	smtpFromName: z.string().optional()
+	smtpFromName: z.string().optional(),
+	claimsShowName: z.coerce.boolean().default(false)
 });

src/routes/admin/groups/[groupId]/settings/+page.server.ts

@@ -44,7 +44,8 @@ export const actions: Actions = {
 		const formData = Object.fromEntries(await request.formData());
 		const groupSettingSchema = settingSchema.pick({
 			suggestionMethod: true,
-			enableSuggestions: true
+			enableSuggestions: true,
+			claimsShowName: true
 		});
 
 		const configData = groupSettingSchema.safeParse(formData);
@@ -63,6 +64,9 @@ export const actions: Actions = {
 			suggestions: {
 				enable: configData.data.enableSuggestions,
 				method: configData.data.suggestionMethod
+			},
+			claims: {
+				showName: configData.data.claimsShowName
 			}
 		};
 		await writeConfig(newConfig, params.groupId);

src/routes/admin/groups/[groupId]/settings/+page.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { enhance } from "$app/forms";
+	import Claims from "$lib/components/admin/SettingsForm/Claims.svelte";
 	import Suggestions from "$lib/components/admin/SettingsForm/Suggestions.svelte";
 	import type { PageData } from "./$types";
 
@@ -18,10 +19,17 @@
 		};
 	}}
 >
-	<Suggestions
-		bind:enabled={data.config.suggestions.enable}
-		bind:method={data.config.suggestions.method}
-	/>
+	<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+		<div class="col-span-1">
+			<Suggestions
+				bind:enabled={data.config.suggestions.enable}
+				bind:method={data.config.suggestions.method}
+			/>
+		</div>
+		<div class="col-span-1">
+			<Claims bind:enabled={data.config.claims.showName} />
+		</div>
+	</div>
 
 	<button class="variant-filled-primary btn mt-2" type="submit">
 		{#if saved}

src/routes/admin/settings/+page.server.ts

@@ -32,7 +32,6 @@ export const actions: Actions = {
 	},
 	settings: async ({ request }) => {
 		const formData = Object.fromEntries(await request.formData());
-
 		const configData = settingSchema.safeParse(formData);
 
 		if (!configData.success) {
@@ -79,7 +78,10 @@ const generateConfig = (configData: z.infer<typeof settingSchema>) => {
 			enable: configData.enableSuggestions,
 			method: configData.suggestionMethod
 		},
-		smtp: smtpConfig
+		smtp: smtpConfig,
+		claims: {
+			showName: configData.claimsShowName
+		}
 	};
 
 	return newConfig;

src/routes/claims/+page.svelte

@@ -42,7 +42,7 @@
 				out:send|local={{ key: item.id }}
 				animate:flip={{ duration: 200 }}
 			>
-				<ItemCard {item} showFor user={data.user} />
+				<ItemCard {item} showClaimedName showFor user={data.user} />
 			</div>
 		{/each}
 		{#each items.filter((item) => item.purchased) as item (item.id)}
@@ -51,7 +51,7 @@
 				out:send|local={{ key: item.id }}
 				animate:flip={{ duration: 200 }}
 			>
-				<ItemCard {item} showFor user={data.user} />
+				<ItemCard {item} showClaimedName showFor user={data.user} />
 			</div>
 		{/each}
 	</div>

src/routes/wishlists/[username]/+page.server.ts

@@ -108,6 +108,7 @@ export const load: PageServerLoad = async ({ locals, params, depends, url }) =>
 		},
 		items: wishlistItems.filter((item) => item.approved),
 		approvals: wishlistItems.filter((item) => !item.approved),
-		suggestionsEnabled: config.suggestions.enable
+		suggestionsEnabled: config.suggestions.enable,
+		showClaimedName: config.claims.showName
 	};
 };

src/routes/wishlists/[username]/+page.svelte

@@ -77,7 +77,7 @@
 				out:send|local={{ key: item.id }}
 				animate:flip={{ duration: 200 }}
 			>
-				<ItemCard {item} user={data.user} />
+				<ItemCard {item} showClaimedName={data.showClaimedName} user={data.user} />
 			</div>
 		{/each}
 	</div>
@@ -106,7 +106,7 @@
 				out:send|local={{ key: item.id }}
 				animate:flip={{ duration: 200 }}
 			>
-				<ItemCard {item} user={data.user} />
+				<ItemCard {item} showClaimedName={data.showClaimedName} user={data.user} />
 			</div>
 		{/each}
 	</div>