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

package/components/groups/GroupUpdate.d.ts

@@ -1,5 +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 }: {
+declare const GroupUpdate: ({ isOrg, labelEntity, groupInfo, usersGroup, usersList, devicesList, userInfo, handleAddUserToGroup, handleGetGroups, handleRemoveUserFromGroup, handleUpdateGroup, handleDeleteGroup, container, containerProps, afterUpdateCallback, afterRemoveCallback, confirmMui }: {
     groupInfo: any;
     usersGroup: any[];
     usersList: any[];
@@ -7,7 +7,7 @@ declare const GroupUpdate: ({ labelEntity, groupInfo, usersGroup, usersList, dev
     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: (userInfo?: UserType) => Promise<any>;
+    handleGetGroups: (userInfo?: UserType, parent_id?: string) => Promise<any>;
     handleUpdateGroup: (id: string, group: any) => Promise<void>;
     handleDeleteGroup: (id: string) => Promise<void>;
     container?: "Box" | "Card";
@@ -16,5 +16,7 @@ declare const GroupUpdate: ({ labelEntity, groupInfo, usersGroup, usersList, dev
     afterRemoveCallback?: () => Promise<void>;
     confirmMui?: (options?: any) => Promise<void>;
     labelEntity: string;
+    isOrg: boolean;
+    userInfo: UserType;
 }) => import("react/jsx-runtime").JSX.Element;
 export default GroupUpdate;

package/components/groups/GroupUpdate.js

@@ -1,15 +1,16 @@
 "use client";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box, Typography, Card, CardContent, TableBody } from '@mui/material';
 import Grid from '@mui/material/Grid2';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { FormControl, TextField, Autocomplete, Alert, Table, TableRow, TableCell } from '@mui/material';
 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 = ({ labelEntity, groupInfo, usersGroup, usersList, devicesList, handleAddUserToGroup, handleRemoveUserFromGroup, handleUpdateGroup, handleDeleteGroup, container = 'Box', containerProps = {}, afterUpdateCallback, afterRemoveCallback, confirmMui }) => {
+const GroupUpdate = ({ isOrg, labelEntity, groupInfo, usersGroup, usersList, devicesList, userInfo, handleAddUserToGroup, handleGetGroups, handleRemoveUserFromGroup, handleUpdateGroup, handleDeleteGroup, container = 'Box', containerProps = {}, afterUpdateCallback, afterRemoveCallback, confirmMui }) => {
     const [group, setGroup] = useState(groupInfo);
+    const [organizationsGroup, setOrganizationsGroup] = useState([]);
     const [loadingUpdateButton, setLoadingUpdateButton] = useState(false);
     const [loadingRemoveUserButton, setLoadingRemoveUserButton] = useState(false);
     const [loadingAddUserButton, setLoadingAddUserButton] = useState(false);
@@ -92,12 +93,21 @@ const GroupUpdate = ({ labelEntity, groupInfo, usersGroup, usersList, devicesLis
             setLoadingDeleteGroupButton(false);
         }
     };
+    useEffect(() => {
+        const getInitialData = async () => {
+            if (isOrg) {
+                const response = await handleGetGroups(userInfo, group.id);
+                setOrganizationsGroup(response);
+            }
+        };
+        getInitialData();
+    }, []);
     const renderGroupUpdate = () => {
         return (_jsxs(Box, { component: "div", children: [_jsx(Grid, { container: true, spacing: 2, children: _jsx(Grid, { size: { xs: 12, md: 8 }, children: _jsxs(Box, { component: "div", children: [_jsx(FormControl, { fullWidth: true, children: _jsx(TextField, { sx: { flexGrow: 1 }, label: "Name", value: group.name, name: "name", onChange: handleChange }) }), _jsx(FormControl, { fullWidth: true, sx: { mt: 2 }, children: _jsx(TextField, { sx: { flexGrow: 1 }, label: "Description", value: group.description, name: "description", multiline: true, rows: 4, onChange: handleChange }) }), _jsx(LoadingButton, { variant: "contained", color: "primary", loading: loadingUpdateButton, sx: { mt: 2 }, onClick: () => updateGroup(), children: "Update" })] }) }) }), _jsx(Grid, { container: true, spacing: 2, sx: { mt: 4 }, children: _jsxs(Grid, { size: { xs: 12, md: 8 }, children: [_jsx(Typography, { variant: 'body1', sx: { fontWeight: 'bold' }, children: "Add members" }), _jsx(Box, { component: "div", sx: { mt: 2 }, children: usersGroup && usersGroup.length > 0 ?
                                     _jsx(Table, { size: "small", children: _jsx(TableBody, { children: usersGroup.map((ug) => (_jsxs(TableRow, { children: [_jsx(TableCell, { children: _jsx(Typography, { variant: "body1", children: ug.user.fullName }) }), _jsx(TableCell, { align: 'right', children: _jsx(LoadingButton, { size: "small", color: "error", loading: loadingRemoveUserButton, onClick: () => removeUserFromCurrentGroup(ug.user.userId), children: _jsx(CloseIcon, { sx: { m: 0, p: 0 }, fontSize: "small" }) }) })] }, ug.id))) }) })
                                     : _jsx(Box, { component: 'div', sx: { mt: 2 }, children: "No members found" }) }), _jsxs(Box, { component: "div", sx: { mt: 4, display: 'flex', alignItems: 'center' }, children: [_jsx(Autocomplete, { fullWidth: true, disablePortal: true, options: usersList || [], value: selectedUser, size: 'small', onChange: (event, newValue) => {
                                             setSelectedUser(newValue);
-                                        }, renderInput: (params) => _jsx(TextField, { ...params, label: "Select user" }) }), _jsxs(LoadingButton, { variant: "contained", color: "success", loading: loadingAddUserButton, sx: { ml: 2 }, disabled: !selectedUser, onClick: () => addUserToCurrentGroup(), children: [_jsx(AddIcon, { sx: { mr: 1 } }), " Add"] })] }), _jsxs(Box, { component: "div", sx: { mt: 4 }, children: [_jsxs(Typography, { variant: 'body1', sx: { fontWeight: 'bold' }, children: ["Delete ", labelEntity.toLocaleLowerCase()] }), _jsx(Alert, { severity: "error", sx: { mt: 2 }, action: _jsxs(LoadingButton, { variant: "contained", disabled: devicesList.length > 0, color: "error", loading: loadingDeleteGroupButton, onClick: () => deleteGroup(), size: 'small', children: [_jsx(DeleteIcon, { fontSize: "small", sx: { mr: 1 } }), " Delete"] }), children: devicesList.length === 0 ? `This action cannot be undone` : `You must manually remove devices from ${labelEntity.toLocaleLowerCase()} before deletion` })] })] }) })] }));
+                                        }, renderInput: (params) => _jsx(TextField, { ...params, label: "Select user" }) }), _jsxs(LoadingButton, { variant: "contained", color: "primary", loading: loadingAddUserButton, sx: { ml: 2 }, disabled: !selectedUser, onClick: () => addUserToCurrentGroup(), children: [_jsx(AddIcon, { sx: { mr: 1 } }), " Add"] })] }), _jsxs(Box, { component: "div", sx: { mt: 4 }, children: [_jsxs(Typography, { variant: 'body1', sx: { fontWeight: 'bold' }, children: ["Delete ", labelEntity.toLocaleLowerCase()] }), _jsx(Alert, { severity: "error", sx: { mt: 2 }, action: _jsxs(LoadingButton, { variant: "contained", disabled: devicesList.length > 0 || usersGroup.length > 0, color: "error", loading: loadingDeleteGroupButton, onClick: () => deleteGroup(), size: 'small', children: [_jsx(DeleteIcon, { fontSize: "small", sx: { mr: 1 } }), " Delete"] }), children: !isOrg ? (_jsx(_Fragment, { children: devicesList.length === 0 && usersGroup.length === 0 ? `This action cannot be undone` : `You must manually remove devices and members from ${labelEntity.toLocaleLowerCase()} before deletion` })) : (_jsx(_Fragment, { children: devicesList.length === 0 && usersGroup.length === 0 && organizationsGroup.length === 0 ? `This action cannot be undone` : `You must manually remove devices and members and groups from ${labelEntity.toLocaleLowerCase()} before deletion` })) })] })] }) })] }));
     };
     return (container === "Card" ? (_jsx(Card, { ...containerProps, children: _jsx(CardContent, { children: renderGroupUpdate() }) })) : (_jsx(Box, { ...containerProps, children: renderGroupUpdate() })));
 };

