Skip to content

Commit 6994284

Browse files
removed the unwanted pagination div (#902)
1 parent 012ce6d commit 6994284

File tree

4 files changed

+16
-93
lines changed

4 files changed

+16
-93
lines changed

__tests__/users/user-management-home-screen.test.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ describe('Tests the User Management User Listing Screen', () => {
99
let tileViewBtn;
1010
let tableViewBtn;
1111
let userSearchElement;
12-
let paginationElement;
13-
let prevBtn;
14-
let nextBtn;
1512
jest.setTimeout(60000);
1613

1714
beforeAll(async () => {
@@ -71,9 +68,6 @@ describe('Tests the User Management User Listing Screen', () => {
7168
tileViewBtn = await page.$('#tile-view-btn');
7269
tableViewBtn = await page.$('#table-view-btn');
7370
userSearchElement = await page.$('#user-search');
74-
paginationElement = await page.$('#pagination');
75-
prevBtn = await page.$('#prevButton');
76-
nextBtn = await page.$('#nextButton');
7771
});
7872

7973
afterAll(async () => {
@@ -85,9 +79,6 @@ describe('Tests the User Management User Listing Screen', () => {
8579
expect(tileViewBtn).toBeTruthy();
8680
expect(tableViewBtn).toBeTruthy();
8781
expect(userSearchElement).toBeTruthy();
88-
expect(paginationElement).toBeTruthy();
89-
expect(prevBtn).toBeTruthy();
90-
expect(nextBtn).toBeTruthy();
9182
});
9283

9384
it('Check the UI interactions of tile view and table view button.', async () => {

users/constants.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ const TILE_VIEW_BTN = 'tile-view-btn';
88
const TABLE_VIEW_BTN = 'table-view-btn';
99
const USER_SEARCH_ELEMENT = 'user-search';
1010
const DEFAULT_AVATAR = '/images/avatar.png';
11-
const PAGINATION_ELEMENT = 'pagination';
12-
const PREV_BUTTON = 'prevButton';
13-
const NEXT_BUTTON = 'nextButton';
1411
const USER_FETCH_COUNT = 100;
1512
const NONE = 'NONE';
1613
const OOO = 'OOO';

users/index.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ <h2>Skills</h2>
7272
<ul id="head_list"></ul>
7373
</div>
7474
<div id="loader_tag" style="display: none"></div>
75-
<div id="pagination" class="remove-element">
76-
<button class="pagination-btn" id="prevButton">&laquo; Previous</button>
77-
<button class="pagination-btn" id="nextButton">Next &raquo;</button>
78-
</div>
7975
</section>
8076
<footer>
8177
<p class="info-repo">

users/script.js

Lines changed: 16 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ const userloaderElement = document.getElementById(USER_LOADER_ELEMENT);
55
const tileViewBtn = document.getElementById(TILE_VIEW_BTN);
66
const tableViewBtn = document.getElementById(TABLE_VIEW_BTN);
77
const userSearchElement = document.getElementById(USER_SEARCH_ELEMENT);
8-
const paginationElement = document.getElementById(PAGINATION_ELEMENT);
9-
const prevBtn = document.getElementById(PREV_BUTTON);
10-
const nextBtn = document.getElementById(NEXT_BUTTON);
118
const filterModal = document.getElementsByClassName(FILTER_MODAL)[0];
129
const filterButton = document.getElementById(FILTER_BUTTON);
1310
const availabilityFilter = document.getElementById(AVAILABILITY_FILTER);
@@ -22,13 +19,10 @@ let page = 0;
2219
let run = true;
2320

2421
const init = (
25-
prevBtn,
26-
nextBtn,
2722
tileViewBtn,
2823
tableViewBtn,
2924
userSearchElement,
3025
userListElement,
31-
paginationElement,
3226
loaderElement,
3327
) => {
3428
window.addEventListener('scroll', async () => {
@@ -45,7 +39,7 @@ const init = (
4539
showUserDataList(
4640
page++,
4741
userListElement,
48-
paginationElement,
42+
4943
loaderElement,
5044
);
5145
}
@@ -65,11 +59,10 @@ const init = (
6559
return getParticularUserData(
6660
event.target.value,
6761
userListElement,
68-
paginationElement,
6962
loaderElement,
7063
);
7164
}
72-
showUserDataList(page, userListElement, paginationElement, loaderElement);
65+
showUserDataList(page, userListElement, loaderElement);
7366
}, 500),
7467
);
7568
};
@@ -104,21 +97,14 @@ function showTableView(userListElement, tableViewBtn, tileViewBtn) {
10497
});
10598
}
10699

107-
function showErrorMessage(
108-
msg,
109-
userListElement,
110-
paginationElement,
111-
loaderElement,
112-
) {
100+
function showErrorMessage(msg, userListElement, loaderElement) {
113101
userListElement.innerHTML = '';
114102
const paraELe = document.createElement('p');
115103
const textNode = document.createTextNode(msg);
116104
paraELe.appendChild(textNode);
117105
paraELe.id = 'error_para';
118106
paraELe.classList.add('error-text');
119107
userListElement.appendChild(paraELe);
120-
paginationElement.classList.add('remove-element');
121-
paginationElement.classList.remove('pagination');
122108
loaderElement.classList.add('remove-element');
123109
}
124110

@@ -146,16 +132,10 @@ function generateUserList(
146132
users,
147133
showPagination,
148134
userListElement,
149-
paginationElement,
150135
loaderElement,
151136
) {
152137
if (!users || !users.length) {
153-
showErrorMessage(
154-
'No data found',
155-
userListElement,
156-
paginationElement,
157-
loaderElement,
158-
);
138+
showErrorMessage('No data found', userListElement, loaderElement);
159139
return;
160140
}
161141

@@ -237,46 +217,24 @@ function formatUsersData(usersData) {
237217
async function getParticularUserData(
238218
searchInput,
239219
userListElement,
240-
paginationElement,
241220
loaderElement,
242221
) {
243222
try {
244223
page = 0;
245224
if (!searchInput.length) {
246-
await showUserDataList(
247-
page,
248-
userListElement,
249-
paginationElement,
250-
loaderElement,
251-
);
225+
await showUserDataList(page, userListElement, loaderElement);
252226
return;
253227
}
254228
const usersData = await fetchUsersData(searchInput);
255229
if (usersData.users) {
256230
const data = formatUsersData(usersData?.users);
257231

258-
generateUserList(
259-
data,
260-
true,
261-
userListElement,
262-
paginationElement,
263-
loaderElement,
264-
);
232+
generateUserList(data, true, userListElement, loaderElement);
265233
} else {
266-
showErrorMessage(
267-
usersData.message,
268-
userListElement,
269-
paginationElement,
270-
loaderElement,
271-
);
234+
showErrorMessage(usersData.message, userListElement, loaderElement);
272235
}
273236
} catch (err) {
274-
showErrorMessage(
275-
'Something Went Wrong',
276-
userListElement,
277-
paginationElement,
278-
loaderElement,
279-
);
237+
showErrorMessage('Something Went Wrong', userListElement, loaderElement);
280238
}
281239
}
282240

@@ -309,8 +267,6 @@ function showUserList(users) {
309267
window.location.href = `/users/details/index.html?username=${userData.username}`;
310268
};
311269
ulElement.appendChild(listElement);
312-
paginationElement.classList.add('remove-element');
313-
paginationElement.classList.remove('pagination');
314270
});
315271

316272
userListElement.innerHTML = '';
@@ -328,13 +284,13 @@ function displayLoader() {
328284
function clearFilters() {
329285
availabilityFilter.value = 'none';
330286
displayLoader();
331-
showUserDataList(page, userListElement, paginationElement, loaderElement);
287+
showUserDataList(page, userListElement, loaderElement);
332288
}
333289

334290
const showUserDataList = async (
335291
page,
336292
userListElement,
337-
paginationElement,
293+
338294
loaderElement,
339295
) => {
340296
try {
@@ -359,7 +315,7 @@ const showUserDataList = async (
359315
usersDataList,
360316
false,
361317
userListElement,
362-
paginationElement,
318+
363319
loaderElement,
364320
);
365321
}
@@ -368,7 +324,7 @@ const showUserDataList = async (
368324
showErrorMessage(
369325
err.message,
370326
userListElement,
371-
paginationElement,
327+
372328
loaderElement,
373329
);
374330
} finally {
@@ -449,23 +405,13 @@ async function generateSkills() {
449405

450406
window.onload = function () {
451407
init(
452-
prevBtn,
453-
nextBtn,
454408
tileViewBtn,
455409
tableViewBtn,
456410
userSearchElement,
457411
userListElement,
458-
paginationElement,
459412
loaderElement,
460413
);
461-
showUserDataList(
462-
page,
463-
userListElement,
464-
paginationElement,
465-
loaderElement,
466-
prevBtn,
467-
nextBtn,
468-
);
414+
showUserDataList(page, userListElement, loaderElement);
469415

470416
populateFilters();
471417
if (window.location.search) {
@@ -622,7 +568,7 @@ applyFilterButton.addEventListener('click', async () => {
622568
users,
623569
true,
624570
userListElement,
625-
paginationElement,
571+
626572
loaderElement,
627573
prevBtn,
628574
);
@@ -631,7 +577,7 @@ applyFilterButton.addEventListener('click', async () => {
631577
showErrorMessage(
632578
`User list request failed with error: ${err}`,
633579
userListElement,
634-
paginationElement,
580+
635581
loaderElement,
636582
);
637583
}
@@ -669,14 +615,7 @@ clearButton.addEventListener('click', function () {
669615
filterModal.classList.toggle('hidden');
670616
displayLoader();
671617
page = 0;
672-
showUserDataList(
673-
page,
674-
userListElement,
675-
paginationElement,
676-
loaderElement,
677-
prevBtn,
678-
nextBtn,
679-
);
618+
showUserDataList(page, userListElement, loaderElement);
680619
manipulateQueryParamsToURL();
681620
});
682621

0 commit comments

Comments
 (0)