@iotready/nextjs-components-library 1.0.0-preview33 → 1.0.0-preview35

package/components/charts/TrendChart.js

@@ -850,7 +850,7 @@ const TrendChart = ({ filter, measures1, annotationsDataFn, measures2, enableDat
                                     '& .MuiToggleButton-root': {
                                         color: 'text.primary', fontSize: '0.95rem', fontWeight: 'normal', paddingTop: '6px', paddingBottom: '6px'
                                     }
-                                }, 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("span", { children: _jsx(ToggleButton, { value: "check", color: "primary", size: "small", selected: spanGapsOption, disabled: chartLoading, onChange: () => handleSpanGaps(!spanGapsOption), sx: { ml: 1 }, children: _jsx(TimelineIcon, {}) }) }) }), annotationsData !== null && (_jsx(MuiTooltip, { placement: "top", arrow: true, title: "Show annotations", children: _jsx("span", { children: _jsx(ToggleButton, { value: "check", color: "primary", size: "small", selected: annotationsEnabled, disabled: chartLoading, onChange: () => setAnnotationsEnabled(!annotationsEnabled), sx: { ml: 1 }, children: _jsx(EditNoteIcon, {}) }) }) }))] })] }), _jsx(Box, { component: 'div', className: "chart-container", sx: { mt: 2, height: '100%' }, children: chartJsLoaded && !chartLoading && typeof window !== 'undefined' ?
+                                }, 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("span", { children: _jsx(ToggleButton, { value: "check", color: "primary", size: "small", selected: spanGapsOption, disabled: chartLoading, onChange: () => handleSpanGaps(!spanGapsOption), sx: { ml: 1 }, children: _jsx(TimelineIcon, {}) }) }) }), annotationsDataFn && annotationsData !== null && (_jsx(MuiTooltip, { placement: "top", arrow: true, title: "Show annotations", children: _jsx("span", { children: _jsx(ToggleButton, { value: "check", color: "primary", size: "small", selected: annotationsEnabled, disabled: chartLoading, onChange: () => setAnnotationsEnabled(!annotationsEnabled), sx: { ml: 1 }, children: _jsx(EditNoteIcon, {}) }) }) }))] })] }), _jsx(Box, { component: 'div', className: "chart-container", sx: { mt: 2, height: '100%' }, children: chartJsLoaded && !chartLoading && typeof window !== 'undefined' ?
                     _jsx(_Fragment, { children: dataMeasures && (dataMeasures.length > 1 || (dataMeasures.length === 1 && dataMeasures[0].data?.length)) ?
                             (_jsx(Line, { options: options, data: {
                                     // datasets: dataMeasures || [{ data: [] }]

package/components/groups/GroupUpdate.d.ts

@@ -1,6 +1,5 @@
 import { AssetType, TrackleDeviceType, UserType } from '../../types';
 declare const GroupUpdate: ({ labelEntity, groupInfo, usersGroup, usersList, devicesList, handleAddUserToGroup, handleRemoveUserFromGroup, handleUpdateGroup, handleDeleteGroup, container, containerProps, afterUpdateCallback, afterRemoveCallback, confirmMui }: {
-    userInfo: UserType;
     groupInfo: any;
     usersGroup: any[];
     usersList: any[];

package/components/groups/GroupsDevices.js

@@ -134,6 +134,9 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
                 getUsersGroup(currentGroup);
             }
             fetchDevices(currentGroup, currentGroup);
+            if (isOrg) {
+                setCheckboxSelection(true);
+            }
         }
     }, [currentGroup, groups]);
     useEffect(() => {
@@ -254,26 +257,64 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
             }, onCellClick: (params) => {
                 clickedIdRef.current = params.id.toString(); // aggiornamento immediato
             }, onRowSelectionModelChange: (ids) => {
-                if (!checkboxSelection || !clickedIdRef.current)
+                if (!checkboxSelection)
                     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;
+                // Se abbiamo un clickedIdRef, gestiamo il click individuale
+                if (clickedIdRef.current) {
+                    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;
+                        }
+                    });
+                }
+                else {
+                    // Gestione del "check all" - confronta con il modello di selezione attuale
+                    const currentSelection = (checkboxSelection && currentGroup === 'all')
+                        ? [
+                            ...devices
+                                .filter(d => d.groups?.includes(selectedGroup))
+                                .map(d => d.id.toString()),
+                            ...devicesToAdd,
+                        ]
+                        : devicesToAdd;
+                    // Se la selezione è diversa, aggiorna devicesToAdd
+                    if (JSON.stringify(ids.sort()) !== JSON.stringify(currentSelection.sort())) {
+                        // Filtra solo i dispositivi che non sono già nel gruppo
+                        const selectableDevices = devices
+                            .filter(d => !d.groups?.includes(selectedGroup))
+                            .map(d => d.id.toString());
+                        // Calcola i nuovi dispositivi da aggiungere
+                        const newDevicesToAdd = ids.filter(id => selectableDevices.includes(id) && !devicesToAdd.includes(id));
+                        // Calcola i dispositivi da rimuovere dalla selezione
+                        const devicesToRemove = devicesToAdd.filter(id => !ids.includes(id));
+                        // Aggiorna devicesToAdd
+                        setDevicesToAdd(prevIds => {
+                            return prevIds
+                                .filter(id => !devicesToRemove.includes(id))
+                                .concat(newDevicesToAdd);
+                        });
+                        // Aggiorna deviceSelectedObjs
+                        setDeviceSelectedObjs(prevObjs => {
+                            return prevObjs
+                                .filter(d => !devicesToRemove.includes(d.id.toString()))
+                                .concat(devices.filter(d => newDevicesToAdd.includes(d.id.toString()) &&
+                                !prevObjs.some(obj => obj.id.toString() === d.id.toString())));
+                        });
                     }
-                });
+                }
             }, disableDensitySelector: true, disableColumnSelector: true, disableRowSelectionOnClick: true, loading: loadingDevices, rows: devices, columns: checkboxSelection
                 ? columnsArray.filter(col => col.field !== 'id')
                 : columnsArray, slots: {
@@ -298,7 +339,7 @@ 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', mb: 1, backgroundColor: editGroup && !isOrg ? 'secondary.light' : '', borderRadius: 3, px: editGroup ? 2 : 0, py: 1, height: 50, ...propsHeaderGroups }, children: [editGroup ? _jsxs(Typography, { variant: 'subtitle1', children: [_jsxs(Box, { component: 'span', sx: { display: { xs: 'none' } }, children: ["Edit ", labelEntity.toLocaleLowerCase()] }), " ", _jsx("b", { children: groupInfo?.name })] }) : '', groups && !checkboxSelection && !isOrg && !(editGroup && currentGroup === 'all') ?
+    return (_jsx(ThemeProvider, { theme: theme, children: _jsxs(Box, { ...props, children: [_jsxs(Box, { component: "div", sx: { display: 'flex', alignItems: 'center', mb: 1, backgroundColor: editGroup && !isOrg ? 'secondary.light' : '', borderRadius: 3, px: editGroup ? 2 : 0, py: 1, height: 50, ...propsHeaderGroups }, children: [editGroup ? _jsx(Typography, { variant: isOrg ? 'h6' : 'subtitle1', children: _jsxs("b", { children: [labelEntity, " \"", groupInfo?.name, "\""] }) }) : '', groups && !checkboxSelection && !isOrg && !(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: labelEntity }) })
                             : '', (userInfo.role === 'admin' || (groupUpdateRoles && groupUpdateRoles.includes(userInfo.role))) &&
                             _jsxs(Box, { sx: { ml: 2 }, children: [checkboxSelection ?
@@ -319,6 +360,6 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
                             transform: 'translate(-50%, -50%)',
                             width: 400,
                             borderRadius: 4
-                        }, children: [_jsx(CardHeader, { title: "new" + labelEntity, action: _jsx(IconButton, { onClick: handleCloseAdd, children: _jsx(CloseIcon, {}) }) }), _jsx(CardContent, { children: _jsxs("form", { onSubmit: handleSubmit, children: [_jsx(TextField, { fullWidth: true, label: labelEntity + " 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, labelEntity: labelEntity })] }) }));
+                        }, children: [_jsx(CardHeader, { title: "New " + labelEntity, action: _jsx(IconButton, { onClick: handleCloseAdd, children: _jsx(CloseIcon, {}) }) }), _jsx(CardContent, { children: _jsxs("form", { onSubmit: handleSubmit, children: [_jsx(TextField, { fullWidth: true, label: labelEntity + " 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, 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, labelEntity: labelEntity })] }) }));
 };
 export default GroupsDevices;

package/package.json

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

package/server-actions/groups.d.ts

@@ -16,6 +16,6 @@ export declare const getGroupsUser: (db: Firestore, userID: string) => Promise<{
 }[]>;
 export declare const addUsersGroup: (db: Firestore, groupID: string, userName: string, userID: string) => Promise<string>;
 export declare const removeUserGroup: (db: Firestore, groupID: string, userID: string) => Promise<string | undefined>;
-export declare const getUserOrganizations: (db: Firestore, productID: number, userID?: string, assetID?: string) => Promise<{
+export declare const getUserOrganizations: (db: Firestore, productID: number, userID?: string, searchParentIds?: boolean, assetID?: string) => Promise<{
     id: string;
 }[]>;

package/server-actions/groups.js

@@ -115,10 +115,8 @@ export const removeUserGroup = async (db, groupID, userID) => {
     }
 };
 // 9. GET ORGANIZATIONS
-export const getUserOrganizations = async (db, productID, userID, assetID) => {
-    let groupsRef = db
-        .collection("groups")
-        .where("productID", "==", productID);
+export const getUserOrganizations = async (db, productID, userID, searchParentIds, assetID) => {
+    let groupsRef = db.collection("groups").where("productID", "==", productID);
     if (assetID) {
         groupsRef = groupsRef.where("assets", "array-contains", assetID);
     }
@@ -130,24 +128,30 @@ export const getUserOrganizations = async (db, productID, userID, assetID) => {
             .where("user.userId", "==", userID)
             .get();
         const userGroupIds = userGroupsSnapshot.docs.map((doc) => doc.data().groupId);
-        let parentIds = [];
         if (userGroupIds.length > 0) {
-            const chunks = [];
-            for (let i = 0; i < userGroupIds.length; i += 10) {
-                chunks.push(userGroupIds.slice(i, i + 10));
+            if (searchParentIds) {
+                const chunks = [];
+                let parentIds = [];
+                for (let i = 0; i < userGroupIds.length; i += 10) {
+                    chunks.push(userGroupIds.slice(i, i + 10));
+                }
+                for (const chunk of chunks) {
+                    const groupsSnapshot = await db
+                        .collection("groups")
+                        .where("__name__", "in", chunk)
+                        .get();
+                    const ids = groupsSnapshot.docs
+                        .map((doc) => doc.data().parent_id)
+                        .filter((id) => id !== null && id !== undefined);
+                    parentIds.push(...ids);
+                }
+                // Rimuove duplicati
+                groupIds = Array.from(new Set(parentIds));
             }
-            for (const chunk of chunks) {
-                const groupsSnapshot = await db
-                    .collection("groups")
-                    .where("__name__", "in", chunk)
-                    .get();
-                const ids = groupsSnapshot.docs
-                    .map((doc) => doc.data().parent_id)
-                    .filter((id) => id !== null && id !== undefined);
-                parentIds.push(...ids);
+            else {
+                // support role
+                groupIds = userGroupIds;
             }
-            // Rimuove duplicati
-            groupIds = Array.from(new Set(parentIds));
         }
         else {
             groupIds = [];
@@ -158,8 +162,8 @@ export const getUserOrganizations = async (db, productID, userID, assetID) => {
         .filter((doc) => {
         const data = doc.data();
         const parentId = data.parent_id;
-        return (parentId === null || parentId === undefined) &&
-            (!groupIds || groupIds.includes(doc.id));
+        return ((parentId === null || parentId === undefined) &&
+            (!groupIds || groupIds.includes(doc.id)));
     })
         .map((doc) => ({
         id: doc.id,