Merge branch 'main' into kalilsn/memberships-have-forms

Author: kalilsn

.github/workflows/on_main.yml

@@ -63,9 +63,9 @@ jobs:
             PLATFORM_IMAGE: ${{ needs.build-all.outputs.core-image }}
             JOBS_IMAGE: ${{ needs.build-all.outputs.jobs-image }}
             MIGRATIONS_IMAGE: ${{ needs.build-all.outputs.base-image }}
-            PUBLIC_URL: ${{ github.event.repository.html_url }}
             AWS_REGION: "us-east-1"
             ALWAYS_ON: "main"
+            COMPOSE_FILES: docker-compose.preview.sandbox.yml
         secrets:
             AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
             AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/on_pr.yml

@@ -64,8 +64,8 @@ jobs:
             PLATFORM_IMAGE: ${{ needs.build-all.outputs.core-image }}
             JOBS_IMAGE: ${{ needs.build-all.outputs.jobs-image }}
             MIGRATIONS_IMAGE: ${{ needs.build-all.outputs.base-image }}
-            PUBLIC_URL: ${{ github.event.repository.html_url }}
             AWS_REGION: "us-east-1"
+            COMPOSE_FILES: docker-compose.preview.pr.yml
         secrets:
             AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
             AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -83,7 +83,6 @@ jobs:
             PLATFORM_IMAGE: "x" # not used
             JOBS_IMAGE: "x" # not used
             MIGRATIONS_IMAGE: "x" # not used
-            PUBLIC_URL: ${{ github.event.repository.html_url }}
             AWS_REGION: "us-east-1"
         secrets:
             AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

.github/workflows/pull-preview.yml

@@ -10,15 +10,15 @@ on:
             MIGRATIONS_IMAGE:
                 required: true
                 type: string
-            PUBLIC_URL:
-                required: true
-                type: string
             AWS_REGION:
                 required: true
                 type: string
             ALWAYS_ON:
                 required: false
                 type: string
+            COMPOSE_FILES:
+                required: false
+                type: string
         secrets:
             AWS_ACCESS_KEY_ID:
                 required: true
@@ -65,10 +65,9 @@ jobs:
 
             - uses: pullpreview/action@v5
               with:
-                  dns: preview.pubpub.org
                   label: preview
                   admins: 3mcd
-                  compose_files: ./self-host/docker-compose.yml,docker-compose.preview.yml
+                  compose_files: ./self-host/docker-compose.yml,docker-compose.preview.yml,${{ inputs.COMPOSE_FILES }}
                   default_port: 443
                   instance_type: small
                   always_on: ${{ inputs.ALWAYS_ON }}

core/actions/pushToV6/action.ts

@@ -11,8 +11,8 @@ export const action = defineAction({
 		schema: z.object({
 			communitySlug: z.string().describe("Community slug"),
 			authToken: z.string().describe("PubPub v6 API auth token"),
-			title: z.string().describe("Title of the pub"),
-			content: z.string().describe("Content of the pub"),
+			title: z.string().describe("Title of the Pub"),
+			content: z.string().describe("Content of the Pub"),
 		}),
 	},
 	description: "Sync a PubPub Platform pub to v6",

core/actions/types.ts

@@ -22,28 +22,10 @@ type ZodObjectOrWrapped = z.ZodObject<any, any> | z.ZodEffects<z.ZodObject<any,
 export type ZodObjectOrWrappedOrOptional = ZodObjectOrWrapped | z.ZodOptional<ZodObjectOrWrapped>;
 
 export type ActionPub = ProcessedPub<{
-	withAssignee: true;
 	withPubType: true;
 	withRelatedPubs: undefined;
 }>;
 
-// export type ActionPub<T extends ActionPubType> = {
-// 	id: PubsId;
-
-// 	assignee?: {
-// 		id: string;
-// 		firstName: string;
-// 		lastName: string | null;
-// 		email: string;
-// 	};
-// 	communityId: CommunitiesId;
-// 	createdAt: Date;
-// 	title: string | null;
-// 	pubType: {
-// 		name: string;
-// 	};
-// };
-
 export type RunProps<T extends Action> =
 	T extends Action<
 		infer P extends ActionPubType,

core/app/(user)/communities/actions.ts

@@ -37,7 +37,7 @@ export const createCommunity = defineServerAction(async function createCommunity
 			error: "User is not a super admin",
 		};
 	}
