@geo2france/api-dashboard 1.20.0 → 1.22.0

package/dist/components/Charts/ChartEvolution.d.ts

@@ -0,0 +1,30 @@
+import { EChartsOption } from "echarts";
+import { datasetInput } from "../Dataset/hooks";
+export interface ChartEvolutionProps {
+    /** Identifiant du dataset */
+    dataset?: datasetInput;
+    /** Nom de la colonne qui contient les valeurs numériques */
+    valueKey: string;
+    /** Nom de la colonne qui contient les catégories */
+    nameKey?: string;
+    /** Colonne qui contient la date ou année */
+    timeKey: string;
+    /** Type de graphique */
+    chartType?: 'bar' | 'line' | 'area';
+    /** Unité à afficher */
+    unit?: string;
+    /** Titre du graphique */
+    title?: string;
+    /** Empiler les valeurs ? */
+    stack?: boolean;
+    /** Afficher un marquer sur la  ligne de temps */
+    timeMarker?: number | string;
+    /** Options suplémentaires passées à Echarts
+     * https://echarts.apache.org/en/option.html
+    */
+    option?: EChartsOption;
+}
+/** Composant de visualisation permettant de montrer l'évolution d'une valeur au cours du temps.
+ * La valeur peut-être décomposée en plusieurs catégories
+ */
+export declare const ChartEvolution: React.FC<ChartEvolutionProps>;

package/dist/components/Charts/ChartEvolution.js

@@ -0,0 +1,71 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { from, op } from "arquero";
+import deepMerge from "../../utils/deepmerge";
+import { useBlockConfig } from "../DashboardPage/Block";
+import { ChartEcharts, useDataset } from "../../dsl";
+/** Composant de visualisation permettant de montrer l'évolution d'une valeur au cours du temps.
+ * La valeur peut-être décomposée en plusieurs catégories
+ */
+export const ChartEvolution = ({ dataset: dataset_id, title, nameKey, timeKey, valueKey, chartType = 'bar', stack: stack_in, timeMarker, unit, option: custom_option = {} }) => {
+    const dataset = useDataset(dataset_id);
+    const data = dataset?.data;
+    useBlockConfig({
+        title: title,
+        dataExport: data
+    });
+    // Devnote : ajouter une propriété "timePrecision" ? (year, month, day, etc..)
+    // Ceci pourrait permettre aussi d'aggréger les données selon la précision souhaité
+    const first_time = data?.[0]?.[timeKey];
+    const yearMode = (typeof first_time === 'number' || isNaN(Number(first_time)) == false);
+    const stack = stack_in ?? (chartType !== 'line');
+    const chart_data1 = data && data.length > 0
+        ? from(data.filter(e => e[valueKey]))
+            .groupby(nameKey ? [nameKey, timeKey] : timeKey)
+            .rollup({ value: op.sum(valueKey) })
+            .orderby(timeKey)
+            .objects()
+            .map((d) => ([
+            String(d[timeKey]),
+            d.value,
+            nameKey ? d[nameKey] : valueKey // Si pas de dimension "cat", on utilise le nom la colonne de valeur
+        ]))
+        : [];
+    const cat = nameKey ?
+        data?.length ? from(data).select(nameKey).dedupe().array(nameKey) : undefined
+        : [valueKey]; // Nom de la série unique
+    const series = cat?.map((c, idx) => ({
+        type: chartType === "area" ? 'line' : chartType,
+        name: c,
+        data: chart_data1.filter(row => row[2] == c),
+        stack: stack ? 'total' : undefined,
+        connectNulls: true,
+        areaStyle: chartType === 'area' ? {} : undefined,
+        symbolSize: chartType === 'area' ? 2 : chartType === 'line' ? 4 : undefined,
+        markLine: idx === 0 && timeMarker ? {
+            symbol: 'none',
+            animation: false,
+            silent: true,
+            data: [
+                { xAxis: String(timeMarker) }
+            ]
+        } : undefined,
+    })) || [];
+    const option = {
+        legend: {
+            show: true,
+        },
+        tooltip: {
+            show: true,
+            trigger: 'axis',
+            axisPointer: {
+                // N'afficher que l'année (au lieu de la date du 1er janvier) 
+                label: { formatter: yearMode ? (p) => String(new Date(p.value).getUTCFullYear()) ?? `` : undefined }
+            },
+            valueFormatter: (v) => `${v?.toLocaleString(undefined, { maximumFractionDigits: 0 })} ${unit ?? ''}`
+        },
+        yAxis: { show: true, type: 'value' },
+        xAxis: { show: true, type: 'time' },
+        series: series,
+    };
+    return _jsx(ChartEcharts, { notMerge: true, option: deepMerge(option, custom_option) });
+};

