Skip to content

Commit cb78692

Browse files
zomarsdevin-ai-integration[bot]hbjORbjemrysal
authored
feat: add calendar cache status and actions (#22532)
* 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]>
1 parent 3784421 commit cb78692

File tree

17 files changed

+379
-31
lines changed

17 files changed

+379
-31
lines changed

‎apps/web/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"analyze:browser": "BUNDLE_ANALYZE=browser next build",
99
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
1010
"dev": "yarn copy-static && next dev --turbopack",
11-
"dev:cron": "ts-node cron-tester.ts",
11+
"dev:cron": "npx tsx cron-tester.ts",
1212
"dev-https": "NODE_TLS_REJECT_UNAUTHORIZED=0 next dev --experimental-https",
1313
"dx": "yarn dev",
1414
"test-codegen": "yarn playwright codegen http://localhost:3000",

‎apps/web/public/static/locales/en/common.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3379,5 +3379,12 @@
33793379
"timezone_mismatch_tooltip": "You are viewing the report based on your profile timezone ({{userTimezone}}), while your browser is set to timezone ({{browserTimezone}})",
33803380
"failed_bookings_by_field": "Failed Bookings By Field",
33813381
"event_type_no_hosts": "No hosts are assigned to event type",
3382+
"cache_status": "Cache Status",
3383+
"cache_last_updated": "Last updated: {{timestamp}}",
3384+
"delete_cached_data": "Delete cached data",
3385+
"cache_deleted_successfully": "Cache deleted successfully",
3386+
"error_deleting_cache": "Error deleting cache",
3387+
"confirm_delete_cache": "Are you sure you want to delete the cached data? This action cannot be undone.",
3388+
"yes_delete_cache": "Yes, delete cache",
33823389
"ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
33833390
}

‎packages/app-store/googlecalendar/lib/CalendarService.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,6 +1019,9 @@ export default class GoogleCalendarService implements Calendar {
10191019
const data = await this.fetchAvailability(parsedArgs);
10201020
await this.setAvailabilityInCache(parsedArgs, data);
10211021
}
1022+
1023+
// Update SelectedCalendar.updatedAt for all calendars under this credential
1024+
await SelectedCalendarRepository.updateManyByCredentialId(this.credential.id, {});
10221025
}
10231026

