Asl/4495 keeping animal alive

client/helpers/render-fields-in-protocol.js

@@ -1,6 +1,15 @@
 export const renderFieldsInProtocol = (fateOfAnimals) => {
   if (!fateOfAnimals) {
-    return [];
+    return [
+      {'continued-use': {
+        label: 'Continued use on another protocol in this project',
+        value: 'continued-use',
+        reveal: {
+          name: 'continued-use-relevant-project',
+          label: 'Please state the relevant protocol.',
+          type: 'texteditor'
+        }
+      }}];
   }
 
   const predefinedFields = {
@@ -66,7 +75,9 @@ export const renderFieldsInProtocol = (fateOfAnimals) => {
     fateOfAnimals.includes('used-in-other-projects') ? predefinedFields['continued-use-2'] : null,
     fateOfAnimals.includes('set-free') ? predefinedFields['set-free'] : null,
     fateOfAnimals.includes('rehomed') ? predefinedFields['rehomed'] : null,
-    (fateOfAnimals.includes('set-free') || fateOfAnimals.includes('rehomed')) ? predefinedFields['kept-alive'] : null
+    (fateOfAnimals.includes('set-free') || fateOfAnimals.includes('rehomed')) ||
+    fateOfAnimals.includes('kept-alive')
+      ? predefinedFields['kept-alive'] : null
   ];
 
   // Filter out null values

client/pages/sections/protocols/protocols.js

@@ -80,7 +80,7 @@ class Protocol extends PureComponent {
     const protocolState = this.getProtocolState();
     const isActive = this.isActive(protocolState);
 
-    const conditionalFateOfAnimalFields = renderFieldsInProtocol(this.props.project['fate-of-animals']);
+    const conditionalFateOfAnimalFields = renderFieldsInProtocol(this.props.project['fate-of-animals'] ?? 'default');
 
     // Ensure options array exists, and is initialised properly
     if (!this.props.sections.fate.fields[0].options) {

package.json

@@ -1,12 +1,12 @@
 {
   "name": "@asl/projects",
-  "version": "15.4.5",
+  "version": "15.5.5",
   "description": "ASL PPL prototype",
   "main": "client/external.js",
   "styles": "assets/scss/projects.scss",
   "scripts": {
     "test": "npm run test:lint && npm run test:unit",
-    "test:lint": "eslint . --fix",
+    "test:lint": "eslint .",
     "test:unit": "mocha ./test --recursive --require @babel/register"
   },
   "repository": {