refactor: update board slug prefix to use dynamic base URL from env (#38)
* refactor: update board slug prefix to use dynamic base URL from env * feat: add board slug availability check with real-time validation UI * refactor: consolidate board slug lookup by removing boardSlug repo and updating environment variables * feat: allow board slug reuse across different workspaces * chore: update environment settings and remove unused imports * refactor: update board slug availability check to use boardPublicId instead of workspaceSlug * refactor: simplify board slug availability check with direct SQL query
This commit is contained in:
@@ -1,11 +1,13 @@
|
|||||||
import { zodResolver } from "@hookform/resolvers/zod";
|
import { zodResolver } from "@hookform/resolvers/zod";
|
||||||
|
import { env } from "next-runtime-env";
|
||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
import { useForm } from "react-hook-form";
|
import { useForm } from "react-hook-form";
|
||||||
import { HiXMark } from "react-icons/hi2";
|
import { HiCheck, HiXMark } from "react-icons/hi2";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
import Button from "~/components/Button";
|
import Button from "~/components/Button";
|
||||||
import Input from "~/components/Input";
|
import Input from "~/components/Input";
|
||||||
|
import { useDebounce } from "~/hooks/useDebounce";
|
||||||
import { useModal } from "~/providers/modal";
|
import { useModal } from "~/providers/modal";
|
||||||
import { usePopup } from "~/providers/popup";
|
import { usePopup } from "~/providers/popup";
|
||||||
import { api } from "~/utils/api";
|
import { api } from "~/utils/api";
|
||||||
@@ -49,6 +51,7 @@ export function UpdateBoardSlugForm({
|
|||||||
register,
|
register,
|
||||||
handleSubmit,
|
handleSubmit,
|
||||||
formState: { isDirty, errors },
|
formState: { isDirty, errors },
|
||||||
|
watch,
|
||||||
} = useForm<FormValues>({
|
} = useForm<FormValues>({
|
||||||
resolver: zodResolver(schema),
|
resolver: zodResolver(schema),
|
||||||
values: {
|
values: {
|
||||||
@@ -57,6 +60,10 @@ export function UpdateBoardSlugForm({
|
|||||||
mode: "onChange",
|
mode: "onChange",
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const slug = watch("slug");
|
||||||
|
|
||||||
|
const [debouncedSlug] = useDebounce(slug, 500);
|
||||||
|
|
||||||
const updateBoardSlug = api.board.update.useMutation({
|
const updateBoardSlug = api.board.update.useMutation({
|
||||||
onError: () => {
|
onError: () => {
|
||||||
showPopup({
|
showPopup({
|
||||||
@@ -71,6 +78,20 @@ export function UpdateBoardSlugForm({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const checkBoardSlugAvailability =
|
||||||
|
api.board.checkSlugAvailability.useQuery(
|
||||||
|
{
|
||||||
|
boardSlug: debouncedSlug,
|
||||||
|
boardPublicId,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
enabled:
|
||||||
|
!!debouncedSlug && debouncedSlug !== boardSlug && !errors.slug,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
const isBoardSlugAvailable = checkBoardSlugAvailability.data;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const nameElement: HTMLElement | null =
|
const nameElement: HTMLElement | null =
|
||||||
document.querySelector<HTMLElement>("#board-slug");
|
document.querySelector<HTMLElement>("#board-slug");
|
||||||
@@ -78,6 +99,9 @@ export function UpdateBoardSlugForm({
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const onSubmit = (data: FormValues) => {
|
const onSubmit = (data: FormValues) => {
|
||||||
|
if (!isBoardSlugAvailable) return;
|
||||||
|
if (isBoardSlugAvailable?.isReserved) return;
|
||||||
|
|
||||||
updateBoardSlug.mutate({
|
updateBoardSlug.mutate({
|
||||||
slug: data.slug,
|
slug: data.slug,
|
||||||
boardPublicId,
|
boardPublicId,
|
||||||
@@ -106,14 +130,23 @@ export function UpdateBoardSlugForm({
|
|||||||
<Input
|
<Input
|
||||||
id="board-slug"
|
id="board-slug"
|
||||||
{...register("slug")}
|
{...register("slug")}
|
||||||
errorMessage={errors.slug?.message}
|
errorMessage={errors.slug?.message || (isBoardSlugAvailable?.isReserved
|
||||||
prefix={`kan.bn/${workspaceSlug}/`}
|
? "This board URL has already been taken"
|
||||||
|
: undefined)}
|
||||||
|
prefix={`${env("NEXT_PUBLIC_BASE_URL")}/${workspaceSlug}/`}
|
||||||
onKeyDown={async (e) => {
|
onKeyDown={async (e) => {
|
||||||
if (e.key === "Enter") {
|
if (e.key === "Enter") {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
await handleSubmit(onSubmit)();
|
await handleSubmit(onSubmit)();
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
iconRight={
|
||||||
|
!!errors.slug?.message || isBoardSlugAvailable?.isReserved ? (
|
||||||
|
<HiXMark className="h-4 w-4 text-red-500" />
|
||||||
|
) : (
|
||||||
|
<HiCheck className="h-4 w-4 dark:text-dark-1000" />
|
||||||
|
)
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-12 flex items-center justify-end border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600">
|
<div className="mt-12 flex items-center justify-end border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600">
|
||||||
@@ -124,7 +157,8 @@ export function UpdateBoardSlugForm({
|
|||||||
disabled={
|
disabled={
|
||||||
!isDirty ||
|
!isDirty ||
|
||||||
updateBoardSlug.isPending ||
|
updateBoardSlug.isPending ||
|
||||||
errors.slug?.message !== undefined
|
errors.slug?.message !== undefined ||
|
||||||
|
isBoardSlugAvailable?.isReserved
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
Update
|
Update
|
||||||
|
|||||||
@@ -352,4 +352,40 @@ export const boardRouter = createTRPCRouter({
|
|||||||
|
|
||||||
return { success: true };
|
return { success: true };
|
||||||
}),
|
}),
|
||||||
|
checkSlugAvailability: publicProcedure
|
||||||
|
.meta({
|
||||||
|
openapi: {
|
||||||
|
summary: "Check if a board slug is available",
|
||||||
|
method: "GET",
|
||||||
|
path: "/boards/{boardPublicId}/check-slug-availability",
|
||||||
|
description: "Checks if a board slug is available",
|
||||||
|
tags: ["Boards"],
|
||||||
|
protect: true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.input(
|
||||||
|
z.object({
|
||||||
|
boardSlug: z
|
||||||
|
.string()
|
||||||
|
.min(3)
|
||||||
|
.max(24)
|
||||||
|
.regex(/^(?![-]+$)[a-zA-Z0-9-]+$/),
|
||||||
|
boardPublicId: z.string().min(12),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.output(
|
||||||
|
z.object({
|
||||||
|
isReserved: z.boolean(),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.query(async ({ ctx, input }) => {
|
||||||
|
const isBoardSlugAvailable = await boardRepo.isBoardSlugAvailable(
|
||||||
|
ctx.db,
|
||||||
|
input.boardSlug,
|
||||||
|
input.boardPublicId,
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
isReserved: !isBoardSlugAvailable,
|
||||||
|
};
|
||||||
|
}),
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { and, asc, desc, eq, inArray, isNull, or } from "drizzle-orm";
|
import { and, asc, desc, eq, exists, inArray, isNull, or, sql } from "drizzle-orm";
|
||||||
|
|
||||||
import type { dbClient } from "@kan/db/client";
|
import type { dbClient } from "@kan/db/client";
|
||||||
import type { BoardVisibilityStatus } from "@kan/db/schema";
|
import type { BoardVisibilityStatus } from "@kan/db/schema";
|
||||||
@@ -477,3 +477,34 @@ export const getWorkspaceAndBoardIdByBoardPublicId = async (
|
|||||||
|
|
||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const isBoardSlugAvailable = async (
|
||||||
|
db: dbClient,
|
||||||
|
boardSlug: string,
|
||||||
|
boardPublicId: string,
|
||||||
|
) => {
|
||||||
|
const result = await db
|
||||||
|
.select({ id: boards.id })
|
||||||
|
.from(boards)
|
||||||
|
.where(
|
||||||
|
and(
|
||||||
|
eq(boards.publicId, boardPublicId),
|
||||||
|
exists(
|
||||||
|
db
|
||||||
|
.select({ id: boards.id })
|
||||||
|
.from(boards)
|
||||||
|
.where(
|
||||||
|
and(
|
||||||
|
eq(boards.slug, boardSlug),
|
||||||
|
eq(boards.workspaceId, sql`${boards.workspaceId}`), // Reference outer query's workspaceId
|
||||||
|
isNull(boards.deletedAt),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.limit(1),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.limit(1);
|
||||||
|
|
||||||
|
return result.length === 0;
|
||||||
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user