Skip to content
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.

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

feat(moderations): add hide join organization filter the table #27

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
28 changes: 26 additions & 2 deletions src/moderations/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,17 @@ export const SEARCH_SIRET_INPUT_ID = "search_siret";
export const SEARCH_EMAIL_INPUT_ID = "search_email";
export const PROCESSED_REQUESTS_INPUT_ID = "processed_requests";
export const NON_VERIFIED_DOMAIN_INPUT_ID = "non_verified_domain";
export const HIDE_JOIN_ORGANIZATION_INPUT_ID = "hide_join_organization";

export const Search_Schema = z.object({
[SEARCH_SIRET_INPUT_ID]: z.string().default(""),
[SEARCH_EMAIL_INPUT_ID]: z.string().default(""),
[PROCESSED_REQUESTS_INPUT_ID]: z.string().pipe(z_coerce_boolean).default(""),
[NON_VERIFIED_DOMAIN_INPUT_ID]: z.string().pipe(z_coerce_boolean).default(""),
[HIDE_JOIN_ORGANIZATION_INPUT_ID]: z
.string()
.pipe(z_coerce_boolean)
.default(""),
});
export type Search = z.infer<typeof Search_Schema>;

Expand All @@ -36,6 +41,7 @@ export type Search = z.infer<typeof Search_Schema>;
const hx_moderations_query_props = {
"hx-get": app_hc.moderations.$url().pathname,
"hx-include": hx_include([
HIDE_JOIN_ORGANIZATION_INPUT_ID,
MODERATION_TABLE_PAGE_ID,
NON_VERIFIED_DOMAIN_INPUT_ID,
PROCESSED_REQUESTS_INPUT_ID,
Expand Down Expand Up @@ -77,6 +83,7 @@ function Filter({ search }: { search: Search }) {
<form
{...hx_moderations_query_props}
hx-trigger={[
`input from:#${HIDE_JOIN_ORGANIZATION_INPUT_ID}`,
`input from:#${NON_VERIFIED_DOMAIN_INPUT_ID}`,
`input from:#${PROCESSED_REQUESTS_INPUT_ID}`,
`keyup changed delay:500ms from:#${SEARCH_EMAIL_INPUT_ID}`,
Expand Down Expand Up @@ -138,6 +145,21 @@ function Filter({ search }: { search: Search }) {
</label>
</div>
</div>
<div class="fr-fieldset__element">
<div class="fr-checkbox-group">
<input
_="on click set @value to my checked"
id={HIDE_JOIN_ORGANIZATION_INPUT_ID}
name={HIDE_JOIN_ORGANIZATION_INPUT_ID}
value={search[HIDE_JOIN_ORGANIZATION_INPUT_ID] ? "true" : "false"}
checked={search[HIDE_JOIN_ORGANIZATION_INPUT_ID]}
type="checkbox"
/>
<label class="fr-label" for={HIDE_JOIN_ORGANIZATION_INPUT_ID}>
Cacher les {moderation_type_to_emoji("organization_join_block")}
</label>
</div>
</div>
</form>
);
}
Expand All @@ -154,17 +176,19 @@ async function ModerationList_Table({
} = useRequestContext<moncomptepro_pg_Context>();
const { page, page_size } = pagination;
const {
hide_join_organization,
non_verified_domain,
processed_requests,
search_email,
search_siret,
processed_requests,
non_verified_domain,
} = search;
const { count, moderations } = await get_moderations_list(moncomptepro_pg, {
search: {
email: search_email,
siret: search_siret,
show_archived: processed_requests,
hide_non_verified_domain: non_verified_domain,
hide_join_organization: hide_join_organization,
},
pagination: { page: page - 1, take: page_size },
});
Expand Down
16 changes: 13 additions & 3 deletions src/moderations/repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,23 @@ export function get_moderations_list(
pagination = { page: 0, take: 10 },
}: {
search: {
siret?: string;
email?: string;
show_archived?: boolean;
hide_join_organization?: boolean;
hide_non_verified_domain?: boolean;
show_archived?: boolean;
siret?: string;
};
pagination?: { page: number; take: number };
},
) {
const { page, take } = pagination;
const { email, siret, show_archived, hide_non_verified_domain } = search;
const {
email,
hide_join_organization,
hide_non_verified_domain,
show_archived,
siret,
} = search;

const where = and(
ilike(schema.organizations.siret, `%${siret ?? ""}%`),
Expand All @@ -42,6 +49,9 @@ export function get_moderations_list(
hide_non_verified_domain
? not(eq(schema.moderations.type, "non_verified_domain"))
: undefined,
hide_join_organization
? not(eq(schema.moderations.type, "organization_join_block"))
: undefined,
);

return pg.transaction(async function moderation_count() {
Expand Down
6 changes: 4 additions & 2 deletions src/moderations/route.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ const moderations_page_route = new Hono<UserInfo_Context & Csp_Context>()
zValidator("query", Search_Schema.merge(Pagination_Schema).partial()),
function GET({ render, req, var: { nonce, userinfo } }) {
const {
hide_join_organization,
non_verified_domain,
page,
processed_requests,
search_email,
search_siret,
processed_requests,
non_verified_domain,
} = req.valid("query");
const username = userinfo_to_username(userinfo);
return render(
Expand All @@ -37,6 +38,7 @@ const moderations_page_route = new Hono<UserInfo_Context & Csp_Context>()
page_size: 10,
}}
search={{
hide_join_organization: hide_join_organization ?? false,
non_verified_domain: non_verified_domain ?? false,
processed_requests: processed_requests ?? false,
search_email: search_email ?? "",
Expand Down
Loading