@geo2france/api-dashboard 1.15.0 → 1.16.0

package/dist/components/Charts/Pie.js

@@ -32,7 +32,7 @@ export const ChartPie = ({ dataset: dataset_id, nameKey, dataKey, unit, title, d
                 color: usePalette({ nColors: chart_data?.length }),
                 itemStyle: {
                     /* Use label's color if any, otherwise fallback to Echarts calculated color */
-                    color: (p) => { console.log(p.color, p); return colors_labels.find(i => i.label.toLowerCase() === p.name.toLowerCase())?.color ?? colors?.[p.dataIndex] ?? '#000'; }
+                    color: (p) => colors_labels.find(i => i.label.toLowerCase() === p.name.toLowerCase())?.color ?? colors?.[p.dataIndex] ?? '#000'
                 },
                 data: chart_data,
                 radius: donut ? ['40%', '75%'] : [0, '75%'],

package/dist/components/Charts/Statistics.js

@@ -69,5 +69,5 @@ export const Statistics = ({ dataset: dataset_id, dataKey, unit, evolutionSuffix
 export const StatisticsCollection = ({ children, columns = 3, title }) => {
     const arrayChildren = Children.toArray(children);
     useBlockConfig({ title: title });
-    return (_jsx(Row, { gutter: [8, 8], children: arrayChildren.map((c, index) => (_jsx(Col, { xl: 24 / columns, xs: 24, children: c }, index))) }));
+    return (_jsx(Row, { gutter: [8, 8], style: { margin: 8 }, children: arrayChildren.map((c, index) => (_jsx(Col, { xl: 24 / columns, xs: 24, children: c }, index))) }));
 };

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

@@ -1,15 +1,28 @@
 /**
  * Graphique standard pour afficher des données annuelles
  */
+import { EChartsOption, SeriesOption } from "echarts";
 interface IYearSerieProps {
     dataset: string;
     title?: string;
     yearKey: string;
     valueKey: string;
+    secondaryValueKey?: string;
     categoryKey?: string;
     stack?: boolean;
     yearMark?: number | string;
+    normalize?: boolean;
+    /**
+     * Fonction de tri appliquée aux séries (SeriesOption) avant affichage.
+     * Passée directement à `Array.sort()`.
+     *
+     * @example
+     * // Tri alphabétique des séries par leur nom
+     * seriesSort: (a, b) => a.name.localeCompare(b.name)
+     */
+    seriesSort?: (a: SeriesOption, b: SeriesOption) => number;
     type?: 'bar' | 'line' | 'area';
+    options?: Partial<EChartsOption>;
 }
 export declare const ChartYearSerie: React.FC<IYearSerieProps>;
 export {};

package/dist/components/Charts/YearSerie.js

@@ -7,7 +7,8 @@ import { useDataset } from "../Dataset/hooks";
 import { usePalette, usePaletteLabels } from "../Palette/Palette";
 import { ChartEcharts } from "./ChartEcharts";
 import { useBlockConfig } from "../DashboardPage/Block";
-export const ChartYearSerie = ({ dataset: dataset_id, categoryKey, valueKey, yearKey, yearMark, stack: stack_input, title, type: chart_type = 'bar' }) => {
+import deepMerge from "../../utils/deepmerge";
+export const ChartYearSerie = ({ dataset: dataset_id, categoryKey, valueKey, secondaryValueKey, yearKey, yearMark, stack: stack_input, title, type: chart_type = 'bar', normalize = false, seriesSort, options: custom_options = {} }) => {
     const stack = stack_input || chart_type == 'line' ? false : true; // Pas de stack par défaut pour le type line
     const dataset = useDataset(dataset_id);
     const data = dataset?.data;
@@ -17,26 +18,48 @@ export const ChartYearSerie = ({ dataset: dataset_id, categoryKey, valueKey, yea
         title: title,
         dataExport: data
     });
+    const rollupSpec = {
+        'value': op.sum(valueKey),
+    };
+    if (secondaryValueKey) {
+        rollupSpec['secondaryValue'] = op.sum(secondaryValueKey);
+    }
     if (data && data.length > 0) {
         const grouped_data = categoryKey ? from(data).groupby(yearKey, categoryKey) //Somme par année et categorykey
-            .rollup({ [valueKey]: op.sum(valueKey) })
+            .rollup(rollupSpec)
             .groupby(yearKey).orderby(yearKey)
             :
                 from(data).groupby(yearKey) //Somme par année seulement
-                    .rollup({ [valueKey]: op.sum(valueKey) }).orderby(yearKey);
+                    .rollup(rollupSpec)
+                    .orderby(yearKey);
         const all_years = from(data).groupby(yearKey).rollup({ [yearKey]: op.any(yearKey) });
         const all_cats = categoryKey ? (from(data).groupby(categoryKey).rollup({ [categoryKey]: op.any(categoryKey) })) : from([{ 'cat': valueKey }]);
         const full = all_years.cross(all_cats); // Contient chaque annee x catégorie (pour éviter les trous)
         distinct_cat = all_cats.array(categoryKey || 'cat'); // Pour générer chaque serie
-        chart_data = full.join_left(grouped_data).objects();
+        chart_data = full.join_left(grouped_data
+            .derive({ part: d => 100 * d.value / op.sum(d.value) }) // Data for normalized view
+            .rename({ value: valueKey, part: `${valueKey}_pct`, secondaryValue: secondaryValueKey || '' }) // Rename to original var name
+        ).objects();
     }
     const COLORS = usePalette({ nColors: distinct_cat?.length }) || [];
     const colors_labels = usePaletteLabels();
     const series = distinct_cat.map((cat, idx) => ({
         name: cat,
         type: chart_type === 'area' ? 'line' : chart_type,
-        data: categoryKey ? chart_data?.filter((row) => row[categoryKey] === cat).map((row) => ([String(row[yearKey]), row[valueKey] || 0]))
-            : chart_data?.map((row) => ([String(row[yearKey]), row[valueKey] || 0])),
+        data: categoryKey ? chart_data?.filter((row) => row[categoryKey] === cat)
+            .map((row) => ([String(row[yearKey]),
+            row[valueKey] || 0,
+            secondaryValueKey ? row[secondaryValueKey] : undefined,
+            row[`${valueKey}_pct`]
+        ]))
+            : chart_data?.map((row) => ([String(row[yearKey]),
+                row[valueKey] || 0,
+                secondaryValueKey ? row[secondaryValueKey] : undefined,
+                row[`${valueKey}_pct`]])),
+        encode: {
+            x: 0, // annee
+            y: normalize ? 3 : 1 // valueKey ou `${ValueKey}_pct`
+        },
         itemStyle: {
             color: colors_labels.find(i => i.label.toLowerCase() === cat.toLowerCase())?.color ?? (COLORS && COLORS[idx % COLORS.length]),
         },
@@ -44,11 +67,13 @@ export const ChartYearSerie = ({ dataset: dataset_id, categoryKey, valueKey, yea
         areaStyle: chart_type === 'area' ? {} : undefined,
         markLine: idx === 0 && yearMark ? {
             symbol: 'none',
+            animation: false,
+            silent: true,
             data: [
                 { xAxis: String(yearMark) }
             ]
-        } : undefined
-    }));
+        } : undefined,
+    })).sort(seriesSort);
     function tooltipFormatter(params) {
         if (!params || params.length === 0)
             return '';
@@ -74,7 +99,9 @@ export const ChartYearSerie = ({ dataset: dataset_id, categoryKey, valueKey, yea
         },
         yAxis: {
             type: 'value',
+            max: normalize ? 100 : undefined,
+            min: normalize ? 0 : undefined,
         },
     };
-    return (_jsx(ChartEcharts, { option: option }));
+    return (_jsx(ChartEcharts, { notMerge: true, option: deepMerge({}, option, custom_options) }));
 };

package/dist/components/DashboardPage/Block.js

@@ -5,6 +5,7 @@ import { Icon } from "@iconify/react";
 import { ProducersFooter } from "../Dataset/Producer";
 import { MoreOutlined } from '@ant-design/icons';
 import { ErrorBoundary } from "../Layout/Error";
+import { cardStyles } from "../../utils/cardStyles";
 const { useToken } = theme;
 export const ChartBlockContext = createContext(undefined);
 export const DSL_ChartBlock = ({ children }) => {
@@ -37,7 +38,7 @@ export const DSL_ChartBlock = ({ children }) => {
         };
         DL();
     };
-    return (_jsx(ChartBlockContext.Provider, { value: { config: config, setConfig: (e) => setConfig(e) }, children: _jsx(Card, { style: { height: '100%' }, extra: has_action && dropdown_toolbox, title: config.title, children: _jsxs(ErrorBoundary, { children: [children, _jsx(ProducersFooter, { component: children })] }) }) }));
+    return (_jsx(ChartBlockContext.Provider, { value: { config: config, setConfig: (e) => setConfig(e) }, children: _jsx(Card, { className: "dashboard-element", style: { height: '100%' }, styles: cardStyles, extra: has_action && dropdown_toolbox, title: config.title, children: _jsxs(ErrorBoundary, { children: [children, _jsx(ProducersFooter, { component: children })] }) }) }));
 };
 export const useBlockConfig = ({ title, dataExport }) => {
     const blockContext = useContext(ChartBlockContext);

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

@@ -1,7 +1,6 @@
 import { RowProps } from "antd";
 import DashboardElement from "../DashboardElement/DashboardElement";
 import React from "react";
-import { SimpleRecord } from "../../types";
 import { Section } from "./Section";
 type Section = {
     key: string;
@@ -18,16 +17,6 @@ interface IDashboardPageProps {
 }
 declare const DashboardPage: React.FC<IDashboardPageProps>;
 export default DashboardPage;
-type dataset = {
-    id: string;
-    resource: string;
-    data?: SimpleRecord[];
-    isFetching: boolean;
-    isError: boolean;
-    producers?: any[];
-    geojson?: any;
-    dataHash?: number;
-};
 type ControlContextType = {
     values: Record<string, any>;
     pushValue: (control: {
@@ -35,8 +24,6 @@ type ControlContextType = {
         value: any;
     }) => void;
 };
-export declare const DatasetContext: React.Context<Record<string, dataset>>;
-export declare const DatasetRegistryContext: React.Context<(dataset: dataset) => void>;
 export declare const ControlContext: React.Context<ControlContextType | undefined>;
 interface IDSLDashboardPageProps {
     children: React.ReactNode;

package/dist/components/DashboardPage/Page.js

@@ -1,6 +1,6 @@
 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 React, { isValidElement, useState, createContext, } from "react";
+import React, { isValidElement, useState, createContext, useEffect } from "react";
 import { Helmet } from "react-helmet-async";
 import { useSearchParamsState } from "../../utils/useSearchParamsState";
 import Control, { DSL_Control } from "../Control/Control";
@@ -8,6 +8,7 @@ import { Dataset, Debug, Provider } from "../../dsl";
 import { DEFAULT_PALETTE, Palette, PaletteContext } from "../Palette/Palette";
 import { Section } from "./Section";
 import { Icon } from "@iconify/react";
+import { useDatasetRegistry } from "../Dataset/hooks";
 const { Header } = Layout;
 const { useToken } = theme;
 const getSection = (child) => React.isValidElement(child) ? child.props.section : undefined;
@@ -39,22 +40,18 @@ 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;
-export const DatasetContext = createContext({});
-export const DatasetRegistryContext = createContext(() => { }); // A modifier, utiliser un seul context
 export const ControlContext = createContext(undefined);
 export const DSL_DashboardPage = ({ name = 'Tableau de bord', columns = 2, children, debug = false }) => {
     const { token } = useToken();
-    const [datasets, setdatasets] = useState({});
     const [palette, setPalette] = useState(DEFAULT_PALETTE);
+    const datasetRegistry = useDatasetRegistry();
+    useEffect(() => {
+        return () => {
+            datasetRegistry.clear();
+        };
+    }, []);
     //const allDatasetLoaded = Object.values(datasets).every(d => !d.isFetching);
     //const isDatasetError = Object.values(datasets).some(d => d.isError);
-    // Ajouter ou mettre à jour un dataset
-    const pushDataset = (d) => {
-        setdatasets(prev => ({
-            ...prev,
-            [d.id]: d
-        }));
-    };
     const childrenArray = React.Children.toArray(children).filter(isValidElement);
     const logicalComponents = [Dataset.name, Provider.name, Palette.name, Debug.name]; //Composant logiques, a ne pas mettre dans la grid
     const getComponentKind = (c) => {
@@ -91,20 +88,20 @@ export const DSL_DashboardPage = ({ name = 'Tableau de bord', columns = 2, child
             children: _jsx(Section, { title: 'Autres', children: visible_components })
         });
     }
-    return (_jsxs(_Fragment, { children: [_jsx(Helmet, { children: _jsx("title", { children: name }) }), _jsx(DatasetRegistryContext.Provider, { value: pushDataset, children: _jsx(DatasetContext.Provider, { value: datasets, children: _jsxs(PaletteContext.Provider, { value: { palette, setPalette }, children: [control_components.length > 0 && _jsx(Header, { style: {
-                                    padding: 12,
-                                    position: "sticky",
-                                    top: 0,
-                                    zIndex: 600, // maplibre top zIndex if 500
-                                    backgroundColor: "#fff",
-                                    height: "auto",
-                                    width: "100%",
-                                }, children: control_components }), items.length > 1 ?
-                                _jsx(Tabs, { defaultActiveKey: "1", items: items, centered: true, tabBarStyle: { margin: 6,
-                                        padding: 4,
-                                        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] }) }) })] }));
+    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: {
+                            padding: 12,
+                            position: "sticky",
+                            top: 0,
+                            zIndex: 600, // maplibre top zIndex if 500
+                            backgroundColor: "#fff",
+                            height: "auto",
+                            width: "100%",
+                        }, children: control_components }), items.length > 1 ?
+                        _jsx(Tabs, { defaultActiveKey: "1", items: items, centered: true, tabBarStyle: { margin: 6,
+                                padding: 4,
+                                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] })] }));
 };

package/dist/components/Dataset/Dataset.d.ts

@@ -1,4 +1,5 @@
 import { ReactNode } from "react";
+import { SimpleRecord } from "../..";
 import { CrudFilters, DataProvider } from "../../data_providers/types";
 import React from "react";
 import { ProviderType } from "./Provider";
@@ -13,5 +14,15 @@ interface IDatasetProps {
     pageSize?: number;
     meta?: any;
 }
+export type dataset = {
+    id: string;
+    resource: string;
+    data?: SimpleRecord[];
+    isFetching: boolean;
+    isError: boolean;
+    producers?: any[];
+    geojson?: any;
+    dataHash?: number;
+};
 export declare const DSL_Dataset: React.FC<IDatasetProps>;
 export {};

package/dist/components/Dataset/Dataset.js

@@ -1,7 +1,7 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { useContext, useEffect } from "react";
 import { useApi } from "../..";
-import { ControlContext, DatasetRegistryContext } from "../DashboardPage/Page";
+import { ControlContext } from "../DashboardPage/Page";
 import { Producer } from "./Producer";
 import React from "react";
 import { Filter, Transform, useAllDatasets, useDatasets } from "../../dsl";
@@ -10,6 +10,7 @@ import { DataProviderContext, getProviderFromType } from "./Provider";
 import { Join } from "./Join";
 import { from } from "arquero";
 import hashCode from "../../utils/hash_data";
+import { DatasetRegistryContext } from "./context";
 export const DSL_Dataset = ({ children, id, provider: provider_input, type: providerType = 'file', url: providerUrl, resource, pageSize, meta }) => {
     const getTransformerFn = (component) => {
         /*
@@ -99,7 +100,7 @@ export const DSL_Dataset = ({ children, id, provider: provider_input, type: prov
     useEffect(() => {
         const finalData = data?.data && transformers.reduce((datat, fn) => fn(datat), data.data);
         if (datasetRegistryContext) {
-            datasetRegistryContext({
+            datasetRegistryContext.register({
                 id: id,
                 resource: resource,
                 data: finalData,

package/dist/components/Dataset/context.d.ts

@@ -0,0 +1,9 @@
+import { dataset } from "./Dataset";
+interface DatasetRegistryContextValue {
+    register: (dataset: dataset) => void;
+    clear: () => void;
+    get: (name: string) => dataset | undefined;
+    getAll: () => Record<string, dataset>;
+}
+export declare const DatasetRegistryContext: import("react").Context<DatasetRegistryContextValue>;
+export {};

package/dist/components/Dataset/context.js

@@ -0,0 +1,7 @@
+import { createContext } from "react";
+export const DatasetRegistryContext = createContext({
+    register: () => { },
+    clear: () => { },
+    get: () => undefined,
+    getAll: () => ({}),
+});

package/dist/components/Dataset/hooks.d.ts

@@ -1,30 +1,10 @@
-export declare const useDataset: (dataset_id?: string) => {
-    id: string;
-    resource: string;
-    data?: import("../..").SimpleRecord[];
-    isFetching: boolean;
-    isError: boolean;
-    producers?: any[];
-    geojson?: any;
-    dataHash?: number;
-} | undefined;
-export declare const useDatasets: (dataset_ids?: string[]) => {
-    id: string;
-    resource: string;
-    data?: import("../..").SimpleRecord[];
-    isFetching: boolean;
-    isError: boolean;
-    producers?: any[];
-    geojson?: any;
-    dataHash?: number;
-}[] | undefined;
-export declare const useAllDatasets: () => {
-    id: string;
-    resource: string;
-    data?: import("../..").SimpleRecord[];
-    isFetching: boolean;
-    isError: boolean;
-    producers?: any[];
-    geojson?: any;
-    dataHash?: number;
-}[] | undefined;
+import { dataset } from "./Dataset";
+export declare const useDataset: (dataset_id?: string) => dataset | undefined;
+export declare const useAllDatasets: () => dataset[];
+export declare const useDatasets: (dataset_ids?: string[]) => dataset[];
+export declare const useDatasetRegistry: () => {
+    register: (d: dataset) => void;
+    clear: () => void;
+    get: (dataset_id?: string) => dataset | undefined;
+    getAll: () => Record<string, dataset>;
+};

package/dist/components/Dataset/hooks.js

@@ -1,19 +1,49 @@
-import { useContext } from "react";
-import { DatasetContext } from "../DashboardPage/Page";
+import { useCallback, useContext, useState } from "react";
+import { DatasetRegistryContext } from "./context";
+// 🔹 Hook pour récupérer un dataset unique
 export const useDataset = (dataset_id) => {
-    const datasetContext = useContext(DatasetContext);
+    const datasetRegistry = useContext(DatasetRegistryContext);
     if (dataset_id) {
-        return datasetContext[dataset_id];
+        return datasetRegistry.get(dataset_id);
     }
-    // Retourne le premier dataset si pas d'id
-    const firstKey = Object.keys(datasetContext)[0];
-    return firstKey ? datasetContext[firstKey] : undefined;
 };
+// 🔹 Hook pour récupérer tous les datasets sous forme de tableau
+export const useAllDatasets = () => {
+    const datasetRegistry = useContext(DatasetRegistryContext);
+    return Object.values(datasetRegistry.getAll());
+};
+// 🔹 Hook pour filtrer plusieurs datasets par id
 export const useDatasets = (dataset_ids) => {
-    const datasetContext = useContext(DatasetContext);
-    return (dataset_ids?.map((dataset_id) => datasetContext[dataset_id]));
+    const datasets = useAllDatasets();
+    return (datasets.filter(d => dataset_ids?.includes(d.id)));
 };
-export const useAllDatasets = () => {
-    const datasetContext = useContext(DatasetContext);
-    return useDatasets(Object.keys(datasetContext));
+export const useDatasetRegistry = () => {
+    /* DATASET */
+    const [datasets, setdatasets] = useState({});
+    const pushDataset = useCallback((d) => {
+        setdatasets(prev => {
+            const existing = prev[d.id];
+            if (existing && existing.dataHash === d.dataHash && existing.isFetching === d.isFetching) { // Eviter les rerender si les données n'ont pas changé
+                return prev;
+            }
+            return { ...prev, [d.id]: d };
+        });
+    }, []);
+    const clearDatasets = useCallback(() => {
+        setdatasets({});
+    }, []);
+    const getDataset = useCallback((dataset_id) => {
+        if (!dataset_id)
+            return undefined;
+        return datasets[dataset_id] ?? undefined;
+    }, [datasets]);
+    const getAllDataset = useCallback(() => {
+        return datasets;
+    }, [datasets]);
+    return {
+        register: pushDataset,
+        clear: clearDatasets,
+        get: getDataset,
+        getAll: getAllDataset,
+    };
 };

package/dist/components/Layout/DashboardApp.js

@@ -10,6 +10,8 @@ import { DasbhoardFooter } from "./Footer";
 import { createContext, useState } from "react";
 import { ControlContext } from "../DashboardPage/Page";
 import { HelmetProvider } from "react-helmet-async";
+import { useDatasetRegistry } from "../Dataset/hooks";
+import { DatasetRegistryContext } from "../Dataset/context";
 //import '../../index.css' //TODO a intégrer en jsx
 const queryClient = new QueryClient();
 const default_theme = {
@@ -41,6 +43,6 @@ const DashboardApp = ({ routes, theme, logo, brands, footerSlider, title, subtit
             ...c
         }));
     };
-    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(ControlContext.Provider, { value: { values: controls, pushValue: pushControl }, children: _jsx(HashRouter, { children: _jsx(Routes, { children: _jsxs(Route, { element: _jsxs(Layout, { hasSider: true, style: { minHeight: '100vh' }, children: [_jsx(DashboardSider, { route_config: routes }), _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, {}) })] }) }) }) }) }) }) }) }));
+    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: useDatasetRegistry(), children: _jsx(ControlContext.Provider, { value: { values: controls, pushValue: pushControl }, children: _jsx(HashRouter, { children: _jsx(Routes, { children: _jsxs(Route, { element: _jsxs(Layout, { hasSider: true, style: { minHeight: '100vh' }, children: [_jsx(DashboardSider, { route_config: routes }), _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, {}) })] }) }) }) }) }) }) }) }) }));
 };
 export default DashboardApp;

