Skip to content

Commit 94588f8

Browse files
committed
update: field change from state to status
1 parent ce6be97 commit 94588f8

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

requests/script.js

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const intersectionObserver = new IntersectionObserver(async (entries) => {
2727
}
2828
if (entries[0].isIntersecting && !isDataLoading) {
2929
await renderRequestCards({
30-
state: statusValue,
30+
[isDev ? 'status' : 'state']: statusValue,
3131
sort: sortByValue,
3232
next: nextLink,
3333
});
@@ -49,7 +49,10 @@ oooTabLink.addEventListener('click', async function () {
4949
extensionTabLink.classList.remove(selected__tab__class);
5050
changeFilter();
5151
updateUrlWithQuery(currentReqType);
52-
await renderRequestCards({ state: statusValue, sort: sortByValue });
52+
await renderRequestCards({
53+
[isDev ? 'status' : 'state']: statusValue,
54+
sort: sortByValue,
55+
});
5356
});
5457

5558
extensionTabLink.addEventListener('click', async function () {
@@ -60,7 +63,10 @@ extensionTabLink.addEventListener('click', async function () {
6063
oooTabLink.classList.remove(selected__tab__class);
6164
changeFilter();
6265
updateUrlWithQuery(currentReqType);
63-
await renderRequestCards({ state: statusValue, sort: sortByValue });
66+
await renderRequestCards({
67+
[isDev ? 'status' : 'state']: statusValue,
68+
sort: sortByValue,
69+
});
6470
});
6571

6672
function updateUrlWithQuery(type) {
@@ -165,6 +171,7 @@ const changeFilter = () => {
165171
function createRequestCard(request, superUserDetails, requesterUserDetails) {
166172
let {
167173
id,
174+
status,
168175
state,
169176
from,
170177
until,
@@ -174,16 +181,17 @@ function createRequestCard(request, superUserDetails, requesterUserDetails) {
174181
reason,
175182
updatedAt,
176183
} = request;
184+
const requestStatus = isDev ? status : state;
177185
let showSuperuserDetailsClass = 'notHidden';
178186
let showActionButtonClass = 'notHidden';
179187
if (
180-
state === 'PENDING' ||
188+
requestStatus === 'PENDING' ||
181189
lastModifiedBy === undefined ||
182190
lastModifiedBy === null
183191
) {
184192
showSuperuserDetailsClass = 'hidden';
185193
}
186-
if (state !== 'PENDING') {
194+
if (requestStatus !== 'PENDING') {
187195
showActionButtonClass = 'hidden';
188196
}
189197
const createdDate = convertDateToReadableStringDate(
@@ -420,9 +428,9 @@ function createRequestCard(request, superUserDetails, requesterUserDetails) {
420428
}),
421429
createElementFromMap({
422430
tagName: 'button',
423-
class: ['request__status', `request__status--${state.toLowerCase()}`],
431+
class: ['request__status', `request__status--${requestStatus.toLowerCase()}`],
424432
textContent:
425-
state.charAt(0).toUpperCase() + state.slice(1).toLowerCase() ||
433+
requestStatus.charAt(0).toUpperCase() + requestStatus.slice(1).toLowerCase() ||
426434
'N/A',
427435
}),
428436
],
@@ -447,7 +455,7 @@ async function renderRequestCards(queries = {}) {
447455
for (const request of requestResponse?.data || []) {
448456
let superUserDetails;
449457
let requesterUserDetails = await getUserDetails(request.requestedBy);
450-
if (request.state !== 'PENDING') {
458+
if (isDev && request.status: request.state !== 'PENDING') {
451459
superUserDetails = await getUserDetails(request.lastModifiedBy);
452460
}
453461
requestContainer.appendChild(
@@ -522,12 +530,12 @@ async function performAcceptRejectAction(isAccepted, e) {
522530
let body = JSON.stringify({
523531
type: currentReqType,
524532
reason: remark,
525-
state: isAccepted ? 'APPROVED' : 'REJECTED',
533+
[isDev ? 'status' : 'state']: isAccepted ? 'APPROVED' : 'REJECTED',
526534
});
527535
if (remark === '' || remark === undefined || remark === null) {
528536
body = JSON.stringify({
529537
type: currentReqType,
530-
state: isAccepted ? 'APPROVED' : 'REJECTED',
538+
[isDev ? 'status' : 'state']: isAccepted ? 'APPROVED' : 'REJECTED',
531539
});
532540
}
533541
const parentDiv = e.target.closest('.ooo_request__card');

0 commit comments

Comments
 (0)