package/dist/components/Charts/Statistics.d.ts

@@ -31,7 +31,7 @@ export interface StatisticsProps {
     /** Inverser les couleurs (rouge/vert) de l'évolution */
     invertColor?: boolean;
     /** Icône. Composant ou nom de l'icône sur https://icon-sets.iconify.design/ */
-    icon?: ReactElement | string;
+    icon?: React.ReactNode | string;
     /** Texte à afficher dans le tooltip d'aide */
     help?: string;
     /** Comparer la valeur avec la précédente ou la première du jeu de données */

package/dist/components/Control/Control.d.ts

@@ -7,13 +7,14 @@ declare const Control: React.FC<IControlProps>;
 export default Control;
 export declare const useControl: (name: string) => string | undefined;
 export declare const useAllControls: () => Record<string, any>;
-export declare const list_to_options: (input?: string[] | {
+export declare const list_to_options: (input?: string[] | number[] | {
     label: string;
-    value: string;
-}[]) => {
+    value: string | number;
+}[]) => ({
     label: string;
     value: string;
-}[];
+}[]);
+export type ListToOptionsInput = Parameters<typeof list_to_options>[0];
 interface IControlProps {
     children: ReactElement | ReactElement[];
 }

package/dist/components/Control/Control.js

@@ -44,14 +44,11 @@ export const useAllControls = () => {
 };
 /* Convenient function to return Options from list or Options */
 export const list_to_options = (input = []) => {
-    if (input === undefined) {
-        return [];
-    }
     return input.map((o) => {
-        if (typeof o == "string") {
+        if (typeof o == "string" || typeof o == "number") {
             return { label: String(o), value: String(o) };
         }
-        return o;
+        return { label: String(o.label), value: String(o.value) };
     });
 };
 export const DSL_Control = ({ children }) => {

package/dist/components/Control/Select.d.ts

@@ -1,4 +1,5 @@
 import type { SelectProps } from 'antd';
+import { ListToOptionsInput } from './Control';
 type ExtendedSelectProps = Omit<SelectProps<any>, 'options'> & {
     /** Nom technique du controle */
     name?: string;
@@ -6,11 +7,8 @@ type ExtendedSelectProps = Omit<SelectProps<any>, 'options'> & {
     label?: string;
     /** Jeu de données contenant les choix (à la place de options) */
     dataset?: string;
-    /** Choix possible */
-    options?: {
-        label: string;
-        value: string;
-    }[] | string[];
+    /** Choix possibles */
+    options?: ListToOptionsInput;
     /** Valeur intiale sélectionnée */
     initial_value?: string;
     /** Colonne à utiliser pour le libellé (si dataset utilisé) */

package/dist/components/DashboardPage/Page.d.ts

@@ -1,6 +1,6 @@
 import { RowProps } from "antd";
 import DashboardElement from "../DashboardElement/DashboardElement";
-import React from "react";
+import React, { ReactNode } from "react";
 import { Section } from "./Section";
 type Section = {
     key: string;
@@ -18,9 +18,16 @@ interface IDashboardPageProps {
 declare const DashboardPage: React.FC<IDashboardPageProps>;
 export default DashboardPage;
 interface IDSLDashboardPageProps {
-    children: React.ReactNode;
+    /** Composants visibles (dataviz, carto) ou logiques (dataset, palette) */
+    children?: ReactNode;
+    /** Nom de la page (titre). */
     name?: string;
+    /** Nombre de colonnes. */
     columns?: number;
+    /** Mode debug. Affiche un bouton permettant d'accéder aux informations développeur. */
     debug?: boolean;
 }
+/** Une page de tableau de bord.
+ * Cette page peut contenir plusieurs `Section` ou directement le contenu.
+ */
 export declare const DSL_DashboardPage: React.FC<IDSLDashboardPageProps>;

package/dist/components/DashboardPage/Page.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { Button, Col, Dropdown, Flex, Grid, Layout, Radio, Row, Tabs, theme } from "antd";
+import { Button, Col, Dropdown, Empty, Flex, Grid, Layout, Radio, Row, Tabs, theme } from "antd";
 import React, { isValidElement, useState, useEffect, useContext } from "react";
 import { Helmet } from "react-helmet-async";
 import { useSearchParamsState } from "../../utils/useSearchParamsState";
@@ -41,6 +41,9 @@ const DashboardPage = ({ children: children_input, control, row_gutter = [8, 8],
                                 })), value: activeTab, onChange: (e) => setActiveTab(e.target.value) }), control] }) }), _jsx(Row, { gutter: row_gutter, style: { margin: 16 }, children: children.map((child, idx) => ({ child, idx })).filter(({ child }) => (getSection(child) ?? 'Autres') == activeTab).map(({ child, idx }) => _jsx(Col, { xl: 12, xs: 24, children: child }, idx)) })] }));
 };
 export default DashboardPage;
