payload-reserve 1.1.0 → 1.3.0

package/README.md

@@ -12,7 +12,7 @@ Designed for salons, clinics, hotels, restaurants, event venues, and any busines
 - **User Collection Extension** — Optionally extend your existing auth collection with booking fields; set `userCollection: undefined` (default) to use a standalone Customers collection
 - **Resource Owner Multi-Tenancy** — Opt-in `resourceOwnerMode` wires ownership access control so each resource owner (host) sees only their own listings and reservations
 - **Configurable Status Machine** — Define your own statuses, transitions, blocking states, and terminal states
-- **Double-Booking Prevention** — Server-side conflict detection with configurable buffer times; respects capacity modes
+- **Double-Booking Prevention** — Server-side conflict detection with per-item buffer times; respects capacity modes
 - **Auto End Time** — Calculates `endTime` from `startTime + service.duration` automatically
 - **Three Duration Types** — `fixed` (service duration), `flexible` (customer-specified end), and `full-day` bookings
 - **Multi-Resource Bookings** — Single reservation that spans multiple resources simultaneously via the `items` array
@@ -21,8 +21,8 @@ Designed for salons, clinics, hotels, restaurants, event venues, and any busines
 - **Extra Reservation Fields** — Inject custom fields into the Reservations collection via `extraReservationFields` without forking the plugin
 - **Cancellation Policy** — Configurable minimum notice period enforcement
 - **Plugin Hooks API** — Seven lifecycle hooks (`beforeBookingCreate`, `afterBookingCreate`, `beforeBookingConfirm`, `afterBookingConfirm`, `beforeBookingCancel`, `afterBookingCancel`, `afterStatusChange`) for integrating email, Stripe, and external systems
-- **Availability Service** — Pure functions and DB helpers for slot generation and conflict checking
-- **Public REST API** — Five pre-built endpoints for availability, slot listing, booking, cancellation, and customer search
+- **Availability Service** — Pure functions and DB helpers for slot generation (15-min step) and conflict checking with guest-count-aware filtering
+- **Public REST API** — Five pre-built endpoints for availability, slot listing, booking, cancellation, and customer search — with ownership enforcement and input validation
 - **Calendar View** — Month/week/day calendar replacing the default reservations list view
 - **Dashboard Widget** — Server component showing today's booking stats
 - **Availability Overview** — Weekly grid of resource availability vs. booked slots
