@@ -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,7 @@ 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 ( { [ isDev ? 'status' : ' state' ] : statusValue , sort : sortByValue } ) ;
53
53
} ) ;
54
54
55
55
extensionTabLink . addEventListener ( 'click' , async function ( ) {
@@ -60,7 +60,7 @@ extensionTabLink.addEventListener('click', async function () {
60
60
oooTabLink . classList . remove ( selected__tab__class ) ;
61
61
changeFilter ( ) ;
62
62
updateUrlWithQuery ( currentReqType ) ;
63
- await renderRequestCards ( { state : statusValue , sort : sortByValue } ) ;
63
+ await renderRequestCards ( { [ isDev ? 'status' : ' state' ] : statusValue , sort : sortByValue } ) ;
64
64
} ) ;
65
65
66
66
function updateUrlWithQuery ( type ) {
@@ -165,6 +165,7 @@ const changeFilter = () => {
165
165
function createRequestCard ( request , superUserDetails , requesterUserDetails ) {
166
166
let {
167
167
id,
168
+ status,
168
169
state,
169
170
from,
170
171
until,
@@ -174,16 +175,17 @@ function createRequestCard(request, superUserDetails, requesterUserDetails) {
174
175
reason,
175
176
updatedAt,
176
177
} = request ;
178
+ const requestStatus = isDev ? status : state ;
177
179
let showSuperuserDetailsClass = 'notHidden' ;
178
180
let showActionButtonClass = 'notHidden' ;
179
181
if (
180
- state === 'PENDING' ||
182
+ requestStatus === 'PENDING' ||
181
183
lastModifiedBy === undefined ||
182
184
lastModifiedBy === null
183
185
) {
184
186
showSuperuserDetailsClass = 'hidden' ;
185
187
}
186
- if ( state !== 'PENDING' ) {
188
+ if ( requestStatus !== 'PENDING' ) {
187
189
showActionButtonClass = 'hidden' ;
188
190
}
189
191
const createdDate = convertDateToReadableStringDate (
@@ -420,9 +422,9 @@ function createRequestCard(request, superUserDetails, requesterUserDetails) {
420
422
} ) ,
421
423
createElementFromMap ( {
422
424
tagName : 'button' ,
423
- class : [ 'request__status' , `request__status--${ state . toLowerCase ( ) } ` ] ,
425
+ class : [ 'request__status' , `request__status--${ requestStatus . toLowerCase ( ) } ` ] ,
424
426
textContent :
425
- state . charAt ( 0 ) . toUpperCase ( ) + state . slice ( 1 ) . toLowerCase ( ) ||
427
+ requestStatus . charAt ( 0 ) . toUpperCase ( ) + requestStatus . slice ( 1 ) . toLowerCase ( ) ||
426
428
'N/A' ,
427
429
} ) ,
428
430
] ,
@@ -447,7 +449,7 @@ async function renderRequestCards(queries = {}) {
447
449
for ( const request of requestResponse ?. data || [ ] ) {
448
450
let superUserDetails ;
449
451
let requesterUserDetails = await getUserDetails ( request . requestedBy ) ;
450
- if ( request . state !== 'PENDING' ) {
452
+ if ( isDev ? request . status : request . state !== 'PENDING' ) {
451
453
superUserDetails = await getUserDetails ( request . lastModifiedBy ) ;
452
454
}
453
455
requestContainer . appendChild (
@@ -522,12 +524,12 @@ async function performAcceptRejectAction(isAccepted, e) {
522
524
let body = JSON . stringify ( {
523
525
type : currentReqType ,
524
526
reason : remark ,
525
- state : isAccepted ? 'APPROVED' : 'REJECTED' ,
527
+ [ isDev ? 'status' : ' state' ] : isAccepted ? 'APPROVED' : 'REJECTED' ,
526
528
} ) ;
527
529
if ( remark === '' || remark === undefined || remark === null ) {
528
530
body = JSON . stringify ( {
529
531
type : currentReqType ,
530
- state : isAccepted ? 'APPROVED' : 'REJECTED' ,
532
+ [ isDev ? 'status' : ' state' ] : isAccepted ? 'APPROVED' : 'REJECTED' ,
531
533
} ) ;
532
534
}
533
535
const parentDiv = e . target . closest ( '.ooo_request__card' ) ;
0 commit comments