+/** Une page de tableau de bord.
+ * Cette page peut contenir plusieurs `Section` ou directement le contenu.
+ */
 export const DSL_DashboardPage = ({ name = 'Tableau de bord', columns = 2, children, debug = false }) => {
     const { token } = useToken();
     const [palette, setPalette] = useState(DEFAULT_PALETTE);
@@ -91,7 +94,7 @@ export const DSL_DashboardPage = ({ name = 'Tableau de bord', columns = 2, child
         items.push({
             key: "99 - Autres",
             label: '-',
-            children: _jsx(Section, { title: 'Autres', children: visible_components })
+            children: _jsx(Section, { title: 'Autres', columns: columns, children: visible_components })
         });
     }
     return (_jsxs(_Fragment, { children: [_jsx(Helmet, { children: _jsx("title", { children: name }) }), _jsxs(PaletteContext.Provider, { value: { palette, setPalette }, children: [control_components.length > 0 && _jsx(Header, { style: {
@@ -108,6 +111,8 @@ export const DSL_DashboardPage = ({ name = 'Tableau de bord', columns = 2, child
                                 background: token.colorBgContainer,
                                 borderRadius: token.borderRadiusLG }, style: { margin: 4 } })
                         :
-                            _jsxs("div", { style: { margin: 4 }, children: [" ", items?.[0].children, " "] }) //Show content without tabs if only one
-                    , logic_components, intro_component] })] }));
+                            items.length == 1 ?
+                                _jsxs("div", { style: { margin: 4 }, children: [" ", items?.[0].children, " "] }) //Show content without tabs if only one
+                                : //no visible content
+                                    _jsx(Flex, { align: "center", justify: "center", style: { height: "100%" }, children: _jsx(Empty, { description: "Ce tableau de bord est vide pour le moment.", image: _jsx(Icon, { icon: "solar:sleeping-circle-bold", height: 55, color: token.colorIcon }) }) }), logic_components, intro_component] })] }));
 };

package/dist/components/DashboardPage/Section.d.ts

@@ -1,7 +1,12 @@
-import React from "react";
+import { FC, ReactNode } from "react";
 export interface SectionProps {
+    /** Titre de la section, doit être unique */
     title: string;
-    children?: React.ReactElement | React.ReactElement[];
-    icon?: React.ReactElement | string;
+    /** Composants visibles (dataviz, carto) ou logiques (dataset, palette) */
+    children?: ReactNode;
+    /** Icone de la section. Composant ou nom (iconify) de l'icon */
+    icon?: ReactNode | string;
+    /** Nombre de colonnes. */
+    columns?: number;
 }
-export declare const Section: React.FC<SectionProps>;
+export declare const Section: FC<SectionProps>;

package/dist/components/DashboardPage/Section.js

@@ -1,9 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Col, Row } from "antd";
-import React, { isValidElement } from "react";
+import { Children, isValidElement } from "react";
 import { DSL_ChartBlock } from "./Block";
