LNP-868: Add profile feature switching per site

helm_deploy/prisoner-content-hub-frontend/templates/_envs.tpl

@@ -52,12 +52,6 @@ env:
           name: {{ .Values.application.contentConfigMapName }}
           key: internalUrl
 
-    - name: APPROVED_VISITORS_FEATURE_ENABLED
-      value: {{ .Values.application.config.approvedVisitorsFeatureEnabled | quote }}
-
-    - name: ADJUDICATIONS_FEATURE_ENABLED
-      value: {{ .Values.application.config.adjudicationsFeatureEnabled | quote }}
-
     - name: ELASTICSEARCH_ENDPOINT
       valueFrom:
         secretKeyRef:

helm_deploy/prisoner-content-hub-frontend/values-development.yaml

@@ -7,8 +7,6 @@ application:
     analyticsSiteId: G-0RBPFCWD3X
     googleTagManagerSiteId: GTM-M62TTBK
     mockAuthEnabled: true
-    approvedVisitorsFeatureEnabled: true
-    adjudicationsFeatureEnabled: true
 
 ingress:
   annotations:

helm_deploy/prisoner-content-hub-frontend/values-production.yaml

@@ -4,8 +4,6 @@ application:
     analyticsSiteId: G-H1MT63QRLQ
     googleTagManagerSiteId: GTM-M62TTBK
     mockAuthEnabled: false
-    approvedVisitorsFeatureEnabled: false
-    adjudicationsFeatureEnabled: true
 
 ingress:
   annotations:

helm_deploy/prisoner-content-hub-frontend/values-staging.yaml

@@ -4,8 +4,6 @@ application:
     analyticsSiteId: G-FVRKLRH5PJ
     googleTagManagerSiteId: GTM-M62TTBK
     mockAuthEnabled: false
-    approvedVisitorsFeatureEnabled: false
-    adjudicationsFeatureEnabled: true
 
 ingress:
   annotations:

server/config.js

@@ -14,6 +14,15 @@ const feedbackEndpoint = getRequiredEnv(
   '/local-feedback/_doc',
 );
 
