From 369abe2671fc220449fa846dd6f41c1a178c4e86 Mon Sep 17 00:00:00 2001
From: alex <alex@roese.dev>
Date: Sat, 2 Sep 2023 19:44:01 +0200
Subject: [PATCH] subscribe topics

---
 src/Pages/GroupTasks/Overview/GroupTasksViewModal.js | 7 +++++--
 src/utils.js                                         | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js b/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js
index 1d948fa..0651420 100644
--- a/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js
+++ b/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js
@@ -16,7 +16,6 @@ import {
   Constants,
   FormatDatetime,
   GetDuration,
-  getUserId,
   hasXYPermission,
   myFetch,
 } from "../../../utils";
@@ -481,6 +480,7 @@ export default function GroupTasksViewModal({ isOpen }) {
                     <div id={`${currentGroupTask.current.Id}-scroll-${index}`}>
                       <InputRequiredHandler
                         webSocketContext={webSocketContext}
+                        appContext={appContext}
                         currentGroupTask={currentGroupTask.current}
                         groupTaskParameters={groupTask.parameters}
                         groupTaskStepInputs={
@@ -557,6 +557,7 @@ export default function GroupTasksViewModal({ isOpen }) {
       {notificationContextHolder}
 
       {!currentGroupTask.current ||
+      groupTasksContext === null ||
       !hasXYPermission(
         appContext.userPermissions,
         Constants.PERMISSIONS.GROUP_TASKS.OVERVIEW.XYView,
@@ -699,6 +700,7 @@ export default function GroupTasksViewModal({ isOpen }) {
 
 function InputRequiredHandler({
   webSocketContext,
+  appContext,
   currentGroupTask,
   groupTaskParameters,
   groupTaskStepInputs,
@@ -756,8 +758,9 @@ function InputRequiredHandler({
     inputValue
   ) => {
     webSocketContext.SendSocketMessage(SentMessagesCommands.TaskLocking, {
+      category: currentGroupTask.Category, // needed for ws topic
       element: `${currentGroupTaskId}-${step}-${groupTaskParameterName}`,
-      lockedByUserId: getUserId(),
+      lockedByUserId: appContext.userId.current,
       groupTaskId: currentGroupTaskId,
       parameterName: groupTaskParameterName,
       value: inputValue,
diff --git a/src/utils.js b/src/utils.js
index 8c5f4d7..3ea5e37 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1241,10 +1241,10 @@ export function getConnectionStatusItem(connectionStatus) {
     <Badge status="success" text="Online" />
   );
 }
-
+/*
 export function getUserId() {
   return localStorage.getItem("userId");
-}
+} */
 
 const emailRegex =
   /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;