Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

feat: add page querystring to url at solution (#1332)

mdm317705b0d49451c
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/index.tsx b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/index.tsx
index 879d4f90..bd96b7f4 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/index.tsx
+++ b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/index.tsx
@@ -16,6 +16,8 @@ import { Pagination } from '../../../_components/pagination';
import { useQuery } from '@tanstack/react-query';
import { SolutionsSkeleton } from './solution-skeleton';
import { SortSelect } from '../../../_components/sort-select';
+import { useGetQueryString } from './useGetQueryString';
+import { useQueryParamState } from './useQueryParamState';
interface Props {
slug: string;
@@ -48,7 +50,7 @@ export function Solutions({ slug }: Props) {
const [view, setView] = useState<View>('list');
const commentContainerRef = useRef<HTMLDivElement>(null);
const [sortKey, setSortKey] = useState<(typeof SORT_KEYS)[number]>(SORT_KEYS[0]);
- const [page, setPage] = useState(1);
+ const [page, setPage] = useQueryParamState<number>('page', 1);
const queryKey = ['challenge-solutions', slug, page, sortKey.key, sortKey.order];
const session = useSession();
@@ -144,10 +146,11 @@ function SolutionRow({
solution: NonNullable<PaginatedSolution['sharedSolution']>[number];
}) {
const { slug } = useParams();
+ const queryString = useGetQueryString();
return (
<Link
+ href={`/challenge/${slug}/solutions/${solution.id}?${queryString}`}
className="flex cursor-pointer flex-col gap-2 p-4 duration-300 hover:bg-neutral-100 dark:hover:bg-zinc-700/50"
- href={`/challenge/${slug}/solutions/${solution.id}`}
>
<h3 className="truncate font-bold">{solution.title}</h3>
<div className="flex items-center gap-2">
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-detail.tsx b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-detail.tsx
index ec9fdc0a..8f57bdd6 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-detail.tsx
+++ b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-detail.tsx
@@ -22,6 +22,7 @@ import { SolutionDeleteDialog } from './delete';
import { useParams } from 'next/navigation';
import { useState } from 'react';
import { EditSolution } from './edit-solution';
+import { useGetQueryString } from './useGetQueryString';
interface Props {
solution: ChallengeSolution;
@@ -32,6 +33,7 @@ export function SolutionDetails({ solution }: Props) {
const { data: session } = useSession();
const showPin = isAdminOrModerator(session);
const [isEditing, setIsEditing] = useState(false);
+ const queryString = useGetQueryString();
const handlePinClick = async () => {
await pinOrUnpinSolution(solution.id, !solution.isPinned, slug as string);
@@ -46,14 +48,13 @@ export function SolutionDetails({ solution }: Props) {
});
}
};
-
return (
<div className="relative h-full">
<div className="relative flex h-full flex-col">
<div className="custom-scrollable-element flex-1 overflow-y-auto px-4 pb-16 pt-3">
<div className="mb-5 flex flex-col gap-3">
<div className="flex items-center gap-3">
- <Link href={`/challenge/${slug}/solutions`} className="h-7 w-7">
+ <Link href={`/challenge/${slug}/solutions?${queryString}`} className="h-7 w-7">
<div className="rounded-full p-1 hover:bg-gray-200 hover:bg-opacity-10">
<ArrowLeft className="stroke-gray-500" size={20} />
</div>
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/useGetQueryString.tsx b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/useGetQueryString.tsx
new file mode 100644
index 00000000..cfb53884
--- /dev/null
+++ b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/useGetQueryString.tsx
@@ -0,0 +1,7 @@
+import { useSearchParams } from 'next/navigation';
+
+export const useGetQueryString = () => {
+ const searchParams = useSearchParams();
+ const params = new URLSearchParams(searchParams);
+ return params.toString();
+};
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/useQueryParamState.ts b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/useQueryParamState.ts
new file mode 100644
index 00000000..c25181c0
--- /dev/null
+++ b/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/useQueryParamState.ts
@@ -0,0 +1,25 @@
+'use client';
+
+import { useSearchParams, useRouter, usePathname } from 'next/navigation';
+
+export const useQueryParamState = <T extends number | string>(key: string, defaultValue: T) => {
+ const router = useRouter();
+ const searchParams = useSearchParams();
+ const pathname = usePathname();
+ const getValue = (): T => {
+ const value = searchParams.get(key);
+ if (!value) {
+ return defaultValue;
+ }
+ return (typeof defaultValue === 'number' ? Number(value) : value) as T;
+ };
+ const value = getValue();
+
+ const setQueryParam = (value: T) => {
+ const params = new URLSearchParams(searchParams);
+ params.set(key, value.toString());
+ router.push(`${pathname}?${params.toString()}`);
+ };
+
+ return [value, setQueryParam] as const;
+};