diff --git a/apps/nextjs/src/app/[locale]/boards/[name]/settings/page.tsx b/apps/nextjs/src/app/[locale]/boards/[name]/settings/page.tsx index 002c5f4c8..06255e0ff 100644 --- a/apps/nextjs/src/app/[locale]/boards/[name]/settings/page.tsx +++ b/apps/nextjs/src/app/[locale]/boards/[name]/settings/page.tsx @@ -95,7 +95,7 @@ export default async function BoardSettingsPage({ params, searchParams }: Props) - + )} diff --git a/apps/nextjs/src/app/[locale]/manage/settings/_components/board-settings-form.tsx b/apps/nextjs/src/app/[locale]/manage/settings/_components/board-settings-form.tsx index d91d94196..8890cbce0 100644 --- a/apps/nextjs/src/app/[locale]/manage/settings/_components/board-settings-form.tsx +++ b/apps/nextjs/src/app/[locale]/manage/settings/_components/board-settings-form.tsx @@ -19,8 +19,8 @@ export const BoardSettingsForm = ({ defaultValues }: { defaultValues: ServerSett {(form) => ( <> ({ value: board.id, label: board.name, @@ -35,7 +35,7 @@ export const BoardSettingsForm = ({ defaultValues }: { defaultValues: ServerSett )} - {...form.getInputProps("defaultBoardId")} + {...form.getInputProps("homeBoardId")} /> )} diff --git a/packages/api/src/router/board.ts b/packages/api/src/router/board.ts index 7ab693bde..accbf7aa3 100644 --- a/packages/api/src/router/board.ts +++ b/packages/api/src/router/board.ts @@ -229,10 +229,10 @@ export const boardRouter = createTRPCRouter({ await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.id), "full"); const boardSettings = await getServerSettingByKeyAsync(ctx.db, "board"); - if (input.visibility !== "public" && boardSettings.defaultBoardId === input.id) { + if (input.visibility !== "public" && boardSettings.homeBoardId === input.id) { throw new TRPCError({ code: "BAD_REQUEST", - message: "Cannot make default board private", + message: "Cannot make home board private", }); } @@ -259,13 +259,13 @@ export const boardRouter = createTRPCRouter({ }) : null; - // 1. user home board, 2. default board, 3. not found + // 1. user home board, 2. home board, 3. not found let boardWhere: SQL | null = null; if (user?.homeBoardId) { boardWhere = eq(boards.id, user.homeBoardId); } else { const boardSettings = await getServerSettingByKeyAsync(ctx.db, "board"); - boardWhere = boardSettings.defaultBoardId ? eq(boards.id, boardSettings.defaultBoardId) : null; + boardWhere = boardSettings.homeBoardId ? eq(boards.id, boardSettings.homeBoardId) : null; } if (!boardWhere) { diff --git a/packages/api/src/router/test/board.spec.ts b/packages/api/src/router/test/board.spec.ts index 034fc585b..c8a50ca25 100644 --- a/packages/api/src/router/test/board.spec.ts +++ b/packages/api/src/router/test/board.spec.ts @@ -507,7 +507,7 @@ describe("getHomeBoard should return home board", () => { const fullBoardProps = await createFullBoardAsync(db, "home"); await db.insert(serverSettings).values({ settingKey: "board", - value: SuperJSON.stringify({ defaultBoardId: fullBoardProps.boardId }), + value: SuperJSON.stringify({ homeBoardId: fullBoardProps.boardId }), }); // Act diff --git a/packages/server-settings/src/index.ts b/packages/server-settings/src/index.ts index 9d3c61373..779490f00 100644 --- a/packages/server-settings/src/index.ts +++ b/packages/server-settings/src/index.ts @@ -25,7 +25,7 @@ export const defaultServerSettings = { noSiteLinksSearchBox: false, }, board: { - defaultBoardId: null as string | null, + homeBoardId: null as string | null, }, appearance: { defaultColorScheme: "light" as ColorScheme, diff --git a/packages/translation/src/lang/en.json b/packages/translation/src/lang/en.json index 0ec22920c..7b8655ed1 100644 --- a/packages/translation/src/lang/en.json +++ b/packages/translation/src/lang/en.json @@ -2075,8 +2075,8 @@ }, "board": { "title": "Boards", - "defaultBoard": { - "label": "Global default board", + "homeBoard": { + "label": "Global home board", "description": "Only public boards are available for selection" } },