Skip to content

Email for professionals and teams

Fix the type errors that tsc reports on main (#124)

Can K.053fd45c2f33
diff --git a/src/app/(admin)/general/utils.ts b/src/app/(admin)/general/utils.ts
index 8a49722..ec27f3c 100644
--- a/src/app/(admin)/general/utils.ts
+++ b/src/app/(admin)/general/utils.ts
@@ -3,7 +3,7 @@ import type { GeneralSettings } from "./types";
export async function loadGeneralSettings(): Promise<GeneralSettings> {
const response = await authFetch("/api/admin/general", { cache: "no-store" });
- const data = await response.json();
+ const data = (await response.json()) as GeneralSettings & { error?: string };
if (!response.ok) throw new Error(data.error ?? "Could not load general settings");
return data as GeneralSettings;
}
@@ -14,7 +14,7 @@ export async function saveGeneralSettings(changes: Partial<GeneralSettings>): Pr
headers: { "Content-Type": "application/json" },
body: JSON.stringify(changes),
});
- const data = await response.json();
+ const data = (await response.json()) as GeneralSettings & { error?: string };
if (!response.ok) throw new Error(data.error ?? "Could not save general settings");
return data as GeneralSettings;
}
diff --git a/src/app/(calendar)/calendar/page.tsx b/src/app/(calendar)/calendar/page.tsx
index d845bea..74fcd11 100644
--- a/src/app/(calendar)/calendar/page.tsx
+++ b/src/app/(calendar)/calendar/page.tsx
@@ -130,7 +130,7 @@ export default function CalendarPage() {
void authFetch(`/api/calendar/events?start=${start.toISOString()}&end=${end.toISOString()}`)
.then((response) => {
if (!response.ok) throw new Error(t("calendar.loadFailed"));
- return response.json();
+ return response.json() as Promise<{ events?: Parameters<typeof expandCalendarEvents>[0] }>;
})
.then((data) => { if (active) setEvents(expandCalendarEvents(data.events ?? [], start, end)); })
.catch(() => { if (active) toast.error(t("calendar.loadFailed")); })
@@ -202,7 +202,7 @@ export default function CalendarPage() {
setEventsVersion((version) => version + 1);
setClosingEventEditor(true);
} else {
- const result = await response.json();
+ const result = (await response.json()) as { error?: string };
toast.error(result.error ?? t("calendar.saveFailed"));
}
} catch {
@@ -223,7 +223,7 @@ export default function CalendarPage() {
setEventsVersion((version) => version + 1);
setClosingEventEditor(true);
} else {
- const result = await response.json();
+ const result = (await response.json()) as { error?: string };
toast.error(result.error ?? t("calendar.deleteFailed"));
}
} catch {
diff --git a/src/app/api/admin/agent/utils.ts b/src/app/api/admin/agent/utils.ts
index 2766484..6281e56 100644
--- a/src/app/api/admin/agent/utils.ts
+++ b/src/app/api/admin/agent/utils.ts
@@ -40,7 +40,7 @@ export async function PUT(request: Request) {
if (!hasValidSessionMutationOrigin(request)) return Response.json({ error: "Invalid origin" }, { status: 403 });
const body = await request.json().catch(() => null);
const enabled = enabledSchema.safeParse(body);
- if (enabled.success && Object.keys(body).length === 1) {
+ if (enabled.success && Object.keys(body as object).length === 1) {
const db = getDb(access.env);
await db.insert(appSettings).values({ id: AGENT_SETTINGS_ID, agentEnabled: enabled.data.enabled }).onConflictDoUpdate({ target: appSettings.id, set: { agentEnabled: enabled.data.enabled, updatedAt: new Date() } });
if (!enabled.data.enabled) {
diff --git a/src/app/api/backups/utils.ts b/src/app/api/backups/utils.ts
index 7fcec6b..c91ef32 100644
--- a/src/app/api/backups/utils.ts
+++ b/src/app/api/backups/utils.ts
@@ -10,7 +10,7 @@ export function parseBackupSettingsInput(value: unknown): BackupSettingsInput |
if (typeof input.scheduleType !== "string" || !SCHEDULE_TYPES.has(input.scheduleType)) return null;
if (typeof input.retentionEnabled !== "boolean") return null;
if (!Array.isArray(input.excludedTableGroups)) return null;
- const groupIds = new Set(BACKUP_TABLE_GROUPS.map((group) => group.id));
+ const groupIds = new Set<string>(BACKUP_TABLE_GROUPS.map((group) => group.id));
if (!input.excludedTableGroups.every((id) => typeof id === "string" && groupIds.has(id))) return null;
const excludedTableGroups = [...new Set(input.excludedTableGroups)] as BackupSettingsInput["excludedTableGroups"];
if (excludedTableGroups.length === BACKUP_TABLE_GROUPS.length) return null;
diff --git a/src/components/settings/api-keys-settings-utils.ts b/src/components/settings/api-keys-settings-utils.ts
index 02a01f1..461bcf2 100644
--- a/src/components/settings/api-keys-settings-utils.ts
+++ b/src/components/settings/api-keys-settings-utils.ts
@@ -20,7 +20,7 @@ export const STANDARD_KEY_SCOPES: { value: ApiKeyScope; labelKey: TranslationKey
];
async function responseData(response: Response): Promise<{ error?: unknown; key?: string; apiKeys?: ManagedApiKey[] }> {
- return response.json().catch(() => ({}));
+ return response.json().catch(() => ({})) as Promise<{ error?: unknown; key?: string; apiKeys?: ManagedApiKey[] }>;
}
export function keyPermissions(key: ManagedApiKey): string[] {
diff --git a/src/components/settings/import-messages.tsx b/src/components/settings/import-messages.tsx
index a8ed188..abf2a08 100644
--- a/src/components/settings/import-messages.tsx
+++ b/src/components/settings/import-messages.tsx
@@ -75,7 +75,7 @@ export function ImportMessages({ destination, sourceLabel }: ImportMessagesProps
<p className="font-medium">{getImportSummary(result, t)}</p>
{(result.errors ?? []).length > 0 && (
<ul className="mt-2 list-disc space-y-1 pl-5 text-xs">
- {result.errors.slice(0, 5).map((item) => (
+ {(result.errors ?? []).slice(0, 5).map((item) => (
<li key={item}>{item}</li>
))}
</ul>
diff --git a/src/components/settings/types.d.ts b/src/components/settings/types.d.ts
index 357ea93..1701a5c 100644
--- a/src/components/settings/types.d.ts
+++ b/src/components/settings/types.d.ts
@@ -20,6 +20,7 @@ export type AccountSettingsResponse = {
id: string;
email: string;
name: string;
+ timeZone: string | null;
resetEmail: string | null;
forwardingEmail: string | null;
canForwardEmail: boolean;
@@ -107,6 +108,7 @@ export type ProfileAvatarFormProps = {
export type CurrentMailboxFormResponse = {
mailbox?: {
id: string;
+ domainId: string;
localPart: string;
hostname: string;
displayName: string | null;
diff --git a/src/components/settings/utils.ts b/src/components/settings/utils.ts
index 1261090..aa84ce2 100644
--- a/src/components/settings/utils.ts
+++ b/src/components/settings/utils.ts
@@ -35,6 +35,7 @@ export async function updateCurrentMailboxName(id: string, displayName: string):
return {
id: data.mailbox.id,
+ domainId: data.mailbox.domainId,
localPart: data.mailbox.localPart,
hostname: data.mailbox.hostname,
displayName: data.mailbox.displayName,
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 74eeaa6..41f148e 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -18,7 +18,8 @@ const buttonVariants = cva(
default: "h-10 px-6 py-2 rounded-xl",
sm: "h-8 rounded-lg px-3 text-xs",
lg: "h-11 rounded-xl px-8",
- roundedSM: "rounded-full p-2 text-xs"
+ roundedSM: "rounded-full p-2 text-xs",
+ icon: "",
},
},
defaultVariants: {
diff --git a/src/hooks/use-message-counts.ts b/src/hooks/use-message-counts.ts
index 3d58a83..512bd24 100644
--- a/src/hooks/use-message-counts.ts
+++ b/src/hooks/use-message-counts.ts
@@ -64,7 +64,7 @@ export function useMessageCounts(mailboxId?: string | null, enabled = true) {
...current.folders,
inbox: {
...current.folders.inbox,
- unread: Math.max(0, current.folders.inbox.unread + detail.inboxUnreadDelta),
+ unread: Math.max(0, current.folders.inbox.unread + (detail.inboxUnreadDelta ?? 0)),
},
},
}));
diff --git a/src/lib/calendar/utils.ts b/src/lib/calendar/utils.ts
index db69b05..3b49b1e 100644
--- a/src/lib/calendar/utils.ts
+++ b/src/lib/calendar/utils.ts
@@ -16,7 +16,7 @@ function formatCalendarDate(value: Date): string {
return value.toISOString().replace(/[-:]/g, "").replace(/\.\d{3}/, "");
}
-export function createCalendarInvitation(input: CalendarInvitationInput): Uint8Array {
+export function createCalendarInvitation(input: CalendarInvitationInput): ArrayBuffer {
const lines = ["BEGIN:VCALENDAR", "VERSION:2.0", "PRODID:-//Mailflare//Calendar//EN", "CALSCALE:GREGORIAN", `METHOD:${input.method ?? "REQUEST"}`, "BEGIN:VEVENT", `UID:${input.uid}@mailflare`, `DTSTAMP:${formatCalendarDate(new Date())}`, `DTSTART:${formatCalendarDate(input.startsAt)}`, `DTEND:${formatCalendarDate(input.endsAt)}`, `SUMMARY:${escapeCalendarText(input.title)}`, `DESCRIPTION:${escapeCalendarText(input.description)}`, `LOCATION:${escapeCalendarText(input.location)}`, "END:VEVENT", "END:VCALENDAR"];
- return new TextEncoder().encode(lines.join("\r\n"));
+ return new TextEncoder().encode(lines.join("\r\n")).buffer as ArrayBuffer;
}