Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(obs): build #2722

Merged
merged 3 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions public/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions public/src/app/observatoire/territoire/Dashboard.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
'use client'
import SectionTitle from '@/components/common/SectionTitle';
import SelectInList from '@/components/common/SelectInList';
import SelectMonth from '@/components/observatoire/SelectMonth';
import SelectObserve from '@/components/observatoire/SelectObserve';
import SelectPeriod from '@/components/observatoire/SelectPeriod';
import SelectSemester from '@/components/observatoire/SelectSemester';
import SelectTerritory from '@/components/observatoire/SelectTerritory';
import { DashboardContext } from '@/context/DashboardProvider';
import SelectTrimester from '@/components/observatoire/SelectTrimester';
import SelectYear from '@/components/observatoire/SelectYear';
import { GetPeriod } from '@/helpers/dashboard';
import { graphList, mapList } from '@/helpers/lists';
import { useDashboard } from '@/hooks/useDashboard';
import { PerimeterType } from '@/interfaces/observatoire/Perimeter';
import { fr } from '@codegouvfr/react-dsfr';
import CircularProgress from '@mui/material/CircularProgress';
import { useSearchParams } from 'next/navigation';
import { useContext, useEffect } from 'react';
import SelectMonth from '../../../components/observatoire/SelectMonth';
import SelectSemester from '../../../components/observatoire/SelectSemester';
import SelectTrimester from '../../../components/observatoire/SelectTrimester';
import SelectYear from '../../../components/observatoire/SelectYear';
import { GetPeriod } from '../../../helpers/dashboard';
import { useEffect } from 'react';
import DistanceGraph from './graphs/DistanceGraph';
import FluxGraph from './graphs/FluxGraph';
import IncentiveGraph from './graphs/IncentiveGraph';
Expand All @@ -32,7 +32,7 @@ import BestTerritoriesTable from './tables/BestTerritoriesTable';

