Restrict related pubs table by selected form

Author: kalilsn

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

@@ -3,19 +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 { ActionInstances, PubTypes, Stages } from "db/public";
+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 { PageContext } from "~/app/components/ActionUI/PubsRunActionDropDownMenu";
-import type { FullProcessedPub } from "~/lib/server/pub";
-import { PubsRunActionDropDownMenu } from "~/app/components/ActionUI/PubsRunActionDropDownMenu";
 import { DataTable } from "~/app/components/DataTable/DataTable";
 import { dateFormatOptions } from "~/lib/dates";
 import { getPubTitle } from "~/lib/pubs";
@@ -95,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);
@@ -114,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,8 +1,8 @@
+import type { ProcessedPubWithForm } from "contracts";
 import { Info } from "ui/icon";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "ui/tooltip";
 
 import type { PageContext } from "~/app/components/ActionUI/PubsRunActionDropDownMenu";
-import type { FullProcessedPub } from "~/lib/server";
 import { PubsRunActionDropDownMenu } from "~/app/components/ActionUI/PubsRunActionDropDownMenu";
 import { RelatedPubsTable } from "./RelatedPubsTable";
 
@@ -24,7 +24,16 @@ const NoActions = () => {
 	);
 };
 
-const getRelatedPubRunActionsDropdowns = (row: FullProcessedPub, pageContext: PageContext) => {
+const getRelatedPubRunActionsDropdowns = (
+	row: ProcessedPubWithForm<{
+		withRelatedPubs: true;
+		withStage: true;
+		withPubType: true;
+		withMembers: true;
+		withStageActionInstances: true;
+	}>,
+	pageContext: PageContext
+) => {
 	return row.stage && row.stage?.actionInstances.length > 0 ? (
 		<PubsRunActionDropDownMenu
 			actionInstances={row.stage.actionInstances}
@@ -38,7 +47,13 @@ const getRelatedPubRunActionsDropdowns = (row: FullProcessedPub, pageContext: Pa
 };
 
 type Props = {
-	pub: FullProcessedPub;
+	pub: ProcessedPubWithForm<{
+		withRelatedPubs: true;
+		withStage: true;
+		withPubType: true;
+		withMembers: true;
+		withStageActionInstances: true;
+	}>;
 	pageContext: PageContext;
 };
 

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

@@ -268,7 +268,7 @@ export default async function Page(props: {
 						relatedPub={{ pubId: pub.id, pubTypeId: pub.pubTypeId }}
 						className="w-fit"
 					/>
-					<RelatedPubsTableWrapper pub={pub} pageContext={pageContext} />
+					<RelatedPubsTableWrapper pub={pubByForm} pageContext={pageContext} />
 				</div>
 			)}
 		</div>

core/lib/pubs.ts

@@ -96,6 +96,7 @@ export const getPubByForm = ({
 	withStage: true;
 	withPubType: true;
 	withMembers: true;
+	withStageActionInstances: true;
 }> => {
 	const { values } = pub;
 	if (!values.length) {
@@ -120,6 +121,7 @@ export const getPubByForm = ({
 		withStage: true;
 		withPubType: true;
 		withMembers: true;
+		withStageActionInstances: true;
 	}>["values"] = [];
 	for (const formElement of pubFieldFormElements) {
 		const values = valuesByFieldSlug[formElement.slug];
@@ -161,6 +163,7 @@ export const getPubByForm = ({
 		withStage: true;
 		withPubType: true;
 		withMembers: true;
+		withStageActionInstances: true;
 	}>["values"] = [];
 	for (const slug of slugsNotInForm) {
 		for (const value of valuesByFieldSlug[slug]) {