mirror of
https://github.com/marcogll/TaxHacker_s23.git
synced 2026-01-13 21:35:19 +00:00
feat: filters and UI improvements
This commit is contained in:
@@ -53,10 +53,12 @@ export default function TransactionEditForm({
|
|||||||
})
|
})
|
||||||
|
|
||||||
const handleDelete = async () => {
|
const handleDelete = async () => {
|
||||||
startTransition(async () => {
|
if (confirm("Are you sure? This will delete the transaction with all the files permanently")) {
|
||||||
await deleteAction(transaction.id)
|
startTransition(async () => {
|
||||||
router.back()
|
await deleteAction(transaction.id)
|
||||||
})
|
router.back()
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -146,9 +148,9 @@ export default function TransactionEditForm({
|
|||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
|
|
||||||
<div className="flex justify-end space-x-4 pt-6">
|
<div className="flex justify-between space-x-4 pt-6">
|
||||||
<Button type="button" onClick={handleDelete} variant="destructive" disabled={isDeleting}>
|
<Button type="button" onClick={handleDelete} variant="destructive" disabled={isDeleting}>
|
||||||
{isDeleting ? "⏳ Deleting..." : "Delete Transaction"}
|
{isDeleting ? "⏳ Deleting..." : "Delete "}
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Button type="submit" disabled={isSaving}>
|
<Button type="submit" disabled={isSaving}>
|
||||||
@@ -158,7 +160,7 @@ export default function TransactionEditForm({
|
|||||||
Saving...
|
Saving...
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
"Save"
|
"Save Transaction"
|
||||||
)}
|
)}
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
"use client"
|
"use client"
|
||||||
|
|
||||||
import { DateRangePicker } from "@/components/forms/date-range-picker"
|
import { DateRangePicker } from "@/components/forms/date-range-picker"
|
||||||
|
import { Button } from "@/components/ui/button"
|
||||||
import { Input } from "@/components/ui/input"
|
import { Input } from "@/components/ui/input"
|
||||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
|
||||||
import { TransactionFilters } from "@/data/transactions"
|
import { TransactionFilters } from "@/data/transactions"
|
||||||
import { useTransactionFilters } from "@/hooks/use-transaction-filters"
|
import { isFiltered, useTransactionFilters } from "@/hooks/use-transaction-filters"
|
||||||
import { Category, Project } from "@prisma/client"
|
import { Category, Project } from "@prisma/client"
|
||||||
|
import { X } from "lucide-react"
|
||||||
|
|
||||||
export function TransactionSearchAndFilters({ categories, projects }: { categories: Category[]; projects: Project[] }) {
|
export function TransactionSearchAndFilters({ categories, projects }: { categories: Category[]; projects: Project[] }) {
|
||||||
const [filters, setFilters] = useTransactionFilters()
|
const [filters, setFilters] = useTransactionFilters()
|
||||||
@@ -79,6 +81,20 @@ export function TransactionSearchAndFilters({ categories, projects }: { categori
|
|||||||
handleFilterChange("dateTo", date ? date.to : undefined)
|
handleFilterChange("dateTo", date ? date.to : undefined)
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
{isFiltered(filters) && (
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
onClick={() => {
|
||||||
|
setFilters({})
|
||||||
|
}}
|
||||||
|
className="text-muted-foreground hover:text-foreground"
|
||||||
|
title="Clear all filters"
|
||||||
|
>
|
||||||
|
<X className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -3,14 +3,33 @@ import { format } from "date-fns"
|
|||||||
import { useRouter, useSearchParams } from "next/navigation"
|
import { useRouter, useSearchParams } from "next/navigation"
|
||||||
import { useEffect, useState } from "react"
|
import { useEffect, useState } from "react"
|
||||||
|
|
||||||
|
const filters = ["search", "dateFrom", "dateTo", "categoryCode", "projectCode"]
|
||||||
|
|
||||||
|
export function useTransactionFilters(defaultFilters?: TransactionFilters) {
|
||||||
|
const router = useRouter()
|
||||||
|
const searchParams = useSearchParams()
|
||||||
|
const [filters, setFilters] = useState<TransactionFilters>({
|
||||||
|
...defaultFilters,
|
||||||
|
...searchParamsToFilters(searchParams),
|
||||||
|
})
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const newSearchParams = filtersToSearchParams(filters)
|
||||||
|
router.push(`?${newSearchParams.toString()}`)
|
||||||
|
}, [filters])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setFilters(searchParamsToFilters(searchParams))
|
||||||
|
}, [searchParams])
|
||||||
|
|
||||||
|
return [filters, setFilters] as const
|
||||||
|
}
|
||||||
|
|
||||||
export function searchParamsToFilters(searchParams: URLSearchParams) {
|
export function searchParamsToFilters(searchParams: URLSearchParams) {
|
||||||
return {
|
return filters.reduce((acc, filter) => {
|
||||||
search: searchParams.get("search") || "",
|
acc[filter] = searchParams.get(filter) || ""
|
||||||
dateFrom: searchParams.get("dateFrom") || "",
|
return acc
|
||||||
dateTo: searchParams.get("dateTo") || "",
|
}, {} as Record<string, string>)
|
||||||
categoryCode: searchParams.get("categoryCode") || "",
|
|
||||||
projectCode: searchParams.get("projectCode") || "",
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function filtersToSearchParams(filters: TransactionFilters): URLSearchParams {
|
export function filtersToSearchParams(filters: TransactionFilters): URLSearchParams {
|
||||||
@@ -48,22 +67,6 @@ export function filtersToSearchParams(filters: TransactionFilters): URLSearchPar
|
|||||||
return searchParams
|
return searchParams
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useTransactionFilters(defaultFilters?: TransactionFilters) {
|
export function isFiltered(filters: TransactionFilters) {
|
||||||
const router = useRouter()
|
return Object.values(filters).some((value) => value !== "" && value !== "-")
|
||||||
const searchParams = useSearchParams()
|
|
||||||
const [filters, setFilters] = useState<TransactionFilters>({
|
|
||||||
...defaultFilters,
|
|
||||||
...searchParamsToFilters(searchParams),
|
|
||||||
})
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const newSearchParams = filtersToSearchParams(filters)
|
|
||||||
router.push(`?${newSearchParams.toString()}`)
|
|
||||||
}, [filters])
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
setFilters(searchParamsToFilters(searchParams))
|
|
||||||
}, [searchParams])
|
|
||||||
|
|
||||||
return [filters, setFilters] as const
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user