hof 22.11.9 → 22.12.0-unit-of-measure-beta.1

package/components/amount-with-unit-select/validation.js

@@ -0,0 +1,175 @@
+'use strict';
+
+const _ = require('lodash');
+const controller = require('../../controller/controller').prototype;
+const utils = require('./utils');
+
+/**
+ * Validates the value is a string consisting of two hyphen-separated values.
+ * Can be passed to the list of field validators to run as a custom validator.
+ * @param {string} value - The amountWithUnitSelect value to validate (E.G. '1-Litre').
+ * @returns {boolean} Returns true if the value is in the expected format, false otherwise.
+ */
+const isTwoHyphenSeparatedValues = value => {
+  if (typeof value !== 'string' || value.indexOf('-') === -1) {
+    return false;
+  }
+  const selectValue = [value.split('-').pop()];
+  return Array.isArray(selectValue) && selectValue.length;
+};
+
+/**
+ * Creates a custom 'equal' validator for a select component.
+ * @param {Object[]} options - The select component options.
+ * @returns {Object[]} Returns a custom 'equal' validator object for the select component.
+ */
+const createCustomEqualValidator = options => [{
+  type: 'equal',
+  arguments: _.map(options, opt =>
+    typeof opt === 'string' ? opt : opt.value)
+}];
+
+/**
+ * Adds a validator to a field's validate array, ensuring no duplicates.
+ * @param {Object} field - The field to add the validator to.
+ * @param {Object|Object[]|string|string[]|function(string): boolean|(function(string): boolean)[]} newValidator -
+ * The validator to add.
+ */
+const addValidator = (field, newValidator) => {
+  field.validate = _.uniq(field.validate.concat(newValidator));
+};
+
+/**
+ * Adds the 'groupedFieldsWithOptions' property to the specified field.
+ * This property prevents the 'equal' validator being applied to the parent component by default,
+ * and enables it to separately be added to the unit child component instead.
+ * @param {Object} field - The field to add the property to.
+ */
+const addGroupedFieldsWithOptionsProperty = field => {
+  field.groupedFieldsWithOptions = true;
+};
+
+/**
+ * Resolves configurations related to making the amount and/or unit fields optional (E.G. amountOptional, unitOptional).
+ * @param {Object[]} parentField - The parent component's field definition and configuration.
+ * @param {Object[]} childFields - The child component's field definitions and configurations.
+ * @param {Array} validators - The list of validators assigned to the parent component.
+ * @param {string} key - The parent component's key.
+ */
+const resolveOptionalFields = (parentField, childFields, validators, key) => {
+  // adds existing required validators from parent component to the child components
+  // and resolves configurations that determine if the child components should be optional
+  validators?.indexOf('required') !== -1 || parentField[key]?.amountOptional !== 'true' &&
+    addValidator(childFields[`${key}-amount`], 'required');
+  validators?.indexOf('required') !== -1 || parentField[key]?.unitOptional !== 'true' &&
+    addValidator(childFields[`${key}-unit`], 'required');
+};
+
+/**
+ * Propagates the child component's (amount and unit) field data and values into the form request to enable validation.
+ * @param {Object} formReq - The form's request object.
+ * @param {Object[]} fields - The child components' definitions and configurations.
+ * @param {string} key - The parent component's key.
+ */
+const propagateChildFieldValidation = (formReq, fields, key) => {
+  // adds child component field definitions to the form request
+  Object.assign(formReq.options.fields,
+    { 'amountWithUnitSelect-amount': fields[`${key}-amount`] },
+    { 'amountWithUnitSelect-unit': fields[`${key}-unit`] }
+  );
+  // splits and assigns the component's values to the form request
+  const amountWithUnitSelectValues = utils.getAmountWithUnitSelectValues(formReq.values.amountWithUnitSelect);
+  Object.assign(formReq.values,
+    { 'amountWithUnitSelect-amount': amountWithUnitSelectValues[0] },
+    { 'amountWithUnitSelect-unit': amountWithUnitSelectValues[1] }
+  );
+};
+
+/**
+ * Moves validators, that are not the 'required' or 'equal' type, from the parent component to
+ * the 'amount' child component,
+ * ensuring all other validators are applied to the amount field only.
+ * @param {Object} formReqFields - The fields in the form's request object (req.form.options.fields).
+ * @param {Object[]} fields - The child components' definitions and configurations.
+ * @param {string} key - The parent component's key.
+ */
+const moveExcessValidatorToChildComponent = (formReqFields, fields, key) => {
+  _.remove(formReqFields?.amountWithUnitSelect?.validate, validator => {
+    if (!((typeof validator === 'object' &&
+      (validator.type === 'equal' ||
+        validator.type === 'required')) ||
+      (typeof validator === 'string' &&
+        (validator === 'equal' ||
+          validator === 'required')))) {
+      if (formReqFields[`${key}-amount`] === null) {
+        Object.assign(formReqFields, {
+          'amountWithUnitSelect-amount': fields[`${key}-amount`]
+        });
+      }
+      if (!formReqFields[`${key}-amount`]?.validate?.includes(validator)) {
+        formReqFields[`${key}-amount`].validate.push(validator);
+      }
+      return true;
+    }
+    return false;
+  });
+};
+
+/**
+ * Creates and adds a validation error for a child component into the form request's errors list.
+ * @param {Object} req - The request object given to the component.
+ * @param {Object} res - The response object given to the component.
+ * @param {Object[]} errors - The validation errors recorded in the session model.
+ * @param {string} pKey - The parent component's key.
+ * @param {string} key - The child component's key.
+ */
+const addValidationError = (req, res, errors, pKey, key) => {
+  // manually creates and adds an error object
+  req.form.errors[`${pKey}-${key}`] = {
+    errorLinkId: `${pKey}-${key}`,
+    key: errors[`${pKey}-${key}`]?.key || `${key}-${key}`,
+    type: errors[`${pKey}-${key}`]?.type || null
+  };
+  // ensure the error message is processed and translated by the controller
+  req.form.errors[`${pKey}-${key}`].message =
+    controller.getErrorMessage(req.form.errors[`${pKey}-${key}`], req, res) ||
+    controller.getErrorMessage({
+      errorLinkId: `${pKey}-${key}`,
+      key: `${pKey}`,
+      type: errors[`${pKey}-${key}`]?.type || null
+    }, req, res);
+};
+
+/**
+ * Inserts child component validation errors into the form request if there is no parent component error.
+ * Only one error from the component is added to the request's error list in the order of the parent, amount,
+ * and then unit component.
+ * @param {Object} req - The request object given to the component.
+ * @param {Object} res - The response object given to the component.
+ * @param {Object[]} errors - The validation errors recorded in the session model.
+ */
+const insertChildValidationErrors = (req, res, errors) => {
+  const pKey = 'amountWithUnitSelect';
+  let key;
+  if (errors && !errors[pKey] && req?.form?.errors) {
+    if (errors[`${pKey}-amount`] && req.form.errors[`${pKey}-amount`]) {
+      key = 'amount';
+    } else if (errors[`${pKey}-unit`] && req.form.errors[`${pKey}-unit`]) {
+      key = 'unit';
+    }
+  }
+  // if there are not parent or child errors, no errors are added
+  key && addValidationError(req, res, errors, pKey, key);
+};
+
+module.exports = {
+  isTwoHyphenSeparatedValues,
+  createCustomEqualValidator,
+  addValidator,
+  addGroupedFieldsWithOptionsProperty,
+  resolveOptionalFields,
+  propagateChildFieldValidation,
+  moveExcessValidatorToChildComponent,
+  addValidationError,
+  insertChildValidationErrors
+};

