Jannex
/
admin-dashboard-web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

subscribe topics

main
alex 2023-09-02 19:44:01 +02:00
parent b4b0c69284
commit 369abe2671
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Pages/GroupTasks/Overview/GroupTasksViewModal.js
View File

@ -16,7 +16,6 @@ import {
Constants, Constants,
FormatDatetime, FormatDatetime,
GetDuration, GetDuration,
getUserId,
hasXYPermission, hasXYPermission,
myFetch, myFetch,
} from "../../../utils"; } from "../../../utils";
@ -481,6 +480,7 @@ export default function GroupTasksViewModal({ isOpen }) {
<div id={`${currentGroupTask.current.Id}-scroll-${index}`}> <div id={`${currentGroupTask.current.Id}-scroll-${index}`}>
<InputRequiredHandler <InputRequiredHandler
webSocketContext={webSocketContext} webSocketContext={webSocketContext}
appContext={appContext}
currentGroupTask={currentGroupTask.current} currentGroupTask={currentGroupTask.current}
groupTaskParameters={groupTask.parameters} groupTaskParameters={groupTask.parameters}
groupTaskStepInputs={ groupTaskStepInputs={
@ -557,6 +557,7 @@ export default function GroupTasksViewModal({ isOpen }) {
{notificationContextHolder} {notificationContextHolder}
{!currentGroupTask.current || {!currentGroupTask.current ||
groupTasksContext === null ||
!hasXYPermission( !hasXYPermission(
appContext.userPermissions, appContext.userPermissions,
Constants.PERMISSIONS.GROUP_TASKS.OVERVIEW.XYView, Constants.PERMISSIONS.GROUP_TASKS.OVERVIEW.XYView,
@ -699,6 +700,7 @@ export default function GroupTasksViewModal({ isOpen }) {
function InputRequiredHandler({ function InputRequiredHandler({
webSocketContext, webSocketContext,
appContext,
currentGroupTask, currentGroupTask,
groupTaskParameters, groupTaskParameters,
groupTaskStepInputs, groupTaskStepInputs,
@ -756,8 +758,9 @@ function InputRequiredHandler({
inputValue inputValue
) => { ) => {
webSocketContext.SendSocketMessage(SentMessagesCommands.TaskLocking, { webSocketContext.SendSocketMessage(SentMessagesCommands.TaskLocking, {
category: currentGroupTask.Category, // needed for ws topic
element: `${currentGroupTaskId}-${step}-${groupTaskParameterName}`, element: `${currentGroupTaskId}-${step}-${groupTaskParameterName}`,
lockedByUserId: getUserId(), lockedByUserId: appContext.userId.current,
groupTaskId: currentGroupTaskId, groupTaskId: currentGroupTaskId,
parameterName: groupTaskParameterName, parameterName: groupTaskParameterName,
value: inputValue, value: inputValue,

4
src/utils.js
View File

@ -1241,10 +1241,10 @@ export function getConnectionStatusItem(connectionStatus) {
<Badge status="success" text="Online" /> <Badge status="success" text="Online" />
); );
} }
/*
export function getUserId() { export function getUserId() {
return localStorage.getItem("userId"); return localStorage.getItem("userId");
} } */
const emailRegex = 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,}))$/; /^(([^<>()[\]\\.,;:\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,}))$/;