Skip to content

✨🏢 Filter foster families by ban status #798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sbellavoine wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

✨🏢 Filter foster families by ban status #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions apps/admin/src/foster-families/db.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,19 @@ import {
import { orderByRank } from "#i/core/order-by-rank.js"
import { prisma } from "#i/core/prisma.server.js"
import type { FosterFamilySearchParams } from "#i/foster-families/search-params.js"
import { FosterFamilyBan } from "#i/foster-families/search-params.js"

export class MissingSpeciesToHostError extends Error {}
export class InvalidAvailabilityDateError extends Error {}

const FOSTER_FAMILY_BAN_WHERE: Record<
FosterFamilyBan,
Prisma.FosterFamilyWhereInput
> = {
[FosterFamilyBan.NO]: { isBanned: false },
[FosterFamilyBan.YES]: { isBanned: true },
}

export class FosterFamilyDbDelegate {
async fuzzySearch<T extends Prisma.FosterFamilySelect>(
displayName: undefined | string,
Expand Down Expand Up @@ -277,6 +286,14 @@ export class FosterFamilyDbDelegate {
})
}

if (searchParams.ban.size > 0) {
where.push({
OR: Array.from(searchParams.ban).map(
(ban) => FOSTER_FAMILY_BAN_WHERE[ban],
),
})
}

if (searchParams.speciesToHost != null) {
where.push({
speciesToHost: { has: searchParams.speciesToHost },
Expand Down
109 changes: 81 additions & 28 deletions apps/admin/src/foster-families/filter-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ import {
SORTED_GARDEN,
SORTED_HOUSING,
} from "#i/foster-families/housing.js"
import { FosterFamilySearchParams } from "#i/foster-families/search-params.js"
import {
FosterFamilyBan,
FosterFamilySearchParams,
} from "#i/foster-families/search-params.js"
import { Icon } from "#i/generated/icon.js"

export function FosterFamilyFilters({
Expand Down Expand Up @@ -91,34 +94,84 @@ export function FosterFamilyFilters({
<Filters.Filter
value={FosterFamilySearchParams.keys.availability}
label="Disponibilités"
count={fosterFamilySearchParams.availability.size}
hiddenContent={Array.from(fosterFamilySearchParams.availability).map(
(availability) => (
<input
key={availability}
type="hidden"
name={FosterFamilySearchParams.keys.availability}
value={availability}
/>
),
)}
count={
fosterFamilySearchParams.availability.size +
fosterFamilySearchParams.ban.size
}
hiddenContent={
<>
{Array.from(fosterFamilySearchParams.availability).map(
(availability) => (
<input
key={availability}
type="hidden"
name={FosterFamilySearchParams.keys.availability}
value={availability}
/>
),
)}

{Array.from(fosterFamilySearchParams.ban).map((ban) => (
<input
key={ban}
type="hidden"
name={FosterFamilySearchParams.keys.ban}
value={ban}
/>
))}
</>
}
>
<ToggleInputList>
{SORTED_AVAILABILITIES.map((availability) => (
<ToggleInput
key={availability}
type="checkbox"
label={AVAILABILITY_TRANSLATION[availability]}
name={FosterFamilySearchParams.keys.availability}
value={availability}
icon={<AvailabilityIcon availability={availability} />}
checked={fosterFamilySearchParams.availability.has(
availability,
)}
onChange={() => {}}
/>
))}
</ToggleInputList>
<Form.Fields>
<Form.Field>
<Form.Label>Statut</Form.Label>

<ToggleInputList>
{SORTED_AVAILABILITIES.map((availability) => (
<ToggleInput
key={availability}
type="checkbox"
label={AVAILABILITY_TRANSLATION[availability]}
name={FosterFamilySearchParams.keys.availability}
value={availability}
icon={<AvailabilityIcon availability={availability} />}
checked={fosterFamilySearchParams.availability.has(
availability,
)}
onChange={() => {}}
/>
))}
</ToggleInputList>
</Form.Field>

<Form.Field>
<Form.Label>Bannissement</Form.Label>

<ToggleInputList>
<ToggleInput
type="checkbox"
label="Oui"
name={FosterFamilySearchParams.keys.ban}
value={FosterFamilyBan.YES}
icon={<Icon href="icon-ban-solid" />}
checked={fosterFamilySearchParams.ban.has(
FosterFamilyBan.YES,
)}
onChange={() => {}}
/>

<ToggleInput
type="checkbox"
label="Non"
name={FosterFamilySearchParams.keys.ban}
value={FosterFamilyBan.NO}
icon={<Icon href="icon-ban-solid" />}
checked={fosterFamilySearchParams.ban.has(FosterFamilyBan.NO)}
onChange={() => {}}
/>
</ToggleInputList>
</Form.Field>
</Form.Fields>
</Filters.Filter>

<Filters.Filter
Expand Down
10 changes: 10 additions & 0 deletions apps/admin/src/foster-families/search-params.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@ import {
import { SearchParamsIO } from "@animeaux/search-params-io"
import { zu } from "@animeaux/zod-utils"

export enum FosterFamilyBan {
NO = "NO",
YES = "YES",
}

export const FosterFamilySearchParams = SearchParamsIO.create({
keys: {
availability: "a",
ban: "ban",
displayName: "q",
garden: "garden",
housing: "housing",
Expand All @@ -23,6 +29,7 @@ export const FosterFamilySearchParams = SearchParamsIO.create({
parseFunction: (searchParams, keys) => {
return Schema.parse({
availability: SearchParamsIO.getValues(searchParams, keys.availability),
ban: SearchParamsIO.getValues(searchParams, keys.ban),
displayName: SearchParamsIO.getValue(searchParams, keys.displayName),
garden: SearchParamsIO.getValues(searchParams, keys.garden),
housing: SearchParamsIO.getValues(searchParams, keys.housing),
Expand Down Expand Up @@ -70,13 +77,16 @@ export const FosterFamilySearchParams = SearchParamsIO.create({
)

SearchParamsIO.setValue(searchParams, keys.zipCode, data.zipCode)

SearchParamsIO.setValues(searchParams, keys.ban, data.ban)
},
})

const Schema = zu.object({
availability: zu.searchParams.set(
zu.searchParams.nativeEnum(FosterFamilyAvailability),
),
ban: zu.searchParams.set(zu.searchParams.nativeEnum(FosterFamilyBan)),
displayName: zu.searchParams.string(),
garden: zu.searchParams.set(zu.searchParams.nativeEnum(FosterFamilyGarden)),
housing: zu.searchParams.set(zu.searchParams.nativeEnum(FosterFamilyHousing)),
Expand Down
Loading