diff --git a/src/Components/SideMenu/index.js b/src/Components/SideMenu/index.js
index 97124d5..14bff7d 100644
--- a/src/Components/SideMenu/index.js
+++ b/src/Components/SideMenu/index.js
@@ -9,7 +9,7 @@ import Sider from "antd/es/layout/Sider";
import { useContext, useEffect, useState } from "react";
import { useLocation, useNavigate } from "react-router-dom";
import PropTypes from "prop-types";
-import { Constants, MyAvatar, WebSocketContext } from "../../utils";
+import { Constants, MyAvatar, WebSocketContext, getUserId } from "../../utils";
export default function SideMenu({ userSession, setUserSession }) {
const location = useLocation();
@@ -22,6 +22,19 @@ export default function SideMenu({ userSession, setUserSession }) {
}, [location.pathname]);
const navigate = useNavigate();
+
+ function getCurrentUsedScannerName() {
+ const userId = getUserId();
+
+ const scannerName = webSocketContext.Scanners.find(
+ (scanner) => scanner.UsedByUserId === userId
+ )?.Name;
+
+ console.log(scannerName);
+
+ return scannerName === undefined ? "No scanner selected" : scannerName;
+ }
+
return (
,
- label: "Alex's Scanner",
+ label: getCurrentUsedScannerName(),
key: "/scanners",
},
{
diff --git a/src/Pages/Scanners/index.js b/src/Pages/Scanners/index.js
index e6afc8b..c2408a0 100644
--- a/src/Pages/Scanners/index.js
+++ b/src/Pages/Scanners/index.js
@@ -3,6 +3,7 @@ import {
FormatDatetime,
MyAvatar,
WebSocketContext,
+ getUserId,
getUserSessionFromLocalStorage,
} from "../../utils";
import { useContext } from "react";
@@ -44,7 +45,7 @@ const columns = [
{
- if (localStorage.getItem("userId") === record._usedByUserId) {
+ if (getUserId() === record._usedByUserId) {
message.error("You are already using this scanner");
return;
}
diff --git a/src/utils.js b/src/utils.js
index bbdfc18..bce510a 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -433,3 +433,7 @@ export function MyAvatar({
return ;
}
+
+export function getUserId() {
+ return localStorage.getItem("userId");
+}