enable latest component features on dev and preprod (#297)

ministryofjustice · Sep 27, 2023 · 3409bb3 · 3409bb3
1 parent eac1983
commit 3409bb3
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 7 deletions.
diff --git a/helm_deploy/values-dev.yaml b/helm_deploy/values-dev.yaml
@@ -44,6 +44,7 @@ generic-service:
     APPOINTMENTS_URL: "https://activities-dev.prison.service.justice.gov.uk/appointments"
     APPOINTMENTS_ENABLED_PRISONS: "LEI,RSI"
     COMPONENT_API_URL: "https://frontend-components-dev.hmpps.service.justice.gov.uk"
+    COMPONENT_API_LATEST: "true"
 
 generic-prometheus-alerts:
   alertSeverity: digital-prison-service-dev
diff --git a/helm_deploy/values-preprod.yaml b/helm_deploy/values-preprod.yaml
@@ -44,6 +44,7 @@ generic-service:
     APPOINTMENTS_URL: "https://activities-preprod.prison.service.justice.gov.uk/appointments"
     APPOINTMENTS_ENABLED_PRISONS: ""
     COMPONENT_API_URL: "https://frontend-components-preprod.hmpps.service.justice.gov.uk"
+    COMPONENT_API_LATEST: "true"
 
   allowlist:
     office: "217.33.148.210/32"

diff --git a/helm_deploy/values-prod.yaml b/helm_deploy/values-prod.yaml
@@ -43,6 +43,7 @@ generic-service:
     APPOINTMENTS_URL: "https://activities.prison.service.justice.gov.uk/appointments"
     APPOINTMENTS_ENABLED_PRISONS: ""
     COMPONENT_API_URL: "https://frontend-components.hmpps.service.justice.gov.uk"
+    COMPONENT_API_LATEST: "false"
 
   allowlist:
     office: "217.33.148.210/32"

diff --git a/server/config.ts b/server/config.ts
@@ -170,6 +170,7 @@ export default {
         deadline: Number(get('COMPONENT_API_TIMEOUT_SECONDS', 20000)),
       },
       agent: new AgentConfig(Number(get('COMPONENT_API_TIMEOUT_SECONDS', 20000))),
+      latest: get('COMPONENT_API_LATEST', 'false') === 'true',
     },
   },
   serviceUrls: {

diff --git a/server/data/componentApiClient.ts b/server/data/componentApiClient.ts
@@ -9,11 +9,13 @@ export default class ComponentApiRestClient implements ComponentApiClient {
   getComponents<T extends AvailableComponent[]>(
     components: T,
     userToken: string,
+    useLatest: boolean,
   ): Promise<Record<T[number], Component>> {
+    const useLatestHeader = useLatest ? { 'x-use-latest-features': 'true' } : {}
     return this.restClient.get<Record<T[number], Component>>({
       path: `/components`,
       query: `component=${components.join('&component=')}`,
-      headers: { 'x-user-token': userToken },
+      headers: { 'x-user-token': userToken, ...useLatestHeader },
     })
   }
 }
diff --git a/server/data/interfaces/componentApiClient.ts b/server/data/interfaces/componentApiClient.ts
@@ -2,5 +2,9 @@ import Component from './component'
 import AvailableComponent from './AvailableComponent'
 
 export interface ComponentApiClient {
-  getComponents<T extends AvailableComponent[]>(component: T, userToken: string): Promise<Record<T[number], Component>>
+  getComponents<T extends AvailableComponent[]>(
+    component: T,
+    userToken: string,
+    useLatest: boolean,
+  ): Promise<Record<T[number], Component>>
 }
diff --git a/server/middleware/frontEndComponents.ts b/server/middleware/frontEndComponents.ts
@@ -3,10 +3,14 @@ import type { RequestHandler } from 'express'
 import logger from '../../logger'
 import { Services } from '../services'
 
-export default function getFrontendComponents({ componentService }: Services): RequestHandler {
+export default function getFrontendComponents({ componentService }: Services, useLatest: boolean): RequestHandler {
   return async (req, res, next) => {
     try {
-      const { header, footer } = await componentService.getComponents(['header', 'footer'], res.locals.user.token)
+      const { header, footer } = await componentService.getComponents(
+        ['header', 'footer'],
+        res.locals.user.token,
+        useLatest,
+      )
 
       res.locals.feComponents = {
         header: header.html,

diff --git a/server/routes/index.ts b/server/routes/index.ts
@@ -46,7 +46,7 @@ export default function routes(services: Services): Router {
 
   commonRoutes()
 
-  get('/prisoner/*', getFrontendComponents(services))
+  get('/prisoner/*', getFrontendComponents(services, config.apis.frontendComponents.latest))
 
   get('/prisoner/:prisonerNumber', getPrisonerData(services), checkPrisonerInCaseload(), async (req, res, next) => {
     const prisonerData = req.middleware?.prisonerData

diff --git a/server/services/componentService.ts b/server/services/componentService.ts
@@ -9,7 +9,8 @@ export default class ComponentService {
   async getComponents<T extends AvailableComponent[]>(
     components: T,
     userToken: string,
+    useLatest = false,
   ): Promise<Record<T[number], Component>> {
-    return this.componentApiClientBuilder(userToken).getComponents(components, userToken)
+    return this.componentApiClientBuilder(userToken).getComponents(components, userToken, useLatest)
   }
 }
diff --git a/server/views/partials/layout.njk b/server/views/partials/layout.njk
@@ -39,7 +39,7 @@
     crossorigin
   />
 
-  {% if feComponents.jsInclude %}
+  {% if feComponents.jsIncludes %}
     {% for js in feComponents.jsIncludes %}
       <script src="{{ js }}" nonce="{{ cspNonce }}"></script>
     {% endfor %}