10241027
async createSelectedCalendar(

‎packages/features/apps/components/CredentialActionsDropdown.tsx‎

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
"use client";
2+
3+
import { useState } from "react";
4+
5+
import { useLocale } from "@calcom/lib/hooks/useLocale";
6+
import { GOOGLE_CALENDAR_TYPE } from "@calcom/platform-constants";
7+
import { trpc } from "@calcom/trpc/react";
8+
import { Button } from "@calcom/ui/components/button";
9+
import { ConfirmationDialogContent } from "@calcom/ui/components/dialog";
10+
import { Dialog } from "@calcom/ui/components/dialog";
11+
import {
12+
Dropdown,
13+
DropdownItem,
14+
DropdownMenuContent,
15+
DropdownMenuItem,
16+
DropdownMenuTrigger,
17+
} from "@calcom/ui/components/dropdown";
18+
import { showToast } from "@calcom/ui/components/toast";
19+
20+
interface CredentialActionsDropdownProps {
21+
credentialId: number;
22+
integrationType: string;
23+
cacheUpdatedAt?: Date | null;
24+
onSuccess?: () => void;
25+
delegationCredentialId?: string | null;
26+
disableConnectionModification?: boolean;
27+
}
28+
29+
export default function CredentialActionsDropdown({
30+
credentialId,
31+
integrationType,
32+
cacheUpdatedAt,
33+
onSuccess,
34+
delegationCredentialId,
35+
disableConnectionModification,
36+
}: CredentialActionsDropdownProps) {
37+
const { t } = useLocale();
38+
const [dropdownOpen, setDropdownOpen] = useState(false);
39+
const [deleteModalOpen, setDeleteModalOpen] = useState(false);
40+
const [disconnectModalOpen, setDisconnectModalOpen] = useState(false);
41+
42+
const deleteCacheMutation = trpc.viewer.calendars.deleteCache.useMutation({
43+
onSuccess: () => {
44+
showToast(t("cache_deleted_successfully"), "success");
45+
onSuccess?.();
46+
},
47+
onError: () => {
48+
showToast(t("error_deleting_cache"), "error");
49+
},
50+
});
51+
52+
const utils = trpc.useUtils();
53+
const disconnectMutation = trpc.viewer.credentials.delete.useMutation({
54+
onSuccess: () => {
55+
showToast(t("app_removed_successfully"), "success");
56+
onSuccess?.();
57+
},
58+
onError: () => {
59+
showToast(t("error_removing_app"), "error");
60+
},
61+
async onSettled() {
62+
await utils.viewer.calendars.connectedCalendars.invalidate();
63+
await utils.viewer.apps.integrations.invalidate();
64+
},
65+
});
66+
67+
const isGoogleCalendar = integrationType === GOOGLE_CALENDAR_TYPE;
68+
const canDisconnect = !delegationCredentialId && !disableConnectionModification;
69+
const hasCache = isGoogleCalendar && cacheUpdatedAt;
70+
71+
if (!canDisconnect && !hasCache) {
72+
return null;
73+
}
74+
75+
return (
76+
<>
77+
<Dropdown open={dropdownOpen} onOpenChange={setDropdownOpen}>
78+
<DropdownMenuTrigger asChild>
79+
<Button type="button" variant="icon" color="secondary" StartIcon="ellipsis" />
80+
</DropdownMenuTrigger>
81+
<DropdownMenuContent>
82+
{hasCache && (
83+
<>
84+
<DropdownMenuItem className="focus:ring-muted">
85+
<div className="px-2 py-1">
86+
<div className="text-sm font-medium text-gray-900 dark:text-white">{t("cache_status")}</div>
87+
<div className="text-xs text-gray-500 dark:text-white">
88+
{t("cache_last_updated", {
89+
timestamp: new Intl.DateTimeFormat("en-US", {
90+
dateStyle: "short",
91+
timeStyle: "short",
92+
}).format(new Date(cacheUpdatedAt)),
93+
interpolation: { escapeValue: false },
94+
})}
95+
</div>
96+
</div>
97+
</DropdownMenuItem>
98+
<DropdownMenuItem className="outline-none">
99+
<DropdownItem
100+
type="button"
101+
color="destructive"
102+
StartIcon="trash"
103+
onClick={() => {
104+
setDeleteModalOpen(true);
105+
setDropdownOpen(false);
106+
}}>
107+
{t("delete_cached_data")}
108+
</DropdownItem>
109+
</DropdownMenuItem>
110+
</>
111+
)}
112+
{canDisconnect && hasCache && <hr className="my-1" />}
113+
{canDisconnect && (
114+
<DropdownMenuItem className="outline-none">
115+
<DropdownItem
116+
type="button"
117+
color="destructive"
118+
StartIcon="trash"
119+
onClick={() => {
120+
setDisconnectModalOpen(true);
121+
setDropdownOpen(false);
122+
}}>
123+
{t("remove_app")}
124+
</DropdownItem>
125+
</DropdownMenuItem>
126+
)}
127+
</DropdownMenuContent>
128+
</Dropdown>
129+
130+
<Dialog open={deleteModalOpen} onOpenChange={setDeleteModalOpen}>
131+
<ConfirmationDialogContent
132+
variety="danger"
133+
title={t("delete_cached_data")}
134+
confirmBtnText={t("yes_delete_cache")}
135+
onConfirm={() => {
136+
deleteCacheMutation.mutate({ credentialId });
137+
setDeleteModalOpen(false);
138+
}}>
139+
{t("confirm_delete_cache")}
140+
</ConfirmationDialogContent>
141+
</Dialog>
142+
143+
<Dialog open={disconnectModalOpen} onOpenChange={setDisconnectModalOpen}>
144+
<ConfirmationDialogContent
145+
variety="danger"
146+
title={t("remove_app")}
147+
confirmBtnText={t("yes_remove_app")}
148+
onConfirm={() => {
149+
disconnectMutation.mutate({ id: credentialId });
150+
setDisconnectModalOpen(false);
151+
}}>
152+
{t("are_you_sure_you_want_to_remove_this_app")}
153+
</ConfirmationDialogContent>
154+
</Dialog>
155+
</>
156+
);
157+
}

‎packages/features/calendar-cache/calendar-cache.repository.interface.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,7 @@ export interface ICalendarCacheRepository {
2727
userId: number | null;
2828
args: FreeBusyArgs;
2929
}): Promise<CalendarCache | null>;
30+
getCacheStatusByCredentialIds(
31+
credentialIds: number[]
32+
): Promise<{ credentialId: number; updatedAt: Date | null }[]>;
3033
}

