Fix batch-delete

Signed-off-by: soupette <cyril.lpz@gmail.com>

packages/strapi-admin/admin/ee/containers/Roles/ListPage/RoleRow.js

@@ -14,11 +14,7 @@ const RoleRow = ({ role, onRoleToggle, onRoleDuplicate, onRoleRemove, selectedRo
   const handleRoleSelection = e => {
     e.stopPropagation();
 
-    if (role.usersCount) {
-      strapi.notification.info('Roles.ListPage.notification.delete-not-allowed');
-    } else {
     onRoleToggle(role.id);
-    }
   };
 
   const handleClickDelete = () => {

packages/strapi-admin/admin/ee/containers/Roles/ListPage/index.js

@@ -53,10 +53,20 @@ const RoleListPage = () => {
 
   const handleConfirmDeleteData = async () => {
     try {
+      const filteredRoles = selectedRoles.filter(currentId => {
+        const currentRole = roles.find(role => role.id === currentId);
+
+        return currentRole.usersCount === 0;
+      });
+
+      if (selectedRoles.length !== filteredRoles.length) {
+        strapi.notification.info('Roles.ListPage.notification.delete-all-not-allowed');
+      }
+
       await request('/admin/roles/batch-delete', {
         method: 'POST',
         body: {
-          ids: selectedRoles,
+          ids: filteredRoles,
         },
       });
 

packages/strapi-admin/admin/src/translations/en.json

@@ -345,6 +345,7 @@
   "app.containers.AuthPage.ForgotPasswordSuccess.text.contact-admin": "If you do not receive this link, please contact your administrator.",
   "app.containers.AuthPage.ForgotPasswordSuccess.title": "Email sent",
   "Roles.ListPage.notification.delete-not-allowed": "A role cannot be deleted if associated with users",
+  "Roles.ListPage.notification.delete-all-not-allowed": "Some roles could not be deleted since they are associated with users",
   "Roles.RoleRow.user-count.plural": "{number} users",
   "Roles.RoleRow.user-count.singular": "{number} user",
   "Roles.components.List.empty.withSearch": "There is no role corresponding to the search ({search})..."