feat: add calendar cache status and actions (#22532)#2
Conversation
* feat: add calendar cache status dropdown - Add updatedAt field to CalendarCache schema with migration - Create tRPC cacheStatus endpoint for fetching cache timestamps - Add action dropdown to CalendarSwitch for Google Calendar entries - Display formatted last updated timestamp in dropdown - Add placeholder for cache deletion functionality - Include translation strings for dropdown content The dropdown only appears for Google Calendar integrations that have active cache entries and provides cache management options for future extensibility. Co-Authored-By: zomars@cal.com <zomars@me.com> * fix: resolve Prisma type incompatibilities in repository files - Remove problematic satisfies clause in selectedCalendar.ts - Add missing cacheStatus parameter to ConnectedCalendarList component - Fixes type errors that were preventing CI from passing Co-Authored-By: zomars@cal.com <zomars@me.com> * refactor: integrate cache status into connectedCalendars handler - Remove separate cacheStatus tRPC endpoint as requested - Return cache status as separate field in connectedCalendars response - Update UI components to use cache data from connectedCalendars - Fix Prisma type incompatibilities in repository files Co-Authored-By: zomars@cal.com <zomars@me.com> * fix: resolve Prisma type incompatibilities and fix data flow for cache status - Fix Prisma.SortOrder usage in membership.ts orderBy clauses - Remove problematic satisfies clause in selectedCalendar.ts - Fix TeamSelect type reference in team.ts - Update SelectedCalendarsSettingsWebWrapper to properly pass cacheStatus data flow Co-Authored-By: zomars@cal.com <zomars@me.com> * Discard changes to packages/lib/server/repository/membership.ts * Discard changes to packages/lib/server/repository/team.ts * fix: improve calendar cache dropdown with proper formatting and subscription logic - Fix timestamp HTML entity encoding with interpolation escapeValue: false - Only show dropdown for subscribed Google calendars (googleChannelId exists) - Hide delete option when no cache data exists - Include updatedAt and googleChannelId fields upstream in user repository - Update data flow to pass subscription status through components Co-Authored-By: zomars@cal.com <zomars@me.com> * feat: update SelectedCalendar.updatedAt when Google webhooks trigger cache refresh - Add updateManyByCredentialId method to SelectedCalendarRepository - Update fetchAvailabilityAndSetCache to refresh SelectedCalendar timestamps - Ensure webhook flow updates both CalendarCache and SelectedCalendar records - Maintain proper timestamp tracking for calendar cache operations Co-Authored-By: zomars@cal.com <zomars@me.com> * Add script to automate Tunnelmole webhook setup Introduces test-gcal-webhooks.sh to start Tunnelmole, extract the public URL, and update GOOGLE_WEBHOOK_URL in the .env file. Handles process management, rate limits, and ensures environment configuration for Google Calendar webhooks. * Update dev:cron script to use npx tsx Replaces 'ts-node' with 'npx tsx' in the dev:cron script for running cron-tester.ts, likely to improve compatibility or leverage tsx features. * Update cache status string and improve CalendarSwitch UI Renamed 'last_updated' to 'cache_last_updated' in locale file for clarity and updated CalendarSwitch to use the new string. Also added dark mode text color support for cache status display. * refactor: move cache management to credential-level dropdown with Remove App - Create CredentialActionsDropdown component consolidating cache and app removal actions - Add deleteCache tRPC mutation for credential-level cache deletion - Update connectedCalendars handler to include cacheUpdatedAt at credential level - Move dropdown from individual CalendarSwitch to credential level in SelectedCalendarsSettingsWebWrapper - Remove cache-related props from CalendarSwitch component - Add translation strings for cache management actions - Consolidate all credential-level actions (cache management + Remove App) in one dropdown Co-Authored-By: zomars@cal.com <zomars@me.com> * fix: remove duplicate translation keys in common.json - Remove duplicate cache-related keys at lines 51-56 - Keep properly positioned keys later in file - Addresses GitHub comment from zomars about duplicate keys Co-Authored-By: zomars@cal.com <zomars@me.com> * fix: rename translation key to cache_last_updated - Address GitHub comment from zomars - Rename 'last_updated' to 'cache_last_updated' for specificity - Update usage in CredentialActionsDropdown component Co-Authored-By: zomars@cal.com <zomars@me.com> * fix: remove duplicate last_updated translation key Co-Authored-By: zomars@cal.com <zomars@me.com> * fix: add confirmation dialog for cache deletion and use repository pattern - Add confirmation dialog for destructive cache deletion action - Replace direct Prisma calls with CalendarCacheRepository pattern - Add getCacheStatusByCredentialIds method to repository interface - Fix import paths for UI components - Address GitHub review comments from zomars Co-Authored-By: zomars@cal.com <zomars@me.com> * Update CredentialActionsDropdown.tsx * Update common.json * Update common.json * fix: remove nested div wrapper to resolve HTML structure error - Remove wrapping div around DisconnectIntegration component - Fixes nested <p> tag validation error preventing Remove App functionality - Maintains existing confirmation dialog patterns Co-Authored-By: zomars@cal.com <zomars@me.com> * Fix API handler response termination logic Removed unnecessary return values after setting status in the integrations API handler. This clarifies response handling and prevents returning the response object when not needed. Resolves "API handler should not return a value, received object". * fix: 400 is correct error code for computing slot for past booking (#22574) * fix * add test * chore: release v5.5.1 * Refactor credential disconnect to use confirmation dialog Replaces the DisconnectIntegration component with an inline confirmation dialog for removing app credentials. Adds disconnect mutation logic and updates UI to improve user experience and consistency. * Set default value for CalendarCache.updatedAt Added a default value of NOW() for the updatedAt column in the CalendarCache table to ensure existing and future rows have a valid timestamp. Updated the Prisma schema to reflect this change and provide compatibility for legacy data and raw inserts. --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com> Co-authored-by: emrysal <me@alexvanandel.com>
There was a problem hiding this comment.
Pull request overview
This PR adds cache management capabilities for calendar integrations, specifically targeting Google Calendar. It introduces the ability to view cache status with timestamps and delete cached data through a new dropdown UI component.
Changes:
- Added
updatedAtfield toCalendarCachemodel to track cache freshness - Created new tRPC endpoint and handler for deleting calendar cache by credential
- Replaced
DisconnectIntegrationcomponent withCredentialActionsDropdownthat shows cache status and provides delete/disconnect actions
Reviewed changes
Copilot reviewed 17 out of 17 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| scripts/test-gcal-webhooks.sh | Added development script for setting up Google Calendar webhook tunneling |
| packages/prisma/schema.prisma | Added updatedAt timestamp field to CalendarCache model |
| packages/prisma/migrations/20250715160635_add_calendar_cache_updated_at/migration.sql | Database migration to add updatedAt column with default value |
| packages/trpc/server/routers/viewer/calendars/_router.tsx | Added deleteCache tRPC endpoint |
| packages/trpc/server/routers/viewer/calendars/deleteCache.handler.ts | Implemented cache deletion handler with authorization |
| packages/trpc/server/routers/viewer/calendars/connectedCalendars.handler.ts | Enhanced to fetch and include cache status for connected calendars |
| packages/features/calendar-cache/calendar-cache.repository.ts | Added method to retrieve cache status grouped by credential IDs |
| packages/features/calendar-cache/calendar-cache.repository.mock.ts | Added mock implementation for getCacheStatusByCredentialIds |
| packages/features/calendar-cache/calendar-cache.repository.interface.ts | Extended interface with getCacheStatusByCredentialIds method |
| packages/features/apps/components/CredentialActionsDropdown.tsx | New component combining disconnect and cache management actions |
| packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper.tsx | Updated to use CredentialActionsDropdown instead of DisconnectIntegration |
| packages/app-store/googlecalendar/lib/CalendarService.ts | Added updatedAt tracking for selected calendars after cache updates |
| packages/lib/getConnectedDestinationCalendars.ts | Updated type definitions to include updatedAt and googleChannelId fields |
| packages/lib/server/repository/user.ts | Added updatedAt and googleChannelId to credential query selection |
| packages/lib/server/repository/selectedCalendar.ts | Added updateManyByCredentialId method and simplified findMany |
| apps/web/public/static/locales/en/common.json | Added localization strings for cache management UI |
| apps/web/package.json | Changed dev:cron script to use npx tsx instead of ts-node |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| credentialId={cal.credentialId} | ||
| eventTypeId={shouldUseEventTypeScope ? eventTypeId : null} | ||
| delegationCredentialId={connectedCalendar.delegationCredentialId} | ||
| delegationCredentialId={connectedCalendar.delegationCredentialId || null} |
There was a problem hiding this comment.
The explicit conversion to null is unnecessary since delegationCredentialId is already typed as 'string | null' in the original data structure. This change adds verbosity without functional benefit.
| delegationCredentialId={connectedCalendar.delegationCredentialId || null} | |
| delegationCredentialId={connectedCalendar.delegationCredentialId} |
| dateStyle: "short", | ||
| timeStyle: "short", |
There was a problem hiding this comment.
The date format is hardcoded to 'en-US' locale regardless of user's locale preference. This should use the user's locale from the t function or useLocale hook for proper internationalization.
| <DropdownMenuContent> | ||
| {hasCache && ( | ||
| <> | ||
| <DropdownMenuItem className="focus:ring-muted"> |
There was a problem hiding this comment.
This DropdownMenuItem is used to display read-only information (cache status), but DropdownMenuItem typically implies an interactive element. Consider using a different component or adding appropriate ARIA attributes to indicate this is informational rather than actionable.
Test 1rnnn
Summary by CodeRabbit
New Features
Documentation
Chores
✏️ Tip: You can customize this high-level summary in your review settings.
nn---n*Replicated from [ai-code-review-evaluation/cal.com-coderabbit#11](https://github.com/ai-code-review-evaluation/cal.com-coderabbit/pull/11)*