S28 2057: View Audit Page

charts/pre-portal/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: '1.0'
 description: A Helm chart for pre-portal App
 name: pre-portal
 home: https://github.com/hmcts/pre-portal
-version: 0.0.24
+version: 0.0.25
 dependencies:
   - name: nodejs
     version: 3.2.0

charts/pre-portal/values.dev.template.yaml

@@ -4,7 +4,7 @@ nodejs:
   ingressHost: ${SERVICE_FQDN}
   environment:
     PORTAL_URL: https://pre-portal-pr-${CHANGE_ID}.dev.platform.hmcts.net
-    API_URL: https://pre-api-pr-956.dev.platform.hmcts.net/
+    API_URL: https://pre-api-pr-976.dev.platform.hmcts.net/
     ALLOW_CONFIG_MUTATIONS: true
     B2C_APP_CLIENT_ID: d20a7462-f222-46b8-a363-d2e30eb274eb
     B2C_BASE_URL: https://hmctsstgextid.b2clogin.com/hmctsstgextid.onmicrosoft.com/v2.0/.well-known/openid-configuration?p=B2C_1A_SIGNUP_SIGNIN

src/main/assets/scss/main.scss

@@ -223,3 +223,7 @@
   border: 4px solid black;
   margin-bottom: 1rem;
 }
+
+.govuk-code {
+  font-size: 1rem;
+}

src/main/routes/admin/audit.ts

@@ -1,57 +1,41 @@
-import { SearchAuditLogsRequest } from 'services/pre-api/types';
+import { RequiresSuperUser } from '../../middleware/admin-middleware';
 import { PreClient } from '../../services/pre-api/pre-client';
+import { Application } from 'express';
+import { requiresAuth } from 'express-openid-connect';
 import { SessionUser } from '../../services/session-user/session-user';
-import { RequiresSuperUser } from '../../middleware/admin-middleware';
 import { UserLevel } from '../../types/user-level';
 
