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

package/components/groups/GroupUpdate.d.ts

@@ -1,18 +1,14 @@
-import { UserType } from '../../types';
-declare const GroupUpdate: ({ userInfo, groupInfo, usersGroup, usersList, devicesList, handleAddUserToGroup, handleRemoveUserFromGroup, handleGetGroups, handleUpdateGroup, handleUpdateDevice, handleDeleteGroup, container, containerProps, afterUpdateCallback, afterRemoveCallback, confirmMui }: {
+import { AssetType, TrackleDeviceType, UserType } from '../../types';
+declare const GroupUpdate: ({ groupInfo, usersGroup, usersList, devicesList, handleAddUserToGroup, handleRemoveUserFromGroup, handleUpdateGroup, handleDeleteGroup, container, containerProps, afterUpdateCallback, afterRemoveCallback, confirmMui }: {
     userInfo: UserType;
     groupInfo: any;
     usersGroup: any[];
     usersList: any[];
-    devicesList: {
-        id: string;
-        state: any;
-        managers: any[];
-    }[];
+    devicesList: AssetType[] | TrackleDeviceType[];
     handleAddUserToGroup: (groupID: string, userName: string, userID: string) => Promise<any>;
     handleRemoveUserFromGroup: (groupID: string, userID: string) => Promise<any>;
     handleUpdateDevice: (id: string, body: any, user: UserType) => Promise<any>;
-    handleGetGroups: (productID: number, userInfo?: UserType) => Promise<any>;
+    handleGetGroups: (userInfo?: UserType) => Promise<any>;
     handleUpdateGroup: (id: string, group: any) => Promise<void>;
     handleDeleteGroup: (id: string) => Promise<void>;
     container?: "Box" | "Card";

package/components/groups/GroupUpdate.js

@@ -8,15 +8,13 @@ import AddIcon from '@mui/icons-material/Add';
 import CloseIcon from '@mui/icons-material/Close';
 import DeleteIcon from '@mui/icons-material/Delete';
 import { LoadingButton } from '@mui/lab';
-const GroupUpdate = ({ userInfo, groupInfo, usersGroup, usersList, devicesList, handleAddUserToGroup, handleRemoveUserFromGroup, handleGetGroups, handleUpdateGroup, handleUpdateDevice, handleDeleteGroup, container = 'Box', containerProps = {}, afterUpdateCallback, afterRemoveCallback, confirmMui }) => {
+const GroupUpdate = ({ groupInfo, usersGroup, usersList, devicesList, handleAddUserToGroup, handleRemoveUserFromGroup, handleUpdateGroup, handleDeleteGroup, container = 'Box', containerProps = {}, afterUpdateCallback, afterRemoveCallback, confirmMui }) => {
     const [group, setGroup] = useState(groupInfo);
     const [loadingUpdateButton, setLoadingUpdateButton] = useState(false);
     const [loadingRemoveUserButton, setLoadingRemoveUserButton] = useState(false);
     const [loadingAddUserButton, setLoadingAddUserButton] = useState(false);
     const [loadingDeleteGroupButton, setLoadingDeleteGroupButton] = useState(false);
     const [selectedUser, setSelectedUser] = useState(null);
-    const [error, setError] = useState(null);
-    const [success, setSuccess] = useState(null);
     function handleChange(event) {
         setGroup({ ...group, [event.target.name]: event.target.value });
     }
@@ -25,23 +23,6 @@ const GroupUpdate = ({ userInfo, groupInfo, usersGroup, usersList, devicesList,
         try {
             const response = await handleRemoveUserFromGroup(group.id, userId);
             if (response) {
-                if (devicesList.length > 0) {
-                    // should check if device is present in other groups the user is member of
-                    const groupsData = await handleGetGroups(1008, { role: 'support', uid: userId });
-                    const userGroupIds = groupsData.map((group) => group.id);
-                    // for all devices in the group set the selectedUser as manager
-                    for (const device of devicesList) {
-                        // check device is in a group of user is member of
-                        const found = device.state.groups.some((gID) => userGroupIds.includes(gID));
-                        if (!found) {
-                            // remove user from managers
-                            const managers = device.managers && device.managers.filter(man => man !== userId) || [];
-                            await handleUpdateDevice(device.id, {
-                                managers
-                            }, userInfo);
-                        }
-                    }
-                }
                 if (afterUpdateCallback) {
                     await afterUpdateCallback(group);
                 }
@@ -60,17 +41,6 @@ const GroupUpdate = ({ userInfo, groupInfo, usersGroup, usersList, devicesList,
             try {
                 const response = await handleAddUserToGroup(group.id, selectedUser.label, selectedUser.id);
                 if (response) {
-                    if (devicesList.length > 0) {
-                        for (const device of devicesList) {
-                            // for all devices in the group set the selectedUser as manager
-                            await handleUpdateDevice(device.id, {
-                                managers: [
-                                    ...(device?.managers || []),
-                                    selectedUser.id
-                                ]
-                            }, userInfo);
-                        }
-                    }
                     if (afterUpdateCallback) {
                         await afterUpdateCallback(group);
                     }

package/components/groups/GroupsDevices.d.ts

@@ -1,7 +1,6 @@
-import { UserType } from '../../types/user';
-import { Position } from "./Map";
 import { Theme } from "@emotion/react";
-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 }: {
+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, customToolbar, groupsLabelAll, addDevicesLabel, groupUpdateRoles }: {
     userInfo: UserType;
     handleGetUsersList: ({ page, pageSize }: {
         page: number;
@@ -11,27 +10,33 @@ declare const GroupsDevices: ({ userInfo, handleGetUsersList, handleAddUserToGro
     }>;
     handleAddUserToGroup: (groupID: string, userName: string, userID: string) => Promise<any>;
     handleRemoveUserFromGroup: (groupID: string, userID: string) => Promise<any>;
-    handleGetGroups: (productID: number, userInfo?: UserType) => Promise<any>;
+    handleGetGroups: (userInfo?: UserType) => Promise<any>;
     handleGetUsersGroup: (groupID: string) => Promise<any>;
     handleCreateGroup: (group: any) => Promise<any>;
-    handleGetDevices: (user: UserType, group: string, selected: string) => Promise<any>;
-    handleGetPositions: (devices: any) => Promise<any>;
-    handleAddDevicesToGroup: (user: UserType, group: string, devicesToPatch: any[]) => Promise<any>;
-    handleRemoveDevicesFromGroup: (user: UserType, group: string, devicesToPatch: any[]) => Promise<any>;
+    handleGetDevices: (user: UserType, group: string, selectedGroup: string) => Promise<AssetType[] | TrackleDeviceType[]>;
+    handleGetPositions?: (devices: any) => Promise<DevicePositionType[]>;
+    handleAddDevicesToGroup: (user: UserType, group: string, devicesToPatch: AssetType[] | TrackleDeviceType[]) => Promise<TrackleDeviceType[]>;
+    handleRemoveDevicesFromGroup: (user: UserType, group: string, devicesToPatch: AssetType[] | TrackleDeviceType[]) => Promise<TrackleDeviceType[]>;
     handleDeleteGroup: (id: string) => Promise<void>;
     handleUpdateGroup: (id: string, group: any) => Promise<void>;
-    handleUpdateDevice: (id: string, body: any, user: UserType) => Promise<any>;
+    handleUpdateDevice: (id: string, body: any, user: UserType) => Promise<void>;
     group: string;
     columnsArray: any[];
     containerDataGrid?: "Card" | "Box";
     props?: any;
     propsDatagrid?: any;
+    propsHeaderGroups?: any;
     loadingComponent?: React.ReactNode;
     containerProps?: any;
     enableMaps?: boolean;
     mapsHeight: string;
-    mapsClickCallback?: (position: Position) => void;
+    mapsClickCallback?: (position: DevicePositionType) => void;
     theme: Theme;
     confirmMui?: (options?: any) => Promise<void>;
+    forceGetDevices?: number;
+    customToolbar?: string[];
+    groupsLabelAll?: string;
+    addDevicesLabel?: string;
+    groupUpdateRoles?: 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, useCallback, 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,13 +10,13 @@ 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, GridToolbarFilterButton, 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 }) => {
-    const [devices, setDevices] = useState(null);
+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, addDevicesLabel, groupUpdateRoles }) => {
+    const [devices, setDevices] = useState([]);
     const [positions, setPositions] = useState([]);
     const [loadingDevices, setLoadingDevices] = useState(false);
     const [loadingGroups, setLoadingGroups] = useState(false);
@@ -24,17 +24,19 @@ 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);
     const [usersList, setUsersList] = useState([]);
-    const [usersGroup, setUsersGroup] = useState([]);
+    const [usersGroup, setUsersGroup] = useState(null);
     const [groupInfo, setGroupInfo] = useState(null);
     const [openAdd, setOpenAdd] = useState(false);
     const [groupName, setGroupName] = useState('');
     const [description, setDescription] = useState('');
     const [groupUpdateVisible, setGroupUpdateVisible] = useState(false);
     const [valueTab, setValueTab] = useState('1');
+    const clickedIdRef = useRef(null);
     const handleChangeTab = (event, newValue) => {
         setValueTab(newValue);
     };
@@ -60,7 +62,7 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
                 moreData = usersList.users.length === pageSize;
                 page++;
             }
-            const userGroupsUserIds = usersGroup.map((ug) => ug.user.userId);
+            const userGroupsUserIds = usersGroup && usersGroup.map((ug) => ug.user.userId) || [];
             setUsersList(usersData.filter((user) => user.role === 'support' && !userGroupsUserIds.includes(user.uid)).map((user) => {
                 const userName = user.name ? user.name.replace("/", " ") : "";
                 return { label: `${userName} (${user.email})`, id: user.uid };
@@ -75,7 +77,7 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
             setLoadingDevices(true);
             const devices = await handleGetDevices(userInfo, group, selected);
             setDevices(devices);
-            if (enableMaps) {
+            if (enableMaps && handleGetPositions) {
                 const positions = await handleGetPositions(devices);
                 setPositions(positions);
             }
@@ -89,7 +91,7 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
     };
     const getGroups = async () => {
         try {
-            const responseData = await handleGetGroups(1008, userInfo);
+            const responseData = await handleGetGroups(userInfo);
             setGroups(responseData);
         }
         catch (err) {
@@ -111,18 +113,23 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
         }
     }, [userInfo]);
     useEffect(() => {
-        if (usersGroup) {
-            getUsersList();
-        }
+        getUsersList();
     }, [usersGroup]);
     useEffect(() => {
         if (currentGroup && !checkboxSelection) {
             setSelectedGroup(currentGroup);
             setGroupInfo(groups && groups.find((g) => g.id === currentGroup));
-            getUsersGroup(currentGroup);
+            if (currentGroup !== 'all') {
+                getUsersGroup(currentGroup);
+            }
             fetchDevices(currentGroup, currentGroup);
         }
     }, [currentGroup]);
+    useEffect(() => {
+        if (forceGetDevices !== 0) {
+            fetchDevices(currentGroup, currentGroup);
+        }
+    }, [forceGetDevices]);
     const handleSubmit = async (e) => {
         e.preventDefault();
         setLoadingAdd(true);
@@ -130,7 +137,6 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
             const newGroup = {
                 name: groupName,
                 description,
-                productID: 1008, // Assuming this is the correct productID
             };
             const id = await handleCreateGroup(newGroup);
             await getGroups();
@@ -172,28 +178,11 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
     const addToSelectedGroup = async () => {
         setLoadingGroups(true);
         try {
-            const selectedData = devices.filter((row) => devicesToAdd.includes(row.id));
-            const devicesToPatch = selectedData?.map((device) => ({ id: device.id, groups: device.state.groups, managers: device.managers }));
-            const devicesPatched = await handleAddDevicesToGroup(userInfo, selectedGroup, devicesToPatch);
-            if (devicesPatched && devicesPatched.length > 0) {
-                // get all members of the group
-                const userIdsToAdd = usersGroup.map((ug) => ug.user.userId);
-                if (userIdsToAdd.length > 0) {
-                    for (const device of devicesToPatch) {
-                        // add members to devices managers
-                        await handleUpdateDevice(device.id, {
-                            managers: [
-                                ...device.managers,
-                                ...userIdsToAdd
-                            ]
-                        }, userInfo);
-                    }
-                }
-                setLoadingGroups(false);
-                setCurrentGroup(selectedGroup);
-                setDevicesToAdd([...[]]);
-                fetchDevices(selectedGroup, selectedGroup);
-            }
+            await handleAddDevicesToGroup(userInfo, selectedGroup, deviceSelectedObjs);
+            setLoadingGroups(false);
+            setCurrentGroup(selectedGroup);
+            setDevicesToAdd([...[]]);
+            fetchDevices(selectedGroup, selectedGroup);
         }
         catch (err) {
             console.error(err);
@@ -205,32 +194,10 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
     const removeFromCurrentGroup = async () => {
         setLoadingGroups(true);
         try {
-            const devicesToRemove = devices.filter((row) => devicesToAdd.includes(row.id));
-            const devicesToPatch = devicesToRemove?.map((device) => ({ id: device.id, groups: device.state.groups, managers: device.managers }));
-            const devicesPatched = await handleRemoveDevicesFromGroup(userInfo, selectedGroup, devicesToPatch);
-            if (devicesPatched && devicesPatched.length > 0) {
-                for (const device of devicesToPatch) {
-                    if (device.managers.length > 0) {
-                        let managersToKeep = device.managers || [];
-                        for (const manager of device.managers) {
-                            // should check if device is present in other groups the user is member of
-                            const groupsData = await handleGetGroups(1008, { role: 'support', uid: manager });
-                            const userGroupIds = groupsData.map((group) => group.id);
-                            const found = device.groups && device.groups.some((gID) => userGroupIds.includes(gID));
-                            if (!found) {
-                                // @ts-ignore
-                                managersToKeep = managersToKeep.filter(man => man !== manager);
-                            }
-                        }
-                        await handleUpdateDevice(device.id, {
-                            managers: managersToKeep
-                        }, userInfo);
-                    }
-                }
-                setLoadingGroups(false);
-                setDevicesToAdd([]);
-                fetchDevices(currentGroup, selectedGroup);
-            }
+            await handleRemoveDevicesFromGroup(userInfo, selectedGroup, deviceSelectedObjs);
+            setLoadingGroups(false);
+            setDevicesToAdd([]);
+            fetchDevices(currentGroup, selectedGroup);
         }
         catch (err) {
             console.error(err);
@@ -247,14 +214,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 = useCallback((props) => (_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(GridToolbarFilterButton, {})
+                        : '', 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 } }), addDevicesLabel || '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,
@@ -262,9 +277,7 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
                     printOptions: { disableToolbarButton: true },
                 },
             }, initialState: {
-                sorting: {
-                    sortModel: [{ field: 'online', sort: 'desc' }],
-                },
+                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 ?
@@ -273,16 +286,16 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
         _jsx(Card, { ...containerProps, children: renderDataGrid }) : _jsx(Box, { ...containerProps, children: renderDataGrid }));
     if (!userInfo || !groups || !devices)
         return loadingComponent;
-    return (_jsx(ThemeProvider, { theme: theme, children: _jsxs(Box, { ...props, children: [_jsxs(Box, { component: "div", sx: { display: 'flex', alignItems: 'center', justifyContent: 'space-between', mb: 1, backgroundColor: editGroup ? 'secondary.light' : '', borderRadius: 3, px: editGroup ? 2 : 0, py: 1, height: 50 }, children: [editGroup ? _jsxs(Typography, { variant: 'subtitle1', children: [_jsx(Box, { component: 'span', sx: { display: { xs: 'none' } }, children: "Edit group" }), " ", _jsx("b", { children: groupInfo?.name })] }) : '', groups && !checkboxSelection && !(editGroup && currentGroup === 'all') ?
-                            _jsx(Autocomplete, { disablePortal: true, onChange: handleChangeGroupSelect, value: groupInfo?.name || 'All devices', disableClearable: currentGroup === 'all', isOptionEqualToValue: (o, v) => o.label === v, options: [{ label: 'All devices', id: 'all' }, ...groups.map((grp) => ({ label: grp.name, id: grp.id }))], sx: { width: { xs: 200, sm: 300 }, textAlign: 'left' }, size: 'small', renderInput: (params) => _jsx(TextField, { ...params, label: "Group" }) })
-                            : '', userInfo.role === 'admin' &&
-                            _jsxs(Box, { children: [checkboxSelection ?
+    return (_jsx(ThemeProvider, { theme: theme, children: _jsxs(Box, { ...props, children: [_jsxs(Box, { component: "div", sx: { display: 'flex', alignItems: 'center', mb: 1, backgroundColor: editGroup ? 'secondary.light' : '', borderRadius: 3, px: editGroup ? 2 : 0, py: 1, height: 50, ...propsHeaderGroups }, children: [editGroup ? _jsxs(Typography, { variant: 'subtitle1', children: [_jsx(Box, { component: 'span', sx: { display: { xs: 'none' } }, children: "Edit group" }), " ", _jsx("b", { children: groupInfo?.name })] }) : '', groups && !checkboxSelection && !(editGroup && currentGroup === 'all') ?
+                            _jsx(Autocomplete, { disablePortal: true, onChange: handleChangeGroupSelect, value: groupInfo?.name || groupsLabelAll || 'All devices', disableClearable: currentGroup === 'all', isOptionEqualToValue: (o, v) => o.label === v, options: [{ label: groupsLabelAll || 'All devices', id: 'all' }, ...groups.map((grp) => ({ label: grp.name, id: grp.id }))], sx: { width: { xs: 200, sm: 300 }, textAlign: 'left' }, size: 'small', renderInput: (params) => _jsx(TextField, { ...params, label: "Group" }) })
+                            : '', userInfo.role === 'admin' || (groupUpdateRoles && groupUpdateRoles.includes(userInfo.role)) &&
+                            _jsxs(Box, { sx: { ml: 2 }, children: [checkboxSelection ?
                                         _jsx(Input, { value: selectedGroup, type: 'hidden', size: 'small' })
                                         : '', selectedGroup === 'all' ? _jsxs(Button, { variant: "contained", color: "primary", onClick: () => { handleOpenAdd(); }, children: [_jsx(AddIcon, { sx: { mr: 1 } }), _jsx(Box, { component: 'span', sx: { display: { xs: 'none', sm: 'inline' } }, children: "Create\u00A0" }), " group"] }) : '', editGroup ?
                                         currentGroup === 'all' ?
-                                            checkboxSelection ? _jsxs(_Fragment, { children: [_jsxs(Button, { onClick: () => { setGroupUpdateVisible(false); setDevicesToAdd([]); setCurrentGroup(selectedGroup); setCheckboxSelection(true); fetchDevices(selectedGroup, selectedGroup); }, variant: "text", color: "inherit", size: "small", children: [_jsx(BackIcon, { fontSize: "small" }), _jsx(Box, { component: 'span', sx: { display: { xs: 'none', sm: 'inline' } }, children: "\u00A0Group devices" })] }), _jsxs(LoadingButton, { loading: loadingGroups, onClick: () => addToSelectedGroup(), variant: 'contained', size: "small", disabled: devicesToAdd.length === 0 || selectedGroup === 'all' || loadingGroups, sx: { ml: 2 }, children: [_jsx(ReadMoreIcon, { sx: { mr: 1 } }), " Add to group"] })] }) : ''
-                                            : devicesToAdd.length === 0 ? groupUpdateVisible ? _jsxs(Button, { onClick: () => setGroupUpdateVisible(false), sx: { ml: 2 }, variant: "text", color: "inherit", size: "small", children: [_jsx(BackIcon, { fontSize: "small" }), _jsx(Box, { component: 'span', sx: { display: { xs: 'none', sm: 'inline' } }, children: "\u00A0Group devices" })] }) :
-                                                _jsxs(_Fragment, { children: [_jsxs(Button, { onClick: () => addDevicesToCurrentGroup(), sx: { ml: 2 }, variant: "outlined", color: "primary", size: "small", children: [_jsx(PlaylistAddIcon, { fontSize: "small", sx: { mr: 1 } }), " Add devices"] }), _jsxs(Button, { onClick: () => setGroupUpdateVisible(true), sx: { ml: 2 }, variant: "outlined", color: "success", size: "small", children: [_jsx(SettingsIcon, { fontSize: "small" }), _jsx(Box, { component: 'span', sx: { display: { xs: 'none', sm: 'inline' } }, children: "\u00A0Manage group" })] })] })
+                                            checkboxSelection ? _jsxs(_Fragment, { children: [_jsxs(Button, { onClick: () => { setGroupUpdateVisible(false); setDevicesToAdd([]); setCurrentGroup(selectedGroup); setCheckboxSelection(true); fetchDevices(selectedGroup, selectedGroup); }, variant: "text", color: "inherit", size: "small", children: [_jsx(BackIcon, { fontSize: "small" }), _jsx(Box, { component: 'span', sx: { display: { xs: 'none', sm: 'inline' } }, children: "\u00A0Back to group" })] }), _jsxs(LoadingButton, { loading: loadingGroups, onClick: () => addToSelectedGroup(), variant: 'contained', size: "small", disabled: devicesToAdd.length === 0 || selectedGroup === 'all' || loadingGroups, sx: { ml: 2 }, children: [_jsx(ReadMoreIcon, { sx: { mr: 1 } }), " Add to group"] })] }) : ''
+                                            : devicesToAdd.length === 0 ? groupUpdateVisible ? _jsxs(Button, { onClick: () => setGroupUpdateVisible(false), sx: { ml: 2 }, variant: "text", color: "inherit", size: "small", children: [_jsx(BackIcon, { fontSize: "small" }), _jsx(Box, { component: 'span', sx: { display: { xs: 'none', sm: 'inline' } }, children: "\u00A0Back to group" })] }) :
+                                                _jsxs(_Fragment, { children: [_jsxs(Button, { onClick: () => addDevicesToCurrentGroup(), sx: { ml: 2 }, variant: "outlined", color: "primary", size: "small", children: [_jsx(PlaylistAddIcon, { fontSize: "small", sx: { mr: 1 } }), " ", addDevicesLabel || 'Add devices'] }), _jsxs(Button, { onClick: () => setGroupUpdateVisible(true), sx: { ml: 2 }, variant: "outlined", color: "success", size: "small", children: [_jsx(SettingsIcon, { fontSize: "small" }), _jsx(Box, { component: 'span', sx: { display: { xs: 'none', sm: 'inline' } }, children: "\u00A0Manage group" })] })] })
                                                 : _jsxs(LoadingButton, { loading: loadingGroups, onClick: async () => { setLoadingGroups(true); await removeFromCurrentGroup(); }, variant: "contained", color: "error", size: "small", disabled: loadingGroups, sx: { ml: 2 }, children: [_jsx(PlaylistRemoveIcon, { fontSize: "small", sx: { mr: 1 } }), " Remove from group"] })
                                         : '', selectedGroup !== 'all' ?
                                         _jsx(_Fragment, { children: editGroup ?
@@ -294,6 +307,6 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
                             transform: 'translate(-50%, -50%)',
                             width: 400,
                             borderRadius: 4
-                        }, children: [_jsx(CardHeader, { title: "New Group", action: _jsx(IconButton, { onClick: handleCloseAdd, children: _jsx(CloseIcon, {}) }) }), _jsx(CardContent, { children: _jsxs("form", { onSubmit: handleSubmit, children: [_jsx(TextField, { fullWidth: true, label: "Group Name", value: groupName, onChange: (e) => setGroupName(e.target.value), required: true }), _jsx(TextField, { fullWidth: true, label: "Description", value: description, onChange: (e) => setDescription(e.target.value), margin: "normal", multiline: true, rows: 4 }), _jsxs(Box, { mt: 2, display: "flex", justifyContent: "space-between", children: [_jsx(Button, { variant: "contained", color: "info", onClick: handleCloseAdd, children: "Cancel" }), _jsx(LoadingButton, { loading: loadingAdd, variant: "contained", color: "primary", type: "submit", children: "Create" })] })] }) })] }) }), !groupUpdateVisible && renderDatagridAndMaps, groupInfo && editGroup && groupUpdateVisible && _jsx(GroupUpdate, { confirmMui: confirmMui, userInfo: userInfo, usersGroup: usersGroup, usersList: usersList, handleGetGroups: handleGetGroups, handleUpdateDevice: handleUpdateDevice, handleAddUserToGroup: handleAddUserToGroup, handleRemoveUserFromGroup: handleRemoveUserFromGroup, groupInfo: groupInfo, afterUpdateCallback: async (groupInfo) => { setGroupInfo(groupInfo); await getGroups(); await getUsersGroup(groupInfo.id); }, afterRemoveCallback: async () => { closeEditGroup(); await getGroups(); setCurrentGroup('all'); }, container: 'Card', handleDeleteGroup: handleDeleteGroup, handleUpdateGroup: handleUpdateGroup, devicesList: devices.map((device) => ({ id: device.id, state: device.state, managers: device.managers })) })] }) }));
+                        }, children: [_jsx(CardHeader, { title: "New Group", action: _jsx(IconButton, { onClick: handleCloseAdd, children: _jsx(CloseIcon, {}) }) }), _jsx(CardContent, { children: _jsxs("form", { onSubmit: handleSubmit, children: [_jsx(TextField, { fullWidth: true, label: "Group Name", value: groupName, onChange: (e) => setGroupName(e.target.value), required: true }), _jsx(TextField, { fullWidth: true, label: "Description", value: description, onChange: (e) => setDescription(e.target.value), margin: "normal", multiline: true, rows: 4 }), _jsxs(Box, { mt: 2, display: "flex", justifyContent: "space-between", children: [_jsx(Button, { variant: "contained", color: "info", onClick: handleCloseAdd, children: "Cancel" }), _jsx(LoadingButton, { loading: loadingAdd, variant: "contained", color: "primary", type: "submit", children: "Create" })] })] }) })] }) }), !groupUpdateVisible && renderDatagridAndMaps, groupInfo && editGroup && groupUpdateVisible && _jsx(GroupUpdate, { confirmMui: confirmMui, userInfo: userInfo, usersGroup: usersGroup, usersList: usersList, handleGetGroups: handleGetGroups, handleUpdateDevice: handleUpdateDevice, handleAddUserToGroup: handleAddUserToGroup, handleRemoveUserFromGroup: handleRemoveUserFromGroup, groupInfo: groupInfo, afterUpdateCallback: async (groupInfo) => { setGroupInfo(groupInfo); await getGroups(); await getUsersGroup(groupInfo.id); }, afterRemoveCallback: async () => { closeEditGroup(); await getGroups(); setCurrentGroup('all'); }, container: 'Card', handleDeleteGroup: handleDeleteGroup, handleUpdateGroup: handleUpdateGroup, devicesList: devices })] }) }));
 };
 export default GroupsDevices;

package/components/groups/Map.d.ts

@@ -1,14 +1,9 @@
 import 'leaflet/dist/leaflet.css';
 import "leaflet-defaulticon-compatibility";
 import "leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.css";
-export type Position = {
-    deviceID: string;
-    name: string;
-    lat: number;
-    lng: number;
-};
+import { DevicePositionType } from "../../types/device";
 export default function Map({ positions, height, mapsClickCallback }: {
-    positions: Position[];
+    positions: DevicePositionType[];
     height: string;
-    mapsClickCallback: (position: Position) => void;
+    mapsClickCallback: (position: DevicePositionType) => void;
 }): import("react/jsx-runtime").JSX.Element;

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

@@ -1,7 +1,8 @@
+import { GridSortModel } from '@mui/x-data-grid';
 import { UserType } from '../../types/user';
 import { Theme } from '@emotion/react';
-declare const UsersDataGrid: ({ handleGetUsersList, pageSize, container, containerProps, props, loadingComponent, theme }: {
-    handleGetUsersList: ({ page, pageSize, filter }: {
+declare const UsersDataGrid: ({ handleGetUsersList, pageSize, container, containerProps, props, loadingComponent, theme, columns }: {
+    handleGetUsersList: ({ page, pageSize, filter, sortModel }: {
         page: number;
         pageSize: number;
         filter?: {
@@ -9,6 +10,7 @@ declare const UsersDataGrid: ({ handleGetUsersList, pageSize, container, contain
             operator?: string;
             value: string;
         };
+        sortModel: GridSortModel;
     }) => Promise<{
         users: UserType[];
         rowCount: number;
@@ -19,5 +21,6 @@ declare const UsersDataGrid: ({ handleGetUsersList, pageSize, container, contain
     props?: object | undefined;
     loadingComponent?: React.ReactNode;
     theme: Theme;
+    columns: any[];
 }) => string | number | bigint | boolean | import("react/jsx-runtime").JSX.Element | Iterable<import("react").ReactNode> | Promise<import("react").AwaitedReactNode> | null;
 export default UsersDataGrid;