feat: workspace start of week column (closes #361) (#399)

* feat: workspace start of week column

* feat(l10n): add workspace setting for the first day of the week

Fixes #361

* feat: add Saturday as option

* chore: fix migration order

* chore: fix merge

---------

Co-authored-by: Henry <henry_ball@hotmail.co.uk>

apps/web/src/components/DateSelector.tsx

@@ -17,9 +17,14 @@ import { twMerge } from "tailwind-merge";
 interface DateSelectorProps {
   selectedDate?: Date | null;
   onDateSelect?: (date: Date | undefined) => void;
+  weekStartsOn?: 0 | 1 | 6;
 }
 
-const DateSelector = ({ selectedDate, onDateSelect }: DateSelectorProps) => {
+const DateSelector = ({
+  selectedDate,
+  onDateSelect,
+  weekStartsOn = 1,
+}: DateSelectorProps) => {
   const [currentMonth, setCurrentMonth] = useState(() => {
     return selectedDate ? startOfMonth(selectedDate) : startOfMonth(new Date());
   });
@@ -28,18 +33,18 @@ const DateSelector = ({ selectedDate, onDateSelect }: DateSelectorProps) => {
   const year = format(currentMonth, "yyyy");
 
   const dayHeaders = useMemo(() => {
-    const weekStart = startOfWeek(new Date(), { weekStartsOn: 1 }); // Monday
+    const weekStart = startOfWeek(new Date(), { weekStartsOn });
     return eachDayOfInterval({
       start: weekStart,
       end: new Date(weekStart.getTime() + 6 * 24 * 60 * 60 * 1000),
     }).map((date) => format(date, "EEEEEE")); // Shortest localized day name
-  }, []);
+  }, [weekStartsOn]);
 
   const days = useMemo(() => {
     const monthStart = startOfMonth(currentMonth);
     const monthEnd = endOfMonth(currentMonth);
-    const calendarStart = startOfWeek(monthStart, { weekStartsOn: 1 }); // Monday
+    const calendarStart = startOfWeek(monthStart, { weekStartsOn });
-    const calendarEnd = endOfWeek(monthEnd, { weekStartsOn: 1 }); // Monday
+    const calendarEnd = endOfWeek(monthEnd, { weekStartsOn });
 
     return eachDayOfInterval({ start: calendarStart, end: calendarEnd }).map(
       (date) => {
@@ -53,7 +58,7 @@ const DateSelector = ({ selectedDate, onDateSelect }: DateSelectorProps) => {
         };
       },
     );
-  }, [currentMonth, selectedDate]);
+  }, [currentMonth, selectedDate, weekStartsOn]);
 
   const handlePreviousMonth = () => {
     setCurrentMonth(subMonths(currentMonth, 1));

apps/web/src/components/NewWorkspaceForm.tsx

@@ -111,6 +111,7 @@ export function NewWorkspaceForm() {
           slug: values.slug,
           plan: values.plan,
           role: "admin",
+          weekStartDay: 1,
         });
 
         // If in cloud and Pro toggle is enabled, create checkout session for pro

apps/web/src/providers/workspace.tsx

@@ -19,6 +19,7 @@ interface Workspace {
   slug: string | undefined;
   plan: "free" | "pro" | "enterprise" | undefined;
   role: "admin" | "member" | "guest";
+  weekStartDay: 0 | 1 | 6;
 }
 
 const initialWorkspace: Workspace = {
@@ -28,13 +29,14 @@ const initialWorkspace: Workspace = {
   slug: "",
   plan: "free",
   role: "member",
+  weekStartDay: 1,
 };
 
 const initialAvailableWorkspaces: Workspace[] = [];
 
-export const WorkspaceContext = createContext<WorkspaceContextProps | undefined>(
+export const WorkspaceContext = createContext<
-  undefined,
+  WorkspaceContextProps | undefined
-);
+>(undefined);
 
 export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
   children,
@@ -79,6 +81,7 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
         slug: workspace.slug,
         description: workspace.description,
         plan: workspace.plan,
+        weekStartDay: workspace.weekStartDay,
         hasLoaded: true,
       })) as Workspace[];
 
@@ -100,6 +103,7 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
         plan: selectedWorkspace.workspace.plan,
         description: selectedWorkspace.workspace.description,
         role: selectedWorkspace.role,
