Add form switcher #1160

kalilsn · 2025-04-15T14:28:15Z

Issue(s) Resolved

Resolves #1037
Resolves #1036

High-level Explanation of PR

This PR adds the form switcher component to forms and the pub details page, and fully implements the new form permissions introduced in #1134.

Forms can now only be used to edit pubs of the same pub type as the form
Contributors can only edit and view pubs using the forms attached to their membership
Contributors to a pub without any forms can only view the pub, not edit it

Test Plan

Screenshots (if applicable)

Notes

…switcher

…dating a pub

…ties

tefkah · 2025-05-14T12:11:48Z

sorry, i have some suggested changes i wanted to push up to a separate branch, but accidentally pushed them here, hence the force push revert

tefkah

other than the bug with switching the view while creating the form it works well!

even though i know its temporary, i do feel like the behavior/look of the switcher could be slightly nicer. i put up this pr with some suggested changes: #1246

merge it in if you want, or not!

otherwise lgtm!

tefkah · 2025-05-14T10:14:32Z

core/app/c/(public)/[communitySlug]/public/forms/[formSlug]/fill/page.tsx

 		}

-		const result = await handleFormToken({
-			params,
-			searchParams,
-			onExpired: ({ params, searchParams, result }) => {
-				return;
-			},
-		});
-
 		return (


nice that we can get rid of this logic, i totally forgot it was there! good that we can just rely on the magic link/invite functionality now rather than this weird edge case

tefkah · 2025-05-14T10:38:00Z

core/app/components/FormSwitcher/FormSwitcherContext.tsx

+"use client";
+
+import type { Dispatch, PropsWithChildren, SetStateAction } from "react";
+
+import { createContext, useContext, useMemo, useState } from "react";
+
+import type { Form } from "~/lib/server/form";
+
+export type FormSwitcherContext = {
+	selectedForm?: Form;
+	setSelectedForm: Dispatch<SetStateAction<Form | undefined>>;
+};
+
+const FormSwitcherContext = createContext<FormSwitcherContext>({
+	setSelectedForm: () => {},
+});
+
+type Props = PropsWithChildren<{
+	defaultForm?: Form;
+}>;
+
+export const FormSwitcherProvider = ({ defaultForm, children }: Props) => {
+	const [selectedForm, setSelectedForm] = useState(defaultForm);
+
+	const value = useMemo(
+		() => ({ selectedForm, setSelectedForm }),
+		[selectedForm, setSelectedForm]
+	);
+
+	return <FormSwitcherContext.Provider value={value}>{children}</FormSwitcherContext.Provider>;
+};
+
+export const useFormSwitcherContext = () => useContext(FormSwitcherContext);


this doesn't seem to be used anywhere, maybe we can remove it?

tefkah · 2025-05-14T12:24:17Z

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

+	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()}`);
+	}
+


I added this to get around the following issue (see vid):

Go to create a Pub.

A pubId is internally initialized using crypto.randomUUID() in bc the UploadElement needs to know about it

Switch form

Content is reloaded! therefore crypto.randomUUID() is called again!

Create Pub

Redirect fails, bc clientside pubid is different from server one

To solve this, I madet this page always have a UUID through the searchParam. This is not optimal, if you navigate back from the edit page to this page it will behave somewhat strangely. That could be solved by doing an additional check if a UUID is provided, namely to check whether that Pub already exists. If it does, try once more.

I'm not a big fan of this solution, as it forces an extra redirect.

Another solution is to properly propagate the changes in UUID on the server to the client. The problem with this is the following:

Go to create a Pub.

Upload a File.

Switch the view

Create Pub

Upload file "PubId" no longer matches the pub it belongs to.

Maybe that's not a big deal and we should just do that, ill leave it to you!

The bug

Screen.Recording.2025-05-14.at.14.16.47.mov

tefkah · 2025-05-14T12:25:15Z

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

@@ -188,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);


this is the other place where the pubId searchParam is used, see above comment

tefkah · 2025-05-14T13:05:12Z

and again...

i made this (#1247) a separate PR as it was messing with the tests.

kalilsn changed the title ~~Remove extra character from croccrocid to fix api validation errors~~ Add form switcher Apr 15, 2025

kalilsn changed the base branch from main to kalilsn/memberships-have-forms April 15, 2025 14:30

kalilsn force-pushed the kalilsn/form-switcher branch from 13ee081 to 8948d60 Compare April 21, 2025 03:56

kalilsn force-pushed the kalilsn/memberships-have-forms branch from f3c9d0e to 87cecc5 Compare April 21, 2025 04:57

kalilsn force-pushed the kalilsn/form-switcher branch from a6adb69 to ff6774d Compare April 21, 2025 04:58

kalilsn added the preview Auto-deploys a preview application label Apr 21, 2025

3mcd temporarily deployed to gh-654103159-pr-1160 April 21, 2025 05:06 Inactive

kalilsn force-pushed the kalilsn/form-switcher branch from 5719a72 to 28d6c2a Compare April 22, 2025 14:31

3mcd temporarily deployed to gh-654103159-pr-1160 April 22, 2025 14:36 Inactive

3mcd temporarily deployed to gh-654103159-pr-1160 April 22, 2025 19:35 Inactive

kalilsn force-pushed the kalilsn/form-switcher branch from 3252290 to 27d51b4 Compare April 22, 2025 20:10

3mcd temporarily deployed to gh-654103159-pr-1160 April 22, 2025 20:15 Inactive

Base automatically changed from kalilsn/memberships-have-forms to main April 22, 2025 20:34

kalilsn added 9 commits April 22, 2025 15:36

Add form switcher

824ba51

Update capabilities

00807da

Use membership formIds to calculate permissions and list of forms in …

7160549

…switcher

Restrict related pubs table by selected form

bc44327

Fix bugs and add form switcher to create page

4995854

Remove unused component

3e09375

Validate that updated fields are present in the form when creating/up…

c7b2919

…dating a pub

Fix relation overwrite bug

810bff2

Add form slug to pub update/create calls in tests

05289b7

kalilsn force-pushed the kalilsn/form-switcher branch from 27d51b4 to 05289b7 Compare April 22, 2025 20:36

Add label for form switcher to edit form

b17ba4f

3mcd temporarily deployed to gh-654103159-pr-1160 April 22, 2025 20:41 Inactive

kalilsn added 5 commits April 23, 2025 08:40

Remove old duplicate authorization check

48c237f

Fix getAuthorizedUpdateForms query to select editPubWithForm capabili…

723bf7b

…ties

Use new capabilties functions on external form pages

2aa371a

Remove unnecessary admin check

89de7c9

Always use highest role in non-usercan permissions checks

d352258

3mcd temporarily deployed to gh-654103159-pr-1160 May 6, 2025 17:10 Inactive

kalilsn added 2 commits May 6, 2025 15:56

Fix tests

e10c343

Remove timeout

23e5c0a

3mcd temporarily deployed to gh-654103159-pr-1160 May 6, 2025 21:20 Inactive

Merge branch 'main' into kalilsn/form-switcher

804498e

3mcd temporarily deployed to gh-654103159-pr-1160 May 7, 2025 14:15 Inactive

3mcd temporarily deployed to gh-654103159-pr-1160 May 7, 2025 21:49 Inactive

Require form and pub pub_type agreement in pub memberships

607b6ab

kalilsn force-pushed the kalilsn/form-switcher branch from 1fcd173 to 607b6ab Compare May 7, 2025 22:09

3mcd temporarily deployed to gh-654103159-pr-1160 May 7, 2025 22:14 Inactive

kalilsn added 3 commits May 12, 2025 14:58

Add superadmin override to usercan

cbc4cdc

Merge branch 'main' into kalilsn/form-switcher

070d4b6

Fix some more pubtype/form agreement issues in tests

83dd0ba

3mcd temporarily deployed to gh-654103159-pr-1160 May 12, 2025 22:03 Inactive

Factor out member dialog fixture

c53c390

3mcd temporarily deployed to gh-654103159-pr-1160 May 12, 2025 22:28 Inactive

kalilsn force-pushed the kalilsn/form-switcher branch from 42efc45 to 1d4431c Compare May 12, 2025 22:42

3mcd temporarily deployed to gh-654103159-pr-1160 May 12, 2025 22:47 Inactive

Fix mock so usercan doesn't error in db tests

9e4205f

kalilsn force-pushed the kalilsn/form-switcher branch from 1d4431c to 9e4205f Compare May 12, 2025 23:12

3mcd temporarily deployed to gh-654103159-pr-1160 May 12, 2025 23:17 Inactive

Fix logged in checks

f24140d

3mcd deployed to gh-654103159-pr-1160 May 13, 2025 14:53 View deployment

3mcd temporarily deployed to gh-654103159-pr-1160 May 14, 2025 11:52 Inactive

tefkah force-pushed the kalilsn/form-switcher branch from ca09ebf to f24140d Compare May 14, 2025 12:10

3mcd temporarily deployed to gh-654103159-pr-1160 May 14, 2025 12:23 Inactive

tefkah approved these changes May 14, 2025

View reviewed changes

tefkah force-pushed the kalilsn/form-switcher branch from 9154242 to f24140d Compare May 14, 2025 13:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add form switcher #1160

Add form switcher #1160

kalilsn commented Apr 15, 2025 •

edited

Loading

tefkah commented May 14, 2025

tefkah left a comment

tefkah May 14, 2025

tefkah May 14, 2025

tefkah May 14, 2025

tefkah May 14, 2025

tefkah May 14, 2025

tefkah commented May 14, 2025

Add form switcher #1160

Are you sure you want to change the base?

Add form switcher #1160

Conversation

kalilsn commented Apr 15, 2025 • edited Loading

Issue(s) Resolved

High-level Explanation of PR

Test Plan

Screenshots (if applicable)

Notes

tefkah commented May 14, 2025

tefkah left a comment

Choose a reason for hiding this comment

tefkah May 14, 2025

Choose a reason for hiding this comment

tefkah May 14, 2025

Choose a reason for hiding this comment

tefkah May 14, 2025

Choose a reason for hiding this comment

tefkah May 14, 2025

Choose a reason for hiding this comment

tefkah May 14, 2025

Choose a reason for hiding this comment

tefkah commented May 14, 2025

kalilsn commented Apr 15, 2025 •

edited

Loading