Merge branch 'main' into azure-devops-pipelines

Author: hardillb

ci/ci-values.yaml

@@ -2,6 +2,7 @@ forge:
   domain: flowfuse.dev
   https: true
   localPostgresql: true
+  projectIngressClassName: traefik
   broker:
     enabled: true
     teamBroker:
@@ -46,3 +47,6 @@ postgresql:
       key: "role"
       values:
         - "management"
+
+ingress:
+  className: traefik

docs/README.md

@@ -233,7 +233,6 @@ Once you're more comfortable with FlowFuse, you may want to explore some of our
 ## Support
 
 - [Troubleshooting](/docs/debugging/)
-- [Community Support](https://community.flowfuse.com/)
 - [FlowFuse Cloud Support](/docs/premium-support/)
 
 ## Contributing to FlowFuse

docs/user/role-based-access-control.md

@@ -134,6 +134,8 @@ To change a team member's role:
 
 Application-Level RBAC enables you to control permissions at the individual application level within a team. This allows different team members to have different permission levels for different applications without creating multiple teams.
 
+This is an Enterprise lisenced feature for Self Hosted Users and requires an Entprise Team on FlowFuse Cloud.
+
 ### Overview
 
 Team-level roles define default permissions across all resources.  

forge/ee/lib/autoUpdateStacks/tasks/upgrade-stack.js

@@ -4,6 +4,9 @@
 
 const { randomInt } = require('../../../../housekeeper/utils')
 
+// utility function to pause for a given number of ms
+const delay = (time) => new Promise(resolve => setTimeout(resolve, time))
+
 module.exports = {
     name: 'stackUpgrade',
     // startup: false
@@ -18,41 +21,50 @@ module.exports = {
             const projectList = await app.db.models.ProjectSettings.getProjectsToUpgrade(hour, day)
             if (projectList) {
                 for (const project of projectList) {
-                    // we should probably rate limit this to not restart lots of projects at once
-                    if (project.Project.ProjectStack.replacedBy) {
-                        // need to add audit logging
-                        try {
-                            const newStack = await app.db.models.ProjectStack.byId(project.Project.ProjectStack.replacedBy)
-                            app.log.info(`Updating project ${project.Project.id} to stack: '${newStack.hashid}'`)
+                    if (project.Project.state !== 'suspended') {
+                        if (project.Project.ProjectStack.replacedBy) {
+                            // need to add audit logging
+                            try {
+                                const newStack = await app.db.models.ProjectStack.byId(project.Project.ProjectStack.replacedBy)
+                                app.log.info(`Updating project ${project.Project.id} to stack: '${newStack.hashid}'`)
 
-                            const suspendOptions = {
-                                skipBilling: true
-                            }
+                                const suspendOptions = {
+                                    skipBilling: true
+                                }
 
-                            app.db.controllers.Project.setInflightState(project.Project, 'starting')
-                            const result = await suspendProject(project.Project, suspendOptions)
+                                app.db.controllers.Project.setInflightState(project.Project, 'starting')
+                                const result = await suspendProject(project.Project, suspendOptions)
 
-                            await project.Project.setProjectStack(newStack)
-                            await project.Project.save()
+                                await project.Project.setProjectStack(newStack)
+                                await project.Project.save()
+                                // Give time for k8s to settle after suspend
+                                await delay(2000)
 
-                            await app.auditLog.Project.project.stack.changed(null, null, project.Project, newStack)
+                                await app.auditLog.Project.project.stack.changed(null, null, project.Project, newStack)
 
-                            await unSuspendProject(project.Project, result.resumeProject, result.targetState)
-                        } catch (err) {
-                            app.log.info(`Problem updating project ${project.Project.id} - ${err.toString()}`)
-                        }
-                    } else if (project.value.restart) {
-                        try {
-                            app.log.info(`Restarting project ${project.Project.id} as scheduled`)
-                            await app.db.controllers.Project.setInflightState(project.Project, 'restarting')
-                            project.Project.state = 'running'
-                            await project.Project.save()
-                            await app.containers.restartFlows(project.Project)
-                            await app.auditLog.Project.project.restarted(null, null, project.Project)
-                            await app.db.controllers.Project.clearInflightState(project.Project)
-                        } catch (err) {
-                            app.log.info(`Problem restarting project ${project.Project.id} - ${err.toString()}`)
+                                await unSuspendProject(project.Project, result.resumeProject, result.targetState)
+                                // Space out restarts a little to not overwhelm k8s api
+                                await delay(2000)
+                            } catch (err) {
+                                app.log.info(`Problem updating project ${project.Project.id} - ${err.toString()}`)
+                            }
+                        } else if (project.value.restart) {
+                            try {
+                                app.log.info(`Restarting project ${project.Project.id} as scheduled`)
+                                await app.db.controllers.Project.setInflightState(project.Project, 'restarting')
+                                project.Project.state = 'running'
+                                await project.Project.save()
+                                await app.containers.restartFlows(project.Project)
+                                await app.auditLog.Project.project.restarted(null, null, project.Project)
+                                await app.db.controllers.Project.clearInflightState(project.Project)
+                                // space out the Node-RED restarts a little.
+                                await delay(2000)
+                            } catch (err) {
+                                app.log.info(`Problem restarting project ${project.Project.id} - ${err.toString()}`)
+                            }
                         }
+                    } else {
+                        app.log.info(`Project ${project.Project.id} is suspended, not upgrading stack`)
                     }
                 }
             }

frontend/src/App.vue

@@ -62,8 +62,8 @@
 </template>
 
 <script>
-import { mapState } from 'pinia'
-import { mapActions, mapState as mapVuexState } from 'vuex'
+import { mapActions, mapState } from 'pinia'
+import { mapState as mapVuexState } from 'vuex'
 
 import Loading from './components/Loading.vue'
 import Offline from './components/Offline.vue'
@@ -78,6 +78,7 @@ import PasswordExpired from './pages/PasswordExpired.vue'
 import TermsAndConditions from './pages/TermsAndConditions.vue'
 import UnverifiedEmail from './pages/UnverifiedEmail.vue'
 
+import { useContextStore } from '@/stores/context.js'
 import { useUxDrawersStore } from '@/stores/ux-drawers.js'
 
 export default {
@@ -144,7 +145,7 @@ export default {
         this.$store.dispatch('product/checkFlags')
     },
     methods: {
-        ...mapActions('context', ['updateRoute'])
+        ...mapActions(useContextStore, ['updateRoute'])
     }
 }
 </script>

frontend/src/components/bill-of-materials/DependencyItem.vue

@@ -25,7 +25,7 @@
 import { ChevronRightIcon } from '@heroicons/vue/outline'
 
 import ExternalClient from '../../api/external.js'
-import { pluralize } from '../../composables/String.js'
+import { pluralize } from '../../composables/strings/String.js'
 import daysSince from '../../utils/daysSince.js'
 
 import VersionsList from './VersionsList.vue'

frontend/src/components/dialogs/EditApplicationPermissionsDialog.vue

@@ -21,7 +21,7 @@ import { defineComponent } from 'vue'
 import { mapState } from 'vuex'
 
 import teamApi from '../../api/team.js'
-import { capitalize } from '../../composables/String.js'
+import { capitalize } from '../../composables/strings/String.js'
 import alerts from '../../services/alerts.js'
 import { RoleNames, Roles } from '../../utils/roles.js'
 

frontend/src/components/dialogs/device-group-management/AddDeviceToGroupDialog.vue

@@ -82,8 +82,7 @@ import { ChipIcon } from '@heroicons/vue/outline'
 import { mapActions } from 'pinia'
 
 import ApplicationAPI from '../../../api/application.js'
-
-import { pluralize } from '../../../composables/String.js'
+import { pluralize } from '../../../composables/strings/String.js'
 import FfLoading from '../../Loading.vue'
 import NoticeBanner from '../../notices/NoticeBanner.vue'
 import DeployNotice from '../../notices/device-groups/DeployNotice.vue'

frontend/src/components/dialogs/device-group-management/components/device-list.vue

@@ -32,8 +32,7 @@
 <script>
 import { mapState } from 'pinia'
 
-import { pluralize } from '../../../../composables/String.js'
-
+import { pluralize } from '../../../../composables/strings/String.js'
 import FfDataTable from '../../../../ui-components/components/data-table/DataTable.vue'
 import Accordion from '../../../Accordion.vue'