@stacksjs/defaults 0.75.230 → 0.75.233

package/resources/components/Dashboard/Commerce/Delivery/LicenseKeysDashboard.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 LicenseKeyStatus = 'active' | 'inactive' | 'unassigned'
@@ -42,21 +43,48 @@ interface LicenseKeyPayload {
 }
 
 const emptyOptions: LicenseKeyOptions = { customers: [], products: [], orders: [] }
-const records = state<LicenseKeyRecord[]>([])
+function matchesQuery(records: LicenseKeyRecord[], query: string): LicenseKeyRecord[] {
+  return records.filter(record => [
+    record.key,
+    record.template,
+    record.status,
+    record.customer?.label,
+    record.customer?.detail,
+    record.product?.label,
+    record.order?.label,
+  ].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<LicenseKeyRecord>({ filter: matchesQuery })
+
 const options = state<LicenseKeyOptions>(emptyOptions)
-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<LicenseKeyRecord | null>(null)
-const saving = state(false)
-const editorError = state('')
-const deleting = state<LicenseKeyRecord | null>(null)
-const deleteBusy = state(false)
-const deleteError = state('')
 
 function optionFor(items: RelatedSummary[], id?: number | null): RelatedSummary | null {
   return id ? items.find(item => item.id === id) || null : null
@@ -78,26 +106,6 @@ function dateTime(value: string): number {
   return new Date(value.replace(' ', 'T')).getTime()
 }
 
-function filteredRecords(): LicenseKeyRecord[] {
-  const query = search().trim().toLowerCase()
-  if (!query)
-    return records()
-  return records().filter(record => [
-    record.key,
-    record.template,
-    record.status,
-    record.customer?.label,
-    record.customer?.detail,
-    record.product?.label,
-    record.order?.label,
-  ].some(value => String(value || '').toLowerCase().includes(query)))
-}
-
-function paginatedRecords(): LicenseKeyRecord[] {
-  const start = (page() - 1) * perPage()
-  return filteredRecords().slice(start, start + perPage())
-}
-
 function metricCards(): Array<{ label: string, value: string, detail: string }> {
   const expiryCutoff = Date.now() + (30 * 24 * 60 * 60 * 1000)
   const expiring = records().filter((record) => {
@@ -124,9 +132,7 @@ async function loadKeys(): Promise<void> {
       throw new TypeError('License key resources were not returned in the expected shape.')
     options.set(optionData)
     records.set(keyData.map(withRelationships))
-    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))
@@ -137,33 +143,6 @@ async function loadKeys(): 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: LicenseKeyRecord): 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)
 }
@@ -183,14 +162,7 @@ async function saveKey(payload: LicenseKeyPayload): Promise<void> {
       },
     )
     const hydrated = withRelationships(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 ? 'License key updated' : 'License key added', { detail: hydrated.key })
@@ -203,18 +175,6 @@ async function saveKey(payload: LicenseKeyPayload): Promise<void> {
   }
 }
 
-function requestDelete(record: LicenseKeyRecord): 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)
@@ -225,11 +185,9 @@ async function confirmDelete(): Promise<void> {
     await dashboardApi(`/api/dashboard/commerce/license-keys/${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', 'License key deleted', { detail: current.key })
   }
   catch (error) {
@@ -240,10 +198,6 @@ async function confirmDelete(): Promise<void> {
   }
 }
 
-function goToPage(value: number): void {
-  page.set(value)
-}
-
 onMount(() => {
   void loadKeys()
 })

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

@@ -1,5 +1,6 @@
 <script client>
 import { dashboardApi } from '../../../../../functions/dashboard-api'
+import { useRecordsDashboard } from '../../../../../functions/dashboard-list'
 import { pushToast } from '../../../../../functions/toasts'
 import { formatCurrency, minorToInput } from '@stacksjs/commerce/money'
 
@@ -28,22 +29,47 @@ interface ShippingRatePayload {
   rate: number
 }
 
-const records = state<ShippingRateRecord[]>([])
+function matchesQuery(records: ShippingRateRecord[], query: string): ShippingRateRecord[] {
+  return records.filter(record => [
+    record.shipping_method?.name,
+    record.shipping_zone?.name,
+    record.weight_from,
+    record.weight_to,
+    minorToInput(record.rate, 'USD'),
+  ].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<ShippingRateRecord>({ filter: matchesQuery })
+
 const methods = state<ShippingResourceOption[]>([])
 const zones = state<ShippingResourceOption[]>([])
-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<ShippingRateRecord | null>(null)
-const saving = state(false)
-const editorError = state('')
-const deleting = state<ShippingRateRecord | null>(null)
-const deleteBusy = state(false)
-const deleteError = state('')
 
 function methodFor(id: number): ShippingResourceOption | undefined {
   return methods().find(method => method.id === id)
@@ -61,24 +87,6 @@ function withRelations(record: ShippingRateRecord): ShippingRateRecord {
   }
 }
 
-function filteredRecords(): ShippingRateRecord[] {
-  const query = search().trim().toLowerCase()
-  if (!query)
-    return records()
-  return records().filter(record => [
-    record.shipping_method?.name,
-    record.shipping_zone?.name,
-    record.weight_from,
-    record.weight_to,
-    minorToInput(record.rate, 'USD'),
-  ].some(value => String(value ?? '').toLowerCase().includes(query)))
-}
-
-function paginatedRecords(): ShippingRateRecord[] {
-  const start = (page() - 1) * perPage()
-  return filteredRecords().slice(start, start + perPage())
-}
-
 function uniqueZoneCount(): number {
   return new Set(records().map(record => record.shipping_zone_id)).size
 }
@@ -114,9 +122,7 @@ async function loadRates(): Promise<void> {
     methods.set(methodData)
     zones.set(zoneData)
     records.set(rateData.map(withRelations))
-    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))
@@ -127,33 +133,6 @@ async function loadRates(): 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: ShippingRateRecord): 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)
 }
@@ -173,14 +152,7 @@ async function saveRate(payload: ShippingRatePayload): Promise<void> {
       },
     )
     const hydrated = withRelations(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 ? 'Shipping rate updated' : 'Shipping rate added', {
@@ -195,18 +167,6 @@ async function saveRate(payload: ShippingRatePayload): Promise<void> {
   }
 }
 
-function requestDelete(record: ShippingRateRecord): 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)
@@ -217,11 +177,9 @@ async function confirmDelete(): Promise<void> {
     await dashboardApi(`/api/dashboard/commerce/shipping-rates/${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', 'Shipping rate deleted', {
       detail: `${current.shipping_method?.name || 'Method'} for ${current.shipping_zone?.name || 'zone'}`,
     })
@@ -234,10 +192,6 @@ async function confirmDelete(): Promise<void> {
   }
 }
 
