Fix bugs and add form switcher to create page

Author: kalilsn

core/app/c/[communitySlug]/pubs/[pubId]/edit/page.tsx

@@ -72,7 +72,7 @@ export async function generateMetadata(props: {
 
 export default async function Page(props: {
 	params: Promise<{ pubId: PubsId; communitySlug: string }>;
-	searchParams: Promise<Record<string, string>>;
+	searchParams: Promise<Record<string, string> & { form: string }>;
 }) {
 	const searchParams = await props.searchParams;
 	const params = await props.params;
@@ -126,10 +126,11 @@ export default async function Page(props: {
 		>
 			<div className="flex justify-center py-10">
 				<div className="max-w-prose flex-1">
-					<FormSwitcher forms={availableForms} />
+					<FormSwitcher defaultFormSlug={searchParams.form} forms={availableForms} />
 					{/** TODO: Add suspense */}
 					<PubEditor
 						searchParams={searchParams}
+						formSlug={searchParams.form}
 						pubId={pub.id}
 						htmlFormId={htmlFormId}
 						communityId={community.id}

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

@@ -17,7 +17,7 @@ import { CreatePubButton } from "~/app/components/pubs/CreatePubButton";
 import { RemovePubButton } from "~/app/components/pubs/RemovePubButton";
 import { db } from "~/kysely/database";
 import { getPageLoginData } from "~/lib/authentication/loginData";
-import { getAuthorizedUpdateForms, userCan } from "~/lib/authorization/capabilities";
+import { getAuthorizedViewForms, userCan } from "~/lib/authorization/capabilities";
 import { getStageActions } from "~/lib/db/queries";
 import { getPubByForm, getPubTitle } from "~/lib/pubs";
 import { getPubsWithRelatedValues, pubValuesByVal } from "~/lib/server";
@@ -157,7 +157,7 @@ export default async function Page(props: {
 				{ type: MembershipType.pub, pubId: pub.id },
 				user.id
 			),
-			getAuthorizedUpdateForms(user.id, pub.id).execute(),
+			getAuthorizedViewForms(user.id, pub.id).execute(),
 		]);
 
 	const pubTypeHasRelatedPubs = pub.pubType.fields.some((field) => field.isRelation);

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

@@ -4,12 +4,14 @@ import { notFound, redirect } from "next/navigation";
 
 import { type PubTypesId } from "db/public";
 import { Button } from "ui/button";
+import { Label } from "ui/label";
 
 import { ContentLayout } from "~/app/c/[communitySlug]/ContentLayout";
+import { FormSwitcher } from "~/app/components/FormSwitcher/FormSwitcher";
 import { PageTitleWithStatus } from "~/app/components/pubs/PubEditor/PageTitleWithStatus";
 import { PubEditor } from "~/app/components/pubs/PubEditor/PubEditor";
 import { getPageLoginData } from "~/lib/authentication/loginData";
-import { userCanCreatePub } from "~/lib/authorization/capabilities";
+import { getAuthorizedCreateForms, userCanCreatePub } from "~/lib/authorization/capabilities";
 import { findCommunityBySlug } from "~/lib/server/community";
 
 export async function generateMetadata(props: {
@@ -29,7 +31,7 @@ export async function generateMetadata(props: {
 
 export default async function Page(props: {
 	params: Promise<{ communitySlug: string }>;
-	searchParams: Promise<Record<string, string> & { pubTypeId: PubTypesId }>;
+	searchParams: Promise<Record<string, string> & { pubTypeId: PubTypesId; form?: string }>;
 }) {
 	const searchParams = await props.searchParams;
 	const params = await props.params;
@@ -57,6 +59,12 @@ export default async function Page(props: {
 
 	const htmlFormId = `create-pub`;
 
+	const availableForms = await getAuthorizedCreateForms({
+		userId: user.id,
+		communityId: community.id,
+		pubTypeId: searchParams.pubTypeId,
+	}).execute();
+
 	return (
 		<ContentLayout
 			left={
@@ -69,10 +77,19 @@ export default async function Page(props: {
 		>
 			<div className="flex justify-center py-10">
 				<div className="max-w-prose flex-1">
+					<div className="mb-4 flex flex-col gap-3">
+						<Label htmlFor="create-page-form-switcher">Current form</Label>
+						<FormSwitcher
+							htmlId="create-page-form-switcher"
+							defaultFormSlug={searchParams.form}
+							forms={availableForms}
+						/>
+					</div>
 					<PubEditor
 						searchParams={searchParams}
 						communityId={community.id}
 						htmlFormId={htmlFormId}
+						formSlug={searchParams.form}
 						// PubEditor checks for the existence of the stageId prop
 						{...(searchParams["stageId"] ? { stageId: searchParams["stageId"] } : {})}
 					/>

core/app/components/FormSwitcher/FormSwitcher.tsx

@@ -13,9 +13,11 @@ export const formSwitcherUrlParam = "form";
 export const FormSwitcher = ({
 	forms,
 	defaultFormSlug,
+	htmlId,
 }: {
 	forms: SimpleForm[];
 	defaultFormSlug?: string;
+	htmlId?: string;
 }) => {
 	const router = useRouter();
 	const pathname = usePathname();
@@ -43,7 +45,7 @@ export const FormSwitcher = ({
 				}}
 				defaultValue={selectedFormSlug}
 			>
-				<SelectTrigger className="">
+				<SelectTrigger id={htmlId}>
 					<SelectValue />
 				</SelectTrigger>
 				<SelectContent>
@@ -54,7 +56,9 @@ export const FormSwitcher = ({
 					))}
 				</SelectContent>
 			</Select>
-			<Button onClick={switchForms}>Switch forms</Button>
+			<Button disabled={forms.length < 2} onClick={switchForms}>
+				Switch forms
+			</Button>
 		</div>
 	);
 };

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

@@ -103,7 +103,7 @@ const getRelatedPubData = async ({
 };
 
 export type PubEditorProps = {
-	searchParams: { relatedPubId?: PubsId; slug?: string; pubTypeId?: PubTypesId };
+	searchParams: { relatedPubId?: PubsId; slug?: string; pubTypeId?: PubTypesId; form?: string };
 	htmlFormId?: string;
 	formSlug?: string;
 } & (

core/lib/authorization/capabilities.ts

@@ -302,7 +302,6 @@ export const getAuthorizedCreateForms = ({
 							eb("membership_capabilities.capability", "in", [
 								Capabilities.createPubWithAnyForm,
 								Capabilities.createPubWithForm,
-								Capabilities.createPubWithDefaultForm,
 							]),
 						])
 					)
@@ -389,7 +388,7 @@ export const getAuthorizedUpdateForms = (userId: UsersId, pubId: PubsId) =>
 			)
 			.selectFrom("forms")
 			.innerJoin("community", "community.communityId", "forms.communityId")
-			.where("forms.pubTypeId", "=", (eb) => eb.selectFrom("pubtype").select("pubTypeId"))
+			.whereRef("forms.pubTypeId", "=", (eb) => eb.selectFrom("pubtype").select("id"))
 			.where((eb) =>
 				eb.or([
 					eb(
@@ -422,3 +421,32 @@ export const getAuthorizedUpdateForms = (userId: UsersId, pubId: PubsId) =>
 			.orderBy("forms.isDefault desc")
 			.orderBy("forms.updatedAt desc")
 	);
+
+export const getAuthorizedViewForms = (userId: UsersId, pubId: PubsId) =>
+	autoCache(
+		getAuthorizedUpdateForms(userId, pubId)
+			.qb.clearWhere()
+			.where((eb) =>
+				eb.or([
+					eb(
+						eb.val(Capabilities.editPubWithAnyForm),
+						"in",
+						eb.selectFrom("capabilities").select("capability")
+					),
+					eb.and([
+						eb(
+							eb.val(Capabilities.editPubWithForm),
+							"in",
+							eb.selectFrom("capabilities").select("capability")
+						),
+						eb.or([
+							eb("forms.id", "in", eb.selectFrom("pub_ms").select("formId")),
+							eb("forms.id", "in", eb.selectFrom("stage_ms").select("formId")),
+						]),
+					]),
+					// Always include the default form (otherwise these conditions are identical to update)
+					eb("forms.isDefault", "is", true),
+				])
+			)
+			.whereRef("forms.pubTypeId", "=", (eb) => eb.selectFrom("pubtype").select("id"))
+	);

core/prisma/migrations/20250420212706_update_capabilities/migration.sql

@@ -70,6 +70,7 @@ VALUES
     ('community'::"MembershipType", 'admin'::"MemberRole", 'editPubField'::"Capabilities"),
     ('community'::"MembershipType", 'admin'::"MemberRole", 'editPubType'::"Capabilities"),
     ('community'::"MembershipType", 'admin'::"MemberRole", 'editPubWithForm'::"Capabilities"),
+    ('community'::"MembershipType", 'admin'::"MemberRole", 'editPubWithAnyForm'::"Capabilities"),
     ('community'::"MembershipType", 'admin'::"MemberRole", 'manageMemberGroups'::"Capabilities"),
     ('community'::"MembershipType", 'admin'::"MemberRole", 'manageStage'::"Capabilities"),
     ('community'::"MembershipType", 'admin'::"MemberRole", 'movePub'::"Capabilities"),
@@ -87,6 +88,7 @@ VALUES
     ('community'::"MembershipType", 'editor'::"MemberRole", 'createRelatedPub'::"Capabilities"),
     ('community'::"MembershipType", 'editor'::"MemberRole", 'deletePub'::"Capabilities"),
     ('community'::"MembershipType", 'editor'::"MemberRole", 'editPubWithForm'::"Capabilities"),
+    ('community'::"MembershipType", 'editor'::"MemberRole", 'editPubWithAnyForm'::"Capabilities"),
     ('community'::"MembershipType", 'editor'::"MemberRole", 'movePub'::"Capabilities"),
     ('community'::"MembershipType", 'editor'::"MemberRole", 'runAction'::"Capabilities"),
     ('community'::"MembershipType", 'editor'::"MemberRole", 'seeExtraPubValues'::"Capabilities"),

packages/db/src/public/PublicSchema.ts

@@ -33,6 +33,22 @@ import type { StagesTable } from "./Stages";
 import type { UsersTable } from "./Users";
 
 export interface PublicSchema {
+	form_elements: FormElementsTable;
+
+	sessions: SessionsTable;
+
+	community_memberships: CommunityMembershipsTable;
+
+	pub_memberships: PubMembershipsTable;
+
+	stage_memberships: StageMembershipsTable;
+
+	membership_capabilities: MembershipCapabilitiesTable;
+
+	pub_values_history: PubValuesHistoryTable;
+
+	_FormElementToPubType: FormElementToPubTypeTable;
+
 	_prisma_migrations: PrismaMigrationsTable;
 
 	users: UsersTable;
@@ -76,20 +92,4 @@ export interface PublicSchema {
 	api_access_logs: ApiAccessLogsTable;
 
 	api_access_permissions: ApiAccessPermissionsTable;
-
-	form_elements: FormElementsTable;
-
-	sessions: SessionsTable;
-
-	community_memberships: CommunityMembershipsTable;
-
-	pub_memberships: PubMembershipsTable;
-
-	stage_memberships: StageMembershipsTable;
-
-	membership_capabilities: MembershipCapabilitiesTable;
-
-	pub_values_history: PubValuesHistoryTable;
-
-	_FormElementToPubType: FormElementToPubTypeTable;
 }