diff --git a/src/Pages/GroupTasks/Overview/GroupTasksTableList.js b/src/Pages/GroupTasks/Overview/GroupTasksTableList.js
index c297806..2d26b66 100644
--- a/src/Pages/GroupTasks/Overview/GroupTasksTableList.js
+++ b/src/Pages/GroupTasks/Overview/GroupTasksTableList.js
@@ -16,15 +16,12 @@ import {
MyAvatar,
SentMessagesCommands,
WebSocketContext,
+ hasOneXYPermission,
+ hasXYPermission,
} from "../../../utils";
import { useContext } from "react";
const columns = [
- /*{
- title: "ID",
- dataIndex: "id",
- key: "id",
- },*/
{
title: "Creator",
dataIndex: "creator",
@@ -124,7 +121,6 @@ export default function GroupTaskTableList({
items.push({
key: groupTask.Id,
- //id: groupTask.Id,
creator: (
<>
{user?.Username}
@@ -153,30 +149,57 @@ export default function GroupTaskTableList({
return (
<>
{categoryGroup.category}
-
-
}
- onClick={() => showGroupTypeSelectionModal(categoryGroup)}
- >
- New task
-
-
handleOnConfirm(categoryGroup.category)}
- >
- }>Reload
-
-
+ {hasOneXYPermission(
+ webSocketContext.User.Permissions,
+ categoryGroup.category,
+ Constants.PERMISSIONS.GROUP_TASKS.OVERVIEW.XYNewTask,
+ Constants.PERMISSIONS.GROUP_TASKS.OVERVIEW.XYReloadGroupConfig
+ ) && (
+
+ {hasXYPermission(
+ webSocketContext.User.Permissions,
+ Constants.PERMISSIONS.GROUP_TASKS.OVERVIEW.XYNewTask,
+ categoryGroup.category
+ ) && (
+
}
+ onClick={() => showGroupTypeSelectionModal(categoryGroup)}
+ >
+ New task
+
+ )}
+
+ {hasXYPermission(
+ webSocketContext.User.Permissions,
+ Constants.PERMISSIONS.GROUP_TASKS.OVERVIEW.XYReloadGroupConfig,
+ categoryGroup.category
+ ) && (
+
handleOnConfirm(categoryGroup.category)}
+ >
+ }>Reload
+
+ )}
+
+ )}
+
>
);
diff --git a/src/Pages/GroupTasks/Overview/index.js b/src/Pages/GroupTasks/Overview/index.js
index 266d1bc..1934fb1 100644
--- a/src/Pages/GroupTasks/Overview/index.js
+++ b/src/Pages/GroupTasks/Overview/index.js
@@ -3,7 +3,7 @@ import { useContext, useState } from "react";
import GroupTasksViewModal from "./GroupTasksViewModal";
import GroupTypeSelectionModal from "./GroupTypeSelectionModal";
import GroupTaskTableList from "./GroupTasksTableList";
-import { WebSocketContext } from "../../../utils";
+import { Constants, WebSocketContext, hasXYPermission } from "../../../utils";
export default function GroupTasks({ isGroupTasksViewModalOpen }) {
const [isGroupTypeSelectionModalOpen, setIsGroupTypeSelectionModalOpen] =
@@ -19,6 +19,31 @@ export default function GroupTasks({ isGroupTasksViewModalOpen }) {
setCurrentSelectedModalGroupType(null);
};
+ const GroupTaskTableListItems = () => {
+ const items = [];
+
+ webSocketContext.CategoryGroups.forEach((categoryGroup) => {
+ if (
+ hasXYPermission(
+ webSocketContext.User.Permissions,
+ Constants.PERMISSIONS.GROUP_TASKS.OVERVIEW.XYView,
+ categoryGroup.category
+ )
+ ) {
+ items.push(
+
+ );
+ }
+ });
+
+ return items;
+ };
+
return (
<>
GROUP TASKS
@@ -26,16 +51,7 @@ export default function GroupTasks({ isGroupTasksViewModalOpen }) {
{webSocketContext.CategoryGroups.length === 0 ? (
) : (
- webSocketContext.CategoryGroups.map((categoryGroup) => {
- return (
-
- );
- })
+
)}