package/components/index.js

@@ -5,6 +5,7 @@ module.exports = {
   clearSession: require('./clear-session'),
   combineAndLoopFields: require('./combine-and-loop-fields'),
   date: require('./date'),
+  amountWithUnitSelect: require('./amount-with-unit-select/amount-with-unit-select'),
   emailer: require('./emailer'),
   homeOfficeCountries: require('./homeoffice-countries'),
   notify: require('./notify'),

package/config/hof-defaults.js

@@ -51,7 +51,7 @@ const defaults = {
   },
   session: {
     ttl: process.env.SESSION_TTL || 1800,
-    secret: process.env.SESSION_SECRET || 'changethis',
+    secret: process.env.SESSION_SECRET,
     name: process.env.SESSION_NAME || 'hod.sid',
     sanitiseInputs: false
   },

package/controller/controller.js

@@ -200,10 +200,12 @@ module.exports = class Controller extends BaseController {
               req.form.errors[key].errorLinkId = key + '-' + field.options[0];
             }
             // eslint-disable-next-line brace-style
-          }
-          // get first field for date input control
-          else if (field && field.mixin === 'input-date') {
+          } else if (field && field.mixin === 'input-date') {
+            // get first field for date input control
             req.form.errors[key].errorLinkId = key + '-day';
+          } else if (field && field.mixin === 'input-amount-with-unit-select') {
+            // get first field for amount-unit input control
+            req.form.errors[key].errorLinkId = key + '-amount';
           } else {
             req.form.errors[key].errorLinkId = key;
           }

