[Dashboard] Improve user filtering functionality #7572
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| import { loginRedirect } from "@app/login/loginRedirect"; | ||
| import { InAppWalletUsersPageContent } from "@app/team/[team_slug]/[project_slug]/(sidebar)/wallets/users/components"; | ||
| import { redirect } from "next/navigation"; | ||
| import { getAuthToken } from "@/api/auth-token"; | ||
| import { fetchEcosystem } from "@/api/ecosystems"; | ||
| import { getTeamBySlug } from "@/api/team"; | ||
| import { getClientThirdwebClient } from "@/constants/thirdweb-client.client"; | ||
|
|
||
| export default async function EcosystemUsersPage(props: { | ||
| params: Promise<{ team_slug: string; slug: string }>; | ||
| }) { | ||
| const params = await props.params; | ||
| const [authToken, ecosystem, team] = await Promise.all([ | ||
| getAuthToken(), | ||
| fetchEcosystem(params.slug, params.team_slug), | ||
| getTeamBySlug(params.team_slug), | ||
| ]); | ||
|
|
||
| if (!authToken) { | ||
| loginRedirect( | ||
| `/team/${params.team_slug}/~/ecosystem/${params.slug}/users`, | ||
| ); | ||
| } | ||
|
|
||
| if (!ecosystem || !team) { | ||
| redirect(`/team/${params.team_slug}`); | ||
| } | ||
|
|
||
| const client = getClientThirdwebClient({ | ||
| jwt: authToken, | ||
| teamId: team.id, | ||
| }); | ||
|
|
||
| return ( | ||
| <InAppWalletUsersPageContent | ||
| authToken={authToken} | ||
| client={client} | ||
| ecosystemSlug={ecosystem.slug} | ||
| /> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| "use client"; | ||
|
|
||
| import { SearchIcon } from "lucide-react"; | ||
| import { useState } from "react"; | ||
| import { Button } from "@/components/ui/button"; | ||
| import { Input } from "@/components/ui/input"; | ||
| import { | ||
| Select, | ||
| SelectContent, | ||
| SelectItem, | ||
| SelectTrigger, | ||
| SelectValue, | ||
| } from "@/components/ui/select"; | ||
|
|
||
| import type { SearchType } from "./types"; | ||
|
|
||
| export function AdvancedSearchInput(props: { | ||
| onSearch: (searchType: SearchType, query: string) => void; | ||
| onClear: () => void; | ||
| isLoading: boolean; | ||
| hasResults: boolean; | ||
| }) { | ||
| const [searchType, setSearchType] = useState<SearchType>("email"); | ||
| const [query, setQuery] = useState(""); | ||
|
|
||
| const handleSearch = () => { | ||
| if (query.trim()) { | ||
| props.onSearch(searchType, query.trim()); | ||
| } | ||
| }; | ||
|
|
||
| const handleClear = () => { | ||
| setQuery(""); | ||
| props.onClear(); | ||
| }; | ||
|
|
||
| const handleKeyDown = (e: React.KeyboardEvent) => { | ||
| if (e.key === "Enter") { | ||
| handleSearch(); | ||
| } | ||
| }; | ||
|
|
||
| return ( | ||
| <div className="flex flex-col gap-2"> | ||
| <div className="flex gap-2"> | ||
| <Select | ||
| value={searchType} | ||
| onValueChange={(value) => setSearchType(value as SearchType)} | ||
|
Contributor
There was a problem hiding this comment. 🛠️ Refactor suggestion Fix type safety issue in search type casting. The type casting - onValueChange={(value) => setSearchType(value as SearchType)}
+ onValueChange={(value) => {
+ if (value === "email" || value === "phone" || value === "id" || value === "address") {
+ setSearchType(value);
+ }
+ }}🤖 Prompt for AI Agents |
||
| > | ||
| <SelectTrigger className="w-[140px] bg-card"> | ||
| <SelectValue /> | ||
| </SelectTrigger> | ||
| <SelectContent> | ||
| <SelectItem value="email">Email</SelectItem> | ||
| <SelectItem value="phone">Phone</SelectItem> | ||
| <SelectItem value="id">ID</SelectItem> | ||
| <SelectItem value="address">Address</SelectItem> | ||
| </SelectContent> | ||
| </Select> | ||
|
|
||
| <div className="relative flex-1"> | ||
| <Input | ||
| className="bg-card pl-9" | ||
| placeholder={`Search by ${searchType}...`} | ||
| value={query} | ||
| onChange={(e) => setQuery(e.target.value)} | ||
| onKeyDown={handleKeyDown} | ||
| /> | ||
| <SearchIcon className="-translate-y-1/2 absolute top-1/2 left-3 size-4 text-muted-foreground" /> | ||
| </div> | ||
|
|
||
| <Button | ||
| onClick={handleSearch} | ||
| disabled={!query.trim() || props.isLoading} | ||
| size="sm" | ||
| > | ||
| {props.isLoading ? "Searching..." : "Search"} | ||
| </Button> | ||
| </div> | ||
|
|
||
| {props.hasResults && ( | ||
| <div className="flex justify-center"> | ||
| <Button | ||
| variant="outline" | ||
| size="sm" | ||
| onClick={handleClear} | ||
| className="gap-2" | ||
| > | ||
| Clear Search & Return to List | ||
| </Button> | ||
| </div> | ||
| )} | ||
| </div> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| "use client"; | ||
|
|
||
| import { format } from "date-fns"; | ||
| import type { ThirdwebClient } from "thirdweb"; | ||
| import type { WalletUser } from "thirdweb/wallets"; | ||
| import { WalletAddress } from "@/components/blocks/wallet-address"; | ||
| import { Badge } from "@/components/ui/badge"; | ||
| import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; | ||
| import { | ||
| Tooltip, | ||
| TooltipContent, | ||
| TooltipProvider, | ||
| TooltipTrigger, | ||
| } from "@/components/ui/tooltip"; | ||
|
|
||
| const getUserIdentifier = (user: WalletUser) => { | ||
| const mainDetail = user.linkedAccounts[0]?.details; | ||
| return ( | ||
| mainDetail?.email ?? | ||
| mainDetail?.phone ?? | ||
| mainDetail?.address ?? | ||
| mainDetail?.id ?? | ||
| user.id | ||
| ); | ||
| }; | ||
|
|
||
| export function SearchResults(props: { | ||
| results: WalletUser[]; | ||
| client: ThirdwebClient; | ||
| }) { | ||
| if (props.results.length === 0) { | ||
| return ( | ||
| <Card> | ||
| <CardContent className="py-8"> | ||
| <div className="flex flex-col items-center gap-3"> | ||
| <p className="text-sm">No users found</p> | ||
| <p className="text-muted-foreground text-sm"> | ||
| Try searching with different criteria | ||
| </p> | ||
| </div> | ||
| </CardContent> | ||
| </Card> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <div className="space-y-4"> | ||
| {props.results.map((user) => { | ||
| const walletAddress = user.wallets?.[0]?.address; | ||
| const createdAt = user.wallets?.[0]?.createdAt; | ||
| const mainDetail = user.linkedAccounts?.[0]?.details; | ||
| const email = mainDetail?.email as string | undefined; | ||
| const phone = mainDetail?.phone as string | undefined; | ||
|
|
||
| return ( | ||
| <Card key={user.id}> | ||
| <CardHeader> | ||
| <CardTitle className="text-lg">User Details</CardTitle> | ||
| </CardHeader> | ||
| <CardContent className="space-y-4"> | ||
| <div className="grid grid-cols-1 md:grid-cols-2 gap-4"> | ||
| <div> | ||
| <p className="text-sm font-medium text-muted-foreground"> | ||
| User Identifier | ||
| </p> | ||
| <p className="text-sm">{getUserIdentifier(user)}</p> | ||
| </div> | ||
|
|
||
| {walletAddress && ( | ||
| <div> | ||
| <p className="text-sm font-medium text-muted-foreground"> | ||
| Wallet Address | ||
| </p> | ||
| <WalletAddress | ||
| address={walletAddress} | ||
| client={props.client} | ||
| /> | ||
| </div> | ||
| )} | ||
|
|
||
| {email && ( | ||
| <div> | ||
| <p className="text-sm font-medium text-muted-foreground"> | ||
| </p> | ||
| <p className="text-sm">{email}</p> | ||
| </div> | ||
| )} | ||
|
|
||
| {phone && ( | ||
| <div> | ||
| <p className="text-sm font-medium text-muted-foreground"> | ||
| Phone | ||
| </p> | ||
| <p className="text-sm">{phone}</p> | ||
| </div> | ||
| )} | ||
|
|
||
| {createdAt && ( | ||
| <div> | ||
| <p className="text-sm font-medium text-muted-foreground"> | ||
| Created | ||
| </p> | ||
| <p className="text-sm"> | ||
| {format(new Date(createdAt), "MMM dd, yyyy")} | ||
| </p> | ||
| </div> | ||
| )} | ||
|
|
||
| <div> | ||
| <p className="text-sm font-medium text-muted-foreground"> | ||
| Login Methods | ||
| </p> | ||
| <div className="flex flex-wrap gap-1"> | ||
| {user.linkedAccounts?.map((account, index) => ( | ||
| <TooltipProvider | ||
| key={`${user.id}-${account.type}-${index}`} | ||
| > | ||
| <Tooltip> | ||
| <TooltipTrigger> | ||
| <Badge variant="secondary" className="text-xs"> | ||
| {account.type} | ||
| </Badge> | ||
| </TooltipTrigger> | ||
| <TooltipContent> | ||
| <div className="text-sm space-y-1"> | ||
| {Object.entries(account.details).map( | ||
| ([key, value]) => ( | ||
| <div key={key}> | ||
| <span className="font-medium">{key}:</span>{" "} | ||
| {String(value)} | ||
| </div> | ||
| ), | ||
| )} | ||
| </div> | ||
| </TooltipContent> | ||
| </Tooltip> | ||
| </TooltipProvider> | ||
| ))} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </CardContent> | ||
| </Card> | ||
| ); | ||
| })} | ||
| </div> | ||
| ); | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Add server-only import for server component.
This server component should import "server-only" at the top to clearly indicate it runs on the server edge.
+import "server-only"; import { loginRedirect } from "@app/login/loginRedirect";📝 Committable suggestion
🤖 Prompt for AI Agents