From bf011bebf7cb396e92274598b48b853fc8969d07 Mon Sep 17 00:00:00 2001
From: Manish Kushare <kushare.manish9@gmail.com>
Date: Tue, 27 Sep 2022 16:44:31 +0530
Subject: [PATCH] [ bug fixed ]: removed user adding dropdown in all user page
 (#4091)

* removed user adding dropdown in all user page

* removed dropdown in app tab , in admin page
---
 .../ManageGroupPermissionResources.jsx        | 114 +++++++++---------
 1 file changed, 59 insertions(+), 55 deletions(-)

diff --git a/frontend/src/ManageGroupPermissionResources/ManageGroupPermissionResources.jsx b/frontend/src/ManageGroupPermissionResources/ManageGroupPermissionResources.jsx
index fbcd31572e..c2d8981ac7 100644
--- a/frontend/src/ManageGroupPermissionResources/ManageGroupPermissionResources.jsx
+++ b/frontend/src/ManageGroupPermissionResources/ManageGroupPermissionResources.jsx
@@ -386,36 +386,38 @@ class ManageGroupPermissionResourcesComponent extends React.Component {
                   <div className="tab-content">
                     {/* Apps Tab */}
                     <div className={`tab-pane ${currentTab === 'apps' ? 'active show' : ''}`}>
-                      <div className="row">
-                        <div className="col-5" data-cy="select-search">
-                          <SelectSearch
-                            className={`${this.props.darkMode ? 'select-search-dark' : 'select-search'}`}
-                            options={appSelectOptions}
-                            closeOnSelect={false}
-                            multiple
-                            search={true}
-                            value={selectedAppIds}
-                            filterOptions={fuzzySearch}
-                            onChange={(value) => this.setSelectedApps(value)}
-                            printOptions="on-focus"
-                            placeholder={this.props.t(
-                              'header.organization.menus.manageGroups.permissionResources.addAppsToGroup',
-                              'Select apps to add to the group'
-                            )}
-                          />
-                        </div>
-                        <div className="col-auto">
-                          <div
-                            className={`btn btn-primary w-100 ${isAddingApps ? 'btn-loading' : ''} ${
-                              selectedAppIds.length === 0 ? 'disabled' : ''
-                            }`}
-                            onClick={() => this.addSelectedAppsToGroup(groupPermission.id, selectedAppIds)}
-                            data-cy="add-button"
-                          >
-                            {this.props.t('globals.add', 'Add')}
+                      {groupPermission?.group !== 'admin' && (
+                        <div className="row">
+                          <div className="col-5" data-cy="select-search">
+                            <SelectSearch
+                              className={`${this.props.darkMode ? 'select-search-dark' : 'select-search'}`}
+                              options={appSelectOptions}
+                              closeOnSelect={false}
+                              multiple
+                              search={true}
+                              value={selectedAppIds}
+                              filterOptions={fuzzySearch}
+                              onChange={(value) => this.setSelectedApps(value)}
+                              printOptions="on-focus"
+                              placeholder={this.props.t(
+                                'header.organization.menus.manageGroups.permissionResources.addAppsToGroup',
+                                'Select apps to add to the group'
+                              )}
+                            />
+                          </div>
+                          <div className="col-auto">
+                            <div
+                              className={`btn btn-primary w-100 ${isAddingApps ? 'btn-loading' : ''} ${
+                                selectedAppIds.length === 0 ? 'disabled' : ''
+                              }`}
+                              onClick={() => this.addSelectedAppsToGroup(groupPermission.id, selectedAppIds)}
+                              data-cy="add-button"
+                            >
+                              {this.props.t('globals.add', 'Add')}
+                            </div>
                           </div>
                         </div>
-                      </div>
+                      )}
                       <br />
                       <div>
                         <div className="table-responsive">
@@ -536,35 +538,37 @@ class ManageGroupPermissionResourcesComponent extends React.Component {
 
                     {/* Users Tab */}
                     <div className={`tab-pane ${currentTab === 'users' ? 'active show' : ''}`}>
-                      <div className="row">
-                        <div className="col-5">
-                          <SelectSearch
-                            className={`${this.props.darkMode ? 'select-search-dark' : 'select-search'}`}
-                            options={userSelectOptions}
-                            closeOnSelect={false}
-                            multiple
-                            search={true}
-                            filterOptions={fuzzySearch}
-                            value={selectedUserIds}
-                            onChange={(value) => this.setSelectedUsers(value)}
-                            printOptions="on-focus"
-                            placeholder={this.props.t(
-                              'header.organization.menus.manageGroups.permissionResources.addUsersToGroup',
-                              'Select users to add to the group'
-                            )}
-                          />
-                        </div>
-                        <div className="col-auto">
-                          <div
-                            className={`btn btn-primary w-100 ${isAddingUsers ? 'btn-loading' : ''} ${
-                              selectedUserIds.length === 0 ? 'disabled' : ''
-                            }`}
-                            onClick={() => this.addSelectedUsersToGroup(groupPermission.id, selectedUserIds)}
-                          >
-                            {this.props.t('globals.add', 'Add')}
+                      {groupPermission?.group === 'admin' && (
+                        <div className="row">
+                          <div className="col-5">
+                            <SelectSearch
+                              className={`${this.props.darkMode ? 'select-search-dark' : 'select-search'}`}
+                              options={userSelectOptions}
+                              closeOnSelect={false}
+                              multiple
+                              search={true}
+                              filterOptions={fuzzySearch}
+                              value={selectedUserIds}
+                              onChange={(value) => this.setSelectedUsers(value)}
+                              printOptions="on-focus"
+                              placeholder={this.props.t(
+                                'header.organization.menus.manageGroups.permissionResources.addUsersToGroup',
+                                'Select users to add to the group'
+                              )}
+                            />
+                          </div>
+                          <div className="col-auto">
+                            <div
+                              className={`btn btn-primary w-100 ${isAddingUsers ? 'btn-loading' : ''} ${
+                                selectedUserIds.length === 0 ? 'disabled' : ''
+                              }`}
+                              onClick={() => this.addSelectedUsersToGroup(groupPermission.id, selectedUserIds)}
+                            >
+                              {this.props.t('globals.add', 'Add')}
+                            </div>
                           </div>
                         </div>
-                      </div>
+                      )}
                       <br />
                       <div>
                         <div className="table-responsive">