package/controller/validation/index.js

@@ -47,7 +47,7 @@ function validate(fields) {
       fields[key].validate = [fields[key].validate];
     }
 
-    if (fields[key].options) {
+    if (fields[key].options && !fields[key].groupedFieldsWithOptions) {
       fields[key].validate = fields[key].validate || [];
       fields[key].validate.push({
         type: 'equal',

package/controller/validation/validators.js

@@ -177,5 +177,4 @@ module.exports = Validators = {
     // eslint-disable-next-line max-len
     return value === '' || Validators.regex(value, /^(([GIR] ?0[A]{2})|((([A-Z][0-9]{1,2})|(([A-Z][A-HJ-Y][0-9]{1,2})|(([A-Z][0-9][A-Z])|([A-Z][A-HJ-Y][0-9]?[A-Z])))) ?[0-9][A-Z]{2}))$/i);
   }
-
 };

package/frontend/template-mixins/mixins/template-mixins.js

@@ -14,6 +14,8 @@ const PARTIALS = [
   'partials/forms/input-text-group',
   'partials/forms/input-text-date',
   'partials/forms/input-submit',
+  'partials/forms/grouped-inputs-select',
+  'partials/forms/grouped-inputs-text',
   'partials/forms/select',
   'partials/forms/checkbox',
   'partials/forms/textarea-group',
@@ -214,6 +216,7 @@ module.exports = function (options) {
         labelClassName: labelClassName ? `govuk-label ${labelClassName}` : 'govuk-label',
         formGroupClassName: classNames(field, 'formGroupClassName') || extension.formGroupClassName || 'govuk-form-group',
         hint: hint,
+        amountWithUnitSelectItemClassName: 'grouped-inputs__item',
         hintId: extension.hintId || (hint ? key + '-hint' : null),
         error: this.errors && this.errors[key],
         maxlengthAttribute: field.maxlengthAttribute === true,
@@ -222,6 +225,7 @@ module.exports = function (options) {
         required: required,
         pattern: extension.pattern,
         date: extension.date,
+        amountWithUnitSelect: extension.amountWithUnitSelect,
         autocomplete: autocomplete,
         child: field.child,
         isPageHeading: field.isPageHeading,
@@ -232,7 +236,7 @@ module.exports = function (options) {
       });
     }
 
-    function optionGroup(key, opts) {
+    function optionGroup(key, opts, pKey = key) {
       opts = opts || {};
       const field = Object.assign({}, this.options.fields[key] || options.fields[key]);
       const legend = field.legend;
@@ -248,6 +252,7 @@ module.exports = function (options) {
           legendValue = legend.value;
         }
       }
+
       return {
         key: key,
         error: this.errors && this.errors[key],
@@ -270,15 +275,16 @@ module.exports = function (options) {
 
           if (typeof obj === 'string') {
             value = obj;
-            label = 'fields.' + key + '.options.' + obj + '.label';
-            optionHint = 'fields.' + key + '.options.' + obj + '.hint';
+            // pKey - optional param that demotes parent key for group components - set to key param val by default
+            label = 'fields.' + pKey + '.options.' + obj + '.label';
+            optionHint = 'fields.' + pKey + '.options.' + obj + '.hint';
           } else {
             value = obj.value;
-            label = obj.label || 'fields.' + key + '.options.' + obj.value + '.label';
+            label = obj.label || 'fields.' + pKey + '.options.' + obj.value + '.label';
             toggle = obj.toggle;
             child = obj.child;
             useHintText = obj.useHintText;
-            optionHint = obj.hint || 'fields.' + key + '.options.' + obj.value + '.hint';
+            optionHint = obj.hint || 'fields.' + pKey + '.options.' + obj.value + '.hint';
           }
 
           if (this.values && this.values[key] !== undefined) {
@@ -469,6 +475,50 @@ module.exports = function (options) {
             return parts.concat(monthPart, yearPart).join('\n');
           };
         }
+      },
+      'input-amount-with-unit-select': {
+        handler: function () {
+          return function (key) {
+            key = (key === '{{key}}' || key === '' || key === undefined) ? hoganRender(key, this) : key;
+            const field = Object.assign({}, this.options.fields[key] || options.fields[key]);
+
+            let autocomplete = field.autocomplete || 'off';
+            if (autocomplete === 'off') {
+              autocomplete = { amount: 'off'};
+            } else if (typeof autocomplete === 'string') {
+              autocomplete = { amount: autocomplete + '-amount' };
+            }
+
+            const formGroupClassName = (field.formGroup && field.formGroup.className) ? field.formGroup.className : '';
+            const classNameAmount = (field.controlsClass && field.controlsClass.amount) ? field.controlsClass.amount : 'govuk-input--width-3';
+            const classNameUnit = (field.controlsClass && field.controlsClass.unit) ? field.controlsClass.unit : 'govuk-input--width-5';
+
+            const parts = [];
+
+            // basically does the '_.each(mixins, function (mixin, name)' part manually (which renders the HTML
+            // for both child components and looks for a 'renderWith' and optional 'Options' method to use)
+            const amountPart = compiled['partials/forms/grouped-inputs-text']
+              .render(inputText.call(this,
+                key + '-amount', {
+                  formGroupClassName,
+                  autocomplete: autocomplete.amount,
+                  className: classNameAmount,
+                  amountWithUnitSelect: true }
+              ));
+
+            const unitPart = compiled['partials/forms/grouped-inputs-select']
+              .render(inputText.call(this, key + '-unit',
+                optionGroup.call(this,
+                  key + '-unit', {
+                    formGroupClassName,
+                    className: classNameUnit,
+                    amountWithUnitSelect: true },
+                  key
+                )));
+
+            return parts.concat(amountPart, unitPart).join('\n');
+          };
+        }
       }
     };
 

package/frontend/template-mixins/partials/forms/grouped-inputs-select.html

@@ -0,0 +1,13 @@
+<div class="{{amountWithUnitSelectItemClassName}}">
+  <div id="{{id}}-group" class="{{#compound}} form-group-compound{{/compound}}{{#formGroupClassName}} {{formGroupClassName}}{{/formGroupClassName}}">
+      <label for="{{id}}" class="{{labelClassName}}">
+        <span class="label-text">{{{label}}}</span>
+      </label>
+      {{#hint}}<div {{$hintId}}id="{{hintId}}" {{/hintId}}class="govuk-hint">{{{hint}}}</div>{{/hint}}
+      <select id="{{id}}" class="govuk-select{{#className}} {{className}}{{/className}}{{#error}} govuk-select--error{{/error}}" name="{{id}}" aria-required="{{required}}">
+      {{#options}}
+          <option value="{{value}}" {{#selected}}selected{{/selected}}>{{label}}</option>
+      {{/options}}
+      </select>
+  </div>
+</div>

package/frontend/template-mixins/partials/forms/grouped-inputs-text.html

@@ -0,0 +1,37 @@
+<div class="{{amountWithUnitSelectItemClassName}}"> 
+    <div id="{{id}}-group" class="{{#formGroupClassName}} {{formGroupClassName}}{{/formGroupClassName}}">
+      <label for="{{id}}" class="{{labelClassName}}">
+          <span class="label-text">{{{label}}}</span>
+      </label>
+      {{#hint}}<span {{$hintId}}id="{{hintId}}" {{/hintId}}class="govuk-hint">{{{hint}}}</span>{{/hint}}
+      {{#renderChild}}{{/renderChild}}
+          {{#attributes}}
+              {{#prefix}}
+                  <div class="govuk-input__prefix" aria-hidden="true">{{prefix}}</div>
+              {{/prefix}}
+          {{/attributes}}
+          <input
+              type="{{type}}"
+              name="{{id}}"
+              id="{{id}}"
+              class="govuk-input{{#className}} {{className}}{{/className}}{{#error}} govuk-input--error{{/error}}"
+              aria-required="{{required}}"
+              {{#value}} value="{{value}}"{{/value}}
+              {{#min}} min="{{min}}"{{/min}}
+              {{#max}} max="{{max}}"{{/max}}
+              {{#maxlength}} maxlength="{{maxlength}}"{{/maxlength}}
+              {{#pattern}} pattern="{{pattern}}"{{/pattern}}
+              {{#hintId}} aria-describedby="{{hintId}}"{{/hintId}}
+              {{#error}} aria-invalid="true"{{/error}}
+              {{#autocomplete}} autocomplete="{{autocomplete}}"{{/autocomplete}}
+              {{#attributes}}
+                  {{attribute}}="{{value}}"
+              {{/attributes}}
+          >
+          {{#attributes}}
+              {{#suffix}}
+                  <div class="govuk-input__prefix" aria-hidden="true">{{suffix}}</div>
+              {{/suffix}}
+          {{/attributes}}
+    </div>
+</div>

package/frontend/themes/gov-uk/styles/_grouped-input.scss

@@ -0,0 +1,5 @@
+.grouped-inputs__item {
+  display: inline-block;
+  margin-right: 20px;
+  margin-bottom: 0;
+}

package/frontend/themes/gov-uk/styles/govuk.scss

@@ -27,6 +27,7 @@ $path: "/public/images/" !default;
 @import "check_your_answers";
 @import "pdf";
 @import "session-timeout-dialog";
+@import "grouped-input";
 
 // Modules
 @import "modules/validation";

package/frontend/toolkit/assets/javascript/form-focus.js

@@ -85,6 +85,10 @@ function formFocus() {
     document.getElementById(getElementFromSummaryLink + '-day').focus();
   }
 
+  if (document.getElementById(getElementFromSummaryLink + '-amount') && forms.length === 1 && editMode) {
+    document.getElementById(getElementFromSummaryLink + '-amount').focus();
+  }
+
   if (forms.length > 0) {
     labels = document.getElementsByTagName('label');
     if (labels) {

package/lib/encryption.js

@@ -1,23 +1,49 @@
-/* eslint-disable */ 
 'use strict';
 
-const crypto = require('crypto');
+const crypto = require('node:crypto');
 const algorithm = 'aes-256-cbc';
+const ivLength = 16;
 
-module.exports = password => ({
-
-  encrypt: text => {
-    const cipher = crypto.createCipher(algorithm, password);
-    let crypted = cipher.update(text, 'utf8', 'hex');
-    crypted += cipher.final('hex');
-    return crypted;
-  },
-
-  decrypt: text => {
-    const decipher = crypto.createDecipher(algorithm, password);
-    let dec = decipher.update(text, 'hex', 'utf8');
-    dec += decipher.final('utf8');
-    return dec;
+/**
+ * Creates an encryption utility with AES-256-CBC algorithm.
+ * Provides encrypt and decrypt methods that use a random IV for each encryption operation.
+ *
+ * @module encryption
+ * @param {string|Buffer} secret - Must be exactly 32 bytes
+ * @returns {Object} Encryption utility object
+ * @throws {Error} If secret is not exactly 32 bytes
+ */
+module.exports = secret => {
+  const encryptionKey = Buffer.from(secret, 'utf8');
+  if (encryptionKey.byteLength !== 32) {
+    throw new Error(`Encryption secret must be exactly 32 bytes. Provided: ${encryptionKey.byteLength} bytes.`);
   }
 
-});
+  return {
+    encrypt: text => {
+      try {
+        const iv = crypto.randomBytes(ivLength);
+        const cipher = crypto.createCipheriv(algorithm, encryptionKey, iv);
+        let encrypted = cipher.update(text, 'utf8');
+        encrypted = Buffer.concat([encrypted, cipher.final()]);
+        return iv.toString('hex') + ':' + encrypted.toString('hex');
+      } catch (error) {
+        throw new Error(`Encryption failed: ${error.message}`);
+      }
+    },
+
+    decrypt: text => {
+      try {
+        const textParts = text.split(':');
+        const iv = Buffer.from(textParts.shift(), 'hex');
+        const encryptedText = Buffer.from(textParts.join(':'), 'hex');
+        const decipher = crypto.createDecipheriv(algorithm, encryptionKey, iv);
+        let decrypted = decipher.update(encryptedText);
+        decrypted = Buffer.concat([decrypted, decipher.final()]);
+        return decrypted.toString('utf8');
+      } catch (error) {
+        throw new Error(`Decryption failed: ${error.message}`);
+      }
+    }
+  };
+};

package/lib/sessions.js

@@ -10,8 +10,11 @@ const secureHttps = config => config.protocol === 'https' || config.env === 'pro
 module.exports = (app, config) => {
   const logger = config.logger || console;
 
-  if (config.env === 'production' && config.session.secret === 'changethis') {
-    throw new Error('Session secret must be set to a unique random string for production environments');
+  const secretBuffer = Buffer.from(config.session.secret, 'utf8');
+  if (secretBuffer.byteLength !== 32) {
+    throw new Error(
+      `Session secret must be exactly 32 bytes. Current: ${secretBuffer.byteLength} bytes.`
+    );
   }
 
   app.use(cookieParser(config.session.secret, {

package/lib/settings.js

@@ -42,7 +42,7 @@ module.exports = async (app, config) => {
     viewsArray.slice().reverse().forEach(view => {
       const customViewPath = path.resolve(config.root, view);
       try {
-        fs.accessSync(customViewPath, fs.F_OK);
+        fs.accessSync(customViewPath, fs.constants.F_OK);
       } catch (err) {
         throw new Error(`Cannot find views at ${customViewPath}`);
       }

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "22.11.9",
+  "version": "22.12.0-unit-of-measure-beta.1",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
   "engines": {
-    "node": ">=10.22.1",
-    "npm": ">=6.14.0"
+    "node": ">=14.0.0"
   },
   "bin": {
     "hof-build": "./bin/hof-build",
@@ -17,10 +16,6 @@
     "type": "git",
     "url": "https://github.com/UKHomeOfficeForms/hof.git"
   },
-  "publishConfig": {
-    "provenance": true,
-    "registry": "https://registry.npmjs.org/"
-  },
   "bugs": {
     "url": "https://github.com/UKHomeOfficeForms/hof/issues"
   },

package/sandbox/apps/sandbox/fields.js

@@ -3,6 +3,7 @@
 
 const dateComponent = require('../../../').components.date;
 const staticAppealStages = require('./lib/staticAppealStages');
+const amountWithUnitSelectComponent = require('../../../').components.amountWithUnitSelect;
 
 module.exports = {
   'landing-page-radio': {
@@ -124,5 +125,21 @@ module.exports = {
       value: '',
       label: 'fields.appealStages.options.null'
     }].concat(staticAppealStages.getstaticAppealStages())
-  }
+  },
+  'amountWithUnitSelect' : amountWithUnitSelectComponent('amountWithUnitSelect', {
+    mixin: 'input-amount-with-unit-select',
+    amountLabel: "Amount-",
+    unitLabel: "Unit-",
+    options: [
+      { "null": "Select" },
+      { "label": "non trans option 1", "value": "1" },
+      { "label": "non trans option 2", "value": "2" }
+    ],
+    hint: "E.G: 5 Kilogram",
+    legend: 'Enter An Amount',
+    isPageHeading: 'true',
+    unitOptional: 'false',
+    amountOptional: 'true',
+    validate: ['alphanum']
+  })
 }

package/sandbox/apps/sandbox/index.js

@@ -31,6 +31,10 @@ module.exports = {
     '/dob': {
       fields: ['dateOfBirth'],
       locals: { showSaveAndExit: true },
+      next: '/amount-unit'
+    },
+    '/amount-unit':{ 
+      fields: ['amountWithUnitSelect'], 
       next: '/address'
     },
     '/address': {

package/sandbox/apps/sandbox/sections/summary-data-sections.js

@@ -39,5 +39,11 @@ module.exports = {
   ],
   whatHappened: [
     'whatHappened'
-  ]
+  ],
+  amountWithUnitSelect:
+  [{
+    field: 'amountWithUnitSelect',
+    parse: val => val ?
+      (val.substring(0, val.lastIndexOf('-')) || '0') + ' ' +  val.substring(val.lastIndexOf('-') + 1) : ''
+  }]
 };