From 65bc4a9c0e486f14b40b99d961644b2dd501ac16 Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Fri, 9 Jul 2021 14:53:15 -0500
Subject: [PATCH] [Workplace Search] Remove users from groups views (#105108)

* Remove user list from groups table

* Remove users table from group overview

* Lint
---
 .../groups/components/group_overview.tsx      | 27 +++++++++----------
 .../groups/components/group_row.test.tsx      | 15 +----------
 .../views/groups/components/group_row.tsx     | 19 +------------
 .../views/groups/components/groups_table.tsx  |  7 -----
 .../translations/translations/ja-JP.json      |  2 --
 .../translations/translations/zh-CN.json      |  2 --
 6 files changed, 14 insertions(+), 58 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.tsx
index e7dfd6ddf138..5714cc965827 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.tsx
@@ -33,24 +33,23 @@ import { NAV, CANCEL_BUTTON } from '../../../constants';
 import { USERS_AND_ROLES_PATH } from '../../../routes';
 import { GroupLogic, MAX_NAME_LENGTH } from '../group_logic';
 
-import { GroupUsersTable } from './group_users_table';
-
 export const EMPTY_SOURCES_DESCRIPTION = i18n.translate(
   'xpack.enterpriseSearch.workplaceSearch.groups.overview.emptySourcesDescription',
   {
     defaultMessage: 'No content sources are shared with this group.',
   }
 );
+const USERS_SECTION_TITLE = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.groups.overview.usersSectionTitle',
+  {
+    defaultMessage: 'Group users',
+  }
+);
 const GROUP_USERS_DESCRIPTION = i18n.translate(
   'xpack.enterpriseSearch.workplaceSearch.groups.overview.groupUsersDescription',
   {
-    defaultMessage: 'Members will be able to search over the group’s sources.',
-  }
-);
-export const EMPTY_USERS_DESCRIPTION = i18n.translate(
-  'xpack.enterpriseSearch.workplaceSearch.groups.overview.emptyUsersDescription',
-  {
-    defaultMessage: 'There are no users in this group.',
+    defaultMessage:
+      "Users assigned to this group gain access to the sources' data and content defined above. User assignments for this group can be managed in the Users and Roles area.",
   }
 );
 const MANAGE_SOURCES_BUTTON_TEXT = i18n.translate(
@@ -118,7 +117,7 @@ export const GroupOverview: React.FC = () => {
     onGroupNameInputChange,
   } = useActions(GroupLogic);
   const {
-    group: { name, contentSources, users, canDeleteGroup },
+    group: { name, contentSources, canDeleteGroup },
     groupNameInputValue,
     dataLoading,
     confirmDeleteModalVisible,
@@ -158,7 +157,6 @@ export const GroupOverview: React.FC = () => {
   );
 
   const hasContentSources = contentSources?.length > 0;
-  const hasUsers = users?.length > 0;
 
   const manageSourcesButton = (
     <EuiButton color="primary" onClick={showSharedSourcesModal}>
@@ -199,12 +197,11 @@ export const GroupOverview: React.FC = () => {
 
   const usersSection = (
     <ContentSection
-      title="Group users"
-      description={hasUsers ? GROUP_USERS_DESCRIPTION : EMPTY_USERS_DESCRIPTION}
-      action={manageUsersButton}
+      title={USERS_SECTION_TITLE}
+      description={GROUP_USERS_DESCRIPTION}
       data-test-subj="GroupUsersSection"
     >
-      {hasUsers && <GroupUsersTable />}
+      {manageUsersButton}
     </ContentSection>
   );
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx
index f98b873aed5b..770bf8a51efd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx
@@ -14,8 +14,7 @@ import moment from 'moment';
 
 import { EuiTableRow } from '@elastic/eui';
 
-import { GroupRow, NO_USERS_MESSAGE, NO_SOURCES_MESSAGE } from './group_row';
-import { GroupUsers } from './group_users';
+import { GroupRow, NO_SOURCES_MESSAGE } from './group_row';
 
 describe('GroupRow', () => {
   it('renders', () => {
@@ -24,12 +23,6 @@ describe('GroupRow', () => {
     expect(wrapper.find(EuiTableRow)).toHaveLength(1);
   });
 
-  it('renders group users', () => {
-    const wrapper = shallow(<GroupRow {...groups[0]} />);
-
-    expect(wrapper.find(GroupUsers)).toHaveLength(1);
-  });
-
   it('renders fromNow date string when in range', () => {
     const wrapper = shallow(
       <GroupRow {...groups[0]} updatedAt={moment().subtract(7, 'days').format()} />
@@ -44,12 +37,6 @@ describe('GroupRow', () => {
     expect(wrapper.find('small').text()).toEqual('Last updated January 1, 2020.');
   });
 
-  it('renders empty users message when no users present', () => {
-    const wrapper = shallow(<GroupRow {...groups[0]} usersCount={0} />);
-
-    expect(wrapper.find('.user-group__accounts').text()).toEqual(NO_USERS_MESSAGE);
-  });
-
   it('renders empty sources message when no sources present', () => {
     const wrapper = shallow(<GroupRow {...groups[0]} contentSources={[]} />);
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.tsx
index 94d44fde57ae..d079eb34fbf8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.tsx
@@ -19,7 +19,6 @@ import { Group } from '../../../types';
 import { MAX_NAME_LENGTH } from '../group_logic';
 
 import { GroupSources } from './group_sources';
-import { GroupUsers } from './group_users';
 
 const DAYS_CUTOFF = 8;
 export const NO_SOURCES_MESSAGE = i18n.translate(
@@ -40,14 +39,7 @@ const dateDisplay = (date: string) =>
     ? moment(date).fromNow()
     : moment(date).format('MMMM D, YYYY');
 
-export const GroupRow: React.FC<Group> = ({
-  id,
-  name,
-  updatedAt,
-  contentSources,
-  users,
-  usersCount,
-}) => {
+export const GroupRow: React.FC<Group> = ({ id, name, updatedAt, contentSources }) => {
   const GROUP_UPDATED_TEXT = i18n.translate(
     'xpack.enterpriseSearch.workplaceSearch.groups.groupUpdatedText',
     {
@@ -76,15 +68,6 @@ export const GroupRow: React.FC<Group> = ({
           )}
         </div>
       </EuiTableRowCell>
-      <EuiTableRowCell>
-        <div className="user-group__accounts">
-          {usersCount > 0 ? (
-            <GroupUsers groupUsers={users} usersCount={usersCount} groupId={id} />
-          ) : (
-            NO_USERS_MESSAGE
-          )}
-        </div>
-      </EuiTableRowCell>
       <EuiTableRowCell align="right">
         <strong>
           <EuiLinkTo to={getGroupPath(id)}>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx
index cfb3ed804423..45175e489f94 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx
@@ -36,12 +36,6 @@ const SOURCES_TABLE_HEADER = i18n.translate(
     defaultMessage: 'Content sources',
   }
 );
-const USERS_TABLE_HEADER = i18n.translate(
-  'xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.usersTableHeader',
-  {
-    defaultMessage: 'Users',
-  }
-);
 
 export const GroupsTable: React.FC<{}> = () => {
   const { setActivePage } = useActions(GroupsLogic);
@@ -77,7 +71,6 @@ export const GroupsTable: React.FC<{}> = () => {
         <EuiTableHeader>
           <EuiTableHeaderCell>{GROUP_TABLE_HEADER}</EuiTableHeaderCell>
           <EuiTableHeaderCell>{SOURCES_TABLE_HEADER}</EuiTableHeaderCell>
-          <EuiTableHeaderCell>{USERS_TABLE_HEADER}</EuiTableHeaderCell>
           <EuiTableHeaderCell />
         </EuiTableHeader>
         <EuiTableBody>
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 11770d2d2f38..b7cde09da631 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -8105,7 +8105,6 @@
     "xpack.enterpriseSearch.workplaceSearch.groups.groupSourcesUpdated": "共有コンテンツソースが正常に更新されました。",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.groupTableHeader": "グループ",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.sourcesTableHeader": "コンテンツソース",
-    "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.usersTableHeader": "ユーザー",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupUpdatedText": "前回更新日時{updatedAt}。",
     "xpack.enterpriseSearch.workplaceSearch.groups.heading": "グループを管理",
     "xpack.enterpriseSearch.workplaceSearch.groups.inviteUsers.action": "ユーザーを招待",
@@ -8118,7 +8117,6 @@
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.confirmRemoveDescription": "グループはWorkplace Searchから削除されます。{name}を削除してよろしいですか？",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.confirmTitleText": "確認",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.emptySourcesDescription": "コンテンツソースはこのグループと共有されていません。",
-    "xpack.enterpriseSearch.workplaceSearch.groups.overview.emptyUsersDescription": "このグループにはユーザーがありません。",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.groupSourcesDescription": "「{name}」グループのすべてのユーザーによって検索可能です。",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.groupSourcesTitle": "グループコンテンツソース",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.groupUsersDescription": "メンバーはグループのソースを検索できます。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 9704070feb8a..ac43983a75cc 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -8173,7 +8173,6 @@
     "xpack.enterpriseSearch.workplaceSearch.groups.groupSourcesUpdated": "已成功更新共享内容源。",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.groupTableHeader": "组",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.sourcesTableHeader": "内容源",
-    "xpack.enterpriseSearch.workplaceSearch.groups.groupsTable.usersTableHeader": "用户",
     "xpack.enterpriseSearch.workplaceSearch.groups.groupUpdatedText": "上次更新于 {updatedAt}。",
     "xpack.enterpriseSearch.workplaceSearch.groups.heading": "管理组",
     "xpack.enterpriseSearch.workplaceSearch.groups.inviteUsers.action": "邀请用户",
@@ -8186,7 +8185,6 @@
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.confirmRemoveDescription": "您的组将从 Workplace Search 中删除。确定要移除 {name}？",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.confirmTitleText": "确认",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.emptySourcesDescription": "未与此组共享任何内容源。",
-    "xpack.enterpriseSearch.workplaceSearch.groups.overview.emptyUsersDescription": "此组中没有用户。",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.groupSourcesDescription": "可按“{name}”组中的所有用户搜索。",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.groupSourcesTitle": "组内容源",
     "xpack.enterpriseSearch.workplaceSearch.groups.overview.groupUsersDescription": "成员将可以对该组的源进行搜索。",