External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 00:08:44 -03:30
Code Issues Packages Projects Releases Wiki Activity

Remove expand/collapse from org access list

Browse Source
This commit is contained in:
mabashian
2019-04-12 10:05:18 -04:00
parent 14c1b85127
commit e11c2df6b6
2 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
__tests__/pages/Organizations/components/OrganizationAccessList.test.jsx
View File

@@ -65,35 +65,6 @@ describe('<OrganizationAccessList />', () => {
}); });
}); });
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(
<I18nProvider>
<MemoryRouter>
<_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={() => {}}
/>
</MemoryRouter>
</I18nProvider>
).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) => { test('onSort being passed properly to DataListToolbar component', async (done) => {
const onSort = jest.spyOn(_OrganizationAccessList.prototype, 'onSort'); const onSort = jest.spyOn(_OrganizationAccessList.prototype, 'onSort');
const wrapper = mount( const wrapper = mount(

15
src/pages/Organizations/components/OrganizationAccessList.jsx
View File

@@ -105,7 +105,6 @@ class OrganizationAccessList extends React.Component {
count: 0, count: 0,
sortOrder: 'ascending', sortOrder: 'ascending',
sortedColumnKey: 'username', sortedColumnKey: 'username',
isCompact: false,
showWarning: false, showWarning: false,
warningTitle: '', warningTitle: '',
warningMsg: '', warningMsg: '',
@@ -117,8 +116,6 @@ class OrganizationAccessList extends React.Component {
this.fetchOrgAccessList = this.fetchOrgAccessList.bind(this); this.fetchOrgAccessList = this.fetchOrgAccessList.bind(this);
this.onSetPage = this.onSetPage.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.onSort = this.onSort.bind(this);
this.getQueryParams = this.getQueryParams.bind(this); this.getQueryParams = this.getQueryParams.bind(this);
this.removeAccessRole = this.removeAccessRole.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) { onSetPage (pageNumber, pageSize) {
const { sortOrder, sortedColumnKey } = this.state; const { sortOrder, sortedColumnKey } = this.state;
const page = parseInt(pageNumber, 10); const page = parseInt(pageNumber, 10);
@@ -343,10 +332,6 @@ class OrganizationAccessList extends React.Component {
columns={this.columns} columns={this.columns}
onSearch={() => { }} onSearch={() => { }}
onSort={this.onSort} onSort={this.onSort}
onCompact={this.onCompact}
onExpand={this.onExpand}
isCompact={isCompact}
showExpandCollapse
/> />
{showWarning && ( {showWarning && (
<AlertModal <AlertModal