-
-
{typeIds.includes(SystemIds.PERSON_TYPE) ? (
<>
diff --git a/apps/web/app/space/[id]/(space)/page.tsx b/apps/web/app/space/[id]/(space)/page.tsx
index 7c35a2bed5..92f10054e6 100644
--- a/apps/web/app/space/[id]/(space)/page.tsx
+++ b/apps/web/app/space/[id]/(space)/page.tsx
@@ -23,6 +23,7 @@ import { Spacer } from '~/design-system/spacer';
import { Editor } from '~/partials/editor/editor';
import { BacklinksServerContainer } from '~/partials/entity-page/backlinks-server-container';
import { ToggleEntityPage } from '~/partials/entity-page/toggle-entity-page';
+import { NewsStoriesSection } from '~/partials/space-page/news-stories/news-stories-section';
import { SubtopicGallery } from '~/partials/space-page/subtopic-gallery';
import { cachedFetchEntitiesBatch, cachedFetchEntityPage } from '../../(entity)/[id]/[entityId]/cached-fetch-entity';
@@ -77,6 +78,8 @@ export default async function SpacePage(props0: Props) {
return (
<>
+
+
}>
@@ -113,6 +116,8 @@ async function TopicEntityBody({ spaceId, topicEntityId }: { spaceId: string; to
initialTabs={topic.tabs}
initialCollectionItems={topic.initialCollectionItems}
>
+
+
}>
diff --git a/apps/web/partials/feed/entity-feed.tsx b/apps/web/partials/feed/entity-feed.tsx
index 3d7b7d18d5..9c6bb47d54 100644
--- a/apps/web/partials/feed/entity-feed.tsx
+++ b/apps/web/partials/feed/entity-feed.tsx
@@ -42,6 +42,161 @@ const TIME_OPTIONS: { value: ExploreTime; label: string }[] = [
export type SpaceOption = { value: string; label: string };
+export type EntityFeedFiltersProps = {
+ sort: ExploreSort;
+ onSortChange: (sort: ExploreSort) => void;
+ time: ExploreTime;
+ onTimeChange: (time: ExploreTime) => void;
+ showSortFilter?: boolean;
+ showTimeFilter?: boolean;
+ initialSpaceOptions?: SpaceOption[];
+ selectedSpaceId?: string;
+ onSpaceChange?: (spaceId: string) => void;
+ className?: string;
+};
+
+export function EntityFeedFilters({
+ sort,
+ onSortChange,
+ time,
+ onTimeChange,
+ showSortFilter = false,
+ showTimeFilter = true,
+ initialSpaceOptions = [],
+ selectedSpaceId = 'all',
+ onSpaceChange,
+ className,
+}: EntityFeedFiltersProps) {
+ const [sortMenuOpen, setSortMenuOpen] = React.useState(false);
+ const [timeMenuOpen, setTimeMenuOpen] = React.useState(false);
+ const [spaceMenuOpen, setSpaceMenuOpen] = React.useState(false);
+ const showSpaceFilter = onSpaceChange != null;
+
+ const timeLabel = TIME_OPTIONS.find(o => o.value === time)?.label ?? time;
+ const sortLabel = SORT_OPTIONS.find(o => o.value === sort)?.label ?? sort;
+ const spaceLabel =
+ selectedSpaceId === 'all'
+ ? 'Any space'
+ : (initialSpaceOptions.find(o => o.value === selectedSpaceId)?.label ?? 'Any space');
+
+ if (!showSortFilter && !showTimeFilter && !showSpaceFilter) return null;
+
+ return (
+
+ {showSortFilter ? (
+
+ ) : null}
+ {showTimeFilter ? (
+
+ ) : null}
+ {showSpaceFilter ? (
+
+
+
+ ) : null}
+
+ );
+}
+
type EntityFeedProps = {
/** REST endpoint this feed fetches from (e.g. `/api/explore/feed` or `/api/activity/feed`). */
apiEndpoint: string;
@@ -49,6 +204,8 @@ type EntityFeedProps = {
initialSpaceOptions?: SpaceOption[];
/** When set, the feed is pinned to this space. No space dropdown is rendered. */
lockedSpaceId?: string;
+ /** Restrict the feed to these entity type IDs. Forwarded to the endpoint as a `types` param. */
+ typeIds?: readonly string[];
/** Initial value for the time dropdown. Defaults to "week". */
initialTime?: ExploreTime;
/** Initial value for the sort dropdown. Defaults to "new". */
@@ -57,6 +214,14 @@ type EntityFeedProps = {
showTimeFilter?: boolean;
/** Whether to render the sort dropdown (New / Top). Defaults to false. */
showSortFilter?: boolean;
+ /** When false, hides the built-in filter row (use `EntityFeedFilters` externally). Defaults to true. */
+ showFilterRow?: boolean;
+ /** Controlled sort value. When set with `time`, the feed uses these instead of internal state. */
+ sort?: ExploreSort;
+ /** Controlled time value. When set with `sort`, the feed uses these instead of internal state. */
+ time?: ExploreTime;
+ /** When true, skips the outer max-width container so a parent can own layout. */
+ embedded?: boolean;
/** Override the spacing between the filter row and the feed. Defaults to `mt-8`. */
feedTopSpacingClassName?: string;
/** When true, renders a divider line between the filter row and the first feed card. */
@@ -70,12 +235,14 @@ async function fetchFeedPage(
time: ExploreTime;
spaceId: string;
cursor: string | undefined;
+ types: readonly string[] | undefined;
}
): Promise
{
const sp = new URLSearchParams();
sp.set('sort', params.sort);
sp.set('time', params.time);
sp.set('spaceId', params.spaceId);
+ if (params.types && params.types.length > 0) sp.set('types', params.types.join(','));
if (params.cursor) sp.set('cursor', params.cursor);
const res = await fetch(`${apiEndpoint}?${sp.toString()}`, { credentials: 'include' });
if (!res.ok) {
@@ -92,20 +259,25 @@ export function EntityFeed({
apiEndpoint,
initialSpaceOptions = [],
lockedSpaceId,
+ typeIds,
initialTime = 'week',
initialSort = 'new',
showTimeFilter = true,
showSortFilter = false,
+ showFilterRow = true,
+ sort: controlledSort,
+ time: controlledTime,
+ embedded = false,
feedTopSpacingClassName,
dividerBeforeFeed = false,
}: EntityFeedProps) {
- const [time, setTime] = React.useState(initialTime);
- const [sort, setSort] = React.useState(initialSort);
+ const [internalTime, setInternalTime] = React.useState(initialTime);
+ const [internalSort, setInternalSort] = React.useState(initialSort);
+ const time = controlledTime ?? internalTime;
+ const sort = controlledSort ?? internalSort;
const [selectedSpaceId, setSelectedSpaceId] = React.useState('all');
- const [sortMenuOpen, setSortMenuOpen] = React.useState(false);
- const [timeMenuOpen, setTimeMenuOpen] = React.useState(false);
- const [spaceMenuOpen, setSpaceMenuOpen] = React.useState(false);
const spaceId = lockedSpaceId ?? selectedSpaceId;
+ const hasBuiltInFilters = showFilterRow && (showSortFilter || showTimeFilter || lockedSpaceId == null);
// Key the query on the smart-account address because that hook is what writes the
// WALLET_ADDRESS cookie the server route reads. Privy's user.id updates earlier
@@ -115,9 +287,9 @@ export function EntityFeed({
const smartAccountAddress = smartAccount?.account.address ?? null;
const { data, isLoading, isFetchingNextPage, fetchNextPage, hasNextPage, error } = useInfiniteQuery({
- queryKey: [apiEndpoint, sort, time, spaceId, smartAccountAddress],
+ queryKey: [apiEndpoint, sort, time, spaceId, typeIds?.join(',') ?? '', smartAccountAddress],
queryFn: ({ pageParam }) =>
- fetchFeedPage(apiEndpoint, { sort, time, spaceId, cursor: pageParam as string | undefined }),
+ fetchFeedPage(apiEndpoint, { sort, time, spaceId, cursor: pageParam as string | undefined, types: typeIds }),
initialPageParam: undefined as string | undefined,
getNextPageParam: last => last.nextCursor ?? undefined,
retry: 2,
@@ -148,136 +320,26 @@ export function EntityFeed({
return flat;
}, [data?.pages]);
- const timeLabel = TIME_OPTIONS.find(o => o.value === time)?.label ?? time;
- const sortLabel = SORT_OPTIONS.find(o => o.value === sort)?.label ?? sort;
- const spaceLabel =
- selectedSpaceId === 'all'
- ? 'Any space'
- : (initialSpaceOptions.find(o => o.value === selectedSpaceId)?.label ?? 'Any space');
-
- return (
-
- {showSortFilter || showTimeFilter || lockedSpaceId == null ? (
-
- {showSortFilter ? (
-
- ) : null}
- {showTimeFilter ? (
-
- ) : null}
- {lockedSpaceId == null ? (
-
-
-
- ) : null}
-
+ const content = (
+ <>
+ {hasBuiltInFilters ? (
+
) : null}
{dividerBeforeFeed ?
: null}
{error ? (
@@ -309,6 +371,10 @@ export function EntityFeed({
) : null}