@geo2france/api-dashboard 1.15.0 → 1.17.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

@@ -25,12 +25,12 @@ export const Statistics = ({ dataset: dataset_id, dataKey, unit, evolutionSuffix
     const dataset = useDataset(dataset_id);
     const row = dataset?.data?.slice(-1)[0];
     const value = row?.[dataKey]; // Dernière valeur du dataset. Caster en Number ?
-    const compare_value = compareWith === 'previous' ? dataset?.data?.slice(-2)[0][dataKey] : dataset?.data?.slice(0, 1)[0][dataKey]; //Première ou avant dernière
+    const compare_value = compareWith === 'previous' ? dataset?.data?.slice(-2)?.[0]?.[dataKey] : dataset?.data?.slice(0, 1)?.[0]?.[dataKey]; //Première ou avant dernière
     const evolution = relativeEvolution ? 100 * ((value - compare_value) / compare_value) : value - compare_value;
     const evolution_unit = relativeEvolution ? '%' : unit;
     const evolution_is_good = invertColor ? evolution < 0 : evolution > 0;
     const tooltip = help && _jsx(Tooltip, { title: help, children: _jsx(QuestionCircleOutlined, {}) });
-    const CallbackParams = { value: value || NaN, compareValue: compare_value || NaN, data: dataset?.data || [], row: row };
+    const CallbackParams = { value: value ?? NaN, compareValue: compare_value ?? NaN, data: dataset?.data ?? [], row: row };
     let subtitle;
     if (annotation !== undefined) {
         subtitle = typeof annotation === 'function' ? annotation(CallbackParams) : annotation;
@@ -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,49 @@ 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();
+        chart_data.sort((a, b) => a[yearKey] - b[yearKey]);
     }
     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 +68,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 +100,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/Control/Control.d.ts

@@ -7,15 +7,31 @@ 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[] | number[] | {
-    label: string | number;
-    value: string | number;
+export declare const list_to_options: (input?: string[] | {
+    label: string;
+    value: string;
 }[]) => {
-    label: string | number;
-    value: string | number;
+    label: string;
+    value: string;
 }[];
 interface IControlProps {
     children: ReactElement | ReactElement[];
 }
 export declare const DSL_Control: React.FC<IControlProps>;
 export declare const ControlPreview: React.FC;
+type ControlContextType = {
+    values: Record<string, any>;
+    register: (control: {
+        name: string;
+        value: any;
+    }) => void;
+    clear: () => void;
+    getAll: () => Record<string, any>;
+};
+export declare const ControlContext: React.Context<ControlContextType | undefined>;
+export declare const CreateControlesRegistry: () => {
+    register: (c: Record<string, any>) => void;
+    clear: () => void;
+    getAll: () => Record<string, any>;
+    values: Record<string, any>;
+};

package/dist/components/Control/Control.js

@@ -1,7 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Descriptions, Form, Layout } from "antd";
-import React, { useContext, useEffect } from "react";
-import { ControlContext } from "../DashboardPage/Page";
+import React, { createContext, useCallback, useContext, useEffect, useState } from "react";
 const { Header } = Layout;
 /*
  * Composant destiné à recevoir un Form avec les contrôles de la page
@@ -28,7 +27,7 @@ export const useControl = (name) => {
     if (!context_controls) {
         throw new Error("useControl must be used within a ControlProvider");
     }
-    const { values } = context_controls;
+    const values = context_controls.getAll();
     const value = values[name];
     return value;
 };
@@ -49,8 +48,8 @@ export const list_to_options = (input = []) => {
         return [];
     }
     return input.map((o) => {
-        if (typeof o == "string" || typeof o == "number") {
-            return { label: String(o), value: o };
+        if (typeof o == "string") {
+            return { label: String(o), value: String(o) };
         }
         return o;
     });
@@ -64,7 +63,7 @@ export const DSL_Control = ({ children }) => {
     if (!context_controls) { //Le contexte peut être nul ?
         throw new Error("useControl must be used within a ControlProvider");
     }
-    const { values: _control, pushValue: pushControl } = context_controls;
+    const { values: _control, register: pushControl } = context_controls;
     const childrenArray = React.Children.toArray(children).filter((child) => React.isValidElement(child));
     //Ajout des nouvelles valeurs de controles dans le contexte de la page
     const handleChange = (changed_value) => {
@@ -83,3 +82,26 @@ export const ControlPreview = ({}) => {
     }));
     return (_jsx(Descriptions, { items: items }));
 };
+export const ControlContext = createContext(undefined);
+export const CreateControlesRegistry = () => {
+    /* CONTROLS */
+    const [controls, setControles] = useState({});
+    const pushControl = useCallback((c) => {
+        setControles(prev => ({
+            ...prev,
+            ...c
+        }));
+    }, []);
+    const clear = useCallback(() => {
+        setControles({});
+    }, []);
+    const getAll = useCallback(() => {
+        return controls;
+    }, [controls]);
+    return ({
+        register: pushControl,
+        clear,
+        getAll,
+        values: controls
+    });
+};

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

@@ -2,18 +2,18 @@ import type { RadioGroupProps } from 'antd';
 import { SimpleRecord } from '../../types';
 export declare const buildOptionsFromData: (data: SimpleRecord[], labelField?: string, valueField?: string) => {
     label: string;
-    value: string | number;
+    value: string;
 }[];
 type ExtendedRadioGroupProps = RadioGroupProps & {
     name?: string;
     dataset?: string;
     options?: {
         label: string;
-        value: string | number;
-    }[] | string[] | number[];
+        value: string;
+    }[] | string[];
     labelField?: string;
     valueField?: string;
-    initalValue?: string | number;
+    initalValue?: string;
 };
 export declare const Radio: React.FC<ExtendedRadioGroupProps>;
 export {};