-export const Section = ({ children }) => {
-    const columns = 2;
-    const childrenArray = React.Children.toArray(children).filter(isValidElement);
+export const Section = ({ children, columns = 2 }) => {
+    const childrenArray = Children.toArray(children).filter(isValidElement);
     return (_jsx(Row, { gutter: [8, 8], style: { margin: 0 }, children: childrenArray.map((component, idx) => (_jsx(Col, { xl: 24 / columns, xs: 24, children: _jsx(DSL_ChartBlock, { children: component }) }, idx))) }));
 };

package/dist/components/Layout/DashboardApp.d.ts

@@ -1,12 +1,24 @@
 import { ThemeConfig } from "antd";
 import { Partner, RouteConfig } from "../../types";
+import { ReactElement, ReactNode } from "react";
+export declare const default_theme: ThemeConfig;
 interface AppContextProps {
     title?: string;
     subtitle?: string;
     logo?: string;
 }
+export interface PageProps {
+    title?: string;
+    /** Icône de la page.
+     * Composant ou nom (iconify) de l'icone */
+    icon?: ReactElement | string;
+    hidden?: boolean;
+    children?: ReactNode;
+}
 export declare const AppContext: import("react").Context<AppContextProps>;
 export interface DashboardConfig {
+    /** Pages de dashboard. La première page sera également l'index (homepage) */
+    children?: ReactElement<PageProps> | ReactElement<PageProps>[];
     /**
     * Titre principal du tableau de bord (affiché dans le header ou le titre de page).
     */
@@ -17,16 +29,18 @@ export interface DashboardConfig {
     subtitle?: string;
     /**
      * Liste des routes de l'application (chaque route correspond à une page du tableau de bord).
+     * @deprecated since 1.22. Use DashboardApp childrens.
     */
-    routes: RouteConfig[];
+    routes?: RouteConfig[];
     /**
      * Configuration du thème Ant Design (permet de personnaliser les couleurs, la typographie, etc.).
+     * Voir : https://ant.design/docs/react/customize-theme#theme
     */
     theme?: ThemeConfig;
     /**
      * URL ou chemin du logo à afficher dans le tableau de bord.
     */
-    logo: string;
+    logo?: string;
     /**
      * Liste optionnelle de partenaires ou marques à afficher dans le footer ou ailleurs.
     */
@@ -40,5 +54,12 @@ export interface DashboardConfig {
      */
     disablePoweredBy?: boolean;
 }
+/** Composant principal de l'application.
+ *
+ * Les enfants de l'application sont les différentes pages de tableau de bord.
+ * La configuration globale de l'application (nom, style, etc.) se fait via les propriétés.
+ */
 declare const DashboardApp: React.FC<DashboardConfig>;
 export default DashboardApp;
+/** Regrouper des pages dans le menu */
+export declare const PagesGroup: React.FC<PageProps>;

package/dist/components/Layout/DashboardApp.js

@@ -2,19 +2,22 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ConfigProvider, Layout } from "antd";
 import { HashRouter, Outlet, Route, Routes } from "react-router-dom";
-import { generateRoutes } from "../../utils/route_utils";
+//import { generateRoutes } from "../../utils/route_utils";
 import DashboardSider from "./Sider";
 import { Content } from "antd/es/layout/layout";
 import { ErrorComponent } from "./Error";
 import { DasbhoardFooter } from "./Footer";
-import { createContext } from "react";
+import { Children, createContext, isValidElement } from "react";
 import { HelmetProvider } from "react-helmet-async";
 import { createDatasetRegistry } from "../Dataset/hooks";
 import { DatasetRegistryContext } from "../Dataset/context";
 import { ControlContext, CreateControlesRegistry } from "../Control/Control";
+import slug from 'slug';
+import { generateRoutes, getFirstValidElement } from "../../utils/route_utils";
+import renderIcon from "../../utils/icon";
 //import '../../index.css' //TODO a intégrer en jsx
 const queryClient = new QueryClient();
-const default_theme = {
+export const default_theme = {
     token: {
         colorPrimary: "#95c11f",
         linkHoverDecoration: 'underline',
@@ -33,8 +36,47 @@ const default_theme = {
     }
 };
 export const AppContext = createContext({});
-const DashboardApp = ({ routes, theme, logo, brands, footerSlider, title, subtitle, disablePoweredBy = false }) => {
+/** Composant principal de l'application.
+ *
+ * Les enfants de l'application sont les différentes pages de tableau de bord.
+ * La configuration globale de l'application (nom, style, etc.) se fait via les propriétés.
+ */
+const DashboardApp = ({ children, theme, routes: routes_legacy, logo, brands, footerSlider, title, subtitle, disablePoweredBy = false }) => {
     const context_values = { title, subtitle, logo };
-    return (_jsx(QueryClientProvider, { client: queryClient, children: _jsx(ConfigProvider, { theme: theme || default_theme /* Merger plutôt ?*/, children: _jsx(HelmetProvider, { children: _jsx(AppContext.Provider, { value: context_values, children: _jsx(DatasetRegistryContext.Provider, { value: createDatasetRegistry(), children: _jsx(ControlContext.Provider, { value: CreateControlesRegistry(), children: _jsx(HashRouter, { children: _jsx(Routes, { children: _jsxs(Route, { element: _jsxs(Layout, { hasSider: true, style: { minHeight: '100vh' }, children: [_jsx(DashboardSider, { route_config: routes, poweredBy: !disablePoweredBy }), _jsxs(Layout, { children: [_jsx(Content, { style: { width: "100%" }, children: _jsx(Outlet, {}) }), _jsx(DasbhoardFooter, { brands: brands, slider: footerSlider })] })] }), children: [generateRoutes(routes), _jsx(Route, { path: "*", element: _jsx(ErrorComponent, {}) })] }) }) }) }) }) }) }) }) }));
+    const pages = Children.toArray(children)
+        .filter(isValidElement);
+    const routes = pages.length >= 1 ? pages.map((page, idx) => {
+        if (typeof (page.type) != 'string' && page.type.name == PagesGroup.name) { // Groupe
+            return ({
+                label: page.props.title ?? String(idx),
+                path: slug(page.props.title ?? String(idx)),
+                element: undefined, // Pas de route pour les groupes
+                hidden: page.props.hidden ?? false,
+                icon: renderIcon(page.props.icon),
+                children: Children.toArray(page.props.children)?.map((c, idx) => ({
+                    label: c.props.title, // A factoriser avec les pages hors groupes
+                    path: slug(c.props.title ?? idx),
+                    element: c,
+                    hidden: c.props.hidden ?? false,
+                    icon: renderIcon(c.props.icon)
+                }))
+            });
+        }
+        else { //Pages directes (sans groupe)
+            return ({
+                label: page.props.title ?? String(idx),
+                path: slug(page.props.title ?? String(idx)),
+                element: page,
+                hidden: page.props.hidden ?? false,
+                icon: renderIcon(page.props.icon)
+            });
+        }
+    }) : routes_legacy ?? []; // Pour rétro-compatibiltié
+    const route_tree = generateRoutes(routes);
+    return (_jsx(QueryClientProvider, { client: queryClient, children: _jsx(ConfigProvider, { theme: theme || default_theme /* Merger plutôt ?*/, children: _jsx(HelmetProvider, { children: _jsx(AppContext.Provider, { value: context_values, children: _jsx(DatasetRegistryContext.Provider, { value: createDatasetRegistry(), children: _jsx(ControlContext.Provider, { value: CreateControlesRegistry(), children: _jsx(HashRouter, { children: _jsx(Routes, { children: _jsxs(Route, { element: _jsxs(Layout, { hasSider: true, style: { minHeight: '100vh' }, children: [_jsx(DashboardSider, { route_config: routes, poweredBy: !disablePoweredBy }), _jsxs(Layout, { children: [_jsx(Content, { style: { width: "100%" }, children: _jsx(Outlet, {}) }), _jsx(DasbhoardFooter, { brands: brands, slider: footerSlider })] })] }), children: [_jsx(Route, { index: true, element: getFirstValidElement(route_tree) }), route_tree, _jsx(Route, { path: "*", element: _jsx(ErrorComponent, {}) })] }) }) }) }) }) }) }) }) }));
 };
 export default DashboardApp;
+/** Regrouper des pages dans le menu */
+export const PagesGroup = ({ children }) => {
+    return children;
+};

package/dist/dsl/index.d.ts

@@ -24,4 +24,5 @@ import { LegendControl } from "../components/MapLegend/MapLegend";
 import { Intro } from "../components/DashboardPage/Intro";
 import { ChartComparison } from "../components/Charts/ChartComparison";
 import { DataTable } from "../components/Charts/Datatable";
-export { Dashboard, Dataset, Provider, Transform, Join, Filter, Section, Intro, DataPreview, ChartEcharts, ChartPie, ChartYearSerie, ChartComparison, DataTable, Statistics, StatisticsCollection, useDataset, useDatasets, useAllDatasets, useBlockConfig, Producer, Control, useControl, useAllControls, Radio, Select, Input, Palette, usePalette, usePaletteLabels, PalettePreview, Debug, Map, MapLayer, LegendControl };
+import { ChartEvolution } from "../components/Charts/ChartEvolution";
+export { Dashboard, Dataset, Provider, Transform, Join, Filter, Section, Intro, DataPreview, ChartEcharts, ChartPie, ChartYearSerie, ChartComparison, ChartEvolution, DataTable, Statistics, StatisticsCollection, useDataset, useDatasets, useAllDatasets, useBlockConfig, Producer, Control, useControl, useAllControls, Radio, Select, Input, Palette, usePalette, usePaletteLabels, PalettePreview, Debug, Map, MapLayer, LegendControl };

package/dist/dsl/index.js

@@ -24,4 +24,5 @@ import { LegendControl } from "../components/MapLegend/MapLegend";
 import { Intro } from "../components/DashboardPage/Intro";
 import { ChartComparison } from "../components/Charts/ChartComparison";
 import { DataTable } from "../components/Charts/Datatable";
-export { Dashboard, Dataset, Provider, Transform, Join, Filter, Section, Intro, DataPreview, ChartEcharts, ChartPie, ChartYearSerie, ChartComparison, DataTable, Statistics, StatisticsCollection, useDataset, useDatasets, useAllDatasets, useBlockConfig, Producer, Control, useControl, useAllControls, Radio, Select, Input, Palette, usePalette, usePaletteLabels, PalettePreview, Debug, Map, MapLayer, LegendControl };
+import { ChartEvolution } from "../components/Charts/ChartEvolution";
+export { Dashboard, Dataset, Provider, Transform, Join, Filter, Section, Intro, DataPreview, ChartEcharts, ChartPie, ChartYearSerie, ChartComparison, ChartEvolution, DataTable, Statistics, StatisticsCollection, useDataset, useDatasets, useAllDatasets, useBlockConfig, Producer, Control, useControl, useAllControls, Radio, Select, Input, Palette, usePalette, usePaletteLabels, PalettePreview, Debug, Map, MapLayer, LegendControl };

package/dist/index.d.ts

@@ -16,11 +16,11 @@ import NextPrevSelect from "./components/NextPrevSelect/NextPrevSelect";
 import Control from "./components/Control/Control";
 import DashboardChart from "./components/DashboardChart/DashboardChart";
 import MapLegend from "./components/MapLegend/MapLegend";
-import DashboardApp from "./components/Layout/DashboardApp";
+import DashboardApp, { PagesGroup } from "./components/Layout/DashboardApp";
 import DashboardSider from "./components/Layout/Sider";
 import DashboardPage from "./components/DashboardPage/Page";
 import DashboardElement from "./components/DashboardElement/DashboardElement";
-export { KeyFigure, DashboardElement, LoadingContainer, FlipCard, Attribution, NextPrevSelect, Control, DashboardChart, DashboardPage, MapLegend, DashboardSider, DashboardApp, };
+export { KeyFigure, DashboardElement, LoadingContainer, FlipCard, Attribution, NextPrevSelect, Control, DashboardChart, DashboardPage, MapLegend, DashboardSider, DashboardApp, PagesGroup, };
 import { dataProvider as WfsProvider } from "./data_providers/wfs";
 import { dataProvider as DatafairProvider } from "./data_providers/datafair";
 import { dataProvider as FileProvider } from "./data_providers/file";
@@ -29,5 +29,6 @@ export type { SimpleRecord, Partner, RouteConfig } from "./types";
 export type { LegendItem } from "./components/MapLegend/MapLegend";
 export type { DashboardConfig } from "./components/Layout/DashboardApp";
 export type { datasetInput } from "./components/Dataset/hooks";
+export type { PageProps } from "./components/Layout/DashboardApp";
 import * as DSL from './dsl';
 export { DSL };

package/dist/index.js

@@ -20,11 +20,11 @@ import Control from "./components/Control/Control";
 import DashboardChart from "./components/DashboardChart/DashboardChart";
 import MapLegend from "./components/MapLegend/MapLegend";
 // Layout
-import DashboardApp from "./components/Layout/DashboardApp";
+import DashboardApp, { PagesGroup } from "./components/Layout/DashboardApp";
 import DashboardSider from "./components/Layout/Sider";
 import DashboardPage from "./components/DashboardPage/Page";
 import DashboardElement from "./components/DashboardElement/DashboardElement";
-export { KeyFigure, DashboardElement, LoadingContainer, FlipCard, Attribution, NextPrevSelect, Control, DashboardChart, DashboardPage, MapLegend, DashboardSider, DashboardApp, };
+export { KeyFigure, DashboardElement, LoadingContainer, FlipCard, Attribution, NextPrevSelect, Control, DashboardChart, DashboardPage, MapLegend, DashboardSider, DashboardApp, PagesGroup, };
 // DataProviders
 import { dataProvider as WfsProvider } from "./data_providers/wfs";
 import { dataProvider as DatafairProvider } from "./data_providers/datafair";

package/dist/utils/icon.d.ts

@@ -0,0 +1,3 @@
+import { ReactNode } from "react";
+declare const renderIcon: (input: ReactNode | String) => number | boolean | Iterable<ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
+export default renderIcon;

package/dist/utils/icon.js

@@ -0,0 +1,6 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Icon } from "@iconify/react";
+const renderIcon = (input) => {
+    return typeof (input) === 'string' ? _jsx(Icon, { icon: input }) : input;
+};
+export default renderIcon;

package/dist/utils/route_utils.d.ts

@@ -1,6 +1,12 @@
 import { RouteConfig } from "../types";
 import type { MenuProps } from 'antd';
+import React from "react";
 type MenuItem = Required<MenuProps>['items'][number];
 export declare const generateRoutes: (routes: RouteConfig[]) => import("react/jsx-runtime").JSX.Element[];
 export declare const generateMenuItems: (routes: RouteConfig[], parentPath?: string) => MenuItem[];
+/** AI Generated,
+ * Get first "viewable" route (aka "not a group")
+ * Used for index route
+ */
+export declare function getFirstValidElement(routes: React.ReactElement[]): React.ReactElement | null;
 export {};

package/dist/utils/route_utils.js

@@ -1,14 +1,70 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 //Retourne les routes et le menu
-import { NavLink, Route } from "react-router-dom";
-export const generateRoutes = (routes) => routes.map((route) => (_jsx(Route, { path: route.path, element: !route.children && route.element, children: route.children && generateRoutes(route.children) }, route.path)));
-export const generateMenuItems = (routes, parentPath = "") => routes.filter((route) => route.hidden != true).map((route) => {
-    const fullPath = `${parentPath}/${route.path}`;
-    const menuItem = {
-        key: fullPath,
-        label: route.children ? _jsxs(_Fragment, { children: [" ", route.label || route.path] }) : _jsx(NavLink, { to: fullPath, children: route.label || route.path }),
-        icon: route.icon,
-        ...(route.children && { children: generateMenuItems(route.children, fullPath) }), // Ajout conditionnel des enfants
-    };
-    return menuItem;
-});
+import { NavLink, Outlet, Route } from "react-router-dom";
+import React from "react";
+export const generateRoutes = (routes) => routes.map((route) => (_jsx(Route, { path: route.path, element: route.children ? _jsx(Outlet, {}) : route.element, children: route.children && generateRoutes(route.children) }, route.path)));
+export const generateMenuItems = (routes, parentPath = "") => {
+    const out = routes.filter((route) => route.hidden != true).map((route) => {
+        const fullPath = `${parentPath}/${route.path}`;
+        const menuItem = {
+            key: fullPath,
+            label: route.children ? _jsxs(_Fragment, { children: [" ", route.label || route.path] }) : _jsx(NavLink, { to: fullPath, children: route.label || route.path }),
+            icon: route.icon,
+            ...(route.children && { children: generateMenuItems(route.children, fullPath) }), // Ajout conditionnel des enfants. Legacy
+        };
+        return menuItem;
+    });
+    return buildMenuTree(out);
+};
+/** AI generated function */
+function buildMenuTree(items) {
+    // Trier par profondeur de path
+    const sorted = [...items].sort((a, b) => 
+    //@ts-ignore
+    a.key.split("/").filter(Boolean).length - b.key.split("/").filter(Boolean).length);
+    const menuMap = new Map();
+    const roots = [];
+    for (const item of sorted) {
+        //@ts-ignore
+        const normalizedKey = item.key.replace(/\/$/, "") || "/";
+        const segments = normalizedKey.split("/").filter(Boolean);
+        const parentKey = segments.length > 0
+            ? "/" + segments.slice(0, -1).join("/")
+            : null;
+        const parent = parentKey ? menuMap.get(parentKey) : null;
+        // On clone l'item pour ne pas muter l'original
+        const menuItem = { ...item, key: normalizedKey };
+        menuMap.set(normalizedKey, menuItem);
+        if (parent) {
+            parent.children = parent.children ?? [];
+            parent.children.push(menuItem);
+        }
+        else {
+            roots.push(menuItem);
+        }
+    }
+    return roots;
+}
+/** AI Generated,
+ * Get first "viewable" route (aka "not a group")
+ * Used for index route
+ */
+export function getFirstValidElement(routes) {
+    function isEmptyOutlet(el) {
+        return React.isValidElement(el) && el.type === Outlet;
+    }
+    for (const route of routes) {
+        const el = route.props.element;
+        if (el && !isEmptyOutlet(el)) { // Page
+            return el;
+        }
+        //Group
+        const children = React.Children.toArray(route.props.children).filter(React.isValidElement);
+        if (children.length > 0) {
+            const firstChild = getFirstValidElement(children);
+            if (firstChild)
+                return firstChild;
+        }
+    }
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geo2france/api-dashboard",
-  "version": "1.20.0",
+  "version": "1.22.0",
   "private": false,
   "description": "Build dashboards with JSX/TSX",
   "main": "dist/index.js",
@@ -64,17 +64,18 @@
     "react-helmet": "^6.1.0",
     "react-helmet-async": "^2.0.5",
     "slick-carousel": "^1.8.1",
+    "slug": "^11.0.1",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
   },
   "devDependencies": {
     "@ant-design/icons": "^6.0.2",
-    "@chromatic-com/storybook": "^5.0.0",
+    "@chromatic-com/storybook": "^5.0.1",
     "@iconify/json": "^2.2.382",
-    "@storybook/addon-a11y": "^10.2.1",
-    "@storybook/addon-docs": "^10.2.1",
-    "@storybook/addon-onboarding": "^10.2.1",
-    "@storybook/addon-vitest": "^10.2.1",
-    "@storybook/react-vite": "^10.2.1",
+    "@storybook/addon-a11y": "^10.2.13",
+    "@storybook/addon-docs": "^10.2.13",
+    "@storybook/addon-onboarding": "^10.2.13",
+    "@storybook/addon-vitest": "^10.2.13",
+    "@storybook/react-vite": "^10.2.13",
     "@tanstack/react-query": "^5.51.11",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.5.0",
@@ -88,6 +89,7 @@
     "@types/react-dom": "^18.3.1",
     "@types/react-helmet-async": "^1.0.1",
     "@types/react-icons": "^2.2.7",
+    "@types/slug": "^5.0.9",
     "@typescript-eslint/eslint-plugin": "^7.16.1",
     "@typescript-eslint/parser": "^7.16.1",
     "@vitejs/plugin-react": "^4.3.1",
@@ -101,7 +103,7 @@
     "react": "^18.3.1",
     "react-map-gl": "^7.1.9",
     "react-router-dom": "^7.13.0",
-    "storybook": "^10.2.1",
+    "storybook": "^10.2.13",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "tsup": "^8.5.0",