fix: fix id mismatch on creation if switching forms

Author: tefkah

core/app/c/[communitySlug]/pubs/create/page.tsx

@@ -2,7 +2,7 @@ import type { Metadata } from "next";
 
 import { notFound, redirect } from "next/navigation";
 
-import { type PubTypesId } from "db/public";
+import { type PubsId, type PubTypesId } from "db/public";
 import { Button } from "ui/button";
 import { Label } from "ui/label";
 
@@ -31,12 +31,20 @@ export async function generateMetadata(props: {
 
 export default async function Page(props: {
 	params: Promise<{ communitySlug: string }>;
-	searchParams: Promise<Record<string, string> & { pubTypeId: PubTypesId; form?: string }>;
+	searchParams: Promise<
+		Record<string, string> & { pubTypeId: PubTypesId; form?: string; pubId?: PubsId }
+	>;
 }) {
 	const searchParams = await props.searchParams;
 	const params = await props.params;
 	const { communitySlug } = params;
 
+	if (!searchParams.pubId) {
+		const sparams = new URLSearchParams(searchParams);
+		sparams.set("pubId", crypto.randomUUID());
+		redirect(`/c/${communitySlug}/pubs/create?${sparams.toString()}`);
+	}
+
 	const { user } = await getPageLoginData();
 
 	const community = await findCommunityBySlug(communitySlug);

core/app/components/pubs/PubEditor/PubEditor.tsx

@@ -103,7 +103,14 @@ const getRelatedPubData = async ({
 };
 
 export type PubEditorProps = {
-	searchParams: { relatedPubId?: PubsId; slug?: string; pubTypeId?: PubTypesId; form?: string };
+	searchParams: {
+		relatedPubId?: PubsId;
+		slug?: string;
+		pubTypeId?: PubTypesId;
+		form?: string;
+		// used when creating a new pub
+		pubId?: PubsId;
+	};
 	htmlFormId?: string;
 	formSlug?: string;
 } & (
@@ -189,7 +196,7 @@ export async function PubEditor(props: PubEditorProps) {
 	// Create the pubId before inserting into the DB if one doesn't exist.
 	// FileUpload needs the pubId when uploading the file before the pub exists
 	const isUpdating = !!pub?.id;
-	const pubId = pub?.id ?? (randomUUID() as PubsId);
+	const pubId = pub?.id ?? props.searchParams.pubId ?? (randomUUID() as PubsId);
 
 	if (pub === undefined) {
 		if (props.searchParams.pubTypeId) {