View past access requests in Manage User table (#1346)

* update access request table & view actioned requests * update frontend tests & add jsdocs * frontend test is failing * fix: dropped test from ActiveUserList - table is larger then testing container, columns invisible --------- Co-authored-by: Mac Deluca <[email protected]> Co-authored-by: Mac Deluca <[email protected]>
bcgov · Sep 5, 2024 · e1a31b8 · e1a31b8
1 parent 36009c9
commit e1a31b8
Show file tree

Hide file tree

Showing 27 changed files with 758 additions and 518 deletions.
diff --git a/api/src/paths/administrative-activities.ts b/api/src/paths/administrative-activities.ts
@@ -108,6 +108,16 @@ GET.apiDoc = {
                 create_date: {
                   type: 'string',
                   description: 'ISO 8601 date string'
+                },
+                updated_by: {
+                  type: 'string',
+                  description: 'Display name of the user who last updated the record',
+                  nullable: true
+                },
+                update_date: {
+                  type: 'string',
+                  description: 'Date when the record was last updated',
+                  nullable: true
                 }
               }
             }

diff --git a/api/src/repositories/administrative-activity-repository.ts b/api/src/repositories/administrative-activity-repository.ts
@@ -24,7 +24,9 @@ export const IAdministrativeActivity = z.object({
   description: z.string().nullable(),
   data: shallowJsonSchema,
   notes: z.string().nullable(),
-  create_date: z.string()
+  create_date: z.string(),
+  updated_by: z.string().nullable(),
+  update_date: z.string().nullable()
 });
 
 export type IAdministrativeActivity = z.infer<typeof IAdministrativeActivity>;
@@ -66,7 +68,9 @@ export class AdministrativeActivityRepository extends BaseRepository {
         aa.description,
         aa.data,
         aa.notes,
-        aa.create_date
+        aa.create_date,
+        su.display_name as updated_by,
+        aa.update_date
       FROM
         administrative_activity aa
       LEFT OUTER JOIN
@@ -77,6 +81,10 @@ export class AdministrativeActivityRepository extends BaseRepository {
         administrative_activity_type aat
       ON
         aa.administrative_activity_type_id = aat.administrative_activity_type_id
+      LEFT OUTER JOIN
+        system_user su 
+      ON 
+        su.system_user_id = aa.update_user
       WHERE
         1 = 1
     `;
@@ -115,7 +123,9 @@ export class AdministrativeActivityRepository extends BaseRepository {
       sqlStatement.append(SQL`)`);
     }
 
-    sqlStatement.append(`;`);
+    sqlStatement.append(`
+      ORDER BY create_date DESC;
+    `);
 
     const response = await this.connection.sql(sqlStatement, IAdministrativeActivity);
     return response.rows;

diff --git a/api/src/services/administrative-activity-service.test.ts b/api/src/services/administrative-activity-service.test.ts
@@ -42,7 +42,9 @@ describe('AdministrativeActivityService', () => {
             identitySource: 'BCEIDBASIC'
           },
           notes: null,
-          create_date: '2023-05-02T02:04:10.751Z'
+          create_date: '2023-05-02T02:04:10.751Z',
+          update_date: '2023-05-02T02:04:10.751Z',
+          updated_by: 'Doe, John WLRS:EX'
         }
       ]);
 
@@ -66,7 +68,9 @@ describe('AdministrativeActivityService', () => {
             identitySource: 'BCEIDBASIC'
           },
           notes: null,
-          create_date: '2023-05-02T02:04:10.751Z'
+          create_date: '2023-05-02T02:04:10.751Z',
+          update_date: '2023-05-02T02:04:10.751Z',
+          updated_by: 'Doe, John WLRS:EX'
         }
       ]);
     });

diff --git a/app/src/constants/colours.ts b/app/src/constants/colours.ts
@@ -65,6 +65,16 @@ const NRM_REGION_COLOUR_MAP = {
   'Skeena Natural Resource Region': { colour: red }
 };
 
+/**
+ * Colour map for access request chips.
+ *
+ */
+const ACCESS_REQUEST_STATUS_COLOUR_MAP = {
+  Pending: { colour: purple },
+  Actioned: { colour: green },
+  Rejected: { colour: red }
+};
+
 /**
  * ColourMap key types
  *
@@ -85,6 +95,12 @@ const generateColourMapGetter = <T extends ColourMap>(colourMap: T, fallbackColo
   return (lookup: keyof T) => colourMap[lookup]?.colour ?? fallbackColour;
 };
 
+/**
+ * Get access request status colour mapping.
+ *
+ */
+export const getAccessRequestStatusColour = generateColourMapGetter(ACCESS_REQUEST_STATUS_COLOUR_MAP);
+
 /**
  * Get survey progress colour mapping.
  *

diff --git a/app/src/features/admin/AdminUsersRouter.tsx b/app/src/features/admin/AdminUsersRouter.tsx
@@ -3,7 +3,7 @@ import { Redirect, Route, Switch } from 'react-router';
 import RouteWithTitle from 'utils/RouteWithTitle';
 import { getTitle } from 'utils/Utils';
 import ManageUsersPage from './users/ManageUsersPage';
-import UsersDetailPage from './users/UsersDetailPage';
+import UsersDetailPage from './users/projects/UsersDetailPage';
 
 /**
  * Router for all `/admin/users/*` pages.