@iotready/nextjs-components-library 1.0.0-preview15 → 1.0.0-preview17

package/components/charts/TrendChart.d.ts

@@ -3,6 +3,7 @@ import 'moment/locale/it';
 import { Theme } from "@emotion/react";
 type Measure = {
     name: string;
+    description: string;
     polltime: number;
     unit: string;
     stepped: boolean;

package/components/charts/TrendChart.js

@@ -144,7 +144,7 @@ function getPollTime(intervalInSeconds, pollTime) {
 }
 function getCsvData(data, measures) {
     // Initialize the header with timestamp and measure names
-    const headers = ["timestamp", ...measures.map(measure => measure.name)];
+    const headers = ["timestamp", ...measures.map(measure => measure.description || measure.name)];
     const csvData = [];
     // Add the header to the csvData
     csvData.push(headers);
@@ -305,7 +305,7 @@ const TrendChart = ({ deviceId, measures1, measures2, enableDatePicker, handleGe
             const influxData = await handleGetInfluxData(measure.name, timeStart, timeEnd, deviceId, polltime, !measure.polltime && rawQuery, !measure.polltime);
             const points = getChartPoints(influxData);
             return {
-                label: measure.name,
+                label: measure.description || measure.name,
                 data: points,
                 unit: measure.unit,
                 borderWidth: 2,
@@ -484,7 +484,7 @@ const TrendChart = ({ deviceId, measures1, measures2, enableDatePicker, handleGe
                     }, minDateTime: moment(timeStart * 1000), slotProps: {
                         textField: { size: 'small', sx: { width: { sm: 210 } } }
                     } })] }) });
-    return (_jsxs(ThemeProvider, { theme: theme, children: [enableDatePicker && _jsx(Box, { sx: { display: { xs: 'flex', lg: 'none', justifyContent: 'flex-end' }, mb: 2 }, children: datePicker }), _jsxs(Box, { sx: { display: 'flex', alignItems: 'center', justifyContent: 'space-between' }, children: [_jsxs(Box, { sx: { display: 'flex', alignItems: 'center' }, children: [!enableExportData && measures && measures.length === 1 ? _jsx(Typography, { variant: 'body1', sx: { mr: 2 }, children: measures[0].name }) : '', enableExportData && (_jsxs(_Fragment, { children: [_jsxs(LoadingButton, { sx: { minWidth: '40px !important', mr: 1, px: 1 }, loading: loadingButton, type: "submit", variant: "text", color: "primary", onClick: handleExportData, disabled: !dataMeasures || !dataMeasures.length, size: 'small', children: [_jsx(LoginIcon, { fontSize: 'small', style: { transform: "rotate(90deg)" } }), _jsx(Box, { sx: { display: { xs: 'none', xl: 'block' }, ml: { md: 1 } }, children: "Export" })] }), _jsx(CSVLink
+    return (_jsxs(ThemeProvider, { theme: theme, children: [enableDatePicker && _jsx(Box, { sx: { display: { xs: 'flex', lg: 'none', justifyContent: 'flex-end' }, mb: 2 }, children: datePicker }), _jsxs(Box, { sx: { display: 'flex', alignItems: 'center', justifyContent: 'space-between' }, children: [_jsxs(Box, { sx: { display: 'flex', alignItems: 'center' }, children: [!enableExportData && measures && measures.length === 1 ? _jsx(Typography, { variant: 'body1', sx: { mr: 2 }, children: measures[0].description || measures[0].name }) : '', enableExportData && (_jsxs(_Fragment, { children: [_jsxs(LoadingButton, { sx: { minWidth: '40px !important', mr: 1, px: 1 }, loading: loadingButton, type: "submit", variant: "text", color: "primary", onClick: handleExportData, disabled: !dataMeasures || !dataMeasures.length, size: 'small', children: [_jsx(LoginIcon, { fontSize: 'small', style: { transform: "rotate(90deg)" } }), _jsx(Box, { sx: { display: { xs: 'none', xl: 'block' }, ml: { md: 1 } }, children: "Export" })] }), _jsx(CSVLink
                                     //@ts-ignore
                                     , { 
                                         //@ts-ignore

package/components/groups/GroupUpdate.d.ts

@@ -12,7 +12,7 @@ declare const GroupUpdate: ({ userInfo, groupInfo, usersGroup, usersList, device
     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

@@ -27,7 +27,7 @@ const GroupUpdate = ({ userInfo, groupInfo, usersGroup, usersList, devicesList,
             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 groupsData = await handleGetGroups({ 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) {

package/components/groups/GroupsDevices.d.ts

@@ -11,7 +11,7 @@ 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, query: string) => Promise<any>;

package/components/groups/GroupsDevices.js

@@ -102,7 +102,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) {
@@ -145,7 +145,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();
@@ -198,7 +197,7 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
                         // add members to devices managers
                         await handleUpdateDevice(device.id, {
                             managers: [
-                                ...device.managers,
+                                ...(device?.managers || []),
                                 ...userIdsToAdd
                             ]
                         }, userInfo);
@@ -229,7 +228,7 @@ const GroupsDevices = ({ userInfo, handleGetUsersList, handleAddUserToGroup, han
                         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 groupsData = await handleGetGroups({ role: 'support', uid: manager });
                             const userGroupIds = groupsData.map((group) => group.id);
                             const found = device.groups && device.groups.some((gID) => userGroupIds.includes(gID));
                             if (!found) {

package/package.json

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

package/server-actions/trackle.d.ts

@@ -1,12 +1,13 @@
 export type TrackleConfig = {
+    orgName: string;
     apiUrl: string;
-    createCustomerUrl: string;
     clientId: string;
     clientSecret: string;
     tokenUrl: string;
     cookieName: string;
     cookieSecure: boolean;
     apiTimeout: number;
+    productID: number;
 };
 export declare function logOut(trackleConfig: TrackleConfig): Promise<void>;
 export declare function createCustomer(trackleConfig: TrackleConfig, uid: string): Promise<{

package/server-actions/trackle.js

@@ -48,7 +48,7 @@ export async function logOut(trackleConfig) {
     cookies().delete(trackleConfig.cookieName);
 }
 export async function createCustomer(trackleConfig, uid) {
-    return await wretch(trackleConfig.createCustomerUrl)
+    return await wretch(`${trackleConfig.apiUrl}/orgs/${trackleConfig.orgName}/customers`)
         .headers({
         Authorization: `Basic ${btoa(`${trackleConfig.clientId}:${trackleConfig.clientSecret}`)}`
     })