Skip to content

Update/state change #996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Update/state change #996

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94588f8
update: field change from state to status
ZendeAditya May 10, 2025
f4a6f39
Merge branch 'develop' into update/state-change
ZendeAditya May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions requests/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const intersectionObserver = new IntersectionObserver(async (entries) => {
}
if (entries[0].isIntersecting && !isDataLoading) {
await renderRequestCards({
state: statusValue,
[isDev ? 'status' : 'state']: statusValue,
sort: sortByValue,
next: nextLink,
});
Expand All @@ -49,7 +49,10 @@ oooTabLink.addEventListener('click', async function () {
extensionTabLink.classList.remove(selected__tab__class);
changeFilter();
updateUrlWithQuery(currentReqType);
await renderRequestCards({ state: statusValue, sort: sortByValue });
await renderRequestCards({
[isDev ? 'status' : 'state']: statusValue,
sort: sortByValue,
});
});

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

function updateUrlWithQuery(type) {
Expand Down Expand Up @@ -165,6 +171,7 @@ const changeFilter = () => {
function createRequestCard(request, superUserDetails, requesterUserDetails) {
let {
id,
status,
state,
from,
until,
Expand All @@ -174,16 +181,17 @@ function createRequestCard(request, superUserDetails, requesterUserDetails) {
reason,
updatedAt,
} = request;
const requestStatus = isDev ? status : state;
let showSuperuserDetailsClass = 'notHidden';
let showActionButtonClass = 'notHidden';
if (
state === 'PENDING' ||
requestStatus === 'PENDING' ||
lastModifiedBy === undefined ||
lastModifiedBy === null
) {
showSuperuserDetailsClass = 'hidden';
}
if (state !== 'PENDING') {
if (requestStatus !== 'PENDING') {
showActionButtonClass = 'hidden';
}
const createdDate = convertDateToReadableStringDate(
Expand Down Expand Up @@ -420,9 +428,9 @@ function createRequestCard(request, superUserDetails, requesterUserDetails) {
}),
createElementFromMap({
tagName: 'button',
class: ['request__status', `request__status--${state.toLowerCase()}`],
class: ['request__status', `request__status--${requestStatus.toLowerCase()}`],
textContent:
state.charAt(0).toUpperCase() + state.slice(1).toLowerCase() ||
requestStatus.charAt(0).toUpperCase() + requestStatus.slice(1).toLowerCase() ||
'N/A',
}),
],
Expand All @@ -447,7 +455,7 @@ async function renderRequestCards(queries = {}) {
for (const request of requestResponse?.data || []) {
let superUserDetails;
let requesterUserDetails = await getUserDetails(request.requestedBy);
if (request.state !== 'PENDING') {
if (isDev && request.status: request.state !== 'PENDING') {
superUserDetails = await getUserDetails(request.lastModifiedBy);
}
requestContainer.appendChild(
Expand Down Expand Up @@ -522,12 +530,12 @@ async function performAcceptRejectAction(isAccepted, e) {
let body = JSON.stringify({
type: currentReqType,
reason: remark,
state: isAccepted ? 'APPROVED' : 'REJECTED',
[isDev ? 'status' : 'state']: isAccepted ? 'APPROVED' : 'REJECTED',
});
if (remark === '' || remark === undefined || remark === null) {
body = JSON.stringify({
type: currentReqType,
state: isAccepted ? 'APPROVED' : 'REJECTED',
[isDev ? 'status' : 'state']: isAccepted ? 'APPROVED' : 'REJECTED',
});
}
const parentDiv = e.target.closest('.ooo_request__card');
Expand Down