-function goToPage(value: number): void {
-  page.set(value)
-}
-
 onMount(() => {
   void loadRates()
 })

package/resources/components/Dashboard/Commerce/Delivery/ShippingZonesDashboard.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 SerializedList = string | string[] | null | undefined
@@ -30,21 +31,47 @@ interface ShippingZonePayload {
   status: 'active' | 'inactive' | 'draft'
 }
 
-const records = state<ShippingZoneRecord[]>([])
+function matchesQuery(records: ShippingZoneRecord[], query: string): ShippingZoneRecord[] {
+  return records.filter(record => [
+    record.name,
+    record.status,
+    record.shipping_method?.name,
+    ...listTokens(record.countries),
+    ...listTokens(record.regions),
+    ...listTokens(record.postal_codes),
+  ].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<ShippingZoneRecord>({ filter: matchesQuery })
+
 const methods = state<ShippingMethodOption[]>([])
-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<ShippingZoneRecord | null>(null)
-const saving = state(false)
-const editorError = state('')
-const deleting = state<ShippingZoneRecord | null>(null)
-const deleteBusy = state(false)
-const deleteError = state('')
 
 function listTokens(value: SerializedList): string[] {
   if (Array.isArray(value))
@@ -73,25 +100,6 @@ function withMethod(record: ShippingZoneRecord): ShippingZoneRecord {
   }
 }
 
-function filteredRecords(): ShippingZoneRecord[] {
-  const query = search().trim().toLowerCase()
-  if (!query)
-    return records()
-  return records().filter(record => [
-    record.name,
-    record.status,
-    record.shipping_method?.name,
-    ...listTokens(record.countries),
-    ...listTokens(record.regions),
-    ...listTokens(record.postal_codes),
-  ].some(value => String(value || '').toLowerCase().includes(query)))
-}
-
-function paginatedRecords(): ShippingZoneRecord[] {
-  const start = (page() - 1) * perPage()
-  return filteredRecords().slice(start, start + perPage())
-}
-
 function uniqueCount(field: 'countries' | 'regions'): number {
   return new Set(records().flatMap(record => listTokens(record[field]))).size
 }
@@ -122,9 +130,7 @@ async function loadZones(): Promise<void> {
       throw new TypeError('Shipping zone resources were not returned as arrays.')
     methods.set(methodData)
     records.set(zoneData.map(withMethod))
-    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))
@@ -135,33 +141,6 @@ async function loadZones(): 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: ShippingZoneRecord): 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)
 }
