@@ -308,6 +321,95 @@ function LedSign() {
return (11 - scrollSpeed);
}
+ function getSelectedClassName(currTab) {
+ return currTab === tab
+ ? 'p-2 bg-gray-100 dark:bg-gray-700 rounded-md dark:text-white text-gray-700'
+ : 'p-2 hover:bg-gray-400 rounded-md dark:text-white text-gray-700';
+ }
+
+ async function fetchAllPermissionRequests() {
+ if (!isOfficer) return;
+ setLoadingRequests(true);
+ const result = await getAllPermissionRequests('LED_SIGN', user.token);
+ if (!result.error && result.responseData) {
+ setAllPermissionRequests(result.responseData);
+ }
+ setLoadingRequests(false);
+ }
+
+ async function handleApprove(requestId) {
+ const result = await approvePermissionRequest('LED_SIGN', requestId, user.token);
+ if (!result.error) await fetchAllPermissionRequests();
+ }
+
+ async function handleDeny(requestId) {
+ const result = await deletePermissionRequest('LED_SIGN', requestId, user.token);
+ if (!result.error) await fetchAllPermissionRequests();
+ }
+
+ function formatUserName(userData) {
+ if (!userData) return 'Unknown User';
+ const name = `${userData.firstName || ''} ${userData.lastName || ''}`.trim();
+ return name || 'Unknown User';
+ }
+
+ function MaybeRenderListOfSignRequests() {
+ if (!isOfficer) return null;
+ if (loadingRequests) {
+ return (
+
+ );
+ }
+
+ return (
+
+
+
+
+
+ | User Name |
+ Email |
+ Request Date |
+ Actions |
+
+
+
+ {allPermissionRequests.length === 0 ? (
+
+ |
+ No pending requests
+ |
+
+ ) : (
+ allPermissionRequests.map((request) => (
+
+ |
+ {formatUserName(request.userId)}
+ |
+ {request.userId?.email || 'N/A'} |
+ {getFormattedTime(request.createdAt)} |
+
+
+
+
+
+ |
+
+ ))
+ )}
+
+
+
+
+ );
+ }
+
const hasAccess = user.accessLevel >= membershipState.OFFICER;
return (
@@ -318,7 +420,24 @@ function LedSign() {
)}
{hasAccess && (
-
+ <>
+
+
+
|
+
+
+ {tab === 'sign' && (
+
@@ -388,6 +507,9 @@ function LedSign() {
+ )}
+ {tab === 'requests' &&
}
+
)}
);
diff --git a/test/api/PermissionRequest.js b/test/api/PermissionRequest.js
index 8f539114e..ca91a87b4 100644
--- a/test/api/PermissionRequest.js
+++ b/test/api/PermissionRequest.js
@@ -15,6 +15,7 @@ const {
} = require('../util/mocks/TokenValidFunctions');
const mongoose = require('mongoose');
const PermissionRequestTypes = require('../../api/main_endpoints/util/permissionRequestTypes');
+const PermissionRequestStatus = constants.PERMISSION_REQUEST_STATUS;
let app = null;
let test = null;
@@ -96,6 +97,17 @@ describe('PermissionRequest', () => {
expect(res).to.have.status(CONFLICT);
});
+ it('Should allow new request after denial', async () => {
+ const userId = createUserToken();
+ const request = await createRequest(userId);
+ request.status = PermissionRequestStatus.DENIED;
+ await request.save();
+ const res = await test.sendPostRequestWithToken(token, '/api/PermissionRequest/create', { type: PermissionRequestTypes.LED_SIGN });
+ expect(res).to.have.status(OK);
+ const updated = await PermissionRequest.findById(request._id);
+ expect(updated.status).to.equal(PermissionRequestStatus.PENDING);
+ });
+
it('Should create permission request successfully', async () => {
const userId = createUserToken();
const res = await test.sendPostRequestWithToken(token, '/api/PermissionRequest/create', { type: PermissionRequestTypes.LED_SIGN });
@@ -174,11 +186,11 @@ describe('PermissionRequest', () => {
expect(typeRes.body.every(r => r.type === PermissionRequestTypes.LED_SIGN)).to.be.true;
});
- it('Should exclude deleted requests and sort by createdAt descending', async () => {
+ it('Should exclude denied requests and sort by createdAt descending', async () => {
const userId = createUserToken();
await PermissionRequest.deleteMany({ userId });
const active = await createRequest(userId);
- active.deletedAt = new Date();
+ active.status = PermissionRequestStatus.DENIED;
await active.save();
const res = await test.sendGetRequest(GET_ROUTE);
expect(res.body.map(r => r._id.toString())).to.not.include(active._id.toString());
@@ -224,11 +236,10 @@ describe('PermissionRequest', () => {
expect(missingRes).to.have.status(BAD_REQUEST);
});
- it('Should delete permission request successfully and set deletedAt', async () => {
+ it('Should delete permission request successfully and set status', async () => {
const userId = createUserToken();
await PermissionRequest.deleteMany({ userId, type: PermissionRequestTypes.LED_SIGN });
const request = await new PermissionRequest({ userId, type: PermissionRequestTypes.LED_SIGN }).save();
- const beforeDelete = new Date();
// For non-officers, the API uses userId as _id in query, which won't match request._id
// So we need to test with an officer who can provide the actual _id
createUserToken(constants.MEMBERSHIP_STATE.OFFICER);
@@ -237,18 +248,21 @@ describe('PermissionRequest', () => {
});
expect(res).to.have.status(OK);
const deleted = await PermissionRequest.findById(request._id);
- expect(deleted.deletedAt).to.not.be.null;
- expect(new Date(deleted.deletedAt).getTime()).to.be.at.least(beforeDelete.getTime());
+ expect(deleted.status).to.equal(PermissionRequestStatus.DENIED);
});
- it('Should return 404 when _id does not exist or request already deleted', async () => {
+ it('Should return 404 when _id does not exist or request already denied', async () => {
const userId = createUserToken(constants.MEMBERSHIP_STATE.OFFICER);
const nonExistentId = new mongoose.Types.ObjectId();
const res1 = await test.sendPostRequestWithToken(token, '/api/PermissionRequest/delete', {
type: PermissionRequestTypes.LED_SIGN, _id: nonExistentId
});
expect(res1).to.have.status(NOT_FOUND);
- const deletedRequest = await new PermissionRequest({ userId, type: PermissionRequestTypes.LED_SIGN, deletedAt: new Date() }).save();
+ const deletedRequest = await new PermissionRequest({
+ userId,
+ type: PermissionRequestTypes.LED_SIGN,
+ status: PermissionRequestStatus.DENIED,
+ }).save();
const res2 = await test.sendPostRequestWithToken(token, '/api/PermissionRequest/delete', {
type: PermissionRequestTypes.LED_SIGN, _id: deletedRequest._id
});
@@ -264,14 +278,14 @@ describe('PermissionRequest', () => {
type: PermissionRequestTypes.LED_SIGN, _id: request2._id
});
expect(memberRes).to.have.status(NOT_FOUND);
- expect((await PermissionRequest.findById(request2._id)).deletedAt).to.be.null;
+ expect((await PermissionRequest.findById(request2._id)).status).to.equal(PermissionRequestStatus.PENDING);
// Officer can delete any request
createUserToken(constants.MEMBERSHIP_STATE.OFFICER);
const officerRes = await test.sendPostRequestWithToken(token, '/api/PermissionRequest/delete', {
type: PermissionRequestTypes.LED_SIGN, _id: request2._id
});
expect(officerRes).to.have.status(OK);
- expect((await PermissionRequest.findById(request2._id)).deletedAt).to.not.be.null;
+ expect((await PermissionRequest.findById(request2._id)).status).to.equal(PermissionRequestStatus.DENIED);
});
it('Should require _id parameter even for officers', async () => {
@@ -281,7 +295,7 @@ describe('PermissionRequest', () => {
type: PermissionRequestTypes.LED_SIGN
});
expect(res).to.have.status(NOT_FOUND);
- expect((await PermissionRequest.findById(request._id)).deletedAt).to.be.null;
+ expect((await PermissionRequest.findById(request._id)).status).to.equal(PermissionRequestStatus.PENDING);
});
});
});