clean code

dataesr · Aug 7, 2024 · 2e82d05 · 2e82d05
1 parent c97ebd0
commit 2e82d05
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 24 deletions.
diff --git a/client/src/pages/european-projects/charts-config.json b/client/src/pages/european-projects/charts-config.json
@@ -52,7 +52,7 @@
     "integrationURL": "/european-projects/components/pages/analysis/overview/charts/projects-types-2"
   },
   {
-    "id": "projectsTypesPiliers1",
+    "id": "pillarsSubsidiesRequestedByProjects",
     "title": "",
     "subtitle": "Subventions demandées et obtenues (M€)",
     "description": "",
@@ -79,7 +79,7 @@
     "integrationURL": "/european-projects/components/pages/analysis/overview/charts/projects-types-1"
   },
   {
-    "id": "projectsTypesPiliers3",
+    "id": "projectsTypesPillarsSubsidiesRequested",
     "title": "",
     "subtitle": "Subventions demandées et obtenues (M€)",
     "description": "",
@@ -88,7 +88,7 @@
     "integrationURL": "/european-projects/components/pages/analysis/overview/charts/projects-types-1"
   },
   {
-    "id": "projectsTypesPiliers3Rates",
+    "id": "projectsTypesPillarsSubsidiesRequestedRates",
     "title": "",
     "subtitle": "Part des subventions demandées et obtenues sur HE",
     "description": "",
@@ -97,7 +97,7 @@
     "integrationURL": "/european-projects/components/pages/analysis/overview/charts/projects-types-1"
   },
   {
-    "id": "projectsTypesPiliers1Rates",
+    "id": "pillarsSubsidiesRequestedByProjectsRates",
     "title": "",
     "subtitle": "Part des subventions demandées et obtenues sur HE",
     "description": "",

diff --git a/...charts/projects-types-piliers-1/index.tsx → ...subsidies-requested-by-projects/index.tsx b/...charts/projects-types-piliers-1/index.tsx → ...subsidies-requested-by-projects/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 ProjectsTypesPiliers1() {
+export default function PillarsSubsidiesRequestedByProjects() {
   const [searchParams] = useSearchParams();
   const params = getDefaultParams(searchParams);
 
   const { data, isLoading } = useQuery({
-    queryKey: ["projectsTypesPiliers1", params],
+    queryKey: ["PillarsSubsidiesRequestedByProjects", params],
     queryFn: () => GetData(params),
   });
 
@@ -26,7 +26,7 @@ export default function ProjectsTypesPiliers1() {
       <Row>
         <Col>
           <ChartWrapper
-            id="projectsTypesPiliers1"
+            id="pillarsSubsidiesRequestedByProjects"
             options={optionsSubventionsValues(data)}
             legend={
               <ul className="legend">

diff --git a/...s-piliers-1/options-subventions_rates.tsx → ...by-projects/options-subventions_rates.tsx b/...s-piliers-1/options-subventions_rates.tsx → ...by-projects/options-subventions_rates.tsx
diff --git a/...-piliers-1/options-subventions_values.tsx → ...y-projects/options-subventions_values.tsx b/...-piliers-1/options-subventions_values.tsx → ...y-projects/options-subventions_values.tsx
diff --git a/...nts/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/query.tsx b/...nts/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/query.tsx
@@ -0,0 +1,10 @@
+const { VITE_APP_SERVER_URL } = import.meta.env;
+
+export async function GetData(params: string) {
+  let url = `${VITE_APP_SERVER_URL}/european-projects/general-projectsTypes-pillarsSubsidiesRequestedByProjects`;
+  if (params !== "") {
+    url = `${VITE_APP_SERVER_URL}/european-projects/general-projectsTypes-pillarsSubsidiesRequestedByProjects?${params}`;
+  }
+
+  return fetch(url).then((response) => response.json());
+}
diff --git a/...rts/projects-types-piliers-1/template.tsx → ...sidies-requested-by-projects/template.tsx b/...rts/projects-types-piliers-1/template.tsx → ...sidies-requested-by-projects/template.tsx
diff --git a/...charts/projects-types-piliers-1/utils.tsx → ...subsidies-requested-by-projects/utils.tsx b/...charts/projects-types-piliers-1/utils.tsx → ...subsidies-requested-by-projects/utils.tsx
diff --git a/...pes-pillars-subsidies-requested/index.tsx → ...rts/pillars-subsidies-requested/index.tsx b/...pes-pillars-subsidies-requested/index.tsx → ...rts/pillars-subsidies-requested/index.tsx
@@ -26,14 +26,14 @@ export default function ProjectsTypesPillarsSubsidiesRequested() {
       <Row>
         <Col md={6}>
           <ChartWrapper
-            id="projectsTypesPiliers3"
+            id="projectsTypesPillarsSubsidiesRequested"
             options={optionsValues(data)}
             legend={null}
           />
         </Col>
         <Col>
           <ChartWrapper
-            id="projectsTypesPiliers3Rates"
+            id="projectsTypesPillarsSubsidiesRequestedRates"
             options={optionsRates(data)}
             legend={null}
           />

diff --git a/...ars-subsidies-requested/options-rates.tsx → ...ars-subsidies-requested/options-rates.tsx b/...ars-subsidies-requested/options-rates.tsx → ...ars-subsidies-requested/options-rates.tsx
diff --git a/...rs-subsidies-requested/options-values.tsx → ...rs-subsidies-requested/options-values.tsx b/...rs-subsidies-requested/options-values.tsx → ...rs-subsidies-requested/options-values.tsx
diff --git a/...pes-pillars-subsidies-requested/query.tsx → ...rts/pillars-subsidies-requested/query.tsx b/...pes-pillars-subsidies-requested/query.tsx → ...rts/pillars-subsidies-requested/query.tsx
diff --git a/...-pillars-subsidies-requested/template.tsx → .../pillars-subsidies-requested/template.tsx b/...-pillars-subsidies-requested/template.tsx → .../pillars-subsidies-requested/template.tsx
diff --git a/...pes-pillars-subsidies-requested/utils.tsx → ...rts/pillars-subsidies-requested/utils.tsx b/...pes-pillars-subsidies-requested/utils.tsx → ...rts/pillars-subsidies-requested/utils.tsx
diff --git a/...rojects/components/pages/general/projects-types/charts/projects-types-piliers-1/query.tsx b/...rojects/components/pages/general/projects-types/charts/projects-types-piliers-1/query.tsx
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/index.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/index.tsx
@@ -2,10 +2,10 @@ import { Container, Title } from "@dataesr/dsfr-plus";
 import { useSearchParams } from "react-router-dom";
 import { useEffect } from "react";
 
-import ProjectsTypesPiliers1 from "./charts/projects-types-piliers-1";
+import PillarsSubsidiesRequestedByProjects from "./charts/pillars-subsidies-requested-by-projects";
 import ProjectsTypes1 from "./charts/projects-types-1";
 import SuccessRateForAmountsByTypeOfFinancing from "./charts/success-rate-for-amounts-by-type-of-financing";
-import ProjectsTypesPillarsSubsidiesRequested from "./charts/projects-types-pillars-subsidies-requested";
+import PillarsSubsidiesRequestedLines from "./charts/pillars-subsidies-requested";
 import SuccessRateForAmountsByPillar from "./charts/success-rate-for-amounts-by-pillar";
 
 export default function ProjectsTypes() {
@@ -22,9 +22,10 @@ export default function ProjectsTypes() {
       <Title as="h2" look="h4">
         Par pilier
       </Title>
-      <ProjectsTypesPiliers1 />
+
+      <PillarsSubsidiesRequestedByProjects />
       <div className="fr-my-5w" />
-      <ProjectsTypesPillarsSubsidiesRequested />
+      <PillarsSubsidiesRequestedLines />
       <div className="fr-my-5w" />
       <SuccessRateForAmountsByPillar />
       <div className="fr-my-5w" />

diff --git a/server/src/routes/tableaux/european-projects/index.js b/server/src/routes/tableaux/european-projects/index.js
@@ -638,7 +638,7 @@ router
 
 router
   .route(
-    "/european-projects/general-objectives-and-projects-types-piliers-subventions-1"
+    "/european-projects/general-projectsTypes-pillarsSubsidiesRequestedByProjects"
   )
   .get(async (req, res) => {
     if (!req.query.country_code) {