+const ALL_PROFILE_FEATURES = [
+  'adjudications',
+  'approvedVisitors',
+  'incentives',
+  'money',
+  'timetable',
+  'visits',
+];
+
 module.exports = {
   isProduction,
   logLevel: getEnv('LOG_LEVEL', 'info'),
@@ -95,27 +104,100 @@ module.exports = {
     showStackTraces:
       getEnv('ENABLE_STACK_TRACES_ON_ERROR_PAGES', 'false') === 'true',
     useRedisCache: getEnv('ENABLE_REDIS_CACHE', 'true') === 'true',
-    approvedVisitorsFeatureEnabled:
-      getEnv('APPROVED_VISITORS_FEATURE_ENABLED', 'false') === 'true',
-    adjudicationsFeatureEnabled:
-      getEnv('ADJUDICATIONS_FEATURE_ENABLED', 'false') === 'true',
-    adjudicationsFeatureEnabledAt: [
-      'cookhamwood',
-      'erlestoke',
-      'felthama',
-      'felthamb',
-      'garth',
-      'lindholme',
-      'newhall',
-      'ranby',
-      'stokeheath',
-      'styal',
-      'swaleside',
-      'themount',
-      'wayland',
-      'werrington',
-      'wetherby',
-    ],
+  },
+  sites: {
+    berwyn: {
+      enabled: false,
+      features: [],
+    },
+    bullingdon: {
+      enabled: true,
+      features: [
+        'approvedVisitors',
+        'incentives',
+        'money',
+        'timetable',
+        'visits',
+      ],
+    },
+    chelmsford: {
+      enabled: true,
+      features: ['incentives', 'money', 'timetable', 'visits'],
+    },
+    cookhamwood: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    erlestoke: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    felthama: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    felthamb: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    garth: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    lindholme: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    newhall: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    ranby: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    stokeheath: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    styal: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    swaleside: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    themount: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    thestudio: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    wayland: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    werrington: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    wetherby: {
+      enabled: true,
+      features: ALL_PROFILE_FEATURES,
+    },
+    woodhill: {
+      enabled: true,
+      features: [
+        'approvedVisitors',
+        'incentives',
+        'money',
+        'timetable',
+        'visits',
+      ],
+    },
   },
   analytics: {
     endpoint: getEnv(

server/middleware/__tests__/configureEstablishment.spec.js

@@ -1,3 +1,26 @@
+const config = {
+  sites: {
+    berwyn: {
+      enabled: true,
+      features: [
+        'adjudications',
+        'approvedVisitors',
+        'incentives',
+        'money',
+        'timetable',
+        'visits',
+      ],
+    },
+  },
+  analytics: {
+    endpoint: 'https://www.google-analytics.com/collect',
+    siteId: 'G-0RBPFCWD3X',
+    gtmSiteId: 'GTM-M62TTBK',
+  },
+};
+
+jest.mock('../../config', () => config);
+
 const configureEstablishment = require('../configureEstablishment');
 
 describe('configureEstablishment', () => {
@@ -22,6 +45,7 @@ describe('configureEstablishment', () => {
     configureEstablishment(req, res, next);
 
     expect(res.locals.establishmentName).toBe('berwyn');
+    expect(res.locals.establishmentEnabled).toBe(true);
     expect(res.locals.establishmentDisplayName).toBe('HMP Berwyn');
     expect(next).toHaveBeenCalled();
   });

server/middleware/configureEstablishment.js

@@ -1,5 +1,6 @@
 const { v4: uuid } = require('uuid');
 const { getEstablishmentId, getEstablishmentDisplayName } = require('../utils');
+const config = require('../config');
 
 const configureEstablishment = (req, res, next) => {
   const establishmentName = req.session?.establishmentName;
@@ -13,6 +14,7 @@ const configureEstablishment = (req, res, next) => {
 
   res.locals.feedbackId = uuid();
   res.locals.establishmentName = establishmentName;
+  res.locals.establishmentEnabled = config.sites[establishmentName]?.enabled;
   res.locals.establishmentDisplayName = `${getEstablishmentDisplayName(
     req.session.establishmentId,
   )}`;

server/routes/__tests__/homepage.spec.js

@@ -188,6 +188,7 @@ describe('GET /', () => {
             establishmentPersonalisationToggle(),
         };
         req.user = userSupplier();
+        res.locals.establishmentEnabled = true;
         next();
       });
       app.use(setCurrentUser);

server/routes/__tests__/profile.spec.js

@@ -1,6 +1,29 @@
 const request = require('supertest');
 const cheerio = require('cheerio');
 
+const config = {
+  sites: {
+    berwyn: {
+      enabled: true,
+      features: [
+        'adjudications',
+        'approvedVisitors',
+        'incentives',
+        'money',
+        'timetable',
+        'visits',
+      ],
+    },
+  },
+  analytics: {
+    endpoint: 'https://www.google-analytics.com/collect',
+    siteId: 'G-0RBPFCWD3X',
+    gtmSiteId: 'GTM-M62TTBK',
+  },
+};
+
+jest.mock('../../config', () => config);
+
 const {
   testApp: { setupApp, userSupplier, sessionSupplier },
   testData: { user },
@@ -19,12 +42,20 @@ describe('GET /profile', () => {
   let app;
 
   beforeEach(() => {
+    const establishmentData = {
+      1: {
+        name: 'berwyn',
+      },
+    };
     const cmsService = {
       getPrimaryNavigation: jest.fn().mockResolvedValue([]),
       getUrgentBanners: jest.fn().mockResolvedValue([]),
       getTopics: jest.fn().mockReturnValue([]),
     };
-    app = setupApp({ offenderService, cmsService });
+    app = setupApp(
+      { offenderService, cmsService },
+      { config, establishmentData },
+    );
     userSupplier.mockReturnValue(user);
   });
 

server/routes/adjudications.js

@@ -2,6 +2,7 @@ const express = require('express');
 const config = require('../config');
 const { createBreadcrumbs } = require('../utils/breadcrumbs');
 const { createPagination } = require('../utils/pagination');
+const { checkFeatureEnabledAtSite } = require('../utils');
 const { logger } = require('../utils/logger');
 
 const createAdjudicationsRouter = ({ offenderService }) => {
@@ -27,10 +28,7 @@ const createAdjudicationsRouter = ({ offenderService }) => {
     const { user, originalUrl: returnUrl, query } = req;
 
     if (
-      config.features.adjudicationsFeatureEnabled &&
-      config.features.adjudicationsFeatureEnabledAt.includes(
-        req.session.establishmentName,
-      )
+      checkFeatureEnabledAtSite(req.session.establishmentName, 'adjudications')
     ) {
       let personalisation;
       let error = null;
@@ -66,9 +64,9 @@ const createAdjudicationsRouter = ({ offenderService }) => {
     const { adjudicationId } = req.params;
 
     if (
-      config.features.adjudicationsFeatureEnabled &&
-      config.features.adjudicationsFeatureEnabledAt.includes(
+      checkFeatureEnabledAtSite(
         req.session.establishmentName,
+        'adjudications',
       ) &&
       adjudicationId
     ) {

server/routes/approvedVisitors.js

@@ -1,6 +1,6 @@
 const express = require('express');
-const config = require('../config');
 const { createBreadcrumbs } = require('../utils/breadcrumbs');
+const { checkFeatureEnabledAtSite } = require('../utils');
 
 const createApprovedVisitorsRouter = ({ offenderService }) => {
   const router = express.Router();
@@ -32,7 +32,12 @@ const createApprovedVisitorsRouter = ({ offenderService }) => {
   router.get('/', async (req, res, next) => {
     const { user, originalUrl: returnUrl, query } = req;
 
-    if (config.features.approvedVisitorsFeatureEnabled) {
+    if (
+      checkFeatureEnabledAtSite(
+        req.session.establishmentName,
+        'approvedVisitors',
+      )
+    ) {
       try {
         const personalisation = user
           ? await getPersonalisation(user, query)

server/routes/profile.js

@@ -1,6 +1,7 @@
 const express = require('express');
 const config = require('../config');
 const { createBreadcrumbs } = require('../utils/breadcrumbs');
+const { checkFeatureEnabledAtSite } = require('../utils');
 
 const createProfileRouter = ({ offenderService }) => {
   const router = express.Router();
@@ -84,6 +85,10 @@ const createProfileRouter = ({ offenderService }) => {
   };
 
   router.get('/', async (req, res, next) => {
+    if (!config.sites[req.session.establishmentName]?.enabled) {
+      return next();
+    }
+
     try {
       const { user } = req;
       const personalisation = user ? await getPersonalisation(user) : {};
@@ -96,14 +101,31 @@ const createProfileRouter = ({ offenderService }) => {
         detailsType: 'small',
         data: { contentType: 'profile', breadcrumbs: createBreadcrumbs(req) },
         ...personalisation,
-        displayApprovedVisitorsCard:
-          config.features.approvedVisitorsFeatureEnabled,
-        displayAdjudicationsFeature:
-          config.features.adjudicationsFeatureEnabled &&
-          config.features.adjudicationsFeatureEnabledAt.includes(
+        displayVisits: checkFeatureEnabledAtSite(
+          req.session.establishmentName,
+          'visits',
+        ),
+        displayTimetable: checkFeatureEnabledAtSite(
+          req.session.establishmentName,
+          'timetable',
+        ),
+        displayIncentives: checkFeatureEnabledAtSite(
+          req.session.establishmentName,
+          'incentives',
+        ),
+        displayMoney: checkFeatureEnabledAtSite(
+          req.session.establishmentName,
+          'money',
+        ),
+        displayApprovedVisitors: checkFeatureEnabledAtSite(
+          req.session.establishmentName,
+          'approvedVisitors',
+        ),
+        displayAdjudications:
+          checkFeatureEnabledAtSite(
             req.session.establishmentName,
-          ) &&
-          personalisation.hasAdjudications,
+            'adjudications',
+          ) && personalisation.hasAdjudications,
       });
     } catch (e) {
       return next(e);