From a6d81e2e30bc61c789be5709f322257993776c94 Mon Sep 17 00:00:00 2001
From: Anika Churilova <nyuta.churilova@gmail.com>
Date: Tue, 16 Apr 2024 15:43:00 +0200
Subject: [PATCH] invitations: rework for the groups invitations

* deprecate COMMUNITIES_GROUPS_ENABLED (moved to USERS_RESOURCES_GROUPS_ENABLED)
* closes https://github.com/inveniosoftware/invenio-app-rdm/issues/2592
---
 .../js/invenio_communities/api/index.js       |  2 ++
 .../components/SearchWithRoleSelection.js     | 22 ++++++++++-----
 .../invitations/InvitationsEmptyResults.js    |  6 ++--
 .../InvitationsResultsContainer.js            |  6 ++--
 .../invitations/InvitationsSearchLayout.js    | 16 ++++-------
 .../members/invitations/index.js              |  8 +++---
 .../invitationsModal/GroupTabPane.js          | 15 +++++-----
 .../InvitationsMembersModal.js                | 12 ++++++--
 .../invitationsModal/MemberSearchBar.js       |  2 +-
 .../manager_view/ManagerEmptyResults.js       |  6 ++--
 .../manager_view/ManagerMemberBulkActions.js  |  2 +-
 .../ManagerMembersResultContainer.js          |  6 ++--
 .../manager_view/ManagerSearchLayout.js       | 16 ++++-------
 .../members/members/manager_view/index.js     |  8 +++---
 invenio_communities/config.py                 |  2 ++
 invenio_communities/generators.py             | 28 +------------------
 invenio_communities/permissions.py            |  2 +-
 .../details/members/invitations.html          |  2 +-
 .../details/members/members.html              |  2 +-
 tests/members/test_members_no_groups.py       |  6 ++--
 20 files changed, 74 insertions(+), 95 deletions(-)

diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/api/index.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/api/index.js
index bcefd7f40..ac5ecb095 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/api/index.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/api/index.js
@@ -7,3 +7,5 @@
 export { CommunityInvitationsApi } from "./invitations/api";
 export { CommunityApi } from "./CommunityApi";
 export { CommunityMembersApi } from "./members/api";
+export { GroupsApi } from "./GroupsApi";
+export { UsersApi } from "./UsersApi";
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/components/SearchWithRoleSelection.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/components/SearchWithRoleSelection.js
index c2c7af005..9de152fde 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/components/SearchWithRoleSelection.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/components/SearchWithRoleSelection.js
@@ -13,14 +13,12 @@ import PropTypes from "prop-types";
 import React, { Component } from "react";
 import { Trans } from "react-i18next";
 import { Button, Form, Modal } from "semantic-ui-react";
