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.

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

Jump to bottom

Search results page revamp #11

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Search results page revamp #11

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
64 changes: 45 additions & 19 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"@codegouvfr/react-dsfr": "^1.9.22",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@mui/material": "^6.1.1",
"@mui/icons-material": "^6.1.2",
"@mui/material": "^6.1.2",
"@sentry/nextjs": "^8.28.0",
"csv-parse": "^5.5.6",
"jszip": "^3.10.1",
Expand Down
197 changes: 151 additions & 46 deletions src/app/rechercher/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,145 @@
import path from "node:path";
import { readFileSync } from "node:fs";
import { Fragment } from "react";
import { parse as csvParse } from "csv-parse/sync";
import Link from "next/link";
import { fr } from "@codegouvfr/react-dsfr";
import Badge from "@codegouvfr/react-dsfr/Badge";
import Tag from "@codegouvfr/react-dsfr/Tag";
import { cx } from "@codegouvfr/react-dsfr/tools/cx";
import List from "@mui/material/List";
import ListItem from "@mui/material/ListItem";
import ListItemText from "@mui/material/ListItemText";
import ListItemButton from "@mui/material/ListItemButton";
import Divider from "@mui/material/Divider";

import { formatSpecName } from "@/displayUtils";
import { atcToBreadcrumbs, formatSpecName } from "@/displayUtils";
import { Specialite, SubstanceNom } from "@/db/pdbmMySQL/types";
import { getResults } from "@/db/search";
import AutocompleteSearch from "@/components/AutocompleteSearch";

const atcData = csvParse(
readFileSync(
path.join(process.cwd(), "src", "data", "CIS-ATC_2024-04-07.csv"),
),
) as string[][];
function getAtc(CIS: string) {
const atc = atcData.find((row) => row[0] === CIS);
return atc ? atc[1] : null;
}

const SubstanceResult = ({ item }: { item: SubstanceNom }) => (
<li className={fr.cx("fr-mb-3w")}>
<Link href={`/substance/${item.NomId}`}>
<ListItemButton sx={{ py: "0.125rem" }}>
<ListItemText
disableTypography
primary={
<>
<i
className={cx(
"fr-icon--custom-molecule",
fr.cx("fr-icon--sm", "fr-mr-1w"),
)}
/>
<span className={fr.cx("fr-text--md", "fr-text--bold")}>
{formatSpecName(item.NomLib)}
</span>
</>
}
/>
<i className={fr.cx("fr-icon-arrow-right-line", "fr-icon--sm")} />
</ListItemButton>
</Link>
</li>
);

const MedicamentGroupResult = ({
item,
}: {
item: { groupName: string; specialites: Specialite[] };
}) => {
const atc = getAtc(item.specialites[0].SpecId);
const atcBreadcrumbs = atc ? atcToBreadcrumbs(atc) : null;
const [, subClass, substance] = atcBreadcrumbs
? atcBreadcrumbs
: [null, null, null];
return (
<li className={fr.cx("fr-mb-3w")}>
<ListItem component="div" sx={{ py: "0.125rem" }}>
<ListItemText
sx={{ my: 0 }}
disableTypography
primary={
<div className={fr.cx("fr-mb-1v")}>
<span className={fr.cx("fr-text--md", "fr-text--bold")}>
{formatSpecName(item.groupName)}
</span>
</div>
}
secondary={
<div
className={fr.cx("fr-grid-row")}
style={{ flexWrap: "nowrap" }}
>
<div className={"fr-mr-1w"}>
<i
className={cx("fr-icon--custom-pill", fr.cx("fr-icon--sm"))}
/>
</div>
<ul className={fr.cx("fr-tags-group", "fr-mb-n1v")}>
{subClass && (
<Tag
small
nativeButtonProps={{
className: fr.cx("fr-tag--yellow-tournesol"),
}}
>
{subClass}
</Tag>
)}
{substance && (
<Tag
small
nativeButtonProps={{
className: fr.cx("fr-tag--purple-glycine"),
}}
>
{substance}
</Tag>
)}
</ul>
</div>
}
/>
</ListItem>
<List sx={{ my: 0, py: 0 }}>
{item.specialites?.map((specialite, i) => (
<li key={i} className={fr.cx("fr-py-0")}>
<Divider sx={{ py: 0 }} />
<Link href={`/medicament/${specialite.SpecId}`}>
<ListItemButton sx={{ py: "0.125rem" }}>
<ListItemText
disableTypography
primary={
<span className={fr.cx("fr-text--sm")}>
{formatSpecName(specialite.SpecDenom01)
.replace(`${formatSpecName(item.groupName)}, `, "")
.replace(formatSpecName(item.groupName), "")}
</span>
}
/>
<i
className={fr.cx("fr-icon-arrow-right-line", "fr-icon--sm")}
/>
</ListItemButton>
</Link>
</li>
))}
</List>
</li>
);
};

export default async function Page({
searchParams,
}: {
Expand All @@ -28,50 +162,21 @@ export default async function Page({
</div>
</div>
{results && (
<>
<p>{results.length} RÉSULTATS</p>
<ul>
{results.map((result, index) => (
<li key={index} className={"fr-mb-2w"}>
{"NomLib" in result ? (
<>
<Link href={`/substance/${result.NomId}`}>
<b>{formatSpecName(result.NomLib)}</b>
</Link>
<Badge
className={fr.cx("fr-ml-2w", "fr-badge--purple-glycine")}
>
Substance
</Badge>
</>
) : (
<>
<b>{formatSpecName(result.groupName)}</b>
<Badge
className={fr.cx("fr-ml-2w", "fr-badge--green-emeraude")}
>
Médicament
</Badge>
<ul>
{result.specialites?.map((specialite) => (
<li key={specialite.SpecId}>
<Link href={`/medicament/${specialite.SpecId}`}>
{formatSpecName(specialite.SpecDenom01)
.replace(
`${formatSpecName(result.groupName)}, `,
"",
)
.replace(formatSpecName(result.groupName), "")}
</Link>
</li>
))}
</ul>
</>
)}
</li>
))}
</ul>
</>
<div className={fr.cx("fr-grid-row")}>
<div className={fr.cx("fr-col-12", "fr-col-lg-9", "fr-col-md-10")}>
<List>
{results.map((result, index) => (
<Fragment key={index}>
{"NomLib" in result ? (
<SubstanceResult item={result} />
) : (
<MedicamentGroupResult key={index} item={result} />
)}
</Fragment>
))}
</List>
</div>
</div>
)}
</>
);
Expand Down
7 changes: 6 additions & 1 deletion src/customIcons/customIcons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@
.fr-icon--custom-box::before,
.fr-icon--custom-box::after {
mask-image:url('box.svg')
}
}

.fr-icon--custom-pill::before,
.fr-icon--custom-pill::after {
mask-image:url('pill.svg')
}
7 changes: 7 additions & 0 deletions src/customIcons/pill.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.