code optimization

app/src/services/factoryBuilder/collab/getActiveUsers.ts

@@ -1,41 +1,31 @@
 let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
 
 export default async function getActiveUsersData(organization: string) {
-  const apiUrl = `${url_Backend_dwinzo}/api/v1/activeCameras/${organization}`;
+    const apiUrl = `${url_Backend_dwinzo}/api/v1/activeCameras/${organization}`;
 
-  try {
-    const response = await fetch(apiUrl, {
-      method: "GET",
-      headers: {
-        Authorization: "Bearer <access_token>",
-        "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",
-        refresh_token: localStorage.getItem("refreshToken") || "",
-      },
-    });
+    try {
+        const response = await fetch(apiUrl, {
+            method: "GET",
+            headers: {
+                Authorization: "Bearer <access_token>",
+                "Content-Type": "application/json",
+                token: localStorage.getItem("token") || "",
+                refresh_token: localStorage.getItem("refreshToken") || "",
+            },
+        });
 
-    const newAccessToken = response.headers.get("x-access-token");
-    if (newAccessToken) {
-      //console.log("New token received:", newAccessToken);
-      localStorage.setItem("token", newAccessToken);
+        const newAccessToken = response.headers.get("x-access-token");
+        if (newAccessToken) {
+            localStorage.setItem("token", newAccessToken);
+        }
+
+        if (!response.ok) {
+            echo.error("Failed to get active users");
+        }
+
+        const result = await response.json();
+        return result;
+    } catch {
+        echo.error("Failed to get active users");
     }
-
-    if (!response.ok) {
-      console.error(`Error: ${response.status} - ${response.statusText}`);
-    }
-
-    if (!response.ok) {
-      console.error("Failed to get active cameras ");
-    }
-
-    const result = await response.json();
-    return result;
-  } catch (error) {
-    echo.error("Failed to get active users");
-    if (error instanceof Error) {
-      console.log(error.message);
-    } else {
-      console.log("An unknown error occurred");
-    }
-  }
 }

app/src/services/factoryBuilder/collab/getProjectSharedList.ts

@@ -1,32 +1,31 @@
 let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
 
 export const getProjectSharedList = async (projectId: string) => {
-  try {
-    const response = await fetch(
-      `${url_Backend_dwinzo}/api/V1/projectsharedList?projectId=${projectId}`,
-      {
-        method: "GET",
-        headers: {
-          Authorization: "Bearer <access_token>",
-          "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",
-          refresh_token: localStorage.getItem("refreshToken") || "",
-        },
-      }
-    );
-    const newAccessToken = response.headers.get("x-access-token");
-    if (newAccessToken) {
-      //console.log("New token received:", newAccessToken);
-      localStorage.setItem("token", newAccessToken);
-    }
 
-    if (!response.ok) {
-      throw new Error("Failed to get users");
-    }
+    try {
+        const response = await fetch(
+            `${url_Backend_dwinzo}/api/V1/projectsharedList?projectId=${projectId}`,
+            {
+                method: "GET",
+                headers: {
+                    Authorization: "Bearer <access_token>",
+                    "Content-Type": "application/json",
+                    token: localStorage.getItem("token") || "",
+                    refresh_token: localStorage.getItem("refreshToken") || "",
+                },
+            }
+        );
+        const newAccessToken = response.headers.get("x-access-token");
+        if (newAccessToken) {
+            localStorage.setItem("token", newAccessToken);
+        }
 
-    return await response.json();
-  } catch (error: any) {
-    echo.error("Failed to get users");
-    console.log(error.message);
-  }
+        if (!response.ok) {
+            echo.error("Failed to get shared project users");
+        }
+
+        return await response.json();
+    } catch {
+        echo.error("Failed to get shared project users");
+    }
 };

app/src/services/factoryBuilder/collab/getSearchUsers.ts

@@ -1,32 +1,31 @@
 let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
 
 export const getSearchUsers = async (searchMail: string) => {
-  try {
-    const response = await fetch(
-      `${url_Backend_dwinzo}/api/V1/searchMail?searchMail=${searchMail}`,
-      {
-        method: "GET",
-        headers: {
-          Authorization: "Bearer <access_token>",
-          "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",
-          refresh_token: localStorage.getItem("refreshToken") || "",
-        },
-      }
-    );
-    const newAccessToken = response.headers.get("x-access-token");
-    if (newAccessToken) {
-      //console.log("New token received:", newAccessToken);
-      localStorage.setItem("token", newAccessToken);
-    }
 
-    if (!response.ok) {
-      throw new Error("Failed to get users");
-    }
+    try {
+        const response = await fetch(
+            `${url_Backend_dwinzo}/api/V1/searchMail?searchMail=${searchMail}`,
+            {
+                method: "GET",
+                headers: {
+                    Authorization: "Bearer <access_token>",
+                    "Content-Type": "application/json",
+                    token: localStorage.getItem("token") || "",
+                    refresh_token: localStorage.getItem("refreshToken") || "",
+                },
+            }
+        );
+        const newAccessToken = response.headers.get("x-access-token");
+        if (newAccessToken) {
+            localStorage.setItem("token", newAccessToken);
+        }
 
-    return await response.json();
-  } catch (error: any) {
-    echo.error("Failed to get users");
-    console.log(error.message);
-  }
+        if (!response.ok) {
+            echo.error("Failed to get users");
+        }
+
+        return await response.json();
+    } catch {
+        echo.error("Failed to get users");
+    }
 };

app/src/services/factoryBuilder/collab/getUsersApi.ts

@@ -1,40 +1,31 @@
 let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
 
 export default async function fetchShareUsers(organization: string) {
-  const apiUrl = `${url_Backend_dwinzo}/api/v1/findshareUsers?organization=${organization}`;
+    const apiUrl = `${url_Backend_dwinzo}/api/v1/findshareUsers?organization=${organization}`;
 
-  try {
-    const response = await fetch(apiUrl, {
-      method: "GET",
-      headers: {
-        Authorization: "Bearer <access_token>",
-        "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",
-        refresh_token: localStorage.getItem("refreshToken") || "",
-      },
-    });
+    try {
+        const response = await fetch(apiUrl, {
+            method: "GET",
+            headers: {
+                Authorization: "Bearer <access_token>",
+                "Content-Type": "application/json",
+                token: localStorage.getItem("token") || "",
+                refresh_token: localStorage.getItem("refreshToken") || "",
+            },
+        });
 
-    const newAccessToken = response.headers.get("x-access-token");
-    if (newAccessToken) {
-      //console.log("New token received:", newAccessToken);
-      localStorage.setItem("token", newAccessToken);
-    }
-    if (!response.ok) {
-      console.error(`Error: ${response.status} - ${response.statusText}`);
-    }
+        const newAccessToken = response.headers.get("x-access-token");
+        if (newAccessToken) {
+            localStorage.setItem("token", newAccessToken);
+        }
 
-    if (!response.ok) {
-      console.error("Failed to get users ");
-    }
+        if (!response.ok) {
+            console.error("Failed to get shared users");
+        }
 
-    const result = await response.json();
-    return result;
-  } catch (error) {
-    echo.error("Failed to get user API");
-    if (error instanceof Error) {
-      console.log(error.message);
-    } else {
-      console.log("An unknown error occurred");
+        const result = await response.json();
+        return result;
+    } catch {
+        echo.error("Failed to get shared users");
     }
-  }
 }

app/src/services/factoryBuilder/collab/giveCollabAccess.ts

@@ -1,39 +1,34 @@
 let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
 
 export default async function giveCollabAccess(
-  email: string,
-  isShare: boolean,
-  organization: string
+    email: string,
+    isShare: boolean,
+    organization: string
 ) {
-  try {
-    const response = await fetch(`${url_Backend_dwinzo}/api/v1/shareUser`, {
-      method: "POST",
-      headers: {
-        Authorization: "Bearer <access_token>",
-        "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",
-        refresh_token: localStorage.getItem("refreshToken") || "",
-      },
-      body: JSON.stringify({ email, isShare, organization }),
-    });
-    const newAccessToken = response.headers.get("x-access-token");
-    if (newAccessToken) {
-      //console.log("New token received:", newAccessToken);
-      localStorage.setItem("token", newAccessToken);
-    }
 
-    if (!response.ok) {
-      console.error("Failed to set Camera Position and Target");
-    }
+    try {
+        const response = await fetch(`${url_Backend_dwinzo}/api/v1/shareUser`, {
+            method: "POST",
+            headers: {
+                Authorization: "Bearer <access_token>",
+                "Content-Type": "application/json",
+                token: localStorage.getItem("token") || "",
+                refresh_token: localStorage.getItem("refreshToken") || "",
+            },
+            body: JSON.stringify({ email, isShare, organization }),
+        });
+        const newAccessToken = response.headers.get("x-access-token");
+        if (newAccessToken) {
+            localStorage.setItem("token", newAccessToken);
+        }
 
-    const result = await response.json();
-    return result;
-  } catch (error) {
-    echo.error("Failed to give collab access");
-    if (error instanceof Error) {
-      console.log(error.message);
-    } else {
-      console.log("An unknown error occurred");
+        if (!response.ok) {
+            echo.error("Failed to give collab access");
+        }
+
+        const result = await response.json();
+        return result;
+    } catch {
+        echo.error("Failed to give collab access");
     }
-  }
 }

app/src/services/factoryBuilder/collab/shareAccess.ts

@@ -1,48 +1,38 @@
 let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
-// let url_Backend_dwinzo = `http://192.168.0.102:5000`;
 
 export const shareAccess = async (
-  projectId: string,
-  targetUserId: string,
-  newAccessPoint: string
+    projectId: string,
+    targetUserId: string,
+    newAccessPoint: string
 ) => {
-  const body: any = {
-    projectId,
-    targetUserId,
-    newAccessPoint,
-  };
+    const body = { projectId, targetUserId, newAccessPoint };
 
-  try {
-    const response = await fetch(
-      `${url_Backend_dwinzo}/api/V1/sharedAccespoint`,
-      {
-        method: "PATCH",
-        headers: {
-          Authorization: "Bearer <access_token>",
-          "Content-Type": "application/json",
-          token: localStorage.getItem("token") || "",
-          refresh_token: localStorage.getItem("refreshToken") || "",
-        },
-        body: JSON.stringify(body),
-      }
-    );
-    const newAccessToken = response.headers.get("x-access-token");
-    if (newAccessToken) {
-      //console.log("New token received:", newAccessToken);
-      localStorage.setItem("token", newAccessToken);
-    }
+    try {
+        const response = await fetch(
+            `${url_Backend_dwinzo}/api/V1/sharedAccespoint`,
+            {
+                method: "PATCH",
+                headers: {
+                    Authorization: "Bearer <access_token>",
+                    "Content-Type": "application/json",
+                    token: localStorage.getItem("token") || "",
+                    refresh_token: localStorage.getItem("refreshToken") || "",
+                },
+                body: JSON.stringify(body),
+            }
+        );
+        const newAccessToken = response.headers.get("x-access-token");
+        if (newAccessToken) {
+            localStorage.setItem("token", newAccessToken);
+        }
 
-    if (!response.ok) {
-      console.error("Failed to clearPanel in the zone");
-    }
+        if (!response.ok) {
+            echo.error("Failed to share accesspoint");
+        }
 
-    const result = await response.json();
-    return result;
-  } catch (error) {
-    if (error instanceof Error) {
-      console.error(error.message);
-    } else {
-      console.error("An unknown error occurred");
+        const result = await response.json();
+        return result;
+    } catch {
+        echo.error("Failed to share accesspoint");
     }
-  }
 };

app/src/services/factoryBuilder/collab/shareProject.ts

@@ -1,36 +1,31 @@
 let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
 
 export const shareProject = async (addUserId: string, projectId: string) => {
-  try {
-    const response = await fetch(`${url_Backend_dwinzo}/api/V1/projectshared`, {
-      method: "POST",
-      headers: {
-        Authorization: "Bearer <access_token>",
-        "Content-Type": "application/json",
-        token: localStorage.getItem("token") || "",
-        refresh_token: localStorage.getItem("refreshToken") || "",
-      },
-      body: JSON.stringify({ addUserId, projectId }),
-    });
-    const newAccessToken = response.headers.get("x-access-token");
-    if (newAccessToken) {
-      //console.log("New token received:", newAccessToken);
-      localStorage.setItem("token", newAccessToken);
-    }
 
-    if (!response.ok) {
-      console.error("Failed to add project");
-    }
+    try {
+        const response = await fetch(`${url_Backend_dwinzo}/api/V1/projectshared`, {
+            method: "POST",
+            headers: {
+                Authorization: "Bearer <access_token>",
+                "Content-Type": "application/json",
+                token: localStorage.getItem("token") || "",
+                refresh_token: localStorage.getItem("refreshToken") || "",
+            },
+            body: JSON.stringify({ addUserId, projectId }),
+        });
+        const newAccessToken = response.headers.get("x-access-token");
+        if (newAccessToken) {
+            localStorage.setItem("token", newAccessToken);
+        }
 
-    const result = await response.json();
-    console.log("result: ", result);
+        if (!response.ok) {
+            echo.error("Failed to share project");
+        }
 
-    return result;
-  } catch (error) {
-    if (error instanceof Error) {
-      console.log(error.message);
-    } else {
-      console.log("An unknown error occurred");
+        const result = await response.json();
+
+        return result;
+    } catch {
+        echo.error("Failed to share project");
     }
-  }
 };