Skip to content

Commit d10368a

Browse files
committed
feat: changements maquette #887
1 parent 2f017b7 commit d10368a

File tree

2 files changed

+41
-45
lines changed

2 files changed

+41
-45
lines changed

assets/entrepot/pages/accesses-request/AccessesRequest.locale.tsx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ const { i18n } = declareComponentKeys<
66
| "explanation"
77
| "explanation_no_private_services"
88
| "back_to_catalogue"
9+
| "data_details.producer"
10+
| "data_details.contact_email"
11+
| "data_details.subject"
12+
| "data_details.subject_value"
13+
| "data_details.data_name"
914
| "form.layers.label"
1015
| "form.layers.error.at_least_one"
1116
| "form.beneficiaries.label"
@@ -27,6 +32,11 @@ export const AccessesRequestFrTranslations: Translations<"fr">["AccessesRequest"
2732
explanation_no_private_services:
2833
"Cette fiche ne décrit aucun service de diffusion dont l’accès est restreint. Vous avez déjà accès à toutes les données décrites.",
2934
back_to_catalogue: "Retour au catalogue de données",
35+
"data_details.producer": "Producteur",
36+
"data_details.contact_email": "Contact",
37+
"data_details.subject": "Objet",
38+
"data_details.subject_value": "Demande d’accès à des services de diffusion",
39+
"data_details.data_name": "Donnée",
3040
"form.layers.label": "Sélectionner les services",
3141
"form.layers.error.at_least_one": "Sélectionnez une donnée",
3242
"form.beneficiaries.label": "Bénéficiaires",
@@ -46,6 +56,11 @@ export const AccessesRequestEnTranslations: Translations<"en">["AccessesRequest"
4656
explanation: undefined,
4757
explanation_no_private_services: undefined,
4858
back_to_catalogue: undefined,
59+
"data_details.producer": undefined,
60+
"data_details.contact_email": undefined,
61+
"data_details.subject": undefined,
62+
"data_details.subject_value": undefined,
63+
"data_details.data_name": undefined,
4964
"form.layers.label": undefined,
5065
"form.layers.error.at_least_one": undefined,
5166
"form.beneficiaries.label": undefined,

assets/entrepot/pages/accesses-request/AccessesRequest.tsx

Lines changed: 26 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ import { CartesApiException } from "../../../modules/jsonFetch";
2323
import { useAuthStore } from "../../../stores/AuthStore";
2424
import api from "../../api";
2525

26-
import placeholder1x1Url from "@/img/placeholder.1x1.png";
27-
2826
const { t } = getTranslation("AccessesRequest");
2927

3028
const MYSELF = "myself";
@@ -118,50 +116,33 @@ const AccessesRequest: FC<AskForAccesses> = ({ fileIdentifier }) => {
118116
) : (
119117
metadataQuery.data !== undefined && (
120118
<>
121-
<div className={css({ display: "flex", gap: "2rem", flexDirection: "column", [fr.breakpoints.up("sm")]: { flexDirection: "row" } })}>
122-
<img
123-
src={metadataQuery.data?.thumbnail_url ?? placeholder1x1Url}
124-
alt=""
125-
className={css({
126-
width: "9rem",
127-
height: "9rem",
128-
objectFit: "cover",
129-
})}
130-
/>
131-
132-
<div
133-
className={css({
119+
<div
120+
className={css({
121+
display: "flex",
122+
flexDirection: "column",
123+
gap: "0.75rem",
124+
"& > div": {
134125
display: "flex",
135126
flexDirection: "column",
136-
overflow: "hidden",
137-
gap: "0.75rem",
138-
})}
139-
>
140-
<strong>{metadataQuery.data?.title}</strong>
141-
<p
142-
className={css({
143-
textOverflow: "ellipsis",
144-
overflow: "hidden",
145-
height: "4.5rem",
146-
margin: 0,
147-
WebkitLineClamp: 3,
148-
display: "-webkit-box",
149-
WebkitBoxOrient: "vertical",
150-
})}
151-
>
152-
{metadataQuery.data?.abstract}
153-
</p>
154-
<p
155-
className={cx(
156-
fr.cx("fr-text--sm", "fr-icon-bank-line", "fr-icon--sm", "fr-m-0"),
157-
css({
158-
color: fr.colors.decisions.text.default.grey.default,
159-
"::before": { marginRight: "0.5rem" },
160-
})
161-
)}
162-
>
163-
{metadataQuery.data?.organisation_name}
164-
</p>
127+
[fr.breakpoints.up("sm")]: { flexDirection: "row", gap: "0.75rem" },
128+
},
129+
})}
130+
>
131+
<div>
132+
<strong>{t("data_details.producer")}</strong>
133+
{metadataQuery.data?.organisation_name}
134+
</div>
135+
<div>
136+
<strong>{t("data_details.contact_email")}</strong>
137+
{metadataQuery.data?.contact_email}
138+
</div>
139+
<div>
140+
<strong>{t("data_details.subject")}</strong>
141+
{t("data_details.subject_value")}
142+
</div>
143+
<div>
144+
<strong>{t("data_details.data_name")}</strong>
145+
{metadataQuery.data?.title}
165146
</div>
166147
</div>
167148
<hr className={fr.cx("fr-mt-10v", "fr-pb-10v")} />
@@ -226,7 +207,7 @@ const AccessesRequest: FC<AskForAccesses> = ({ fileIdentifier }) => {
226207
{layer.name}
227208
</span>
228209
{layer.gmd_online_resource_protocol && (
229-
<Badge noIcon={true} severity={"info"} className={fr.cx("fr-p-1v")} small as="span">
210+
<Badge noIcon={true} severity={"info"} className={fr.cx("fr-py-1v", "fr-px-2v")} small as="span">
230211
{gmdProtocolToServiceType(layer.gmd_online_resource_protocol)}
231212
</Badge>
232213
)}

0 commit comments

Comments
 (0)