fix ts

dataesr · Feb 6, 2024 · f0c2f5a · f0c2f5a
1 parent 4a698c4
commit f0c2f5a
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 50 deletions.
diff --git a/client/src/api/index.ts b/client/src/api/index.ts
@@ -1 +1 @@
-export * from './atlas'
+export * from './atlas.ts'
diff --git a/client/src/components/cards/students-card/index.tsx b/client/src/components/cards/students-card/index.tsx
@@ -1,4 +1,4 @@
-import { Container, Row, Col, TagGroup, Tag, Badge } from '@dataesr/dsfr-plus';
+import { Row, Col, Badge } from '@dataesr/dsfr-plus';
 
 import './style.scss';
 

diff --git a/client/src/components/filieres-cards/index.tsx b/client/src/components/filieres-cards/index.tsx
@@ -1,5 +1,5 @@
 import { useSearchParams } from "react-router-dom";
-import { Container, Row, Col, TagGroup, Tag, Badge } from '@dataesr/dsfr-plus';
+import { Container, Row, Col, TagGroup, Tag } from '@dataesr/dsfr-plus';
 
 import StudentsCard from "../cards/students-card/index.tsx";
 

diff --git a/client/src/components/filters/index.tsx b/client/src/components/filters/index.tsx
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import { Accordion, AccordionGroup, Button, Col, Container, Modal, ModalContent, ModalTitle, Row, Tag, TagGroup, Text, Title } from '../../../../musical-octo-waddle/dist/index.js';
+import { Accordion, AccordionGroup, Button, Col, Container, Modal, ModalContent, ModalTitle, Row, Tag, TagGroup, Text, Title } from '@dataesr/dsfr-plus';
 import { useSearchParams } from 'react-router-dom';
 import { useQuery } from '@tanstack/react-query';
 import { getFiltersValues } from '../../api';

diff --git a/client/src/components/map.tsx b/client/src/components/map.tsx
@@ -6,7 +6,6 @@ type PolygonCoordinatesProps = {
   type: string,
   coordinates: []
 }
