diff --git a/apps/site/app/channel/[id]/[index]/page.tsx b/apps/site/app/channel/[id]/[index]/page.tsx index e94645c2..267e6f92 100644 --- a/apps/site/app/channel/[id]/[index]/page.tsx +++ b/apps/site/app/channel/[id]/[index]/page.tsx @@ -44,6 +44,7 @@ export default async function ItemPage({ }) { const { channel } = await getChannelWithId({ id: params.id, + limit: 100, }) const totalItems = channel?.adds?.items?.length ?? 0 diff --git a/apps/site/app/channel/[id]/page.tsx b/apps/site/app/channel/[id]/page.tsx index 0f17d591..15f68330 100644 --- a/apps/site/app/channel/[id]/page.tsx +++ b/apps/site/app/channel/[id]/page.tsx @@ -1,4 +1,4 @@ -import { ViewToggle } from '@/client' +import { ViewToggle, PaginationControls } from '@/client' import { Flex, Stack, Typography } from '@/design-system' import { getChannelWithId } from '@/gql' import { getAddsMetadata } from '@/lib' @@ -17,8 +17,13 @@ export default async function Channel({ params: { id: string } searchParams: { [key: string]: string | string[] | undefined } }) { - const { channel } = await getChannelWithId({ + // biome-ignore lint: + const after = searchParams['after'] as string | undefined + + const { channel, pageInfo } = await getChannelWithId({ id: params.id, + limit: 100, + after, }) if (!channel) { @@ -58,6 +63,10 @@ export default async function Channel({
{}
+ + {/* @ts-ignore */} + + ) } diff --git a/apps/site/gql/queries/channelWithId.graphql b/apps/site/gql/queries/channelWithId.graphql index 0a225a63..f299187b 100644 --- a/apps/site/gql/queries/channelWithId.graphql +++ b/apps/site/gql/queries/channelWithId.graphql @@ -1,4 +1,4 @@ -query channelWithId($id: String!) { +query channelWithId($id: String!, $limit: Int!, $after: String) { channel(id: $id) { id timestamp @@ -13,7 +13,7 @@ query channelWithId($id: String!) { role } } - adds(limit: 100, orderBy: "timestamp", orderDirection: "desc") { + adds(limit: $limit, orderBy: "timestamp", orderDirection: "desc", after: $after) { items { timestamp channelId @@ -35,6 +35,9 @@ query channelWithId($id: String!) { } } } + pageInfo { + ...PageInfo + } } } } \ No newline at end of file diff --git a/apps/site/gql/requests/getChannelWithId.ts b/apps/site/gql/requests/getChannelWithId.ts index b191bcdd..c2139e5a 100644 --- a/apps/site/gql/requests/getChannelWithId.ts +++ b/apps/site/gql/requests/getChannelWithId.ts @@ -2,12 +2,21 @@ import sdk from '../client' import { unstable_cache } from 'next/cache' export const getChannelWithId = unstable_cache( - async ({ id }: { id: string }) => { + async ({ + id, + limit, + after, + }: { id: string; limit: number; after?: string }) => { const response = await sdk.channelWithId({ - id: id, + id, + limit, + after, }) - return { channel: response.channel } + return { + channel: response.channel, + pageInfo: response.channel?.adds?.pageInfo, + } }, ['channelWithId'], ) diff --git a/apps/site/gql/sdk.generated.ts b/apps/site/gql/sdk.generated.ts index ecd9ad9d..d21c3877 100644 --- a/apps/site/gql/sdk.generated.ts +++ b/apps/site/gql/sdk.generated.ts @@ -36,6 +36,8 @@ export type Adds = { }; export type AddsFilter = { + AND?: InputMaybe>>; + OR?: InputMaybe>>; addedById?: InputMaybe; addedById_gt?: InputMaybe; addedById_gte?: InputMaybe; @@ -108,8 +110,8 @@ export type AddsFilter = { export type AddsPage = { __typename?: 'AddsPage'; - items?: Maybe>; - pageInfo?: Maybe; + items: Array; + pageInfo: PageInfo; }; export type Channel = { @@ -134,7 +136,7 @@ export type ChannelAddsArgs = { limit?: InputMaybe; orderBy?: InputMaybe; orderDirection?: InputMaybe; - timestamp?: InputMaybe; + where?: InputMaybe; }; @@ -144,7 +146,7 @@ export type ChannelRolesArgs = { limit?: InputMaybe; orderBy?: InputMaybe; orderDirection?: InputMaybe; - timestamp?: InputMaybe; + where?: InputMaybe; }; export type ChannelCounter = { @@ -155,6 +157,8 @@ export type ChannelCounter = { }; export type ChannelCounterFilter = { + AND?: InputMaybe>>; + OR?: InputMaybe>>; counter?: InputMaybe; counter_gt?: InputMaybe; counter_gte?: InputMaybe; @@ -185,11 +189,13 @@ export type ChannelCounterFilter = { export type ChannelCounterPage = { __typename?: 'ChannelCounterPage'; - items?: Maybe>; - pageInfo?: Maybe; + items: Array; + pageInfo: PageInfo; }; export type ChannelFilter = { + AND?: InputMaybe>>; + OR?: InputMaybe>>; createdById?: InputMaybe; createdById_gt?: InputMaybe; createdById_gte?: InputMaybe; @@ -260,8 +266,8 @@ export type ChannelFilter = { export type ChannelPage = { __typename?: 'ChannelPage'; - items?: Maybe>; - pageInfo?: Maybe; + items: Array; + pageInfo: PageInfo; }; export type ChannelRoles = { @@ -275,6 +281,8 @@ export type ChannelRoles = { }; export type ChannelRolesFilter = { + AND?: InputMaybe>>; + OR?: InputMaybe>>; channelId?: InputMaybe; channelId_contains?: InputMaybe; channelId_ends_with?: InputMaybe; @@ -323,8 +331,8 @@ export type ChannelRolesFilter = { export type ChannelRolesPage = { __typename?: 'ChannelRolesPage'; - items?: Maybe>; - pageInfo?: Maybe; + items: Array; + pageInfo: PageInfo; }; export type Item = { @@ -346,7 +354,7 @@ export type ItemAddsArgs = { limit?: InputMaybe; orderBy?: InputMaybe; orderDirection?: InputMaybe; - timestamp?: InputMaybe; + where?: InputMaybe; }; export type ItemCounter = { @@ -357,6 +365,8 @@ export type ItemCounter = { }; export type ItemCounterFilter = { + AND?: InputMaybe>>; + OR?: InputMaybe>>; counter?: InputMaybe; counter_gt?: InputMaybe; counter_gte?: InputMaybe; @@ -387,11 +397,13 @@ export type ItemCounterFilter = { export type ItemCounterPage = { __typename?: 'ItemCounterPage'; - items?: Maybe>; - pageInfo?: Maybe; + items: Array; + pageInfo: PageInfo; }; export type ItemFilter = { + AND?: InputMaybe>>; + OR?: InputMaybe>>; createdById?: InputMaybe; createdById_gt?: InputMaybe; createdById_gte?: InputMaybe; @@ -442,8 +454,8 @@ export type ItemFilter = { export type ItemPage = { __typename?: 'ItemPage'; - items?: Maybe>; - pageInfo?: Maybe; + items: Array; + pageInfo: PageInfo; }; export type ItemRoles = { @@ -456,6 +468,8 @@ export type ItemRoles = { }; export type ItemRolesFilter = { + AND?: InputMaybe>>; + OR?: InputMaybe>>; id?: InputMaybe; id_contains?: InputMaybe; id_ends_with?: InputMaybe; @@ -496,8 +510,8 @@ export type ItemRolesFilter = { export type ItemRolesPage = { __typename?: 'ItemRolesPage'; - items?: Maybe>; - pageInfo?: Maybe; + items: Array; + pageInfo: PageInfo; }; export type Message = { @@ -511,6 +525,8 @@ export type Message = { }; export type MessageFilter = { + AND?: InputMaybe>>; + OR?: InputMaybe>>; id?: InputMaybe; id_contains?: InputMaybe; id_ends_with?: InputMaybe; @@ -567,8 +583,8 @@ export type MessageFilter = { export type MessagePage = { __typename?: 'MessagePage'; - items?: Maybe>; - pageInfo?: Maybe; + items: Array; + pageInfo: PageInfo; }; export type PageInfo = { @@ -593,6 +609,8 @@ export type Post = { }; export type PostFilter = { + AND?: InputMaybe>>; + OR?: InputMaybe>>; hash?: InputMaybe; hashType?: InputMaybe; hashType_gt?: InputMaybe; @@ -665,36 +683,36 @@ export type PostFilter = { export type PostPage = { __typename?: 'PostPage'; - items?: Maybe>; - pageInfo?: Maybe; + items: Array; + pageInfo: PageInfo; }; export type Query = { __typename?: 'Query'; adds?: Maybe; - addss?: Maybe; + addss: AddsPage; channel?: Maybe; channelCounter?: Maybe; - channelCounters?: Maybe; + channelCounters: ChannelCounterPage; channelRoles?: Maybe; - channelRoless?: Maybe; - channels?: Maybe; + channelRoless: ChannelRolesPage; + channels: ChannelPage; item?: Maybe; itemCounter?: Maybe; - itemCounters?: Maybe; + itemCounters: ItemCounterPage; itemRoles?: Maybe; - itemRoless?: Maybe; - items?: Maybe; + itemRoless: ItemRolesPage; + items: ItemPage; message?: Maybe; - messages?: Maybe; + messages: MessagePage; post?: Maybe; - posts?: Maybe; + posts: PostPage; txn?: Maybe; - txns?: Maybe; + txns: TxnPage; user?: Maybe; userCounter?: Maybe; - userCounters?: Maybe; - users?: Maybe; + userCounters: UserCounterPage; + users: UserPage; }; @@ -907,6 +925,8 @@ export type Txn = { }; export type TxnFilter = { + AND?: InputMaybe>>; + OR?: InputMaybe>>; id?: InputMaybe; id_gt?: InputMaybe; id_gte?: InputMaybe; @@ -919,8 +939,8 @@ export type TxnFilter = { export type TxnPage = { __typename?: 'TxnPage'; - items?: Maybe>; - pageInfo?: Maybe; + items: Array; + pageInfo: PageInfo; }; export type User = { @@ -941,6 +961,8 @@ export type UserCounter = { }; export type UserCounterFilter = { + AND?: InputMaybe>>; + OR?: InputMaybe>>; counter?: InputMaybe; counter_gt?: InputMaybe; counter_gte?: InputMaybe; @@ -971,11 +993,13 @@ export type UserCounterFilter = { export type UserCounterPage = { __typename?: 'UserCounterPage'; - items?: Maybe>; - pageInfo?: Maybe; + items: Array; + pageInfo: PageInfo; }; export type UserFilter = { + AND?: InputMaybe>>; + OR?: InputMaybe>>; from?: InputMaybe; from_gt?: InputMaybe; from_gte?: InputMaybe; @@ -1028,8 +1052,8 @@ export type UserFilter = { export type UserPage = { __typename?: 'UserPage'; - items?: Maybe>; - pageInfo?: Maybe; + items: Array; + pageInfo: PageInfo; }; export type PageInfoFragment = { __typename?: 'PageInfo', startCursor?: string | null, endCursor?: string | null, hasPreviousPage: boolean, hasNextPage: boolean }; @@ -1040,52 +1064,54 @@ export type AllAddsQueryVariables = Exact<{ }>; -export type AllAddsQuery = { __typename?: 'Query', addss?: { __typename?: 'AddsPage', items?: Array<{ __typename?: 'Adds', addedById: any, removed?: boolean | null, channelId: string, item: { __typename?: 'Item', id: string, timestamp: any, createdById: any, uri: string }, channel: { __typename?: 'Channel', name: string, roles?: { __typename?: 'ChannelRolesPage', items?: Array<{ __typename?: 'ChannelRoles', timestamp: any, rid: any, role: any }> | null } | null, adds?: { __typename?: 'AddsPage', items?: Array<{ __typename?: 'Adds', itemId: string }> | null } | null } }> | null, pageInfo?: { __typename?: 'PageInfo', startCursor?: string | null, endCursor?: string | null, hasPreviousPage: boolean, hasNextPage: boolean } | null } | null }; +export type AllAddsQuery = { __typename?: 'Query', addss: { __typename?: 'AddsPage', items: Array<{ __typename?: 'Adds', addedById: any, removed?: boolean | null, channelId: string, item: { __typename?: 'Item', id: string, timestamp: any, createdById: any, uri: string }, channel: { __typename?: 'Channel', name: string, roles?: { __typename?: 'ChannelRolesPage', items: Array<{ __typename?: 'ChannelRoles', timestamp: any, rid: any, role: any }> } | null, adds?: { __typename?: 'AddsPage', items: Array<{ __typename?: 'Adds', itemId: string }> } | null } }>, pageInfo: { __typename?: 'PageInfo', startCursor?: string | null, endCursor?: string | null, hasPreviousPage: boolean, hasNextPage: boolean } } }; export type AllChannelsQueryVariables = Exact<{ endCursor?: InputMaybe; }>; -export type AllChannelsQuery = { __typename?: 'Query', channels?: { __typename?: 'ChannelPage', items?: Array<{ __typename?: 'Channel', id: string, timestamp: any, createdById: any, uri: string, name: string, description: string, roles?: { __typename?: 'ChannelRolesPage', items?: Array<{ __typename?: 'ChannelRoles', timestamp: any, rid: any, role: any }> | null } | null, adds?: { __typename?: 'AddsPage', items?: Array<{ __typename?: 'Adds', timestamp: any }> | null } | null }> | null, pageInfo?: { __typename?: 'PageInfo', endCursor?: string | null, hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | null } | null } | null }; +export type AllChannelsQuery = { __typename?: 'Query', channels: { __typename?: 'ChannelPage', items: Array<{ __typename?: 'Channel', id: string, timestamp: any, createdById: any, uri: string, name: string, description: string, roles?: { __typename?: 'ChannelRolesPage', items: Array<{ __typename?: 'ChannelRoles', timestamp: any, rid: any, role: any }> } | null, adds?: { __typename?: 'AddsPage', items: Array<{ __typename?: 'Adds', timestamp: any }> } | null }>, pageInfo: { __typename?: 'PageInfo', endCursor?: string | null, hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | null } } }; export type AllChannelsWithRidQueryVariables = Exact<{ rid: Scalars['BigInt']['input']; }>; -export type AllChannelsWithRidQuery = { __typename?: 'Query', channelRoless?: { __typename?: 'ChannelRolesPage', items?: Array<{ __typename?: 'ChannelRoles', channel: { __typename?: 'Channel', id: string, timestamp: any, createdById: any, uri: string, name: string, description: string, roles?: { __typename?: 'ChannelRolesPage', items?: Array<{ __typename?: 'ChannelRoles', rid: any, role: any }> | null } | null, adds?: { __typename?: 'AddsPage', items?: Array<{ __typename?: 'Adds', timestamp: any, channelId: string, itemId: string, addedById: any, removed?: boolean | null, item: { __typename?: 'Item', id: string, uri: string, timestamp: any, createdById: any } }> | null } | null } }> | null } | null }; +export type AllChannelsWithRidQuery = { __typename?: 'Query', channelRoless: { __typename?: 'ChannelRolesPage', items: Array<{ __typename?: 'ChannelRoles', channel: { __typename?: 'Channel', id: string, timestamp: any, createdById: any, uri: string, name: string, description: string, roles?: { __typename?: 'ChannelRolesPage', items: Array<{ __typename?: 'ChannelRoles', rid: any, role: any }> } | null, adds?: { __typename?: 'AddsPage', items: Array<{ __typename?: 'Adds', timestamp: any, channelId: string, itemId: string, addedById: any, removed?: boolean | null, item: { __typename?: 'Item', id: string, uri: string, timestamp: any, createdById: any } }> } | null } }> } }; export type AllItemsQueryVariables = Exact<{ [key: string]: never; }>; -export type AllItemsQuery = { __typename?: 'Query', items?: { __typename?: 'ItemPage', items?: Array<{ __typename?: 'Item', id: string }> | null } | null }; +export type AllItemsQuery = { __typename?: 'Query', items: { __typename?: 'ItemPage', items: Array<{ __typename?: 'Item', id: string }> } }; export type AllUsersQueryVariables = Exact<{ [key: string]: never; }>; -export type AllUsersQuery = { __typename?: 'Query', users?: { __typename?: 'UserPage', items?: Array<{ __typename?: 'User', id: any }> | null } | null }; +export type AllUsersQuery = { __typename?: 'Query', users: { __typename?: 'UserPage', items: Array<{ __typename?: 'User', id: any }> } }; export type ChannelWithIdQueryVariables = Exact<{ id: Scalars['String']['input']; + limit: Scalars['Int']['input']; + after?: InputMaybe; }>; -export type ChannelWithIdQuery = { __typename?: 'Query', channel?: { __typename?: 'Channel', id: string, timestamp: any, createdById: any, uri: string, name: string, description: string, roles?: { __typename?: 'ChannelRolesPage', items?: Array<{ __typename?: 'ChannelRoles', timestamp: any, rid: any, role: any }> | null } | null, adds?: { __typename?: 'AddsPage', items?: Array<{ __typename?: 'Adds', timestamp: any, channelId: string, itemId: string, addedById: any, removed?: boolean | null, item: { __typename?: 'Item', id: string, uri: string, timestamp: any, createdById: any }, channel: { __typename?: 'Channel', name: string, adds?: { __typename?: 'AddsPage', items?: Array<{ __typename?: 'Adds', itemId: string }> | null } | null } }> | null } | null } | null }; +export type ChannelWithIdQuery = { __typename?: 'Query', channel?: { __typename?: 'Channel', id: string, timestamp: any, createdById: any, uri: string, name: string, description: string, roles?: { __typename?: 'ChannelRolesPage', items: Array<{ __typename?: 'ChannelRoles', timestamp: any, rid: any, role: any }> } | null, adds?: { __typename?: 'AddsPage', items: Array<{ __typename?: 'Adds', timestamp: any, channelId: string, itemId: string, addedById: any, removed?: boolean | null, item: { __typename?: 'Item', id: string, uri: string, timestamp: any, createdById: any }, channel: { __typename?: 'Channel', name: string, adds?: { __typename?: 'AddsPage', items: Array<{ __typename?: 'Adds', itemId: string }> } | null } }>, pageInfo: { __typename?: 'PageInfo', startCursor?: string | null, endCursor?: string | null, hasPreviousPage: boolean, hasNextPage: boolean } } | null } | null }; export type ChannelsForItemQueryVariables = Exact<{ id: Scalars['String']['input']; }>; -export type ChannelsForItemQuery = { __typename?: 'Query', addss?: { __typename?: 'AddsPage', items?: Array<{ __typename?: 'Adds', channel: { __typename?: 'Channel', id: string, timestamp: any, uri: string, name: string, roles?: { __typename?: 'ChannelRolesPage', items?: Array<{ __typename?: 'ChannelRoles', rid: any, role: any }> | null } | null, adds?: { __typename?: 'AddsPage', items?: Array<{ __typename?: 'Adds', timestamp: any, channelId: string, itemId: string, addedById: any, removed?: boolean | null, item: { __typename?: 'Item', id: string, uri: string, timestamp: any, createdById: any } }> | null } | null } }> | null } | null }; +export type ChannelsForItemQuery = { __typename?: 'Query', addss: { __typename?: 'AddsPage', items: Array<{ __typename?: 'Adds', channel: { __typename?: 'Channel', id: string, timestamp: any, uri: string, name: string, roles?: { __typename?: 'ChannelRolesPage', items: Array<{ __typename?: 'ChannelRoles', rid: any, role: any }> } | null, adds?: { __typename?: 'AddsPage', items: Array<{ __typename?: 'Adds', timestamp: any, channelId: string, itemId: string, addedById: any, removed?: boolean | null, item: { __typename?: 'Item', id: string, uri: string, timestamp: any, createdById: any } }> } | null } }> } }; export type ChannelsItemsWithUserQueryVariables = Exact<{ userId: Scalars['BigInt']['input']; }>; -export type ChannelsItemsWithUserQuery = { __typename?: 'Query', channels?: { __typename?: 'ChannelPage', items?: Array<{ __typename?: 'Channel', id: string, timestamp: any, name: string, description: string, createdById: any, roles?: { __typename?: 'ChannelRolesPage', items?: Array<{ __typename?: 'ChannelRoles', rid: any, role: any }> | null } | null, adds?: { __typename?: 'AddsPage', items?: Array<{ __typename?: 'Adds', timestamp: any, removed?: boolean | null, item: { __typename?: 'Item', uri: string } }> | null } | null }> | null } | null, items?: { __typename?: 'ItemPage', items?: Array<{ __typename?: 'Item', timestamp: any, uri: string }> | null } | null }; +export type ChannelsItemsWithUserQuery = { __typename?: 'Query', channels: { __typename?: 'ChannelPage', items: Array<{ __typename?: 'Channel', id: string, timestamp: any, name: string, description: string, createdById: any, roles?: { __typename?: 'ChannelRolesPage', items: Array<{ __typename?: 'ChannelRoles', rid: any, role: any }> } | null, adds?: { __typename?: 'AddsPage', items: Array<{ __typename?: 'Adds', timestamp: any, removed?: boolean | null, item: { __typename?: 'Item', uri: string } }> } | null }> }, items: { __typename?: 'ItemPage', items: Array<{ __typename?: 'Item', timestamp: any, uri: string }> } }; export type ItemPageQueryVariables = Exact<{ id: Scalars['String']['input']; @@ -1104,7 +1130,7 @@ export type ItemWithIdQuery = { __typename?: 'Query', item?: { __typename?: 'Ite export type MarqueeDataQueryVariables = Exact<{ [key: string]: never; }>; -export type MarqueeDataQuery = { __typename?: 'Query', userCounters?: { __typename?: 'UserCounterPage', items?: Array<{ __typename?: 'UserCounter', counter: any }> | null } | null, itemCounters?: { __typename?: 'ItemCounterPage', items?: Array<{ __typename?: 'ItemCounter', counter: any }> | null } | null, channelCounters?: { __typename?: 'ChannelCounterPage', items?: Array<{ __typename?: 'ChannelCounter', counter: any }> | null } | null }; +export type MarqueeDataQuery = { __typename?: 'Query', userCounters: { __typename?: 'UserCounterPage', items: Array<{ __typename?: 'UserCounter', counter: any }> }, itemCounters: { __typename?: 'ItemCounterPage', items: Array<{ __typename?: 'ItemCounter', counter: any }> }, channelCounters: { __typename?: 'ChannelCounterPage', items: Array<{ __typename?: 'ChannelCounter', counter: any }> } }; export type TxnHashQueryVariables = Exact<{ hash: Scalars['String']['input']; @@ -1118,7 +1144,7 @@ export type UserIdQueryVariables = Exact<{ }>; -export type UserIdQuery = { __typename?: 'Query', users?: { __typename?: 'UserPage', items?: Array<{ __typename?: 'User', id: any, userId: any, to: string, recovery: string, from: string }> | null } | null }; +export type UserIdQuery = { __typename?: 'Query', users: { __typename?: 'UserPage', items: Array<{ __typename?: 'User', id: any, userId: any, to: string, recovery: string, from: string }> } }; export const PageInfoFragmentDoc = gql` fragment PageInfo on PageInfo { @@ -1256,7 +1282,7 @@ export const AllUsersDocument = gql` } `; export const ChannelWithIdDocument = gql` - query channelWithId($id: String!) { + query channelWithId($id: String!, $limit: Int!, $after: String) { channel(id: $id) { id timestamp @@ -1271,7 +1297,7 @@ export const ChannelWithIdDocument = gql` role } } - adds(limit: 100, orderBy: "timestamp", orderDirection: "desc") { + adds(limit: $limit, orderBy: "timestamp", orderDirection: "desc", after: $after) { items { timestamp channelId @@ -1293,10 +1319,13 @@ export const ChannelWithIdDocument = gql` } } } + pageInfo { + ...PageInfo + } } } } - `; + ${PageInfoFragmentDoc}`; export const ChannelsForItemDocument = gql` query channelsForItem($id: String!) { addss(where: {itemId: $id}) {