package/dist/components/Control/Radio.js

@@ -6,6 +6,9 @@ import { list_to_options } from './Control';
 // On construit les options depuis le tableau de données, utiliser pour Radio et Select
 export const buildOptionsFromData = (data, labelField = 'label', valueField = 'value') => {
     const t = from(data);
+    if (data.length <= 0) { //Avoir arquero error on empty data
+        return [];
+    }
     return (t.select(labelField, valueField)
         .dedupe(valueField)
         .objects()

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

@@ -3,13 +3,15 @@ type ExtendedSelectProps = Omit<SelectProps<any>, 'options'> & {
     dataset?: string;
     options?: {
         label: string;
-        value: string | number;
-    }[] | string[] | number[];
-    initial_value?: string | number;
+        value: string;
+    }[] | string[];
+    initial_value?: string;
     labelField?: string;
     valueField?: string;
     name?: string;
+    label?: string;
     arrows?: boolean;
+    reverse?: boolean;
 };
 export declare const Select: React.FC<ExtendedSelectProps>;
 export {};

package/dist/components/Control/Select.js

@@ -5,13 +5,13 @@ import NextPrevSelect from '../NextPrevSelect/NextPrevSelect';
 import { list_to_options } from './Control';
 // TODO : a fusionner avec NextPrevSelect pour n'avoir qu'un seul composant
 // Actuellement, Select apporte seulement le fait de choisir les valeurs depuis un
-export const Select = ({ name, dataset: datasetSource, options: input_options = [], labelField = 'label', valueField = 'value', arrows = false, initial_value: initial_value_in, ...rest }) => {
+export const Select = ({ name, dataset: datasetSource, options: input_options = [], labelField = 'label', valueField = 'value', arrows = false, reverse = false, label, initial_value: initial_value_in, ...rest }) => {
     const options = list_to_options(input_options);
     const data = useDataset(datasetSource)?.data;
     const data_options = datasetSource ? (data && buildOptionsFromData(data, labelField, valueField)) : options;
     const myOptions = data_options && data_options.map((o) => {
-        if (typeof o == "string" || typeof o == "number") {
-            return { label: o, value: o };
+        if (typeof o == "string") {
+            return { label: o, value: String(o) };
         }
         return o;
     });
@@ -22,5 +22,5 @@ export const Select = ({ name, dataset: datasetSource, options: input_options =
     const value = initial_value == null || initial_value == false
         ? undefined
         : initial_value;
-    return (_jsx(NextPrevSelect, { name: name, options: data_options, defaultValue: value, value: value, arrows: arrows, optionFilterProp: "label", ...rest }));
+    return (_jsx(NextPrevSelect, { name: name, label: label ?? name, options: data_options, defaultValue: value, value: value, arrows: arrows, reverse: reverse, optionFilterProp: "label", ...rest }));
 };

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,26 +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: {
-        name: string;
-        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;
     name?: string;

package/dist/components/DashboardPage/Page.js

@@ -1,13 +1,14 @@
 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, useEffect, useContext } from "react";
 import { Helmet } from "react-helmet-async";
 import { useSearchParamsState } from "../../utils/useSearchParamsState";
-import Control, { DSL_Control } from "../Control/Control";
+import Control, { ControlContext, DSL_Control } from "../Control/Control";
 import { Dataset, Debug, Provider } from "../../dsl";
 import { DEFAULT_PALETTE, Palette, PaletteContext } from "../Palette/Palette";
 import { Section } from "./Section";
 import { Icon } from "@iconify/react";
+import { DatasetRegistryContext } from "../Dataset/context";
 const { Header } = Layout;
 const { useToken } = theme;
 const getSection = (child) => React.isValidElement(child) ? child.props.section : undefined;
@@ -39,22 +40,19 @@ 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 = useContext(DatasetRegistryContext);
+    const controlesRegistry = useContext(ControlContext);
+    useEffect(() => {
+        return () => {
+            datasetRegistry.clear();
+            controlesRegistry?.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 +89,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,15 +1,15 @@
 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 { Producer } from "./Producer";
 import React from "react";
-import { Filter, Transform, useAllDatasets, useDatasets } from "../../dsl";
+import { Filter, Transform, useAllControls, useAllDatasets, useDatasets } from "../../dsl";
 import alasql from "alasql";
 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) => {
         /*
@@ -57,8 +57,7 @@ export const DSL_Dataset = ({ children, id, provider: provider_input, type: prov
     };
     const datasetRegistryContext = useContext(DatasetRegistryContext);
     const allDatasets = useAllDatasets();
-    const controlContext = useContext(ControlContext);
-    const controls = controlContext?.values;
+    const controls = useAllControls();
     const providerContext = useContext(DataProviderContext);
     const provider = (providerUrl && getProviderFromType(providerType)(providerUrl)) || providerContext || provider_input;
     if (provider === undefined) {
@@ -99,7 +98,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/Producer.js

@@ -1,7 +1,7 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useDatasets } from "./hooks";
 import { Typography } from "antd";
-const { Link } = Typography;
+const { Link, Text } = Typography;
 /**
  * Les props sont récupérées par le parent (Dataset) et enregistrés avec le dataset
  */
@@ -21,7 +21,7 @@ export const ProducersFooter = ({ component }) => {
         const uniqueProducers = Array.from(new Map(producers?.map(p => [p.nom, p]) // clé unique = nom
         ).values());
         uniqueProducers.sort((a, b) => a.nom.localeCompare(b.nom));
-        return datasets ? (_jsxs(_Fragment, { children: ["Source des donn\u00E9es :", " ", uniqueProducers?.map((p, idx, arr) => (_jsxs("span", { children: [_jsx(Link, { href: p.url, children: p.nom }), idx < arr.length - 1 ? ', ' : ''] }, idx)))] })) : null;
+        return (producers?.length > 0) ? (_jsxs(Text, { type: "secondary", style: { padding: 4 }, children: ["Source des donn\u00E9es :", " ", uniqueProducers?.map((p, idx, arr) => (_jsxs("span", { children: [_jsx(Link, { href: p.url, children: p.nom }), idx < arr.length - 1 ? ', ' : ''] }, idx)))] })) : null;
     }
     return _jsx(_Fragment, {});
 };

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

@@ -1,6 +1,16 @@
 import { SimpleRecord } from "../..";
-interface ITransformProps<T = SimpleRecord[]> {
-    children: string | ((data: T) => T);
+interface ITransformProps {
+    /**
+   * Contenu du Transform :
+   * - **string** : SQL (interprété par Alasql)
+   * - **fonction** `(data: any) => SimpleRecord[]` : transforme les données brutes ou déjà transformées
+   *   en un tableau de `SimpleRecord`.
+   */
+    children: string | ((data: any) => SimpleRecord[]);
 }
-export declare const DSL_Transform: React.FC<ITransformProps>;
+/**
+ * Composant permettant d'appliquer une transformation à un jeu de données.
+ * La transformation est appliquée via une fonction ou une chaîne SQL.
+ */
+export declare const Transform: React.FC<ITransformProps>;
 export {};

package/dist/components/Dataset/Transform.js

@@ -1,7 +1,8 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
-/*
-* Les props sont utilisées dans le Dataset parent pour appliquer une (ou plusieurs fonction de transformation)
-*/
-export const DSL_Transform = () => {
+/**
+ * Composant permettant d'appliquer une transformation à un jeu de données.
+ * La transformation est appliquée via une fonction ou une chaîne SQL.
+ */
+export const Transform = () => {
     return _jsx(_Fragment, {});
 };

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,14 @@
-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[];
+/**
+ * Fonction permettant de créer le registre de dataset
+ * avec les méthodes nécessaires.
+ */
+export declare const createDatasetRegistry: () => {
+    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,53 @@
-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));
+/**
+ * Fonction permettant de créer le registre de dataset
+ * avec les méthodes nécessaires.
+ */
+export const createDatasetRegistry = () => {
+    /* 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

@@ -7,9 +7,11 @@ import DashboardSider from "./Sider";
 import { Content } from "antd/es/layout/layout";
 import { ErrorComponent } from "./Error";
 import { DasbhoardFooter } from "./Footer";
-import { createContext, useState } from "react";
-import { ControlContext } from "../DashboardPage/Page";
+import { createContext } 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 '../../index.css' //TODO a intégrer en jsx
 const queryClient = new QueryClient();
 const default_theme = {
@@ -33,14 +35,6 @@ const default_theme = {
 export const AppContext = createContext({});
 const DashboardApp = ({ routes, theme, logo, brands, footerSlider, title, subtitle }) => {
     const context_values = { title, subtitle, logo };
-    /* CONTROLS */
-    const [controls, setControles] = useState({});
-    const pushControl = (c) => {
-        setControles(prev => ({
-            ...prev,
-            ...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: 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 }), _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/Layout/Footer.js

@@ -1,14 +1,39 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button, Layout, Typography } from "antd";
-import { useContext, useState } from "react";
+import { Button, Layout, theme, Typography } from "antd";
+import { useContext, useEffect, useState } from "react";
 import Slider from "@ant-design/react-slick";
 import { UpOutlined, DownOutlined } from "@ant-design/icons";
 import { AppContext } from "./DashboardApp";
 import "slick-carousel/slick/slick.css";
 import "slick-carousel/slick/slick-theme.css";
+import { Icon } from "@iconify/react";
 const { Text } = Typography;
+const { useToken } = theme;
 export const DasbhoardFooter = ({ brands, slider = true }) => {
     const [isCollapsed, setIsCollapsed] = useState(window.innerWidth < 768 ? true : false);
+    const [showScrollIndicator, setShowScrollIndicator] = useState(true);
+    const { token } = useToken();
+    /* 🤖 IA Generated effect
+    * Permet d'afficher ou non le scrollIndicator
+    */
+    useEffect(() => {
+        const checkShadow = () => {
+            const scrollTop = window.scrollY;
+            const windowHeight = window.innerHeight;
+            const docHeight = document.documentElement.scrollHeight;
+            setShowScrollIndicator(scrollTop + windowHeight < docHeight - 1);
+        };
+        // scroll listener
+        window.addEventListener("scroll", checkShadow);
+        // observer pour changements dynamiques du contenu
+        const observer = new ResizeObserver(checkShadow);
+        observer.observe(document.body);
+        checkShadow(); // initial
+        return () => {
+            window.removeEventListener("scroll", checkShadow);
+            observer.disconnect();
+        };
+    }, []);
     const toggleCollapse = () => {
         setIsCollapsed(!isCollapsed);
     };
@@ -40,10 +65,23 @@ export const DasbhoardFooter = ({ brands, slider = true }) => {
             height: "auto",
             minHeight: "40px",
             transition: "height 0.5s ease-in-out",
-            overflow: "hidden",
+            overflow: "visible",
             borderTop: "1px solid #ccc",
             zIndex: 600, // maplibre top zIndex if 500
-        }, children: [isCollapsed && (_jsxs(Text, { type: "secondary", children: [app_context?.title, " - ", app_context?.subtitle] })), _jsx("div", { style: { display: isCollapsed ? "none" : "block", padding: "10px 0" }, children: slider
+        }, children: [showScrollIndicator &&
+                /* Shaddow + chevron : show the user that remaing content is avaible downside */
+                _jsx("div", { className: "scroll-indicator", style: {
+                        position: "absolute",
+                        top: -40,
+                        left: 0,
+                        right: 0,
+                        height: 40,
+                        pointerEvents: "none",
+                        display: "flex",
+                        justifyContent: "center",
+                        alignContent: "flex-end",
+                        background: "linear-gradient(to bottom, rgba(255,255,255,0), rgba(0,0,0,0.1))",
+                    }, children: _jsx(Icon, { icon: "fa6-solid:chevron-down", fontSize: 35, color: token.colorPrimary }) }), isCollapsed && (_jsxs(Text, { type: "secondary", children: [app_context?.title, " - ", app_context?.subtitle] })), _jsx("div", { style: { display: isCollapsed ? "none" : "block", padding: "10px 0" }, children: slider
                     // Logos avec défilement (choix par défaut)
                     ? _jsx(Slider
                     // Défilement auto si plus de logos que la lagreur de l'écran ne peut en afficher

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/components/NextPrevSelect/NextPrevSelect.d.ts

@@ -2,16 +2,17 @@ import React from 'react';
 import { CSSProperties } from "react";
 type NextPrevSelectProps = {
     options?: {
-        label: string | number;
-        value: string | number;
-    }[] | string[] | number[];
+        label: string;
+        value: string;
+    }[] | string[];
     style?: CSSProperties;
-    defaultValue?: string | number;
-    value?: string | number;
-    onChange?: (value: string | number) => void;
+    defaultValue?: string;
+    value?: string;
+    onChange?: (value: string) => void;
     reverse?: boolean;
     name?: string;
     arrows?: boolean;
+    label?: string;
 };
 declare const NextPrevSelect: React.FC<NextPrevSelectProps>;
 export default NextPrevSelect;

package/dist/components/NextPrevSelect/NextPrevSelect.js

@@ -1,8 +1,10 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { CaretLeftOutlined, CaretRightOutlined } from "@ant-design/icons";
-import { Button, ConfigProvider, Flex, Form, Select } from "antd";
-import { useEffect, useState } from "react";
+import { Button, ConfigProvider, Flex, Form, Select, theme, Typography } from "antd";
+import { useEffect } from "react";
 import { list_to_options } from '../Control/Control';
+import { useSearchParamsState } from '../../utils/useSearchParamsState';
+const { Text } = Typography;
 // Update field and trigger form OnValueChange, thanks to : https://github.com/ant-design/ant-design/issues/23782#issuecomment-2114700558
 const updateFieldValue = (form, name, value) => {
     form.getInternalHooks('RC_FORM_INTERNAL_HOOKS').dispatch({
@@ -23,20 +25,22 @@ const style_button_right = {
     borderBottomRightRadius: 4,
     borderLeft: 0,
 };
-const NextPrevSelect = ({ name, options: input_options = [], style, value, defaultValue, onChange, reverse = false, arrows = true, ...rest }) => {
-    const [current_value, setCurrent_value] = useState(value);
+const NextPrevSelect = ({ name = 'sansnom', options: input_options = [], style, value, defaultValue, onChange, reverse = false, arrows = true, label, ...rest }) => {
+    const [current_value, setCurrent_value] = useSearchParamsState(name, String(defaultValue) || '');
+    const { token } = theme.useToken();
     const form = Form.useFormInstance();
+    const labelApplied = label ?? name;
     useEffect(() => {
-        value && handleChange(value);
-    }, [value]);
+        current_value && handleChange(current_value);
+    }, [value, current_value]);
     const options = list_to_options(input_options);
     const current_index = options?.findIndex((o) => o.value == form?.getFieldValue(name) || o.value == current_value);
-    const next = () => reverse
+    const next = () => String(reverse
         ? options[current_index - 1].value
-        : options[current_index + 1].value;
-    const previous = () => reverse
+        : options[current_index + 1].value);
+    const previous = () => String(reverse
         ? options[current_index + 1].value
-        : options[current_index - 1].value;
+        : options[current_index - 1].value);
     const isFirst = () => reverse ? current_index == options.length - 1 : current_index == 0;
     const isLast = () => reverse ? current_index == 0 : current_index == options.length - 1;
     const handleChange = (v) => {
@@ -44,6 +48,6 @@ const NextPrevSelect = ({ name, options: input_options = [], style, value, defau
         name && form && updateFieldValue(form, name, v);
         onChange && onChange(v);
     };
-    return (_jsxs(Flex, { style: style, name: name, children: [arrows && _jsx(Button, { style: style_button_left, onClick: () => handleChange(previous()), disabled: isFirst(), children: _jsx(CaretLeftOutlined, {}) }), _jsxs(ConfigProvider, { theme: arrows ? { components: { Select: { borderRadius: 0, }, }, } : undefined, children: [" ", _jsx(Form.Item, { name: name, label: name, noStyle: arrows, initialValue: defaultValue, shouldUpdate: true, children: _jsx(Select, { className: "nextPrevSelect", options: options, style: { ...style }, value: current_value, defaultValue: defaultValue, onChange: handleChange, ...rest }) })] }), arrows && _jsx(Button, { style: style_button_right, onClick: () => handleChange(next()), disabled: isLast(), children: _jsx(CaretRightOutlined, {}) })] }));
+    return (_jsxs(Flex, { style: style, align: 'center', name: name, children: [" ", arrows && _jsxs(Text, { type: 'secondary', style: { color: token.colorTextLabel }, children: [" ", labelApplied, "\u00A0:\u00A0"] }), arrows && _jsx(Button, { style: style_button_left, onClick: () => handleChange(previous()), disabled: isFirst(), children: _jsx(CaretLeftOutlined, {}) }), _jsxs(ConfigProvider, { theme: arrows ? { components: { Select: { borderRadius: 0, }, }, } : undefined, children: [" ", _jsx(Form.Item, { name: name, label: labelApplied, noStyle: arrows, initialValue: defaultValue, shouldUpdate: true, children: _jsx(Select, { className: "nextPrevSelect", options: options, style: { ...style }, value: current_value, defaultValue: defaultValue, onChange: handleChange, ...rest }) })] }), arrows && _jsx(Button, { style: style_button_right, onClick: () => handleChange(next()), disabled: isLast(), children: _jsx(CaretRightOutlined, {}) })] }));
 };
 export default NextPrevSelect;

package/dist/dsl/index.d.ts

@@ -1,7 +1,7 @@
 import { DSL_DashboardPage as Dashboard } from "../components/DashboardPage/Page";
 import { DSL_Dataset as Dataset } from "../components/Dataset/Dataset";
 import { DSL_DataPreview as DataPreview } from "../components/Dataset/DataPreview";
-import { DSL_Transform as Transform } from "../components/Dataset/Transform";
+import { Transform } from "../components/Dataset/Transform";
 import { DSL_Filter as Filter } from "../components/Dataset/Filter";
 import { Provider } from "../components/Dataset/Provider";
 import { useAllDatasets, useDataset, useDatasets } from "../components/Dataset/hooks";
@@ -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

@@ -1,7 +1,7 @@
 import { DSL_DashboardPage as Dashboard } from "../components/DashboardPage/Page";
 import { DSL_Dataset as Dataset } from "../components/Dataset/Dataset";
 import { DSL_DataPreview as DataPreview } from "../components/Dataset/DataPreview";
-import { DSL_Transform as Transform } from "../components/Dataset/Transform";
+import { Transform } from "../components/Dataset/Transform";
 import { DSL_Filter as Filter } from "../components/Dataset/Filter";
 import { Provider } from "../components/Dataset/Provider";
 import { useAllDatasets, useDataset, useDatasets } from "../components/Dataset/hooks";
@@ -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.17.0",
   "private": false,
   "description": "Build dashboards with JSX/TSX",
   "main": "dist/index.js",