+        weekStartDay: selectedWorkspace.workspace.weekStartDay as 0 | 1 | 6,
       });
 
       if (workspacePublicId) {
@@ -119,6 +123,7 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
         plan: primaryWorkspace.plan,
         description: primaryWorkspace.description,
         role: primaryWorkspaceRole,
+        weekStartDay: primaryWorkspace.weekStartDay as 0 | 1 | 6,
       });
     }
   }, [data, isLoading, workspacePublicId, router]);

apps/web/src/views/board/components/NewCardForm.tsx

@@ -24,6 +24,7 @@ import Toggle from "~/components/Toggle";
 import { useModalFormState } from "~/hooks/useModalFormState";
 import { useModal } from "~/providers/modal";
 import { usePopup } from "~/providers/popup";
+import { useWorkspace } from "~/providers/workspace";
 import { api } from "~/utils/api";
 import { formatMemberDisplayName, getAvatarUrl } from "~/utils/helpers";
 
@@ -53,6 +54,7 @@ export function NewCardForm({
   queryParams,
 }: NewCardFormProps) {
   const { showPopup } = usePopup();
+  const { workspace } = useWorkspace();
   const { closeModal, openModal, modalStates, clearModalState } = useModal();
 
   const utils = api.useUtils();
@@ -491,6 +493,7 @@ export function NewCardForm({
                       setValue("dueDate", date ?? null);
                       setIsDateSelectorOpen(false);
                     }}
+                    weekStartsOn={workspace.weekStartDay}
                   />
                 </div>
               </>

apps/web/src/views/card/components/DueDateSelector.tsx

@@ -5,6 +5,7 @@ import { HiMiniPlus } from "react-icons/hi2";
 
 import DateSelector from "~/components/DateSelector";
 import { usePopup } from "~/providers/popup";
+import { useWorkspace } from "~/providers/workspace";
 import { api } from "~/utils/api";
 import { invalidateCard } from "~/utils/cardInvalidation";
 
@@ -22,6 +23,7 @@ export function DueDateSelector({
   disabled = false,
 }: DueDateSelectorProps) {
   const { showPopup } = usePopup();
+  const { workspace } = useWorkspace();
   const utils = api.useUtils();
   const [isOpen, setIsOpen] = useState(false);
   const [pendingDate, setPendingDate] = useState<Date | null | undefined>(
@@ -135,6 +137,7 @@ export function DueDateSelector({
             <DateSelector
               selectedDate={pendingDate ?? undefined}
               onDateSelect={handleDateSelect}
+              weekStartsOn={workspace.weekStartDay}
             />
           </div>
         </>

apps/web/src/views/settings/WorkspaceSettings.tsx

@@ -21,6 +21,7 @@ import UpdateWorkspaceDescriptionForm from "./components/UpdateWorkspaceDescript
 import UpdateWorkspaceEmailVisibilityForm from "./components/UpdateWorkspaceEmailVisibilityForm";
 import UpdateWorkspaceNameForm from "./components/UpdateWorkspaceNameForm";
 import UpdateWorkspaceUrlForm from "./components/UpdateWorkspaceUrlForm";
+import UpdateWeekStartDayForm from "./components/UpdateWeekStartDayForm";
 import { UpgradeToProConfirmation } from "./components/UpgradeToProConfirmation";
 
 export default function WorkspaceSettings() {
@@ -86,6 +87,15 @@ export default function WorkspaceSettings() {
           disabled={!canEditWorkspace}
         />
 
+        <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
+          {t`Week start day`}
+        </h2>
+        <UpdateWeekStartDayForm
+          workspacePublicId={workspace.publicId}
+          weekStartDay={workspaceData?.weekStartDay ?? 1}
+          disabled={!canEditWorkspace}
+        />
+
         <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
           {t`Email visibility`}
         </h2>

apps/web/src/views/settings/components/UpdateWeekStartDayForm.tsx

@@ -0,0 +1,59 @@
+import { t } from "@lingui/core/macro";
+import { useEffect, useState } from "react";
+
+import { api } from "~/utils/api";
+
+export default function UpdateWeekStartDayForm({
+  workspacePublicId,
+  weekStartDay,
+  disabled = false,
+}: {
+  workspacePublicId: string;
+  weekStartDay: number;
+  disabled?: boolean;
+}) {
+  const utils = api.useUtils();
+  const [value, setValue] = useState(weekStartDay);
+
+  useEffect(() => {
+    setValue(weekStartDay);
+  }, [weekStartDay]);
+
+  const updateWorkspace = api.workspace.update.useMutation({
+    onSuccess: () => {
+      if (workspacePublicId && workspacePublicId.length >= 12) {
+        void utils.workspace.byId.invalidate({
+          workspacePublicId,
+        });
+        void utils.workspace.all.invalidate();
+      }
+    },
+  });
+
+  const handleChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
+    if (disabled) return;
+    const newValue = Number(e.target.value);
+    setValue(newValue);
+    updateWorkspace.mutate({
+      workspacePublicId,
+      weekStartDay: newValue,
+    });
+  };
+
+  return (
+    <div className="flex gap-2">
+      <div className="mb-4 flex w-full max-w-[325px] items-center gap-2">
+        <select
+          value={value}
+          onChange={handleChange}
+          disabled={disabled || updateWorkspace.isPending}
+          className="block w-full rounded-md border-0 bg-dark-300 bg-white/5 py-1.5 text-sm shadow-sm ring-1 ring-inset ring-light-600 placeholder:text-dark-800 focus:ring-2 focus:ring-inset focus:ring-light-700 dark:text-dark-1000 dark:ring-dark-700 dark:focus:ring-dark-700 sm:leading-6"
+        >
+          <option value={0}>{t`Sunday`}</option>
+          <option value={1}>{t`Monday`}</option>
+          <option value={6}>{t`Saturday`}</option>
+        </select>
+      </div>
+    </div>
+  );
+}

packages/api/src/routers/workspace.ts

@@ -4,11 +4,10 @@ import { z } from "zod";
 
 import * as workspaceRepo from "@kan/db/repository/workspace.repo";
 import * as workspaceSlugRepo from "@kan/db/repository/workspaceSlug.repo";
-import { generateUID } from "@kan/shared/utils";
+import { generateAvatarUrl, generateUID } from "@kan/shared/utils";
 
 import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";
 import { assertPermission } from "../utils/permissions";
-import { generateAvatarUrl } from "@kan/shared/utils";
 
 export const workspaceRouter = createTRPCRouter({
   all: protectedProcedure
@@ -84,8 +83,7 @@ export const workspaceRouter = createTRPCRouter({
       const isAdmin = userMember?.role === "admin";
 
       // Show emails if user is admin OR workspace setting allows it
-      const shouldShowEmails =
+      const shouldShowEmails = isAdmin || result.showEmailsToMembers === true;
-        isAdmin || result.showEmailsToMembers === true;
 
       // Generate presigned URLs for member avatars
       const membersWithAvatarUrls = await Promise.all(
@@ -295,6 +293,9 @@ export const workspaceRouter = createTRPCRouter({
           .optional(),
         description: z.string().min(3).max(280).optional(),
         showEmailsToMembers: z.boolean().optional(),
+        weekStartDay: z
+          .union([z.literal(0), z.literal(1), z.literal(6)])
+          .optional(),
       }),
     )
     .output(z.custom<Awaited<ReturnType<typeof workspaceRepo.update>>>())
@@ -356,6 +357,7 @@ export const workspaceRouter = createTRPCRouter({
           slug: input.slug,
           description: input.description,
           showEmailsToMembers: input.showEmailsToMembers,
+          weekStartDay: input.weekStartDay,
         },
       );
 

packages/api/src/utils/webhook.ts

@@ -190,7 +190,7 @@ export async function sendWebhooksForWorkspace(
       db,
       workspaceId,
     );
-    const webhooks = allWebhooks.filter((w) =>
+    const webhooksForEvent = allWebhooks.filter((w) =>
       w.events.includes(payload.event),
     );
 

packages/db/migrations/20260311065722_AddWeekStartDay.sql

@@ -0,0 +1,52 @@
+-- Migrations and snapshots seem to have become out of sync (this should fix that)
+DO $$
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1
+    FROM pg_enum e
+    JOIN pg_type t ON e.enumtypid = t.oid
+    WHERE t.typname = 'source'
+      AND e.enumlabel = 'github'
+  ) THEN
+    ALTER TYPE "public"."source" ADD VALUE 'github';
+  END IF;
+END $$;
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "workspace_webhooks" (
+	"id" bigserial PRIMARY KEY NOT NULL,
+	"publicId" varchar(12) NOT NULL,
+	"workspaceId" bigint NOT NULL,
+	"name" varchar(255) NOT NULL,
+	"url" varchar(2048) NOT NULL,
+	"secret" text,
+	"events" text NOT NULL,
+	"active" boolean DEFAULT true NOT NULL,
+	"createdBy" uuid NOT NULL,
+	"createdAt" timestamp DEFAULT now() NOT NULL,
+	"updatedAt" timestamp,
+	CONSTRAINT "workspace_webhooks_publicId_unique" UNIQUE("publicId")
+);
+--> statement-breakpoint
+ALTER TABLE "workspace_webhooks" ENABLE ROW LEVEL SECURITY;--> statement-breakpoint
+ALTER TABLE "integration" ALTER COLUMN "accessToken" SET DATA TYPE text;--> statement-breakpoint
+ALTER TABLE "card_activity" ADD COLUMN IF NOT EXISTS "attachmentId" bigint;--> statement-breakpoint
+--> statement-breakpoint
+ALTER TABLE "workspace" ADD COLUMN IF NOT EXISTS "weekStartDay" integer DEFAULT 1 NOT NULL;--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "workspace_webhooks" ADD CONSTRAINT "workspace_webhooks_workspaceId_workspace_id_fk" FOREIGN KEY ("workspaceId") REFERENCES "public"."workspace"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "workspace_webhooks" ADD CONSTRAINT "workspace_webhooks_createdBy_user_id_fk" FOREIGN KEY ("createdBy") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "workspace_webhooks_workspace_idx" ON "workspace_webhooks" USING btree ("workspaceId");--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "card_activity" ADD CONSTRAINT "card_activity_attachmentId_card_attachment_id_fk" FOREIGN KEY ("attachmentId") REFERENCES "public"."card_attachment"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;

packages/db/migrations/meta/20260224105235_snapshot.json

@@ -1,6 +1,6 @@
 {
   "id": "dc863226-583e-4985-8b6a-4c360a3b9fa1",
-  "prevId": "4e1ebb8b-bd52-48c5-87d6-8e6e5eb8bbde",
+  "prevId": "d0ce9209-d34a-4ae8-b93e-d73391bfec64",
   "version": "7",
   "dialect": "postgresql",
   "tables": {

packages/db/migrations/meta/_journal.json

@@ -206,11 +206,18 @@
       "breakpoints": true
     },
     {
-      "idx": 28,
+      "idx": 29,
       "version": "7",
       "when": 1771930355536,
       "tag": "20260224105235_AddGitHubIntegrationSupport",
       "breakpoints": true
+    },
+    {
+      "idx": 30,
+      "version": "7",
+      "when": 1773212242728,
+      "tag": "20260311065722_AddWeekStartDay",
+      "breakpoints": true
     }
   ]
-}
+}

packages/db/src/repository/workspace.repo.ts

@@ -127,6 +127,7 @@ export const update = async (
     plan?: "free" | "pro" | "enterprise";
     description?: string;
     showEmailsToMembers?: boolean;
+    weekStartDay?: number;
   },
 ) => {
   const [result] = await db
@@ -137,6 +138,7 @@ export const update = async (
       plan: workspaceInput.plan,
       description: workspaceInput.description,
       showEmailsToMembers: workspaceInput.showEmailsToMembers,
+      weekStartDay: workspaceInput.weekStartDay,
     })
     .where(eq(workspaces.publicId, workspacePublicId))
     .returning({
@@ -147,6 +149,7 @@ export const update = async (
       description: workspaces.description,
       plan: workspaces.plan,
       showEmailsToMembers: workspaces.showEmailsToMembers,
+      weekStartDay: workspaces.weekStartDay,
     });
 
   return result;
@@ -189,6 +192,7 @@ export const getByPublicIdWithMembers = (
       name: true,
       slug: true,
       showEmailsToMembers: true,
+      weekStartDay: true,
     },
     with: {
       members: {
@@ -274,6 +278,7 @@ export const getAllByUserId = async (db: dbClient, userId: string) => {
           description: true,
           slug: true,
           plan: true,
+          weekStartDay: true,
           deletedAt: true,
         },
         // https://github.com/drizzle-team/drizzle-orm/issues/2903

packages/db/src/schema/workspaces.ts

@@ -3,6 +3,7 @@ import {
   bigint,
   bigserial,
   boolean,
+  integer,
   pgEnum,
   pgTable,
   text,
@@ -45,6 +46,7 @@ export const workspaces = pgTable("workspace", {
   slug: varchar("slug", { length: 255 }).notNull().unique(),
   plan: workspacePlanEnum("plan").notNull().default("free"),
   showEmailsToMembers: boolean("showEmailsToMembers").notNull().default(true),
+  weekStartDay: integer("weekStartDay").notNull().default(1),
   createdBy: uuid("createdBy").references(() => users.id, {
     onDelete: "set null",
   }),