Skip to content

Commit b49b579

Browse files
Suvidh-kaushikSuvidh-kaushik
authored
fix: change the order of extension-requests in the extension request page (#820)
* fix: change the order of extensions request page * changed tests of extension-requests according to newest first(descending order) * chore:update username in test file due to recent changes
1 parent 4e03a4a commit b49b579

File tree

4 files changed

+47
-47
lines changed

4 files changed

+47
-47
lines changed

‎__tests__/extension-requests/extension-requests.test.js‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const {
44
extensionRequestsListPending,
55
extensionRequestsListApproved,
66
extensionRequestResponse,
7-
extensionRequestsListPendingDescending,
7+
extensionRequestsListPendingAscending,
88
extensionRequestsListUserSearch,
99
extensionRequestListForAuditLogs,
1010
} = require('../../mock-data/extension-requests');
@@ -46,9 +46,9 @@ describe('Tests the Extension Requests Screen', () => {
4646
const url = interceptedRequest.url();
4747
if (
4848
url ===
49-
'https://api.realdevsquad.com/extension-requests?order=asc&size=5&q=status%3APENDING' ||
49+
'https://api.realdevsquad.com/extension-requests?order=desc&size=5&q=status%3APENDING' ||
5050
url ===
51-
'https://api.realdevsquad.com/extension-requests?dev=true&order=asc'
51+
'https://api.realdevsquad.com/extension-requests?dev=true&order=desc'
5252
) {
5353
interceptedRequest.respond({
5454
status: 200,
@@ -86,7 +86,7 @@ describe('Tests the Extension Requests Screen', () => {
8686
});
8787
} else if (
8888
url ===
89-
'https://api.realdevsquad.com/extension-requests?order=desc&size=5&q=status%3APENDING'
89+
'https://api.realdevsquad.com/extension-requests?order=asc&size=5&q=status%3APENDING'
9090
) {
9191
interceptedRequest.respond({
9292
status: 200,
@@ -96,7 +96,7 @@ describe('Tests the Extension Requests Screen', () => {
9696
'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
9797
'Access-Control-Allow-Headers': 'Content-Type, Authorization',
9898
},
99-
body: JSON.stringify(extensionRequestsListPendingDescending),
99+
body: JSON.stringify(extensionRequestsListPendingAscending),
100100
});
101101
} else if (
102102
url === 'https://api.realdevsquad.com/users?search=sunny&size=1'
@@ -196,7 +196,7 @@ describe('Tests the Extension Requests Screen', () => {
196196
});
197197
} else if (
198198
url ===
199-
'https://api.realdevsquad.com/extension-requests?order=asc&size=5&q=status%3APENDING%2Cassignee%3AiODXB6gfsjaZB9p0XlBw'
199+
'https://api.realdevsquad.com/extension-requests?order=desc&size=5&q=status%3APENDING%2Cassignee%3AiODXB6gfsjaZB9p0XlBw'
200200
) {
201201
interceptedRequest.respond({
202202
status: 200,
@@ -210,7 +210,7 @@ describe('Tests the Extension Requests Screen', () => {
210210
});
211211
} else if (
212212
url ===
213-
'https://api.realdevsquad.com/extension-requests?order=asc&size=5&q=status%3APENDING%2Cassignee%3AiODXB6gfsjaZB9p0XlBw%2B7yzVDl8s1ORNCtH9Ps7K'
213+
'https://api.realdevsquad.com/extension-requests?order=desc&size=5&q=status%3APENDING%2Cassignee%3AiODXB6gfsjaZB9p0XlBw%2B7yzVDl8s1ORNCtH9Ps7K'
214214
) {
215215
interceptedRequest.respond({
216216
status: 200,
@@ -278,9 +278,9 @@ describe('Tests the Extension Requests Screen', () => {
278278
});
279279
} else if (
280280
url ===
281-
'https://api.realdevsquad.com/extension-requests?order=asc&size=5&q=status%3AAPPROVED%2BPENDING%2BDENIED' ||
281+
'https://api.realdevsquad.com/extension-requests?order=desc&size=5&q=status%3AAPPROVED%2BPENDING%2BDENIED' ||
282282
url ===
283-
'https://api.realdevsquad.com/extension-requests?dev=true&order=asc&q=status%3AAPPROVED%2BDENIED'
283+
'https://api.realdevsquad.com/extension-requests?dev=true&order=desc&q=status%3AAPPROVED%2BDENIED'
284284
) {
285285
interceptedRequest.respond({
286286
status: 200,
@@ -346,7 +346,7 @@ describe('Tests the Extension Requests Screen', () => {
346346
});
347347
} else if (
348348
url ===
349-
'https://api.realdevsquad.com/extension-requests?order=asc&size=5&q=status%3AAPPROVED%2Cassignee%3AiODXB6gfsjaZB9p0XlBw%2B7yzVDl8s1ORNCtH9Ps7K'
349+
'https://api.realdevsquad.com/extension-requests?order=desc&size=5&q=status%3AAPPROVED%2Cassignee%3AiODXB6gfsjaZB9p0XlBw%2B7yzVDl8s1ORNCtH9Ps7K'
350350
) {
351351
interceptedRequest.respond({
352352
status: 200,
@@ -360,7 +360,7 @@ describe('Tests the Extension Requests Screen', () => {
360360
});
361361
} else if (
362362
url ===
363-
'https://api.realdevsquad.com/extension-requests?order=asc&size=1&q=status%3APENDING'
363+
'https://api.realdevsquad.com/extension-requests?order=desc&size=1&q=status%3APENDING'
364364
) {
365365
interceptedRequest.respond({
366366
status: 200,
@@ -677,11 +677,11 @@ describe('Tests the Extension Requests Screen', () => {
677677

678678
const sortedRequestDaysArray = requestDaysArray
679679
.slice()
680-
.sort((a, b) => a - b);
680+
.sort((a, b) => b - a);
681681
expect(requestDaysArray).toEqual(sortedRequestDaysArray);
682682
});
683683

684-
it('Checks whether the cards displayed in descending order when sort icon is clicked', async () => {
684+
it('Checks whether the cards displayed in ascending order when sort icon is clicked', async () => {
685685
const sortButton = await page.$('.sort-button');
686686

687687
await sortButton.click();
@@ -697,7 +697,7 @@ describe('Tests the Extension Requests Screen', () => {
697697
requestDaysArray.push(requestedDays.slice(5));
698698
}
699699

700-
const sortedRequestDaysArray = [...requestDaysArray].sort().reverse();
700+
const sortedRequestDaysArray = [...requestDaysArray].sort();
701701

702702
expect(requestDaysArray).toEqual(sortedRequestDaysArray);
703703
});
@@ -916,12 +916,12 @@ describe('Tests the Extension Requests Screen', () => {
916916
await page.waitForNetworkIdle();
917917
const url = page.url();
918918
expect(url).toBe(
919-
`${baseUrl}?order=asc&size=5&q=status%3AAPPROVED%2Cassignee%3Asunny%2Brandhir`,
919+
`${baseUrl}?order=desc&size=5&q=status%3AAPPROVED%2Cassignee%3Asunny%2Brandhir`,
920920
);
921921
});
922922
it('Should have UI elements in sync with url', async () => {
923923
await page.goto(
924-
`${baseUrl}/?order=asc&size=5&q=status%3AAPPROVED%2Cassignee%3Asunny%2Brandhir`,
924+
`${baseUrl}/?order=desc&size=5&q=status%3AAPPROVED%2Cassignee%3Asunny%2Brandhir`,
925925
);
926926
const filterButton = await page.$('#filter-button');
927927
await filterButton.click();
@@ -936,15 +936,15 @@ describe('Tests the Extension Requests Screen', () => {
936936
);
937937
expect(searchText).toBe('sunny,randhir');
938938
await page.waitForSelector('.sort-button');
939-
const ascSortIconDisplayStyle = await page.$eval(
940-
'#asc-sort-icon',
939+
const descSortIconDisplayStyle = await page.$eval(
940+
'#desc-sort-icon',
941941
(icon) => window.getComputedStyle(icon).display,
942942
);
943-
expect(ascSortIconDisplayStyle).toBe('block');
943+
expect(descSortIconDisplayStyle).toBe('block');
944944
});
945945

946946
it('Should show empty message if all extension requests have been addressed', async () => {
947-
await page.goto(`${baseUrl}/?order=asc&size=1&q=status%3APENDING`);
947+
await page.goto(`${baseUrl}/?order=desc&size=1&q=status%3APENDING`);
948948
await page.waitForNetworkIdle();
949949

950950
extensionRequestsElement = await page.$('.extension-requests');

‎__tests__/user-details/task-duedate-hover.test.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ describe('Tasks On User Management Page', () => {
182182

183183
it('Scroll of task should work', async () => {
184184
await page.goto(
185-
'http://localhost:8000/users/details/index.html?username=ajeyakrishna',
185+
'http://localhost:8000/users/details/index.html?username=ankush',
186186
);
187187
await page.waitForNetworkIdle();
188188
const taskDiv = await page.$$('.accordion-tasks');
@@ -213,12 +213,12 @@ describe('Tasks On User Management Page', () => {
213213
await page.waitForNetworkIdle();
214214

215215
let renderedTasks = await userTasksDevDiv.$$('.user-task');
216-
expect(Array.from(renderedTasks).length).toBe(12);
216+
expect(Array.from(renderedTasks).length).toBe(15);
217217
});
218218

219219
it('New task card should have all the detail fields', async () => {
220220
await page.goto(
221-
'http://localhost:8000/users/details/index.html?username=ajeyakrishna',
221+
'http://localhost:8000/users/details/index.html?username=ankush',
222222
);
223223
await page.waitForNetworkIdle();
224224
const taskDiv = await page.$$('.accordion-tasks');
@@ -236,7 +236,7 @@ describe('Tasks On User Management Page', () => {
236236
);
237237

238238
expect(firstTaskHTML).toContain('<div class="task-title">');
239-
expect(firstTaskHTML).not.toContain('<progress');
239+
expect(firstTaskHTML).toContain('<progress');
240240
expect(firstTaskHTML).toContain('<div class="detail-block eta">');
241241
expect(firstTaskHTML).toContain('<div class="detail-block status">');
242242
expect(firstTaskHTML).toContain('<div class="detail-block startedOn">');
@@ -251,7 +251,7 @@ describe('Tasks On User Management Page', () => {
251251
);
252252

253253
expect(secondTaskHTML).toContain('<div class="task-title">');
254-
expect(secondTaskHTML).not.toContain('<progress');
254+
expect(secondTaskHTML).toContain('<progress');
255255
expect(secondTaskHTML).toContain('<div class="detail-block eta">');
256256
expect(secondTaskHTML).toContain('<div class="detail-block status">');
257257
expect(secondTaskHTML).toContain('<div class="detail-block startedOn">');
@@ -266,7 +266,7 @@ describe('Tasks On User Management Page', () => {
266266
);
267267

268268
expect(thirdTaskHTML).toContain('<div class="task-title">');
269-
expect(thirdTaskHTML).not.toContain('<progress');
269+
expect(thirdTaskHTML).toContain('<progress');
270270
expect(thirdTaskHTML).toContain('<div class="detail-block eta">');
271271
expect(thirdTaskHTML).toContain('<div class="detail-block status">');
272272
expect(thirdTaskHTML).toContain('<div class="detail-block startedOn">');

‎extension-requests/script.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ const render = async () => {
133133
const assigneeFilterState = userIdList.length ? userIdList : '';
134134
filterStates.assignee = assigneeFilterState;
135135
if (!filterStates.order) {
136-
filterStates.order = Order.ASCENDING;
136+
filterStates.order = Order.DESCENDING;
137137
}
138138
} else {
139139
filterStates.status = Status.PENDING;
140-
filterStates.order = Order.ASCENDING;
140+
filterStates.order = Order.DESCENDING;
141141
filterStates.size = DEFAULT_PAGE_SIZE;
142142
}
143143
updateUIBasedOnFilterStates();

‎mock-data/extension-requests/index.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,55 +24,55 @@ const extensionRequestsList = {
2424
title: 'A new title',
2525
},
2626
],
27-
next: '/extension-requests&size=5&order=asc',
27+
next: '/extension-requests&size=5&order=desc',
2828
};
2929

30-
const extensionRequestsListPendingDescending = {
30+
const extensionRequestsListPendingAscending = {
3131
message: 'Extension Requests returned successfully!',
3232
allExtensionRequests: [
3333
{
34-
assignee: 'randhir',
35-
id: 'QISvF7kAmnD9vXHwwIs8',
34+
assignee: 'sunny',
35+
id: 'lGQ3AjUlgNB6Jd8jXaEC',
3636
newEndsOn: 1690528980,
3737
oldEndsOn: 1689954609.948,
38-
reason: 'b',
38+
reason: 'test reason',
3939
status: 'PENDING',
4040
taskId: 'PYj79ki2agB0q5JN3kUf',
41-
timestamp: 1691993520.03,
42-
title: 'A new title',
41+
timestamp: 1691734400.045, // Oldest timestamp
42+
title: 'A title',
4343
},
4444
{
4545
assignee: 'randhir',
46-
id: 'QISvF7kAmnD9vXHwwIs7',
46+
id: 'QISvF7kAmnD9vXHwwIsG',
4747
newEndsOn: 1690528980,
4848
oldEndsOn: 1689954609.948,
4949
reason: 'b',
5050
status: 'PENDING',
5151
taskId: 'PYj79ki2agB0q5JN3kUf',
52-
timestamp: 1691907153.157,
52+
timestamp: 1691820785.341,
5353
title: 'A new title',
5454
},
5555
{
5656
assignee: 'randhir',
57-
id: 'QISvF7kAmnD9vXHwwIsG',
57+
id: 'QISvF7kAmnD9vXHwwIs7',
5858
newEndsOn: 1690528980,
5959
oldEndsOn: 1689954609.948,
6060
reason: 'b',
6161
status: 'PENDING',
6262
taskId: 'PYj79ki2agB0q5JN3kUf',
63-
timestamp: 1691820785.341,
63+
timestamp: 1691907153.157,
6464
title: 'A new title',
6565
},
6666
{
67-
assignee: 'sunny',
68-
id: 'lGQ3AjUlgNB6Jd8jXaEC',
67+
assignee: 'randhir',
68+
id: 'QISvF7kAmnD9vXHwwIs8',
6969
newEndsOn: 1690528980,
7070
oldEndsOn: 1689954609.948,
71-
reason: 'test reason',
71+
reason: 'b',
7272
status: 'PENDING',
7373
taskId: 'PYj79ki2agB0q5JN3kUf',
74-
timestamp: 1691734400.045,
75-
title: 'A title',
74+
timestamp: 1691993520.03, // Most recent timestamp
75+
title: 'A new title',
7676
},
7777
],
7878
next: '/extension-requests?order=desc&size=5&q=status%3APENDING',
@@ -143,7 +143,7 @@ const extensionRequestsListPending = {
143143
title: 'A different title 2',
144144
},
145145
],
146-
next: '/extension-requests?order=asc&size=5&q=status%3APENDING',
146+
next: '/extension-requests?order=desc&size=5&q=status%3APENDING',
147147
};
148148

149149
const extensionRequestsListApproved = {
@@ -172,7 +172,7 @@ const extensionRequestsListApproved = {
172172
title: 'test title',
173173
},
174174
],
175-
next: '/extension-requests?q=status%3AAPPROVED&size=5&order=asc',
175+
next: '/extension-requests?q=status%3AAPPROVED&size=5&order=desc',
176176
};
177177

178178
const extensionRequestResponse = {
@@ -223,7 +223,7 @@ module.exports = {
223223
extensionRequestsListApproved,
224224
extensionRequestsListPending,
225225
extensionRequestResponse,
226-
extensionRequestsListPendingDescending,
226+
extensionRequestsListPendingAscending,
227227
extensionRequestsListUserSearch,
228228
extensionRequestListForAuditLogs,
229229
};

0 commit comments

Comments
 (0)