Skip to content

Commit 77053ea

Browse files
committed
update: change all occurange of 'state' to 'status'
1 parent 4708131 commit 77053ea

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

requests/script.js

Lines changed: 12 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,7 @@ 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({ [isDev ? 'status' : 'state']: statusValue, sort: sortByValue });
5353
});
5454

5555
extensionTabLink.addEventListener('click', async function () {
@@ -60,7 +60,7 @@ extensionTabLink.addEventListener('click', async function () {
6060
oooTabLink.classList.remove(selected__tab__class);
6161
changeFilter();
6262
updateUrlWithQuery(currentReqType);
63-
await renderRequestCards({ state: statusValue, sort: sortByValue });
63+
await renderRequestCards({ [isDev ? 'status' : 'state']: statusValue, sort: sortByValue });
6464
});
6565

6666
function updateUrlWithQuery(type) {
@@ -165,6 +165,7 @@ const changeFilter = () => {
165165
function createRequestCard(request, superUserDetails, requesterUserDetails) {
166166
let {
167167
id,
168+
status,
168169
state,
169170
from,
170171
until,
@@ -174,16 +175,17 @@ function createRequestCard(request, superUserDetails, requesterUserDetails) {
174175
reason,
175176
updatedAt,
176177
} = request;
178+
const requestStatus = isDev ? status : state;
177179
let showSuperuserDetailsClass = 'notHidden';
178180
let showActionButtonClass = 'notHidden';
179181
if (
180-
state === 'PENDING' ||
182+
requestStatus === 'PENDING' ||
181183
lastModifiedBy === undefined ||
182184
lastModifiedBy === null
183185
) {
184186
showSuperuserDetailsClass = 'hidden';
185187
}
186-
if (state !== 'PENDING') {
188+
if (requestStatus !== 'PENDING') {
187189
showActionButtonClass = 'hidden';
188190
}
189191
const createdDate = convertDateToReadableStringDate(
@@ -420,9 +422,9 @@ function createRequestCard(request, superUserDetails, requesterUserDetails) {
420422
}),
421423
createElementFromMap({
422424
tagName: 'button',
423-
class: ['request__status', `request__status--${state.toLowerCase()}`],
425+
class: ['request__status', `request__status--${requestStatus.toLowerCase()}`],
424426
textContent:
425-
state.charAt(0).toUpperCase() + state.slice(1).toLowerCase() ||
427+
requestStatus.charAt(0).toUpperCase() + requestStatus.slice(1).toLowerCase() ||
426428
'N/A',
427429
}),
428430
],
@@ -447,7 +449,7 @@ async function renderRequestCards(queries = {}) {
447449
for (const request of requestResponse?.data || []) {
448450
let superUserDetails;
449451
let requesterUserDetails = await getUserDetails(request.requestedBy);
450-
if (request.state !== 'PENDING') {
452+
if (isDev ? request.status : request.state !== 'PENDING') {
451453
superUserDetails = await getUserDetails(request.lastModifiedBy);
452454
}
453455
requestContainer.appendChild(
@@ -522,12 +524,12 @@ async function performAcceptRejectAction(isAccepted, e) {
522524
let body = JSON.stringify({
523525
type: currentReqType,
524526
reason: remark,
525-
state: isAccepted ? 'APPROVED' : 'REJECTED',
527+
[isDev ? 'status' : 'state']: isAccepted ? 'APPROVED' : 'REJECTED',
526528
});
527529
if (remark === '' || remark === undefined || remark === null) {
528530
body = JSON.stringify({
529531
type: currentReqType,
530-
state: isAccepted ? 'APPROVED' : 'REJECTED',
532+
[isDev ? 'status' : 'state']: isAccepted ? 'APPROVED' : 'REJECTED',
531533
});
532534
}
533535
const parentDiv = e.target.closest('.ooo_request__card');

0 commit comments

Comments
 (0)