From 879a3bd8bd40478614f0f105b310a9ddc93fec55 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Mon, 15 Dec 2025 09:52:03 -0800
Subject: [PATCH] move season field to Metadata section

---
 .../sections/CharacterMetadataSection.svelte  | 37 ++++++++-
 .../sections/CharacterTaxonomySection.svelte  | 80 ++-----------------
 2 files changed, 40 insertions(+), 77 deletions(-)

diff --git a/src/lib/features/database/characters/sections/CharacterMetadataSection.svelte b/src/lib/features/database/characters/sections/CharacterMetadataSection.svelte
index 6208ce7b..7950607e 100644
--- a/src/lib/features/database/characters/sections/CharacterMetadataSection.svelte
+++ b/src/lib/features/database/characters/sections/CharacterMetadataSection.svelte
@@ -6,8 +6,10 @@
   import DetailItem from '$lib/components/ui/DetailItem.svelte'
   import SuggestionDetailItem from '$lib/components/ui/SuggestionDetailItem.svelte'
   import CopyableText from '$lib/components/ui/CopyableText.svelte'
+  import Select from '$lib/components/ui/Select.svelte'
   import { getRarityLabel, getRarityOptions } from '$lib/utils/rarity'
   import { getWeaponImage } from '$lib/utils/images'
+  import { CHARACTER_SEASON_NAMES, getSeasonName } from '$lib/types/enums'
 
   interface Props {
     character: any
@@ -32,6 +34,15 @@
 
   const rarityOptions = getRarityOptions()
 
+  // Season options (nullable, so include a "None" option)
+  const seasonOptions = [
+    { value: 0, label: 'None' },
+    ...Object.entries(CHARACTER_SEASON_NAMES).map(([value, label]) => ({
+      value: Number(value),
+      label
+    }))
+  ]
+
   function formatPromotions(promotionNames: string[] | undefined): string {
     if (!promotionNames || promotionNames.length === 0) return '—'
     return promotionNames.join(', ')
@@ -52,13 +63,30 @@
       onDismissSuggestion={() => onDismissSuggestion?.('rarity')}
     />
     <DetailItem
-      label="Granblue ID"
-      bind:value={editData.granblueId}
+      label="Season"
+      sublabel="Used to disambiguate characters with the same name"
+      editable={true}
+    >
+      <Select
+        size="medium"
+        options={seasonOptions}
+        bind:value={editData.season}
+        contained
+      />
+    </DetailItem>
+    <DetailItem
+      label="Character ID"
+      sublabel="Separate multiple IDs with commas"
+      bind:value={editData.characterId}
       editable={true}
       type="text"
+      placeholder="Character IDs"
     />
   {:else}
     <DetailItem label="Rarity" value={getRarityLabel(character.rarity)} />
+    {#if character.season}
+      <DetailItem label="Season" value={getSeasonName(character.season) || '—'} />
+    {/if}
     <DetailItem label="Granblue ID">
       {#if character.granblueId}
         <CopyableText value={character.granblueId} />
@@ -66,6 +94,11 @@
         —
       {/if}
     </DetailItem>
+    {#if character.characterId?.length}
+      <DetailItem label="Character ID">
+        <CopyableText value={character.characterId.join(', ')} />
+      </DetailItem>
+    {/if}
     {#if character.recruitedBy}
       <DetailItem label="Recruited By">
         <a href="/database/weapons/{character.recruitedBy.id}" class="recruited-by-link">
diff --git a/src/lib/features/database/characters/sections/CharacterTaxonomySection.svelte b/src/lib/features/database/characters/sections/CharacterTaxonomySection.svelte
index e65b4ad4..de46bbb4 100644
--- a/src/lib/features/database/characters/sections/CharacterTaxonomySection.svelte
+++ b/src/lib/features/database/characters/sections/CharacterTaxonomySection.svelte
@@ -8,22 +8,11 @@
 	import MultiSelect from '$lib/components/ui/MultiSelect.svelte'
 	import ElementLabel from '$lib/components/labels/ElementLabel.svelte'
 	import ProficiencyLabel from '$lib/components/labels/ProficiencyLabel.svelte'
-	import { getElementLabel, getElementOptions } from '$lib/utils/element'
+	import { getElementOptions } from '$lib/utils/element'
 	import { getRaceLabel, getRaceOptions } from '$lib/utils/race'
 	import { getGenderLabel, getGenderOptions } from '$lib/utils/gender'
 	import { getProficiencyOptions } from '$lib/utils/proficiency'
-	import {
-		CharacterSeason,
-		CharacterSeries,
-		CHARACTER_SEASON_NAMES,
-		CHARACTER_SERIES_NAMES,
-		PROMOTION_NAMES,
-		getSeasonName,
-		getSeriesNames,
-		getPromotionNames
-	} from '$lib/types/enums'
-
-	type ElementName = 'wind' | 'fire' | 'water' | 'earth' | 'dark' | 'light'
+	import { CHARACTER_SERIES_NAMES, getSeriesNames } from '$lib/types/enums'
 
 	interface Props {
 		character: any
@@ -51,45 +40,17 @@
 	const genderOptions = getGenderOptions()
 	const proficiencyOptions = getProficiencyOptions()
 
-	// Season options (nullable, so include a "None" option)
-	const seasonOptions = [
-		{ value: 0, label: 'None' },
-		...Object.entries(CHARACTER_SEASON_NAMES).map(([value, label]) => ({
-			value: Number(value),
-			label
-		}))
-	]
-
 	// Series options for multiselect
 	const seriesOptions = Object.entries(CHARACTER_SERIES_NAMES).map(([value, label]) => ({
 		value: Number(value),
 		label
 	}))
 
-	// Promotion options for multiselect
-	const promotionOptions = Object.entries(PROMOTION_NAMES).map(([value, label]) => ({
-		value: Number(value),
-		label
-	}))
-
-	// Get element name for checkbox theming
-	const elementName = $derived.by((): ElementName | undefined => {
-		const el = editMode ? editData?.element : character?.element
-		const label = getElementLabel(el)
-		return label !== '—' && label !== 'Null' ? (label.toLowerCase() as ElementName) : undefined
-	})
-
 	// Format series for display
 	function formatSeriesDisplay(series: number[]): string {
 		if (!series || series.length === 0) return '—'
 		return getSeriesNames(series).join(', ')
 	}
-
-	// Format promotions for display
-	function formatPromotionsDisplay(promotions: number[]): string {
-		if (!promotions || promotions.length === 0) return '—'
-		return getPromotionNames(promotions).join(', ')
-	}
 </script>
 
 <DetailsContainer title="Details">
@@ -160,39 +121,15 @@
 			onAcceptSuggestion={() => onAcceptSuggestion?.('proficiency2', suggestions?.proficiency2)}
 			onDismissSuggestion={() => onDismissSuggestion?.('proficiency2')}
 		/>
-		<DetailItem
-			label="Season"
-			bind:value={editData.season}
-			editable={true}
-			type="select"
-			options={seasonOptions}
-		/>
 		<DetailItem
 			label="Series"
-			bind:value={editData.series}
-			editable={true}
-			type="multiselect"
-			options={seriesOptions}
-			element={elementName}
-		/>
-		<DetailItem
-			label="Gacha Available"
-			sublabel="Can be pulled from gacha"
-			bind:value={editData.gacha_available}
-			editable={true}
-			type="checkbox"
-			element={elementName}
-		/>
-		<DetailItem
-			label="Promotions"
-			sublabel="Gacha pools where this character appears"
 			editable={true}
 		>
 			<MultiSelect
 				size="medium"
-				options={promotionOptions}
-				bind:value={editData.promotions}
-				placeholder="Select promotions"
+				options={seriesOptions}
+				bind:value={editData.series}
+				placeholder="Select series"
 				contained
 			/>
 		</DetailItem>
@@ -209,13 +146,6 @@
 		<DetailItem label="Proficiency 2">
 			<ProficiencyLabel proficiency={character.proficiency?.[1] ?? 0} size="medium" />
 		</DetailItem>
-		<DetailItem label="Season" value={getSeasonName(character.season) || '—'} />
 		<DetailItem label="Series" value={formatSeriesDisplay(character.series)} />
-		<DetailItem label="Gacha Available" value={character.gachaAvailable ? 'Yes' : 'No'} />
-		<DetailItem
-			label="Promotions"
-			sublabel="Gacha pools where this character appears"
-			value={formatPromotionsDisplay(character.promotions)}
-		/>
 	{/if}
 </DetailsContainer>