Merge branch 'main' into lock-user-access

Author: rahearn

docs/openapi/index.yaml

@@ -109,7 +109,9 @@ components:
             type: string
     selectableUser:
       type: object
-      description: Users with permission to approve reports
+      description: >
+        Users with only their id and name, ready to be placed in a select box on the frontend without
+        further modification
       properties:
         id:
           type: number

frontend/src/fetchers/activityReports.js

@@ -3,7 +3,7 @@ import { get, put, post } from './index';
 
 const activityReportUrl = join('/', 'api', 'activity-reports');
 
-export const fetchApprovers = async (region) => {
+export const getApprovers = async (region) => {
   const res = await get(join(activityReportUrl, 'approvers', `?region=${region}`));
   return res.json();
 };

frontend/src/pages/ActivityReport/constants.js

@@ -54,12 +54,6 @@ export const targetPopulations = [
   'Pregnant Women',
 ];
 
-export const otherUsers = [
-  'User 1',
-  'User 2',
-  'User 3',
-];
-
 export const programTypes = [
   'program type 1',
   'program type 2',

frontend/src/pages/ActivityReport/index.js

@@ -21,7 +21,7 @@ import {
   getRecipients,
   createReport,
   getCollaborators,
-  fetchApprovers,
+  getApprovers,
 } from '../../fetchers/activityReports';
 
 const defaultValues = {
@@ -34,7 +34,6 @@ const defaultValues = {
   endDate: null,
   grantees: [],
   numberOfParticipants: '',
-  otherUsers: [],
   participantCategory: '',
   participants: [],
   programTypes: [],
@@ -71,7 +70,7 @@ function ActivityReport({ match }) {
         const apiCalls = [
           getRecipients(),
           getCollaborators(region),
-          fetchApprovers(region),
+          getApprovers(region),
         ];
 
         if (activityReportId !== 'new') {

src/routes/activityReports/handlers.test.js

@@ -16,6 +16,8 @@ jest.mock('../../services/users', () => ({
   usersWithPermissions: jest.fn(),
 }));
 
+jest.mock('../../policies/activityReport');
+
 const mockResponse = {
   json: jest.fn(),
   sendStatus: jest.fn(),
@@ -49,7 +51,9 @@ describe('Activity Report handlers', () => {
     };
 
     it('returns the report', async () => {
-      ActivityReport.prototype.canUpdate = jest.fn().mockReturnValue(true);
+      ActivityReport.mockImplementationOnce(() => ({
+        canUpdate: () => true,
+      }));
       createOrUpdate.mockResolvedValue(report);
       userById.mockResolvedValue({
         id: 1,
@@ -59,7 +63,9 @@ describe('Activity Report handlers', () => {
     });
 
     it('handles unauthorizedRequests', async () => {
-      ActivityReport.prototype.canUpdate = jest.fn().mockReturnValue(false);
+      ActivityReport.mockImplementationOnce(() => ({
+        canUpdate: () => false,
+      }));
       activityReportById.mockResolvedValue(report);
       userById.mockResolvedValue({
         id: 1,
@@ -77,7 +83,9 @@ describe('Activity Report handlers', () => {
     };
 
     it('returns the created report', async () => {
-      ActivityReport.prototype.canCreate = jest.fn().mockReturnValue(true);
+      ActivityReport.mockImplementationOnce(() => ({
+        canCreate: () => true,
+      }));
       createOrUpdate.mockResolvedValue(report);
       userById.mockResolvedValue({
         id: 1,
@@ -93,7 +101,9 @@ describe('Activity Report handlers', () => {
     });
 
     it('handles unauthorized requests', async () => {
-      ActivityReport.prototype.canCreate = jest.fn().mockReturnValue(false);
+      ActivityReport.mockImplementationOnce(() => ({
+        canCreate: () => false,
+      }));
       userById.mockResolvedValue({
         id: 1,
       });
@@ -110,7 +120,9 @@ describe('Activity Report handlers', () => {
     };
 
     it('returns the updated report', async () => {
-      ActivityReport.prototype.canUpdate = jest.fn().mockReturnValue(true);
+      ActivityReport.mockImplementationOnce(() => ({
+        canUpdate: () => true,
+      }));
       activityReportById.mockResolvedValue(report);
       createOrUpdate.mockResolvedValue(report);
       userById.mockResolvedValue({
@@ -122,7 +134,9 @@ describe('Activity Report handlers', () => {
 
     it('handles unauthorized requests', async () => {
       activityReportById.mockResolvedValue(report);
-      ActivityReport.prototype.canUpdate = jest.fn().mockReturnValue(false);
+      ActivityReport.mockImplementationOnce(() => ({
+        canUpdate: () => false,
+      }));
       userById.mockResolvedValue({
         id: 1,
       });
@@ -150,6 +164,9 @@ describe('Activity Report handlers', () => {
     };
 
     it('returns the report', async () => {
+      ActivityReport.mockImplementationOnce(() => ({
+        canGet: () => true,
+      }));
       activityReportById.mockResolvedValue(report);
       userById.mockResolvedValue({
         id: 1,
@@ -167,7 +184,9 @@ describe('Activity Report handlers', () => {
 
     it('handles unauthorized requests', async () => {
       activityReportById.mockResolvedValue(report);
-      ActivityReport.prototype.canGet = jest.fn().mockReturnValue(false);
+      ActivityReport.mockImplementationOnce(() => ({
+        canGet: () => false,
+      }));
       await getReport(request, mockResponse);
       expect(mockResponse.sendStatus).toHaveBeenCalledWith(403);
     });