Merge pull request #713 from Northeastern-Electric-Racing/#650-can-re…

…view-own-cr #650 - added check so you can't review your own cr
Northeastern-Electric-Racing · Jun 15, 2022 · 3082c92 · 3082c92
2 parents db23a2a + 92d3b52
commit 3082c92
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/frontend/pages/ChangeRequestDetailPage/change-request-details.test.tsx b/src/frontend/pages/ChangeRequestDetailPage/change-request-details.test.tsx
@@ -12,6 +12,7 @@ import {
 } from '../../../test-support/test-data/change-requests.stub';
 import {
   exampleAdminUser,
+  exampleAdminUser2,
   exampleGuestUser,
   exampleMemberUser
 } from '../../../test-support/test-data/users.stub';
@@ -113,7 +114,7 @@ describe('change request details container', () => {
 
   it('enables review if the user is an admin', () => {
     mockSingleCRHook(false, false, exampleActivationChangeRequest);
-    mockAuthHook(exampleAdminUser);
+    mockAuthHook(exampleAdminUser2);
     renderComponent();
 
     expect(screen.getByText('Review')).not.toBeDisabled();

diff --git a/src/frontend/pages/ChangeRequestDetailPage/change-request-details.tsx b/src/frontend/pages/ChangeRequestDetailPage/change-request-details.tsx
@@ -25,7 +25,11 @@ const ChangeRequestDetails: React.FC = () => {
 
   return (
     <ChangeRequestDetailsView
-      isUserAllowedToReview={auth.user?.role !== 'GUEST' && auth.user?.role !== 'MEMBER'}
+      isUserAllowedToReview={
+        auth.user?.role !== 'GUEST' &&
+        auth.user?.role !== 'MEMBER' &&
+        auth.user?.userId !== data?.submitter.userId
+      }
       isUserAllowedToImplement={auth.user?.role !== 'GUEST'}
       changeRequest={data!}
     />

diff --git a/src/test-support/test-data/users.stub.ts b/src/test-support/test-data/users.stub.ts
@@ -25,6 +25,16 @@ export const exampleAdminUser: User = {
   role: Role.ADMIN
 };
 
+export const exampleAdminUser2: User = {
+  userId: 3,
+  firstName: 'Joe',
+  lastName: 'Shmoe',
+  googleAuthId: '2',
+  email: '[email protected]',
+  emailId: 'shmoe.j',
+  role: Role.ADMIN
+};
+
 export const exampleLeadershipUser: User = {
   userId: 3,
   firstName: 'Joe',