package/components/groups/GroupsDevices.d.ts

@@ -1,16 +1,11 @@
 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, customToolbar, groupsLabelAll, addDevicesLabel, noDevicesLabel, groupUpdateRoles, isOrg, currentOrg, userGroupsRole }: {
+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, noDevicesLabel, groupUpdateRoles, isOrg, currentOrg }: {
     userInfo: UserType;
-    handleGetUsersList: ({ page, pageSize }: {
-        page: number;
-        pageSize: number;
-    }) => Promise<{
-        users: UserType[];
-    }>;
+    handleGetUsersList: () => Promise<UserType[]>;
     handleAddUserToGroup: (groupID: string, userName: string, userID: string) => Promise<any>;
     handleRemoveUserFromGroup: (groupID: string, userID: string) => Promise<any>;
-    handleGetGroups: (userInfo?: UserType) => Promise<any>;
+    handleGetGroups: (userInfo?: UserType, parent_id?: string | undefined) => Promise<any>;
     handleGetUsersGroup: (groupID: string) => Promise<any>;
     handleCreateGroup: (group: any) => Promise<any>;
     handleGetDevices: (user: UserType, group: string, selectedGroup: string) => Promise<AssetType[] | TrackleDeviceType[]>;
@@ -22,7 +17,6 @@ declare const GroupsDevices: ({ userInfo, handleGetUsersList, handleAddUserToGro
     handleUpdateDevice: (id: string, body: any, user: UserType) => Promise<void>;
     group: string;
     columnsArray: any[];
-    userGroupsRole?: string[];
     containerDataGrid?: "Card" | "Box";
     props?: any;
     propsDatagrid?: any;

package/components/groups/GroupsDevices.js

@@ -15,7 +15,7 @@ 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 = 0, customToolbar, groupsLabelAll, addDevicesLabel, noDevicesLabel, groupUpdateRoles, isOrg = false, currentOrg, userGroupsRole = ['support'] }) => {
+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 = 0, customToolbar, groupsLabelAll, addDevicesLabel, noDevicesLabel, groupUpdateRoles, isOrg = false, currentOrg }) => {
     const [devices, setDevices] = useState([]);
     const [positions, setPositions] = useState([]);
     const [loadingDevices, setLoadingDevices] = useState(false);
@@ -47,29 +47,13 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
     }), []);
     const getUsersList = async () => {
         try {
-            let page = 1;
-            const pageSize = 100;
-            let usersData = [];
-            let moreData = true;
-            while (moreData) {
-                const usersList = await handleGetUsersList({
-                    page,
-                    pageSize,
-                });
-                if (usersList.users && usersList.users.length > 0) {
-                    usersData = [...usersData, ...usersList.users];
-                }
-                // Se il numero di utenti restituiti è minore di pageSize, non ci sono più pagine da caricare
-                moreData = usersList.users.length === pageSize;
-                page++;
-            }
+            const usersData = await handleGetUsersList();
             const userGroupsUserIds = usersGroup && usersGroup.map((ug) => ug.user.userId) || [];
             setUsersList(usersData
-                .filter((user) => userGroupsRole.includes(user.role) &&
-                !userGroupsUserIds.includes(user.uid))
+                .filter((user) => !userGroupsUserIds.includes(user.uid))
                 .map((user) => {
-                const userName = user.name ? user.name.replace("/", " ") : "";
-                return { label: `${userName} (${user.email})`, id: user.uid };
+                const userName = user.profile.name ? user.profile.name.replace("/", " ") : "";
+                return { label: `${userName} (${user.profile.email})`, id: user.uid };
             }));
         }
         catch (err) {
@@ -360,6 +344,8 @@ 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, 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, { userInfo: userInfo, 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(); if (!isOrg) {
+                        setCurrentGroup('all');
+                    } }, container: 'Card', handleDeleteGroup: handleDeleteGroup, handleUpdateGroup: handleUpdateGroup, devicesList: devices, labelEntity: labelEntity, isOrg: isOrg })] }) }));
 };
 export default GroupsDevices;

