Skip to content

feat: add calendar cache status and actions (#22532)#1

Open
zaibkhan wants to merge 1 commit into
calendar-cache-foundationfrom
introduce-cache-key-overflow
Open

feat: add calendar cache status and actions (#22532)#1
zaibkhan wants to merge 1 commit into
calendar-cache-foundationfrom
introduce-cache-key-overflow

Conversation

@zaibkhan

Copy link
Copy Markdown

No description provided.

* 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>
@codoki-pr-intelligence

codoki-pr-intelligence Bot commented Sep 10, 2025

Copy link
Copy Markdown

Codoki PR Review

Summary: Ensure cache timestamp updates, prevent stale status
What’s good: Solid addition of cache status plumbing: new repository method, mock parity, and Prisma @updatedat on CalendarCache improve observability; UI strings and connectedCalendars selection fields align with the feature.
Review Status: ✅ Safe to merge
Review Update:
• Coverage: Reviewed all 17 files across 2 batches

Issues (Medium)

Severity Issue Why it matters
Medium Correctness — Stale UI after cache deletion due to missing invalidation …/components/CredentialActionsDropdown.tsx
After deleting cache, the connectedCalendars list isn't invalidated, so cacheUpdatedAt can remain stale until a manual reload. Add an onSettled to invalidate connectedCalendars (and optionally integrations) and move the useUtils() declaration above this mutation so it can be referenced here.
Medium Compatibility — sed -i usage is not portable across macOS/Linux scripts/test-gcal-webhooks.sh
This sed invocation is BSD/macOS-specific and will fail on GNU sed (Linux). Use an OS-aware branch to ensure portability.

Showing up to 2 medium issue(s). See inline suggestions for more details.

Key Feedback (click to expand)
  • Needs improvement: In GoogleCalendarService, updating SelectedCalendar timestamps with an empty data payload may be a no-op; explicitly set updatedAt or ensure the repository bumps timestamps when data is empty to avoid misleading 'Last updated'.
  • Testing: Add an integration test for refresh path verifying SelectedCalendar.updatedAt actually changes post-refresh and that UI renders the new timestamp; include a negative case when repository throws to ensure failures don't mask cache writes. Also test that getCacheStatusByCredentialIds surfaces expected timestamps and that the mock returns an empty array without errors when calendar cache is disabled.
  • Documentation: Document in SelectedCalendarRepository.updateManyByCredentialId whether passing {} is intended to bump updatedAt and, if so, mention reliance on Prisma @updatedat vs explicit field updates. Clarify in the handler/service whether updates apply to all calendars under a credential or only those processed.
  • Compatibility: No backward-compatibility issues detected; added fields are optional reads and new repository method is additive.
  • Performance: The extra updateMany call per refresh is acceptable; if this runs frequently, consider scoping updates to just affected calendar IDs to avoid unnecessary writes.
  • Security: No new security surfaces identified in the provided diffs.
  • Open questions: Should we update only the SelectedCalendars that were actually refreshed, rather than all under the credential, to better reflect per-calendar cache freshness?

Confidence: 4/5 — Looks good; minor fixes (4 medium)

React with 👍 or 👎 if you found this review useful.

const [deleteModalOpen, setDeleteModalOpen] = useState(false);
const [disconnectModalOpen, setDisconnectModalOpen] = useState(false);

const deleteCacheMutation = trpc.viewer.calendars.deleteCache.useMutation({

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔷 Medium: After deleting cache, the connectedCalendars list isn't invalidated, so cacheUpdatedAt can remain stale until a manual reload. Add an onSettled to invalidate connectedCalendars (and optionally integrations) and move the useUtils() declaration above this mutation so it can be referenced here.

diff

  • const deleteCacheMutation = trpc.viewer.calendars.deleteCache.useMutation({
  • 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();
    
  • },
    });

fi

if grep -q '^GOOGLE_WEBHOOK_URL=' "$ENV_FILE"; then
sed -i '' -E "s|^GOOGLE_WEBHOOK_URL=.*|GOOGLE_WEBHOOK_URL=$TUNNEL_URL|" "$ENV_FILE"

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔷 Medium: This sed invocation is BSD/macOS-specific and will fail on GNU sed (Linux). Use an OS-aware branch to ensure portability.

diff

  • sed -i '' -E "s|^GOOGLE_WEBHOOK_URL=.*|GOOGLE_WEBHOOK_URL=$TUNNEL_URL|" "$ENV_FILE"
  • if [[ "$OSTYPE" == "darwin"* ]]; then
  • sed -i '' -E "s|^GOOGLE_WEBHOOK_URL=.*|GOOGLE_WEBHOOK_URL=$TUNNEL_URL|" "$ENV_FILE"
  • else
  • sed -i -E "s|^GOOGLE_WEBHOOK_URL=.*|GOOGLE_WEBHOOK_URL=$TUNNEL_URL|" "$ENV_FILE"
  • fi

}

// Update SelectedCalendar.updatedAt for all calendars under this credential
await SelectedCalendarRepository.updateManyByCredentialId(this.credential.id, {});

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔷 Medium: Passing an empty update object may not trigger any write, so SelectedCalendar.updatedAt might not change, leaving the UI with a stale 'Last updated' value. Either have the repository explicitly bump updatedAt when data is empty or set it here to guarantee the timestamp updates. Also consider scoping the update to only calendars actually refreshed to avoid misleading statuses.

Suggested change
await SelectedCalendarRepository.updateManyByCredentialId(this.credential.id, {});
await SelectedCalendarRepository.updateManyByCredentialId(this.credential.id, { updatedAt: new Date() });

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants