Merge branch 'main' into 4756-search-api

forge/comms/v2AuthRoutes.js

@@ -119,20 +119,22 @@ module.exports = async function (app) {
             if (app.license.active()) {
                 const parts = request.body.username.split('@')
                 const user = await app.db.models.TeamBrokerClient.byUsername(parts[0], parts[1])
-                const acls = JSON.parse(user.acls)
-                for (const acl in acls) {
-                    if (request.body.action === 'subscribe') {
-                        if (mqttMatch(acls[acl].pattern, request.body.topic)) {
-                            if (acls[acl].action === 'both' || acls[acl].action === 'subscribe') {
-                                reply.send({ result: 'allow' })
-                                return
+                if (user) {
+                    const acls = JSON.parse(user.acls)
+                    for (const acl in acls) {
+                        if (request.body.action === 'subscribe') {
+                            if (mqttMatch(acls[acl].pattern, request.body.topic)) {
+                                if (acls[acl].action === 'both' || acls[acl].action === 'subscribe') {
+                                    reply.send({ result: 'allow' })
+                                    return
+                                }
                             }
-                        }
-                    } else {
-                        if (mqttMatch(acls[acl].pattern, request.body.topic)) {
-                            if (acls[acl].action === 'both' || acls[acl].action === 'publish') {
-                                reply.send({ result: 'allow' })
-                                return
+                        } else {
+                            if (mqttMatch(acls[acl].pattern, request.body.topic)) {
+                                if (acls[acl].action === 'both' || acls[acl].action === 'publish') {
+                                    reply.send({ result: 'allow' })
+                                    return
+                                }
                             }
                         }
                     }

frontend/src/App.vue

@@ -1,5 +1,5 @@
 <template>
-    <div id="ff-app" class="min-h-screen flex flex-col">
+    <div id="ff-app" class="flex flex-col" :class="{'hidden-left-drawer': hiddenLeftDrawer}">
         <template v-if="offline">
             <main class="ff-bg-dark flex-grow flex flex-col">
                 <div class="w-full max-w-screen-2xl mx-auto my-2 sm:my-8 flex-grow flex flex-col">
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 
 import Loading from './components/Loading.vue'
 import Offline from './components/Offline.vue'
@@ -88,6 +88,8 @@ export default {
     },
     computed: {
         ...mapState('account', ['pending', 'user', 'team', 'offline', 'settings']),
+        ...mapState('ux', ['leftDrawer']),
+        ...mapGetters('ux', ['hiddenLeftDrawer']),
         loginRequired () {
             return this.$route.meta.requiresLogin !== false
         },

frontend/src/components/PageHeader.vue

@@ -1,8 +1,11 @@
 <template>
     <div class="ff-header" data-sentry-unmask>
         <!-- Mobile: Toggle(Team & Team Admin Options) -->
-        <i v-if="shouldDisplayMenuToggle" class="ff-header--mobile-toggle" :class="{'active': mobileMenuOpen}">
-            <MenuIcon class="ff-avatar" @click="$emit('menu-toggle')" />
+        <i v-if="!hiddenLeftDrawer" class="ff-header--mobile-toggle">
+            <transition name="mobile-menu-fade" mode="out-in">
+                <MenuIcon v-if="!leftDrawer.state" class="ff-avatar cursor-pointer" @click="toggleLeftDrawer" />
+                <XIcon v-else class="ff-avatar cursor-pointer" @click="toggleLeftDrawer" />
+            </transition>
         </i>
         <!-- FlowFuse Logo -->
         <img class="ff-logo" src="/ff-logo--wordmark-caps--dark.png" @click="home()">
@@ -69,7 +72,7 @@
     </div>
 </template>
 <script>
-import { AcademicCapIcon, AdjustmentsIcon, CogIcon, LogoutIcon, MenuIcon, PlusIcon, QuestionMarkCircleIcon, UserAddIcon } from '@heroicons/vue/solid'
+import { AcademicCapIcon, AdjustmentsIcon, CogIcon, LogoutIcon, MenuIcon, PlusIcon, QuestionMarkCircleIcon, UserAddIcon, XIcon } from '@heroicons/vue/solid'
 import { ref } from 'vue'
 import { mapActions, mapGetters, mapState } from 'vuex'
 
@@ -84,17 +87,12 @@ import TeamSelection from './TeamSelection.vue'
 
 export default {
     name: 'NavBar',
-    props: {
-        mobileMenuOpen: {
-            type: Boolean
-        }
-    },
-    emits: ['menu-toggle'],
     mixins: [navigationMixin, permissionsMixin],
     computed: {
         ...mapState('account', ['user', 'team', 'teams']),
+        ...mapState('ux', ['leftDrawer']),
         ...mapGetters('account', ['notifications', 'hasAvailableTeams', 'defaultUserTeam', 'canCreateTeam', 'isTrialAccount']),
-        ...mapGetters('ux', ['shouldShowLeftMenu']),
+        ...mapGetters('ux', ['hiddenLeftDrawer']),
         navigationOptions () {
             return [
                 {
@@ -137,10 +135,7 @@ export default {
             ].filter(option => option !== undefined)
         },
         showInviteButton () {
-            return this.team && this.hasPermission('team:user:invite') && this.$route.name !== 'TeamMembers'
-        },
-        shouldDisplayMenuToggle () {
-            return this.shouldShowLeftMenu(this.$route)
+            return this.team && this.hasPermission('team:user:invite') && this.$route.name !== 'team-members-members'
         }
     },
     watch: {
@@ -155,6 +150,7 @@ export default {
         NavItem,
         'ff-team-selection': TeamSelection,
         MenuIcon,
+        XIcon,
         UserAddIcon,
         NotificationsButton
     },
@@ -172,6 +168,7 @@ export default {
         }
     },
     methods: {
+        ...mapActions('ux', ['toggleLeftDrawer']),
         to (route) {
             window.open(route.url, '_blank')
         },