From e9d129993ac7968c43d3b8c595e65dcb5bc33fbc Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 15 Apr 2024 09:38:33 +0100
Subject: [PATCH 01/15] introduce new key setting KEY_HEALTH_CHECK_INTERVAL

---
 forge/db/models/Project.js         | 5 +++--
 forge/db/models/ProjectSettings.js | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/forge/db/models/Project.js b/forge/db/models/Project.js
index 660746243e..437e0d59a2 100644
--- a/forge/db/models/Project.js
+++ b/forge/db/models/Project.js
@@ -17,7 +17,7 @@ const { DataTypes, Op } = require('sequelize')
 
 const Controllers = require('../controllers')
 
-const { KEY_HOSTNAME, KEY_SETTINGS, KEY_HA, KEY_PROTECTED } = require('./ProjectSettings')
+const { KEY_HOSTNAME, KEY_SETTINGS, KEY_HA, KEY_PROTECTED, KEY_HEALTH_CHECK_INTERVAL } = require('./ProjectSettings')
 
 const BANNED_NAME_LIST = [
     'www',
@@ -358,7 +358,8 @@ module.exports = {
                                     { key: KEY_SETTINGS },
                                     { key: KEY_HOSTNAME },
                                     { key: KEY_HA },
-                                    { key: KEY_PROTECTED }
+                                    { key: KEY_PROTECTED },
+                                    { key: KEY_HEALTH_CHECK_INTERVAL }
                                 ]
                             },
                             required: false
diff --git a/forge/db/models/ProjectSettings.js b/forge/db/models/ProjectSettings.js
index 5bb9de7eba..1f9c566c13 100644
--- a/forge/db/models/ProjectSettings.js
+++ b/forge/db/models/ProjectSettings.js
@@ -13,12 +13,14 @@ const KEY_SETTINGS = 'settings'
 const KEY_HOSTNAME = 'hostname'
 const KEY_HA = 'ha'
 const KEY_PROTECTED = 'protected'
