@iotready/nextjs-components-library 1.0.0-preview3 → 1.0.0-preview5

package/components/charts/TrendChart.d.ts

@@ -6,7 +6,7 @@ type Measure = {
     polltime: number;
     unit: string;
 };
-declare const TrendChart: ({ deviceId, measures, enableExportData, enableDatePicker, handleGetInfluxData, handleGetFirstTimestamp, theme, ...props }: {
+declare const TrendChart: ({ deviceId, measures, enableExportData, enableDatePicker, handleGetInfluxData, theme, ...props }: {
     deviceId: string;
     measures: Array<Measure>;
     enableenableExportData: boolean;

package/components/charts/TrendChart.js

@@ -37,7 +37,7 @@ const lineOptions = {
         tooltip: {
             callbacks: {
                 label: (context) => {
-                    return `${context.dataset.label}: ${context.parsed.y.toFixed(2)} ${context.dataset.unit}`;
+                    return `${context.dataset.label}: ${context.parsed.y.toFixed(3)} ${context.dataset.unit}`;
                 }
             },
         },
@@ -162,8 +162,11 @@ function getCsvData(data, measures) {
             });
         });
     });
-    // Create rows from timestampMap
-    Object.values(timestampMap).forEach((entry) => {
+    // Sort timestamps in ascending order
+    const sortedTimestamps = Object.keys(timestampMap).sort((a, b) => new Date(a).getTime() - new Date(b).getTime());
+    // Create rows from sorted timestampMap
+    sortedTimestamps.forEach(timestamp => {
+        const entry = timestampMap[timestamp];
         const row = [entry.timestamp];
         measures.forEach(measure => {
             // Push the corresponding value or an empty string if undefined
@@ -171,7 +174,7 @@ function getCsvData(data, measures) {
         });
         // Check if the row contains only empty values (besides the timestamp)
         const hasNonEmptyValues = row.slice(1).some(value => value !== null && value !== '' && value !== undefined);
-        // If the row has at least one non-empty value or just the timestamp, add it to csvData
+        // If the row has at least one non-empty value, add it to csvData
         if (hasNonEmptyValues || row.length === 1) {
             csvData.push(row);
         }
@@ -180,16 +183,18 @@ function getCsvData(data, measures) {
     return csvData.map(row => row.join(',')).join('\n');
 }
 // eslint-disable-next-line no-unused-vars
-const TrendChart = ({ deviceId, measures, enableExportData, enableDatePicker, handleGetInfluxData, handleGetFirstTimestamp, theme, ...props }) => {
+const TrendChart = ({ deviceId, measures, enableExportData, enableDatePicker, handleGetInfluxData, theme, ...props }) => {
     const [chartJsLoaded, setChartJsLoaded] = useState(false);
     const [dataMeasures, setDataMeasures] = useState(null);
     const [chartPeriod, setChartPeriod] = useState('1D');
     const [chartPeriodConfig, setChartPeriodConfig] = useState(chartConfigByPeriod['1D']);
     const [chartLoading, setChartLoading] = useState(false);
+    const [timeStartPicker, setTimeStartPicker] = useState(moment().subtract(1, 'day').unix());
     const [timeStart, setTimeStart] = useState(moment().subtract(1, 'day').unix());
     const [timeEnd, setTimeEnd] = useState(moment().unix());
-    const [firstTimestamp, setFirstTimestamp] = useState();
     const [datePickerUsed, setDatePickerUsed] = useState(false);
+    const [pickerTimeStart, setPickerTimeStart] = useState(moment().subtract(1, 'day').unix());
+    const [pickerTimeEnd, setPickerTimeEnd] = useState(moment().unix());
     const [loadingButton, setLoadingButton] = useState(false);
     const csvLinkRef = useRef(null);
     const [csvData, setCsvData] = useState('');
@@ -244,7 +249,7 @@ const TrendChart = ({ deviceId, measures, enableExportData, enableDatePicker, ha
         setDatePickerUsed(false);
         setCsvData('');
         if (newPeriod === "ALL") {
-            setTimeStart(firstTimestamp - 86400);
+            setTimeStart(1577854800);
             setTimeEnd(moment().unix());
             setChartPeriod(newPeriod);
             return;
@@ -259,10 +264,8 @@ const TrendChart = ({ deviceId, measures, enableExportData, enableDatePicker, ha
     };
     const handleExportData = async () => {
         setLoadingButton(true);
-        const intervalInSeconds = timeEnd - timeStart;
         const data = await Promise.all(measures.map(async (measure) => {
-            const polltime = getPollTime(intervalInSeconds, measure.polltime);
-            return await handleGetInfluxData(measure.name, timeStart, timeEnd, deviceId, polltime, true);
+            return await handleGetInfluxData(measure.name, timeStart, timeEnd, deviceId, "0s", true);
         }));
         const csvData = getCsvData(data, measures);
         setCsvData(csvData);
@@ -275,22 +278,22 @@ const TrendChart = ({ deviceId, measures, enableExportData, enableDatePicker, ha
     }, [csvData]);
     const loadDatasets = async (chartPeriod) => {
         setChartLoading(true);
-        const intervalInSeconds = timeEnd - timeStart;
+        let intervalInSeconds = chartPeriod === "ALL" && !datePickerUsed && !zoomed ? 31536000 : timeEnd - timeStart;
+        const rawQuery = intervalInSeconds < 86400; // 
         // Inizializza un array di promesse per ottenere i dati per ciascuna misura
         const datasetsPromises = measures.map(async (measure) => {
-            const polltime = getPollTime(intervalInSeconds, measure.polltime);
-            const influxData = await handleGetInfluxData(measure.name, timeStart, timeEnd, deviceId, polltime, false);
+            const polltime = getPollTime(intervalInSeconds, measure.polltime || 30);
+            const influxData = await handleGetInfluxData(measure.name, timeStart, timeEnd, deviceId, polltime, !measure.polltime && rawQuery);
             const points = GetPoints(influxData);
             return {
                 label: measure.name,
                 data: points,
                 unit: measure.unit,
-                // borderColor: `hsl(${index * 50}, 70%, 50%)`, // Colore unico per ogni dataset
                 borderWidth: 2,
                 pointRadius: 1,
                 pointHoverRadius: 5,
                 pointHoverBackgroundColor: 'rgba(52, 125, 236, 0.5)',
-                // spanGaps: false,
+                // showLine: measure.polltime ? true : false, //<- set this
                 fill: false
             };
         });
@@ -298,15 +301,21 @@ const TrendChart = ({ deviceId, measures, enableExportData, enableDatePicker, ha
         const datasets = await Promise.all(datasetsPromises);
         let min = null;
         let max = null;
-        let values = [];
+        let time;
+        let minTime = null;
         datasets.forEach(dataset => {
-            values = [...values, ...dataset.data.map((point) => point.y).filter((data) => data !== null)];
+            const values = dataset.data.map((point) => point.y).filter((data) => data !== null);
+            if (chartPeriod === "ALL" && !datePickerUsed && !zoomed && values.length) {
+                time = dataset.data.filter((data) => data.y !== null).map((data) => data.x)[0];
+            }
             const datasetMin = Math.min(...values);
             const datasetMax = Math.max(...values);
             if (min === null || datasetMin < min)
                 min = datasetMin;
             if (max === null || datasetMax > max)
                 max = datasetMax;
+            if (time && (minTime === null || time.unix() < minTime))
+                minTime = time.unix() - 86400;
         });
         let paddedMin = null;
         let paddedMax = null;
@@ -316,6 +325,7 @@ const TrendChart = ({ deviceId, measures, enableExportData, enableDatePicker, ha
             paddedMax = max + diff;
         }
         setDataMeasures([...datasets]);
+        setTimeStartPicker(minTime || timeStart);
         setOptions({
             ...options,
             scales: {
@@ -327,27 +337,14 @@ const TrendChart = ({ deviceId, measures, enableExportData, enableDatePicker, ha
                 },
                 x: {
                     ...options.scales.x,
-                    min: moment.unix(timeStart).toString(),
-                    max: moment.unix(timeEnd).toString(),
-                    time: {
-                        ...options.scales.x.time,
-                        unit: chartPeriod.scaleUnit
-                    }
+                    min: moment.unix(minTime || timeStart).toString(),
+                    max: moment.unix(timeEnd).toString()
                 }
             }
         });
     };
     useEffect(() => {
-        const fetchFirstTimestamp = async () => {
-            const response = await handleGetFirstTimestamp(deviceId);
-            if (response) {
-                setFirstTimestamp(response);
-            }
-        };
-        fetchFirstTimestamp();
-    }, []);
-    useEffect(() => {
-        const timeDifference = Math.abs(moment(timeStart).valueOf() - moment(timeEnd).valueOf()); // Convert milliseconds to seconds
+        const timeDifference = Math.abs(moment(timeEnd).valueOf() - moment(timeStart).valueOf()); // Convert milliseconds to seconds
         let newChartPeriod = '1D'; // Default to 1 day
         if (timeDifference < 86400) { // Less than 1 day
             newChartPeriod = '1H'; // Set to 1 day
@@ -355,16 +352,16 @@ const TrendChart = ({ deviceId, measures, enableExportData, enableDatePicker, ha
         else if (timeDifference < 604800) { // Less than 1 week
             newChartPeriod = '1D'; // Set to 1 day
         }
-        else if (timeDifference < 2629800) { // Less than 1 month
+        else if (timeDifference < 2678400) { // Less than 1 month
             newChartPeriod = '1W'; // Set to 1 week
         }
-        else if (timeDifference < 7889400) { // Less than 3 months
+        else if (timeDifference < 8035200) { // Less than 3 months
             newChartPeriod = '1M'; // Set to 1 month
         }
-        else if (timeDifference < 15778440) { // Less than 6 months
+        else if (timeDifference < 16070400) { // Less than 6 months
             newChartPeriod = '3M'; // Set to 3 months
         }
-        else if (timeDifference < 31556926) { // Less than 1 year
+        else if (timeDifference < 31536000) { // Less than 1 year
             newChartPeriod = '6M'; // Set to 6 months
         }
         else {
@@ -403,16 +400,18 @@ const TrendChart = ({ deviceId, measures, enableExportData, enableDatePicker, ha
         loadZoomPlugin();
         resetChart();
     }, []);
-    const datePicker = _jsx(Box, { sx: { display: 'flex', alignItems: 'center', mr: { xs: 0, lg: 2 } }, children: _jsxs(LocalizationProvider, { dateAdapter: AdapterMoment, adapterLocale: "it", children: [_jsx(DateTimePicker, { value: moment(timeStart * 1000), 
-                    // format="DD/MM/YY hh:mm A"
-                    onChange: (newValue) => {
-                        setTimeStart((moment(newValue).unix()));
+    const datePicker = _jsx(Box, { sx: { display: 'flex', alignItems: 'center', mr: { xs: 0, lg: 2 } }, children: _jsxs(LocalizationProvider, { dateAdapter: AdapterMoment, adapterLocale: "it", children: [_jsx(DateTimePicker, { value: moment(timeStartPicker * 1000), onChange: (newValue) => {
+                        setDatePickerUsed(true);
+                        setZoomed(false);
+                        setPickerTimeStart(moment(newValue).unix());
+                        setTimeStart(moment(newValue).unix());
                     }, maxDateTime: moment(timeEnd * 1000), slotProps: {
                         textField: { size: 'small', sx: { width: { sm: 210 } } }
-                    } }), " \u00A0\u00A0 ", _jsx(Box, { children: "\u2013" }), " \u00A0\u00A0", _jsx(DateTimePicker, { value: moment(timeEnd * 1000), 
-                    // format="DD/MM/YY hh:mm A"
-                    onChange: (newValue) => {
-                        setTimeEnd((moment(newValue).unix()));
+                    } }), " \u00A0\u00A0 ", _jsx(Box, { children: "\u2013" }), " \u00A0\u00A0", _jsx(DateTimePicker, { value: moment(timeEnd * 1000), onChange: (newValue) => {
+                        setDatePickerUsed(true);
+                        setZoomed(false);
+                        setPickerTimeEnd(moment(newValue).unix());
+                        setTimeEnd(moment(newValue).unix());
                     }, minDateTime: moment(timeStart * 1000), slotProps: {
                         textField: { size: 'small', sx: { width: { sm: 210 } } }
                     } })] }) });
@@ -421,16 +420,18 @@ const TrendChart = ({ deviceId, measures, enableExportData, enableDatePicker, ha
                                     , { 
                                         //@ts-ignore
                                         ref: csvLinkRef, data: csvData, filename: `export_${moment().toISOString()}.csv`, separator: ';' })] })), zoomed && (_jsxs(Button, { sx: { minWidth: '40px !important', boxShadow: 1, px: 1 }, variant: "contained", color: "secondary", size: 'small', onClick: () => {
-                                    if (datePickerUsed) {
-                                        setZoomed(false);
-                                    }
-                                    else if (chartPeriod === "ALL") {
-                                        setZoomed(false);
+                                    setZoomed(false);
+                                    if (chartPeriod === "ALL") {
+                                        setDatePickerUsed(false);
+                                        setTimeStart(1577854800);
                                         setTimeEnd(moment().unix());
-                                        setTimeStart(firstTimestamp - 86400);
+                                    }
+                                    else if (datePickerUsed) {
+                                        setTimeStart(pickerTimeStart);
+                                        setTimeEnd(pickerTimeEnd);
                                     }
                                     else {
-                                        setZoomed(false);
+                                        setDatePickerUsed(false);
                                         setChartPeriodConfig(chartConfigByPeriod[chartPeriod]);
                                         setTimeStart(chartPeriodConfig.from?.days
                                             ? moment()
@@ -439,7 +440,7 @@ const TrendChart = ({ deviceId, measures, enableExportData, enableDatePicker, ha
                                             : moment().subtract(1, 'day').unix());
                                         setTimeEnd(moment().unix());
                                     }
-                                }, children: [_jsx(ZoomOut, { fontSize: 'small' }), _jsx(Box, { sx: { display: { xs: 'none', xl: 'block' }, ml: { md: 1 } }, children: "Reset" })] }))] }), _jsxs(Box, { sx: { display: 'flex', justifyContent: 'flex-end' }, children: [enableDatePicker && _jsx(Box, { sx: { display: { xs: 'none', lg: 'flex' } }, children: datePicker }), _jsxs(ToggleButtonGroup, { color: "primary", value: chartPeriod, exclusive: true, onChange: handleChange, size: "small", 
+                                }, children: [_jsx(ZoomOut, { fontSize: 'small' }), _jsx(Box, { sx: { display: { xs: 'none', lg: 'block' }, ml: { md: 1 } }, children: "Reset" })] }))] }), _jsxs(Box, { sx: { display: 'flex', justifyContent: 'flex-end' }, children: [enableDatePicker && _jsx(Box, { sx: { display: { xs: 'none', lg: 'flex' } }, children: datePicker }), _jsxs(ToggleButtonGroup, { color: "primary", value: !datePickerUsed && !zoomed ? chartPeriod : null, exclusive: true, onChange: handleChange, size: "small", 
                                 // sx={{ boxShadow: 1 }}
                                 disabled: chartLoading, children: [_jsx(ToggleButton, { value: "1D", sx: { px: 1 }, children: "1d" }), _jsx(ToggleButton, { value: "1W", sx: { px: 1 }, children: "1w" }), _jsx(ToggleButton, { value: "1M", sx: { px: 1 }, children: "1M" }), _jsx(ToggleButton, { value: "3M", sx: { px: 1 }, children: "3M" }), _jsx(ToggleButton, { value: "6M", sx: { px: 1 }, children: "6M" }), _jsx(ToggleButton, { value: "1Y", sx: { px: 1 }, children: "1Y" }), _jsx(ToggleButton, { value: "ALL", sx: { px: 1 }, children: "ALL" })] }), _jsx(MuiTooltip, { placement: "top", arrow: true, title: "Connect point values", children: _jsx(ToggleButton, { value: "check", color: "primary", size: "small", selected: spanGapsOption, disabled: chartLoading, onChange: () => handleSpanGaps(!spanGapsOption), sx: { ml: 2 }, children: _jsx(TimelineIcon, {}) }) })] })] }), _jsx(Box, { component: 'div', className: "chart-container", sx: { height: { xs: enableDatePicker && props.height ? `calc(${props.height} - 50px)` : props.height, lg: props.height }, minHeight: 300, mt: 2 }, children: chartJsLoaded && !chartLoading && typeof window !== 'undefined' ?
                     _jsx(_Fragment, { children: dataMeasures && dataMeasures[0]?.data?.length ?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iotready/nextjs-components-library",
-  "version": "1.0.0-preview3",
+  "version": "1.0.0-preview5",
   "main": "index.js",
   "scripts": {
     "build": "rm -rf dist && tsc --project tsconfig.build.json && cp package.json dist/",