Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
51 changes: 49 additions & 2 deletions frontend/src/routes/_app/beans/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
import { Skeleton } from "@/components/ui/skeleton"
import { StarRating } from "@/components/ui/star-rating"
import { canEdit, useCurrentUser } from "@/lib/auth"
import { ROAST_TYPES } from "@/lib/domain"
import { humanize } from "@/lib/format"
import { useCrudFeedback } from "@/lib/mutations"
import { useMutation, useQuery } from "@tanstack/react-query"
Expand All @@ -48,11 +49,20 @@ function BeansPage() {
const [dialogOpen, setDialogOpen] = useState(false)
const [deleting, setDeleting] = useState<BeanRead | null>(null)
const [roasterFilter, setRoasterFilter] = useState("all")
const [roastTypeFilter, setRoastTypeFilter] = useState("all")
const [originFilter, setOriginFilter] = useState("all")
const [search, setSearch] = useState("")

// Only the origins actually in use, so the dropdown never offers an empty result.
const origins = [
...new Set((data ?? []).flatMap((bean) => (bean.origin_country ? [bean.origin_country] : []))),
].sort()

const query = search.trim().toLowerCase()
const filtered = (data ?? [])
.filter((bean) => roasterFilter === "all" || String(bean.roaster.id) === roasterFilter)
.filter((bean) => roastTypeFilter === "all" || bean.roast_type === roastTypeFilter)
.filter((bean) => originFilter === "all" || bean.origin_country === originFilter)
.filter(
(bean) =>
query === "" ||
Expand All @@ -67,6 +77,15 @@ function BeansPage() {
onError: feedback.onError,
})

const hasFilters =
roasterFilter !== "all" || roastTypeFilter !== "all" || originFilter !== "all"

function clearFilters() {
setRoasterFilter("all")
setRoastTypeFilter("all")
setOriginFilter("all")
}

function openCreate() {
setEditing(null)
setDialogOpen(true)
Expand Down Expand Up @@ -111,8 +130,36 @@ function BeansPage() {
</SelectContent>
</Select>

{roasterFilter !== "all" ? (
<Button variant="ghost" size="sm" onClick={() => setRoasterFilter("all")}>
<Select value={roastTypeFilter} onValueChange={setRoastTypeFilter}>
<SelectTrigger className="w-44">
<SelectValue placeholder="All roast types" />
</SelectTrigger>
<SelectContent>
<SelectItem value="all">All roast types</SelectItem>
{ROAST_TYPES.map((roastType) => (
<SelectItem key={roastType} value={roastType}>
{humanize(roastType)}
</SelectItem>
))}
</SelectContent>
</Select>

<Select value={originFilter} onValueChange={setOriginFilter}>
<SelectTrigger className="w-44">
<SelectValue placeholder="All origins" />
</SelectTrigger>
<SelectContent>
<SelectItem value="all">All origins</SelectItem>
{origins.map((origin) => (
<SelectItem key={origin} value={origin}>
{origin}
</SelectItem>
))}
</SelectContent>
</Select>

{hasFilters ? (
<Button variant="ghost" size="sm" onClick={clearFilters}>
<X className="size-4" />
Clear
</Button>
Expand Down
52 changes: 50 additions & 2 deletions frontend/src/routes/_app/brews/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import { formatDateTime, formatNumber, formatSeconds } from "@/lib/format"
import { useCrudFeedback } from "@/lib/mutations"
import { useMutation, useQuery } from "@tanstack/react-query"
import { Link, createFileRoute } from "@tanstack/react-router"
import { Plus, X } from "lucide-react"
import { Plus, StarOff, User, X } from "lucide-react"
import type { ReactNode } from "react"
import { useState } from "react"

Expand All @@ -64,6 +64,9 @@ function BrewsPage() {
const [deleting, setDeleting] = useState<BrewRead | null>(null)
const [roasterFilter, setRoasterFilter] = useState("all")
const [beanFilter, setBeanFilter] = useState("all")
const [methodFilter, setMethodFilter] = useState("all")
const [mineOnly, setMineOnly] = useState(false)
const [untastedOnly, setUntastedOnly] = useState(false)
const [search, setSearch] = useState("")

const remove = useMutation({
Expand Down Expand Up @@ -96,6 +99,9 @@ function BrewsPage() {
return false
}
if (beanFilter !== "all" && String(brew.bean_id) !== beanFilter) return false
if (methodFilter !== "all" && String(brew.method_id) !== methodFilter) return false
if (mineOnly && brew.user_id !== user?.id) return false
if (untastedOnly && myTastingByBrew.has(brew.id)) return false
if (query !== "") {
const haystack = [
beanName(brew.bean_id),
Expand All @@ -112,7 +118,12 @@ function BrewsPage() {
})
.sort((a, b) => (b.brewed_at ?? "").localeCompare(a.brewed_at ?? ""))

const hasFilters = roasterFilter !== "all" || beanFilter !== "all"
const hasFilters =
roasterFilter !== "all" ||
beanFilter !== "all" ||
methodFilter !== "all" ||
mineOnly ||
untastedOnly

function pickRoaster(value: string) {
setRoasterFilter(value)
Expand All @@ -122,6 +133,9 @@ function BrewsPage() {
function clearFilters() {
setRoasterFilter("all")
setBeanFilter("all")
setMethodFilter("all")
setMineOnly(false)
setUntastedOnly(false)
}

return (
Expand Down Expand Up @@ -176,6 +190,40 @@ function BrewsPage() {
className="w-56"
/>

<Select value={methodFilter} onValueChange={setMethodFilter}>
<SelectTrigger className="w-44">
<SelectValue placeholder="All methods" />
</SelectTrigger>
<SelectContent>
<SelectItem value="all">All methods</SelectItem>
{(methods ?? []).map((method) => (
<SelectItem key={method.id} value={String(method.id)}>
{method.name}
</SelectItem>
))}
</SelectContent>
</Select>

<Button
variant={mineOnly ? "secondary" : "outline"}
size="sm"
aria-pressed={mineOnly}
onClick={() => setMineOnly((on) => !on)}
>
<User className="size-4" />
Mine
</Button>

<Button
variant={untastedOnly ? "secondary" : "outline"}
size="sm"
aria-pressed={untastedOnly}
onClick={() => setUntastedOnly((on) => !on)}
>
<StarOff className="size-4" />
Not tasted
</Button>

{hasFilters ? (
<Button variant="ghost" size="sm" onClick={clearFilters}>
<X className="size-4" />
Expand Down