hof 20.1.2-redis-beta.0 → 20.1.3

package/.github/workflows/automate-publish.yml

@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 10
           registry-url: https://registry.npmjs.org/
       - name: 'Get Previous tag'
         id: previoustag

package/.github/workflows/automate-tag.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [10.x, 12.x, 14.x]
         redis-version: [4, 5, 6]
     steps:
       - uses: actions/checkout@v2.2.0
@@ -34,7 +34,7 @@ jobs:
       - uses: actions/checkout@v2.2.0
       - uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 10
           registry-url: https://registry.npmjs.org/
       - run: |
           git config --local user.email "$(git log --format='%ae' HEAD^!)"
@@ -52,7 +52,7 @@ jobs:
       - uses: actions/checkout@v2.2.0
       - uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 10
           registry-url: https://registry.npmjs.org/
       - run: |
           git config --local user.email "$(git log --format='%ae' HEAD^!)"
@@ -70,7 +70,7 @@ jobs:
       - uses: actions/checkout@v2.2.0
       - uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 10
           registry-url: https://registry.npmjs.org/
       - run: |
           git config --local user.email "$(git log --format='%ae' HEAD^!)"

package/components/combine-and-loop-fields/Readme.md

@@ -25,6 +25,7 @@ This allows you to specify fields to loop over and add as objects to a parent ar
     ],
     removePrefix: 'storage-',
     combineValuesToSingleField: 'address',
+    groupOptional: true,
     returnTo: '/add-address'
   }),
   next: '/confirm'
@@ -35,5 +36,6 @@ Here are the fields you call this behaviour first to set config for it:
 `fieldsToGroup`: (Required) the fields being specified for an object, e.g. house number, street, postcode, that are grouped together,
 `removePrefix`: (Optional) a string which is used to remove consistent prefixes from a collection of fields that are grouped together,
 `combineValuesToSingleField`: (Optional) a new field that is created with its value being the concatenation of values of the fields specified in `fieldsToGroup`,
-`returnTo`: the next step if you want to add another object to this group
+`groupOptional`: (Optional) set this to true if you want to land on the radio button question if all records in the group are deleted after creation,
+`returnTo`: (Required) the next step if you want to add another object to this group
 ```

package/components/combine-and-loop-fields/index.js

@@ -5,7 +5,7 @@ const path = require('path');
 const express = require('express');
 
 module.exports = config => {
-  const { returnTo, groupName, fieldsToGroup, combineValuesToSingleField, removePrefix } = config;
+  const { returnTo, groupName, fieldsToGroup, combineValuesToSingleField, removePrefix, groupOptional } = config;
 
   if (removePrefix && typeof removePrefix !== 'string') {
     throw new Error('removePrefix is a string and is optional for loops');
@@ -71,7 +71,7 @@ module.exports = config => {
         });
       }
 
-      const target = items.length ? req.form.options.route : returnTo;
+      const target = (items.length || groupOptional) ? req.form.options.route : returnTo;
       const action = req.params.action || '';
       res.redirect(path.join(req.baseUrl, target, action));
     }
@@ -84,7 +84,10 @@ module.exports = config => {
         validate: ['required'],
         options: [
           'yes', 'no'
-        ]
+        ],
+        legend: {
+          className: 'visuallyhidden'
+        }
       }, req.form.options.fieldSettings);
 
       // add conditonal fork
@@ -95,9 +98,6 @@ module.exports = config => {
         condition: {
           field: field,
           value: 'yes'
-        },
-        legend: {
-          className: 'visuallyhidden'
         }
       });
       next();

package/config/hof-defaults.js

@@ -27,8 +27,7 @@ const defaults = {
   ignoreMiddlewareLogs: ['/healthz'],
   redis: {
     port: process.env.REDIS_PORT || '6379',
-    host: process.env.REDIS_HOST || '127.0.0.1',
-    legacyMode: true
+    host: process.env.REDIS_HOST || '127.0.0.1'
   },
   session: {
     ttl: process.env.SESSION_TTL || 1800,

package/lib/health.js

@@ -15,7 +15,7 @@ module.exports = redis => {
 
   router.get('/readiness', healthCheck({
     test: () => {
-      if (!redis.isOpen && !redis.isReady) {
+      if (!redis.connected && !redis.ready) {
         return new Error('Session store unhealthy');
       }
       return 0;

package/lib/sessions.js

@@ -50,7 +50,7 @@ module.exports = (app, config) => {
       logger.error(e);
     });
   }
-  client.connect();
+
   const store = new RedisStore({
     client: client,
     ttl: config.session.ttl,

package/middleware/rate-limiter.js

@@ -25,11 +25,9 @@ module.exports = (options, rateLimitType) => {
     }
 
     const closeConnection = async err => {
-      await redisClient.v4.QUIT();
+      await redisClient.quit();
       return next(err);
     };
-    redisClient.on('error', err => logger.log('error', err));
-    await redisClient.connect();
 
     try {
       // fetch records of current user using IP address, returns null when no record is found

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "20.1.2-redis-beta.0",
+  "version": "20.1.3",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -42,7 +42,7 @@
     "callsite": "^1.0.0",
     "chalk": "^2.0.0",
     "chokidar": "^3.4.0",
-    "connect-redis": "^6.1.3",
+    "connect-redis": "^5.2.0",
     "cookie-parser": "^1.4.6",
     "cp": "^0.2.0",
     "csrf": "^3.0.2",
@@ -80,7 +80,7 @@
     "nodemailer-smtp-transport": "^2.7.4",
     "nodemailer-stub-transport": "^1.1.0",
     "notifications-node-client": "^5.1.1",
-    "redis": "^4.3.1",
+    "redis": "^3.1.2",
     "reqres": "^3.0.1",
     "request": "^2.79.0",
     "rimraf": "^3.0.2",