@@ -27,7 +27,7 @@ const intersectionObserver = new IntersectionObserver(async (entries) => {
27
27
}
28
28
if ( entries [ 0 ] . isIntersecting && ! isDataLoading ) {
29
29
await renderRequestCards ( {
30
- state : statusValue ,
30
+ [ isDev ? 'status' : ' state' ] : statusValue ,
31
31
sort : sortByValue ,
32
32
next : nextLink ,
33
33
} ) ;
@@ -49,7 +49,10 @@ oooTabLink.addEventListener('click', async function () {
49
49
extensionTabLink . classList . remove ( selected__tab__class ) ;
50
50
changeFilter ( ) ;
51
51
updateUrlWithQuery ( currentReqType ) ;
52
- await renderRequestCards ( { state : statusValue , sort : sortByValue } ) ;
52
+ await renderRequestCards ( {
53
+ [ isDev ? 'status' : 'state' ] : statusValue ,
54
+ sort : sortByValue ,
55
+ } ) ;
53
56
} ) ;
54
57
55
58
extensionTabLink . addEventListener ( 'click' , async function ( ) {
@@ -60,7 +63,10 @@ extensionTabLink.addEventListener('click', async function () {
60
63
oooTabLink . classList . remove ( selected__tab__class ) ;
61
64
changeFilter ( ) ;
62
65
updateUrlWithQuery ( currentReqType ) ;
63
- await renderRequestCards ( { state : statusValue , sort : sortByValue } ) ;
66
+ await renderRequestCards ( {
67
+ [ isDev ? 'status' : 'state' ] : statusValue ,
68
+ sort : sortByValue ,
69
+ } ) ;
64
70
} ) ;
65
71
66
72
function updateUrlWithQuery ( type ) {
@@ -165,6 +171,7 @@ const changeFilter = () => {
165
171
function createRequestCard ( request , superUserDetails , requesterUserDetails ) {
166
172
let {
167
173
id,
174
+ status,
168
175
state,
169
176
from,
170
177
until,
@@ -174,16 +181,17 @@ function createRequestCard(request, superUserDetails, requesterUserDetails) {
174
181
reason,
175
182
updatedAt,
176
183
} = request ;
184
+ const requestStatus = isDev ? status : state ;
177
185
let showSuperuserDetailsClass = 'notHidden' ;
178
186
let showActionButtonClass = 'notHidden' ;
179
187
if (
180
- state === 'PENDING' ||
188
+ requestStatus === 'PENDING' ||
181
189
lastModifiedBy === undefined ||
182
190
lastModifiedBy === null
183
191
) {
184
192
showSuperuserDetailsClass = 'hidden' ;
185
193
}
186
- if ( state !== 'PENDING' ) {
194
+ if ( requestStatus !== 'PENDING' ) {
187
195
showActionButtonClass = 'hidden' ;
188
196
}
189
197
const createdDate = convertDateToReadableStringDate (
@@ -420,9 +428,9 @@ function createRequestCard(request, superUserDetails, requesterUserDetails) {
420
428
} ) ,
421
429
createElementFromMap ( {
422
430
tagName : 'button' ,
423
- class : [ 'request__status' , `request__status--${ state . toLowerCase ( ) } ` ] ,
431
+ class : [ 'request__status' , `request__status--${ requestStatus . toLowerCase ( ) } ` ] ,
424
432
textContent :
425
- state . charAt ( 0 ) . toUpperCase ( ) + state . slice ( 1 ) . toLowerCase ( ) ||
433
+ requestStatus . charAt ( 0 ) . toUpperCase ( ) + requestStatus . slice ( 1 ) . toLowerCase ( ) ||
426
434
'N/A' ,
427
435
} ) ,
428
436
] ,
@@ -447,7 +455,7 @@ async function renderRequestCards(queries = {}) {
447
455
for ( const request of requestResponse ?. data || [ ] ) {
448
456
let superUserDetails ;
449
457
let requesterUserDetails = await getUserDetails ( request . requestedBy ) ;
450
- if ( request . state !== 'PENDING' ) {
458
+ if ( isDev && request . status : request . state !== 'PENDING' ) {
451
459
superUserDetails = await getUserDetails ( request . lastModifiedBy ) ;
452
460
}
453
461
requestContainer . appendChild (
@@ -522,12 +530,12 @@ async function performAcceptRejectAction(isAccepted, e) {
522
530
let body = JSON . stringify ( {
523
531
type : currentReqType ,
524
532
reason : remark ,
525
- state : isAccepted ? 'APPROVED' : 'REJECTED' ,
533
+ [ isDev ? 'status' : ' state' ] : isAccepted ? 'APPROVED' : 'REJECTED' ,
526
534
} ) ;
527
535
if ( remark === '' || remark === undefined || remark === null ) {
528
536
body = JSON . stringify ( {
529
537
type : currentReqType ,
530
- state : isAccepted ? 'APPROVED' : 'REJECTED' ,
538
+ [ isDev ? 'status' : ' state' ] : isAccepted ? 'APPROVED' : 'REJECTED' ,
531
539
} ) ;
532
540
}
533
541
const parentDiv = e . target . closest ( '.ooo_request__card' ) ;
0 commit comments