@@ -181,14 +160,7 @@ async function saveZone(payload: ShippingZonePayload): Promise<void> {
       },
     )
     const hydrated = withMethod(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 ? 'Shipping zone updated' : 'Shipping zone added', {
@@ -203,18 +175,6 @@ async function saveZone(payload: ShippingZonePayload): Promise<void> {
   }
 }
 
-function requestDelete(record: ShippingZoneRecord): 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)
@@ -225,11 +185,9 @@ async function confirmDelete(): Promise<void> {
     await dashboardApi(`/api/dashboard/commerce/shipping-zones/${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', 'Shipping zone deleted', { detail: current.name })
   }
   catch (error) {
@@ -240,10 +198,6 @@ async function confirmDelete(): Promise<void> {
   }
 }
 
-function goToPage(value: number): void {
-  page.set(value)
-}
-
 onMount(() => {
   void loadZones()
 })

package/resources/components/Dashboard/Commerce/PrintDeviceDialog.stx

@@ -1,4 +1,5 @@
 <script client>
+import { formErrorMessages } from '../../../../functions/dashboard-form'
 import type {
   PrintDeviceRecord,
   PrintDeviceStatus,
@@ -51,10 +52,7 @@ function submit(): void {
 }
 
 function errorMessages(): string[] {
-  return Object.entries(errors()).map(([field, message]) => {
-    const label = field.replace(/([a-z])([A-Z])/g, '$1 $2').replaceAll('_', ' ')
-    return `${label.charAt(0).toUpperCase()}${label.slice(1)}: ${message}`
-  })
+  return formErrorMessages(errors())
 }
 </script>
 

package/resources/components/Dashboard/Commerce/PrintDevicesDashboard.stx

@@ -6,6 +6,7 @@ import type {
 } from '../../../../app/Actions/Dashboard/Commerce/print-device-records'
 import { DashboardApiError, dashboardApi } from '../../../../functions/dashboard-api'
 import { pushToast } from '../../../../functions/toasts'
+import { pageControls } from '../../../../functions/dashboard-list'
 
 interface PrintDevicesResponse {
   records: PrintDeviceRecord[]
@@ -234,13 +235,7 @@ async function deletePrintDevice(): Promise<void> {
   }
 }
 
-function previousPage(): void {
-  page.set(Math.max(1, page() - 1))
-}
-
-function nextPage(): void {
-  page.set(Math.min(pageCount(), page() + 1))
-}
+const { previousPage, nextPage } = pageControls(page, pageCount)
 
 onMount(() => {
   void loadPrintDevices()

package/resources/components/Dashboard/Commerce/ProductWaitlistEntryDialog.stx

@@ -1,5 +1,6 @@
 <script client>
 import type { ProductWaitlistOptions, ProductWaitlistRecord, ProductWaitlistWritePayload } from '../../../../app/Actions/Dashboard/Commerce/product-waitlist-records'
+import { formErrorMessages } from '../../../../functions/dashboard-form'
 
 type DialogMode = 'add' | 'edit'
 
@@ -94,10 +95,7 @@ function submitForm(): void {
 }
 
 function errorMessages(): string[] {
-  return Object.entries(errors()).map(([field, message]) => {
-    const label = field.replace(/([a-z])([A-Z])/g, '$1 $2').replaceAll('_', ' ')
-    return `${label.charAt(0).toUpperCase()}${label.slice(1)}: ${message}`
-  })
+  return formErrorMessages(errors())
 }
 </script>
 

package/resources/components/Dashboard/Commerce/RestaurantWaitlistEntryDialog.stx

@@ -1,6 +1,7 @@
 <script client>
 import type { RestaurantWaitlistOptions, RestaurantWaitlistRecord, RestaurantWaitlistWritePayload } from '../../../../app/Actions/Dashboard/Commerce/restaurant-waitlist-records'
 import { restaurantWaitlistDateTimeLocal, restaurantWaitlistTimestamp } from '../../../../app/Actions/Dashboard/Commerce/restaurant-waitlist-records'
+import { formErrorMessages } from '../../../../functions/dashboard-form'
 
 type DialogMode = 'add' | 'edit'
 
@@ -104,10 +105,7 @@ function submitForm(): void {
 }
 
 function errorMessages(): string[] {
-  return Object.entries(errors()).map(([field, message]) => {
-    const label = field.replace(/([a-z])([A-Z])/g, '$1 $2').replaceAll('_', ' ')
-    return `${label.charAt(0).toUpperCase()}${label.slice(1)}: ${message}`
-  })
+  return formErrorMessages(errors())
 }
 </script>
 

package/resources/components/Dashboard/Marketing/AbandonedCartsDashboard.stx

@@ -8,6 +8,7 @@ import type {
 import { formatCurrency } from '@stacksjs/commerce/money'
 import { dashboardApi } from '../../../../functions/dashboard-api'
 import { pushToast } from '../../../../functions/toasts'
+import { pageControls } from '../../../../functions/dashboard-list'
 
 const emptySummary: AbandonedCartSummary = {
   open: 0,
@@ -162,15 +163,7 @@ async function createCampaign(payload: Record<string, unknown>): Promise<void> {
   }
 }
 
-function previousPage(): void {
-  if (page() > 1)
-    page.set(page() - 1)
-}
-
-function nextPage(): void {
-  if (page() < totalPages())
-    page.set(page() + 1)
-}
+const { previousPage, nextPage } = pageControls(page, totalPages)
 
 onMount(() => {
   void loadCarts()