feat: add calendar cache status and actions (#22532)#10
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>
|
Claude finished @ShashankFC's task in 2m 27s —— View job Code Review CompleteI've reviewed all 17 changed files in this PR. Here's my comprehensive feedback: Tasks
Overall AssessmentThis PR adds calendar cache management UI capabilities, allowing users to view cache status and delete cached calendar data for Google Calendar integrations. The implementation is generally solid with good separation of concerns. Critical Issues1. Missing Authorization Check in deleteCache Handler 🔴File: The authorization check only verifies that the credential belongs to the user, but doesn't validate that the user has permission to delete cache for that credential type or team context. const credential = await prisma.credential.findFirst({
where: {
id: credentialId,
userId: user.id,
},
});Issue: If delegated credentials are involved, this might not properly handle permission boundaries. Recommendation: Verify team membership and feature flags before allowing cache deletion, similar to how other calendar operations handle delegated credentials. 2. Database Migration Has Warning Comment 🟡File: /*
Warnings:
- Added the required column `updatedAt` to the `CalendarCache` table without a default value. This is not possible if the table is not empty.
*/The migration warning indicates the column is marked as required without a default, but the actual migration adds 3. Race Condition in Cache Repository 🟡File: When querying cache for in-memory delegation credentials, there's a potential race condition: cached = await prisma.calendarCache.findFirst({
where: {
userId,
key,
expiresAt: { gte: new Date(Date.now()) },
},
orderBy: {
expiresAt: "desc",
},
});Issue: Between checking Recommendation: Add a small buffer (e.g., 1 second) when checking expiry or revalidate after fetching. Security Concerns4. Missing Error Messages Sanitization 🟡File: throw new Error("Credential not found or access denied");Generic error message is good for security, but the catch block in the component shows raw error messages to users: File: onError: () => {
showToast(t("error_deleting_cache"), "error");
},Good practice: Error messages are properly sanitized in the UI layer. Performance Issues5. N+1 Query Pattern in connectedCalendars Handler 🟡File: const credentialIds = connectedCalendars.map((cal) => cal.credentialId);
const cacheRepository = new CalendarCacheRepository();
const cacheStatuses = await cacheRepository.getCacheStatusByCredentialIds(credentialIds);While this uses a single query with File: The Code Quality Issues6. Inconsistent Component Naming 🟢File: The component is located in
7. Magic Numbers Without Constants 🟢File: const MS_PER_DAY = 24 * 60 * 60 * 1000;
const ONE_MONTH_IN_MS = 30 * MS_PER_DAY;
const CACHING_TIME = ONE_MONTH_IN_MS;Good: Constants are defined. However, consider extracting these to a shared config file since caching duration is a business rule that might need adjustment. 8. Missing Error Handling in UI 🟢File: deleteCacheMutation.mutate({ credentialId });The mutation is called but there's no loading state handling. Consider disabling the button or showing a spinner while the deletion is in progress. 9. TypeScript Type Safety Could Be Improved 🟢File: cacheUpdatedAt?: Date | null;Consider using a stricter type like 10. Console.log Left in Production Code 🟡File: console.log(
`Upsert the selectedCalendar record to the DB for user ${user.id} with details ${JSON.stringify(
selectedCalendar
)}`
);Issue: This should use the logger instance instead of Minor Issues & Suggestions11. Duplicate HR Element Logic 🟢File: {canDisconnect && hasCache && <hr className="my-1" />}Good: Conditional separator is clean and follows React patterns. 12. Test Script Has Hardcoded Paths 🟢File: LOG_FILE="/tmp/tmole.log"
ENV_FILE="../.env"The script assumes it's run from a specific directory. Consider making it more robust: SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
ENV_FILE="$SCRIPT_DIR/../.env"13. Missing Translations for Other Locales 🟢Only English translations were added in 14. Good: Proper Use of Repository Pattern ✅The PR correctly uses the repository pattern ( 15. Good: Proper Type Safety in tRPC Router ✅File: The tRPC endpoint properly validates input with Zod schema: deleteCache: authedProcedure
.input(z.object({ credentialId: z.number() }))
.mutation(async ({ ctx, input }) => {Database Schema Review16. Schema Change is Well-Designed ✅File: updatedAt DateTime @default(now()) @updatedAtThe addition of Testing Recommendations
DocumentationThe PR lacks documentation for:
SummaryStrengths:
Must Fix Before Merge:
Should Fix:
Nice to Have:
|
|
This PR is being marked as stale due to inactivity. |
Test 1nn---nReplicated from ai-code-review-evaluation/cal.com-greptile#11