refactor(persons): extract inputCls/labelCls and PersonFormData type
Some checks failed
CI / Unit & Component Tests (push) Failing after 3m26s
CI / OCR Service Tests (push) Successful in 1m4s
CI / Backend Unit Tests (push) Failing after 3m18s
CI / Unit & Component Tests (pull_request) Failing after 3m26s
CI / OCR Service Tests (pull_request) Successful in 42s
CI / Backend Unit Tests (pull_request) Failing after 3m2s
Some checks failed
CI / Unit & Component Tests (push) Failing after 3m26s
CI / OCR Service Tests (push) Successful in 1m4s
CI / Backend Unit Tests (push) Failing after 3m18s
CI / Unit & Component Tests (pull_request) Failing after 3m26s
CI / OCR Service Tests (pull_request) Successful in 42s
CI / Backend Unit Tests (pull_request) Failing after 3m2s
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -3,6 +3,17 @@ import { m } from '$lib/paraglide/messages.js';
|
|||||||
export const PERSON_TYPES = ['PERSON', 'INSTITUTION', 'GROUP', 'UNKNOWN'] as const;
|
export const PERSON_TYPES = ['PERSON', 'INSTITUTION', 'GROUP', 'UNKNOWN'] as const;
|
||||||
export type PersonType = (typeof PERSON_TYPES)[number];
|
export type PersonType = (typeof PERSON_TYPES)[number];
|
||||||
|
|
||||||
|
export type PersonFormData = {
|
||||||
|
personType?: string | null;
|
||||||
|
title?: string | null;
|
||||||
|
firstName?: string | null;
|
||||||
|
lastName: string;
|
||||||
|
alias?: string | null;
|
||||||
|
birthYear?: number | null;
|
||||||
|
deathYear?: number | null;
|
||||||
|
notes?: string | null;
|
||||||
|
};
|
||||||
|
|
||||||
export function normalizePersonType(raw: string | undefined | null): PersonType {
|
export function normalizePersonType(raw: string | undefined | null): PersonType {
|
||||||
return raw === 'SKIP' ? 'UNKNOWN' : ((raw ?? 'PERSON') as PersonType);
|
return raw === 'SKIP' ? 'UNKNOWN' : ((raw ?? 'PERSON') as PersonType);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,22 +2,13 @@
|
|||||||
import { untrack } from 'svelte';
|
import { untrack } from 'svelte';
|
||||||
import { m } from '$lib/paraglide/messages.js';
|
import { m } from '$lib/paraglide/messages.js';
|
||||||
import PersonTypeSelector from '$lib/components/PersonTypeSelector.svelte';
|
import PersonTypeSelector from '$lib/components/PersonTypeSelector.svelte';
|
||||||
import { PERSON_TYPES as TYPES, type PersonType } from '$lib/person-validation';
|
import {
|
||||||
|
PERSON_TYPES as TYPES,
|
||||||
|
type PersonType,
|
||||||
|
type PersonFormData
|
||||||
|
} from '$lib/person-validation';
|
||||||
|
|
||||||
let {
|
let { person }: { person: PersonFormData } = $props();
|
||||||
person
|
|
||||||
}: {
|
|
||||||
person: {
|
|
||||||
personType?: string | null;
|
|
||||||
title?: string | null;
|
|
||||||
firstName?: string | null;
|
|
||||||
lastName: string;
|
|
||||||
alias?: string | null;
|
|
||||||
birthYear?: number | null;
|
|
||||||
deathYear?: number | null;
|
|
||||||
notes?: string | null;
|
|
||||||
};
|
|
||||||
} = $props();
|
|
||||||
|
|
||||||
let selectedType = $state<PersonType>(
|
let selectedType = $state<PersonType>(
|
||||||
untrack(() =>
|
untrack(() =>
|
||||||
@@ -31,11 +22,15 @@ const lastNameLabel = $derived(
|
|||||||
? m.form_label_name()
|
? m.form_label_name()
|
||||||
: m.form_label_last_name()
|
: m.form_label_last_name()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const labelCls = 'mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase';
|
||||||
|
const inputCls =
|
||||||
|
'block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring';
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||||
<div class="md:col-span-2">
|
<div class="md:col-span-2">
|
||||||
<p class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase">
|
<p class={labelCls}>
|
||||||
{m.form_label_person_type()}
|
{m.form_label_person_type()}
|
||||||
</p>
|
</p>
|
||||||
<PersonTypeSelector
|
<PersonTypeSelector
|
||||||
@@ -47,68 +42,48 @@ const lastNameLabel = $derived(
|
|||||||
|
|
||||||
{#if isPerson}
|
{#if isPerson}
|
||||||
<div>
|
<div>
|
||||||
<label for="title" class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
|
<label for="title" class={labelCls}>{m.form_label_title()}</label>
|
||||||
>{m.form_label_title()}</label
|
|
||||||
>
|
|
||||||
<input
|
<input
|
||||||
id="title"
|
id="title"
|
||||||
name="title"
|
name="title"
|
||||||
type="text"
|
type="text"
|
||||||
maxlength="50"
|
maxlength="50"
|
||||||
value={person.title ?? ''}
|
value={person.title ?? ''}
|
||||||
class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
|
class={inputCls}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label
|
<label for="firstName" class={labelCls}>{m.form_label_first_name()} *</label>
|
||||||
for="firstName"
|
|
||||||
class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
|
|
||||||
>{m.form_label_first_name()} *</label
|
|
||||||
>
|
|
||||||
<input
|
<input
|
||||||
id="firstName"
|
id="firstName"
|
||||||
name="firstName"
|
name="firstName"
|
||||||
type="text"
|
type="text"
|
||||||
required
|
required
|
||||||
value={person.firstName ?? ''}
|
value={person.firstName ?? ''}
|
||||||
class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
|
class={inputCls}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<div class={!isPerson ? 'md:col-span-2' : ''}>
|
<div class={!isPerson ? 'md:col-span-2' : ''}>
|
||||||
<label for="lastName" class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
|
<label for="lastName" class={labelCls}>{lastNameLabel} *</label>
|
||||||
>{lastNameLabel} *</label
|
|
||||||
>
|
|
||||||
<input
|
<input
|
||||||
id="lastName"
|
id="lastName"
|
||||||
name="lastName"
|
name="lastName"
|
||||||
type="text"
|
type="text"
|
||||||
required
|
required
|
||||||
value={person.lastName}
|
value={person.lastName}
|
||||||
class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
|
class={inputCls}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{#if isPerson}
|
{#if isPerson}
|
||||||
<div class="md:col-span-2">
|
<div class="md:col-span-2">
|
||||||
<label for="alias" class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
|
<label for="alias" class={labelCls}>{m.form_label_alias()}</label>
|
||||||
>{m.form_label_alias()}</label
|
<input id="alias" name="alias" type="text" value={person.alias ?? ''} class={inputCls} />
|
||||||
>
|
|
||||||
<input
|
|
||||||
id="alias"
|
|
||||||
name="alias"
|
|
||||||
type="text"
|
|
||||||
value={person.alias ?? ''}
|
|
||||||
class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label
|
<label for="birthYear" class={labelCls}>{m.person_label_birth_year()}</label>
|
||||||
for="birthYear"
|
|
||||||
class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
|
|
||||||
>{m.person_label_birth_year()}</label
|
|
||||||
>
|
|
||||||
<input
|
<input
|
||||||
id="birthYear"
|
id="birthYear"
|
||||||
name="birthYear"
|
name="birthYear"
|
||||||
@@ -117,15 +92,11 @@ const lastNameLabel = $derived(
|
|||||||
max="2100"
|
max="2100"
|
||||||
placeholder={m.person_placeholder_year()}
|
placeholder={m.person_placeholder_year()}
|
||||||
value={person.birthYear ?? ''}
|
value={person.birthYear ?? ''}
|
||||||
class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
|
class={inputCls}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label
|
<label for="deathYear" class={labelCls}>{m.person_label_death_year()}</label>
|
||||||
for="deathYear"
|
|
||||||
class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
|
|
||||||
>{m.person_label_death_year()}</label
|
|
||||||
>
|
|
||||||
<input
|
<input
|
||||||
id="deathYear"
|
id="deathYear"
|
||||||
name="deathYear"
|
name="deathYear"
|
||||||
@@ -134,15 +105,13 @@ const lastNameLabel = $derived(
|
|||||||
max="2100"
|
max="2100"
|
||||||
placeholder={m.person_placeholder_year()}
|
placeholder={m.person_placeholder_year()}
|
||||||
value={person.deathYear ?? ''}
|
value={person.deathYear ?? ''}
|
||||||
class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
|
class={inputCls}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<div class="md:col-span-2">
|
<div class="md:col-span-2">
|
||||||
<label for="notes" class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
|
<label for="notes" class={labelCls}>{m.person_label_notes()}</label>
|
||||||
>{m.person_label_notes()}</label
|
|
||||||
>
|
|
||||||
<textarea
|
<textarea
|
||||||
id="notes"
|
id="notes"
|
||||||
name="notes"
|
name="notes"
|
||||||
|
|||||||
Reference in New Issue
Block a user