naming

dataesr · Feb 27, 2024 · f3b4e2c · f3b4e2c
1 parent 99d6d6e
commit f3b4e2c
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 18 deletions.
diff --git a/client/src/pages/european-projects/charts-config.json b/client/src/pages/european-projects/charts-config.json
@@ -1,10 +1,10 @@
 [
   {
-    "id": "Horizon2020Participation",
-    "title": "Objectifs financés par Horizon 2020",
+    "id": "fundedObjectives",
+    "title": "Objectifs financés",
     "description": "Ad duis occaecat voluptate deserunt tempor enim nulla officia.",
     "source": "Commission européenne, Cordis",
     "sourceURL": "https://cordis.europa.eu/",
-    "integrationURL": "./../european-projects/components/pages/analysis/overview/charts/horizon-2020-participation"
+    "integrationURL": "./../european-projects/components/pages/analysis/overview/charts/funded-objectives"
   }
 ]
diff --git a/client/src/pages/european-projects/components/chart-wrapper/index.tsx b/client/src/pages/european-projects/components/chart-wrapper/index.tsx
@@ -18,7 +18,7 @@ export default function ChartWrapper({ id, options, legend }) {
   const integrationCode = `<iframe \ntitle="${graphConfig.title}" \nwidth="800" \nheight="600" \nsrc="https://barometredelascienceouverte.esr.gouv.fr/integration/fr/publi.publishers.type-ouverture.chart-repartition-modeles"></iframe>`;
 
   return (
-    <>
+    <section>
       <Title as="h2" look="h4" className="fr-mb-0">{graphConfig.title}</Title>
       <p className="sources">
         Sources : <a href={graphConfig.sourceURL} target="_blank" rel="noreferrer noopener">{graphConfig.source}</a>
@@ -69,6 +69,6 @@ export default function ChartWrapper({ id, options, legend }) {
           </SyntaxHighlighter>
         </ModalContent>
       </Modal>
-    </>
+    </section>
   );
 }
diff --git a/...arts/horizon-2020-participation/index.tsx → ...erview/charts/funded-objectives/index.tsx b/...arts/horizon-2020-participation/index.tsx → ...erview/charts/funded-objectives/index.tsx
@@ -2,19 +2,19 @@ import { useQuery } from "@tanstack/react-query";
 import { useSearchParams } from "react-router-dom";
 
 import Template from "./template";
-import { GetHorizon2020Participation } from "./query";
+import { GetfundedObjectives } from "./query";
 import options from "./options";
 
 import ChartWrapper from "../../../../../chart-wrapper";
 import { getColorByPillierName } from "./utils";
 
-export default function Horizon2020Participation() {
+export default function FundedObjectives() {
   const [searchParams] = useSearchParams();
   let params = [...searchParams].map(([key, value]) => `${key}=${value}`).join('&');
   params += '&stage=successful';
   const { data, isLoading } = useQuery({
-    queryKey: ["GetHorizon2020Participation", params],
-    queryFn: () => GetHorizon2020Participation(params)
+    queryKey: ["fundedObjectives", params],
+    queryFn: () => GetfundedObjectives(params)
   })
 
   if (isLoading || !data) return <Template />
@@ -29,7 +29,7 @@ export default function Horizon2020Participation() {
 
   return (
     <ChartWrapper
-      id="Horizon2020Participation"
+      id="fundedObjectives"
       options={options(data)}
       legend={(
         <ul className="legend">

diff --git a/...ts/horizon-2020-participation/options.tsx → ...view/charts/funded-objectives/options.tsx b/...ts/horizon-2020-participation/options.tsx → ...view/charts/funded-objectives/options.tsx
diff --git a/...arts/horizon-2020-participation/query.tsx → ...erview/charts/funded-objectives/query.tsx b/...arts/horizon-2020-participation/query.tsx → ...erview/charts/funded-objectives/query.tsx
@@ -1,6 +1,6 @@
 const { VITE_APP_SERVER_URL } = import.meta.env;
 
-export async function GetHorizon2020Participation(params: string) {
+export async function GetfundedObjectives(params: string) {
   let url = `${VITE_APP_SERVER_URL}/european-projects/analysis-synthese-funding_programme`;
   if (params !== '') {
     url = `${VITE_APP_SERVER_URL}/european-projects/analysis-synthese-funding_programme?${params}`;

diff --git a/...s/horizon-2020-participation/template.tsx → ...iew/charts/funded-objectives/template.tsx b/...s/horizon-2020-participation/template.tsx → ...iew/charts/funded-objectives/template.tsx
diff --git a/...arts/horizon-2020-participation/utils.tsx → ...erview/charts/funded-objectives/utils.tsx b/...arts/horizon-2020-participation/utils.tsx → ...erview/charts/funded-objectives/utils.tsx
diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/index.tsx b/client/src/pages/european-projects/components/pages/analysis/overview/index.tsx
@@ -1,14 +1,11 @@
-import { Container, Row, Col } from "@dataesr/dsfr-plus";
-import Horizon2020Participation from "./charts/horizon-2020-participation";
+import { Container } from "@dataesr/dsfr-plus";
+import Horizon2020Participation from "./charts/funded-objectives";
 
 export default function Overview() {
   return (
     <Container as="main">
-      <Row>
-        <Col>
-          <Horizon2020Participation />
-        </Col>
-      </Row>
+      {/* <Focus /> */}
+      <Horizon2020Participation />
     </Container>
   );
 }