+const KEY_HEALTH_CHECK_INTERVAL = 'healthCheckInterval'
 
 module.exports = {
     KEY_SETTINGS,
     KEY_HOSTNAME,
     KEY_HA,
     KEY_PROTECTED,
+    KEY_HEALTH_CHECK_INTERVAL,
     name: 'ProjectSettings',
     schema: {
         ProjectId: { type: DataTypes.UUID, unique: 'pk_settings' },

From 7efe08c2077916679ae5d8222f1de817eba4b220 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 15 Apr 2024 09:49:05 +0100
Subject: [PATCH 02/15] update API for launcher settings
 (KEY_HEALTH_CHECK_INTERVAL)

---
 forge/db/views/Project.js   | 16 +++++++++++++++-
 forge/routes/api/project.js | 21 ++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/forge/db/views/Project.js b/forge/db/views/Project.js
index 527e8bc317..6163610a69 100644
--- a/forge/db/views/Project.js
+++ b/forge/db/views/Project.js
@@ -1,4 +1,4 @@
-const { KEY_HOSTNAME, KEY_SETTINGS, KEY_HA, KEY_PROTECTED } = require('../models/ProjectSettings')
+const { KEY_HOSTNAME, KEY_SETTINGS, KEY_HA, KEY_PROTECTED, KEY_HEALTH_CHECK_INTERVAL } = require('../models/ProjectSettings')
 
 module.exports = function (app) {
     app.addSchema({
@@ -32,6 +32,13 @@ module.exports = function (app) {
             protected: {
                 type: 'object',
                 additionalProperties: true
+            },
+            launcherSettings: {
+                type: 'object',
+                properties: {
+                    healthCheckInterval: { type: 'number' }
+                },
+                additionalProperties: false
             }
         }
     })
@@ -61,6 +68,13 @@ module.exports = function (app) {
             } else {
                 result.settings = {}
             }
+            // Launcher Settings
+            const heathCheckIntervalRow = proj.ProjectSettings?.find((projectSettingsRow) => projectSettingsRow.key === KEY_HEALTH_CHECK_INTERVAL)
+            if (heathCheckIntervalRow) {
+                result.launcherSettings = {}
+                result.launcherSettings.healthCheckInterval = heathCheckIntervalRow?.value
+            }
+            // Environment
             result.settings.env = app.db.controllers.Project.insertPlatformSpecificEnvVars(proj, result.settings.env)
             if (!result.settings.palette?.modules) {
                 // If there are no modules listed in settings, check the StorageSettings
diff --git a/forge/routes/api/project.js b/forge/routes/api/project.js
index d5585a20f5..38f3c60332 100644
--- a/forge/routes/api/project.js
+++ b/forge/routes/api/project.js
@@ -1,4 +1,4 @@
-const { KEY_HOSTNAME, KEY_SETTINGS } = require('../../db/models/ProjectSettings')
+const { KEY_HOSTNAME, KEY_SETTINGS, KEY_HEALTH_CHECK_INTERVAL } = require('../../db/models/ProjectSettings')
 const { Roles } = require('../../lib/roles')
 
 const { isFQDN } = require('../../lib/validate')
@@ -312,6 +312,7 @@ module.exports = async function (app) {
                     name: { type: 'string' },
                     hostname: { type: 'string' },
                     settings: { type: 'object' },
+                    launcherSettings: { type: 'object' },
                     projectType: { type: 'string' },
                     stack: { type: 'string' },
                     sourceProject: {
@@ -478,6 +479,19 @@ module.exports = async function (app) {
             changesToPersist.stack = { from: request.project.stack, to: stack }
         }
 
+        // Launcher settings
+        if (request.body?.launcherSettings?.healthCheckInterval) {
+            const oldInterval = await request.project.getSetting(KEY_HEALTH_CHECK_INTERVAL)
+            const newInterval = parseInt(request.body.launcherSettings.healthCheckInterval, 10)
+            if (isNaN(newInterval) || newInterval < 1000) {
+                reply.code(400).send({ code: 'invalid_heathCheckInterval', error: 'Invalid heath check interval' })
+                return
+            }
+            if (oldInterval !== newInterval) {
+                changesToPersist.healthCheckInterval = { from: oldInterval, to: newInterval }
+            }
+        }
+
         /// Persist the changes
         const updates = new app.auditLog.formatters.UpdatesCollection()
         const transaction = await app.db.sequelize.transaction() // start a transaction
@@ -541,6 +555,11 @@ module.exports = async function (app) {
                 }
             }
 
+            if (changesToPersist.healthCheckInterval) {
+                await request.project.updateSetting(KEY_HEALTH_CHECK_INTERVAL, changesToPersist.healthCheckInterval.to, { transaction })
+                updates.pushDifferences({ healthCheckInterval: changesToPersist.healthCheckInterval.from }, { healthCheckInterval: changesToPersist.healthCheckInterval.to })
+            }
+
             await transaction.commit() // all good, commit the transaction
 
             // Log the updates

From a7e25854aaa6f3ff553626d0f151085668f2faa8 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 15 Apr 2024 09:53:22 +0100
Subject: [PATCH 03/15] add launcher settings page to instance settings.

---
 .../instance/Settings/LauncherSettings.vue    | 91 +++++++++++++++++++
 .../src/pages/instance/Settings/index.vue     |  1 +
 .../src/pages/instance/Settings/routes.js     |  2 +
 3 files changed, 94 insertions(+)
 create mode 100644 frontend/src/pages/instance/Settings/LauncherSettings.vue

diff --git a/frontend/src/pages/instance/Settings/LauncherSettings.vue b/frontend/src/pages/instance/Settings/LauncherSettings.vue
new file mode 100644
index 0000000000..bb36efafe5
--- /dev/null
+++ b/frontend/src/pages/instance/Settings/LauncherSettings.vue
@@ -0,0 +1,91 @@
+<template>
+    <FormHeading class="mb-6">Launcher Settings</FormHeading>
+    <form class="space-y-6">
+        <FormRow v-model="input.healthCheckInterval" type="number">
+            Heath check interval (ms)
+            <template #description>
+                The interval at which the launcher will check the health of the instance. Default is 7500ms.
+                It is not recommended to set this value lower than 5000ms.
+            </template>
+        </FormRow>
+
+        <div class="space-x-4 whitespace-nowrap">
+            <ff-button size="small" :disabled="!unsavedChanges" @click="saveSettings()">Save settings</ff-button>
+        </div>
+    </form>
+</template>
+
+<script>
+
+import { useRouter } from 'vue-router'
+
+import { mapState } from 'vuex'
+
+import InstanceApi from '../../../api/instances.js'
+import FormHeading from '../../../components/FormHeading.vue'
+import FormRow from '../../../components/FormRow.vue'
+import permissionsMixin from '../../../mixins/Permissions.js'
+import alerts from '../../../services/alerts.js'
+
+export default {
+    name: 'LauncherSettings',
+    components: {
+        FormRow,
+        FormHeading
+    },
+    mixins: [permissionsMixin],
+    inheritAttrs: false,
+    props: {
+        project: {
+            type: Object,
+            required: true
+        }
+    },
+    emits: ['instance-updated'],
+    data () {
+        return {
+            mounted: false,
+            original: {
+                healthCheckInterval: null
+            },
+            input: {
+                healthCheckInterval: null
+            }
+
+        }
+    },
+    computed: {
+        ...mapState('account', ['team', 'teamMembership']),
+        unsavedChanges: function () {
+            return this.original.healthCheckInterval !== this.input.healthCheckInterval
+        }
+    },
+    watch: {
+        project: 'getSettings'
+    },
+    mounted () {
+        this.checkAccess()
+        this.getSettings()
+        this.mounted = true
+    },
+    methods: {
+        checkAccess: function () {
+            if (!this.hasPermission('project:edit')) {
+                useRouter().push({ replace: true, path: 'general' })
+            }
+        },
+        getSettings: function () {
+            this.original.healthCheckInterval = this.project?.launcherSettings?.healthCheckInterval
+            this.input.healthCheckInterval = this.project?.launcherSettings.healthCheckInterval
+        },
+        async saveSettings () {
+            const launcherSettings = {
+                healthCheckInterval: this.input.healthCheckInterval
+            }
+            await InstanceApi.updateInstance(this.project.id, { launcherSettings })
+            this.$emit('instance-updated')
+            alerts.emit('Instance successfully updated. Restart the instance to apply the changes.', 'confirmation')
+        }
+    }
+}
+</script>
diff --git a/frontend/src/pages/instance/Settings/index.vue b/frontend/src/pages/instance/Settings/index.vue
index 1b2dec9146..52054cb9a9 100644
--- a/frontend/src/pages/instance/Settings/index.vue
+++ b/frontend/src/pages/instance/Settings/index.vue
@@ -68,6 +68,7 @@ export default {
                 this.sideNavigation.push({ name: 'Editor', path: './editor' })
                 this.sideNavigation.push({ name: 'Security', path: './security' })
                 this.sideNavigation.push({ name: 'Palette', path: './palette' })
+                this.sideNavigation.push({ name: 'Launcher', path: './launcher' })
                 if (this.features.emailAlerts && this.team.type.properties.features?.emailAlerts) {
                     this.sideNavigation.push({ name: 'Alerts', path: './alerts' })
                 }
diff --git a/frontend/src/pages/instance/Settings/routes.js b/frontend/src/pages/instance/Settings/routes.js
index 1331805bc7..9c5cc9705d 100644
--- a/frontend/src/pages/instance/Settings/routes.js
+++ b/frontend/src/pages/instance/Settings/routes.js
@@ -5,6 +5,7 @@ import InstanceSettingsEditor from './Editor.vue'
 import InstanceSettingsEnvVar from './Environment.vue'
 import InstanceSettingsGeneral from './General.vue'
 import InstanceSettingsHA from './HighAvailability.vue'
+import InstanceSettingsLauncher from './LauncherSettings.vue'
 import InstanceSettingsPalette from './Palette.vue'
 import InstanceSettingsProtect from './ProtectInstance.vue'
 import InstanceSettingsSecurity from './Security.vue'
@@ -26,5 +27,6 @@ export default [
             title: 'Instance - Change Type'
         }
     },
+    { path: 'launcher', name: 'InstanceSettingsLauncher', component: InstanceSettingsLauncher },
     { path: 'alerts', component: InstanceSettingsAlerts }
 ]

From c56437ad3cb93cd984141f30b87f09b00587c771 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 15 Apr 2024 11:06:06 +0100
Subject: [PATCH 04/15] fix existing test - remove brittle length check

---
 test/e2e/frontend/cypress/tests-ee/instances/alerts.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/e2e/frontend/cypress/tests-ee/instances/alerts.spec.js b/test/e2e/frontend/cypress/tests-ee/instances/alerts.spec.js
index abba6c0778..405e480ac3 100644
--- a/test/e2e/frontend/cypress/tests-ee/instances/alerts.spec.js
+++ b/test/e2e/frontend/cypress/tests-ee/instances/alerts.spec.js
@@ -28,7 +28,6 @@ describe('FlowFuse EE - Instance - Alerts', () => {
         navigateToInstanceSettings('BTeam', 'instance-2-1')
 
         // check Alerts in list and click
-        cy.get('[data-el="section-side-menu"] li').should('have.length', 8)
         cy.get('[data-el="section-side-menu"] li:last a').contains('Alerts')
         cy.get('[data-el="section-side-menu"] li:last').click()
 

From 7c11b328210edbb3f02a39056eece0d62983a89d Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 15 Apr 2024 11:45:20 +0100
Subject: [PATCH 05/15] add e2e test

---
 .../instance/Settings/LauncherSettings.vue    |  4 +-
 .../tests/instances/settings/launcher.spec.js | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 test/e2e/frontend/cypress/tests/instances/settings/launcher.spec.js

diff --git a/frontend/src/pages/instance/Settings/LauncherSettings.vue b/frontend/src/pages/instance/Settings/LauncherSettings.vue
index bb36efafe5..4a3bce45bb 100644
--- a/frontend/src/pages/instance/Settings/LauncherSettings.vue
+++ b/frontend/src/pages/instance/Settings/LauncherSettings.vue
@@ -1,6 +1,6 @@
 <template>
     <FormHeading class="mb-6">Launcher Settings</FormHeading>
-    <form class="space-y-6">
+    <form class="space-y-6" data-el="launcher-settings-form">
         <FormRow v-model="input.healthCheckInterval" type="number">
             Heath check interval (ms)
             <template #description>
@@ -10,7 +10,7 @@
         </FormRow>
 
         <div class="space-x-4 whitespace-nowrap">
-            <ff-button size="small" :disabled="!unsavedChanges" @click="saveSettings()">Save settings</ff-button>
+            <ff-button size="small" :disabled="!unsavedChanges" data-action="save-settings" @click="saveSettings()">Save settings</ff-button>
         </div>
     </form>
 </template>
diff --git a/test/e2e/frontend/cypress/tests/instances/settings/launcher.spec.js b/test/e2e/frontend/cypress/tests/instances/settings/launcher.spec.js
new file mode 100644
index 0000000000..1d8c05a723
--- /dev/null
+++ b/test/e2e/frontend/cypress/tests/instances/settings/launcher.spec.js
@@ -0,0 +1,58 @@
+describe('FlowFuse - Instance - Settings - Launcher', () => {
+    let instance
+    function navigateToInstanceSettings (teamName, instanceName) {
+        cy.request('GET', '/api/v1/user/teams')
+            .then((response) => {
+                const team = response.body.teams.find(
+                    (team) => team.name === teamName
+                )
+                return cy.request('GET', `/api/v1/teams/${team.id}/projects`)
+            })
+            .then((response) => {
+                instance = response.body.projects.find(
+                    (app) => app.name === instanceName
+                )
+                cy.visit(`/instance/${instance.id}/settings`)
+                cy.wait('@getInstance')
+            })
+    }
+    beforeEach(() => {
+        cy.intercept('GET', '/api/*/projects/*').as('getInstance')
+
+        cy.login('bob', 'bbPassword')
+        cy.home()
+    })
+
+    it('can set health check value', () => {
+        cy.intercept('PUT', '/api/*/projects/*').as('updateInstance')
+
+        const gotoInstance = () => {
+            navigateToInstanceSettings('BTeam', 'instance-2-1')
+            // find li with text "Launcher" in [data-el="section-side-menu"]
+            cy.get('[data-el="section-side-menu"] li').contains('Launcher').click()
+        }
+        const getForm = () => {
+            return cy.get('[data-el="launcher-settings-form"]')
+        }
+
+        gotoInstance()
+
+        // ensure the first child's title is correct
+        getForm().first('div').get('[data-el="form-row-title"]').contains('Heath check interval (ms)')
+        // ensure the first child's numeric input exists
+        getForm().first('div').get('.ff-input > input[type=number]').should('exist')
+
+        // Change value & save
+        const randomBetween6789and9876 = Math.floor(Math.random() * (9876 - 6789 + 1)) + 6789
+        getForm().first('div').get('.ff-input > input[type=number]').clear()
+        getForm().first('div').get('.ff-input > input[type=number]').type(randomBetween6789and9876)
+        cy.get('[data-action="save-settings"]').click()
+        cy.wait('@updateInstance')
+
+        // refresh page
+        gotoInstance()
+
+        // check value is restored
+        cy.get('[data-el="launcher-settings-form"]').first().get('.ff-input > input[type=number]').should('have.value', randomBetween6789and9876)
+    })
+})

From 71a38e8c3b1d8d7331e116ff88ff0c0d498d32a2 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 15 Apr 2024 12:07:30 +0100
Subject: [PATCH 06/15] add unit tests

---
 test/unit/forge/routes/api/project_spec.js | 81 +++++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)

diff --git a/test/unit/forge/routes/api/project_spec.js b/test/unit/forge/routes/api/project_spec.js
index e4b62aee45..26f8b14225 100644
--- a/test/unit/forge/routes/api/project_spec.js
+++ b/test/unit/forge/routes/api/project_spec.js
@@ -10,7 +10,7 @@ const setup = require('../setup')
 
 const FF_UTIL = require('flowforge-test-utils')
 const { Roles } = FF_UTIL.require('forge/lib/roles')
-const { KEY_HOSTNAME } = FF_UTIL.require('forge/db/models/ProjectSettings')
+const { KEY_HOSTNAME, KEY_HEALTH_CHECK_INTERVAL } = FF_UTIL.require('forge/db/models/ProjectSettings')
 const { START_DELAY, STOP_DELAY } = FF_UTIL.require('forge/containers/stub/index.js')
 
 describe('Project API', function () {
@@ -1654,6 +1654,85 @@ describe('Project API', function () {
                 { name: 'two', value: '2' }
             ]) // should be unchanged
         })
+        it('Change launcher health check interval - owner', async function () {
+            // Setup some flows/credentials
+            await addFlowsToProject(app,
+                TestObjects.project1.id,
+                TestObjects.tokens.project,
+                TestObjects.tokens.alice,
+                [{ id: 'node1' }],
+                { testCreds: 'abc' },
+                'key1',
+                {}
+            )
+            // call "Update a project" with new httpAdminRoot
+            const response = await app.inject({
+                method: 'PUT',
+                url: `/api/v1/projects/${TestObjects.project1.id}`,
+                payload: {
+                    launcherSettings: {
+                        healthCheckInterval: 9876
+                    }
+                },
+                cookies: { sid: TestObjects.tokens.alice }
+            })
+            response.statusCode.should.equal(200)
+
+            const newValue = await TestObjects.project1.getSetting(KEY_HEALTH_CHECK_INTERVAL)
+            should(newValue).equal(9876)
+        })
+        it('Change launcher health check interval bad value - owner', async function () {
+            // Setup some flows/credentials
+            await addFlowsToProject(app,
+                TestObjects.project1.id,
+                TestObjects.tokens.project,
+                TestObjects.tokens.alice,
+                [{ id: 'node1' }],
+                { testCreds: 'abc' },
+                'key1',
+                {}
+            )
+            // call "Update a project" with new httpAdminRoot
+            const response = await app.inject({
+                method: 'PUT',
+                url: `/api/v1/projects/${TestObjects.project1.id}`,
+                payload: {
+                    launcherSettings: {
+                        healthCheckInterval: 999 // 1000 is the minimum
+                    }
+                },
+                cookies: { sid: TestObjects.tokens.alice }
+            })
+            response.statusCode.should.equal(400)
+            const result = response.json()
+            result.should.have.property('code', 'invalid_heathCheckInterval')
+        })
+        it('Change launcher health check interval - member', async function () {
+            // Setup some flows/credentials
+            // app, id, token, userToken, flows, creds, key, settings
+            await addFlowsToProject(
+                app,
+                TestObjects.project1.id,
+                TestObjects.tokens.project,
+                TestObjects.tokens.alice,
+                [{ id: 'node1' }],
+                { testCreds: 'abc' },
+                'key1',
+                {}
+            )
+            // call "Update a project" with new httpAdminRoot
+            const response = await app.inject({
+                method: 'PUT',
+                url: `/api/v1/projects/${TestObjects.project1.id}`,
+                payload: {
+                    launcherSettings: {
+                        healthCheckInterval: 9876
+                    }
+                },
+                cookies: { sid: TestObjects.tokens.bob }
+            })
+            response.statusCode.should.equal(403)
+        })
 
         describe('Update hostname', function () {
             it('Changes the projects hostname', async function () {

From 89db3d2acc9888145cb05d07b0d4e748ac899b55 Mon Sep 17 00:00:00 2001
From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com>
Date: Thu, 18 Apr 2024 14:15:54 +0100
Subject: [PATCH 07/15] Update
 frontend/src/pages/instance/Settings/LauncherSettings.vue

Co-authored-by: Nick O'Leary <nick.oleary@gmail.com>
---
 frontend/src/pages/instance/Settings/LauncherSettings.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/instance/Settings/LauncherSettings.vue b/frontend/src/pages/instance/Settings/LauncherSettings.vue
index 4a3bce45bb..241519eae3 100644
--- a/frontend/src/pages/instance/Settings/LauncherSettings.vue
+++ b/frontend/src/pages/instance/Settings/LauncherSettings.vue
@@ -2,9 +2,9 @@
     <FormHeading class="mb-6">Launcher Settings</FormHeading>
     <form class="space-y-6" data-el="launcher-settings-form">
         <FormRow v-model="input.healthCheckInterval" type="number">
-            Heath check interval (ms)
+            Health check interval (ms)
             <template #description>
-                The interval at which the launcher will check the health of the instance. Default is 7500ms.
+                The interval at which the launcher will check the health of Node-RED. Flows that perform CPU intensive work may require to increase this from the default of 7500ms.
                 It is not recommended to set this value lower than 5000ms.
             </template>
         </FormRow>

From b97a870b2123e4206dd9d81b45e27ebf6de53b76 Mon Sep 17 00:00:00 2001
From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com>
Date: Thu, 18 Apr 2024 14:21:21 +0100
Subject: [PATCH 08/15] Update forge/routes/api/project.js

---
 forge/routes/api/project.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge/routes/api/project.js b/forge/routes/api/project.js
index 38f3c60332..c7c8cdf83a 100644
--- a/forge/routes/api/project.js
+++ b/forge/routes/api/project.js
@@ -483,7 +483,7 @@ module.exports = async function (app) {
         if (request.body?.launcherSettings?.healthCheckInterval) {
             const oldInterval = await request.project.getSetting(KEY_HEALTH_CHECK_INTERVAL)
             const newInterval = parseInt(request.body.launcherSettings.healthCheckInterval, 10)
-            if (isNaN(newInterval) || newInterval < 1000) {
+            if (isNaN(newInterval) || newInterval < 5000) {
                 reply.code(400).send({ code: 'invalid_heathCheckInterval', error: 'Invalid heath check interval' })
                 return
             }

From 00df3d94803089b8a4d7c798a997e6a1210bc2df Mon Sep 17 00:00:00 2001
From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com>
Date: Thu, 18 Apr 2024 14:21:26 +0100
Subject: [PATCH 09/15] Update test/unit/forge/routes/api/project_spec.js

---
 test/unit/forge/routes/api/project_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/forge/routes/api/project_spec.js b/test/unit/forge/routes/api/project_spec.js
index 26f8b14225..813bb74632 100644
--- a/test/unit/forge/routes/api/project_spec.js
+++ b/test/unit/forge/routes/api/project_spec.js
@@ -1698,7 +1698,7 @@ describe('Project API', function () {
                 url: `/api/v1/projects/${TestObjects.project1.id}`,
                 payload: {
                     launcherSettings: {
-                        healthCheckInterval: 999 // 1000 is the minimum
+                        healthCheckInterval: 999 // 999 is below the 5000 is the minimum
                     }
                 },
                 cookies: { sid: TestObjects.tokens.alice }

From 9412788ca8b7846b411376262ed2276b3ac37a3f Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Fri, 19 Apr 2024 14:59:38 +0100
Subject: [PATCH 10/15] alert for invalid value

---
 .../pages/instance/Settings/LauncherSettings.vue   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/instance/Settings/LauncherSettings.vue b/frontend/src/pages/instance/Settings/LauncherSettings.vue
index 241519eae3..494d2b2c62 100644
--- a/frontend/src/pages/instance/Settings/LauncherSettings.vue
+++ b/frontend/src/pages/instance/Settings/LauncherSettings.vue
@@ -82,9 +82,17 @@ export default {
             const launcherSettings = {
                 healthCheckInterval: this.input.healthCheckInterval
             }
-            await InstanceApi.updateInstance(this.project.id, { launcherSettings })
-            this.$emit('instance-updated')
-            alerts.emit('Instance successfully updated. Restart the instance to apply the changes.', 'confirmation')
+            try {
+                await InstanceApi.updateInstance(this.project.id, { launcherSettings })
+                this.$emit('instance-updated')
+                alerts.emit('Instance successfully updated. Restart the instance to apply the changes.', 'confirmation')
+            } catch (error) {
+                if (error.response?.data?.code === 'invalid_heathCheckInterval') {
+                    alerts.emit('Invalid health check interval. Please enter a number 5000 or greater', 'warning')
+                } else {
+                    alerts.emit('Failed to update instance settings. Please try again.', 'warning')
+                }
+            }
         }
     }
 }

From 8378317c63bd7fa6d78b4a18e0997556f9b9cdf8 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Fri, 19 Apr 2024 16:30:13 +0100
Subject: [PATCH 11/15] add client side validation on health check interval

---
 .../instance/Settings/LauncherSettings.vue    | 47 +++++++++++++------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/frontend/src/pages/instance/Settings/LauncherSettings.vue b/frontend/src/pages/instance/Settings/LauncherSettings.vue
index 494d2b2c62..271180bae1 100644
--- a/frontend/src/pages/instance/Settings/LauncherSettings.vue
+++ b/frontend/src/pages/instance/Settings/LauncherSettings.vue
@@ -1,16 +1,16 @@
 <template>
     <FormHeading class="mb-6">Launcher Settings</FormHeading>
     <form class="space-y-6" data-el="launcher-settings-form">
-        <FormRow v-model="input.healthCheckInterval" type="number">
+        <FormRow v-model="input.healthCheckInterval" type="number" :error="errors.healthCheckInterval">
             Health check interval (ms)
             <template #description>
-                The interval at which the launcher will check the health of Node-RED. Flows that perform CPU intensive work may require to increase this from the default of 7500ms.
-                It is not recommended to set this value lower than 5000ms.
+                The interval at which the launcher will check the health of Node-RED.
+                Flows that perform CPU intensive work may need to increase this from the default of 7500ms.
             </template>
         </FormRow>
 
         <div class="space-x-4 whitespace-nowrap">
-            <ff-button size="small" :disabled="!unsavedChanges" data-action="save-settings" @click="saveSettings()">Save settings</ff-button>
+            <ff-button size="small" :disabled="!unsavedChanges || !validateFormInputs()" data-action="save-settings" @click="saveSettings()">Save settings</ff-button>
         </div>
     </form>
 </template>
@@ -50,6 +50,9 @@ export default {
             },
             input: {
                 healthCheckInterval: null
+            },
+            errors: {
+                healthCheckInterval: ''
             }
 
         }
@@ -61,7 +64,12 @@ export default {
         }
     },
     watch: {
-        project: 'getSettings'
+        project: 'getSettings',
+        'input.healthCheckInterval': function (value) {
+            if (this.mounted) {
+                this.validateFormInputs()
+            }
+        }
     },
     mounted () {
         this.checkAccess()
@@ -74,6 +82,19 @@ export default {
                 useRouter().push({ replace: true, path: 'general' })
             }
         },
+        validateFormInputs () {
+            if (!this.unsavedChanges) {
+                this.errors.healthCheckInterval = ''
+            } else {
+                const hci = parseInt(this.input.healthCheckInterval)
+                if (isNaN(hci) || hci < 5000) {
+                    this.errors.healthCheckInterval = 'Health check interval must be 5000 or greater'
+                } else {
+                    this.errors.healthCheckInterval = ''
+                }
+            }
+            return !this.errors.healthCheckInterval
+        },
         getSettings: function () {
             this.original.healthCheckInterval = this.project?.launcherSettings?.healthCheckInterval
             this.input.healthCheckInterval = this.project?.launcherSettings.healthCheckInterval
@@ -82,17 +103,13 @@ export default {
             const launcherSettings = {
                 healthCheckInterval: this.input.healthCheckInterval
             }
-            try {
-                await InstanceApi.updateInstance(this.project.id, { launcherSettings })
-                this.$emit('instance-updated')
-                alerts.emit('Instance successfully updated. Restart the instance to apply the changes.', 'confirmation')
-            } catch (error) {
-                if (error.response?.data?.code === 'invalid_heathCheckInterval') {
-                    alerts.emit('Invalid health check interval. Please enter a number 5000 or greater', 'warning')
-                } else {
-                    alerts.emit('Failed to update instance settings. Please try again.', 'warning')
-                }
+            if (!this.validateFormInputs()) {
+                alerts.emit('Please correct the errors before saving.', 'error')
+                return
             }
+            await InstanceApi.updateInstance(this.project.id, { launcherSettings })
+            this.$emit('instance-updated')
+            alerts.emit('Instance successfully updated. Restart the instance to apply the changes.', 'confirmation')
         }
     }
 }

From 9311dbff97f5c4f703388f9c07bdf330f7d9154a Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Fri, 19 Apr 2024 16:31:48 +0100
Subject: [PATCH 12/15] fix existing test

---
 .../tests/instances/settings/launcher.spec.js | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/test/e2e/frontend/cypress/tests/instances/settings/launcher.spec.js b/test/e2e/frontend/cypress/tests/instances/settings/launcher.spec.js
index 1d8c05a723..d7cf29964d 100644
--- a/test/e2e/frontend/cypress/tests/instances/settings/launcher.spec.js
+++ b/test/e2e/frontend/cypress/tests/instances/settings/launcher.spec.js
@@ -1,6 +1,6 @@
+/// <reference types="Cypress" />
 describe('FlowFuse - Instance - Settings - Launcher', () => {
-    let instance
-    function navigateToInstanceSettings (teamName, instanceName) {
+    function navigateToInstanceSettings (teamName, projectName) {
         cy.request('GET', '/api/v1/user/teams')
             .then((response) => {
                 const team = response.body.teams.find(
@@ -9,16 +9,21 @@ describe('FlowFuse - Instance - Settings - Launcher', () => {
                 return cy.request('GET', `/api/v1/teams/${team.id}/projects`)
             })
             .then((response) => {
-                instance = response.body.projects.find(
-                    (app) => app.name === instanceName
+                const project = response.body.projects.find(
+                    (project) => project.name === projectName
                 )
-                cy.visit(`/instance/${instance.id}/settings`)
+                cy.visit(`/instance/${project.id}/settings/general`)
                 cy.wait('@getInstance')
             })
     }
+
+    function getForm () {
+        return cy.get('[data-el="launcher-settings-form"]')
+    }
+
     beforeEach(() => {
+        cy.intercept('GET', '/api/*/projects/').as('getProjects')
         cy.intercept('GET', '/api/*/projects/*').as('getInstance')
-
         cy.login('bob', 'bbPassword')
         cy.home()
     })
@@ -26,19 +31,18 @@ describe('FlowFuse - Instance - Settings - Launcher', () => {
     it('can set health check value', () => {
         cy.intercept('PUT', '/api/*/projects/*').as('updateInstance')
 
-        const gotoInstance = () => {
-            navigateToInstanceSettings('BTeam', 'instance-2-1')
-            // find li with text "Launcher" in [data-el="section-side-menu"]
-            cy.get('[data-el="section-side-menu"] li').contains('Launcher').click()
-        }
-        const getForm = () => {
-            return cy.get('[data-el="launcher-settings-form"]')
-        }
+        navigateToInstanceSettings('BTeam', 'instance-2-1')
+
+        // locate and click on the launcher tab
+        cy.get('[data-el="section-side-menu"] li').contains('Launcher').click()
 
-        gotoInstance()
+        // wait for url /instance/***/settings/launcher
+        cy.url().should('include', 'settings/launcher')
 
-        // ensure the first child's title is correct
-        getForm().first('div').get('[data-el="form-row-title"]').contains('Heath check interval (ms)')
+        // // ensure the first child's title is correct
+        getForm().should('exist')
+        getForm().first('div').should('exist')
+        getForm().first('div').get('[data-el="form-row-title"]').contains('Health check interval (ms)').should('exist')
         // ensure the first child's numeric input exists
         getForm().first('div').get('.ff-input > input[type=number]').should('exist')
 
@@ -50,7 +54,8 @@ describe('FlowFuse - Instance - Settings - Launcher', () => {
         cy.wait('@updateInstance')
 
         // refresh page
-        gotoInstance()
+        navigateToInstanceSettings('BTeam', 'instance-2-1')
+        cy.get('[data-el="section-side-menu"] li').contains('Launcher').click()
 
         // check value is restored
         cy.get('[data-el="launcher-settings-form"]').first().get('.ff-input > input[type=number]').should('have.value', randomBetween6789and9876)

From 81588d21c592b3145107aee4c7bf4c4f570f6306 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Fri, 19 Apr 2024 16:32:13 +0100
Subject: [PATCH 13/15] add e2e test for client side validation

---
 .../tests/instances/settings/launcher.spec.js | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/test/e2e/frontend/cypress/tests/instances/settings/launcher.spec.js b/test/e2e/frontend/cypress/tests/instances/settings/launcher.spec.js
index d7cf29964d..72ec0d70e1 100644
--- a/test/e2e/frontend/cypress/tests/instances/settings/launcher.spec.js
+++ b/test/e2e/frontend/cypress/tests/instances/settings/launcher.spec.js
@@ -28,7 +28,32 @@ describe('FlowFuse - Instance - Settings - Launcher', () => {
         cy.home()
     })
 
-    it('can set health check value', () => {
+    it('Validates health check interval user input', () => {
+        cy.intercept('PUT', '/api/*/projects/*').as('updateInstance')
+        // navigate to instance settings -> launcher tab
+        cy.login('bob', 'bbPassword')
+        cy.home()
+        navigateToInstanceSettings('BTeam', 'instance-2-1')
+
+        cy.get('[data-el="section-side-menu"] li').contains('Launcher').click()
+
+        // wait for url /instance/***/settings/launcher
+        cy.url().should('include', 'settings/launcher')
+
+        // Change value to < 5000
+        getForm().first('div').get('.ff-input > input[type=number]').clear()
+        getForm().first('div').get('.ff-input > input[type=number]').type(4999)
+        cy.get('[data-action="save-settings"]').should('be.disabled')
+        getForm().first('div').get('[data-el="form-row-error"').contains('Health check interval must be 5000 or greater').should('exist')
+
+        // Change value to > 5000
+        getForm().first('div').get('.ff-input > input[type=number]').clear()
+        getForm().first('div').get('.ff-input > input[type=number]').type(5001)
+        cy.get('[data-action="save-settings"]').should('not.be.disabled')
+        getForm().first('div').get('[data-el="form-row-error"').should('not.exist')
+    })
+
+    it('Can set health check interval value', () => {
         cy.intercept('PUT', '/api/*/projects/*').as('updateInstance')
 
         navigateToInstanceSettings('BTeam', 'instance-2-1')

From d27f6256b62fd8e3df0281ac1ec3dab5f2ff5592 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Fri, 19 Apr 2024 16:52:28 +0100
Subject: [PATCH 14/15] align path name with other routes

---
 frontend/src/pages/instance/Settings/routes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/instance/Settings/routes.js b/frontend/src/pages/instance/Settings/routes.js
index 16e1fef66a..a8fb46bf2e 100644
--- a/frontend/src/pages/instance/Settings/routes.js
+++ b/frontend/src/pages/instance/Settings/routes.js
@@ -27,6 +27,6 @@ export default [
             title: 'Instance - Change Type'
         }
     },
-    { path: 'launcher', name: 'InstanceSettingsLauncher', component: InstanceSettingsLauncher },
+    { path: 'launcher', name: 'instance-settings-launcher', component: InstanceSettingsLauncher },
     { path: 'alerts', name: 'instance-settings-alerts', component: InstanceSettingsAlerts }
 ]

From 3c5e0276eb3c96511378571e1d8f3009090d2b27 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Thu, 2 May 2024 10:10:13 +0100
Subject: [PATCH 15/15] add healthCheckInterval to /settings

---
 forge/routes/api/project.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/forge/routes/api/project.js b/forge/routes/api/project.js
index c7c8cdf83a..359325f8a9 100644
--- a/forge/routes/api/project.js
+++ b/forge/routes/api/project.js
@@ -814,7 +814,9 @@ module.exports = async function (app) {
             reply.code(400).send({ code: 'project_suspended', error: 'Project suspended' })
             return
         }
+        // get settings from the driver
         const settings = await app.containers.settings(request.project)
+        // add instance settings
         settings.env = settings.env || {}
         settings.baseURL = request.project.url
         settings.forgeURL = app.config.base_url
@@ -824,6 +826,7 @@ module.exports = async function (app) {
         settings.auditURL = request.project.auditURL
         settings.state = request.project.state
         settings.stack = request.project.ProjectStack?.properties || {}
+        settings.healthCheckInterval = await request.project.getSetting(KEY_HEALTH_CHECK_INTERVAL)
         settings.settings = await app.db.controllers.Project.getRuntimeSettings(request.project)
         if (settings.settings.env) {
             settings.env = Object.assign({}, settings.settings.env, settings.env)