package/package.json

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

package/server-actions/groups.d.ts

@@ -19,3 +19,4 @@ export declare const removeUserGroup: (db: Firestore, groupID: string, userID: s
 export declare const getUserOrganizations: (db: Firestore, productID: number, userID?: string, searchParentIds?: boolean, assetID?: string) => Promise<{
     id: string;
 }[]>;
+export declare const getCustomerOrganizations: (db: Firestore, userOrganizations: string[]) => Promise<any[]>;

package/server-actions/groups.js

@@ -171,3 +171,24 @@ export const getUserOrganizations = async (db, productID, userID, searchParentId
     }));
     return organizations;
 };
+export const getCustomerOrganizations = async (db, userOrganizations) => {
+    if (userOrganizations.length === 0) {
+        return [];
+    }
+    const chunks = [];
+    const organizations = [];
+    for (let i = 0; i < userOrganizations.length; i += 10) {
+        chunks.push(userOrganizations.slice(i, i + 10));
+    }
+    for (const chunk of chunks) {
+        const groupsSnapshot = await db
+            .collection("groups")
+            .where("__name__", "in", chunk)
+            .get();
+        organizations.push(...groupsSnapshot.docs.map((doc) => ({
+            id: doc.id,
+            ...doc.data()
+        })));
+    }
+    return organizations;
+};

