feat: option filter people based on visibility
Signed-off-by: Varun Raj <varun@skcript.com>
This commit is contained in:
1 parent
0c37a08542
commit
506c5a408e
4 files changed
+26
-4
No files matched your search
@@ -15,10 +15,12 @@ import {
|
|||||||
import { Input } from "../ui/input";
|
import { Input } from "../ui/input";
|
||||||
import { IPersonListFilters } from "@/handlers/api/people.handler";
|
import { IPersonListFilters } from "@/handlers/api/people.handler";
|
||||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../ui/select";
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../ui/select";
|
||||||
|
import { removeNullOrUndefinedProperties } from "@/helpers/data.helper";
|
||||||
|
import { ParsedUrlQueryInput } from "querystring";
|
||||||
|
|
||||||
export function PeopleFilters() {
|
export function PeopleFilters() {
|
||||||
const router = useRouter();
|
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<IPersonListFilters>) => {
|
const handleChange = (data: Partial<IPersonListFilters>) => {
|
||||||
updateContext(data);
|
updateContext(data);
|
||||||
@@ -29,6 +31,11 @@ export function PeopleFilters() {
|
|||||||
...data,
|
...data,
|
||||||
page: data.page || undefined,
|
page: data.page || undefined,
|
||||||
type: data.type || 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() {
|
|||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
|
|
||||||
|
<Select value={visibility} onValueChange={(value) => handleChange({ visibility: value as "all" | "visible" | "hidden" })}>
|
||||||
|
<SelectTrigger>
|
||||||
|
<SelectValue placeholder="Visibility" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="all">All</SelectItem>
|
||||||
|
<SelectItem value="visible">Visible</SelectItem>
|
||||||
|
<SelectItem value="hidden">Hidden</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
disabled={prevPage < 1}
|
disabled={prevPage < 1}
|
||||||
onClick={() => handleChange({ page: prevPage })}
|
onClick={() => handleChange({ page: prevPage })}
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ export default function PersonItem({ person, onRemove }: IProps) {
|
|||||||
<Button variant="outline" className="!py-0.5 !px-2 text-xs h-7" onClick={() => {
|
<Button variant="outline" className="!py-0.5 !px-2 text-xs h-7" onClick={() => {
|
||||||
handleHide(!formData.isHidden);
|
handleHide(!formData.isHidden);
|
||||||
}}>
|
}}>
|
||||||
Hide
|
{formData.isHidden ? "Show" : "Hide"}
|
||||||
</Button>
|
</Button>
|
||||||
<ShareAssetsTrigger filters={{ personIds: [person.id] }} buttonProps={{ variant: "outline", className: "!py-0.5 !px-2 text-xs h-7" }} />
|
<ShareAssetsTrigger filters={{ personIds: [person.id] }} buttonProps={{ variant: "outline", className: "!py-0.5 !px-2 text-xs h-7" }} />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ export interface IPersonListFilters {
|
|||||||
sortOrder?: "asc" | "desc";
|
sortOrder?: "asc" | "desc";
|
||||||
type?: string;
|
type?: string;
|
||||||
query?: string;
|
query?: string;
|
||||||
|
visibility?: "all" | "visible" | "hidden";
|
||||||
}
|
}
|
||||||
export const listPeople = (filters: IPersonListFilters): Promise<IPeopleListResponse> => {
|
export const listPeople = (filters: IPersonListFilters): Promise<IPeopleListResponse> => {
|
||||||
return API.get(LIST_PEOPLE_PATH, filters).then((response) => {
|
return API.get(LIST_PEOPLE_PATH, filters).then((response) => {
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ interface IQuery {
|
|||||||
sort: ISortField;
|
sort: ISortField;
|
||||||
sortOrder: "asc" | "desc";
|
sortOrder: "asc" | "desc";
|
||||||
query: string;
|
query: string;
|
||||||
|
visibility: "all" | "visible" | "hidden";
|
||||||
}
|
}
|
||||||
export default async function handler(
|
export default async function handler(
|
||||||
req: NextApiRequest,
|
req: NextApiRequest,
|
||||||
@@ -43,19 +44,21 @@ export default async function handler(
|
|||||||
sortOrder = "desc",
|
sortOrder = "desc",
|
||||||
type = "all",
|
type = "all",
|
||||||
query = "",
|
query = "",
|
||||||
|
visibility = "all",
|
||||||
} = req.query as any as IQuery;
|
} = req.query as any as IQuery;
|
||||||
|
|
||||||
const currentUser = await getCurrentUser(req);
|
const currentUser = await getCurrentUser(req);
|
||||||
|
|
||||||
const maximumAssetCount = !maxValue || maxValue <= 0 ? 1000000 : maxValue;
|
const maximumAssetCount = !maxValue || maxValue <= 0 ? 1000000 : maxValue;
|
||||||
|
|
||||||
const whereClause = and(
|
const whereClause = and(
|
||||||
eq(person.isHidden, false),
|
|
||||||
isNull(assets.duplicateId),
|
isNull(assets.duplicateId),
|
||||||
eq(assets.isVisible, true),
|
eq(assets.isVisible, true),
|
||||||
eq(assets.isArchived, false),
|
eq(assets.isArchived, false),
|
||||||
eq(assets.ownerId, currentUser.id),
|
eq(assets.ownerId, currentUser.id),
|
||||||
type === "all" ? undefined : (type === "nameless" ? eq(person.name, "") : ne(person.name, "")),
|
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
|
let dbQuery = db
|
||||||
|
|||||||
Reference in new issue
Block a user