subscribe topics

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,

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,}))$/;