External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-22 16:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

158 paginated data list (#180)

Browse Source 
* working: rename OrganizationTeamsList to PaginatedDataList

* convert org notifications list fully to PaginatedDataList

* update NotificationList tests

* refactor org access to use PaginatedDataList

* update tests for org access refactor; fix pagination & sorting

* restore Add Role functionality to Org roles

* fix displayed text when list of items is empty

* preserve query params when navigating through pagination

* fix bugs after RBAC rebase

* fix lint errors, fix add org access button
This commit is contained in:
Keith Grant
2019-04-29 10:08:50 -04:00
committed by GitHub
parent 3c06c97c32
commit 9d66b583b7
36 changed files with 4133 additions and 1427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
__tests__/pages/Organizations/screens/Organization/OrganizationTeams.test.jsx
View File

@@ -5,7 +5,6 @@ import { createMemoryHistory } from 'history';
import { mountWithContexts } from '../../../../enzymeHelpers';
import { sleep } from '../../../../testUtils';
import OrganizationTeams, { _OrganizationTeams } from '../../../../../src/pages/Organizations/screens/Organization/OrganizationTeams';
import OrganizationTeamsList from '../../../../../src/pages/Organizations/components/OrganizationTeamsList';
const listData = {
data: {
@@ -52,7 +51,7 @@ describe('<OrganizationTeams />', () => {
});
});
test('should pass fetched teams to list component', async () => {
test('should pass fetched teams to PaginatedDatalist', async () => {
const readOrganizationTeamsList = jest.fn(() => Promise.resolve(listData));
const wrapper = mountWithContexts(
<OrganizationTeams
@@ -66,8 +65,8 @@ describe('<OrganizationTeams />', () => {
await sleep(0);
wrapper.update();
const list = wrapper.find('OrganizationTeamsList');
expect(list.prop('teams')).toEqual(listData.data.results);
const list = wrapper.find('PaginatedDataList');
expect(list.prop('items')).toEqual(listData.data.results);
expect(list.prop('itemCount')).toEqual(listData.data.count);
expect(list.prop('queryParams')).toEqual({
page: 1,
@@ -76,7 +75,7 @@ describe('<OrganizationTeams />', () => {
});
});
test('should pass queryParams to OrganizationTeamsList', async () => {
test('should pass queryParams to PaginatedDataList', async () => {
const page1Data = listData;
const page2Data = {
data: {
@@ -111,7 +110,7 @@ describe('<OrganizationTeams />', () => {
await sleep(0);
wrapper.update();
const list = wrapper.find(OrganizationTeamsList);
const list = wrapper.find('PaginatedDataList');
expect(list.prop('queryParams')).toEqual({
page: 1,
page_size: 5,
@@ -123,7 +122,7 @@ describe('<OrganizationTeams />', () => {
await sleep(0);
wrapper.update();
const list2 = wrapper.find(OrganizationTeamsList);
const list2 = wrapper.find('PaginatedDataList');
expect(list2.prop('queryParams')).toEqual({
page: 2,
page_size: 5,