@stacksjs/defaults 0.75.231 → 0.75.236

package/resources/components/Dashboard/Commerce/Delivery/CouriersDashboard.stx

@@ -1,5 +1,6 @@
 <script client>
 import { dashboardApi } from '../../../../../functions/dashboard-api'
+import { useRecordsDashboard } from '../../../../../functions/dashboard-list'
 import { pushToast } from '../../../../../functions/toasts'
 
 type CourierStatus = 'active' | 'on_delivery' | 'on_break'
@@ -34,21 +35,48 @@ interface CourierPayload {
   userId: number | null
 }
 
-const records = state<CourierRecord[]>([])
+function matchesQuery(records: CourierRecord[], query: string): CourierRecord[] {
+  return records.filter(record => [
+    record.name,
+    record.phone,
+    record.vehicle_number,
+    record.license,
+    record.status,
+    record.user?.name,
+    record.user?.email,
+  ].some(value => String(value || '').toLowerCase().includes(query)))
+}
+
+const {
+  records,
+  loading,
+  loadError,
+  search,
+  page,
+  perPage,
+  editorOpen,
+  editorMode,
+  editing,
+  saving,
+  editorError,
+  deleting,
+  deleteBusy,
+  deleteError,
+  filteredRecords,
+  paginatedRecords,
+  goToPage,
+  handleSearch,
+  openCreate,
+  openEdit,
+  closeEditor,
+  requestDelete,
+  closeDelete,
+  upsert,
+  remove,
+  clampPage,
+} = useRecordsDashboard<CourierRecord>({ filter: matchesQuery })
+
 const users = state<UserOption[]>([])
-const loading = state(true)
-const loadError = state('')
-const search = state('')
-const page = state(1)
-const perPage = state(10)
-const editorOpen = state(false)
-const editorMode = state<'create' | 'edit'>('create')
-const editing = state<CourierRecord | null>(null)
-const saving = state(false)
-const editorError = state('')
-const deleting = state<CourierRecord | null>(null)
-const deleteBusy = state(false)
-const deleteError = state('')
 
 function userFor(id?: number | null): UserOption | undefined {
   return id ? users().find(user => user.id === id) : undefined
@@ -61,26 +89,6 @@ function withUser(record: CourierRecord): CourierRecord {
   }
 }
 
-function filteredRecords(): CourierRecord[] {
-  const query = search().trim().toLowerCase()
-  if (!query)
-    return records()
-  return records().filter(record => [
-    record.name,
-    record.phone,
-    record.vehicle_number,
-    record.license,
-    record.status,
-    record.user?.name,
-    record.user?.email,
-  ].some(value => String(value || '').toLowerCase().includes(query)))
-}
-
-function paginatedRecords(): CourierRecord[] {
-  const start = (page() - 1) * perPage()
-  return filteredRecords().slice(start, start + perPage())
-}
-
 function statusCount(status: CourierStatus): number {
   return records().filter(record => record.status === status).length
 }
@@ -106,9 +114,7 @@ async function loadCouriers(): Promise<void> {
       throw new TypeError('Courier resources were not returned in the expected shape.')
     users.set(userData.users)
     records.set(courierData.map(withUser))
-    const lastPage = Math.max(1, Math.ceil(filteredRecords().length / perPage()))
-    if (page() > lastPage)
-      page.set(lastPage)
+    clampPage()
   }
   catch (error) {
     loadError.set(error instanceof Error ? error.message : String(error))
@@ -119,33 +125,6 @@ async function loadCouriers(): Promise<void> {
   }
 }
 
-function handleSearch(value: string): void {
-  search.set(value)
-  page.set(1)
-}
-
-function openCreate(): void {
-  editing.set(null)
-  editorMode.set('create')
-  editorError.set('')
-  editorOpen.set(true)
-}
-
-function openEdit(record: CourierRecord): void {
-  editing.set(record)
-  editorMode.set('edit')
-  editorError.set('')
-  editorOpen.set(true)
-}
-
-function closeEditor(): void {
-  if (saving())
-    return
-  editorOpen.set(false)
-  editing.set(null)
-  editorError.set('')
-}
-
 function setEditorError(message: string): void {
   editorError.set(message)
 }
