-
Notifications
You must be signed in to change notification settings - Fork 0
feat: add calendar cache status and actions (#22532) #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: calendar-cache-foundation
Are you sure you want to change the base?
feat: add calendar cache status and actions (#22532) #1
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: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * fix: remove duplicate last_updated translation key Co-Authored-By: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * 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 <[email protected]> Co-authored-by: emrysal <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Your free trial has ended. If you'd like to continue receiving code reviews, you can add a payment method here.
Greptile OverviewConfidence Score: 4/5
Important Files ChangedFile Analysis
Sequence DiagramsequenceDiagram
participant User
participant UI as CredentialActionsDropdown
participant tRPC as tRPC Router
participant Handler as deleteCache.handler
participant Prisma as Database
participant Cache as CalendarCache
Note over User,Cache: View Cache Status Flow
User->>UI: Opens calendar settings
UI->>tRPC: connectedCalendars.query()
tRPC->>Handler: connectedCalendarsHandler()
Handler->>Cache: getCacheStatusByCredentialIds()
Cache->>Prisma: groupBy credentialId, max(updatedAt)
Prisma-->>Cache: Cache timestamps
Cache-->>Handler: Cache status map
Handler-->>tRPC: Connected calendars + cache status
tRPC-->>UI: Display cache "Last updated" info
UI-->>User: Shows cache status in dropdown
Note over User,Cache: Delete Cache Flow
User->>UI: Clicks "Delete cached data"
UI->>UI: Shows confirmation dialog
User->>UI: Confirms deletion
UI->>tRPC: deleteCache.mutate({ credentialId })
tRPC->>Handler: deleteCacheHandler({ credentialId })
Handler->>Prisma: Check credential ownership
Prisma-->>Handler: Credential found
Handler->>Prisma: deleteMany CalendarCache by credentialId
Prisma-->>Handler: Cache deleted
Handler-->>tRPC: { success: true }
tRPC-->>UI: onSuccess callback
UI->>UI: onSuccess() refetch
UI->>User: Shows success toast
UI->>tRPC: Re-query connectedCalendars
tRPC-->>UI: Updated cache status (null)
Note over User,Cache: Sync Calendar Flow
User->>tRPC: Syncs Google Calendar
tRPC->>Cache: syncCalendars()
Cache->>Cache: fetchAvailability()
Cache->>Prisma: upsert CalendarCache
Prisma-->>Cache: Cache updated with new updatedAt
Cache->>Prisma: updateManyByCredentialId SelectedCalendar
Prisma-->>Cache: SelectedCalendar.updatedAt updated
Cache-->>tRPC: Sync complete
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
17 files reviewed, 1 comment
| const deleteCacheMutation = trpc.viewer.calendars.deleteCache.useMutation({ | ||
| onSuccess: () => { | ||
| showToast(t("cache_deleted_successfully"), "success"); | ||
| onSuccess?.(); | ||
| }, | ||
| onError: () => { | ||
| showToast(t("error_deleting_cache"), "error"); | ||
| }, | ||
| }); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
logic: missing cache invalidation in onSettled
| const deleteCacheMutation = trpc.viewer.calendars.deleteCache.useMutation({ | |
| onSuccess: () => { | |
| showToast(t("cache_deleted_successfully"), "success"); | |
| onSuccess?.(); | |
| }, | |
| onError: () => { | |
| showToast(t("error_deleting_cache"), "error"); | |
| }, | |
| }); | |
| const deleteCacheMutation = trpc.viewer.calendars.deleteCache.useMutation({ | |
| onSuccess: () => { | |
| showToast(t("cache_deleted_successfully"), "success"); | |
| onSuccess?.(); | |
| }, | |
| onError: () => { | |
| showToast(t("error_deleting_cache"), "error"); | |
| }, | |
| async onSettled() { | |
| await utils.viewer.calendars.connectedCalendars.invalidate(); | |
| }, | |
| }); |
Prompt To Fix With AI
This is a comment left during a code review.
Path: packages/features/apps/components/CredentialActionsDropdown.tsx
Line: 42:50
Comment:
**logic:** missing cache invalidation in `onSettled`
```suggestion
const deleteCacheMutation = trpc.viewer.calendars.deleteCache.useMutation({
onSuccess: () => {
showToast(t("cache_deleted_successfully"), "success");
onSuccess?.();
},
onError: () => {
showToast(t("error_deleting_cache"), "error");
},
async onSettled() {
await utils.viewer.calendars.connectedCalendars.invalidate();
},
});
```
How can I resolve this? If you propose a fix, please make it concise.
Test 1
Replicated from ai-code-review-evaluation/cal.com-greptile#11