-const zoomLevel = 8;
 
 export default function Map({
   autoCenter = false,
@@ -27,7 +26,8 @@ export default function Map({
 
   if (polygonCoordinates) {
     if (polygonCoordinates?.type === 'MultiPolygon') {
-      polygons = polygonCoordinates.coordinates[0];
+      // @ts-expect-error description
+      polygons = polygonCoordinates.coordinates[0] || [];
     } else if (polygonCoordinates?.type === 'Polygon') {
       polygons = polygonCoordinates.coordinates;
     }
@@ -39,12 +39,12 @@ export default function Map({
   let center = [46.71109, 1.719103];
   if (autoCenter) {
     zoomLevel = 8;
-    center = calculateCenter?.geometry?.coordinates?.reverse();
+    center = (calculateCenter as turf.Feature<turf.Point>)?.geometry?.coordinates?.reverse();
   }
 
   return (
     <MapContainer
-      center={center}
+      center={[center[0], center[1]]}
       scrollWheelZoom={false}
       style={{ height, width }}
       zoom={zoomLevel}
@@ -56,6 +56,7 @@ export default function Map({
       />
       <GeoJSON
         style={{ color: 'var(--brown-caramel-sun-425-moon-901-active)' }}
+        // @ts-expect-error description
         data={polygonCoordinates}
       />
     </MapContainer>

diff --git a/client/src/components/queries-creator/index.tsx b/client/src/components/queries-creator/index.tsx
@@ -1,8 +1,8 @@
-import { useState } from "react";
-import { Button, TextInput } from "../../../../musical-octo-waddle/dist/index.js";
+// import { useState } from "react";
+import { Button } from "@dataesr/dsfr-plus";
 
-export default function QueriesCreator({ }) {
-  const [queries, setQueries] = useState({});
+export default function QueriesCreator() {
+  // const [queries, setQueries] = useState({});
 
 
   const addQuery = () => {

diff --git a/client/src/main.tsx b/client/src/main.tsx
@@ -1,7 +1,7 @@
-import React, { ReactNode, useLayoutEffect } from 'react'
+import React from 'react';
 import ReactDOM from 'react-dom/client'
 import Routes from './router.js'
-import { BrowserRouter, Link, useLocation } from 'react-router-dom';
+import { BrowserRouter, Link } from 'react-router-dom';
 import { DSFRConfig } from '@dataesr/dsfr-plus';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools'
@@ -40,7 +40,8 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
     <BrowserRouter>
       <QueryClientProvider client={queryClient}>
         {/* <ScrollToTop /> */}
-        <DSFRConfig routerComponent={RouterLink} theme='light'>
+        {/* <DSFRConfig routerComponent={RouterLink} theme='light'> */}
+        <DSFRConfig routerComponent={RouterLink}>
           <Routes />
         </DSFRConfig>
         <ReactQueryDevtools initialIsOpen={false} />

diff --git a/client/src/pages/atlas/charts/EffectifByType/index.tsx b/client/src/pages/atlas/charts/EffectifByType/index.tsx
@@ -1,7 +1,7 @@
 import {
   Container, Row, Col,
   Text,
-} from '../../../../../../musical-octo-waddle/dist/index.js';
+} from '@dataesr/dsfr-plus';
 import ColumnsChart from '../columns';
 import './style.css';
 

diff --git a/client/src/pages/atlas/charts/columns.tsx b/client/src/pages/atlas/charts/columns.tsx
@@ -2,7 +2,7 @@ import Highcharts from "highcharts";
 import HighchartsReact from "highcharts-react-official";
 import type { DataByYear } from '../../../types/atlas';
 
-export default function ColumnsChart({ data, label, currentYear, noTitle }: { data: DataByYear[], label: string, currentYear: string, noTitle: boolean }) {
+export default function ColumnsChart({ data, label, currentYear }: { data: DataByYear[], label: string, currentYear: string }) {
   const filieresOptions = {
     chart: {
       type: 'column',

diff --git a/client/src/pages/atlas/charts/map-with-polygon.tsx b/client/src/pages/atlas/charts/map-with-polygon.tsx
@@ -10,7 +10,7 @@ export default function MapWithPolygon({
   width = '100%',
   zoomControl = true,
 }: {
-  autoCenter: boolean,
+  autoCenter?: boolean,
   id: string,
   height?: string,
   width?: string,

diff --git a/client/src/pages/atlas/charts/sectors.tsx b/client/src/pages/atlas/charts/sectors.tsx
@@ -6,7 +6,7 @@ type SectorData = {
   y: number;
 }[];
 
-export default function SectortsChart({ data = [], isLoading = false, currentYear }: { data: SectorData, isLoading: boolean, currentYear: string }) {
+export default function SectortsChart({ data = [], isLoading = false }: { data: SectorData, isLoading: boolean }) {
   if (isLoading || !data || !data.length) {
     return (
       <div>Loader</div>

diff --git a/client/src/pages/atlas/components/main/search.tsx b/client/src/pages/atlas/components/main/search.tsx
@@ -17,6 +17,10 @@ export function Search() {
     queryFn: () => getFiltersValues()
   })
 
+  if (isLoadingFiltersValues) {
+    return <div>Loading...</div>
+  }
+
   // Create a list of all territories (regions, departments, academies - without urban unities and cities)
   const territoiresList = Object.keys(filtersValues.geo_id).map((key) => {
     if (key !== 'communes' && key !== 'unites_urbaines') {
@@ -92,8 +96,8 @@ export function Search() {
       <hr className="fr-mt-3w" />
 
       <HomeMapCards
-        data={filtersValues}
-        isLoading={isLoadingFiltersValues}
+        // data={filtersValues}
+        // isLoading={isLoadingFiltersValues}
         territoiresList={territoiresList}
       />
     </Container>

diff --git a/client/src/pages/atlas/components/main/tabs/fields/one.tsx b/client/src/pages/atlas/components/main/tabs/fields/one.tsx
@@ -6,10 +6,7 @@ import {
   Title, Text,
   Button, Badge
 } from '@dataesr/dsfr-plus';
-import Callout from "../../../../../../components/callout.tsx";
 import ColumnsChart from "../../../../charts/columns.tsx";
-import SectortsChart from "../../../../charts/sectors.tsx";
-import GenderChart from "../../../../charts/gender.tsx";
 import { DEFAULT_CURRENT_YEAR } from "../../../../../../constants.tsx";
 import { DataByYear } from "../../../../../../types/atlas.ts";
 import StudentsCard from "../../../../../../components/cards/students-card/index.tsx";
@@ -40,27 +37,27 @@ export default function OneField() {
     return <div>Loading...</div>
   }
 
-  const dataSectors = [
-    {
-      name: 'Secteur public',
-      y: dataByYear?.find((el: DataByYear) => el.annee_universitaire === currentYear)?.effectif_pu || 0,
-    },
-    {
-      name: 'Secteur privé',
-      y: dataByYear?.find((el: DataByYear) => el.annee_universitaire === currentYear)?.effectif_pr || 0,
-    }
-  ];
+  // const dataSectors = [
+  //   {
+  //     name: 'Secteur public',
+  //     y: dataByYear?.find((el: DataByYear) => el.annee_universitaire === currentYear)?.effectif_pu || 0,
+  //   },
+  //   {
+  //     name: 'Secteur privé',
+  //     y: dataByYear?.find((el: DataByYear) => el.annee_universitaire === currentYear)?.effectif_pr || 0,
+  //   }
+  // ];
 
-  const dataGender = [
-    {
-      name: 'Masculin',
-      y: dataByYear?.find((el: DataByYear) => el.annee_universitaire === currentYear)?.effectif_masculin || 0,
-    },
-    {
-      name: 'Féminin',
-      y: dataByYear?.find((el: DataByYear) => el.annee_universitaire === currentYear)?.effectif_feminin || 0,
-    }
-  ];
+  // const dataGender = [
+  //   {
+  //     name: 'Masculin',
+  //     y: dataByYear?.find((el: DataByYear) => el.annee_universitaire === currentYear)?.effectif_masculin || 0,
+  //   },
+  //   {
+  //     name: 'Féminin',
+  //     y: dataByYear?.find((el: DataByYear) => el.annee_universitaire === currentYear)?.effectif_feminin || 0,
+  //   }
+  // ];
 
   const effectifPU = dataByYear?.find((el: DataByYear) => el.annee_universitaire === currentYear)?.effectif_pu || 0;
   const effectifPR = dataByYear?.find((el: DataByYear) => el.annee_universitaire === currentYear)?.effectif_pr || 0;
@@ -146,7 +143,6 @@ export default function OneField() {
             <ColumnsChart
               data={dataByYear || []} label="effectif_total"
               currentYear={currentYear}
-              noTitle
             />
           </Col>
         </Row>

diff --git a/client/src/pages/atlas/components/main/tabs/sectors.tsx b/client/src/pages/atlas/components/main/tabs/sectors.tsx
@@ -98,7 +98,7 @@ export function Sectors() {
           </Row>
         </Col>
         <Col>
-          <SectortsChart data={dataSectors || []} isLoading={isLoading} currentYear={data?.annee_universitaire || ''} />
+          <SectortsChart data={dataSectors || []} isLoading={isLoading} />
         </Col>
       </Row>
       <Row className="fr-mt-5w">

diff --git a/client/src/pages/atlas/side-menu-layout/index.tsx b/client/src/pages/atlas/side-menu-layout/index.tsx
@@ -1,4 +1,4 @@
-import { SideMenu, Link, Container, Row, Col, SideMenuItem } from '../../../../../musical-octo-waddle/dist/index.js';
+import { SideMenu, Link, Container, Row, Col, SideMenuItem } from '@dataesr/dsfr-plus';
 import { Outlet, useLocation, useSearchParams, useParams } from 'react-router-dom';
 import './styles.scss';
 

diff --git a/client/tsconfig.json b/client/tsconfig.json
@@ -7,10 +7,10 @@
       "DOM",
       "DOM.Iterable"
     ],
-    "module": "NodeNext",
+    "module": "ESNext",
     "skipLibCheck": true,
     /* Bundler mode */
-    "moduleResolution": "nodenext",
+    "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
@@ -20,7 +20,8 @@
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": false,
   },
   "include": [
     "src"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export * from './atlas'
		export * from './atlas.ts'
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,7 +98,7 @@ export function Sectors() { @@
               </Row>
             </Col>
             <Col>
-              <SectortsChart data={dataSectors || []} isLoading={isLoading} currentYear={data?.annee_universitaire || ''} />
+              <SectortsChart data={dataSectors || []} isLoading={isLoading} />
             </Col>
           </Row>
           <Row className="fr-mt-5w">
@@ Expand Down @@