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

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

@@ -360,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-preview34",
+  "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,