clean code

client/src/pages/european-projects/charts-config.json

@@ -16,7 +16,7 @@
     "integrationURL": "/european-projects/components/pages/analysis/overview/charts/synthesis-focus"
   },
   {
-    "id": "projectsTypes1",
+    "id": "typeOfFinancingSubsidiesRequestedByProjects",
     "title": "",
     "subtitle": "Subventions demandées et obtenues (M€)",
     "description": "",
@@ -25,7 +25,7 @@
     "integrationURL": "/european-projects/components/pages/analysis/overview/charts/projects-types-1"
   },
   {
-    "id": "projectsTypes1Rates",
+    "id": "typeOfFinancingSubsidiesRequestedByProjectsRates",
     "title": "",
     "subtitle": "Part des subventions demandées et obtenues sur HE",
     "description": "",

client/src/pages/european-projects/components/pages/general/overview/index.tsx

@@ -3,8 +3,6 @@ import { useSearchParams } from "react-router-dom";
 import { useEffect } from "react";
 import FundedObjectives from "./charts/funded-objectives";
 import SynthesisFocus from "./charts/synthesis-focus";
-// import ProjectsTypes1 from "./charts/projects-types-1";
-// import ProjectsTypes2 from "./charts/projects-types-2";
 import MainBeneficiaries from "./charts/main-beneficiaries";
 
 export default function Overview() {
@@ -22,10 +20,6 @@ export default function Overview() {
       <div className="fr-my-5w" />
       <FundedObjectives />
       <div className="fr-my-5w" />
-      {/* <ProjectsTypes1 />
-      <div className="fr-my-5w" />
-      <ProjectsTypes2 />
-      <div className="fr-my-5w" /> */}
       <MainBeneficiaries />
     </Container>
   );

client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/index.tsx

@@ -70,7 +70,7 @@ export default function PillarsSubsidiesRequestedByProjects() {
         </Col>
         <Col>
           <ChartWrapper
-            id="projectsTypes1Rates"
+            id="pillarsSubsidiesRequestedByProjectsRates"
             options={optionsSubventionsRates(data)}
             legend={null}
           />

client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-1/index.tsx

@@ -10,12 +10,12 @@ import ChartWrapper from "../../../../../chart-wrapper";
 import { getDefaultParams } from "./utils";
 import { Container, Row, Col } from "@dataesr/dsfr-plus";
 
-export default function ProjectsTypes1() {
+export default function TypeOfFinancingSubsidiesRequestedByProjects() {
   const [searchParams] = useSearchParams();
   const params = getDefaultParams(searchParams);
 
   const { data, isLoading } = useQuery({
-    queryKey: ["projectsTypes1", params],
+    queryKey: ["TypeOfFinancingSubsidiesRequestedByProjects", params],
     queryFn: () => GetData(params),
   });
 
@@ -26,7 +26,7 @@ export default function ProjectsTypes1() {
       <Row>
         <Col>
           <ChartWrapper
-            id="projectsTypes1"
+            id="typeOfFinancingSubsidiesRequestedByProjects"
             options={optionsSubventionsValues(data)}
             legend={
               <ul className="legend">
@@ -70,7 +70,7 @@ export default function ProjectsTypes1() {
         </Col>
         <Col>
           <ChartWrapper
-            id="projectsTypes1Rates"
+            id="typeOfFinancingSubsidiesRequestedByProjectsRates"
             options={optionsSubventionsRates(data)}
             legend={null}
           />

client/src/pages/european-projects/components/pages/general/projects-types/index.tsx

@@ -3,7 +3,7 @@ import { useSearchParams } from "react-router-dom";
 import { useEffect } from "react";
 
 import PillarsSubsidiesRequestedByProjects from "./charts/pillars-subsidies-requested-by-projects";
-import ProjectsTypes1 from "./charts/projects-types-1";
+import TypeOfFinancingSubsidiesRequestedByProjects from "./charts/projects-types-1";
 import SuccessRateForAmountsByTypeOfFinancing from "./charts/success-rate-for-amounts-by-type-of-financing";
 import PillarsSubsidiesRequestedLines from "./charts/pillars-subsidies-requested";
 import SuccessRateForAmountsByPillar from "./charts/success-rate-for-amounts-by-pillar";
@@ -22,7 +22,6 @@ export default function ProjectsTypes() {
       <Title as="h2" look="h4">
         Par pilier
       </Title>
-
       <PillarsSubsidiesRequestedByProjects />
       <div className="fr-my-5w" />
       <PillarsSubsidiesRequestedLines />
@@ -33,7 +32,7 @@ export default function ProjectsTypes() {
       <Title as="h2" look="h4">
         Par type de projets
       </Title>
-      <ProjectsTypes1 />
+      <TypeOfFinancingSubsidiesRequestedByProjects />
       <div className="fr-my-5w" />
       <SuccessRateForAmountsByTypeOfFinancing />
     </Container>