@@ -105,3 +105,29 @@ The `access` override in plugin config always takes precedence over the auto-wir
 | [Examples](https://github.com/elghaied/payload-reserve/blob/main/docs/examples.md) | Salon, hotel, restaurant, event venue, Stripe, email, multi-tenant (resource owner mode) |
 | [Advanced](https://github.com/elghaied/payload-reserve/blob/main/docs/advanced.md) | DB indexes, reconciliation job for race condition detection |
 | [Development](https://github.com/elghaied/payload-reserve/blob/main/docs/development.md) | Prerequisites, commands, project file tree |
+| [v1.2.0 Breaking Changes](https://github.com/elghaied/payload-reserve/blob/main/docs/BREAKING-CHANGES-v1.2.md) | Migration guide for upgrading to v1.2.0 |
+
+---
+
+## Contributing
+
+This project uses [Changesets](https://github.com/changesets/changesets) for versioning and changelogs.
+
+When making a change that should appear in the release notes, run:
+
+```bash
+pnpm changeset
+```
+
+This prompts for the semver bump type (patch/minor/major) and a summary. Commit the generated changeset file with your PR.
+
+**Releasing:**
+
+```bash
+pnpm changeset:version   # consume changesets, bump version, update CHANGELOG.md
+git add -A && git commit -m "release v<version>"
+git tag v<version>
+git push && git push --tags
+```
+
+The GitHub Action will create a release with the changelog content and publish to npm.

package/dist/collections/Schedules.js

@@ -1,4 +1,12 @@
+import { ValidationError } from 'payload';
 import { makeScheduleOwnerAccess } from '../utilities/ownerAccess.js';
+const TIME_REGEX = /^(?:[01]\d|2[0-3]):[0-5]\d$/;
+const validateTime = (value)=>{
+    if (!value) {
+        return true;
+    } // required handles emptiness
+    return TIME_REGEX.test(value) || 'Invalid time format. Use HH:mm (e.g., 09:00, 17:30)';
+};
 export function createSchedulesCollection(config) {
     const rom = config.resourceOwnerMode;
     const access = config.access.schedules ?? (rom ? makeScheduleOwnerAccess(rom) : {});
@@ -89,7 +97,8 @@ export function createSchedulesCollection(config) {
                             placeholder: '09:00'
                         },
                         label: ({ t })=>t('reservation:fieldStartTimeHHmm'),
-                        required: true
+                        required: true,
+                        validate: validateTime
                     },
                     {
                         name: 'endTime',
@@ -98,7 +107,8 @@ export function createSchedulesCollection(config) {
                             placeholder: '17:00'
                         },
                         label: ({ t })=>t('reservation:fieldEndTimeHHmm'),
-                        required: true
+                        required: true,
+                        validate: validateTime
                     }
                 ],
                 label: ({ t })=>t('reservation:fieldRecurringSlots')
@@ -128,7 +138,8 @@ export function createSchedulesCollection(config) {
                             placeholder: '09:00'
                         },
                         label: ({ t })=>t('reservation:fieldStartTimeHHmm'),
-                        required: true
+                        required: true,
+                        validate: validateTime
                     },
                     {
                         name: 'endTime',
@@ -137,7 +148,8 @@ export function createSchedulesCollection(config) {
                             placeholder: '17:00'
                         },
                         label: ({ t })=>t('reservation:fieldEndTimeHHmm'),
-                        required: true
+                        required: true,
+                        validate: validateTime
                     }
                 ],
                 label: ({ t })=>t('reservation:fieldManualSlots')
@@ -175,6 +187,39 @@ export function createSchedulesCollection(config) {
                 label: ({ t })=>t('reservation:fieldActive')
             }
         ],
+        hooks: {
+            beforeValidate: [
+                ({ data })=>{
+                    const slots = data?.recurringSlots ?? [];
+                    for (const slot of slots){
+                        if (slot.startTime && slot.endTime && slot.startTime >= slot.endTime) {
+                            throw new ValidationError({
+                                errors: [
+                                    {
+                                        message: 'endTime must be after startTime',
+                                        path: 'recurringSlots'
+                                    }
+                                ]
+                            });
+                        }
+                    }
+                    const manual = data?.manualSlots ?? [];
+                    for (const slot of manual){
+                        if (slot.startTime && slot.endTime && slot.startTime >= slot.endTime) {
+                            throw new ValidationError({
+                                errors: [
+                                    {
+                                        message: 'endTime must be after startTime',
+                                        path: 'manualSlots'
+                                    }
+                                ]
+                            });
+                        }
+                    }
+                    return data;
+                }
+            ]
+        },
         labels: {
             plural: ({ t })=>t('reservation:collectionSchedules'),
             singular: ({ t })=>t('reservation:collectionSchedules')

package/dist/collections/Schedules.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/collections/Schedules.ts"],"sourcesContent":["import type { CollectionConfig, CollectionSlug } from 'payload'\n\nimport type { PluginT } from '../translations/index.js'\nimport type { ResolvedReservationPluginConfig } from '../types.js'\n\nimport { makeScheduleOwnerAccess } from '../utilities/ownerAccess.js'\n\nexport function createSchedulesCollection(\n  config: ResolvedReservationPluginConfig,\n): CollectionConfig {\n  const rom = config.resourceOwnerMode\n  const access =\n    config.access.schedules ?? (rom ? makeScheduleOwnerAccess(rom) : {})\n\n  return {\n    slug: config.slugs.schedules,\n    access,\n    admin: {\n      group: config.adminGroup,\n      useAsTitle: 'name',\n    },\n    fields: [\n      {\n        name: 'name',\n        type: 'text',\n        label: ({ t }) => (t as PluginT)('reservation:fieldName'),\n        required: true,\n      },\n      {\n        name: 'resource',\n        type: 'relationship',\n        label: ({ t }) => (t as PluginT)('reservation:fieldResource'),\n        relationTo: config.slugs.resources as unknown as CollectionSlug,\n        required: true,\n      },\n      {\n        name: 'scheduleType',\n        type: 'select',\n        defaultValue: 'recurring',\n        label: ({ t }) => (t as PluginT)('reservation:fieldScheduleType'),\n        options: [\n          {\n            label: ({ t }) => (t as PluginT)('reservation:scheduleTypeRecurring'),\n            value: 'recurring',\n          },\n          {\n            label: ({ t }) => (t as PluginT)('reservation:scheduleTypeManual'),\n            value: 'manual',\n          },\n        ],\n      },\n      {\n        name: 'recurringSlots',\n        type: 'array',\n        admin: {\n          condition: (_, siblingData) => siblingData?.scheduleType === 'recurring',\n        },\n        fields: [\n          {\n            name: 'day',\n            type: 'select',\n            label: ({ t }) => (t as PluginT)('reservation:fieldDay'),\n            options: [\n              { label: ({ t }) => (t as PluginT)('reservation:dayMonday'), value: 'mon' },\n              { label: ({ t }) => (t as PluginT)('reservation:dayTuesday'), value: 'tue' },\n              { label: ({ t }) => (t as PluginT)('reservation:dayWednesday'), value: 'wed' },\n              { label: ({ t }) => (t as PluginT)('reservation:dayThursday'), value: 'thu' },\n              { label: ({ t }) => (t as PluginT)('reservation:dayFriday'), value: 'fri' },\n              { label: ({ t }) => (t as PluginT)('reservation:daySaturday'), value: 'sat' },\n              { label: ({ t }) => (t as PluginT)('reservation:daySunday'), value: 'sun' },\n            ],\n            required: true,\n          },\n          {\n            name: 'startTime',\n            type: 'text',\n            admin: {\n              placeholder: '09:00',\n            },\n            label: ({ t }) => (t as PluginT)('reservation:fieldStartTimeHHmm'),\n            required: true,\n          },\n          {\n            name: 'endTime',\n            type: 'text',\n            admin: {\n              placeholder: '17:00',\n            },\n            label: ({ t }) => (t as PluginT)('reservation:fieldEndTimeHHmm'),\n            required: true,\n          },\n        ],\n        label: ({ t }) => (t as PluginT)('reservation:fieldRecurringSlots'),\n      },\n      {\n        name: 'manualSlots',\n        type: 'array',\n        admin: {\n          condition: (_, siblingData) => siblingData?.scheduleType === 'manual',\n        },\n        fields: [\n          {\n            name: 'date',\n            type: 'date',\n            admin: {\n              date: {\n                pickerAppearance: 'dayOnly',\n              },\n            },\n            label: ({ t }) => (t as PluginT)('reservation:fieldDate'),\n            required: true,\n          },\n          {\n            name: 'startTime',\n            type: 'text',\n            admin: {\n              placeholder: '09:00',\n            },\n            label: ({ t }) => (t as PluginT)('reservation:fieldStartTimeHHmm'),\n            required: true,\n          },\n          {\n            name: 'endTime',\n            type: 'text',\n            admin: {\n              placeholder: '17:00',\n            },\n            label: ({ t }) => (t as PluginT)('reservation:fieldEndTimeHHmm'),\n            required: true,\n          },\n        ],\n        label: ({ t }) => (t as PluginT)('reservation:fieldManualSlots'),\n      },\n      {\n        name: 'exceptions',\n        type: 'array',\n        fields: [\n          {\n            name: 'date',\n            type: 'date',\n            admin: {\n              date: {\n                pickerAppearance: 'dayOnly',\n              },\n            },\n            label: ({ t }) => (t as PluginT)('reservation:fieldDate'),\n            required: true,\n          },\n          {\n            name: 'reason',\n            type: 'text',\n            label: ({ t }) => (t as PluginT)('reservation:fieldReason'),\n          },\n        ],\n        label: ({ t }) => (t as PluginT)('reservation:fieldExceptions'),\n      },\n      {\n        name: 'active',\n        type: 'checkbox',\n        admin: {\n          position: 'sidebar',\n        },\n        defaultValue: true,\n        label: ({ t }) => (t as PluginT)('reservation:fieldActive'),\n      },\n    ],\n    labels: {\n      plural: ({ t }) => (t as PluginT)('reservation:collectionSchedules'),\n      singular: ({ t }) => (t as PluginT)('reservation:collectionSchedules'),\n    },\n  }\n}\n"],"names":["makeScheduleOwnerAccess","createSchedulesCollection","config","rom","resourceOwnerMode","access","schedules","slug","slugs","admin","group","adminGroup","useAsTitle","fields","name","type","label","t","required","relationTo","resources","defaultValue","options","value","condition","_","siblingData","scheduleType","placeholder","date","pickerAppearance","position","labels","plural","singular"],"mappings":"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"}
+{"version":3,"sources":["../../src/collections/Schedules.ts"],"sourcesContent":["import type { CollectionConfig, CollectionSlug } from 'payload'\n\nimport { ValidationError } from 'payload'\n\nimport type { PluginT } from '../translations/index.js'\nimport type { ResolvedReservationPluginConfig } from '../types.js'\n\nimport { makeScheduleOwnerAccess } from '../utilities/ownerAccess.js'\n\nconst TIME_REGEX = /^(?:[01]\\d|2[0-3]):[0-5]\\d$/\n\nconst validateTime = (value: null | string | undefined): string | true => {\n  if (!value) { return true } // required handles emptiness\n  return TIME_REGEX.test(value) || 'Invalid time format. Use HH:mm (e.g., 09:00, 17:30)'\n}\n\nexport function createSchedulesCollection(\n  config: ResolvedReservationPluginConfig,\n): CollectionConfig {\n  const rom = config.resourceOwnerMode\n  const access =\n    config.access.schedules ?? (rom ? makeScheduleOwnerAccess(rom) : {})\n\n  return {\n    slug: config.slugs.schedules,\n    access,\n    admin: {\n      group: config.adminGroup,\n      useAsTitle: 'name',\n    },\n    fields: [\n      {\n        name: 'name',\n        type: 'text',\n        label: ({ t }) => (t as PluginT)('reservation:fieldName'),\n        required: true,\n      },\n      {\n        name: 'resource',\n        type: 'relationship',\n        label: ({ t }) => (t as PluginT)('reservation:fieldResource'),\n        relationTo: config.slugs.resources as unknown as CollectionSlug,\n        required: true,\n      },\n      {\n        name: 'scheduleType',\n        type: 'select',\n        defaultValue: 'recurring',\n        label: ({ t }) => (t as PluginT)('reservation:fieldScheduleType'),\n        options: [\n          {\n            label: ({ t }) => (t as PluginT)('reservation:scheduleTypeRecurring'),\n            value: 'recurring',\n          },\n          {\n            label: ({ t }) => (t as PluginT)('reservation:scheduleTypeManual'),\n            value: 'manual',\n          },\n        ],\n      },\n      {\n        name: 'recurringSlots',\n        type: 'array',\n        admin: {\n          condition: (_, siblingData) => siblingData?.scheduleType === 'recurring',\n        },\n        fields: [\n          {\n            name: 'day',\n            type: 'select',\n            label: ({ t }) => (t as PluginT)('reservation:fieldDay'),\n            options: [\n              { label: ({ t }) => (t as PluginT)('reservation:dayMonday'), value: 'mon' },\n              { label: ({ t }) => (t as PluginT)('reservation:dayTuesday'), value: 'tue' },\n              { label: ({ t }) => (t as PluginT)('reservation:dayWednesday'), value: 'wed' },\n              { label: ({ t }) => (t as PluginT)('reservation:dayThursday'), value: 'thu' },\n              { label: ({ t }) => (t as PluginT)('reservation:dayFriday'), value: 'fri' },\n              { label: ({ t }) => (t as PluginT)('reservation:daySaturday'), value: 'sat' },\n              { label: ({ t }) => (t as PluginT)('reservation:daySunday'), value: 'sun' },\n            ],\n            required: true,\n          },\n          {\n            name: 'startTime',\n            type: 'text',\n            admin: {\n              placeholder: '09:00',\n            },\n            label: ({ t }) => (t as PluginT)('reservation:fieldStartTimeHHmm'),\n            required: true,\n            validate: validateTime,\n          },\n          {\n            name: 'endTime',\n            type: 'text',\n            admin: {\n              placeholder: '17:00',\n            },\n            label: ({ t }) => (t as PluginT)('reservation:fieldEndTimeHHmm'),\n            required: true,\n            validate: validateTime,\n          },\n        ],\n        label: ({ t }) => (t as PluginT)('reservation:fieldRecurringSlots'),\n      },\n      {\n        name: 'manualSlots',\n        type: 'array',\n        admin: {\n          condition: (_, siblingData) => siblingData?.scheduleType === 'manual',\n        },\n        fields: [\n          {\n            name: 'date',\n            type: 'date',\n            admin: {\n              date: {\n                pickerAppearance: 'dayOnly',\n              },\n            },\n            label: ({ t }) => (t as PluginT)('reservation:fieldDate'),\n            required: true,\n          },\n          {\n            name: 'startTime',\n            type: 'text',\n            admin: {\n              placeholder: '09:00',\n            },\n            label: ({ t }) => (t as PluginT)('reservation:fieldStartTimeHHmm'),\n            required: true,\n            validate: validateTime,\n          },\n          {\n            name: 'endTime',\n            type: 'text',\n            admin: {\n              placeholder: '17:00',\n            },\n            label: ({ t }) => (t as PluginT)('reservation:fieldEndTimeHHmm'),\n            required: true,\n            validate: validateTime,\n          },\n        ],\n        label: ({ t }) => (t as PluginT)('reservation:fieldManualSlots'),\n      },\n      {\n        name: 'exceptions',\n        type: 'array',\n        fields: [\n          {\n            name: 'date',\n            type: 'date',\n            admin: {\n              date: {\n                pickerAppearance: 'dayOnly',\n              },\n            },\n            label: ({ t }) => (t as PluginT)('reservation:fieldDate'),\n            required: true,\n          },\n          {\n            name: 'reason',\n            type: 'text',\n            label: ({ t }) => (t as PluginT)('reservation:fieldReason'),\n          },\n        ],\n        label: ({ t }) => (t as PluginT)('reservation:fieldExceptions'),\n      },\n      {\n        name: 'active',\n        type: 'checkbox',\n        admin: {\n          position: 'sidebar',\n        },\n        defaultValue: true,\n        label: ({ t }) => (t as PluginT)('reservation:fieldActive'),\n      },\n    ],\n    hooks: {\n      beforeValidate: [\n        ({ data }) => {\n          const slots = (data?.recurringSlots as Array<{ endTime?: string; startTime?: string }>) ?? []\n          for (const slot of slots) {\n            if (slot.startTime && slot.endTime && slot.startTime >= slot.endTime) {\n              throw new ValidationError({\n                errors: [{ message: 'endTime must be after startTime', path: 'recurringSlots' }],\n              })\n            }\n          }\n          const manual = (data?.manualSlots as Array<{ endTime?: string; startTime?: string }>) ?? []\n          for (const slot of manual) {\n            if (slot.startTime && slot.endTime && slot.startTime >= slot.endTime) {\n              throw new ValidationError({\n                errors: [{ message: 'endTime must be after startTime', path: 'manualSlots' }],\n              })\n            }\n          }\n          return data\n        },\n      ],\n    },\n    labels: {\n      plural: ({ t }) => (t as PluginT)('reservation:collectionSchedules'),\n      singular: ({ t }) => (t as PluginT)('reservation:collectionSchedules'),\n    },\n  }\n}\n"],"names":["ValidationError","makeScheduleOwnerAccess","TIME_REGEX","validateTime","value","test","createSchedulesCollection","config","rom","resourceOwnerMode","access","schedules","slug","slugs","admin","group","adminGroup","useAsTitle","fields","name","type","label","t","required","relationTo","resources","defaultValue","options","condition","_","siblingData","scheduleType","placeholder","validate","date","pickerAppearance","position","hooks","beforeValidate","data","slots","recurringSlots","slot","startTime","endTime","errors","message","path","manual","manualSlots","labels","plural","singular"],"mappings":"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"}

package/dist/components/CalendarView/CalendarView.module.css

@@ -452,3 +452,38 @@
   color: var(--theme-elevation-400);
   font-size: 0.9375rem;
 }
+
+/* Resource filter */
+.filterBar {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 12px;
+}
+
+.resourceFilter {
+  appearance: none;
+  background: var(--theme-bg);
+  border: none;
+  border-radius: 3px;
+  box-shadow: inset 0 0 0 1px var(--theme-elevation-250);
+  padding: 6px 28px 6px 10px;
+  cursor: pointer;
+  font-family: inherit;
+  font-size: 0.8125rem;
+  color: var(--theme-text);
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='6'%3E%3Cpath d='M0 0l5 6 5-6z' fill='%23666'/%3E%3C/svg%3E");
+  background-repeat: no-repeat;
+  background-position: right 10px center;
+  min-width: 160px;
+  transition: box-shadow 100ms cubic-bezier(0, 0.2, 0.2, 1);
+}
+
+.resourceFilter:hover {
+  box-shadow: inset 0 0 0 1px var(--theme-elevation-400);
+}
+
+.resourceFilter:focus-visible {
+  outline: 2px solid var(--theme-text);
+  outline-offset: 2px;
+}

package/dist/components/CalendarView/index.js

@@ -100,6 +100,9 @@ export const CalendarView = ()=>{
     const [loading, setLoading] = useState(true);
     const [drawerDocId, setDrawerDocId] = useState(null);
     const [initialData, setInitialData] = useState(undefined);
+    // Resource filter state
+    const [resources, setResources] = useState([]);
+    const [selectedResourceId, setSelectedResourceId] = useState('');
     // Pending tab state
     const [pendingReservations, setPendingReservations] = useState([]);
     const [pendingCount, setPendingCount] = useState(0);
@@ -117,6 +120,35 @@ export const CalendarView = ()=>{
             openDrawer();
         }
     });
