Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Untangle file-level import cycles in components/forms and lib/datetime (#2558)
Luke Vella003ce1055e95
diff --git a/apps/web/src/components/forms/index.ts b/apps/web/src/components/forms/index.tsindex bd9308f3e..11c00f4f6 100644--- a/apps/web/src/components/forms/index.ts+++ b/apps/web/src/components/forms/index.ts@@ -1,5 +1,3 @@-export type { PollDetailsData } from "./poll-details-form";export { PollDetailsForm } from "./poll-details-form";-export type { PollOptionsData } from "./poll-options-form/poll-options-form";export { default as PollOptionsForm } from "./poll-options-form/poll-options-form";export * from "./types";diff --git a/apps/web/src/components/forms/poll-details-form.tsx b/apps/web/src/components/forms/poll-details-form.tsxindex 7f080778b..a39cb3557 100644--- a/apps/web/src/components/forms/poll-details-form.tsx+++ b/apps/web/src/components/forms/poll-details-form.tsx@@ -8,12 +8,6 @@ import { useFormValidation } from "@/utils/form-validation";import type { NewEventData } from "./types";-export interface PollDetailsData {- title: string;- location: string;- description: string;-}-export const PollDetailsForm = () => {const { t } = useTranslation();const form = useFormContext<NewEventData>();diff --git a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx b/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsxindex 3975b4ab5..3b9d236ea 100644--- a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx+++ b/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx@@ -26,7 +26,7 @@ import {EmptyStateIcon,EmptyStateTitle,} from "@/components/empty-state";-import type { NewEventData } from "@/components/forms";+import type { NewEventData } from "@/components/forms/types";import { Trans, useTranslation } from "@/i18n/client";import { useDateTime, useDateTimeConfig } from "@/lib/datetime/client";import { formatDateParts } from "@/lib/datetime/format";@@ -38,8 +38,7 @@ import {} from "../../../../utils/date-time-utils";import DateCard from "../../../date-card";import { useHeadlessDatePicker } from "../../../headless-date-picker";-import type { DateTimeOption } from "..";-import type { DateTimePickerProps } from "../types";+import type { DateTimeOption, DateTimePickerProps } from "../types";import { formatDateWithoutTime, formatDateWithoutTz } from "../utils";import TimePicker from "./time-picker";diff --git a/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx b/apps/web/src/components/forms/poll-options-form/poll-options-form.tsxindex bf50fb35f..7ab47744f 100644--- a/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx+++ b/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx@@ -24,17 +24,8 @@ import { Trans, useTranslation } from "@/i18n/client";import { getBrowserTimeZone } from "../../../utils/date-time-utils";import type { NewEventData } from "../types";import MonthCalendar from "./month-calendar";-import type { DateTimeOption } from "./types";import WeekCalendar from "./week-calendar";-export type PollOptionsData = {- navigationDate: string; // used to navigate to the right part of the calendar- duration: number; // duration of the event in minutes- timeZone: string;- view: string;- options: DateTimeOption[];-};-const PollOptionsForm = ({children,disableTimeZoneChange,diff --git a/apps/web/src/components/forms/poll-settings.tsx b/apps/web/src/components/forms/poll-settings.tsxindex 327de54a6..3e1bf961d 100644--- a/apps/web/src/components/forms/poll-settings.tsx+++ b/apps/web/src/components/forms/poll-settings.tsx@@ -11,18 +11,12 @@ import { Switch } from "@rallly/ui/switch";import { AtSignIcon, EyeIcon, MessageCircleIcon, VoteIcon } from "lucide-react";import type React from "react";import { useFormContext } from "react-hook-form";+import type { PollSettingsFormData } from "@/components/forms/types";import { ProBadge } from "@/components/pro-badge";import { useIsFree } from "@/features/billing/client";import { showPayWall } from "@/features/billing/paywall-store";import { Trans } from "@/i18n/client";-export type PollSettingsFormData = {- requireParticipantEmail: boolean;- hideParticipants: boolean;- hideScores: boolean;- disableComments: boolean;-};-const PollSetting = ({name,icon: Icon,diff --git a/apps/web/src/components/forms/types.ts b/apps/web/src/components/forms/types.tsindex 32f49a70b..dab29c9d4 100644--- a/apps/web/src/components/forms/types.ts+++ b/apps/web/src/components/forms/types.ts@@ -1,7 +1,25 @@-import type { PollSettingsFormData } from "@/components/forms/poll-settings";+import type { DateTimeOption } from "./poll-options-form/types";-import type { PollDetailsData } from "./poll-details-form";-import type { PollOptionsData } from "./poll-options-form/poll-options-form";+export interface PollDetailsData {+ title: string;+ location: string;+ description: string;+}++export type PollOptionsData = {+ navigationDate: string; // used to navigate to the right part of the calendar+ duration: number; // duration of the event in minutes+ timeZone: string;+ view: string;+ options: DateTimeOption[];+};++export type PollSettingsFormData = {+ requireParticipantEmail: boolean;+ hideParticipants: boolean;+ hideScores: boolean;+ disableComments: boolean;+};export type NewEventData = PollDetailsData &PollOptionsData &diff --git a/apps/web/src/components/participants-provider.tsx b/apps/web/src/components/participants-provider.tsxindex 1d18f0fa4..d7fa055a8 100644--- a/apps/web/src/components/participants-provider.tsx+++ b/apps/web/src/components/participants-provider.tsx@@ -1,8 +1,6 @@import type { VoteType } from "@rallly/database";import { useParams, useSearchParams } from "next/navigation";import * as React from "react";-import { useVisibility } from "@/components/visibility";-import { usePermissions } from "@/contexts/permissions";import { useTranslation } from "@/i18n/client";import { trpc } from "@/trpc/client";@@ -43,20 +41,3 @@ export const useParticipants = () => {return { participants };};--export const useVisibleParticipants = () => {- const { canSeeScores } = useVisibility();- const { canEditParticipant } = usePermissions();- const { participants } = useParticipants();-- const filteredParticipants = React.useMemo(() => {- if (!canSeeScores) {- return participants.filter((participant) =>- canEditParticipant(participant.id),- );- }- return participants;- }, [canEditParticipant, canSeeScores, participants]);-- return filteredParticipants;-};diff --git a/apps/web/src/components/poll/desktop-poll.tsx b/apps/web/src/components/poll/desktop-poll.tsxindex 1c23f67bb..839be9f4f 100644--- a/apps/web/src/components/poll/desktop-poll.tsx+++ b/apps/web/src/components/poll/desktop-poll.tsx@@ -30,10 +30,8 @@ import { ScrollContainer } from "@/components/scroll-container";import { usePermissions } from "@/contexts/permissions";import { usePoll } from "@/contexts/poll";import { Trans, useTranslation } from "@/i18n/client";-import {- useParticipants,- useVisibleParticipants,-} from "../participants-provider";+import { useParticipants } from "../participants-provider";+import { useVisibleParticipants } from "../visibility";import ParticipantRow from "./desktop-poll/participant-row";import ParticipantRowForm from "./desktop-poll/participant-row-form";import PollHeader from "./desktop-poll/poll-header";diff --git a/apps/web/src/components/poll/mobile-poll.tsx b/apps/web/src/components/poll/mobile-poll.tsxindex a48bd8beb..3fb62dcb3 100644--- a/apps/web/src/components/poll/mobile-poll.tsx+++ b/apps/web/src/components/poll/mobile-poll.tsx@@ -24,9 +24,8 @@ import { YouAvatar } from "@/components/poll/you-avatar";import { useOptions, usePoll } from "@/components/poll-context";import { usePermissions } from "@/contexts/permissions";import { Trans, useTranslation } from "@/i18n/client";--import { useVisibleParticipants } from "../participants-provider";import { useUser } from "../user-provider";+import { useVisibleParticipants } from "../visibility";import GroupedOptions from "./mobile-poll/grouped-options";if (typeof window !== "undefined") {diff --git a/apps/web/src/components/visibility.tsx b/apps/web/src/components/visibility.tsxindex 5cf822fb8..b4411978e 100644--- a/apps/web/src/components/visibility.tsx+++ b/apps/web/src/components/visibility.tsx@@ -27,6 +27,23 @@ const VisibilityContext = React.createContext<{canSeeScores: true,});+export const useVisibleParticipants = () => {+ const { canSeeScores } = useVisibility();+ const { canEditParticipant } = usePermissions();+ const { participants } = useParticipants();++ const filteredParticipants = React.useMemo(() => {+ if (!canSeeScores) {+ return participants.filter((participant) =>+ canEditParticipant(participant.id),+ );+ }+ return participants;+ }, [canEditParticipant, canSeeScores, participants]);++ return filteredParticipants;+};+export const VisibilityProvider = ({ children }: React.PropsWithChildren) => {const poll = usePoll();const { participants } = useParticipants();diff --git a/apps/web/src/features/scheduled-event/components/event-date-time.tsx b/apps/web/src/features/scheduled-event/components/event-date-time.tsxindex 85e1c5725..d26a4eddd 100644--- a/apps/web/src/features/scheduled-event/components/event-date-time.tsx+++ b/apps/web/src/features/scheduled-event/components/event-date-time.tsx@@ -8,9 +8,10 @@ import {import { Trans } from "@/i18n/client";import { CalendarDate } from "@/lib/datetime/calendar-date";import { useDateTimeConfig } from "@/lib/datetime/client";-import type { DateInput, DatePreset } from "@/lib/datetime/format";+import type { DatePreset } from "@/lib/datetime/format";import { formatDateParts } from "@/lib/datetime/format";import { Time, TimeRange } from "@/lib/datetime/time";+import type { DateInput } from "@/lib/datetime/types";import { useHydrated } from "@/lib/datetime/use-hydrated";/**diff --git a/apps/web/src/features/scheduled-event/utils.ts b/apps/web/src/features/scheduled-event/utils.tsindex afb8fa81e..042411f66 100644--- a/apps/web/src/features/scheduled-event/utils.ts+++ b/apps/web/src/features/scheduled-event/utils.ts@@ -3,7 +3,7 @@ import {formatDateTime,formatDateTimeRange,} from "@/lib/datetime/format";-import type { TimeFormat } from "@/lib/datetime/schema";+import type { TimeFormat } from "@/lib/datetime/types";export interface FormattedEventDateTime {date: string;diff --git a/apps/web/src/lib/datetime/calendar-date.tsx b/apps/web/src/lib/datetime/calendar-date.tsxindex 71368f44c..954fb9e78 100644--- a/apps/web/src/lib/datetime/calendar-date.tsx+++ b/apps/web/src/lib/datetime/calendar-date.tsx@@ -1,8 +1,9 @@"use client";import { useDateTimeConfig } from "@/lib/datetime/client";-import type { DateInput, DatePreset } from "@/lib/datetime/format";+import type { DatePreset } from "@/lib/datetime/format";import { formatDate } from "@/lib/datetime/format";+import type { DateInput } from "@/lib/datetime/types";import { useHydrated } from "@/lib/datetime/use-hydrated";import { toISODate } from "./utils";diff --git a/apps/web/src/lib/datetime/client.tsx b/apps/web/src/lib/datetime/client.tsxindex e4ad32d1c..cd5b6ca32 100644--- a/apps/web/src/lib/datetime/client.tsx+++ b/apps/web/src/lib/datetime/client.tsx@@ -2,14 +2,14 @@import { defaultLocale } from "@rallly/languages";import React from "react";-import type { DateInput, DateTimePreset } from "@/lib/datetime/format";+import type { DateTimePreset } from "@/lib/datetime/format";import {formatDateTime as baseFormatDateTime,formatDuration as baseFormatDuration,formatRelativeTime,} from "@/lib/datetime/format";import { getLocaleDefaults, getWeekdayNames } from "@/lib/datetime/locales";-import type { TimeFormat } from "@/lib/datetime/schema";+import type { DateInput, TimeFormat } from "@/lib/datetime/types";import { normalizeTimeZone } from "@/lib/datetime/utils";import { getBrowserTimeZone } from "@/utils/date-time-utils";diff --git a/apps/web/src/lib/datetime/device.tsx b/apps/web/src/lib/datetime/device.tsxindex 432565048..7df1d42eb 100644--- a/apps/web/src/lib/datetime/device.tsx+++ b/apps/web/src/lib/datetime/device.tsx@@ -8,7 +8,7 @@ import {TIME_ZONE_COOKIE_NAME,TIME_ZONE_OVERRIDE_COOKIE_NAME,} from "@/lib/datetime/constants";-import type { TimeFormat } from "@/lib/datetime/schema";+import type { TimeFormat } from "@/lib/datetime/types";const cookieAttributes = {path: "/",diff --git a/apps/web/src/lib/datetime/format.test.ts b/apps/web/src/lib/datetime/format.test.tsindex 5e535a7d1..ea3f9fe0b 100644--- a/apps/web/src/lib/datetime/format.test.ts+++ b/apps/web/src/lib/datetime/format.test.ts@@ -5,7 +5,7 @@ import {formatDateTimeRange,formatRelativeTime,} from "@/lib/datetime/format";-import type { TimeFormat } from "@/lib/datetime/schema";+import type { TimeFormat } from "@/lib/datetime/types";// Fri 26 Jun 2026, in UTC.const at = (hour: number, minute = 0) =>diff --git a/apps/web/src/lib/datetime/format.ts b/apps/web/src/lib/datetime/format.tsindex 941888570..fa079eb94 100644--- a/apps/web/src/lib/datetime/format.ts+++ b/apps/web/src/lib/datetime/format.ts@@ -1,6 +1,4 @@-import type { TimeFormat } from "@/lib/datetime/schema";--export type DateInput = Date | number;+import type { DateInput, TimeFormat } from "@/lib/datetime/types";export type DatePreset =| "date"diff --git a/apps/web/src/lib/datetime/locales.ts b/apps/web/src/lib/datetime/locales.tsindex 35bafb753..5a632d8f8 100644--- a/apps/web/src/lib/datetime/locales.ts+++ b/apps/web/src/lib/datetime/locales.ts@@ -1,4 +1,4 @@-import type { TimeFormat } from "@/lib/datetime/schema";+import type { TimeFormat } from "@/lib/datetime/types";type LocaleDefaults = {weekStart: number;diff --git a/apps/web/src/lib/datetime/relative-time.tsx b/apps/web/src/lib/datetime/relative-time.tsxindex 9ef3398d7..8f8d2e067 100644--- a/apps/web/src/lib/datetime/relative-time.tsx+++ b/apps/web/src/lib/datetime/relative-time.tsx@@ -1,8 +1,8 @@"use client";import { useDateTimeConfig } from "@/lib/datetime/client";-import type { DateInput } from "@/lib/datetime/format";import { formatRelativeTime } from "@/lib/datetime/format";+import type { DateInput } from "@/lib/datetime/types";import { useHydrated } from "@/lib/datetime/use-hydrated";import { toISO } from "./utils";diff --git a/apps/web/src/lib/datetime/schema.ts b/apps/web/src/lib/datetime/schema.tsindex 1c327fccd..1c8b2ae3a 100644--- a/apps/web/src/lib/datetime/schema.ts+++ b/apps/web/src/lib/datetime/schema.ts@@ -1,11 +1,11 @@import * as z from "zod";+import type { TimeFormat } from "./types";import { normalizeTimeZone } from "./utils";-export const timeFormatSchema = z.enum(["hours12", "hours24"]);--// The formatting layer's own TimeFormat; same literals as the Prisma enum so-// user records assign directly, without coupling this layer to the database.-export type TimeFormat = z.infer<typeof timeFormatSchema>;+export const timeFormatSchema = z.enum([+ "hours12",+ "hours24",+]) satisfies z.ZodType<TimeFormat>;export const timeZoneSchema = z.string()diff --git a/apps/web/src/lib/datetime/time.tsx b/apps/web/src/lib/datetime/time.tsxindex 7a7c1b985..b7900a599 100644--- a/apps/web/src/lib/datetime/time.tsx+++ b/apps/web/src/lib/datetime/time.tsx@@ -1,8 +1,9 @@"use client";import { useDateTimeConfig } from "@/lib/datetime/client";-import type { DateInput, DateTimePreset } from "@/lib/datetime/format";+import type { DateTimePreset } from "@/lib/datetime/format";import { formatDateTime, formatDateTimeRange } from "@/lib/datetime/format";+import type { DateInput } from "@/lib/datetime/types";import { useHydrated } from "@/lib/datetime/use-hydrated";import { toISO } from "./utils";diff --git a/apps/web/src/lib/datetime/types.ts b/apps/web/src/lib/datetime/types.tsnew file mode 100644index 000000000..352707f74--- /dev/null+++ b/apps/web/src/lib/datetime/types.ts@@ -0,0 +1,5 @@+export type DateInput = Date | number;++// The formatting layer's own TimeFormat; same literals as the Prisma enum so+// user records assign directly, without coupling this layer to the database.+export type TimeFormat = "hours12" | "hours24";diff --git a/apps/web/src/lib/datetime/utils.ts b/apps/web/src/lib/datetime/utils.tsindex 38c6ab9a6..251a04e4b 100644--- a/apps/web/src/lib/datetime/utils.ts+++ b/apps/web/src/lib/datetime/utils.ts@@ -1,5 +1,4 @@-import type { DateInput } from "@/lib/datetime/format";-import type { TimeFormat } from "@/lib/datetime/schema";+import type { DateInput, TimeFormat } from "@/lib/datetime/types";function toDate(value: DateInput) {return value instanceof Date ? value : new Date(value);diff --git a/apps/web/src/utils/date-time-utils.ts b/apps/web/src/utils/date-time-utils.tsindex ba1d8b0d6..9aaf8bfa7 100644--- a/apps/web/src/utils/date-time-utils.ts+++ b/apps/web/src/utils/date-time-utils.ts@@ -3,7 +3,7 @@ import { dayjs } from "@/lib/dayjs";import type {DateTimeOption,TimeOption,-} from "../components/forms/poll-options-form";+} from "../components/forms/poll-options-form/types";export function getBrowserTimeZone() {return dayjs.tz.guess();