From 506c5a408e94ff312221337132332b80633b834a Mon Sep 17 00:00:00 2001 From: Varun Raj Date: Sat, 1 Feb 2025 09:46:50 +0530 Subject: [PATCH] feat: option filter people based on visibility Signed-off-by: Varun Raj --- src/components/people/PeopleFilters.tsx | 24 +++++++++++++++++++++--- src/components/people/PersonItem.tsx | 2 +- src/handlers/api/people.handler.ts | 1 + src/pages/api/people/list.ts | 7 +++++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/components/people/PeopleFilters.tsx b/src/components/people/PeopleFilters.tsx index c64a39c..6915039 100644 --- a/src/components/people/PeopleFilters.tsx +++ b/src/components/people/PeopleFilters.tsx @@ -15,20 +15,27 @@ import { import { Input } from "../ui/input"; import { IPersonListFilters } from "@/handlers/api/people.handler"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../ui/select"; +import { removeNullOrUndefinedProperties } from "@/helpers/data.helper"; +import { ParsedUrlQueryInput } from "querystring"; export function PeopleFilters() { const router = useRouter(); - const { updateContext, page, maximumAssetCount, type = "all", query ="" } = usePeopleFilterContext(); + const { updateContext, page, maximumAssetCount, type = "all", query = "", visibility = "all" } = usePeopleFilterContext(); const handleChange = (data: Partial) => { updateContext(data); router.push({ pathname: router.pathname, - query: { + query: { ...router.query, - ...data, + ...data, page: data.page || undefined, type: data.type || undefined, + visibility: data.visibility || undefined, + query: data.query || undefined, + maximumAssetCount: data.maximumAssetCount || undefined, + sort: data.sort || undefined, + sortOrder: data.sortOrder || undefined, }, }); } @@ -73,6 +80,17 @@ export function PeopleFilters() { + + diff --git a/src/handlers/api/people.handler.ts b/src/handlers/api/people.handler.ts index bd901c6..f1d1d29 100644 --- a/src/handlers/api/people.handler.ts +++ b/src/handlers/api/people.handler.ts @@ -14,6 +14,7 @@ export interface IPersonListFilters { sortOrder?: "asc" | "desc"; type?: string; query?: string; + visibility?: "all" | "visible" | "hidden"; } export const listPeople = (filters: IPersonListFilters): Promise => { return API.get(LIST_PEOPLE_PATH, filters).then((response) => { diff --git a/src/pages/api/people/list.ts b/src/pages/api/people/list.ts index 4dabcd0..8789d5f 100644 --- a/src/pages/api/people/list.ts +++ b/src/pages/api/people/list.ts @@ -29,6 +29,7 @@ interface IQuery { sort: ISortField; sortOrder: "asc" | "desc"; query: string; + visibility: "all" | "visible" | "hidden"; } export default async function handler( req: NextApiRequest, @@ -43,19 +44,21 @@ export default async function handler( sortOrder = "desc", type = "all", query = "", + visibility = "all", } = req.query as any as IQuery; const currentUser = await getCurrentUser(req); const maximumAssetCount = !maxValue || maxValue <= 0 ? 1000000 : maxValue; + const whereClause = and( - eq(person.isHidden, false), isNull(assets.duplicateId), eq(assets.isVisible, true), eq(assets.isArchived, false), eq(assets.ownerId, currentUser.id), type === "all" ? undefined : (type === "nameless" ? eq(person.name, "") : ne(person.name, "")), - query && query.length > 0 ? ilike(person.name, `%${query}%`) : undefined + query && query.length > 0 ? ilike(person.name, `%${query}%`) : undefined, + visibility === "visible" ? eq(person.isHidden, false) : visibility === "hidden" ? eq(person.isHidden, true) : undefined ); let dbQuery = db