-	if (slug === "unjournal" || slug === "croccroc") {
+	if (slug === "legacy" || slug === "starter") {
 		return {
 			title: "Failed to remove community",
 			error: "Cannot update example community",

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

@@ -144,15 +144,14 @@ export default async function FormPage(props: {
 		searchParams.pubId
 			? await getPubsWithRelatedValues(
 					{ pubId: searchParams.pubId, communityId: community.id },
-					{ withStage: true, withLegacyAssignee: true, withPubType: true }
+					{ withStage: true, withPubType: true }
 				)
 			: undefined,
 		getPubsWithRelatedValues(
 			{ communityId: community.id, userId: user?.id },
 			{
 				limit: 30,
 				withStage: true,
-				withLegacyAssignee: true,
 				withPubType: true,
 			}
 		),

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

@@ -36,7 +36,6 @@ const PaginatedPubListInner = async (props: PaginatedPubListProps) => {
 				withRelatedPubs: false,
 				withStage: true,
 				withValues: false,
-				withLegacyAssignee: true,
 			}
 		),
 	]);

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

@@ -8,7 +8,6 @@ import { Capabilities, MembershipType } from "db/public";
 import { Button } from "ui/button";
 import { Pencil } from "ui/icon";
 
-import Assign from "~/app/c/[communitySlug]/stages/components/Assign";
 import Move from "~/app/c/[communitySlug]/stages/components/Move";
 import { MembersList } from "~/app/components//Memberships/MembersList";
 import { PubsRunActionDropDownMenu } from "~/app/components/ActionUI/PubsRunActionDropDownMenu";
@@ -252,12 +251,6 @@ export default async function Page(props: {
 							readOnly={!canRemoveMember}
 						/>
 					</div>
-					<div>
-						<div className="mb-1 text-lg font-bold">Assignee</div>
-						<div className="ml-4">
-							<Assign members={communityMembers} pub={slimPub} />
-						</div>
-					</div>
 				</div>
 			</div>
 			{(pubTypeHasRelatedPubs || pubHasRelatedPubs) && (

core/app/c/[communitySlug]/stages/components/Assign.tsx

@@ -113,7 +113,6 @@ export async function StagePubs({
 				withValues: false,
 				withStage: true,
 				withPubType: true,
-				withLegacyAssignee: true,
 			}
 		),
 		getStageActions(stage.id).execute(),

core/app/c/[communitySlug]/stages/components/AssignWrapper.tsx

@@ -8,7 +8,6 @@ import type { CommunityStage } from "~/lib/server/stages";
 import type { MemberWithUser } from "~/lib/types";
 import { PubsRunActionDropDownMenu } from "~/app/components/ActionUI/PubsRunActionDropDownMenu";
 import { SkeletonButton } from "~/app/components/skeletons/SkeletonButton";
-import { AssignWrapper } from "./AssignWrapper";
 import Move from "./Move";
 
 type Props = {
@@ -17,7 +16,6 @@ type Props = {
 		withStage: true;
 		withPubType: true;
 		withRelatedValues: false;
-		withLegacyAssignee: true;
 	}>;
 	stage: CommunityStage;
 	actionInstances: ActionInstances[];
@@ -33,7 +31,6 @@ export const StagePubActions = async (props: Props) => {
 				moveFrom={props.stage.moveConstraintSources}
 				moveTo={props.stage.moveConstraints}
 			/>
-			<AssignWrapper pub={props.pub} members={props.members} />
 			<Suspense fallback={<SkeletonButton className="w-20" />}>
 				<PubsRunActionDropDownMenu
 					pubId={props.pub.id}