Skip to content

feat(webapp): preserve admin tabs search query between Users and Organizations #3609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicktrn merged 2 commits into from
May 13, 2026
Merged

feat(webapp): preserve admin tabs search query between Users and Organizations #3609

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a7a82d
feat(webapp): preserve admin tabs search query between Users and Orga…
nicktrn May 13, 2026
0a8c562
Merge branch 'main' into improvement/admin-tabs-preserve-search
nicktrn May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .server-changes/admin-tabs-preserve-search.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
area: webapp
type: improvement
---

Preserve search string when switching between the Users and Organizations tabs in the admin dashboard.
10 changes: 7 additions & 3 deletions apps/webapp/app/routes/admin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Outlet } from "@remix-run/react";
import { Outlet, useSearchParams } from "@remix-run/react";
import { typedjson } from "remix-typedjson";
import { LinkButton } from "~/components/primitives/Buttons";
import { Tabs } from "~/components/primitives/Tabs";
Expand All @@ -10,18 +10,22 @@ export const loader = dashboardLoader(
);

export default function Page() {
const [searchParams] = useSearchParams();
const search = searchParams.get("search");
const searchSuffix = search ? `?search=${encodeURIComponent(search)}` : "";

return (
<div className="h-full w-full">
<div className="flex items-center justify-between p-4">
<Tabs
tabs={[
{
label: "Users",
to: "/admin",
to: `/admin${searchSuffix}`,
},
{
label: "Organizations",
to: "/admin/orgs",
to: `/admin/orgs${searchSuffix}`,
},
{
label: "Concurrency",
Expand Down
Loading