Connect, collaborate, and grow with a community of TypeScript developers
Comment Sorting (#469)
Ben Asokanthan2179d68bde12
diff --git a/apps/web/src/app/challenge/_components/comments/getCommentRouteData.ts b/apps/web/src/app/challenge/_components/comments/getCommentRouteData.tsindex f2cf1297..170858f8 100644--- a/apps/web/src/app/challenge/_components/comments/getCommentRouteData.ts+++ b/apps/web/src/app/challenge/_components/comments/getCommentRouteData.ts@@ -5,6 +5,33 @@ import type { CommentRoot } from '@repo/db/types';const PAGESIZE = 10;+const sortKeys = ['createdAt', 'vote', 'replies'] as const;+const sortOrders = ['asc', 'desc'] as const;++export type SortKey = (typeof sortKeys)[number];+export type SortOrder = (typeof sortOrders)[number];++function orderBy(sortKey: SortKey, sortOrder: SortOrder) {+ switch (sortKey) {+ case 'vote':+ return {+ vote: {+ _count: sortOrder,+ },+ };+ case 'replies':+ return {+ replies: {+ _count: sortOrder,+ },+ };+ case 'createdAt':+ return {+ [sortKey]: sortOrder,+ };+ }+}+export type PaginatedComments = NonNullable<Awaited<ReturnType<typeof getPaginatedComments>>>;export async function getPaginatedComments({@@ -12,11 +39,15 @@ export async function getPaginatedComments({rootId,rootType,parentId = null,+ sortKey = 'createdAt',+ sortOrder = 'desc',}: {page: number;rootId: number;rootType: CommentRoot;parentId?: number | null;+ sortKey?: SortKey;+ sortOrder?: SortOrder;}) {const session = await getServerAuthSession();@@ -49,9 +80,7 @@ export async function getPaginatedComments({...(rootType === 'CHALLENGE' ? { rootChallengeId: rootId } : { rootSolutionId: rootId }),visible: true,},- orderBy: {- createdAt: 'desc',- },+ orderBy: orderBy(sortKey, sortOrder),include: {user: true,_count: {diff --git a/apps/web/src/app/challenge/_components/comments/index.tsx b/apps/web/src/app/challenge/_components/comments/index.tsxindex a59a08e5..fb6cd10c 100644--- a/apps/web/src/app/challenge/_components/comments/index.tsx+++ b/apps/web/src/app/challenge/_components/comments/index.tsx@@ -1,18 +1,42 @@'use client';import type { CommentRoot } from '@repo/db/types';-import { Button, toast } from '@repo/ui';+import {+ Button,+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+ Toggle,+ toast,+} from '@repo/ui';import { ChevronDown, ChevronLeft, ChevronRight, MessageCircle } from '@repo/ui/icons';import { useQuery, useQueryClient } from '@tanstack/react-query';import clsx from 'clsx';+import { ArrowDownNarrowWide, ArrowUpNarrowWide } from 'lucide-react';import { useRef, useState } from 'react';import { Comment } from './comment';import { CommentInput } from './comment-input';import { CommentSkeleton } from './comment-skeleton';import { addComment } from './comment.action';-import { getPaginatedComments } from './getCommentRouteData';+import { getPaginatedComments, type SortOrder } from './getCommentRouteData';import NoComments from './nocomments';+const sortKeys = [+ {+ label: 'Created At',+ value: 'createdAt',+ },+ {+ label: '# of Votes',+ value: 'vote',+ },+ {+ label: '# of Replies',+ value: 'replies',+ },+] as const;interface Props {rootId: number;type: CommentRoot;@@ -24,12 +48,15 @@ export function Comments({ rootId, type }: Props) {const commentContainerRef = useRef<HTMLDivElement>(null);const queryClient = useQueryClient();const [page, setPage] = useState(1);+ const [sortKey, setSortKey] = useState<(typeof sortKeys)[number]>(sortKeys[0]);+ const [sortOrder, setSortOrder] = useState<SortOrder>('desc');- const queryKey = [`${type.toLowerCase()}-${rootId}-comments`, page];+ const queryKey = [`${type.toLowerCase()}-${rootId}-comments`, sortKey.value, sortOrder, page];const { status, data } = useQuery({queryKey,- queryFn: () => getPaginatedComments({ rootId, page, rootType: type }),+ queryFn: () =>+ getPaginatedComments({ rootId, page, rootType: type, sortKey: sortKey.value, sortOrder }),keepPreviousData: true,staleTime: 5000,});@@ -115,6 +142,51 @@ export function Comments({ rootId, type }: Props) {value={text}/></div>+ <div className="flex items-center gap-2 px-3 py-2">+ <Select+ value={sortKey.value}+ defaultValue="createdAt"+ onValueChange={(value) => {+ setSortKey(sortKeys.find((sk) => sk.value === value) ?? sortKeys[0]);+ setPage(1);+ }}+ >+ <SelectTrigger className="w-[180px]">+ <SelectValue placeholder="Sort Key" />+ </SelectTrigger>+ <SelectContent>+ {sortKeys.map((sortKey, index) => (+ <SelectItem key={index} value={sortKey.value}>+ {sortKey.label}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ <Toggle+ variant="outline"+ size="sm"+ aria-label="Ascending"+ pressed={sortOrder === 'asc'}+ onPressedChange={() => {+ setSortOrder('asc');+ setPage(1);+ }}+ >+ <ArrowUpNarrowWide />+ </Toggle>+ <Toggle+ variant="outline"+ size="sm"+ aria-label="Descending"+ pressed={sortOrder === 'desc'}+ onPressedChange={() => {+ setSortOrder('desc');+ setPage(1);+ }}+ >+ <ArrowDownNarrowWide />+ </Toggle>+ </div>{status === 'loading' && <CommentSkeleton />}<div className="flex-1">{status === 'success' &&diff --git a/packages/ui/package.json b/packages/ui/package.jsonindex da86aaaf..eb30646b 100644--- a/packages/ui/package.json+++ b/packages/ui/package.json@@ -41,6 +41,7 @@"@radix-ui/react-slot": "^1.0.2","@radix-ui/react-tabs": "^1.0.4","@radix-ui/react-toast": "^1.1.4",+ "@radix-ui/react-toggle": "^1.0.3","@radix-ui/react-tooltip": "^1.0.6","@repo/db": "workspace:*","@tanstack/react-table": "^8.9.3",diff --git a/packages/ui/src/components/toggle.tsx b/packages/ui/src/components/toggle.tsxnew file mode 100644index 00000000..fc870d2a--- /dev/null+++ b/packages/ui/src/components/toggle.tsx@@ -0,0 +1,43 @@+'use client';++import * as TogglePrimitive from '@radix-ui/react-toggle';+import { cva, type VariantProps } from 'class-variance-authority';+import * as React from 'react';++import { cn } from '../cn';++const toggleVariants = cva(+ 'inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-zinc-600/30 data-[state=on]:text-accent-foreground',+ {+ variants: {+ variant: {+ default: 'bg-transparent',+ outline: 'border border-input bg-transparent hover:bg-accent hover:text-accent-foreground',+ },+ size: {+ default: 'h-10 px-3',+ sm: 'h-9 px-2.5',+ lg: 'h-11 px-5',+ },+ },+ defaultVariants: {+ variant: 'default',+ size: 'default',+ },+ },+);++const Toggle = React.forwardRef<+ React.ElementRef<typeof TogglePrimitive.Root>,+ React.ComponentPropsWithoutRef<typeof TogglePrimitive.Root> & VariantProps<typeof toggleVariants>+>(({ className, variant, size, ...props }, ref) => (+ <TogglePrimitive.Root+ ref={ref}+ className={cn(toggleVariants({ variant, size, className }))}+ {...props}+ />+));++Toggle.displayName = TogglePrimitive.Root.displayName;++export { Toggle, toggleVariants };diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.tsindex 390960d7..7c6dc764 100644--- a/packages/ui/src/index.ts+++ b/packages/ui/src/index.ts@@ -33,11 +33,12 @@ export * from './components/tabs';export * from './components/textarea';export * from './components/toast';export * from './components/toaster';+export * from './components/toggle';export * from './components/tooltip';-export * from './components/use-toast';-export * from './components/user-badge';export * from './components/typography/h1';export * from './components/typography/h2';export * from './components/typography/h3';export * from './components/typography/large';export * from './components/typography/typography';+export * from './components/use-toast';+export * from './components/user-badge';diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex a4eede78..a71a6fa0 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -586,6 +586,9 @@ importers:'@radix-ui/react-toast':specifier: ^1.1.4+ '@radix-ui/react-toggle':+ specifier: ^1.0.3'@radix-ui/react-tooltip':specifier: ^1.0.6@@ -3059,6 +3062,28 @@ packages:react-dom: 18.2.0([email protected])dev: false+ resolution: {integrity: sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0+ react-dom: ^16.8 || ^17.0 || ^18.0+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+ dependencies:+ '@babel/runtime': 7.22.6+ '@radix-ui/primitive': 1.0.1+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])+ '@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])+ '@types/react': 18.2.20+ react: 18.2.0+ react-dom: 18.2.0([email protected])+ dev: false+resolution: {integrity: sha512-DmNFOiwEc2UDigsYj6clJENma58OelxD24O4IODoZ+3sQc3Zb+L8w1EP+y9laTuKCLAysPw4fD6/v0j4KNV8rg==}peerDependencies: