From e11c2df6b6e425b4d470cefe915313df9bf62ddf Mon Sep 17 00:00:00 2001 From: mabashian Date: Fri, 12 Apr 2019 10:05:18 -0400 Subject: [PATCH] Remove expand/collapse from org access list --- .../OrganizationAccessList.test.jsx | 29 ------------------- .../components/OrganizationAccessList.jsx | 15 ---------- 2 files changed, 44 deletions(-) diff --git a/__tests__/pages/Organizations/components/OrganizationAccessList.test.jsx b/__tests__/pages/Organizations/components/OrganizationAccessList.test.jsx index 6c064e7eb3..54288159d6 100644 --- a/__tests__/pages/Organizations/components/OrganizationAccessList.test.jsx +++ b/__tests__/pages/Organizations/components/OrganizationAccessList.test.jsx @@ -65,35 +65,6 @@ describe('', () => { }); }); - test('onExpand and onCompact methods called when user clicks on Expand and Compact icons respectively', async (done) => { - const onExpand = jest.spyOn(_OrganizationAccessList.prototype, 'onExpand'); - const onCompact = jest.spyOn(_OrganizationAccessList.prototype, 'onCompact'); - const wrapper = mount( - - - <_OrganizationAccessList - match={{ path: '/organizations/:id', url: '/organizations/1', params: { id: '0' } }} - location={{ search: '', pathname: '/organizations/1/access' }} - getAccessList={() => ({ data: { count: 1, results: mockData } })} - removeRole={() => {}} - handleHttpError={() => {}} - /> - - - ).find('OrganizationAccessList'); - expect(onExpand).not.toHaveBeenCalled(); - expect(onCompact).not.toHaveBeenCalled(); - - setImmediate(() => { - const rendered = wrapper.update(); - rendered.find('button[aria-label="Expand"]').simulate('click'); - rendered.find('button[aria-label="Collapse"]').simulate('click'); - expect(onExpand).toHaveBeenCalled(); - expect(onCompact).toHaveBeenCalled(); - done(); - }); - }); - test('onSort being passed properly to DataListToolbar component', async (done) => { const onSort = jest.spyOn(_OrganizationAccessList.prototype, 'onSort'); const wrapper = mount( diff --git a/src/pages/Organizations/components/OrganizationAccessList.jsx b/src/pages/Organizations/components/OrganizationAccessList.jsx index c30c31943c..ce8bc751db 100644 --- a/src/pages/Organizations/components/OrganizationAccessList.jsx +++ b/src/pages/Organizations/components/OrganizationAccessList.jsx @@ -105,7 +105,6 @@ class OrganizationAccessList extends React.Component { count: 0, sortOrder: 'ascending', sortedColumnKey: 'username', - isCompact: false, showWarning: false, warningTitle: '', warningMsg: '', @@ -117,8 +116,6 @@ class OrganizationAccessList extends React.Component { this.fetchOrgAccessList = this.fetchOrgAccessList.bind(this); this.onSetPage = this.onSetPage.bind(this); - this.onExpand = this.onExpand.bind(this); - this.onCompact = this.onCompact.bind(this); this.onSort = this.onSort.bind(this); this.getQueryParams = this.getQueryParams.bind(this); this.removeAccessRole = this.removeAccessRole.bind(this); @@ -136,14 +133,6 @@ class OrganizationAccessList extends React.Component { } } - onExpand () { - this.setState({ isCompact: false }); - } - - onCompact () { - this.setState({ isCompact: true }); - } - onSetPage (pageNumber, pageSize) { const { sortOrder, sortedColumnKey } = this.state; const page = parseInt(pageNumber, 10); @@ -343,10 +332,6 @@ class OrganizationAccessList extends React.Component { columns={this.columns} onSearch={() => { }} onSort={this.onSort} - onCompact={this.onCompact} - onExpand={this.onExpand} - isCompact={isCompact} - showExpandCollapse /> {showWarning && (