‎packages/features/calendar-cache/calendar-cache.repository.mock.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,9 @@ export class CalendarCacheRepositoryMock implements ICalendarCacheRepository {
2323
async deleteManyByCredential() {
2424
log.info(`Skipping deleteManyByCredential due to calendar-cache being disabled`);
2525
}
26+
27+
async getCacheStatusByCredentialIds() {
28+
log.info(`Skipping getCacheStatusByCredentialIds due to calendar-cache being disabled`);
29+
return [];
30+
}
2631
}

‎packages/features/calendar-cache/calendar-cache.repository.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,21 @@ export class CalendarCacheRepository implements ICalendarCacheRepository {
169169
},
170170
});
171171
}
172+
173+
async getCacheStatusByCredentialIds(credentialIds: number[]) {
174+
const cacheStatuses = await prisma.calendarCache.groupBy({
175+
by: ["credentialId"],
176+
where: {
177+
credentialId: { in: credentialIds },
178+
},
179+
_max: {
180+
updatedAt: true,
181+
},
182+
});
183+
184+
return cacheStatuses.map((cache) => ({
185+
credentialId: cache.credentialId,
186+
updatedAt: cache._max.updatedAt,
187+
}));
188+
}
172189
}

‎packages/lib/getConnectedDestinationCalendars.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,14 @@ type ReturnTypeGetConnectedCalendars = Awaited<ReturnType<typeof getConnectedCal
1818
type ConnectedCalendarsFromGetConnectedCalendars = ReturnTypeGetConnectedCalendars["connectedCalendars"];
1919

2020
export type UserWithCalendars = Pick<User, "id" | "email"> & {
21-
allSelectedCalendars: Pick<SelectedCalendar, "externalId" | "integration" | "eventTypeId">[];
22-
userLevelSelectedCalendars: Pick<SelectedCalendar, "externalId" | "integration" | "eventTypeId">[];
21+
allSelectedCalendars: Pick<
22+
SelectedCalendar,
23+
"externalId" | "integration" | "eventTypeId" | "updatedAt" | "googleChannelId"
24+
>[];
25+
userLevelSelectedCalendars: Pick<
26+
SelectedCalendar,
27+
"externalId" | "integration" | "eventTypeId" | "updatedAt" | "googleChannelId"
28+
>[];
2329
destinationCalendar: DestinationCalendar | null;
2430
};
2531

‎packages/lib/server/repository/selectedCalendar.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ export class SelectedCalendarRepository {
257257
}
258258

259259
static async findMany({ where, select, orderBy }: FindManyArgs) {
260-
const args = { where, select, orderBy } satisfies Prisma.SelectedCalendarFindManyArgs;
261-
return await prisma.selectedCalendar.findMany(args);
260+
return await prisma.selectedCalendar.findMany({ where, select, orderBy });
262261
}
263262

264263
static async findUniqueOrThrow({ where }: { where: Prisma.SelectedCalendarWhereInput }) {
@@ -398,6 +397,13 @@ export class SelectedCalendarRepository {
398397
});
399398
}
400399

400+
static async updateManyByCredentialId(credentialId: number, data: Prisma.SelectedCalendarUpdateInput) {
401+
return await prisma.selectedCalendar.updateMany({
402+
where: { credentialId },
403+
data,
404+
});
405+
}
406+
401407
static async setErrorInWatching({ id, error }: { id: string; error: string }) {
402408
await SelectedCalendarRepository.updateById(id, {
403409
error,

‎packages/lib/server/repository/user.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -896,6 +896,8 @@ export class UserRepository {
896896
eventTypeId: true,
897897
externalId: true,
898898
integration: true,
899+
updatedAt: true,
900+
googleChannelId: true,
899901
},
900902
},
901903
completedOnboarding: true,

0 commit comments

Comments
 (0)