+    // Fetch active resources for filter dropdown
+    useEffect(()=>{
+        const fetchResources = async ()=>{
+            try {
+                const resourceSlug = slugs?.resources ?? 'resources';
+                const params = new URLSearchParams({
+                    depth: '0',
+                    limit: '100',
+                    sort: 'name',
+                    'where[active][equals]': 'true'
+                });
+                const url = `${config.serverURL ?? ''}${config.routes.api}/${resourceSlug}?${params}`;
+                const response = await fetch(url);
+                const result = await response.json();
+                const docs = result.docs ?? [];
+                setResources(docs.map((d)=>({
+                        id: d.id,
+                        name: d.name ?? ''
+                    })));
+            } catch  {
+                setResources([]);
+            }
+        };
+        void fetchResources();
+    }, [
+        config.routes.api,
+        config.serverURL,
+        slugs?.resources
+    ]);
     const { rangeEnd, rangeStart } = useMemo(()=>{
         const start = new Date(currentDate);
         const end = new Date(currentDate);
@@ -216,7 +248,36 @@ export const CalendarView = ()=>{
         viewMode,
         fetchPendingReservations
     ]);
-    // Clear selection when leaving pending view
+    // Client-side resource filtering
+    const matchesResourceFilter = useCallback((r)=>{
+        if (!selectedResourceId) {
+            return true;
+        }
+        // Check top-level resource
+        const topId = typeof r.resource === 'string' ? r.resource : r.resource?.id;
+        if (topId === selectedResourceId) {
+            return true;
+        }
+        // Check items array for multi-resource bookings
+        if (r.items && r.items.length > 0) {
+            return r.items.some((item)=>{
+                const itemId = typeof item.resource === 'string' ? item.resource : item.resource?.id;
+                return itemId === selectedResourceId;
+            });
+        }
+        return false;
+    }, [
+        selectedResourceId
+    ]);
+    const filteredReservations = useMemo(()=>reservations.filter(matchesResourceFilter), [
+        reservations,
+        matchesResourceFilter
+    ]);
+    const filteredPendingReservations = useMemo(()=>pendingReservations.filter(matchesResourceFilter), [
+        pendingReservations,
+        matchesResourceFilter
+    ]);
+    // Clear selection when leaving pending view or changing resource filter
     useEffect(()=>{
         if (viewMode !== 'pending') {
             setSelectedIds(new Set());
@@ -225,6 +286,11 @@ export const CalendarView = ()=>{
     }, [
         viewMode
     ]);
+    useEffect(()=>{
+        setSelectedIds(new Set());
+    }, [
+        selectedResourceId
+    ]);
     // Auto-clear feedback toast
     useEffect(()=>{
         if (!actionFeedback) {
@@ -563,7 +629,7 @@ export const CalendarView = ()=>{
                     const dayStr = `${day.getFullYear()}-${day.getMonth()}-${day.getDate()}`;
                     const isToday = dayStr === todayStr;
                     const isOtherMonth = day.getMonth() !== currentDate.getMonth();
-                    const dayReservations = reservations.filter((r)=>{
+                    const dayReservations = filteredReservations.filter((r)=>{
                         const rDate = new Date(r.startTime);
                         return rDate.getFullYear() === day.getFullYear() && rDate.getMonth() === day.getMonth() && rDate.getDate() === day.getDate();
                     });
@@ -629,7 +695,7 @@ export const CalendarView = ()=>{
                                 ]
                             }),
                             weekDays.map((day, di)=>{
-                                const cellReservations = reservations.filter((r)=>{
+                                const cellReservations = filteredReservations.filter((r)=>{
                                     const rDate = new Date(r.startTime);
                                     return rDate.getFullYear() === day.getFullYear() && rDate.getMonth() === day.getMonth() && rDate.getDate() === day.getDate() && rDate.getHours() === hour;
                                 });
@@ -664,7 +730,7 @@ export const CalendarView = ()=>{
         return /*#__PURE__*/ _jsx("div", {
             className: styles.dayView,
             children: hours.map((hour)=>{
-                const hourReservations = reservations.filter((r)=>{
+                const hourReservations = filteredReservations.filter((r)=>{
                     const rDate = new Date(r.startTime);
                     return rDate.getFullYear() === currentDate.getFullYear() && rDate.getMonth() === currentDate.getMonth() && rDate.getDate() === currentDate.getDate() && rDate.getHours() === hour;
                 });
@@ -701,18 +767,18 @@ export const CalendarView = ()=>{
         });
     };
     const renderPendingView = ()=>{
-        if (pendingReservations.length === 0) {
+        if (filteredPendingReservations.length === 0) {
             return /*#__PURE__*/ _jsx("div", {
                 className: styles.pendingEmpty,
                 children: t('reservation:pendingEmpty')
             });
         }
-        const allSelected = pendingReservations.length > 0 && pendingReservations.every((r)=>selectedIds.has(r.id));
+        const allSelected = filteredPendingReservations.length > 0 && filteredPendingReservations.every((r)=>selectedIds.has(r.id));
         const toggleSelectAll = ()=>{
             if (allSelected) {
                 setSelectedIds(new Set());
             } else {
-                setSelectedIds(new Set(pendingReservations.map((r)=>r.id)));
+                setSelectedIds(new Set(filteredPendingReservations.map((r)=>r.id)));
             }
         };
         const toggleSelect = (id)=>{
@@ -801,7 +867,7 @@ export const CalendarView = ()=>{
                             })
                         }),
                         /*#__PURE__*/ _jsx("tbody", {
-                            children: pendingReservations.map((r)=>{
+                            children: filteredPendingReservations.map((r)=>{
                                 const isConfirming = confirmingIds.has(r.id);
                                 // Show all resources from items array if present, else top-level resource
                                 const resourceDisplay = getResourceNames(r).join(', ') || t('reservation:calendarUnknownResource');
@@ -986,7 +1052,7 @@ export const CalendarView = ()=>{
                                         label,
                                         key === 'pending' && pendingCount > 0 && /*#__PURE__*/ _jsx("span", {
                                             className: styles.pendingBadge,
-                                            children: pendingCount
+                                            children: selectedResourceId ? filteredPendingReservations.length : pendingCount
                                         })
                                     ]
                                 }, key))
@@ -995,6 +1061,25 @@ export const CalendarView = ()=>{
                 ]
             }),
             viewMode !== 'pending' && renderStatusLegend(),
+            resources.length > 1 && /*#__PURE__*/ _jsx("div", {
+                className: styles.filterBar,
+                children: /*#__PURE__*/ _jsxs("select", {
+                    "aria-label": t('reservation:filterByResource'),
+                    className: styles.resourceFilter,
+                    onChange: (e)=>setSelectedResourceId(e.target.value),
+                    value: selectedResourceId,
+                    children: [
+                        /*#__PURE__*/ _jsx("option", {
+                            value: "",
+                            children: t('reservation:filterAllResources')
+                        }),
+                        resources.map((r)=>/*#__PURE__*/ _jsx("option", {
+                                value: r.id,
+                                children: r.name
+                            }, r.id))
+                    ]
+                })
+            }),
             loading && viewMode !== 'pending' ? /*#__PURE__*/ _jsx("div", {
                 className: styles.loading,
                 children: t('reservation:calendarLoading')