-import { Application } from 'express';
-import { requiresAuth } from 'express-openid-connect';
-import { getAllPaginatedCourts } from '../../helpers/helpers';
+function validateId(id: string): boolean {
+  return /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(id);
+}
 
 export default function (app: Application): void {
-  app.get('/admin/audit', requiresAuth(), RequiresSuperUser, async (req, res) => {
+  app.get('/admin/audit/:id', requiresAuth(), RequiresSuperUser, async (req, res) => {
+    if (!validateId(req.params.id)) {
+      res.status(404);
+      res.render('not-found');
+      return;
+    }
+
     const client = new PreClient();
 
     try {
-      const request: SearchAuditLogsRequest = {
-        after: req.query.after as string,
-        before: req.query.before as string,
-        functionalArea: req.query.functionalArea as string,
-        source: req.query.source as string,
-        userName: req.query.userName as string,
-        courtId: req.query.courtId as string,
-        caseReference: req.query.caseReference as string,
-        page: req.query.page as unknown as number,
-        size: 10,
-      };
-
-      const userPortalId = SessionUser.getLoggedInUserProfile(req).app_access.filter(
-        role => role.role.name === UserLevel.SUPER_USER
-      )?.[0].id;
-
-      const { auditLogs, pagination } = await client.getAuditLogs(userPortalId, request);
-      const { paginationLinks, title } = client.createPagination(
-        pagination,
-        'admin/audit',
-        'Audit Logs',
-        auditLogs.length
+      const audit = await client.getAudit(
+        SessionUser.getLoggedInUserProfile(req).app_access.filter(role => role.role.name === UserLevel.SUPER_USER)?.[0]
+          .id,
+        req.params.id as string
       );
 
-      const courts = await getAllPaginatedCourts(client, userPortalId, { size: 50 });
+      if (!audit) {
+        res.status(404);
+        res.render('not-found');
+        return;
+      }
 
       res.render('admin/audit', {
-        auditLogs,
-        paginationLinks,
-        title,
+        audit,
         pageUrl: req.url,
         isSuperUser: true,
-        params: req.query,
-        courts: courts.map(court => {
-          return {
-            id: court.id,
-            name: court.name,
-          };
-        }),
       });
     } catch (err) {
       res.status(404);

src/main/routes/admin/audits.ts

@@ -0,0 +1,62 @@
+import { SearchAuditLogsRequest } from 'services/pre-api/types';
+import { PreClient } from '../../services/pre-api/pre-client';
+import { SessionUser } from '../../services/session-user/session-user';
+import { RequiresSuperUser } from '../../middleware/admin-middleware';
+import { UserLevel } from '../../types/user-level';
+
+import { Application } from 'express';
+import { requiresAuth } from 'express-openid-connect';
+import { getAllPaginatedCourts } from '../../helpers/helpers';
+
+export default function (app: Application): void {
+  app.get('/admin/audit', requiresAuth(), RequiresSuperUser, async (req, res) => {
+    const client = new PreClient();
+
+    try {
+      const request: SearchAuditLogsRequest = {
+        after: req.query.after as string,
+        before: req.query.before as string,
+        functionalArea: req.query.functionalArea as string,
+        source: req.query.source as string,
+        userName: req.query.userName as string,
+        courtId: req.query.courtId as string,
+        caseReference: req.query.caseReference as string,
+        page: req.query.page as unknown as number,
+        size: 10,
+      };
+
+      const userPortalId = SessionUser.getLoggedInUserProfile(req).app_access.filter(
+        role => role.role.name === UserLevel.SUPER_USER
+      )?.[0].id;
+
+      const { auditLogs, pagination } = await client.getAuditLogs(userPortalId, request);
+      const { paginationLinks, title } = client.createPagination(
+        pagination,
+        'admin/audits',
+        'Audit Logs',
+        auditLogs.length
+      );
+
+      const courts = await getAllPaginatedCourts(client, userPortalId, { size: 50 });
+
+      res.render('admin/audits', {
+        auditLogs,
+        paginationLinks,
+        title,
+        pageUrl: req.url,
+        isSuperUser: true,
+        params: req.query,
+        courts: courts.map(court => {
+          return {
+            id: court.id,
+            name: court.name,
+          };
+        }),
+      });
+    } catch (err) {
+      res.status(404);
+      res.render('not-found');
+      return;
+    }
+  });
+}

src/main/services/pre-api/pre-client.ts

@@ -10,6 +10,7 @@ import {
   Pagination,
   PutAuditRequest,
   Recording,
+  RecordingPlaybackData,
   SearchAuditLogsRequest,
   SearchRecordingsRequest,
 } from './types';
@@ -124,6 +125,24 @@ export class PreClient {
     }
   }
 
+  public async getAudit(xUserId: string, id: string): Promise<Audit | null> {
+    try {
+      const response = await axios.get('/audit/' + id, {
+        headers: {
+          'X-User-Id': xUserId,
+        },
+      });
+
+      return response.data as Audit;
+    } catch (e) {
+      if (e.response?.status === 404) {
+        return null;
+      }
+      this.logger.error(e);
+      throw e;
+    }
+  }
+
   public async getAuditLogs(
     xUserId: string,
     request: SearchAuditLogsRequest
@@ -325,15 +344,15 @@ export class PreClient {
     }
   }
 
-  public async getRecordingPlaybackDataMk(xUserId: string, id: string): Promise<Recording | null> {
+  public async getRecordingPlaybackDataMk(xUserId: string, id: string): Promise<RecordingPlaybackData | null> {
     try {
       const response = await axios.get(`/media-service/vod?recordingId=${id}`, {
         headers: {
           'X-User-Id': xUserId,
         },
       });
 
-      return response.data as Recording;
+      return response.data as RecordingPlaybackData;
     } catch (e) {
       if (e.response?.status === 404) {
         return null;

src/main/views/admin/MK-live-events.njk

@@ -5,13 +5,13 @@
 {% block pageTitle %}MediaKind Live Events - PRE Portal{% endblock %}
 
 {% block mainContent %}
-<div class="gem-c-title govuk-!-margin-top-0 govuk-!-margin-bottom-8">
-    <h1 class="gem-c-title__text govuk-heading-xl">
+  <div class="govuk-!-margin-top-0 govuk-!-margin-bottom-8">
+    <h1 class="govuk-heading-xl">
       MediaKind Live Events
     </h1>
-    <div>
+  </div>
   <form method="GET" action="" class="govuk-grid-row govuk-!-margin-bottom-6">
-   <div class="govuk-grid-column-one-quarter">
+    <div class="govuk-grid-column-one-quarter">
             <div class="govuk-form-group">
                 <label class="govuk-label" for="id">ID</label>
                 <input class="govuk-input" id="id" name="id" type="text"
@@ -54,10 +54,8 @@
          <div class="govuk-grid-column-one-quarter">
              <button class="govuk-button govuk-button--secondary govuk-visually-hidden"" type="submit">Submit</button>
          </div>
-
-  </form>
-  <div>
-
+    </form>
+    <div>
     <div style="overflow-x: auto; width: 100%;">
       <table class="govuk-table" id="live-events-table">
         <caption class="govuk-table__caption govuk-table__caption--m"  tabindex="0">Live events</caption>
@@ -99,7 +97,7 @@
         {{ govukPagination(paginationLinks) }}
       </div>
     {% endif %}
-</div>
+  </div>
 
 <script>
 function filterTable() {
@@ -184,6 +182,4 @@ document.addEventListener("DOMContentLoaded", function () {
   });
 });
 </script>
-
-
 {% endblock %}