@@ -165,14 +144,7 @@ async function saveCourier(payload: CourierPayload): Promise<void> {
       },
     )
     const hydrated = withUser(updated)
-    if (current) {
-      records.set(records().map(record => record.id === current.id ? hydrated : record))
-    }
-    else {
-      const nextRecords = [...records(), hydrated]
-      records.set(nextRecords)
-      page.set(Math.max(1, Math.ceil(nextRecords.length / perPage())))
-    }
+    upsert(hydrated, current)
     editorOpen.set(false)
     editing.set(null)
     pushToast('success', current ? 'Courier updated' : 'Courier added', { detail: hydrated.name })
@@ -185,18 +157,6 @@ async function saveCourier(payload: CourierPayload): Promise<void> {
   }
 }
 
-function requestDelete(record: CourierRecord): void {
-  deleting.set(record)
-  deleteError.set('')
-}
-
-function closeDelete(): void {
-  if (deleteBusy())
-    return
-  deleting.set(null)
-  deleteError.set('')
-}
-
 async function confirmDelete(): Promise<void> {
   const current = deleting()
   if (!current)
@@ -207,11 +167,8 @@ async function confirmDelete(): Promise<void> {
     await dashboardApi(`/api/dashboard/commerce/couriers/${current.id}`, {
       method: 'DELETE',
     })
-    records.set(records().filter(record => record.id !== current.id))
+    remove(current)
     deleting.set(null)
-    const lastPage = Math.max(1, Math.ceil(filteredRecords().length / perPage()))
-    if (page() > lastPage)
-      page.set(lastPage)
     pushToast('success', 'Courier deleted', { detail: current.name })
   }
   catch (error) {
@@ -222,10 +179,6 @@ async function confirmDelete(): Promise<void> {
   }
 }
 
-function goToPage(value: number): void {
-  page.set(value)
-}
-
 onMount(() => {
   void loadCouriers()
 })
@@ -234,22 +187,16 @@ onMount(() => {
 <div class="space-y-6">
   <TabNavigation model-value="couriers" />
 
-  <header class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
-    <div>
-      <h1 class="font-bold text-2xl text-gray-900 dark:text-white">Delivery couriers</h1>
-      <p class="mt-1 text-gray-500 text-sm dark:text-neutral-400">Manage courier availability, vehicles, licenses, and optional user accounts.</p>
-    </div>
-    <div class="flex gap-2">
-      <Button :loading="loading()" variant="secondary" @click="loadCouriers()"><span :if="!loading()" aria-hidden="true" class="h-4 w-4 i-hugeicons-refresh"></span>Refresh</Button>
-      <Button :disabled="loading()" @click="openCreate()"><span aria-hidden="true" class="h-4 w-4 i-hugeicons-add-01"></span>Add courier</Button>
-    </div>
-  </header>
+  <PageHeader title="Delivery couriers" description="Manage courier availability, vehicles, licenses, and optional user accounts.">
+  <div class="flex gap-2">
+    <Button :loading="loading()" variant="secondary" @click="loadCouriers()"><span :if="!loading()" aria-hidden="true" class="h-4 w-4 i-hugeicons-refresh"></span>Refresh</Button>
+    <Button :disabled="loading()" @click="openCreate()"><span aria-hidden="true" class="h-4 w-4 i-hugeicons-add-01"></span>Add courier</Button>
+  </div>
+  </PageHeader>
 
   <div :if="loadError()" class="flex gap-4 items-center justify-between p-4 text-red-700 text-sm dark:text-red-300 bg-red-50 dark:bg-red-950/30 border border-red-200 rounded-lg dark:border-red-900"><span>{{ loadError() }}</span><Button variant="secondary" size="sm" @click="loadCouriers()">Retry</Button></div>
 
-  <section aria-label="Courier metrics" class="grid gap-3 grid-cols-1 sm:grid-cols-2 xl:grid-cols-4">
-    <template :for="item in metricCards()" :key="item.label"><article class="p-4 bg-white dark:bg-neutral-800 border border-gray-200 rounded-lg dark:border-neutral-700"><p class="text-gray-500 text-xs dark:text-neutral-400">{{ item.label }}</p><p class="mt-2 font-semibold text-2xl text-gray-900 dark:text-white">{{ item.value }}</p><p class="mt-1 text-gray-400 text-xs dark:text-neutral-500">{{ item.detail }}</p></article></template>
-  </section>
+  <MetricCards label="Courier metrics" columns="grid-cols-1 sm:grid-cols-2 xl:grid-cols-4" :items="metricCards()" />
 
   <section class="overflow-hidden bg-white dark:bg-neutral-800 border border-gray-200 rounded-xl dark:border-neutral-700">
     <div class="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between px-4 py-4 border-b border-gray-200 dark:border-neutral-700">

package/resources/components/Dashboard/Commerce/Delivery/DeliveryOverviewDashboard.stx

@@ -142,22 +142,18 @@ onMount(() => {
 <div class="space-y-6">
   <TabNavigation model-value="overview" />
 
-  <header class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
-    <div>
-      <h1 class="font-bold text-2xl text-gray-900 dark:text-white">Delivery</h1>
-      <p class="mt-1 text-gray-500 text-sm dark:text-neutral-400">Monitor active routes, courier availability, shipping methods, and coverage.</p>
-    </div>
-    <div class="flex gap-2">
-      <Button :loading="loading()" variant="secondary" @click="loadOverview()">
-        <span :if="!loading()" aria-hidden="true" class="h-4 w-4 i-hugeicons-refresh"></span>
-        Refresh
-      </Button>
-      <Button href="/commerce/delivery/delivery-routes">
-        <span aria-hidden="true" class="h-4 w-4 i-hugeicons-route-02"></span>
-        Manage routes
-      </Button>
-    </div>
-  </header>
+  <PageHeader title="Delivery" description="Monitor active routes, courier availability, shipping methods, and coverage.">
+  <div class="flex gap-2">
+    <Button :loading="loading()" variant="secondary" @click="loadOverview()">
+      <span :if="!loading()" aria-hidden="true" class="h-4 w-4 i-hugeicons-refresh"></span>
+      Refresh
+    </Button>
+    <Button href="/commerce/delivery/delivery-routes">
+      <span aria-hidden="true" class="h-4 w-4 i-hugeicons-route-02"></span>
+      Manage routes
+    </Button>
+  </div>
+  </PageHeader>
 
   <div :if="loadError()" role="alert" class="flex gap-4 items-center justify-between p-4 text-red-700 text-sm dark:text-red-300 bg-red-50 dark:bg-red-950/30 border border-red-200 rounded-lg dark:border-red-900">
     <span>{{ loadError() }}</span>

package/resources/components/Dashboard/Commerce/Delivery/DeliveryRoutesDashboard.stx

@@ -1,5 +1,6 @@
 <script client>
 import { dashboardApi } from '../../../../../functions/dashboard-api'
+import { useRecordsDashboard } from '../../../../../functions/dashboard-list'
 import { pushToast } from '../../../../../functions/toasts'
 
 interface CourierRecord {
@@ -31,21 +32,48 @@ interface DeliveryRoutePayload {
   lastActive: number
 }
 
-const records = state<DeliveryRouteRecord[]>([])
+function matchesQuery(records: DeliveryRouteRecord[], query: string): DeliveryRouteRecord[] {
+  return records.filter(record => [
+    record.id,
+    record.courier,
+    record.courier_record?.name,
+    record.vehicle,
+    record.stops,
+    record.delivery_time,
+    record.total_distance,
+  ].some(value => String(value || '').toLowerCase().includes(query)))
+}
+
+const {
+  records,
+  loading,
+  loadError,
+  search,
+  page,
+  perPage,
+  editorOpen,
+  editorMode,
+  editing,
+  saving,
+  editorError,
+  deleting,
+  deleteBusy,
+  deleteError,
+  filteredRecords,
+  paginatedRecords,
+  goToPage,
+  handleSearch,
+  openCreate,
+  openEdit,
+  closeEditor,
+  requestDelete,
+  closeDelete,
+  upsert,
+  remove,
+  clampPage,
+} = useRecordsDashboard<DeliveryRouteRecord>({ filter: matchesQuery })
+
 const couriers = state<CourierRecord[]>([])
-const loading = state(true)
-const loadError = state('')
-const search = state('')
-const page = state(1)
-const perPage = state(10)
-const editorOpen = state(false)
-const editorMode = state<'create' | 'edit'>('create')
-const editing = state<DeliveryRouteRecord | null>(null)
-const saving = state(false)
-const editorError = state('')
-const deleting = state<DeliveryRouteRecord | null>(null)
-const deleteBusy = state(false)
-const deleteError = state('')
 
 function courierFor(id?: number | null): CourierRecord | undefined {
   return id ? couriers().find(courier => courier.id === id) : undefined
@@ -64,26 +92,6 @@ function routeTime(value: string | number): number {
   return new Date(String(value).replace(' ', 'T')).getTime()
 }
 
-function filteredRecords(): DeliveryRouteRecord[] {
-  const query = search().trim().toLowerCase()
-  if (!query)
-    return records()
-  return records().filter(record => [
-    record.id,
-    record.courier,
-    record.courier_record?.name,
-    record.vehicle,
-    record.stops,
-    record.delivery_time,
-    record.total_distance,
-  ].some(value => String(value || '').toLowerCase().includes(query)))
-}
-
-function paginatedRecords(): DeliveryRouteRecord[] {
-  const start = (page() - 1) * perPage()
-  return filteredRecords().slice(start, start + perPage())
-}
-
 function metricCards(): Array<{ label: string, value: string, detail: string }> {
   const totalStops = records().reduce((sum, record) => sum + record.stops, 0)
   const totalDistance = records().reduce((sum, record) => sum + record.total_distance, 0)
@@ -109,9 +117,7 @@ async function loadRoutes(): Promise<void> {
       throw new TypeError('Delivery route resources were not returned in the expected shape.')
     couriers.set(courierData)
     records.set(routeData.map(withCourier))
-    const lastPage = Math.max(1, Math.ceil(filteredRecords().length / perPage()))
-    if (page() > lastPage)
-      page.set(lastPage)
+    clampPage()
   }
   catch (error) {
     loadError.set(error instanceof Error ? error.message : String(error))
@@ -122,33 +128,6 @@ async function loadRoutes(): Promise<void> {
   }
 }
 
-function handleSearch(value: string): void {
-  search.set(value)
-  page.set(1)
-}
-
-function openCreate(): void {
-  editing.set(null)
-  editorMode.set('create')
-  editorError.set('')
-  editorOpen.set(true)
-}
-
-function openEdit(record: DeliveryRouteRecord): void {
-  editing.set(record)
-  editorMode.set('edit')
-  editorError.set('')
-  editorOpen.set(true)
-}
-
-function closeEditor(): void {
-  if (saving())
-    return
-  editorOpen.set(false)
-  editing.set(null)
-  editorError.set('')
-}
-
 function setEditorError(message: string): void {
   editorError.set(message)
 }
@@ -168,14 +147,7 @@ async function saveRoute(payload: DeliveryRoutePayload): Promise<void> {
       },
     )
     const hydrated = withCourier(updated)
-    if (current) {
-      records.set(records().map(record => record.id === current.id ? hydrated : record))
-    }
-    else {
-      const nextRecords = [...records(), hydrated]
-      records.set(nextRecords)
-      page.set(Math.max(1, Math.ceil(nextRecords.length / perPage())))
-    }
+    upsert(hydrated, current)
     editorOpen.set(false)
     editing.set(null)
     pushToast('success', current ? 'Delivery route updated' : 'Delivery route added', { detail: `Route #${hydrated.id}` })
@@ -188,18 +160,6 @@ async function saveRoute(payload: DeliveryRoutePayload): Promise<void> {
   }
 }
 
-function requestDelete(record: DeliveryRouteRecord): void {
-  deleting.set(record)
-  deleteError.set('')
-}
-
-function closeDelete(): void {
-  if (deleteBusy())
-    return
-  deleting.set(null)
-  deleteError.set('')
-}
-
 async function confirmDelete(): Promise<void> {
   const current = deleting()
   if (!current)
@@ -210,11 +170,9 @@ async function confirmDelete(): Promise<void> {
     await dashboardApi(`/api/dashboard/commerce/delivery-routes/${current.id}`, {
       method: 'DELETE',
     })
-    records.set(records().filter(record => record.id !== current.id))
+    remove(current)
     deleting.set(null)
-    const lastPage = Math.max(1, Math.ceil(filteredRecords().length / perPage()))
-    if (page() > lastPage)
-      page.set(lastPage)
+    clampPage()
     pushToast('success', 'Delivery route deleted', { detail: `Route #${current.id}` })
   }
   catch (error) {
@@ -225,10 +183,6 @@ async function confirmDelete(): Promise<void> {
   }
 }
 
-function goToPage(value: number): void {
-  page.set(value)
-}
-
 onMount(() => {
   void loadRoutes()
 })
@@ -237,23 +191,17 @@ onMount(() => {
 <div class="space-y-6">
   <TabNavigation model-value="routes" />
 
-  <header class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
-    <div>
-      <h1 class="font-bold text-2xl text-gray-900 dark:text-white">Delivery routes</h1>
-      <p class="mt-1 text-gray-500 text-sm dark:text-neutral-400">Assign persisted couriers and track route workload, distance, and activity.</p>
-    </div>
-    <div class="flex gap-2">
-      <Button :loading="loading()" variant="secondary" @click="loadRoutes()"><span :if="!loading()" aria-hidden="true" class="h-4 w-4 i-hugeicons-refresh"></span>Refresh</Button>
-      <Button :disabled="loading() || couriers().length === 0" @click="openCreate()"><span aria-hidden="true" class="h-4 w-4 i-hugeicons-add-01"></span>Add route</Button>
-    </div>
-  </header>
+  <PageHeader title="Delivery routes" description="Assign persisted couriers and track route workload, distance, and activity.">
+  <div class="flex gap-2">
+    <Button :loading="loading()" variant="secondary" @click="loadRoutes()"><span :if="!loading()" aria-hidden="true" class="h-4 w-4 i-hugeicons-refresh"></span>Refresh</Button>
+    <Button :disabled="loading() || couriers().length === 0" @click="openCreate()"><span aria-hidden="true" class="h-4 w-4 i-hugeicons-add-01"></span>Add route</Button>
+  </div>
+  </PageHeader>
 
   <div :if="loadError()" class="flex gap-4 items-center justify-between p-4 text-red-700 text-sm dark:text-red-300 bg-red-50 dark:bg-red-950/30 border border-red-200 rounded-lg dark:border-red-900"><span>{{ loadError() }}</span><Button variant="secondary" size="sm" @click="loadRoutes()">Retry</Button></div>
   <div :if="!loading() && couriers().length === 0" class="p-4 text-amber-800 text-sm dark:text-amber-200 bg-amber-50 dark:bg-amber-950/30 border border-amber-200 rounded-lg dark:border-amber-900">Add a courier before creating a delivery route.</div>
 
-  <section aria-label="Delivery route metrics" class="grid gap-3 grid-cols-1 sm:grid-cols-2 xl:grid-cols-4">
-    <template :for="item in metricCards()" :key="item.label"><article class="p-4 bg-white dark:bg-neutral-800 border border-gray-200 rounded-lg dark:border-neutral-700"><p class="text-gray-500 text-xs dark:text-neutral-400">{{ item.label }}</p><p class="mt-2 font-semibold text-2xl text-gray-900 dark:text-white">{{ item.value }}</p><p class="mt-1 text-gray-400 text-xs dark:text-neutral-500">{{ item.detail }}</p></article></template>
-  </section>
+  <MetricCards label="Delivery route metrics" columns="grid-cols-1 sm:grid-cols-2 xl:grid-cols-4" :items="metricCards()" />
 
   <section class="overflow-hidden bg-white dark:bg-neutral-800 border border-gray-200 rounded-xl dark:border-neutral-700">
     <div class="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between px-4 py-4 border-b border-gray-200 dark:border-neutral-700">

package/resources/components/Dashboard/Commerce/Delivery/DigitalDeliveriesDashboard.stx

@@ -202,22 +202,16 @@ onMount(() => {
 <div class="space-y-6">
   <TabNavigation model-value="digital" />
 
-  <header class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
-    <div>
-      <h1 class="font-bold text-2xl text-gray-900 dark:text-white">Digital delivery</h1>
-      <p class="mt-1 text-gray-500 text-sm dark:text-neutral-400">Control file access, download limits, expiry, and automatic fulfillment.</p>
-    </div>
-    <div class="flex gap-2">
-      <Button :loading="loading()" variant="secondary" @click="loadMethods()"><span :if="!loading()" aria-hidden="true" class="h-4 w-4 i-hugeicons-refresh"></span>Refresh</Button>
-      <Button :disabled="loading()" @click="openCreate()"><span aria-hidden="true" class="h-4 w-4 i-hugeicons-add-01"></span>Add method</Button>
-    </div>
-  </header>
+  <PageHeader title="Digital delivery" description="Control file access, download limits, expiry, and automatic fulfillment.">
+  <div class="flex gap-2">
+    <Button :loading="loading()" variant="secondary" @click="loadMethods()"><span :if="!loading()" aria-hidden="true" class="h-4 w-4 i-hugeicons-refresh"></span>Refresh</Button>
+    <Button :disabled="loading()" @click="openCreate()"><span aria-hidden="true" class="h-4 w-4 i-hugeicons-add-01"></span>Add method</Button>
+  </div>
+  </PageHeader>
 
   <div :if="loadError()" class="flex gap-4 items-center justify-between p-4 text-red-700 text-sm dark:text-red-300 bg-red-50 dark:bg-red-950/30 border border-red-200 rounded-lg dark:border-red-900"><span>{{ loadError() }}</span><Button variant="secondary" size="sm" @click="loadMethods()">Retry</Button></div>
 
-  <section aria-label="Digital delivery metrics" class="grid gap-3 grid-cols-1 sm:grid-cols-2 xl:grid-cols-4">
-    <template :for="item in metricCards()" :key="item.label"><article class="p-4 bg-white dark:bg-neutral-800 border border-gray-200 rounded-lg dark:border-neutral-700"><p class="text-gray-500 text-xs dark:text-neutral-400">{{ item.label }}</p><p class="mt-2 font-semibold text-2xl text-gray-900 dark:text-white">{{ item.value }}</p><p class="mt-1 text-gray-400 text-xs dark:text-neutral-500">{{ item.detail }}</p></article></template>
-  </section>
+  <MetricCards label="Digital delivery metrics" columns="grid-cols-1 sm:grid-cols-2 xl:grid-cols-4" :items="metricCards()" />
 
   <section class="overflow-hidden bg-white dark:bg-neutral-800 border border-gray-200 rounded-xl dark:border-neutral-700">
     <div class="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between px-4 py-4 border-b border-gray-200 dark:border-neutral-700">