@iotready/nextjs-components-library 1.0.0-preview21 → 1.0.0-preview23

package/components/charts/TrendChart.d.ts

@@ -17,7 +17,7 @@ declare const TrendChart: ({ deviceId, measures1, annotationsDataFn, measures2,
     measures2?: Array<Measure>;
     enableDatePicker: boolean;
     handleGetInfluxData: (measure: string, timeStart: number, timeEnd: number, deviceId: string, timeGroup: string, raw: boolean, fill?: InfluxFillType, filterTag?: number, includeTag?: FilterTagMode) => Promise<any>;
-    handleGetDwSlotsCB: (timeStart: number, timeEnd: number, deviceID: string) => Promise<any>;
+    handleGetDwSlotsCB?: (timeStart: number, timeEnd: number, deviceID: string) => Promise<any>;
     handleExportDataCB?: (measure: string, timeStart: number, timeEnd: number, deviceId: string) => Promise<any>;
     theme: Theme;
     initialTimeStart?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iotready/nextjs-components-library",
-  "version": "1.0.0-preview21",
+  "version": "1.0.0-preview23",
   "main": "index.js",
   "scripts": {
     "build": "rm -rf dist && tsc --project tsconfig.build.json && cp package.json dist/",
@@ -20,7 +20,7 @@
     "chartjs-plugin-annotation": "^3.1.0",
     "chartjs-plugin-zoom": "^2.0.1",
     "csv-parse": "^5.6.0",
-    "firebase": "^10.13.1",
+    "firebase-admin": "^13.4.0",
     "leaflet": "^1.9.4",
     "leaflet-defaulticon-compatibility": "^0.1.2",
     "material-ui-confirm": "^3.0.16",

package/server-actions/annotations.d.ts

@@ -1,4 +1,4 @@
-import { FirebaseConfig } from "./types";
-export declare const getAnnotations: (firebaseConfig: FirebaseConfig, deviceID: number) => Promise<{
+import { Firestore } from "firebase-admin/firestore";
+export declare const getAnnotations: (db: Firestore, deviceID: number) => Promise<{
     id: string;
 }[]>;

package/server-actions/annotations.js

@@ -1,14 +1,11 @@
 "use server";
-import { initializeApp } from "firebase/app";
-import { collection, query, orderBy, getDocs, where } from "@firebase/firestore";
-import { getFirestore } from "@firebase/firestore";
-export const getAnnotations = async (firebaseConfig, deviceID) => {
-    // Initialize Firebase
-    const app = initializeApp(firebaseConfig);
-    const db = getFirestore(app);
-    const annotationsQuery = query(collection(db, "annotations"), where("target", "==", deviceID), orderBy("createdAt", "desc"));
-    const groupsSnapshot = await getDocs(annotationsQuery);
-    return groupsSnapshot.docs.map((doc) => ({
+export const getAnnotations = async (db, deviceID) => {
+    const annotationsRef = db.collection("annotations");
+    const snapshot = await annotationsRef
+        .where("target", "==", deviceID)
+        .orderBy("createdAt", "desc")
+        .get();
+    return snapshot.docs.map((doc) => ({
         id: doc.id,
         ...doc.data()
     }));

package/server-actions/groups.d.ts

@@ -1,15 +1,15 @@
-import { FirebaseConfig } from "./types";
-export declare const getGroups: (firebaseConfig: FirebaseConfig, productID: number, userID?: string) => Promise<{
+import { Firestore } from "firebase-admin/firestore";
+export declare const getGroups: (db: Firestore, productID: number, userID?: string) => Promise<{
     id: string;
 }[]>;
-export declare const getGroupById: (firebaseConfig: FirebaseConfig, id: string) => Promise<{
+export declare const getGroupById: (db: Firestore, id: string) => Promise<{
     id: string;
 }>;
-export declare const createGroup: (firebaseConfig: FirebaseConfig, group: any) => Promise<string>;
-export declare const updateGroup: (firebaseConfig: FirebaseConfig, id: string, group: any) => Promise<any>;
-export declare const deleteGroup: (firebaseConfig: FirebaseConfig, id: string) => Promise<void>;
-export declare const getUsersGroup: (firebaseConfig: FirebaseConfig, groupID: string) => Promise<{
+export declare const createGroup: (db: Firestore, group: any) => Promise<string>;
+export declare const updateGroup: (db: Firestore, id: string, group: any) => Promise<any>;
+export declare const deleteGroup: (db: Firestore, id: string) => Promise<void>;
+export declare const getUsersGroup: (db: Firestore, groupID: string) => Promise<{
     id: string;
 }[]>;
-export declare const addUsersGroup: (firebaseConfig: FirebaseConfig, groupID: string, userName: string, userID: string) => Promise<string>;
-export declare const removeUserGroup: (firebaseConfig: FirebaseConfig, groupID: string, userID: string) => Promise<string | undefined>;
+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>;

package/server-actions/groups.js

@@ -1,87 +1,74 @@
 "use server";
-import { initializeApp } from "firebase/app";
-import { getDoc, doc, updateDoc, deleteDoc, collection, query, orderBy, getDocs, where, addDoc } from "@firebase/firestore";
-import { getFirestore } from "@firebase/firestore";
-export const getGroups = async (firebaseConfig, productID, userID) => {
-    // Initialize Firebase
-    const app = initializeApp(firebaseConfig);
-    const db = getFirestore(app);
-    const groupsQuery = query(collection(db, "groups"), where("productID", "==", productID), orderBy("created", "desc"));
+// 1. GET GROUPS
+export const getGroups = async (db, productID, userID) => {
+    const groupsRef = db
+        .collection("groups")
+        .where("productID", "==", productID)
+        .orderBy("created", "desc");
     let groupIds = null;
     if (userID) {
-        const usersGroupQuery = query(collection(db, "userGroups"), where("user.userId", "==", userID));
-        const userSnapshot = await getDocs(usersGroupQuery);
-        groupIds = userSnapshot.docs.map((ug) => ug.data().groupId);
+        const userGroupsSnapshot = await db
+            .collection("userGroups")
+            .where("user.userId", "==", userID)
+            .get();
+        groupIds = userGroupsSnapshot.docs.map((doc) => doc.data().groupId);
     }
-    const groupsSnapshot = await getDocs(groupsQuery);
-    if (groupIds) {
-        return groupsSnapshot.docs
-            .filter((entry) => groupIds?.includes(entry.id))
-            .map((doc) => ({
-            id: doc.id,
-            ...doc.data()
-        }));
-    }
-    return groupsSnapshot.docs.map((doc) => ({
+    const groupsSnapshot = await groupsRef.get();
+    return groupsSnapshot.docs
+        .filter((doc) => !groupIds || groupIds.includes(doc.id))
+        .map((doc) => ({
         id: doc.id,
         ...doc.data()
     }));
 };
-export const getGroupById = async (firebaseConfig, id) => {
-    const app = initializeApp(firebaseConfig);
-    const db = getFirestore(app);
-    const groupSnapshot = await getDoc(doc(db, "groups", id));
+// 2. GET GROUP BY ID
+export const getGroupById = async (db, id) => {
+    const docSnapshot = await db.collection("groups").doc(id).get();
     return {
-        id: groupSnapshot.id,
-        ...groupSnapshot.data()
+        id: docSnapshot.id,
+        ...docSnapshot.data()
     };
 };
-export const createGroup = async (firebaseConfig, group) => {
-    const created = new Date().toISOString();
+// 3. CREATE GROUP
+export const createGroup = async (db, group) => {
     const newGroup = {
         ...group,
-        created
+        created: new Date().toISOString()
     };
-    const app = initializeApp(firebaseConfig);
-    const db = getFirestore(app);
-    const docRef = await addDoc(collection(db, "groups"), newGroup);
+    const docRef = await db.collection("groups").add(newGroup);
     return docRef.id;
 };
-export const updateGroup = async (firebaseConfig, id, group) => {
-    const app = initializeApp(firebaseConfig);
-    const db = getFirestore(app);
-    const groupRef = doc(db, "groups", id);
-    await updateDoc(groupRef, group);
+// 4. UPDATE GROUP
+export const updateGroup = async (db, id, group) => {
+    await db.collection("groups").doc(id).update(group);
     return group;
 };
-export const deleteGroup = async (firebaseConfig, id) => {
-    const app = initializeApp(firebaseConfig);
-    const db = getFirestore(app);
-    const usersGroupQuery = query(collection(db, "userGroups"), where("groupId", "==", id));
-    const groupsSnapshot = await getDocs(usersGroupQuery);
-    groupsSnapshot.docs.forEach(async (ug) => {
-        const userGroupRef = doc(db, "userGroups", ug.id);
-        await deleteDoc(userGroupRef);
+// 5. DELETE GROUP
+export const deleteGroup = async (db, id) => {
+    const userGroupsSnapshot = await db
+        .collection("userGroups")
+        .where("groupId", "==", id)
+        .get();
+    const batch = db.batch();
+    userGroupsSnapshot.docs.forEach((doc) => {
+        batch.delete(doc.ref);
     });
-    const groupRef = doc(db, "groups", id);
-    await deleteDoc(groupRef);
+    batch.delete(db.collection("groups").doc(id));
+    await batch.commit();
 };
-// USERS GROUPS
-export const getUsersGroup = async (firebaseConfig, groupID) => {
-    // Initialize Firebase
-    const app = initializeApp(firebaseConfig);
-    const db = getFirestore(app);
-    const usersGroupQuery = query(collection(db, "userGroups"), where("groupId", "==", groupID));
-    const groupsSnapshot = await getDocs(usersGroupQuery);
-    return groupsSnapshot.docs.map((doc) => ({
+// 6. GET USERS GROUP
+export const getUsersGroup = async (db, groupID) => {
+    const snapshot = await db
+        .collection("userGroups")
+        .where("groupId", "==", groupID)
+        .get();
+    return snapshot.docs.map((doc) => ({
         id: doc.id,
         ...doc.data()
     }));
 };
-export const addUsersGroup = async (firebaseConfig, groupID, userName, userID) => {
-    // Initialize Firebase
-    const app = initializeApp(firebaseConfig);
-    const db = getFirestore(app);
+// 7. ADD USER TO GROUP
+export const addUsersGroup = async (db, groupID, userName, userID) => {
     const created = new Date().toISOString();
     const newUserGroup = {
         user: {
@@ -91,19 +78,19 @@ export const addUsersGroup = async (firebaseConfig, groupID, userName, userID) =
         groupId: groupID,
         created
     };
-    const docRef = await addDoc(collection(db, "userGroups"), newUserGroup);
+    const docRef = await db.collection("userGroups").add(newUserGroup);
     return docRef.id;
 };
-export const removeUserGroup = async (firebaseConfig, groupID, userID) => {
-    // Initialize Firebase
-    const app = initializeApp(firebaseConfig);
-    const db = getFirestore(app);
-    const usersGroupQuery = query(collection(db, "userGroups"), where("groupId", "==", groupID), where("user.userId", "==", userID));
-    const groupsSnapshot = await getDocs(usersGroupQuery);
-    if (groupsSnapshot.docs[0]) {
-        const userGroupId = groupsSnapshot.docs[0].id;
-        const groupRef = doc(db, "userGroups", userGroupId);
-        await deleteDoc(groupRef);
-        return userGroupId;
+// 8. REMOVE USER FROM GROUP
+export const removeUserGroup = async (db, groupID, userID) => {
+    const snapshot = await db
+        .collection("userGroups")
+        .where("groupId", "==", groupID)
+        .where("user.userId", "==", userID)
+        .get();
+    const doc = snapshot.docs[0];
+    if (doc) {
+        await doc.ref.delete();
+        return doc.id;
     }
 };

package/server-actions/types.d.ts

@@ -1,11 +1,3 @@
-export type FirebaseConfig = {
-    apiKey: string;
-    authDomain: string;
-    projectId: string;
-    storageBucket: string;
-    messagingSenderId: string;
-    appId: string;
-};
 export type InfluxConfig = {
     url: string;
     accessToken: string;