diff --git a/public/locales/de/translation.json b/public/locales/de/translation.json index 419ec2a..41ff88c 100644 --- a/public/locales/de/translation.json +++ b/public/locales/de/translation.json @@ -144,12 +144,6 @@ "popover": { "title": "Sind Sie sicher, dass Sie die globalen Python Bibliotheken installieren wollen?" } - }, - "checkingForCategoryGroupChanges": { - "check": "Prüfung auf Änderungen der Kategoriegruppen", - "popover": { - "title": "Sind Sie sicher, dass Sie die Kategoriegruppen prüfen wollen? (Während der Prüfung schaut der Server nach neuen Kategoriegruppen und löscht ggf. nicht mehr vorhandene)" - } } } }, diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 2a01339..01dc226 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -144,12 +144,6 @@ "popover": { "title": "Are you sure you want to install the global Python libraries?" } - }, - "checkingForCategoryGroupChanges": { - "check": "Checking for Category Group Changes", - "popover": { - "title": "Are you sure you want to check category groups? (During the check, the server looks for new category groups and deletes those that are no longer available)" - } } } }, diff --git a/src/Handlers/WebSocketMessageHandler.js b/src/Handlers/WebSocketMessageHandler.js index b0bc36e..56987c0 100644 --- a/src/Handlers/WebSocketMessageHandler.js +++ b/src/Handlers/WebSocketMessageHandler.js @@ -30,7 +30,6 @@ export const ReceivedMessagesCommands = { AllUsersNewUserCreated: 26, AllUsersUserDeleted: 27, AllUsersUserDeactivation: 28, - GroupTasksCategoryGroupChanges: 29, NewUserApiKeyCreated: 30, DeletedUserApiKey: 31, NewApiKeyUsageCount: 32, @@ -66,7 +65,6 @@ export const SentMessagesCommands = { AllUsersUserDeactivation: 14, ScannersUseScanners: 15, ScannersDisconnectScanner: 16, - GroupTasksCheckingForCategoryGroupChanges: 17, HandleUserActionTaskStep: 18, CreateNewUserApiKey: 19, DeleteUserApiKey: 20, @@ -716,113 +714,6 @@ export function handleWebSocketMessage( return newArr; }); break; - case ReceivedMessagesCommands.GroupTasksCategoryGroupChanges: - if ( - body["AddedPermissions"] !== undefined || - body["RemovedPermissions"] !== undefined - ) { - appContext.setUserPermissions((arr) => { - let newArr = [...arr]; - - if (body["AddedPermissions"] !== undefined) { - newArr = newArr.concat(body.AddedPermissions); - } - - if (body["RemovedPermissions"] !== undefined) { - newArr = newArr.filter( - (permission) => !body.RemovedPermissions.includes(permission) - ); - } - - return newArr; - }); - - /*setUser((user) => { - const updatedUser = { ...user }; - - if ( - body.AddedPermissions !== undefined && - updatedUser.RoleId === body.MasterRoleId - ) { - updatedUser.Permissions = updatedUser.Permissions.concat( - body.AddedPermissions - ); - } - - if (body.RemovedPermissions !== undefined) { - updatedUser.Permissions = updatedUser.Permissions.filter( - (permission) => !body.RemovedPermissions.includes(permission) - ); - } - - return updatedUser; - });*/ - - adminAreaRolesContext.setRolesPermissions((arr) => { - let newArr = [...arr]; - - const roleIndex = arr.findIndex( - (item) => item.RoleId === body.MasterRoleId - ); - - if (roleIndex !== -1) { - if (body.AddedPermissions !== undefined) { - newArr[roleIndex].Permissions = newArr[ - roleIndex - ].Permissions.concat(body.AddedPermissions); - } - - if (body.RemovedPermissions !== undefined) { - newArr[roleIndex].Permissions = newArr[ - roleIndex - ].Permissions.filter( - (permission) => !body.RemovedPermissions.includes(permission) - ); - } - } - - return newArr; - }); - } - - /* - TODO: handle this - if ( - body["AddedCategoryGroups"] !== undefined || - body["RemovedCategoryGroups"] !== undefined - ) { - groupTasksContext.setCategoryGroup((arr) => { - let newArr = [...arr]; - - if (body["RemovedCategoryGroups"] !== undefined) { - newArr = newArr.filter( - (c) => !body.RemovedCategoryGroups.includes(c.category) - ); - } - - if (body["AddedCategoryGroups"] !== undefined) { - newArr = newArr.concat(body.AddedCategoryGroups); - } - - newArr = newArr.sort((a, b) => { - if (a.category < b.category) { - return -1; // a below b - } else if (a.category > b.category) { - return 1; // a above b - } else { - return 0; // keep the order - } - }); - - return newArr; - }); - } */ - - notificationApi["success"]({ - message: `Category group changes reloaded`, - description: `You can now continue with the work`, - }); - break; case ReceivedMessagesCommands.NewUserApiKeyCreated: /*userProfileContext.setUserProfile((user) => ({ ...user, diff --git a/src/Pages/GroupTasks/Overview/index.js b/src/Pages/GroupTasks/Overview/index.js index e4f8ea0..0a9647f 100644 --- a/src/Pages/GroupTasks/Overview/index.js +++ b/src/Pages/GroupTasks/Overview/index.js @@ -32,13 +32,6 @@ export default function GroupTasks({ isGroupTasksViewModalOpen }) { setCurrentSelectedModalGroupType(null); }; - const onCheckingForCategoryGroupChanges = () => { - webSocketContext.SendSocketMessage( - SentMessagesCommands.GroupTasksCheckingForCategoryGroupChanges, - {} - ); - }; - const onInstallGlobalPythonPackages = () => { webSocketContext.SendSocketMessage( SentMessagesCommands.GroupTasksInstallGlobalPythonPackages, @@ -136,40 +129,6 @@ export default function GroupTasks({ isGroupTasksViewModalOpen }) { setPaginationPage={(page) => onPaginationChange(page)} totalPages={groupTasksContext.totalPages} /> - - {hasPermission( - appContext.userPermissions, - Constants.PERMISSIONS.GROUP_TASKS - .CHECKING_FOR_CATEGORY_GROUP_CHANGES - ) && ( -
- onCheckingForCategoryGroupChanges()} - > - - -
- )} )} diff --git a/src/utils.js b/src/utils.js index df97c28..7b8ee2c 100644 --- a/src/utils.js +++ b/src/utils.js @@ -109,8 +109,6 @@ export const Constants = { HISTORY: "group_tasks.history", INSTALL_GLOBAL_PYTHON_PACKAGES: "group_tasks.install_global_python_packages", - CHECKING_FOR_CATEGORY_GROUP_CHANGES: - "group_tasks.checking_for_category_group_changes", }, ALL_USERS: { CREATE_NEW_USER: "all_users.create_new_user",