package/server-actions/trackle.d.ts

@@ -38,4 +38,4 @@ export declare function put(trackleConfig: TrackleConfig, id: string, endpoint:
     return_value: number;
 }>;
 export declare function addDevicesToGroup(trackleConfig: TrackleConfig, productId: number, group: string, devicesToPatch: TrackleDeviceType[], uid?: string): Promise<TrackleDeviceType[]>;
-export declare function removeDevicesFromGroup(trackleConfig: TrackleConfig, productId: number, group: string, devicesToPatch: TrackleDeviceType[], uid?: string): Promise<TrackleDeviceType[]>;
+export declare function removeDevicesFromGroup(trackleConfig: TrackleConfig, productId: number, group: string | string[], devicesToPatch: TrackleDeviceType[], uid?: string): Promise<TrackleDeviceType[]>;

package/server-actions/trackle.js

@@ -147,7 +147,7 @@ export async function removeDevicesFromGroup(trackleConfig, productId, group, de
         let newGroups = device.state?.groups && device.state?.groups instanceof Array
             ? device.state?.groups
             : [];
-        if (newGroups.includes(group)) {
+        if (typeof group === "string" && newGroups.includes(group)) {
             newGroups = newGroups.filter((newGroup) => newGroup !== group);
             const api = uid ? wretchApi(trackleConfig, uid) : wretchApi(trackleConfig);
             await api
@@ -156,8 +156,24 @@ export async function removeDevicesFromGroup(trackleConfig, productId, group, de
                 : `/products/${productId}/devices/${device.id}/groups`)
                 .setTimeout(trackleConfig.apiTimeout)
                 .res();
+            device.state.groups = newGroups;
             devicesPatched.push(device);
         }
+        else if (Array.isArray(group)) {
+            const intersection = newGroups.filter((g) => group.includes(g));
+            if (intersection.length > 0) {
+                newGroups = newGroups.filter((g) => !group.includes(g));
+                const api = uid ? wretchApi(trackleConfig, uid) : wretchApi(trackleConfig);
+                await api
+                    .put({ value: newGroups }, uid
+                    ? `/devices/${device.id}/groups`
+                    : `/products/${productId}/devices/${device.id}/groups`)
+                    .setTimeout(trackleConfig.apiTimeout)
+                    .res();
+                device.state.groups = newGroups;
+                devicesPatched.push(device);
+            }
+        }
     }
     return devicesPatched;
 }

package/types/user.d.ts

@@ -10,4 +10,5 @@ export type UserType = {
     lastname?: string;
     uid: string;
     sign?: string;
+    organization?: string;
 };