From c9e3bd2f4a1fae8da778d17484369998937b146d Mon Sep 17 00:00:00 2001
From: davidemarcoli <davide@marcoli.ch>
Date: Sat, 16 Nov 2024 11:54:45 +0100
Subject: [PATCH] fix: update ranking data type export and clean up form field
 props

---
 src/lib/forms/helpers.ts                    | 2 +-
 src/lib/forms/ranking-form.svelte           | 8 ++++----
 src/routes/browse/+page.svelte              | 8 ++------
 src/routes/settings/ranking/+page.server.ts | 5 +++--
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/lib/forms/helpers.ts b/src/lib/forms/helpers.ts
index 0c84843..13886a7 100644
--- a/src/lib/forms/helpers.ts
+++ b/src/lib/forms/helpers.ts
@@ -776,7 +776,7 @@ type CustomRanks = {
 	trash: Ranks;
 };
 
-type RankingData = {
+export type RankingData = {
 	ranking: {
 		custom_ranks: CustomRanks;
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/src/lib/forms/ranking-form.svelte b/src/lib/forms/ranking-form.svelte
index 9ba4919..df7906f 100644
--- a/src/lib/forms/ranking-form.svelte
+++ b/src/lib/forms/ranking-form.svelte
@@ -255,7 +255,7 @@
 
 	<div class="space-y-4">
 		<h3 class="text-lg font-medium">Options</h3>
-		<NumberField {form} name="title_similarity" {formData} stepValue={0.01} min={0} max={1} />
+		<NumberField {form} name="title_similarity" {formData} stepValue={0.01} />
 		<CheckboxField {form} name="remove_all_trash" {formData} />
 		<NumberField {form} name="remove_ranks_under" {formData} stepValue={1} />
 		<CheckboxField {form} name="remove_unknown_languages" {formData} />
@@ -266,11 +266,11 @@
 
 	<div class="space-y-4">
 		<h3 class="text-lg font-medium">Languages</h3>
-		<LanguageField {form} {formData} name="languages_required" label="Required Languages" />
+		<LanguageField {form} {formData} name="languages_required" />
 
-		<LanguageField {form} {formData} name="languages_exclude" label="Excluded Languages" />
+		<LanguageField {form} {formData} name="languages_exclude" />
 
-		<LanguageField {form} {formData} name="languages_preferred" label="Preferred Languages" />
+		<LanguageField {form} {formData} name="languages_preferred" />
 		<!-- <ArrayField {form} name="languages_required" {formData}>
 			{#each $formData.languages_required as _, i}
 				<Form.ElementField {form} name="languages_required[{i}]">
diff --git a/src/routes/browse/+page.svelte b/src/routes/browse/+page.svelte
index f806e18..16bfa04 100644
--- a/src/routes/browse/+page.svelte
+++ b/src/routes/browse/+page.svelte
@@ -106,16 +106,12 @@
 
 	function mapSelectedStates(selectedStates: Selected<string>[]) {
 		return selectedStates
-			.values()
-			.map((v) => v.value as keyof typeof states)
-			.toArray();
+			.map((v: Selected<String>) => v.value as keyof typeof states);
 	}
 
 	function mapSelectedTypes(selectedTypes: Selected<string>[]) {
 		return selectedTypes
-			.values()
-			.map((v) => v.value as keyof typeof types)
-			.toArray();
+			.map((v: Selected<String>) => v.value as keyof typeof types);
 	}
 </script>
 
diff --git a/src/routes/settings/ranking/+page.server.ts b/src/routes/settings/ranking/+page.server.ts
index d22e74b..d0c3bce 100644
--- a/src/routes/settings/ranking/+page.server.ts
+++ b/src/routes/settings/ranking/+page.server.ts
@@ -6,7 +6,8 @@ import {
 	rankingSettingsSchema,
 	rankingSettingsToGet,
 	rankingSettingsToPass,
-	rankingSettingsToSet
+	rankingSettingsToSet,
+	type RankingData
 } from '$lib/forms/helpers';
 import { setSettings, saveSettings, loadSettings } from '$lib/forms/helpers.server';
 import { SettingsService } from '$lib/client';
@@ -17,7 +18,7 @@ export const load: PageServerLoad = async () => {
 			paths: rankingSettingsToGet.join(',')
 		}
 	});
-	const toPassToSchema = rankingSettingsToPass(data);
+	const toPassToSchema = rankingSettingsToPass(data as RankingData);
 
 	return {
 		form: await superValidate(toPassToSchema, zod(rankingSettingsSchema))