NeilClack
22b6adee3f
- Add per-route form components: UserRoleForm, UserForm, ProclamationForm (with category cascade), CategoryForm, FreqForm, LevelForm - Update all admin +page.svelte files to use AdminTable + AdminModal + their specific form component instead of AdminPage - Update profiles page to inline fields instead of using AdminForm - Add custom Proclamation server action with category fallback logic (categoryId falls back to parentCategoryId when no sub-category) - Remove cascade/were/fieldLabels logic from generic crud.ts - Remove outdated cascade/where tests from crud.spec.ts - Remove fieldLabels from AdminModelConfig type
488 lines
15 KiB
Svelte
488 lines
15 KiB
Svelte
<script lang="ts">
|
|
import type { PageProps } from './$types';
|
|
import type { ActionResult } from '$lib/svelte-admin/types';
|
|
import AdminTable from '$lib/components/admin/AdminTable.svelte';
|
|
import AdminModal from '$lib/components/admin/AdminModal.svelte';
|
|
import Toast from '$lib/components/admin/Toast.svelte';
|
|
import { enhance } from '$app/forms';
|
|
import { getModelConfig } from '$lib/svelte-admin/registry';
|
|
|
|
let { data, form }: PageProps = $props();
|
|
|
|
const config = getModelConfig('profiles')!;
|
|
let canDelete = $derived((data.adminUser?.roleId ?? 4) <= 2);
|
|
|
|
let modalOpen = $state(false);
|
|
let editingRecord = $state<Record<string, unknown> | null>(null);
|
|
let toastMessage = $state('');
|
|
let toastType = $state<'success' | 'error'>('success');
|
|
let fieldErrors = $state<Record<string, string>>({});
|
|
let formError = $state('');
|
|
let addressFormOpen = $state(false);
|
|
let userFormOpen = $state(false);
|
|
let addressError = $state('');
|
|
let userError = $state('');
|
|
|
|
let addressFields = $state<Record<string, string>>({
|
|
street: '',
|
|
city: '',
|
|
state: '',
|
|
postalCode: '',
|
|
country: '',
|
|
isDefaultMailing: 'false',
|
|
isDefaultBilling: 'false',
|
|
isDefaultShipping: 'false'
|
|
});
|
|
|
|
let userEmail = $state('');
|
|
let userName = $state('');
|
|
|
|
$effect(() => {
|
|
if (form) {
|
|
if ((form as any).addressError) {
|
|
addressError = (form as any).addressError;
|
|
} else if ((form as any).userError) {
|
|
userError = (form as any).userError;
|
|
} else if (form.success) {
|
|
toastType = 'success';
|
|
if ((form as any).address) {
|
|
toastMessage = 'Address saved';
|
|
const addr = (form as any).address as Record<string, unknown>;
|
|
if (editingRecord) {
|
|
const addrs = (editingRecord.addresses as Record<string, unknown>[]) ?? [];
|
|
editingRecord = {
|
|
...editingRecord,
|
|
addresses: [...addrs, addr]
|
|
};
|
|
}
|
|
addressFormOpen = false;
|
|
addressError = '';
|
|
} else {
|
|
toastMessage = 'Saved successfully';
|
|
closeModal();
|
|
}
|
|
} else if (!(form as any).addressError && !(form as any).userError) {
|
|
formError = (form as ActionResult).error ?? '';
|
|
fieldErrors = (form as ActionResult).fieldErrors ?? {};
|
|
}
|
|
}
|
|
});
|
|
|
|
function openCreate() {
|
|
editingRecord = null;
|
|
formError = '';
|
|
fieldErrors = {};
|
|
addressFormOpen = false;
|
|
userFormOpen = false;
|
|
modalOpen = true;
|
|
}
|
|
|
|
function openEdit(record: Record<string, unknown>) {
|
|
editingRecord = record;
|
|
formError = '';
|
|
fieldErrors = {};
|
|
addressFormOpen = false;
|
|
userFormOpen = false;
|
|
addressError = '';
|
|
userError = '';
|
|
userEmail = ((record.user as Record<string, unknown>)?.email as string) ?? '';
|
|
userName = ((record.user as Record<string, unknown>)?.name as string) ?? '';
|
|
modalOpen = true;
|
|
}
|
|
|
|
function closeModal() {
|
|
modalOpen = false;
|
|
editingRecord = null;
|
|
formError = '';
|
|
fieldErrors = {};
|
|
addressFormOpen = false;
|
|
userFormOpen = false;
|
|
addressError = '';
|
|
userError = '';
|
|
}
|
|
|
|
function toggleAddressForm() {
|
|
addressFormOpen = !addressFormOpen;
|
|
addressError = '';
|
|
}
|
|
|
|
function toggleUserForm() {
|
|
userFormOpen = !userFormOpen;
|
|
userError = '';
|
|
}
|
|
</script>
|
|
|
|
<div class="p-6">
|
|
<h1 class="mb-4 text-xl font-bold text-gray-900 dark:text-gray-100">{config.displayName}</h1>
|
|
<AdminTable
|
|
records={data.records}
|
|
listFields={config.listFields}
|
|
searchFields={config.searchFields}
|
|
fieldTypes={config.fieldTypes}
|
|
singular={config.displayNameSingular}
|
|
onRowClick={openEdit}
|
|
onNew={openCreate}
|
|
/>
|
|
</div>
|
|
|
|
<AdminModal
|
|
title={editingRecord
|
|
? `Edit ${config.displayNameSingular}`
|
|
: `Create ${config.displayNameSingular}`}
|
|
open={modalOpen}
|
|
onClose={closeModal}
|
|
{canDelete}
|
|
recordId={editingRecord?.id as string | undefined}
|
|
>
|
|
<form method="POST" action="?/upsert" use:enhance>
|
|
{#if editingRecord?.id}
|
|
<input type="hidden" name="id" value={String(editingRecord.id)} />
|
|
{/if}
|
|
{#if formError}
|
|
<div class="mb-4 border border-red-300 bg-red-50 px-4 py-2 text-sm text-red-700">
|
|
{formError}
|
|
</div>
|
|
{/if}
|
|
<div class="flex flex-col gap-4">
|
|
<div>
|
|
<label
|
|
for="field-userId"
|
|
class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300"
|
|
>
|
|
User
|
|
</label>
|
|
<select
|
|
id="field-userId"
|
|
name="userId"
|
|
value={String(editingRecord?.userId ?? '')}
|
|
class="w-full border px-3 py-1.5 text-sm {fieldErrors.userId
|
|
? 'border-red-400'
|
|
: 'border-gray-300 dark:border-gray-600'} dark:bg-gray-800 dark:text-gray-100"
|
|
>
|
|
<option value="">-- Select User --</option>
|
|
{#each data.relationOptionsData.userId ?? [] as opt (String(opt.value))}
|
|
<option value={opt.value}>{opt.label}</option>
|
|
{/each}
|
|
</select>
|
|
{#if fieldErrors.userId}
|
|
<p class="mt-1 text-xs text-red-600">{fieldErrors.userId}</p>
|
|
{/if}
|
|
</div>
|
|
<div>
|
|
<label
|
|
for="field-firstName"
|
|
class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300"
|
|
>
|
|
First Name
|
|
</label>
|
|
<input
|
|
type="text"
|
|
id="field-firstName"
|
|
name="firstName"
|
|
value={String(editingRecord?.firstName ?? '')}
|
|
class="w-full border px-3 py-1.5 text-sm {fieldErrors.firstName
|
|
? 'border-red-400'
|
|
: 'border-gray-300 dark:border-gray-600'} dark:bg-gray-800 dark:text-gray-100"
|
|
/>
|
|
{#if fieldErrors.firstName}
|
|
<p class="mt-1 text-xs text-red-600">{fieldErrors.firstName}</p>
|
|
{/if}
|
|
</div>
|
|
<div>
|
|
<label
|
|
for="field-lastName"
|
|
class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300"
|
|
>
|
|
Last Name
|
|
</label>
|
|
<input
|
|
type="text"
|
|
id="field-lastName"
|
|
name="lastName"
|
|
value={String(editingRecord?.lastName ?? '')}
|
|
class="w-full border px-3 py-1.5 text-sm {fieldErrors.lastName
|
|
? 'border-red-400'
|
|
: 'border-gray-300 dark:border-gray-600'} dark:bg-gray-800 dark:text-gray-100"
|
|
/>
|
|
{#if fieldErrors.lastName}
|
|
<p class="mt-1 text-xs text-red-600">{fieldErrors.lastName}</p>
|
|
{/if}
|
|
</div>
|
|
<div>
|
|
<label
|
|
for="field-phoneNumber"
|
|
class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300"
|
|
>
|
|
Phone Number
|
|
</label>
|
|
<input
|
|
type="text"
|
|
id="field-phoneNumber"
|
|
name="phoneNumber"
|
|
value={String(editingRecord?.phoneNumber ?? '')}
|
|
class="w-full border px-3 py-1.5 text-sm {fieldErrors.phoneNumber
|
|
? 'border-red-400'
|
|
: 'border-gray-300 dark:border-gray-600'} dark:bg-gray-800 dark:text-gray-100"
|
|
/>
|
|
{#if fieldErrors.phoneNumber}
|
|
<p class="mt-1 text-xs text-red-600">{fieldErrors.phoneNumber}</p>
|
|
{/if}
|
|
</div>
|
|
<div class="flex justify-end gap-2 pt-2">
|
|
<button
|
|
type="submit"
|
|
class="border border-gray-300 bg-gray-100 px-4 py-1.5 text-sm font-medium hover:bg-gray-200 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-300 dark:hover:bg-gray-700"
|
|
>
|
|
{editingRecord ? 'Update' : 'Create'}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
|
|
{#if editingRecord}
|
|
{@const user = editingRecord.user as Record<string, unknown> | undefined}
|
|
<div class="mt-6 border-t border-gray-200 pt-4 dark:border-gray-700">
|
|
<div class="mb-2 flex items-center justify-between">
|
|
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300">User</h3>
|
|
<button
|
|
type="button"
|
|
onclick={toggleUserForm}
|
|
class="text-xs font-medium text-blue-600 hover:text-blue-800 dark:text-blue-400"
|
|
>
|
|
{userFormOpen ? 'Cancel' : 'Edit User'}
|
|
</button>
|
|
</div>
|
|
<p class="mb-1 text-sm text-gray-600 dark:text-gray-400">
|
|
{(user?.name as string) ?? ''} ({(user?.email as string) ?? ''})
|
|
</p>
|
|
|
|
{#if userFormOpen}
|
|
<form
|
|
method="POST"
|
|
action="?/updateUser"
|
|
use:enhance
|
|
class="mt-3 rounded border border-gray-200 p-3 dark:border-gray-700"
|
|
>
|
|
<input type="hidden" name="id" value={String(user?.id ?? '')} />
|
|
{#if userError}
|
|
<div class="mb-2 border border-red-300 bg-red-50 px-3 py-1.5 text-sm text-red-700">
|
|
{userError}
|
|
</div>
|
|
{/if}
|
|
<div class="flex flex-col gap-2">
|
|
<div>
|
|
<label
|
|
for="user-name"
|
|
class="mb-0.5 block text-xs font-medium text-gray-600 dark:text-gray-400"
|
|
>
|
|
Name
|
|
</label>
|
|
<input
|
|
type="text"
|
|
id="user-name"
|
|
name="name"
|
|
value={userName}
|
|
class="w-full border border-gray-300 px-2 py-1 text-sm dark:border-gray-600 dark:bg-gray-800 dark:text-gray-100"
|
|
/>
|
|
</div>
|
|
<div>
|
|
<label
|
|
for="user-email"
|
|
class="mb-0.5 block text-xs font-medium text-gray-600 dark:text-gray-400"
|
|
>
|
|
Email
|
|
</label>
|
|
<input
|
|
type="email"
|
|
id="user-email"
|
|
name="email"
|
|
value={userEmail}
|
|
class="w-full border border-gray-300 px-2 py-1 text-sm dark:border-gray-600 dark:bg-gray-800 dark:text-gray-100"
|
|
/>
|
|
</div>
|
|
<div class="flex justify-end">
|
|
<button
|
|
type="submit"
|
|
class="border border-gray-300 bg-gray-100 px-3 py-1 text-xs font-medium hover:bg-gray-200 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-300 dark:hover:bg-gray-700"
|
|
>
|
|
Save User
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
{/if}
|
|
</div>
|
|
{/if}
|
|
|
|
{#if editingRecord}
|
|
{@const addresses = (editingRecord.addresses as Record<string, unknown>[]) ?? []}
|
|
<div class="mt-6 border-t border-gray-200 pt-4 dark:border-gray-700">
|
|
<div class="mb-2 flex items-center justify-between">
|
|
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300">Addresses</h3>
|
|
<button
|
|
type="button"
|
|
onclick={toggleAddressForm}
|
|
class="text-xs font-medium text-blue-600 hover:text-blue-800 dark:text-blue-400"
|
|
>
|
|
{addressFormOpen ? 'Cancel' : 'Add Address +'}
|
|
</button>
|
|
</div>
|
|
|
|
{#if addressFormOpen}
|
|
<form
|
|
method="POST"
|
|
action="?/upsertAddress"
|
|
use:enhance
|
|
class="mb-3 rounded border border-gray-200 p-3 dark:border-gray-700"
|
|
>
|
|
<input type="hidden" name="profileId" value={String(editingRecord.id)} />
|
|
{#if addressError}
|
|
<div class="mb-2 border border-red-300 bg-red-50 px-3 py-1.5 text-sm text-red-700">
|
|
{addressError}
|
|
</div>
|
|
{/if}
|
|
<div class="grid grid-cols-2 gap-2">
|
|
<div>
|
|
<label
|
|
for="addr-street"
|
|
class="mb-0.5 block text-xs font-medium text-gray-600 dark:text-gray-400"
|
|
>
|
|
Street
|
|
</label>
|
|
<input
|
|
type="text"
|
|
id="addr-street"
|
|
name="street"
|
|
required
|
|
class="w-full border border-gray-300 px-2 py-1 text-sm dark:border-gray-600 dark:bg-gray-800 dark:text-gray-100"
|
|
/>
|
|
</div>
|
|
<div>
|
|
<label
|
|
for="addr-city"
|
|
class="mb-0.5 block text-xs font-medium text-gray-600 dark:text-gray-400"
|
|
>
|
|
City
|
|
</label>
|
|
<input
|
|
type="text"
|
|
id="addr-city"
|
|
name="city"
|
|
required
|
|
class="w-full border border-gray-300 px-2 py-1 text-sm dark:border-gray-600 dark:bg-gray-800 dark:text-gray-100"
|
|
/>
|
|
</div>
|
|
<div>
|
|
<label
|
|
for="addr-state"
|
|
class="mb-0.5 block text-xs font-medium text-gray-600 dark:text-gray-400"
|
|
>
|
|
State
|
|
</label>
|
|
<input
|
|
type="text"
|
|
id="addr-state"
|
|
name="state"
|
|
required
|
|
class="w-full border border-gray-300 px-2 py-1 text-sm dark:border-gray-600 dark:bg-gray-800 dark:text-gray-100"
|
|
/>
|
|
</div>
|
|
<div>
|
|
<label
|
|
for="addr-postal"
|
|
class="mb-0.5 block text-xs font-medium text-gray-600 dark:text-gray-400"
|
|
>
|
|
Postal Code
|
|
</label>
|
|
<input
|
|
type="text"
|
|
id="addr-postal"
|
|
name="postalCode"
|
|
required
|
|
class="w-full border border-gray-300 px-2 py-1 text-sm dark:border-gray-600 dark:bg-gray-800 dark:text-gray-100"
|
|
/>
|
|
</div>
|
|
<div>
|
|
<label
|
|
for="addr-country"
|
|
class="mb-0.5 block text-xs font-medium text-gray-600 dark:text-gray-400"
|
|
>
|
|
Country
|
|
</label>
|
|
<input
|
|
type="text"
|
|
id="addr-country"
|
|
name="country"
|
|
required
|
|
class="w-full border border-gray-300 px-2 py-1 text-sm dark:border-gray-600 dark:bg-gray-800 dark:text-gray-100"
|
|
/>
|
|
</div>
|
|
</div>
|
|
<div class="mt-2 flex flex-wrap gap-4">
|
|
<label class="flex items-center gap-1.5 text-xs text-gray-600 dark:text-gray-400">
|
|
<input type="checkbox" name="isDefaultMailing" class="h-3.5 w-3.5" />
|
|
Default Mailing
|
|
</label>
|
|
<label class="flex items-center gap-1.5 text-xs text-gray-600 dark:text-gray-400">
|
|
<input type="checkbox" name="isDefaultBilling" class="h-3.5 w-3.5" />
|
|
Default Billing
|
|
</label>
|
|
<label class="flex items-center gap-1.5 text-xs text-gray-600 dark:text-gray-400">
|
|
<input type="checkbox" name="isDefaultShipping" class="h-3.5 w-3.5" />
|
|
Default Shipping
|
|
</label>
|
|
</div>
|
|
<div class="mt-2 flex justify-end">
|
|
<button
|
|
type="submit"
|
|
class="border border-gray-300 bg-gray-100 px-3 py-1 text-xs font-medium hover:bg-gray-200 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-300 dark:hover:bg-gray-700"
|
|
>
|
|
Save Address
|
|
</button>
|
|
</div>
|
|
</form>
|
|
{/if}
|
|
|
|
{#if addresses.length > 0}
|
|
<table class="w-full text-sm">
|
|
<thead>
|
|
<tr class="border-b border-gray-200 dark:border-gray-700">
|
|
<th class="px-2 py-1 text-left text-xs font-medium text-gray-500 uppercase">Street</th
|
|
>
|
|
<th class="px-2 py-1 text-left text-xs font-medium text-gray-500 uppercase">City</th>
|
|
<th class="px-2 py-1 text-left text-xs font-medium text-gray-500 uppercase">State</th>
|
|
<th class="px-2 py-1 text-left text-xs font-medium text-gray-500 uppercase">Zip</th>
|
|
<th class="px-2 py-1 text-left text-xs font-medium text-gray-500 uppercase"
|
|
>Country</th
|
|
>
|
|
<th class="px-2 py-1 text-center text-xs font-medium text-gray-500 uppercase">M</th>
|
|
<th class="px-2 py-1 text-center text-xs font-medium text-gray-500 uppercase">B</th>
|
|
<th class="px-2 py-1 text-center text-xs font-medium text-gray-500 uppercase">S</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{#each addresses as addr}
|
|
<tr class="border-b border-gray-100 dark:border-gray-800">
|
|
<td class="px-2 py-1">{addr.street as string}</td>
|
|
<td class="px-2 py-1">{addr.city as string}</td>
|
|
<td class="px-2 py-1">{addr.state as string}</td>
|
|
<td class="px-2 py-1">{addr.postalCode as string}</td>
|
|
<td class="px-2 py-1">{addr.country as string}</td>
|
|
<td class="px-2 py-1 text-center text-xs">{addr.isDefaultMailing ? '✓' : ''}</td>
|
|
<td class="px-2 py-1 text-center text-xs">{addr.isDefaultBilling ? '✓' : ''}</td>
|
|
<td class="px-2 py-1 text-center text-xs">{addr.isDefaultShipping ? '✓' : ''}</td>
|
|
</tr>
|
|
{/each}
|
|
</tbody>
|
|
</table>
|
|
{:else}
|
|
<p class="text-sm text-gray-500">No addresses on file.</p>
|
|
{/if}
|
|
</div>
|
|
{/if}
|
|
</AdminModal>
|
|
|
|
{#if toastMessage}
|
|
<Toast message={toastMessage} type={toastType} />
|
|
{/if}
|