@iotready/nextjs-components-library 1.0.0-preview25 → 1.0.0-preview27

package/components/charts/TrendChart.d.ts

@@ -10,15 +10,27 @@ type Measure = {
     unit: string;
     stepped: boolean;
 };
-declare const TrendChart: ({ deviceId, measures1, annotationsDataFn, measures2, enableDatePicker, handleGetInfluxData, handleGetDwSlotsCB, handleExportDataCB, theme, initialTimeStart, initialTimeEnd }: {
-    deviceId: string;
+declare const TrendChart: ({ filter, measures1, annotationsDataFn, measures2, enableDatePicker, handleGetInfluxData, handleGetDwSlotsCB, handleExportDataCB, theme, initialTimeStart, initialTimeEnd }: {
+    filter: {
+        field: string;
+        value: string;
+    };
     annotationsDataFn?: () => Promise<any>;
     measures1?: Array<Measure>;
     measures2?: Array<Measure>;
     enableDatePicker: boolean;
-    handleGetInfluxData: (measure: string, timeStart: number, timeEnd: number, deviceId: string, timeGroup: string, raw: boolean, fill?: InfluxFillType, filterTag?: number, includeTag?: FilterTagMode) => Promise<any>;
-    handleGetDwSlotsCB?: (timeStart: number, timeEnd: number, deviceID: string) => Promise<any>;
-    handleExportDataCB?: (measure: string, timeStart: number, timeEnd: number, deviceId: string) => Promise<any>;
+    handleGetInfluxData: (measure: string, timeStart: number, timeEnd: number, filter: {
+        field: string;
+        value: string;
+    }, timeGroup: string, raw: boolean, fill?: InfluxFillType, filterTag?: number, includeTag?: FilterTagMode) => Promise<any>;
+    handleGetDwSlotsCB?: (timeStart: number, timeEnd: number, filter: {
+        field: string;
+        value: string;
+    }) => Promise<any>;
+    handleExportDataCB?: (measure: string, timeStart: number, timeEnd: number, filter: {
+        field: string;
+        value: string;
+    }) => Promise<any>;
     theme: Theme;
     initialTimeStart?: number;
     initialTimeEnd?: number;

package/components/charts/TrendChart.js

@@ -184,7 +184,7 @@ function getCsvData(data, measures) {
         .join('\n');
 }
 // eslint-disable-next-line no-unused-vars
-const TrendChart = ({ deviceId, measures1, annotationsDataFn, measures2, enableDatePicker, handleGetInfluxData, handleGetDwSlotsCB, handleExportDataCB, theme, initialTimeStart, initialTimeEnd }) => {
+const TrendChart = ({ filter, measures1, annotationsDataFn, measures2, enableDatePicker, handleGetInfluxData, handleGetDwSlotsCB, handleExportDataCB, theme, initialTimeStart, initialTimeEnd }) => {
     const [chartJsLoaded, setChartJsLoaded] = useState(false);
     // Dichiarazione di annotationsData come funzione che ritorna una Promise<any>
     const [annotationsData, setAnnotationsData] = useState(null);
@@ -297,7 +297,7 @@ const TrendChart = ({ deviceId, measures1, annotationsDataFn, measures2, enableD
         setLoadingButton(true);
         if (handleExportDataCB) {
             const data = await Promise.all(measures.map(async (measure) => {
-                return await handleExportDataCB(measure.name, timeStart, timeEnd, deviceId);
+                return await handleExportDataCB(measure.name, timeStart, timeEnd, filter);
             }));
             const csvData = getCsvData(data, measures);
             setCsvData(csvData);
@@ -336,7 +336,7 @@ const TrendChart = ({ deviceId, measures1, annotationsDataFn, measures2, enableD
         const rawQuery = intervalInSeconds < 86400;
         let tempSlots = [];
         if (handleGetDwSlotsCB) {
-            const dwValues = await handleGetDwSlotsCB(timeStart, timeEnd, deviceId);
+            const dwValues = await handleGetDwSlotsCB(timeStart, timeEnd, filter);
             tempSlots = getDwSlotsFromValues(dwValues);
         }
         // Combine measures and track their source
@@ -351,7 +351,7 @@ const TrendChart = ({ deviceId, measures1, annotationsDataFn, measures2, enableD
             if (measure.dwPolltime) {
                 const dwPolltime = getPollTime(intervalInSeconds, measure.dwPolltime);
                 // Query DW solo tag=100
-                const rawDwPoints = await handleGetInfluxData(measure.name, timeStart, timeEnd, deviceId, dwPolltime, false, "previous", 100, FilterTagMode.DW);
+                const rawDwPoints = await handleGetInfluxData(measure.name, timeStart, timeEnd, filter, dwPolltime, false, "previous", 100, FilterTagMode.DW);
                 dwSlots = tempSlots;
                 if (dwSlots.length > 0) {
                     dwPoints = rawDwPoints.filter((p) => dwSlots.some(slot => p.x >= slot.start && p.x <= slot.end));
@@ -360,7 +360,7 @@ const TrendChart = ({ deviceId, measures1, annotationsDataFn, measures2, enableD
                     dwPoints = rawDwPoints;
                 }
             }
-            const stdPoints = await handleGetInfluxData(measure.name, timeStart, timeEnd, deviceId, polltime, !measure.polltime && rawQuery, !measure.polltime ? "none" : "null", 100, FilterTagMode.Exclude);
+            const stdPoints = await handleGetInfluxData(measure.name, timeStart, timeEnd, filter, polltime, !measure.polltime && rawQuery, !measure.polltime ? "none" : "null", 100, FilterTagMode.Exclude);
             const filtered = dwSlots.length
                 ? stdPoints.filter((p) => !dwSlots.some(slot => p.x >= slot.start && p.x <= slot.end))
                 : stdPoints;

package/components/groups/GroupsDevices.d.ts

@@ -1,6 +1,6 @@
 import { Theme } from "@emotion/react";
 import { UserType, AssetType, DevicePositionType, TrackleDeviceType } from "../../types";
-declare const GroupsDevices: ({ userInfo, handleGetUsersList, handleAddUserToGroup, handleRemoveUserFromGroup, handleGetGroups, handleGetUsersGroup, handleGetDevices, handleUpdateDevice, handleGetPositions, handleAddDevicesToGroup, handleRemoveDevicesFromGroup, handleCreateGroup, handleDeleteGroup, handleUpdateGroup, group, columnsArray, containerDataGrid, props, propsDatagrid, loadingComponent, containerProps, enableMaps, mapsHeight, mapsClickCallback, theme, confirmMui, propsHeaderGroups, forceGetDevices, groupsLabelAll }: {
+declare const GroupsDevices: ({ userInfo, handleGetUsersList, handleAddUserToGroup, handleRemoveUserFromGroup, handleGetGroups, handleGetUsersGroup, handleGetDevices, handleUpdateDevice, handleGetPositions, handleAddDevicesToGroup, handleRemoveDevicesFromGroup, handleCreateGroup, handleDeleteGroup, handleUpdateGroup, group, columnsArray, containerDataGrid, props, propsDatagrid, loadingComponent, containerProps, enableMaps, mapsHeight, mapsClickCallback, theme, confirmMui, propsHeaderGroups, forceGetDevices, customToolbar, groupsLabelAll }: {
     userInfo: UserType;
     handleGetUsersList: ({ page, pageSize }: {
         page: number;
@@ -33,7 +33,8 @@ declare const GroupsDevices: ({ userInfo, handleGetUsersList, handleAddUserToGro
     mapsClickCallback?: (position: DevicePositionType) => void;
     theme: Theme;
     confirmMui?: (options?: any) => Promise<void>;
-    forceGetDevices: number;
+    forceGetDevices?: number;
+    customToolbar?: string[];
     groupsLabelAll?: string;
 }) => string | number | bigint | boolean | import("react/jsx-runtime").JSX.Element | Iterable<import("react").ReactNode> | Promise<import("react").AwaitedReactNode> | null;
 export default GroupsDevices;

package/components/groups/GroupsDevices.js

@@ -1,7 +1,7 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box, CircularProgress, Autocomplete, TextField, Input, IconButton, Button, Card, CardContent, CardHeader, Modal, Typography, Stack, Tab } from "@mui/material";
-import { cloneElement, isValidElement, useEffect, useMemo, useState } from "react";
+import { cloneElement, isValidElement, useEffect, useMemo, useRef, useState } from "react";
 import AddIcon from '@mui/icons-material/Add';
 import PlaylistAddIcon from '@mui/icons-material/PlaylistAdd';
 import EditIcon from '@mui/icons-material/Edit';
@@ -10,12 +10,12 @@ import ReadMoreIcon from '@mui/icons-material/ReadMore';
 import PlaylistRemoveIcon from '@mui/icons-material/PlaylistRemove';
 import CloseIcon from '@mui/icons-material/Close';
 import { LoadingButton, TabContext, TabList, TabPanel } from "@mui/lab";
-import { DataGrid, GridToolbar } from "@mui/x-data-grid";
+import { DataGrid, GridToolbar, GridToolbarExport, GridToolbarQuickFilter } from "@mui/x-data-grid";
 import GroupUpdate from "./GroupUpdate";
 import BackIcon from '@mui/icons-material/ArrowBack';
 import dynamic from "next/dynamic";
 import { ThemeProvider } from '@mui/material/styles';
-const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, handleRemoveUserFromGroup, handleGetGroups, handleGetUsersGroup, handleGetDevices, handleUpdateDevice, handleGetPositions, handleAddDevicesToGroup, handleRemoveDevicesFromGroup, handleCreateGroup, handleDeleteGroup, handleUpdateGroup, group = 'all', columnsArray = [], containerDataGrid = 'Card', props = {}, propsDatagrid = {}, loadingComponent = _jsx(CircularProgress, {}), containerProps = {}, enableMaps = true, mapsHeight = '400px', mapsClickCallback = () => { }, theme, confirmMui, propsHeaderGroups, forceGetDevices, groupsLabelAll }) => {
+const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, handleRemoveUserFromGroup, handleGetGroups, handleGetUsersGroup, handleGetDevices, handleUpdateDevice, handleGetPositions, handleAddDevicesToGroup, handleRemoveDevicesFromGroup, handleCreateGroup, handleDeleteGroup, handleUpdateGroup, group = 'all', columnsArray = [], containerDataGrid = 'Card', props = {}, propsDatagrid = {}, loadingComponent = _jsx(CircularProgress, {}), containerProps = {}, enableMaps = true, mapsHeight = '400px', mapsClickCallback = () => { }, theme, confirmMui, propsHeaderGroups, forceGetDevices, customToolbar, groupsLabelAll }) => {
     const [devices, setDevices] = useState([]);
     const [positions, setPositions] = useState([]);
     const [loadingDevices, setLoadingDevices] = useState(false);
@@ -24,6 +24,7 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
     const [editGroup, setEditGroup] = useState(false);
     const [checkboxSelection, setCheckboxSelection] = useState(false);
     const [devicesToAdd, setDevicesToAdd] = useState([]);
+    const [deviceSelectedObjs, setDeviceSelectedObjs] = useState([]);
     const [currentGroup, setCurrentGroup] = useState(group);
     const [selectedGroup, setSelectedGroup] = useState(group);
     const [groups, setGroups] = useState(null);
@@ -35,6 +36,7 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
     const [description, setDescription] = useState('');
     const [groupUpdateVisible, setGroupUpdateVisible] = useState(false);
     const [valueTab, setValueTab] = useState('1');
+    const clickedIdRef = useRef(null);
     const handleChangeTab = (event, newValue) => {
         setValueTab(newValue);
     };
@@ -178,8 +180,7 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
     const addToSelectedGroup = async () => {
         setLoadingGroups(true);
         try {
-            const devicesToPatch = devices.filter((row) => devicesToAdd.includes(row.id));
-            await handleAddDevicesToGroup(userInfo, selectedGroup, devicesToPatch);
+            await handleAddDevicesToGroup(userInfo, selectedGroup, deviceSelectedObjs);
             setLoadingGroups(false);
             setCurrentGroup(selectedGroup);
             setDevicesToAdd([...[]]);
@@ -195,8 +196,7 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
     const removeFromCurrentGroup = async () => {
         setLoadingGroups(true);
         try {
-            const devicesToRemove = devices.filter((row) => devicesToAdd.includes(row.id));
-            await handleRemoveDevicesFromGroup(userInfo, selectedGroup, devicesToRemove);
+            await handleRemoveDevicesFromGroup(userInfo, selectedGroup, deviceSelectedObjs);
             setLoadingGroups(false);
             setDevicesToAdd([]);
             fetchDevices(currentGroup, selectedGroup);
@@ -216,14 +216,62 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
         setCheckboxSelection(!checkboxSelection);
     };
     const renderMaps = (_jsx(Map, { positions: positions, mapsClickCallback: mapsClickCallback, height: mapsHeight }));
-    const renderDataGrid = (_jsx("div", { style: { display: 'flex', flexDirection: 'column', minHeight: 323 }, children: _jsx(DataGrid, { checkboxSelection: checkboxSelection, onRowSelectionModelChange: (ids) => {
-                if (checkboxSelection) {
-                    setDevicesToAdd(ids);
-                }
-            }, rowSelectionModel: devicesToAdd, disableDensitySelector: true, disableColumnSelector: true, disableRowSelectionOnClick: true, loading: loadingDevices, rows: devices, columns: checkboxSelection ? columnsArray.filter(col => col.field !== 'id') : columnsArray, slots: {
-                noRowsOverlay: () => (_jsx(Stack, { height: "100%", alignItems: "center", justifyContent: "center", children: currentGroup !== 'all' ? _jsxs(_Fragment, { children: [_jsx(Box, { children: "No devices in group" }), editGroup ? _jsxs(Button, { onClick: () => addDevicesToCurrentGroup(), variant: "outlined", color: "primary", size: "small", sx: { mt: 2 }, children: [_jsx(PlaylistAddIcon, { fontSize: "small", sx: { mr: 1 } }), " Add devices"] }) : ''] }) : "No devices" })),
+    useEffect(() => {
+        if (devicesToAdd.length <= 0) {
+            setDeviceSelectedObjs([]);
+        }
+    }, [devicesToAdd]);
+    const CustomToolbar = () => (_jsxs("div", { style: { display: 'flex', padding: '8px', justifyContent: 'space-between', paddingTop: '2px' }, children: [_jsxs("div", { style: { display: 'flex', gap: 8, marginRight: '20px' }, children: [customToolbar && customToolbar.includes('filters') ?
+                        _jsx(GridToolbarExport, { sx: { mr: 2 } })
+                        : '', customToolbar && customToolbar.includes('export') ?
+                        _jsx(GridToolbarExport, {})
+                        : ''] }), customToolbar && customToolbar.includes('quickfilter') && _jsx(GridToolbarQuickFilter, {})] }));
+    const renderDataGrid = (_jsx("div", { style: { display: 'flex', flexDirection: 'column', minHeight: 323 }, children: _jsx(DataGrid, { checkboxSelection: checkboxSelection, 
+            // Se siamo in modalità aggiunta, includi gli ID già nel gruppo
+            rowSelectionModel: (checkboxSelection && currentGroup === 'all')
+                ? [
+                    ...devices
+                        .filter(d => d.groups?.includes(selectedGroup))
+                        .map(d => d.id.toString()),
+                    ...devicesToAdd,
+                ]
+                : devicesToAdd, 
+            // Se siamo in modalità aggiunta, disabilita la selezione per i già nel gruppo
+            isRowSelectable: params => {
+                return (checkboxSelection && currentGroup === 'all')
+                    ? !params.row.groups?.includes(selectedGroup)
+                    : true;
+            }, onCellClick: (params) => {
+                clickedIdRef.current = params.id.toString(); // aggiornamento immediato
+            }, onRowSelectionModelChange: (ids) => {
+                if (!checkboxSelection || !clickedIdRef.current)
+                    return;
+                const clickedId = clickedIdRef.current;
+                clickedIdRef.current = null; // resetta subito dopo l’uso
+                setDevicesToAdd(prevIds => {
+                    const updated = prevIds.includes(clickedId)
+                        ? prevIds.filter(id => id !== clickedId)
+                        : [...prevIds, clickedId];
+                    return updated;
+                });
+                setDeviceSelectedObjs(prevObjs => {
+                    const isDeselecting = prevObjs.some(d => d.id.toString() === clickedId);
+                    if (isDeselecting) {
+                        return prevObjs.filter(d => d.id.toString() !== clickedId);
+                    }
+                    else {
+                        const device = devices.find(d => d.id.toString() === clickedId);
+                        return device ? [...prevObjs, device] : prevObjs;
+                    }
+                });
+            }, disableDensitySelector: true, disableColumnSelector: true, disableRowSelectionOnClick: true, loading: loadingDevices, rows: devices, columns: checkboxSelection
+                ? columnsArray.filter(col => col.field !== 'id')
+                : columnsArray, slots: {
+                noRowsOverlay: () => (_jsx(Stack, { height: "100%", alignItems: "center", justifyContent: "center", children: currentGroup !== 'all'
+                        ? (_jsxs(_Fragment, { children: [_jsx(Box, { children: "No devices in group" }), editGroup && (_jsxs(Button, { onClick: addDevicesToCurrentGroup, variant: "outlined", color: "primary", size: "small", sx: { mt: 2 }, children: [_jsx(PlaylistAddIcon, { fontSize: "small", sx: { mr: 1 } }), "Add devices"] }))] }))
+                        : "No devices" })),
                 noResultsOverlay: () => (_jsx(Stack, { height: "100%", alignItems: "center", justifyContent: "center", children: "Filter returns no result" })),
-                toolbar: GridToolbar,
+                toolbar: customToolbar && customToolbar.length ? CustomToolbar : GridToolbar,
             }, slotProps: {
                 toolbar: {
                     showQuickFilter: true,
@@ -234,7 +282,7 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
                 sorting: {
                     sortModel: [{ field: 'online', sort: 'desc' }],
                 },
-                pagination: { paginationModel: { pageSize: 100 } }
+                pagination: { paginationModel: { pageSize: 100 } },
             }, ...propsDatagrid }) }));
     const renderTabContext = (_jsxs(TabContext, { value: valueTab, children: [_jsx(Box, { sx: { borderBottom: 1, borderColor: 'divider' }, children: _jsxs(TabList, { onChange: handleChangeTab, sx: { minHeight: 20 }, children: [_jsx(Tab, { label: "List", value: "1", sx: { minHeight: 20 } }), _jsx(Tab, { label: "Map", value: "2", sx: { minHeight: 20 } })] }) }), _jsx(TabPanel, { value: "1", sx: { p: 0 }, children: renderDataGrid }), _jsx(TabPanel, { value: "2", sx: { p: 0 }, children: renderMaps })] }));
     const renderDatagridAndMaps = (enableMaps ?

package/components/settings/DynamicMenu.d.ts

@@ -1,5 +1,6 @@
 import { SvgIconProps } from "@mui/material/SvgIcon";
 import { Theme } from "@emotion/react";
+import React from "react";
 interface MenuItem {
     name: string;
     description: string;

package/components/settings/DynamicMenu.js

@@ -4,6 +4,7 @@ import { createElement, useState } from "react";
 import { Box, Card, CardContent, List, ListItemButton, ListItemText, styled, ThemeProvider } from "@mui/material";
 import Grid from "@mui/material/Grid2";
 import NavigateNextIcon from "@mui/icons-material/NavigateNext";
+import React from "react";
 const ListItemButtonSettings = styled(ListItemButton)(({ theme, selected }) => ({
     backgroundColor: theme.palette.primary.main,
     color: theme.palette.primary.contrastText,
@@ -37,6 +38,6 @@ const DynamicMenu = ({ menuItems, selectedIndex = null, theme }) => {
     const handleMenuClick = (index) => {
         setSelected(index); // Assicurati di non chiamarlo nel rendering
     };
-    return (_jsx(ThemeProvider, { theme: theme, children: _jsx(Grid, { container: true, spacing: 2, sx: { width: '100%' }, children: _jsx(Grid, { size: { xs: 12, lg: 9 }, children: _jsx(Card, { sx: { borderRadius: 2 }, children: _jsx(CardContent, { sx: { p: 0, "&:last-child": { p: 0 } }, children: _jsxs(Grid, { container: true, spacing: 2, children: [_jsx(Grid, { size: { xs: 12, sm: 4 }, sx: { display: { xs: selected !== null ? 'none' : 'block', sm: 'block' } }, children: _jsx(List, { sx: { p: 0, height: "100%", backgroundColor: "primary.main" }, children: menuItems.map((item, index) => (_jsxs(ListItemButtonSettings, { selected: selected === index, onClick: () => handleMenuClick(index), children: [item.icon && _jsx(Box, { sx: { mr: 2 }, children: item.icon }), _jsx(ListItemText, { primary: _jsx("b", { children: item.name }), secondary: item.description }), _jsx(NavigateNextIcon, { sx: { display: { xs: "block", sm: "none" } } })] }, index))) }) }), _jsx(Grid, { size: { xs: 12, sm: 8, md: 6 }, sx: { display: { xs: selected === null ? 'none' : 'block', sm: 'block' } }, children: _jsx(Box, { component: "div", sx: { p: { xs: 2 }, py: { sm: 3 } }, children: selected !== null ? createElement(menuItems[selected].page, { handleBack: () => { setSelected(null); } }) : "" }) })] }) }) }) }) }) }));
+    return (_jsx(ThemeProvider, { theme: theme, children: _jsx(Grid, { container: true, spacing: 2, sx: { width: '100%' }, children: _jsx(Grid, { size: { xs: 12, lg: 9 }, children: _jsx(Card, { sx: { borderRadius: 2 }, children: _jsx(CardContent, { sx: { p: 0, "&:last-child": { p: 0 } }, children: _jsxs(Grid, { container: true, spacing: 2, children: [_jsx(Grid, { size: { xs: 12, sm: 4 }, sx: { display: { xs: selected !== null ? 'none' : 'block', sm: 'block' } }, children: _jsx(List, { sx: { p: 0, height: "100%", backgroundColor: "primary.main" }, children: menuItems.map((item, index) => (_jsxs(ListItemButtonSettings, { selected: selected === index, onClick: () => handleMenuClick(index), children: [item.icon && _jsx(Box, { sx: { mr: 2 }, children: React.isValidElement(item.icon) ? item.icon : null }), _jsx(ListItemText, { primary: _jsx("b", { children: item.name }), secondary: item.description }), _jsx(NavigateNextIcon, { sx: { display: { xs: "block", sm: "none" } } })] }, index))) }) }), _jsx(Grid, { size: { xs: 12, sm: 8, md: 6 }, sx: { display: { xs: selected === null ? 'none' : 'block', sm: 'block' } }, children: _jsx(Box, { component: "div", sx: { p: { xs: 2 }, py: { sm: 3 } }, children: selected !== null ? createElement(menuItems[selected].page, { handleBack: () => { setSelected(null); } }) : "" }) })] }) }) }) }) }) }));
 };
 export default DynamicMenu;

package/package.json

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

package/server-actions/influx.d.ts

@@ -1,5 +1,17 @@
 import { FilterTagMode, InfluxConfig, InfluxFillType } from "./types";
-export declare function getInfluxAlerts(influxConfig: InfluxConfig, fields: string[], limit: number, offset: number, sort: any, deviceID: string, timeStart: number, timeEnd: number): Promise<any>;
-export declare function getDwSlots(influxConfig: InfluxConfig, timeStart: number, timeEnd: number, deviceID: string): Promise<any>;
-export declare function getInfluxDataV1(influxConfig: InfluxConfig, field: string, timeStart: number, timeEnd: number, deviceID: string, timeGroup: string, raw: boolean, fill?: InfluxFillType, filterTag?: number, tagInclude?: FilterTagMode): Promise<any>;
-export declare function exportDataV1(influxConfig: InfluxConfig, field: string, timeStart: number, timeEnd: number, deviceID: string): Promise<any>;
+export declare function getInfluxAlerts(influxConfig: InfluxConfig, fields: string[], limit: number, offset: number, sort: any, filter: {
+    field: string;
+    value: string;
+}, timeStart: number, timeEnd: number): Promise<any>;
+export declare function getDwSlots(influxConfig: InfluxConfig, timeStart: number, timeEnd: number, filter: {
+    field: string;
+    value: string;
+}): Promise<any>;
+export declare function getInfluxDataV1(influxConfig: InfluxConfig, field: string, timeStart: number, timeEnd: number, filter: {
+    field: string;
+    value: string;
+}, timeGroup: string, raw: boolean, fill?: InfluxFillType, filterTag?: number, tagInclude?: FilterTagMode): Promise<any>;
+export declare function exportDataV1(influxConfig: InfluxConfig, field: string, timeStart: number, timeEnd: number, filter: {
+    field: string;
+    value: string;
+}): Promise<any>;

package/server-actions/influx.js

@@ -2,7 +2,7 @@
 import { parse } from "csv-parse";
 import moment from "moment";
 import { FilterTagMode } from "./types";
-export async function getInfluxAlerts(influxConfig, fields, limit, offset, sort, deviceID, timeStart, timeEnd) {
+export async function getInfluxAlerts(influxConfig, fields, limit, offset, sort, filter, timeStart, timeEnd) {
     const conditions = fields
         .map((field) => `r["valueName"] == "${field}"`)
         .join(" or ");
@@ -13,7 +13,7 @@ export async function getInfluxAlerts(influxConfig, fields, limit, offset, sort,
         query += ` |> range(start: ${timeStart}, stop: ${timeEnd})`;
     }
     query += `
-    |> filter(fn: (r) => r["_measurement"] == "${influxConfig.measurement}" and r["deviceid"] == "${deviceID}" and (${conditions}))
+    |> filter(fn: (r) => r["_measurement"] == "${influxConfig.measurement}" and r["${filter.field}"] == "${filter.value}" and (${conditions}))
   `;
     // Add filter for tag d === 3
     query += `
@@ -80,11 +80,11 @@ export async function getInfluxAlerts(influxConfig, fields, limit, offset, sort,
         count: countData
     };
 }
-export async function getDwSlots(influxConfig, timeStart, timeEnd, deviceID) {
+export async function getDwSlots(influxConfig, timeStart, timeEnd, filter) {
     const field = "dw";
     const query = `
     SELECT ("value") FROM "${influxConfig.measurement}"
-    WHERE "deviceid" = '${deviceID}'
+    WHERE "${filter.field}" = '${filter.value}'
     AND "valueName" = '${field}'
     AND time >= '${moment.unix(timeStart).toISOString()}'
     AND time <= '${moment.unix(timeEnd).toISOString()}'
@@ -116,7 +116,7 @@ export async function getDwSlots(influxConfig, timeStart, timeEnd, deviceID) {
     }
     return data; // stessa struttura di Influx, con values modificati
 }
-export async function getInfluxDataV1(influxConfig, field, timeStart, timeEnd, deviceID, timeGroup, raw, fill, filterTag, tagInclude = FilterTagMode.Include) {
+export async function getInfluxDataV1(influxConfig, field, timeStart, timeEnd, filter, timeGroup, raw, fill, filterTag, tagInclude = FilterTagMode.Include) {
     let query;
     let preStartValue = null;
     // Costruzione filtro tag
@@ -135,12 +135,12 @@ export async function getInfluxDataV1(influxConfig, field, timeStart, timeEnd, d
         }
     }
     if (raw) {
-        query = `SELECT ("value") FROM "${influxConfig.measurement}" WHERE "deviceid" = '${deviceID}' AND "valueName" = '${field}'${filterTagCondition} AND time >= '${moment
+        query = `SELECT ("value") FROM "${influxConfig.measurement}" WHERE "${filter.field}" = '${filter.value}' AND "valueName" = '${field}'${filterTagCondition} AND time >= '${moment
             .unix(timeStart)
             .toISOString()}' AND time <= '${moment.unix(timeEnd).toISOString()}'`;
     }
     else {
-        query = `SELECT last("value") FROM "${influxConfig.measurement}" WHERE "deviceid" = '${deviceID}' AND "valueName" = '${field}'${filterTagCondition} AND time >= '${moment
+        query = `SELECT last("value") FROM "${influxConfig.measurement}" WHERE "${filter.field}" = '${filter.value}' AND "valueName" = '${field}'${filterTagCondition} AND time >= '${moment
             .unix(timeStart)
             .toISOString()}' AND time <= '${moment
             .unix(timeEnd)
@@ -157,7 +157,7 @@ export async function getInfluxDataV1(influxConfig, field, timeStart, timeEnd, d
     }
     if (fill !== "null") {
         // Query to get the last data point before timeStart
-        const preStartQuery = `SELECT last("value") FROM "${influxConfig.measurement}" WHERE "deviceid" = '${deviceID}' AND "valueName" = '${field}'${filterTagCondition} AND time < '${moment
+        const preStartQuery = `SELECT last("value") FROM "${influxConfig.measurement}" WHERE "${filter.field}" = '${filter.value}' AND "valueName" = '${field}'${filterTagCondition} AND time < '${moment
             .unix(timeStart)
             .toISOString()}'`;
         const preStartResponse = await fetch(encodeURI(`${influxConfig.url}/query?db=${influxConfig.dbName}&epoch=s&q=${preStartQuery}`), {
@@ -215,8 +215,8 @@ export async function getInfluxDataV1(influxConfig, field, timeStart, timeEnd, d
     }
     return data;
 }
-export async function exportDataV1(influxConfig, field, timeStart, timeEnd, deviceID) {
-    const query = `SELECT ("value") FROM "${influxConfig.measurement}" WHERE "deviceid" = '${deviceID}' AND "valueName" = '${field}' AND time >= '${moment
+export async function exportDataV1(influxConfig, field, timeStart, timeEnd, filter) {
+    const query = `SELECT ("value") FROM "${influxConfig.measurement}" WHERE "${filter.field}" = '${filter.value}' AND "valueName" = '${field}' AND time >= '${moment
         .unix(timeStart)
         .toISOString()}' AND time <= '${moment.unix(timeEnd).toISOString()}'`;
     const response = await fetch(encodeURI(`${influxConfig.url}/query?db=${influxConfig.dbName}&epoch=s&q=${query}`), {