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

fix(frontend): add ref to relevant content #340

Merged
merged 4 commits into from
Feb 26, 2021
Merged

fix(frontend): add ref to relevant content #340

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03f723f
fix(frontend): add refto relevant content
lionelB Feb 23, 2021
3046751
fix: lint
lionelB Feb 23, 2021
2242fac
Merge branch 'master' into lionel/add-ref-to-relevant-content
lionelB Feb 24, 2021
f7200de
fix: ref
lionelB Feb 25, 2021
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
184 changes: 117 additions & 67 deletions targets/frontend/src/pages/alerts/[[...params]].js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxImportSource theme-ui */
import { Accordion } from "@reach/accordion";
import slugify from "@socialgouv/cdtn-slugify";
import { getRouteBySource } from "@socialgouv/cdtn-sources";
Expand All @@ -12,7 +13,7 @@ import { Stack } from "src/components/layout/Stack";
import { Pagination } from "src/components/pagination";
import { withCustomUrqlClient } from "src/hoc/CustomUrqlClient";
import { withUserProvider } from "src/hoc/UserProvider";
import { Card, Container, Divider, Message } from "theme-ui";
import { Box, Card, Container, Divider, Message, NavLink } from "theme-ui";
import { useQuery } from "urql";

const getAlertQuery = `
Expand Down Expand Up @@ -107,80 +108,117 @@ export function AlertPage() {
<Layout title="Gestion des alertes">
<Stack>
<AlertTabs repository={repository} activeStatus={activeStatus} />
{alerts.map((alert) => (
<Container sx={{ paddingTop: "large" }} key={`${alert.id}`}>
<Card>
<Stack>
<AlertTitle alertId={alert.id} info={alert.info}>
{getTitle(alert)}
</AlertTitle>
<Accordion collapsible multiple>
{alert.changes.added.length > 0 && (
{alerts.map((alert) => {
const openIndices = [];
// Pre-open documents panel If there are documents targeted by the alert
if (alert.changes.documents && alert.changes.documents.length > 0) {
openIndices.push(0);
}
return (
<Container sx={{ paddingTop: "large" }} key={`${alert.id}`}>
<Card>
<Stack>
<AlertTitle alertId={alert.id} info={alert.info}>
{getTitle(alert)}
</AlertTitle>
<Accordion collapsible multiple defaultIndex={openIndices}>
<ChangesGroup
changes={alert.changes.added}
label="Éléments ajoutés"
changes={alert.changes.documents}
label="Contenus liés"
renderChange={(item) => {
const [title, anchor] = item.document.title.split("#");

return (
<li
sx={{ lineHeight: 1.4, paddingBottom: "xxsmall" }}
key={`${alert.id}-documents-${item.document.id}`}
>
<a
target="_blank"
rel="noopener noreferrer"
href={`https://code.travail.gouv.fr/${getRouteBySource(
item.document.source
)}/${slugify(title)}${
anchor ? `#${anchor}` : ``
}`}
>
{title}
</a>
<Box>
{jsxJoin(
item.references.map((node) => (
<NavLink
sx={{
color: "muted",
fontSize: "xsmall",
lineHeight: 1,
}}
href={node.url}
key={`${alert.id}-${item.document.id}-${node.dila_id}-${node.title}`}
>
{node.title}
</NavLink>
)),
", "
)}
</Box>
</li>
);
}}
/>

{alert.changes.documents?.length > 0 &&
alert.changes.added.length > 0 && <Divider />}

{alert.changes.added.length > 0 && (
<ChangesGroup
changes={alert.changes.added}
label="Éléments ajoutés"
renderChange={(changes, i) =>
renderChange(
changes,
`${alert.id}-added-${i}`,
alert.info.type
)
}
/>
)}

{alert.changes.added.length > 0 &&
alert.changes.modified.length > 0 && <Divider />}

<ChangesGroup
changes={alert.changes.modified}
label="Éléments modifiés"
renderChange={(changes, i) =>
renderChange(
changes,
`${alert.id}-added-${i}`,
`${alert.id}-modified-${i}`,
alert.info.type
)
}
/>
)}
{alert.changes.added.length > 0 &&
alert.changes.modified.length > 0 && <Divider />}
<ChangesGroup
changes={alert.changes.modified}
label="Éléments modifiés"
renderChange={(changes, i) =>
renderChange(
changes,
`${alert.id}-modified-${i}`,
alert.info.type
)
}
/>
{alert.changes.removed.length > 0 && <Divider />}
<ChangesGroup
changes={alert.changes.removed}
label="Éléments supprimés"
renderChange={(changes, i) =>
renderChange(
changes,
`${alert.id}-removed-${i}`,
alert.info.type
)
}
/>
{alert.changes.documents?.length > 0 && <Divider />}
<ChangesGroup
changes={alert.changes.documents}
label="Contenus liés"
renderChange={(item, i) => {
const [title, anchor] = item.document.title.split("#");

return (
<li key={`${alert.id}-documents-${i}`}>
<a
target="_blank"
rel="noopener noreferrer"
key={item.document.id}
href={`https://code.travail.gouv.fr/${getRouteBySource(
item.document.source
)}/${slugify(title)}${anchor ? `#${anchor}` : ``}`}
>
{title}
</a>
</li>
);
}}
/>
</Accordion>
</Stack>
</Card>
</Container>
))}

{alert.changes.modified.length > 0 &&
alert.changes.removed.length > 0 && <Divider />}

<ChangesGroup
changes={alert.changes.removed}
label="Éléments supprimés"
renderChange={(changes, i) =>
renderChange(
changes,
`${alert.id}-removed-${i}`,
alert.info.type
)
}
/>
</Accordion>
</Stack>
</Card>
</Container>
);
})}
<Pagination
count={alerts_aggregate.aggregate.count}
currentPage={currentPage}
Expand All @@ -202,3 +240,15 @@ export function AlertPage() {
// };

export default withCustomUrqlClient(withUserProvider(AlertPage));

function jsxJoin(array, str) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure I get what is this for ? Where is the comma in the end ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is Array.join() but work for array containing jsx

return array.length > 0
? array.reduce((result, item) => (
<>
{result}
{str}
{item}
</>
))
: null;
}