-import { UsersApi } from "../../api/UsersApi";
 import { MembersSearchBar } from "../invitations/invitationsModal/MemberSearchBar";
 import { SelectedMembers } from "./bulk_actions/SelectedMembers";
 
 export class SearchWithRoleSelection extends Component {
   constructor(props) {
     super(props);
-    this.usersApi = new UsersApi();
     this.state = {
       role: undefined,
       selected: {},
@@ -69,6 +67,10 @@ export class SearchWithRoleSelection extends Component {
       messageComponent,
       existingEntities,
       existingEntitiesDescription,
+      fetchMembers,
+      searchType,
+      searchBarPlaceholder,
+      doneButtonTipType,
     } = this.props;
     const { selected, loading, error } = this.state;
     const selectedCount = Object.keys(selected).length;
@@ -88,11 +90,11 @@ export class SearchWithRoleSelection extends Component {
               <MembersSearchBar
                 existingEntities={existingEntities}
                 existingEntitiesDescription={existingEntitiesDescription}
-                fetchMembers={this.usersApi.getUsers}
+                fetchMembers={fetchMembers}
                 selectedMembers={selected}
                 handleChange={this.addEntityToSelected}
-                searchType="user"
-                placeholder={i18next.t("Search by email, full name or username")}
+                searchType={searchType}
+                placeholder={searchBarPlaceholder}
               />
               <label className="helptext rel-mt-1">{searchBarTooltip}</label>
             </Form.Field>
@@ -102,7 +104,7 @@ export class SearchWithRoleSelection extends Component {
               onOptionChangeCallback={this.handleRoleUpdate}
               checked={false}
             />
-            <Form.Field>{messageComponent}</Form.Field>
+            {searchType !== "group" && <Form.Field>{messageComponent}</Form.Field>}
           </Form>
         </Modal.Content>
         <Modal.Actions>
@@ -117,7 +119,7 @@ export class SearchWithRoleSelection extends Component {
           />
           {selectedCount > 0 && (
             <Trans key="entitiesSelected" count={selectedCount}>
-              {doneButtonTip} {{ selectedCount }} users
+              {doneButtonTip} {{ selectedCount }} {doneButtonTipType}
             </Trans>
           )}
           <Button
@@ -142,9 +144,11 @@ SearchWithRoleSelection.propTypes = {
   onSuccessCallback: PropTypes.func.isRequired,
   searchBarTitle: PropTypes.object,
   searchBarTooltip: PropTypes.string,
+  searchBarPlaceholder: PropTypes.string,
   doneButtonText: PropTypes.string,
   doneButtonIcon: PropTypes.string,
   doneButtonTip: PropTypes.string,
+  doneButtonTipType: PropTypes.string,
   radioLabel: PropTypes.string,
   selectedItemsHeader: PropTypes.string,
   message: PropTypes.string,
@@ -152,6 +156,8 @@ SearchWithRoleSelection.propTypes = {
   notify: PropTypes.bool,
   existingEntities: PropTypes.array.isRequired,
   existingEntitiesDescription: PropTypes.string,
+  fetchMembers: PropTypes.func.isRequired,
+  searchType: PropTypes.oneOf(["group", "user"]).isRequired,
 };
 
 SearchWithRoleSelection.defaultProps = {
@@ -160,6 +166,8 @@ SearchWithRoleSelection.defaultProps = {
   doneButtonText: "",
   doneButtonIcon: "",
   doneButtonTip: "",
+  doneButtonTipType: "",
+  searchBarPlaceholder: "",
   radioLabel: "",
   selectedItemsHeader: "",
   message: "",
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/InvitationsEmptyResults.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/InvitationsEmptyResults.js
index 0abbaad09..868ef41e5 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/InvitationsEmptyResults.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/InvitationsEmptyResults.js
@@ -13,7 +13,7 @@ class InvitationsEmptyResultsCmp extends Component {
       extraContent,
       queryString,
       community,
-      communityGroupsEnabled,
+      groupsEnabled,
       rolesCanInvite,
     } = this.props;
 
@@ -25,7 +25,7 @@ class InvitationsEmptyResultsCmp extends Component {
             <InvitationsContextProvider community={community}>
               <InvitationsMembersModalWithSearchKit
                 rolesCanInvite={rolesCanInvite}
-                groupsEnabled={communityGroupsEnabled}
+                groupsEnabled={groupsEnabled}
                 community={community}
               />
             </InvitationsContextProvider>
@@ -58,7 +58,7 @@ InvitationsEmptyResultsCmp.propTypes = {
   queryString: PropTypes.string.isRequired,
   rolesCanInvite: PropTypes.object.isRequired,
   community: PropTypes.object.isRequired,
-  communityGroupsEnabled: PropTypes.bool.isRequired,
+  groupsEnabled: PropTypes.bool.isRequired,
   extraContent: PropTypes.node,
 };
 
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/InvitationsResultsContainer.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/InvitationsResultsContainer.js
index 9deb83e3c..5416358bc 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/InvitationsResultsContainer.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/InvitationsResultsContainer.js
@@ -17,7 +17,7 @@ export const InvitationsResultsContainer = ({
   results,
   rolesCanInvite,
   community,
-  communityGroupsEnabled,
+  groupsEnabled,
 }) => {
   return (
     <Table>
@@ -31,7 +31,7 @@ export const InvitationsResultsContainer = ({
             <InvitationsContextProvider community={community}>
               <InvitationsMembersModalWithSearchKit
                 rolesCanInvite={rolesCanInvite}
-                groupsEnabled={communityGroupsEnabled}
+                groupsEnabled={groupsEnabled}
                 community={community}
                 triggerButtonSize="tiny"
               />
@@ -48,5 +48,5 @@ InvitationsResultsContainer.propTypes = {
   results: PropTypes.array.isRequired,
   rolesCanInvite: PropTypes.object.isRequired,
   community: PropTypes.object.isRequired,
-  communityGroupsEnabled: PropTypes.bool.isRequired,
+  groupsEnabled: PropTypes.bool.isRequired,
 };
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/InvitationsSearchLayout.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/InvitationsSearchLayout.js
index e85f56f44..88dc8c113 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/InvitationsSearchLayout.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/InvitationsSearchLayout.js
@@ -19,14 +19,8 @@ import { SearchFilters } from "@js/invenio_search_ui/components/SearchFilters";
 
 export class InvitationsSearchLayout extends Component {
   render() {
-    const {
-      config,
-      roles,
-      rolesCanInvite,
-      community,
-      communityGroupsEnabled,
-      appName,
-    } = this.props;
+    const { config, roles, rolesCanInvite, community, groupsEnabled, appName } =
+      this.props;
 
     const filtersClass = new Filters(roles);
     const customFilters = filtersClass.getInvitationFilters();
@@ -42,7 +36,7 @@ export class InvitationsSearchLayout extends Component {
                 <InvitationsContextProvider community={community}>
                   <InvitationsMembersModalWithSearchKit
                     rolesCanInvite={rolesCanInvite}
-                    groupsEnabled={communityGroupsEnabled}
+                    groupsEnabled={groupsEnabled}
                     community={community}
                   />
                 </InvitationsContextProvider>
@@ -59,7 +53,7 @@ export class InvitationsSearchLayout extends Component {
               <InvitationsContextProvider community={community}>
                 <InvitationsMembersModalWithSearchKit
                   rolesCanInvite={rolesCanInvite}
-                  groupsEnabled={communityGroupsEnabled}
+                  groupsEnabled={groupsEnabled}
                   community={community}
                 />
               </InvitationsContextProvider>
@@ -86,7 +80,7 @@ InvitationsSearchLayout.propTypes = {
   roles: PropTypes.array.isRequired,
   rolesCanInvite: PropTypes.object.isRequired,
   community: PropTypes.object.isRequired,
-  communityGroupsEnabled: PropTypes.bool.isRequired,
+  groupsEnabled: PropTypes.bool.isRequired,
   appName: PropTypes.string,
 };
 
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/index.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/index.js
index 89bdb261c..34862a764 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/index.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/index.js
@@ -33,7 +33,7 @@ const permissions = JSON.parse(dataAttr.permissions);
 
 const appName = "InvenioCommunities.InvitationsSearch";
 
-const communityGroupsEnabled = JSON.parse(dataAttr.communityGroupsEnabled);
+const groupsEnabled = JSON.parse(dataAttr.groupsEnabled);
 
 const InvitationResultItemWithConfig = parametrize(InvitationResultItem, {
   config: { rolesCanInvite: communitiesRolesCanInvite },
@@ -45,7 +45,7 @@ const InvitationsSearchLayoutWithConfig = parametrize(InvitationsSearchLayout, {
   rolesCanInvite: communitiesRolesCanInvite,
   community: community,
   permissions: permissions,
-  communityGroupsEnabled: communityGroupsEnabled,
+  groupsEnabled: groupsEnabled,
   appName: appName,
 });
 
@@ -56,12 +56,12 @@ const InvitationsContextProvider = parametrize(ContextProvider, {
 const InvitationsResultsContainerWithConfig = parametrize(InvitationsResultsContainer, {
   rolesCanInvite: communitiesRolesCanInvite,
   community: community,
-  communityGroupsEnabled: communityGroupsEnabled,
+  groupsEnabled: groupsEnabled,
 });
 
 const InvitationsEmptyResultsWithCommunity = parametrize(InvitationsEmptyResults, {
   community: community,
-  communityGroupsEnabled: communityGroupsEnabled,
+  groupsEnabled: groupsEnabled,
   rolesCanInvite: communitiesRolesCanInvite,
 });
 
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/invitationsModal/GroupTabPane.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/invitationsModal/GroupTabPane.js
index 5ef2c1ffc..40923567f 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/invitationsModal/GroupTabPane.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/invitationsModal/GroupTabPane.js
@@ -15,7 +15,7 @@ import { i18next } from "@translations/invenio_communities/i18next";
 import { MembersSearchBar } from "./MemberSearchBar";
 import { GroupsApi } from "../../../api/GroupsApi";
 import { Trans } from "react-i18next";
-import { RichEditor, http, withCancel } from "react-invenio-forms";
+import { http, withCancel } from "react-invenio-forms";
 
 export class GroupTabPane extends Component {
   constructor(props) {
@@ -90,7 +90,7 @@ export class GroupTabPane extends Component {
           <SelectedMembers
             updateSelectedMembers={this.updateSelectedMembers}
             selectedMembers={selectedMembers}
-            headerText={i18next.t("Selected groups")}
+            headerText={i18next.t("No selected groups")}
           />
           <Form>
             <Form.Field>
@@ -112,12 +112,11 @@ export class GroupTabPane extends Component {
                 onOptionChangeCallback={this.handleRoleUpdate}
               />
             </Form.Field>
-            <Form.Field disabled>
-              <>
-                <label>{i18next.t("Message")}</label>
-                <RichEditor />
-              </>
-            </Form.Field>
+            <i>
+              {i18next.t(
+                "Note: upon addition, selected groups will become community members immediately without any kind of notification."
+              )}
+            </i>
           </Form>
         </div>
         <Modal.Actions>
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/invitationsModal/InvitationsMembersModal.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/invitationsModal/InvitationsMembersModal.js
index bf0d8167e..0d038986f 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/invitationsModal/InvitationsMembersModal.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/invitationsModal/InvitationsMembersModal.js
@@ -16,6 +16,7 @@ import { InvitationsContext } from "../../../api/invitations/InvitationsContextP
 import { GroupTabPane } from "./GroupTabPane";
 import { SearchWithRoleSelection } from "../../components/SearchWithRoleSelection";
 import { RichEditor, withCancel, http } from "react-invenio-forms";
+import { UsersApi } from "../../../api";
 
 export class InvitationsMembersModal extends Component {
   constructor(props) {
@@ -75,6 +76,7 @@ export class InvitationsMembersModal extends Component {
     const { activeIndex, message, existingIds } = this.state;
     const { api } = this.context;
     const userRoles = rolesCanInvite["user"];
+    const client = new UsersApi();
 
     const peopleTab = {
       menuItem: (
@@ -98,6 +100,8 @@ export class InvitationsMembersModal extends Component {
         >
           <SearchWithRoleSelection
             key="members-users"
+            searchType="user"
+            fetchMembers={client.getUsers}
             roleOptions={userRoles}
             modalClose={this.handleCloseModal}
             action={api.createInvite}
@@ -109,11 +113,11 @@ export class InvitationsMembersModal extends Component {
             doneButtonText={i18next.t("Invite")}
             doneButtonIcon="checkmark"
             radioLabel={i18next.t("Role")}
-            selectedItemsHeader={i18next.t("Selected members")}
+            selectedItemsHeader={i18next.t("No selected members")}
             message={message}
             messageComponent={
               <>
-                <label>{i18next.t("Message")}</label>
+                <label>{i18next.t("Invitation message")}</label>
                 <RichEditor
                   onBlur={(event, editor) => {
                     this.updateMessage(editor.getContent());
@@ -121,11 +125,13 @@ export class InvitationsMembersModal extends Component {
                 />
               </>
             }
-            doneButtonTip="You are about to invite"
+            doneButtonTip={i18next.t("You are about to invite")}
+            doneButtonTipType={i18next.t("users")}
             existingEntities={existingIds}
             existingEntitiesDescription={i18next.t(
               "Already a member or invitation pending"
             )}
+            searchBarPlaceholder={i18next.t("Search by email, full name or username")}
           />
         </Tab.Pane>
       ),
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/invitationsModal/MemberSearchBar.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/invitationsModal/MemberSearchBar.js
index 28ee8c727..02668335e 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/invitationsModal/MemberSearchBar.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/invitations/invitationsModal/MemberSearchBar.js
@@ -53,7 +53,7 @@ export class MembersSearchBar extends Component {
               <Header as="a" className={person?.disabled ? "no-text-decoration" : ""}>
                 {this.serializeMemberName(person)}
               </Header>
-              <Header.Subheader>{person.profile.affiliations}</Header.Subheader>
+              <Header.Subheader>{person.profile?.affiliations}</Header.Subheader>
             </Grid.Column>
             <Grid.Column width={6}>
               {person?.disabled && <p>{existingEntitiesDescription}</p>}
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerEmptyResults.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerEmptyResults.js
index 95d7d5f97..0561cadba 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerEmptyResults.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerEmptyResults.js
@@ -13,7 +13,7 @@ class ManagerEmptyResultsCmp extends Component {
       extraContent,
       queryString,
       community,
-      communityGroupsEnabled,
+      groupsEnabled,
       rolesCanInvite,
     } = this.props;
 
@@ -25,7 +25,7 @@ class ManagerEmptyResultsCmp extends Component {
             <InvitationsContextProvider community={community}>
               <InvitationsMembersModalWithSearchKit
                 rolesCanInvite={rolesCanInvite}
-                groupsEnabled={communityGroupsEnabled}
+                groupsEnabled={groupsEnabled}
                 community={community}
               />
             </InvitationsContextProvider>
@@ -58,7 +58,7 @@ ManagerEmptyResultsCmp.propTypes = {
   queryString: PropTypes.string.isRequired,
   rolesCanInvite: PropTypes.object.isRequired,
   community: PropTypes.object.isRequired,
-  communityGroupsEnabled: PropTypes.bool.isRequired,
+  groupsEnabled: PropTypes.bool.isRequired,
   extraContent: PropTypes.node,
 };
 
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerMemberBulkActions.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerMemberBulkActions.js
index e3094267e..b1b34b65e 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerMemberBulkActions.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerMemberBulkActions.js
@@ -186,7 +186,7 @@ class ManagerMemberBulkActionsCmp extends Component {
             <SelectedMembers
               updateSelectedMembers={this.updateSelectedMembers}
               selectedMembers={selectedMembers}
-              headerText={i18next.t("Selected members")}
+              headerText={i18next.t("No selected members")}
             />
             {currentActionRender}
           </Modal.Content>
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerMembersResultContainer.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerMembersResultContainer.js
index c8572e622..7f4d72c77 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerMembersResultContainer.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerMembersResultContainer.js
@@ -16,7 +16,7 @@ import { ManagerMemberBulkActions } from "./ManagerMemberBulkActions";
 export const ManagerMembersResultsContainer = ({
   results,
   community,
-  communityGroupsEnabled,
+  groupsEnabled,
   rolesCanInvite,
   config,
 }) => {
@@ -39,7 +39,7 @@ export const ManagerMembersResultsContainer = ({
             <InvitationsContextProvider community={community}>
               <InvitationsMembersModalWithSearchKit
                 rolesCanInvite={rolesCanInvite}
-                groupsEnabled={communityGroupsEnabled}
+                groupsEnabled={groupsEnabled}
                 community={community}
                 triggerButtonSize="tiny"
               />
@@ -56,6 +56,6 @@ ManagerMembersResultsContainer.propTypes = {
   results: PropTypes.array.isRequired,
   community: PropTypes.object.isRequired,
   rolesCanInvite: PropTypes.object.isRequired,
-  communityGroupsEnabled: PropTypes.bool.isRequired,
+  groupsEnabled: PropTypes.bool.isRequired,
   config: PropTypes.object.isRequired,
 };
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerSearchLayout.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerSearchLayout.js
index 438febc1b..2e6d12efc 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerSearchLayout.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/ManagerSearchLayout.js
@@ -18,14 +18,8 @@ import { InvitationsMembersModalWithSearchKit } from "../../invitations/invitati
 
 export class ManagerSearchLayout extends Component {
   render() {
-    const {
-      config,
-      roles,
-      rolesCanInvite,
-      community,
-      communityGroupsEnabled,
-      appName,
-    } = this.props;
+    const { config, roles, rolesCanInvite, community, groupsEnabled, appName } =
+      this.props;
     const filtersClass = new Filters(roles);
     const customFilters = filtersClass.getMembersFilters();
     return (
@@ -37,7 +31,7 @@ export class ManagerSearchLayout extends Component {
               <InvitationsContextProvider community={community}>
                 <InvitationsMembersModalWithSearchKit
                   rolesCanInvite={rolesCanInvite}
-                  groupsEnabled={communityGroupsEnabled}
+                  groupsEnabled={groupsEnabled}
                   community={community}
                 />
               </InvitationsContextProvider>
@@ -50,7 +44,7 @@ export class ManagerSearchLayout extends Component {
               <InvitationsContextProvider community={community}>
                 <InvitationsMembersModalWithSearchKit
                   rolesCanInvite={rolesCanInvite}
-                  groupsEnabled={communityGroupsEnabled}
+                  groupsEnabled={groupsEnabled}
                   community={community}
                 />
               </InvitationsContextProvider>
@@ -78,7 +72,7 @@ ManagerSearchLayout.propTypes = {
   roles: PropTypes.array.isRequired,
   rolesCanInvite: PropTypes.object.isRequired,
   community: PropTypes.object.isRequired,
-  communityGroupsEnabled: PropTypes.bool.isRequired,
+  groupsEnabled: PropTypes.bool.isRequired,
   appName: PropTypes.string,
 };
 
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/index.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/index.js
index bba048242..8edfcd34b 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/index.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/members/members/manager_view/index.js
@@ -24,7 +24,7 @@ const communitiesRolesCanUpdate = JSON.parse(dataAttr.communitiesRolesCanUpdate)
 const communitiesAllRoles = JSON.parse(dataAttr.communitiesAllRoles);
 const community = JSON.parse(dataAttr.community);
 const permissions = JSON.parse(dataAttr.permissions);
-const communityGroupsEnabled = JSON.parse(dataAttr.communityGroupsEnabled);
+const groupsEnabled = JSON.parse(dataAttr.groupsEnabled);
 const rolesCanInvite = JSON.parse(dataAttr.communitiesRolesCanInvite);
 const appName = "InvenioCommunities.ManagerSearch";
 
@@ -40,7 +40,7 @@ const ManagerMembersResultContainerWithCommunity = parametrize(
   ManagerMembersResultsContainer,
   {
     community: community,
-    communityGroupsEnabled: communityGroupsEnabled,
+    groupsEnabled: groupsEnabled,
     rolesCanInvite: rolesCanInvite,
     config: {
       roles: communitiesAllRoles,
@@ -56,7 +56,7 @@ const MembersSearchAppContext = parametrize(MembersSearchAppContextCmp, {
 
 const ManagerSearchLayoutWithConfig = parametrize(ManagerSearchLayout, {
   community: community,
-  communityGroupsEnabled: communityGroupsEnabled,
+  groupsEnabled: groupsEnabled,
   rolesCanInvite: rolesCanInvite,
   permissions: permissions,
   roles: communitiesAllRoles,
@@ -65,7 +65,7 @@ const ManagerSearchLayoutWithConfig = parametrize(ManagerSearchLayout, {
 
 const ManagerEmptyResultsWithCommunity = parametrize(ManagerEmptyResults, {
   community: community,
-  communityGroupsEnabled: communityGroupsEnabled,
+  groupsEnabled: groupsEnabled,
   rolesCanInvite: rolesCanInvite,
 });
 
diff --git a/invenio_communities/config.py b/invenio_communities/config.py
index 104f94941..09a2e269b 100644
--- a/invenio_communities/config.py
+++ b/invenio_communities/config.py
@@ -34,6 +34,8 @@
 
 """Communities ui endpoints."""
 
+
+# Deprecated. Please use USERS_RESOURCES_GROUPS_ENABLED config instead.
 COMMUNITIES_GROUPS_ENABLED = True
 """Config to allow invitation of groups."""
 
diff --git a/invenio_communities/generators.py b/invenio_communities/generators.py
index 944e655df..e18a6320f 100644
--- a/invenio_communities/generators.py
+++ b/invenio_communities/generators.py
@@ -16,10 +16,9 @@
 from functools import partial, reduce
 from itertools import chain
 
-from flask import current_app
 from flask_principal import UserNeed
 from invenio_access.permissions import any_user, system_process
-from invenio_records_permissions.generators import ConditionalGenerator, Generator
+from invenio_records_permissions.generators import Generator
 from invenio_search.engine import dsl
 
 from .communities.records.systemfields.deletion_status import (
@@ -341,28 +340,3 @@ def excludes(self, member_types=None, **kwargs):
                 if m not in self.allowed_member_types:
                     return [any_user]
         return []
-
-
-class GroupsEnabled(Generator):
-    """Generator to restrict if the groups are not enabled.
-
-    If the groups are not enabled, exclude any user for adding members of the
-    param member type.
-
-    A system process is allowed to do anything.
-    """
-
-    def __init__(self, *need_groups_enabled_types):
-        """Types that need the groups enabled."""
-        self.need_groups_enabled_types = need_groups_enabled_types
-
-    def excludes(self, member_types=None, **kwargs):
-        """Preventing needs."""
-        if member_types:
-            for m in member_types:
-                if (
-                    m in self.need_groups_enabled_types
-                    and not current_app.config["COMMUNITIES_GROUPS_ENABLED"]
-                ):
-                    return [any_user]
-        return []
diff --git a/invenio_communities/permissions.py b/invenio_communities/permissions.py
index 71e6cc258..196912233 100644
--- a/invenio_communities/permissions.py
+++ b/invenio_communities/permissions.py
@@ -20,6 +20,7 @@
     SystemProcess,
 )
 from invenio_records_permissions.policies import BasePermissionPolicy
+from invenio_users_resources.services.generators import GroupsEnabled
 from invenio_users_resources.services.permissions import UserManager
 
 from .generators import (
@@ -30,7 +31,6 @@
     CommunityMembers,
     CommunityOwners,
     CommunitySelfMember,
-    GroupsEnabled,
     IfCommunityDeleted,
     IfPolicyClosed,
     IfRestricted,
diff --git a/invenio_communities/templates/semantic-ui/invenio_communities/details/members/invitations.html b/invenio_communities/templates/semantic-ui/invenio_communities/details/members/invitations.html
index 8b598c6a3..034287e2f 100644
--- a/invenio_communities/templates/semantic-ui/invenio_communities/details/members/invitations.html
+++ b/invenio_communities/templates/semantic-ui/invenio_communities/details/members/invitations.html
@@ -23,7 +23,7 @@
     <div
       id="community-invitations-search-root"
       data-community='{{ community | tojson }}'
-      data-community-groups-enabled='{{ config.COMMUNITIES_GROUPS_ENABLED | tojson }}'
+      data-groups-enabled='{{ config.USERS_RESOURCES_GROUPS_ENABLED | tojson }}'
       data-communities-all-roles='{{ config.COMMUNITIES_ROLES | tojson }}'
       data-communities-roles-can-invite='{{ roles_can_invite | tojson }}'
       data-permissions='{{ permissions | tojson }}'
diff --git a/invenio_communities/templates/semantic-ui/invenio_communities/details/members/members.html b/invenio_communities/templates/semantic-ui/invenio_communities/details/members/members.html
index 9d649a84c..de58db758 100644
--- a/invenio_communities/templates/semantic-ui/invenio_communities/details/members/members.html
+++ b/invenio_communities/templates/semantic-ui/invenio_communities/details/members/members.html
@@ -39,7 +39,7 @@
       data-community='{{ community | tojson }}'
       data-communities-all-roles='{{ config.COMMUNITIES_ROLES | tojson }}'
       data-communities-roles-can-update='{{ roles_can_update | tojson }}'
-      data-community-groups-enabled='{{ config.COMMUNITIES_GROUPS_ENABLED | tojson }}'
+      data-groups-enabled='{{ config.USERS_RESOURCES_GROUPS_ENABLED | tojson }}'
       data-communities-roles-can-invite='{{ roles_can_invite | tojson }}'
       data-permissions='{{ permissions | tojson }}'
     ></div>
diff --git a/tests/members/test_members_no_groups.py b/tests/members/test_members_no_groups.py
index e18bb9a90..6e80f7c89 100644
--- a/tests/members/test_members_no_groups.py
+++ b/tests/members/test_members_no_groups.py
@@ -4,9 +4,9 @@
 
 @pytest.fixture(scope="function")
 def groups_disabled(app):
-    app.config["COMMUNITIES_GROUPS_ENABLED"] = False
+    app.config["USERS_RESOURCES_GROUPS_ENABLED"] = False
     yield
-    app.config["COMMUNITIES_GROUPS_ENABLED"] = True
+    app.config["USERS_RESOURCES_GROUPS_ENABLED"] = True
 
 
 def test_invite_member_with_groups_disabled(
@@ -35,7 +35,7 @@ def test_invite_member_with_groups_disabled(
 def test_add_member_with_groups_disabled(
     member_service, community, members, group, actor, role, db, groups_disabled
 ):
-    """Test that the COMMUNITIES_GROUPS_ENABLED flag allows/forbids to add
+    """Test that the USERS_RESOURCES_GROUPS_ENABLED flag allows/forbids to add
     members.
     """
     data = {