@ossy/booking 1.15.7 → 1.16.1

package/src/booking-card.component.jsx

@@ -1,5 +1,8 @@
 import React, { useState } from 'react'
-import { View, Title, Text, Button, Badge, Alert } from '@ossy/design-system'
+import { View, Title, Text, Button, Badge, Alert, useLocale } from '@ossy/design-system'
+import { metadata as ConfirmBooking } from './confirm-booking.action.js'
+import { metadata as DeclineBooking } from './decline-booking.action.js'
+import { metadata as CancelBooking } from './cancel-booking.action.js'
 
 export const metadata = { id: 'resource:booking/booking/card' }
 
@@ -9,36 +12,21 @@ const STATUS_VARIANT = {
   cancelled: 'neutral',
 }
 
-const STATUS_LABEL = {
-  pending: 'Väntar',
-  confirmed: 'Bekräftad',
-  cancelled: 'Avbokad',
-}
-
-const SV_MONTHS = [
-  'jan', 'feb', 'mar', 'apr', 'maj', 'jun',
-  'jul', 'aug', 'sep', 'okt', 'nov', 'dec',
-]
-const SV_WEEKDAYS = ['Sön', 'Mån', 'Tis', 'Ons', 'Tor', 'Fre', 'Lör']
-
-function formatDateTime (iso) {
+function formatDateTime (iso, t, language) {
   if (!iso) return '—'
   const d = new Date(iso)
-  const weekday = SV_WEEKDAYS[d.getDay()]
-  const day = d.getDate()
-  const month = SV_MONTHS[d.getMonth()]
-  const hh = String(d.getHours()).padStart(2, '0')
-  const mm = String(d.getMinutes()).padStart(2, '0')
+  const locale = language === 'sv' ? 'sv-SE' : 'en-GB'
   try {
-    const tz = new Intl.DateTimeFormat('sv-SE', { timeZoneName: 'short', hour: 'numeric' })
-      .formatToParts(d).find(p => p.type === 'timeZoneName')?.value ?? ''
-    return `${weekday} ${day} ${month} kl. ${hh}:${mm}${tz ? ` (${tz})` : ''}`
+    return new Intl.DateTimeFormat(locale, {
+      weekday: 'short', day: 'numeric', month: 'short',
+      hour: '2-digit', minute: '2-digit', timeZoneName: 'short',
+    }).format(d)
   } catch {
-    return `${weekday} ${day} ${month} kl. ${hh}:${mm}`
+    return d.toLocaleString(locale)
   }
 }
 
-function formatDuration (minutes) {
+function formatDuration (minutes, t) {
   if (!minutes) return '—'
   if (minutes < 60) return `${minutes} min`
   const h = Math.floor(minutes / 60)
@@ -51,21 +39,27 @@ function truncate (text, max = 120) {
   return text.length > max ? `${text.slice(0, max).trimEnd()}…` : text
 }
 
-/** Booking card view — registered at `resource:booking/booking/card`. */
 export function BookingCard ({ booking, resource, onConfirm, onDecline, onCancel, onView }) {
+  const { t, language } = useLocale()
   const data = booking ?? resource?.content ?? resource
   if (!data) return null
 
   const [loadingAction, setLoadingAction] = useState(null)
   const [error, setError] = useState(null)
 
+  const statusLabel = {
+    pending: t('booking.card.status.pending'),
+    confirmed: t('booking.card.status.confirmed'),
+    cancelled: t('booking.card.status.cancelled'),
+  }
+
   const handle = async (actionFn, actionName) => {
     setLoadingAction(actionName)
     setError(null)
     try {
       await actionFn(data)
     } catch (err) {
-      setError(err?.message ?? 'Något gick fel')
+      setError(err?.message ?? t('booking.card.errorGeneric'))
     } finally {
       setLoadingAction(null)
     }
@@ -81,7 +75,7 @@ export function BookingCard ({ booking, resource, onConfirm, onDecline, onCancel
           <View layout="row" gap="s" alignItems="center" style={{ flexWrap: 'wrap' }}>
             <Title variant="tertiary">{data.clientName ?? '—'}</Title>
             <Badge
-              label={STATUS_LABEL[data.status] ?? data.status}
+              label={statusLabel[data.status] ?? data.status}
               variant={STATUS_VARIANT[data.status] ?? 'neutral'}
               size="s"
             />
@@ -91,14 +85,14 @@ export function BookingCard ({ booking, resource, onConfirm, onDecline, onCancel
 
         {onView && (
           <Button variant="link" onClick={() => onView(data)}>
-            Visa →
+            {t('booking.card.view')}
           </Button>
         )}
       </View>
 
       <View layout="row" gap="l" style={{ flexWrap: 'wrap' }}>
-        <Text size="s" color="secondary">{formatDateTime(data.startsAt)}</Text>
-        <Text size="s" color="secondary">{formatDuration(data.duration)}</Text>
+        <Text size="s" color="secondary">{formatDateTime(data.startsAt, t, language)}</Text>
+        <Text size="s" color="secondary">{formatDuration(data.duration, t)}</Text>
       </View>
 
       {data.clientMessage && (
@@ -111,29 +105,32 @@ export function BookingCard ({ booking, resource, onConfirm, onDecline, onCancel
         <View layout="row" gap="s" style={{ flexWrap: 'wrap' }}>
           {isPending && onConfirm && (
             <Button
+              data-action={ConfirmBooking.id}
               variant="primary"
               disabled={loadingAction === 'confirm'}
               onClick={() => handle(onConfirm, 'confirm')}
             >
-              {loadingAction === 'confirm' ? 'Väntar…' : 'Bekräfta'}
+              {loadingAction === 'confirm' ? t('booking.card.waiting') : t('booking.card.confirm')}
             </Button>
           )}
           {isPending && onDecline && (
             <Button
+              data-action={DeclineBooking.id}
               variant="danger"
               disabled={loadingAction === 'decline'}
               onClick={() => handle(onDecline, 'decline')}
             >
-              {loadingAction === 'decline' ? 'Väntar…' : 'Avböj'}
+              {loadingAction === 'decline' ? t('booking.card.waiting') : t('booking.card.decline')}
             </Button>
           )}
           {isConfirmed && onCancel && (
             <Button
+              data-action={CancelBooking.id}
               variant="danger"
               disabled={loadingAction === 'cancel'}
               onClick={() => handle(onCancel, 'cancel')}
             >
-              {loadingAction === 'cancel' ? 'Väntar…' : 'Avboka'}
+              {loadingAction === 'cancel' ? t('booking.card.waiting') : t('booking.card.cancel')}
             </Button>
           )}
         </View>

package/src/booking-detail.page.jsx

@@ -1,57 +1,36 @@
-import React, { useState, useEffect, useCallback } from 'react'
+import React, { useState, useEffect, useCallback, useMemo } from 'react'
 import { useRouter } from '@ossy/router-react'
-import { View, Title, Text, Button, Badge, Alert, Textarea } from '@ossy/design-system'
+import { View, Title, Text, Button, Badge, Alert, Textarea, useLocale } from '@ossy/design-system'
+import { useSdk } from '@ossy/sdk-react'
+import { metadata as ConfirmBooking } from './confirm-booking.action.js'
+import { metadata as DeclineBooking } from './decline-booking.action.js'
+import { metadata as CancelBooking } from './cancel-booking.action.js'
+import { metadata as ListBookings } from './list-bookings.action.js'
+import { invokeErrorMessage } from './invoke-error-message.js'
 
 export const metadata = {
   id: 'booking/booking-detail',
-  path: {
-    sv: '/bokningar/:bookingId',
-    en: '/bookings/:bookingId',
-  },
+  path: { sv: '/bokningar/:bookingId', en: '/bookings/:bookingId' },
 }
 
-const STATUS_VARIANT = {
-  pending: 'warning',
-  confirmed: 'success',
-  cancelled: 'neutral',
-}
-
-const STATUS_LABEL = {
-  pending: 'Väntar på bekräftelse',
-  confirmed: 'Bekräftad',
-  cancelled: 'Avbokad',
-}
-
-const SV_MONTHS = [
-  'januari', 'februari', 'mars', 'april', 'maj', 'juni',
-  'juli', 'augusti', 'september', 'oktober', 'november', 'december',
-]
-const SV_WEEKDAYS = ['Söndag', 'Måndag', 'Tisdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lördag']
+const STATUS_VARIANT = { pending: 'warning', confirmed: 'success', cancelled: 'neutral' }
 
-function formatDateTime (iso) {
+function formatDateTime (iso, language) {
   if (!iso) return '—'
-  const d = new Date(iso)
-  const weekday = SV_WEEKDAYS[d.getDay()]
-  const day = d.getDate()
-  const month = SV_MONTHS[d.getMonth()]
-  const year = d.getFullYear()
-  const hh = String(d.getHours()).padStart(2, '0')
-  const mm = String(d.getMinutes()).padStart(2, '0')
+  const locale = language === 'sv' ? 'sv-SE' : 'en-GB'
   try {
-    const tz = new Intl.DateTimeFormat('sv-SE', { timeZoneName: 'short', hour: 'numeric' })
-      .formatToParts(d).find(p => p.type === 'timeZoneName')?.value ?? ''
-    return `${weekday} ${day} ${month} ${year} kl. ${hh}:${mm}${tz ? ` (${tz})` : ''}`
+    return new Intl.DateTimeFormat(locale, { weekday: 'long', day: 'numeric', month: 'long', year: 'numeric', hour: '2-digit', minute: '2-digit', timeZoneName: 'short' }).format(new Date(iso))
   } catch {
-    return `${weekday} ${day} ${month} ${year} kl. ${hh}:${mm}`
+    return new Date(iso).toLocaleString(locale)
   }
 }
 
-function formatDuration (minutes) {
+function formatDuration (minutes, t) {
   if (!minutes) return '—'
-  if (minutes < 60) return `${minutes} minuter`
+  if (minutes < 60) return t('booking.bookingDetail.durationMinutes', { minutes })
   const h = Math.floor(minutes / 60)
   const m = minutes % 60
-  return m ? `${h} timme ${m} min` : `${h} timme`
+  return m ? t('booking.bookingDetail.durationHoursMinutes', { hours: h, minutes: m }) : t('booking.bookingDetail.durationHours', { hours: h })
 }
 
 function DetailRow ({ label, value }) {
@@ -63,139 +42,66 @@ function DetailRow ({ label, value }) {
   )
 }
 
-function ConfirmForm ({ booking, onSuccess, onError }) {
+function ConfirmForm ({ booking, onSuccess, onError, t, sdk }) {
   const [loading, setLoading] = useState(false)
-
   const handleConfirm = async () => {
     setLoading(true)
     try {
-      const res = await fetch('/actions/booking/confirm', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ bookingId: booking.id }),
-      })
-      if (!res.ok) {
-        const data = await res.json().catch(() => ({}))
-        throw new Error(data?.message ?? 'Bekräftning misslyckades')
-      }
+      await sdk.invoke(ConfirmBooking, { bookingId: booking.id })
       onSuccess()
-    } catch (err) {
-      onError(err.message)
-    } finally {
-      setLoading(false)
-    }
+    } catch (err) { onError(await invokeErrorMessage(err, t('booking.bookingDetail.errorConfirm'))) } finally { setLoading(false) }
   }
-
   return (
-    <Button variant="primary" disabled={loading} onClick={handleConfirm}>
-      {loading ? 'Bekräftar…' : 'Bekräfta bokning'}
+    <Button data-action={ConfirmBooking.id} variant="primary" disabled={loading} onClick={handleConfirm}>
+      {loading ? t('booking.bookingDetail.confirming') : t('booking.bookingDetail.confirm')}
     </Button>
   )
 }
 
-function DeclineForm ({ booking, onSuccess, onError }) {
+function DeclineForm ({ booking, onSuccess, onError, t, sdk }) {
   const [reason, setReason] = useState('')
   const [loading, setLoading] = useState(false)
   const [expanded, setExpanded] = useState(false)
-
   const handleDecline = async () => {
     setLoading(true)
     try {
-      const res = await fetch('/actions/booking/decline', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ bookingId: booking.id, reason: reason.trim() || null }),
-      })
-      if (!res.ok) {
-        const data = await res.json().catch(() => ({}))
-        throw new Error(data?.message ?? 'Avböjning misslyckades')
-      }
+      await sdk.invoke(DeclineBooking, { bookingId: booking.id, reason: reason.trim() || null })
       onSuccess()
-    } catch (err) {
-      onError(err.message)
-    } finally {
-      setLoading(false)
-    }
+    } catch (err) { onError(await invokeErrorMessage(err, t('booking.bookingDetail.errorDecline'))) } finally { setLoading(false) }
   }
-
-  if (!expanded) {
-    return (
-      <Button variant="danger" onClick={() => setExpanded(true)}>
-        Avböj förfrågan
-      </Button>
-    )
-  }
-
+  if (!expanded) return <Button variant="danger" onClick={() => setExpanded(true)}>{t('booking.bookingDetail.decline')}</Button>
   return (
-    <Alert variant="danger" title="Avböj bokningsförfrågan">
+    <Alert variant="danger" title={t('booking.bookingDetail.declineTitle')}>
       <View gap="s">
-        <Textarea
-          value={reason}
-          onChange={e => setReason(e.target.value)}
-          rows={3}
-          placeholder="T.ex. Tyvärr är den begärda tiden inte längre tillgänglig…"
-        />
-        <Text variant="small" color="secondary">
-          Anledning (valfritt — skickas till klienten)
-        </Text>
+        <Textarea value={reason} onChange={e => setReason(e.target.value)} rows={3} placeholder={t('booking.bookingDetail.declinePlaceholder')} />
+        <Text variant="small" color="secondary">{t('booking.bookingDetail.declineReasonHint')}</Text>
         <View layout="row" gap="s">
-          <Button variant="danger" disabled={loading} onClick={handleDecline}>
-            {loading ? 'Avböjer…' : 'Bekräfta avböjning'}
-          </Button>
-          <Button variant="neutral" onClick={() => setExpanded(false)}>
-            Avbryt
-          </Button>
+          <Button data-action={DeclineBooking.id} variant="danger" disabled={loading} onClick={handleDecline}>{loading ? t('booking.bookingDetail.declining') : t('booking.bookingDetail.declineConfirm')}</Button>
+          <Button variant="neutral" onClick={() => setExpanded(false)}>{t('booking.bookingDetail.cancelButton')}</Button>
         </View>
       </View>
     </Alert>
   )
 }
 
-function CancelForm ({ booking, onSuccess, onError }) {
+function CancelForm ({ booking, onSuccess, onError, t, sdk }) {
   const [loading, setLoading] = useState(false)
   const [expanded, setExpanded] = useState(false)
-
   const handleCancel = async () => {
     setLoading(true)
     try {
-      const res = await fetch('/actions/booking/cancel', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ bookingId: booking.id }),
-      })
-      if (!res.ok) {
-        const data = await res.json().catch(() => ({}))
-        throw new Error(data?.message ?? 'Avbokning misslyckades')
-      }
+      await sdk.invoke(CancelBooking, { bookingId: booking.id })
       onSuccess()
-    } catch (err) {
-      onError(err.message)
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  if (!expanded) {
-    return (
-      <Button variant="danger" onClick={() => setExpanded(true)}>
-        Avboka möte
-      </Button>
-    )
+    } catch (err) { onError(await invokeErrorMessage(err, t('booking.bookingDetail.errorCancel'))) } finally { setLoading(false) }
   }
-
+  if (!expanded) return <Button variant="danger" onClick={() => setExpanded(true)}>{t('booking.bookingDetail.cancelMeeting')}</Button>
   return (
-    <Alert variant="danger" title="Avboka bekräftad bokning">
+    <Alert variant="danger" title={t('booking.bookingDetail.cancelTitle')}>
       <View gap="s">
-        <Text color="secondary">
-          Klienten meddelas via e-post. Åtgärden kan inte ångras.
-        </Text>
+        <Text color="secondary">{t('booking.bookingDetail.cancelBody')}</Text>
         <View layout="row" gap="s">
-          <Button variant="danger" disabled={loading} onClick={handleCancel}>
-            {loading ? 'Avbokar…' : 'Bekräfta avbokning'}
-          </Button>
-          <Button variant="neutral" onClick={() => setExpanded(false)}>
-            Avbryt
-          </Button>
+          <Button data-action={CancelBooking.id} variant="danger" disabled={loading} onClick={handleCancel}>{loading ? t('booking.bookingDetail.cancelling') : t('booking.bookingDetail.cancelConfirm')}</Button>
+          <Button variant="neutral" onClick={() => setExpanded(false)}>{t('booking.bookingDetail.cancelButton')}</Button>
         </View>
       </View>
     </Alert>
@@ -203,67 +109,44 @@ function CancelForm ({ booking, onSuccess, onError }) {
 }
 
 export default function BookingDetailPage ({ bookingId: bookingIdProp }) {
+  const { t, language } = useLocale()
+  const sdk = useSdk()
   const router = useRouter()
   const bookingId = bookingIdProp ?? router?.params?.bookingId
-
   const [booking, setBooking] = useState(null)
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState(null)
   const [actionError, setActionError] = useState(null)
 
+  const statusLabel = useMemo(() => ({
+    pending: t('booking.bookingDetail.status.pending'),
+    confirmed: t('booking.bookingDetail.status.confirmed'),
+    cancelled: t('booking.bookingDetail.status.cancelled'),
+  }), [t])
+
   const loadBooking = useCallback(async () => {
     if (!bookingId) return
-    setLoading(true)
-    setError(null)
+    setLoading(true); setError(null)
     try {
-      const res = await fetch('/actions/booking/list', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({}),
-      })
-      if (!res.ok) {
-        const data = await res.json().catch(() => ({}))
-        throw new Error(data?.message ?? `Fel ${res.status}`)
-      }
-      const all = await res.json()
+      const all = await sdk.invoke(ListBookings, {})
       const found = all.find(b => b.id === bookingId)
-      if (!found) throw new Error('Bokningen hittades inte')
+      if (!found) throw new Error(t('booking.bookingDetail.notFound'))
       setBooking(found)
-    } catch (err) {
-      setError(err.message)
-    } finally {
-      setLoading(false)
-    }
-  }, [bookingId])
-
-  useEffect(() => {
-    loadBooking()
-  }, [loadBooking])
+    } catch (err) { setError(err.message) } finally { setLoading(false) }
+  }, [bookingId, sdk, t])
 
-  const handleSuccess = () => {
-    setActionError(null)
-    loadBooking()
-  }
+  useEffect(() => { loadBooking() }, [loadBooking])
 
   const goBack = () => {
     if (window.history.length > 1) window.history.back()
-    else window.location.href = '/bokningar'
+    else window.location.href = router.getHref('booking/bookings')
   }
 
   return (
-    <View
-      gap="m"
-      surface="primary"
-      style={{ padding: 'var(--space-m) var(--space-l)', height: '100%', overflowY: 'auto' }}
-    >
-      <Button variant="link" onClick={goBack}>
-        ← Alla bokningar
-      </Button>
-
+    <View gap="m" surface="primary" style={{ padding: 'var(--space-m) var(--space-l)', height: '100%', overflowY: 'auto' }}>
+      <Button variant="link" onClick={goBack}>{t('booking.bookingDetail.back')}</Button>
       {loading ? (
-        <Text color="secondary" style={{ textAlign: 'center', padding: 'var(--space-l)' }}>
-          Laddar…
-        </Text>
+        <Text color="secondary" style={{ textAlign: 'center', padding: 'var(--space-l)' }}>{t('booking.bookingDetail.loading')}</Text>
       ) : error ? (
         <Alert variant="danger">{error}</Alert>
       ) : booking ? (
@@ -274,18 +157,14 @@ export default function BookingDetailPage ({ bookingId: bookingIdProp }) {
                 <Title variant="secondary">{booking.clientName ?? '—'}</Title>
                 {booking.clientEmail && <Text color="secondary">{booking.clientEmail}</Text>}
               </View>
-              <Badge
-                label={STATUS_LABEL[booking.status] ?? booking.status}
-                variant={STATUS_VARIANT[booking.status] ?? 'neutral'}
-              />
+              <Badge label={statusLabel[booking.status] ?? booking.status} variant={STATUS_VARIANT[booking.status] ?? 'neutral'} />
             </View>
-
             <View gap="s">
-              <DetailRow label="Datum och tid" value={formatDateTime(booking.startsAt)} />
-              <DetailRow label="Längd" value={formatDuration(booking.duration)} />
+              <DetailRow label={t('booking.bookingDetail.label.dateTime')} value={formatDateTime(booking.startsAt, language)} />
+              <DetailRow label={t('booking.bookingDetail.label.duration')} value={formatDuration(booking.duration, t)} />
               {booking.clientMessage && (
                 <View gap="xs">
-                  <Text weight="medium" color="secondary">Meddelande</Text>
+                  <Text weight="medium" color="secondary">{t('booking.bookingDetail.label.message')}</Text>
                   <View surface="primary" roundness="s" inset="s" style={{ borderLeft: '3px solid var(--separator)' }}>
                     <Text style={{ whiteSpace: 'pre-wrap' }}>{booking.clientMessage}</Text>
                   </View>
@@ -293,36 +172,18 @@ export default function BookingDetailPage ({ bookingId: bookingIdProp }) {
               )}
             </View>
           </View>
-
           {(booking.status === 'pending' || booking.status === 'confirmed') && (
             <View gap="s" surface="secondary" roundness="m" inset="l">
-              <Title variant="tertiary">
-                {booking.status === 'pending' ? 'Hantera förfrågan' : 'Hantera bokning'}
-              </Title>
-
+              <Title variant="tertiary">{booking.status === 'pending' ? t('booking.bookingDetail.manageRequest') : t('booking.bookingDetail.manageBooking')}</Title>
               {actionError && <Alert variant="danger">{actionError}</Alert>}
-
               {booking.status === 'pending' && (
                 <View gap="s">
-                  <ConfirmForm
-                    booking={booking}
-                    onSuccess={handleSuccess}
-                    onError={setActionError}
-                  />
-                  <DeclineForm
-                    booking={booking}
-                    onSuccess={handleSuccess}
-                    onError={setActionError}
-                  />
+                  <ConfirmForm booking={booking} sdk={sdk} onSuccess={() => { setActionError(null); loadBooking() }} onError={setActionError} t={t} />
+                  <DeclineForm booking={booking} sdk={sdk} onSuccess={() => { setActionError(null); loadBooking() }} onError={setActionError} t={t} />
                 </View>
               )}
-
               {booking.status === 'confirmed' && (
-                <CancelForm
-                  booking={booking}
-                  onSuccess={handleSuccess}
-                  onError={setActionError}
-                />
+                <CancelForm booking={booking} sdk={sdk} onSuccess={() => { setActionError(null); loadBooking() }} onError={setActionError} t={t} />
               )}
             </View>
           )}

package/src/booking-resources.js

@@ -0,0 +1,10 @@
+import { ResourcesQueries } from '@ossy/resources/server'
+
+/**
+ * List booking resources by type (and optional workspace).
+ */
+export function getBookingResources ({ type, belongsTo }) {
+  const query = { type }
+  if (belongsTo) query.belongsTo = belongsTo
+  return ResourcesQueries.GetResources(query)
+}