Add form switcher

.env.docker-compose.dev

@@ -5,7 +5,10 @@ ASSETS_BUCKET_NAME=assets.v7.pubpub.org
 ASSETS_UPLOAD_KEY=pubpubuser
 ASSETS_UPLOAD_SECRET_KEY=pubpubpass
 ASSETS_REGION=us-east-1
-ASSETS_STORAGE_ENDPOINT=http://localhost:9000
+# internal endpoint used by backend services running in Docker
+ASSETS_STORAGE_ENDPOINT=http://minio:9000
+# public endpoint used for signed URLs accessible from browsers
+ASSETS_PUBLIC_ENDPOINT=http://localhost:9000
 
 POSTGRES_PORT=54322
 POSTGRES_USER=postgres

core/app/api/v0/c/[communitySlug]/site/[...ts-rest]/route.ts

@@ -387,7 +387,7 @@ const handler = createNextHandler(
 			create: async ({ body }) => {
 				const { authorization, community, lastModifiedBy } = await checkAuthorization({
 					token: { scope: ApiAccessScope.pub, type: ApiAccessType.write },
-					// TODO: figure out capability here
+					// TODO: refactor so we call userCanCreatePub here
 					cookies: false,
 				});
 
@@ -423,10 +423,8 @@ const handler = createNextHandler(
 			update: async ({ params, body }) => {
 				const { user, community, lastModifiedBy } = await checkAuthorization({
 					token: { scope: ApiAccessScope.pub, type: ApiAccessType.write },
-					cookies: {
-						capability: Capabilities.updatePubValues,
-						target: { type: MembershipType.pub, pubId: params.pubId as PubsId },
-					},
+					// TODO: refactor so we call userCanEditPub here
+					cookies: false,
 				});
 
 				const { exists } = await doesPubExist(

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

@@ -18,13 +18,13 @@ export const RequestLink = ({
 }: {
 	formSlug: string;
 	token: string;
-	pubId: PubsId;
+	pubId?: PubsId;
 }) => {
-	const useRequestLink = useServerAction(actions.inviteUserToForm);
+	const sendNewFormLink = useServerAction(actions.sendNewFormLink);
 	const { id: communityId } = useCommunity();
 
 	const requestLink = useCallback(async () => {
-		const link = await useRequestLink({ slug: formSlug, token, pubId, communityId });
+		const link = await sendNewFormLink({ slug: formSlug, token, pubId, communityId });
 
 		if (link && link.error) {
 			return;

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

@@ -24,14 +24,14 @@ import { SaveStatus } from "~/app/components/pubs/PubEditor/SaveStatus";
 import { db } from "~/kysely/database";
 import { getLoginData } from "~/lib/authentication/loginData";
 import { getCommunityRole } from "~/lib/authentication/roles";
+import { userCanCreatePub, userCanEditPub } from "~/lib/authorization/capabilities";
 import { findCommunityBySlug } from "~/lib/server/community";
-import { getForm, userHasPermissionToForm } from "~/lib/server/form";
+import { getForm } from "~/lib/server/form";
 import { getPubsWithRelatedValues } from "~/lib/server/pub";
 import { getPubTypesForCommunity } from "~/lib/server/pubtype";
 import { capitalize } from "~/lib/string";
 import { ExternalFormWrapper } from "./ExternalFormWrapper";
 import { RequestLink } from "./RequestLink";
-import { handleFormToken } from "./utils";
 
 const NotFound = ({ children }: { children: ReactNode }) => {
 	return <div className="w-full pt-8 text-center">{children}</div>;
@@ -163,6 +163,10 @@ export default async function FormPage(props: {
 		return <NotFound>No form found</NotFound>;
 	}
 
+	if (searchParams.pubId && !pub) {
+		return <NotFound>Pub not found</NotFound>;
+	}
+
 	if (!user && !session) {
 		if (form.access === "public") {
 			// redirect user to signup/login
@@ -171,14 +175,6 @@ export default async function FormPage(props: {
 			);
 		}
 
-		const result = await handleFormToken({
-			params,
-			searchParams,
-			onExpired: ({ params, searchParams, result }) => {
-				return;
-			},
-		});
-
 		return (
 			<ExpiredTokenPage
 				params={params}
@@ -203,11 +199,19 @@ export default async function FormPage(props: {
 
 	// all other roles always have access to the form
 	if (role === MemberRole.contributor && form.access !== FormAccessType.public) {
-		const memberHasAccessToForm = await userHasPermissionToForm({
-			formSlug: params.formSlug,
-			userId: user.id,
-			pubId: pub?.id,
-		});
+		const memberHasAccessToForm = pub
+			? await userCanEditPub({
+					formSlug: params.formSlug,
+					userId: user.id,
+					pubId: pub.id,
+				})
+			: await userCanCreatePub({
+					userId: user.id,
+					communityId: community.id,
+					// When the form is in create mode (there's no pub), just pass the form's pubType since
+					// the user doesn't control the type.
+					pubTypeId: form.pubTypeId,
+				});
 
 		if (!memberHasAccessToForm) {
 			// TODO: show no access page

core/app/c/[communitySlug]/forms/[formSlug]/edit/actions.ts

@@ -16,7 +16,7 @@ export const updateForm = defineServerAction(async function updateForm({
 	formId: FormsId;
 	name: string;
 }) {
-	const user = await getLoginData();
+	const { user } = await getLoginData();
 
 	if (!user) {
 		return {

core/app/c/[communitySlug]/forms/actions.ts

@@ -19,7 +19,7 @@ export const createForm = defineServerAction(async function createForm(
 	slug: string,
 	communityId: CommunitiesId
 ) {
-	const user = await getLoginData();
+	const { user } = await getLoginData();
 
 	if (!user) {
 		return {

core/app/c/[communitySlug]/members/page.tsx

@@ -10,7 +10,7 @@ import { getPageLoginData } from "~/lib/authentication/loginData";
 import { userCan } from "~/lib/authorization/capabilities";
 import { compareMemberRoles } from "~/lib/authorization/rolesRanking";
 import { findCommunityBySlug } from "~/lib/server/community";
-import { getMembershipForms } from "~/lib/server/form";
+import { getSimpleForms } from "~/lib/server/form";
 import { selectAllCommunityMemberships } from "~/lib/server/member";
 import { addMember, createUserWithCommunityMembership } from "./actions";
 import { MemberTable } from "./MemberTable";
@@ -54,7 +54,7 @@ export default async function Page(props: {
 	const page = parseInt(searchParams.page ?? "1", 10);
 	const [members, availableForms] = await Promise.all([
 		selectAllCommunityMemberships({ communityId: community.id }).execute(),
-		getMembershipForms(),
+		getSimpleForms(),
 	]);
 
 	if (!members.length && page !== 1) {

core/app/c/[communitySlug]/pubs/PubList.tsx

@@ -58,16 +58,13 @@ const PaginatedPubListInner = async (props: PaginatedPubListProps) => {
 			<PubsSelectedProvider pubIds={[]}>
 				{pubs.map((pub) => {
 					return (
-						<div key={pub.id}>
-							<PubCard
-								key={pub.id}
-								pub={pub}
-								communitySlug={communitySlug}
-								stages={stages}
-								actionInstances={actions}
-							/>
-							<PubSelector pubId={pub.id} />
-						</div>
+						<PubCard
+							key={pub.id}
+							pub={pub}
+							communitySlug={communitySlug}
+							stages={stages}
+							actionInstances={actions}
+						/>
 					);
 				})}
 				<FooterPagination

core/app/c/[communitySlug]/pubs/PubSelector.tsx

@@ -5,7 +5,7 @@ import { Checkbox } from "ui/checkbox";
 
 import { usePubsSelectedContext } from "./PubsSelectedContext";
 
-export const PubSelector = ({ pubId }: { pubId: PubsId }) => {
+export const PubSelector = ({ pubId, className }: { pubId: PubsId; className?: string }) => {
 	const { isSelected, toggle } = usePubsSelectedContext();
 
 	return (
@@ -14,6 +14,7 @@ export const PubSelector = ({ pubId }: { pubId: PubsId }) => {
 			onCheckedChange={() => {
 				toggle(pubId);
 			}}
+			className={className}
 		/>
 	);
 };

core/app/c/[communitySlug]/pubs/[pubId]/components/RelatedPubsTable.tsx

@@ -3,17 +3,17 @@
 import type { ColumnDef } from "@tanstack/react-table";
 import type { ReactNode } from "react";
 
-import React, { useMemo, useState } from "react";
+import { useMemo, useState } from "react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 
+import type { ProcessedPubWithForm } from "contracts";
 import type { PubTypes, Stages } from "db/public";
 import { Badge } from "ui/badge";
 import { Button } from "ui/button";
 import { Checkbox } from "ui/checkbox";
 import { DataTableColumnHeader } from "ui/data-table";
 
-import type { FullProcessedPub } from "~/lib/server/pub";
 import { DataTable } from "~/app/components/DataTable/DataTable";
 import { dateFormatOptions } from "~/lib/dates";
 import { getPubTitle } from "~/lib/pubs";
@@ -93,14 +93,29 @@ const getRelatedPubsColumns = (relatedPubActionsDropdowns: Record<string, ReactN
 				return relatedPubActionsDropdowns[row.original.id];
 			},
 		},
-	] as const satisfies ColumnDef<FullProcessedPub, unknown>[];
+	] as const satisfies ColumnDef<
+		ProcessedPubWithForm<{
+			withRelatedPubs: true;
+			withStage: true;
+			withPubType: true;
+			withMembers: true;
+			withStageActionInstances: true;
+		}>,
+		unknown
+	>[];
 };
 
 const Table = ({
 	pubs,
 	relatedPubActionsDropdowns,
 }: {
-	pubs: FullProcessedPub[];
+	pubs: ProcessedPubWithForm<{
+		withRelatedPubs: true;
+		withStage: true;
+		withPubType: true;
+		withMembers: true;
+		withStageActionInstances: true;
+	}>[];
 	relatedPubActionsDropdowns: Record<string, ReactNode>;
 }) => {
 	const columns = getRelatedPubsColumns(relatedPubActionsDropdowns);
@@ -112,11 +127,29 @@ export const RelatedPubsTable = ({
 	pub,
 	relatedPubActionsDropdowns,
 }: {
-	pub: FullProcessedPub;
+	pub: ProcessedPubWithForm<{
+		withRelatedPubs: true;
+		withStage: true;
+		withPubType: true;
+		withMembers: true;
+		withStageActionInstances: true;
+	}>;
 	relatedPubActionsDropdowns: Record<string, ReactNode>;
 }) => {
 	const groupedBySlug = useMemo(() => {
-		const grouped: Record<string, { pub: FullProcessedPub; fieldName: string }[]> = {};
+		const grouped: Record<
+			string,
+			{
+				pub: ProcessedPubWithForm<{
+					withRelatedPubs: true;
+					withStage: true;
+					withPubType: true;
+					withMembers: true;
+					withStageActionInstances: true;
+				}>;
+				fieldName: string;
+			}[]
+		> = {};
 		for (const value of pub.values) {
 			const { relatedPub, fieldSlug, fieldName } = value;
 			if (relatedPub) {

core/app/c/[communitySlug]/pubs/[pubId]/components/RelatedPubsTableWrapper.tsx

@@ -1,7 +1,7 @@
 import { Info } from "ui/icon";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "ui/tooltip";
 
-import type { FullProcessedPub } from "~/lib/server";
+import type { FullProcessedPubWithForm } from "~/lib/server";
 import { PubsRunActionDropDownMenu } from "~/app/components/ActionUI/PubsRunActionDropDownMenu";
 import { RelatedPubsTable } from "./RelatedPubsTable";
 
@@ -23,7 +23,7 @@ const NoActions = () => {
 	);
 };
 
-const getRelatedPubRunActionsDropdowns = (row: FullProcessedPub) => {
+const getRelatedPubRunActionsDropdowns = (row: FullProcessedPubWithForm) => {
 	return row.stage && row.stage?.actionInstances.length > 0 ? (
 		<PubsRunActionDropDownMenu
 			actionInstances={row.stage.actionInstances}
@@ -36,7 +36,7 @@ const getRelatedPubRunActionsDropdowns = (row: FullProcessedPub) => {
 };
 
 type Props = {
-	pub: FullProcessedPub;
+	pub: FullProcessedPubWithForm;
 };
 
 export const RelatedPubsTableWrapper = async (props: Props) => {