package/dist/components/Map/Map.js

@@ -35,7 +35,6 @@ const build_geojson = (params) => {
     else {
         features_collection = undefined;
     }
-    console.log(geomKey, features_collection);
     return features_collection;
 };
 export const Map = ({ dataset, color, type, paint, categoryKey, popup = false, popupFormatter: popupFormatterUser, title, xKey, yKey }) => {
@@ -74,7 +73,6 @@ export const MapLayer = ({ dataset, categoryKey, color = 'red', type = 'circle',
     // src (lib proj4 pour convertir)
     const keys = data?.data?.[0] ? Object.keys(data?.data?.[0]) : undefined;
     const geomKey = [geomKey_input, "geom", "geometry"].find(c => c && keys?.includes(c));
-    console.log(data?.id, data?.data, geomKey);
     // Si x et y sont definie, on construit le geojson
     const geojson = xKey && yKey && data?.data ?
         build_geojson({ data: data.data, xKey: xKey, yKey: yKey })

package/dist/dsl/index.d.ts

@@ -20,4 +20,5 @@ import { useBlockConfig } from "../components/DashboardPage/Block";
 import { Statistics, StatisticsCollection } from "../components/Charts/Statistics";
 import { MapLayer, Map } from "../components/Map/Map";
 import { Section } from "../components/DashboardPage/Section";
-export { Dashboard, Dataset, Provider, Transform, Join, Filter, Section, DataPreview, ChartEcharts, ChartPie, ChartYearSerie, Statistics, StatisticsCollection, useDataset, useDatasets, useAllDatasets, useBlockConfig, Producer, Control, useControl, useAllControls, Radio, Select, Input, Palette, usePalette, usePaletteLabels, PalettePreview, Debug, Map, MapLayer };
+import { LegendControl } from "../components/MapLegend/MapLegend";
+export { Dashboard, Dataset, Provider, Transform, Join, Filter, Section, DataPreview, ChartEcharts, ChartPie, ChartYearSerie, 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

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

package/dist/utils/usechartexports.js

@@ -32,7 +32,7 @@ export const useChartExport = ({ chartRef }) => {
         }
     }, [chartRef, exportRequested]);
     const exportImage = () => {
-        console.log('called');
+        //console.log('called')
         setExportRequested(true);
     };
     return { img64, exportImage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geo2france/api-dashboard",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "private": false,
   "description": "Build dashboards with JSX/TSX",
   "main": "dist/index.js",