export default function Dashboard() {
const searchParams = useSearchParams();
const { dashboard } =useContext(DashboardContext);
const dashboard =useDashboard();
const period = GetPeriod();
const observeLabel = dashboard.params.map == 1 ? 'Flux entre:' : 'Territoires observés';
useEffect(() => {
Expand Down
5 changes: 2 additions & 3 deletions public/src/app/observatoire/territoire/KeyFigures.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import Rows from '@/components/observatoire/indicators/Rows';
import { Config } from '@/config';
import { DashboardContext } from '@/context/DashboardProvider';
import { useApi } from '@/hooks/useApi';
import { IndicatorProps } from '@/interfaces/observatoire/componentsInterfaces';
import { KeyFiguresDataInterface } from '@/interfaces/observatoire/dataInterfaces';
import { fr } from '@codegouvfr/react-dsfr';
import { useContext } from 'react';
import { useDashboardContext } from '../../../context/DashboardProvider';

export default function KeyFigures() {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const apiUrl = Config.get<string>('next.public_api_url', '');
const url = () => {
const params = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import DownloadButton from '@/components/observatoire/DownloadButton';
import { DashboardContext } from '@/context/DashboardProvider';
import { GetApiUrl } from '@/helpers/api';
import { chartLabels } from '@/helpers/graph';
import { useApi } from '@/hooks/useApi';
import { fr } from '@codegouvfr/react-dsfr';
import {
Expand All @@ -13,15 +14,13 @@ import {
Title,
Tooltip,
} from 'chart.js';
import { useContext } from 'react';
import { Line } from 'react-chartjs-2';
import { GetApiUrl } from '../../../../helpers/api';
import { chartLabels } from '../../../../helpers/graph';
import { useDashboardContext } from '../../../../context/DashboardProvider';

ChartJS.register(CategoryScale, LinearScale, PointElement, LineElement, Title, Tooltip, Legend, Filler);

export default function DistanceGraph({ title }: { title: string }) {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const options = {
responsive: true,
plugins: {
Expand Down
9 changes: 4 additions & 5 deletions public/src/app/observatoire/territoire/graphs/FluxGraph.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import DownloadButton from '@/components/observatoire/DownloadButton';
import { DashboardContext } from '@/context/DashboardProvider';
import { GetApiUrl } from '@/helpers/api';
import { chartLabels } from '@/helpers/graph';
import { useApi } from '@/hooks/useApi';
import { FluxIndicators } from '@/interfaces/observatoire/componentsInterfaces';
import { fr } from '@codegouvfr/react-dsfr';
Expand All @@ -14,15 +15,13 @@ import {
Title,
Tooltip,
} from 'chart.js';
import { useContext } from 'react';
import { Line } from 'react-chartjs-2';
import { GetApiUrl } from '../../../../helpers/api';
import { chartLabels } from '../../../../helpers/graph';
import { useDashboardContext } from '../../../../context/DashboardProvider';

ChartJS.register(CategoryScale, LinearScale, PointElement, LineElement, Title, Tooltip, Legend, Filler);

export default function TrajetsGraph({ title,indic }: { title: string, indic:FluxIndicators }) {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const options = {
responsive: true,
plugins: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import DownloadButton from '@/components/observatoire/DownloadButton';
import { DashboardContext } from '@/context/DashboardProvider';
import { GetApiUrl } from '@/helpers/api';
import { useApi } from '@/hooks/useApi';
import { IncentiveDataInterface } from '@/interfaces/observatoire/dataInterfaces';
import { fr } from '@codegouvfr/react-dsfr';
import { ArcElement, ChartData, Chart as ChartJS, Legend, Title, Tooltip } from 'chart.js';
import ChartDataLabels, { Context } from 'chartjs-plugin-datalabels';
import { useContext } from 'react';
import { Doughnut } from 'react-chartjs-2';
import { GetApiUrl } from '../../../../helpers/api';
import { useDashboardContext } from '../../../../context/DashboardProvider';

ChartJS.register(ArcElement, Title, Tooltip, Legend);

export default function IncentiveGraph({ title }: { title: string }) {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const options = {
responsive: true,
maintainAspectRatio: false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import DownloadButton from '@/components/observatoire/DownloadButton';
import { DashboardContext } from '@/context/DashboardProvider';
import { GetApiUrl } from '@/helpers/api';
import { chartLabels } from '@/helpers/graph';
import { useApi } from '@/hooks/useApi';
import { OccupationIndicators } from '@/interfaces/observatoire/componentsInterfaces';
import { fr } from '@codegouvfr/react-dsfr';
Expand All @@ -14,15 +15,13 @@ import {
Title,
Tooltip,
} from 'chart.js';
import { useContext } from 'react';
import { Line } from 'react-chartjs-2';
import { GetApiUrl } from '../../../../helpers/api';
import { chartLabels } from '../../../../helpers/graph';
import { useDashboardContext } from '../../../../context/DashboardProvider';

ChartJS.register(CategoryScale, LinearScale, PointElement, LineElement, Title, Tooltip, Legend, Filler);

export default function TrajetsGraph({ title,indic }: { title: string, indic:OccupationIndicators }) {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const options = {
responsive: true,
plugins: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import DownloadButton from '@/components/observatoire/DownloadButton';
import { DashboardContext } from '@/context/DashboardProvider';
import { GetApiUrl } from '@/helpers/api';
import { useApi } from '@/hooks/useApi';
import { DistributionDistanceDataInterface } from '@/interfaces/observatoire/dataInterfaces';
import { fr } from '@codegouvfr/react-dsfr';
import { ArcElement, ChartData, Chart as ChartJS, Legend, Title, Tooltip } from 'chart.js';
import ChartDataLabels, { Context } from 'chartjs-plugin-datalabels';
import { useContext } from 'react';
import { Doughnut } from 'react-chartjs-2';
import { GetApiUrl } from '../../../../helpers/api';
import { useDashboardContext } from '../../../../context/DashboardProvider';

ChartJS.register(ArcElement, Title, Tooltip, Legend);

export default function RepartitionDistanceGraph({ title }: { title: string }) {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const options = {
responsive: true,
maintainAspectRatio: false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import DownloadButton from '@/components/observatoire/DownloadButton';
import { DashboardContext } from '@/context/DashboardProvider';
import { GetApiUrl } from '@/helpers/api';
import { useApi } from '@/hooks/useApi';
import { Hour } from '@/interfaces/observatoire/Perimeter';
import { DistributionHoraireDataInterface } from '@/interfaces/observatoire/dataInterfaces';
import { fr } from '@codegouvfr/react-dsfr';
import { BarElement, CategoryScale, ChartData, Chart as ChartJS, Legend, LinearScale, Title, Tooltip } from 'chart.js';
import { useContext } from 'react';
import { Bar } from 'react-chartjs-2';
import { GetApiUrl } from '../../../../helpers/api';
import { useDashboardContext } from '../../../../context/DashboardProvider';

ChartJS.register(BarElement, CategoryScale, LinearScale, Title, Tooltip, Legend);

export default function RepartitionHoraireGraph({ title }: { title: string }) {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const options = {
responsive: true,
maintainAspectRatio: false,
Expand Down
6 changes: 3 additions & 3 deletions public/src/app/observatoire/territoire/maps/AiresMap.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import DownloadButton from '@/components/observatoire/DownloadButton';
import AppMap from '@/components/observatoire/maps/Map';
import { Config } from '@/config';
import { DashboardContext } from '@/context/DashboardProvider';
import { useApi } from '@/hooks/useApi';
import { useSwitchFilters } from '@/hooks/useSwitchFilters';
import { ClasseInterface } from '@/interfaces/observatoire/componentsInterfaces';
Expand All @@ -13,11 +12,12 @@ import bbox from '@turf/bbox';
import { feature, featureCollection } from '@turf/helpers';
import { FeatureCollection } from 'geojson';
import { LngLatBoundsLike } from 'maplibre-gl';
import { useCallback, useContext, useMemo, useState } from 'react';
import { useCallback, useMemo, useState } from 'react';
import { CircleLayer, Layer, Popup, Source } from 'react-map-gl/maplibre';
import { useDashboardContext } from '../../../../context/DashboardProvider';

export default function AiresCovoiturageMap({ title }: { title: string }) {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const mapTitle = title;
const apiUrl = Config.get<string>('next.public_api_url', '');
const url = `${apiUrl}/aires-covoiturage?code=${dashboard.params.code}&type=${dashboard.params.type}`;
Expand Down
6 changes: 3 additions & 3 deletions public/src/app/observatoire/territoire/maps/DensiteMap.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import DownloadButton from '@/components/observatoire/DownloadButton';
import DeckMap from '@/components/observatoire/maps/DeckMap';
import { Config } from '@/config';
import { DashboardContext } from '@/context/DashboardProvider';
import { classColor, jenks } from '@/helpers/analyse';
import { useApi } from '@/hooks/useApi';
import type { DensiteDataInterface } from '@/interfaces/observatoire/dataInterfaces';
Expand All @@ -11,10 +10,11 @@ import bbox from '@turf/bbox';
import { multiPolygon } from '@turf/helpers';
import { cellsToMultiPolygon } from 'h3-js';
import { LngLatBoundsLike } from 'maplibre-gl';
import { useContext, useMemo } from 'react';
import { useMemo } from 'react';
import { useDashboardContext } from '../../../../context/DashboardProvider';

export default function DensiteMap({ title }: { title: string }) {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const mapTitle = title;
const apiUrl = Config.get<string>('next.public_api_url', '');
const url = `${apiUrl}/location?code=${dashboard.params.code}&type=${dashboard.params.type}&year=${dashboard.params.year}&month=${dashboard.params.month}&zoom=8`;
Expand Down
8 changes: 4 additions & 4 deletions public/src/app/observatoire/territoire/maps/FluxMap.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import DownloadButton from '@/components/observatoire/DownloadButton';
import DeckMap from '@/components/observatoire/maps/DeckMap';
import { Config } from '@/config';
import { DashboardContext } from '@/context/DashboardProvider';
import { classWidth, getLegendClasses, jenks } from '@/helpers/analyse';
import { GetApiUrl } from '@/helpers/api';
import { useApi } from '@/hooks/useApi';
import type { FluxDataInterface } from '@/interfaces/observatoire/dataInterfaces';
import { fr } from '@codegouvfr/react-dsfr';
import { ArcLayer } from '@deck.gl/layers/typed';
import bbox from '@turf/bbox';
import { multiPoint } from '@turf/helpers';
import { LngLatBoundsLike } from 'maplibre-gl';
import { useContext, useMemo } from 'react';
import { GetApiUrl } from '../../../../helpers/api';
import { useMemo } from 'react';
import { useDashboardContext } from '../../../../context/DashboardProvider';

export default function FluxMap({ title }: { title: string }) {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const params = [
`code=${dashboard.params.code}`,
`type=${dashboard.params.type}`,
Expand Down
8 changes: 4 additions & 4 deletions public/src/app/observatoire/territoire/maps/OccupationMap.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import DownloadButton from '@/components/observatoire/DownloadButton';
import AppMap from '@/components/observatoire/maps/Map';
import { Config } from '@/config';
import { DashboardContext } from '@/context/DashboardProvider';
import { getLegendClasses } from '@/helpers/analyse';
import { GetApiUrl } from '@/helpers/api';
import { useApi } from '@/hooks/useApi';
import { ClasseInterface } from '@/interfaces/observatoire/componentsInterfaces';
import type { OccupationDataInterface } from '@/interfaces/observatoire/dataInterfaces';
Expand All @@ -12,12 +12,12 @@ import bbox from '@turf/bbox';
import { feature, featureCollection } from '@turf/helpers';
import { FeatureCollection } from 'geojson';
import { LngLatBoundsLike } from 'maplibre-gl';
import { useCallback, useContext, useMemo, useState } from 'react';
import { useCallback, useMemo, useState } from 'react';
import { CircleLayer, Layer, Popup, Source } from 'react-map-gl/maplibre';
import { GetApiUrl } from '../../../../helpers/api';
import { useDashboardContext } from '../../../../context/DashboardProvider';

export default function OccupationMap({ title }: { title: string }) {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const mapTitle = title;
const params = [
`code=${dashboard.params.code}`,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { DashboardContext } from '@/context/DashboardProvider';
import { GetApiUrl } from '@/helpers/api';
import { useApi } from "@/hooks/useApi";
import { BestFluxDataInterface } from "@/interfaces/observatoire/dataInterfaces";
import { fr } from "@codegouvfr/react-dsfr";
import { Table as TableStyled } from "@codegouvfr/react-dsfr/Table";
import { css } from "@emotion/react";
import styled from '@emotion/styled';
import { useContext } from 'react';
import { GetApiUrl } from '../../../../helpers/api';
import { useDashboardContext } from '../../../../context/DashboardProvider';

const Table = styled(TableStyled)(
css`
Expand All @@ -23,7 +22,7 @@ const Table = styled(TableStyled)(
`);

export default function BestFluxTable({ title, limit}: { title: string, limit: number }) {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const params = [
`code=${dashboard.params.code}`,
`type=${dashboard.params.type}`,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { DashboardContext } from '@/context/DashboardProvider';
import { GetApiUrl } from '@/helpers/api';
import { useApi } from "@/hooks/useApi";
import { BestTerritoriesDataInterface } from "@/interfaces/observatoire/dataInterfaces";
import { fr } from "@codegouvfr/react-dsfr";
import { Table as TableStyled } from "@codegouvfr/react-dsfr/Table";
import { css } from "@emotion/react";
import styled from '@emotion/styled';
import { useContext } from 'react';
import { GetApiUrl } from '../../../../helpers/api';
import { useDashboardContext } from '../../../../context/DashboardProvider';

const Table = styled(TableStyled)(
css`
Expand All @@ -23,7 +22,7 @@ const Table = styled(TableStyled)(
`);

export default function BestTerritoriesTable({ title, limit }: { title: string, limit: number }) {
const { dashboard } =useContext(DashboardContext);
const { dashboard } = useDashboardContext();
const params = [
`code=${dashboard.params.code}`,
`type=${dashboard.params.type}`,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
'use client'
import { DashboardContext } from '@/context/DashboardProvider';
import { castPerimeterType, getUrl } from '@/helpers/search';
import { PerimeterType } from '@/interfaces/observatoire/Perimeter';
import { fr } from '@codegouvfr/react-dsfr';
import Autocomplete from '@mui/material/Autocomplete';
import TextField from '@mui/material/TextField';
import { useRouter } from 'next/navigation';
import { useContext, useState } from 'react';
import { PerimeterType } from '../../interfaces/observatoire/Perimeter';
import { useState } from 'react';
import { useDashboardContext } from '../../context/DashboardProvider';

export default function SelectIncentiveTerritory(props: { url: string, data:any[] }) {
const { dashboard } =useContext(DashboardContext)
const { dashboard } = useDashboardContext();
const router = useRouter();
const defaultOption = [props.data,{
code: dashboard.params.code,
Expand Down
Loading
Loading