From c86bfdf11c406ae7cf05e8aa8f8c39209bf4f29f Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 11 Feb 2025 14:14:28 +0000
Subject: [PATCH 1/6] Add externalBroker feature flag to UI

---
 frontend/src/store/account.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/store/account.js b/frontend/src/store/account.js
index 2eff7b81b5..ab46acca18 100644
--- a/frontend/src/store/account.js
+++ b/frontend/src/store/account.js
@@ -184,6 +184,8 @@ const getters = {
             isMqttBrokerFeatureEnabledForPlatform: !!state.features?.teamBroker,
             isMqttBrokerFeatureEnabledForTeam: !!state.team?.type?.properties?.features?.teamBroker,
 
+            isExternalMqttBrokerFeatureEnabledForPlatform: !!state.features?.externalBroker,
+
             // DevOps Pipelines
             devOpsPipelinesFeatureEnabledForPlatform: !!state.features?.['devops-pipelines']
         }
@@ -197,6 +199,8 @@ const getters = {
             isBOMFeatureEnabled: preCheck.isBOMFeatureEnabledForPlatform && preCheck.isBOMFeatureEnabledForTeam,
             isTimelineFeatureEnabled: preCheck.isTimelineFeatureEnabledForPlatform && preCheck.isTimelineFeatureEnabledForTeam,
             isMqttBrokerFeatureEnabled: preCheck.isMqttBrokerFeatureEnabledForPlatform && preCheck.isMqttBrokerFeatureEnabledForTeam,
+            // external broker must be enabled for platform, and share the same team-level feature flag as the team broker
+            isExternalMqttBrokerFeatureEnabled: preCheck.isExternalMqttBrokerFeatureEnabledForPlatform && preCheck.isMqttBrokerFeatureEnabledForTeam,
             devOpsPipelinesFeatureEnabled: preCheck.devOpsPipelinesFeatureEnabledForPlatform,
             isDeviceGroupsFeatureEnabled: !!state.team?.type?.properties?.features?.deviceGroups
         }

From 59e28ecf4757761090490d43df5ab590215cce09 Mon Sep 17 00:00:00 2001
From: cstns <cstn.serban@gmail.com>
Date: Tue, 11 Feb 2025 16:27:02 +0200
Subject: [PATCH 2/6] hide the broker status badge from broker creation pages

---
 forge/ee/lib/teamBroker/index.js          | 2 +-
 frontend/src/pages/team/Brokers/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge/ee/lib/teamBroker/index.js b/forge/ee/lib/teamBroker/index.js
index 8fcf2d9258..e42b6f8b86 100644
--- a/forge/ee/lib/teamBroker/index.js
+++ b/forge/ee/lib/teamBroker/index.js
@@ -7,7 +7,7 @@ module.exports.init = function (app) {
     if (app.config.driver.type === 'localfs' ||
         app.config.driver.type === 'kubernetes' ||
         app.config.driver.type === 'stub') {
-        app.config.features.register('externalBroker', true, true)
+        // app.config.features.register('externalBroker', true, true)
     }
 
     /*
diff --git a/frontend/src/pages/team/Brokers/index.vue b/frontend/src/pages/team/Brokers/index.vue
index ff0fabeebe..6fc6728768 100644
--- a/frontend/src/pages/team/Brokers/index.vue
+++ b/frontend/src/pages/team/Brokers/index.vue
@@ -7,7 +7,7 @@
                 </template>
 
                 <template #status>
-                    <BrokerStatusBadge v-if="broker?.id !== 'team-broker'" :status="brokerState" :pendingStateChange="!brokerState" />
+                    <BrokerStatusBadge v-if="broker?.id !== 'team-broker' && !isCreationPage" :status="brokerState" :pendingStateChange="!brokerState" />
                 </template>
 
                 <template #pictogram>

From 9e6f65f057c0563debca1b4515bd674e65d5f1cc Mon Sep 17 00:00:00 2001
From: cstns <cstn.serban@gmail.com>
Date: Tue, 11 Feb 2025 16:30:27 +0200
Subject: [PATCH 3/6] should not have commited

---
 forge/ee/lib/teamBroker/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge/ee/lib/teamBroker/index.js b/forge/ee/lib/teamBroker/index.js
index e42b6f8b86..8fcf2d9258 100644
--- a/forge/ee/lib/teamBroker/index.js
+++ b/forge/ee/lib/teamBroker/index.js
@@ -7,7 +7,7 @@ module.exports.init = function (app) {
     if (app.config.driver.type === 'localfs' ||
         app.config.driver.type === 'kubernetes' ||
         app.config.driver.type === 'stub') {
-        // app.config.features.register('externalBroker', true, true)
+        app.config.features.register('externalBroker', true, true)
     }
 
     /*

From 07dd2e1ad72685dcf59b80f46efcc3b77ddaffb5 Mon Sep 17 00:00:00 2001
From: cstns <cstn.serban@gmail.com>
Date: Tue, 11 Feb 2025 16:35:43 +0200
Subject: [PATCH 4/6] hide the 3rd party broker option and the local broker
 ribbon if the externalBroker feature flag is not set

---
 frontend/src/pages/team/Brokers/ChooseBroker.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/team/Brokers/ChooseBroker.vue b/frontend/src/pages/team/Brokers/ChooseBroker.vue
index 287f6b6ca9..e389fe6084 100644
--- a/frontend/src/pages/team/Brokers/ChooseBroker.vue
+++ b/frontend/src/pages/team/Brokers/ChooseBroker.vue
@@ -61,10 +61,11 @@ export default {
     },
     computed: {
         ...mapGetters('product', ['hasFfUnsClients', 'hasBrokers']),
+        ...mapGetters('account', ['featuresCheck']),
         options () {
             return [
                 {
-                    ribbon: 'Recommended',
+                    ribbon: this.featuresCheck.isExternalMqttBrokerFeatureEnabled ? 'Recommended' : '',
                     title: 'FlowFuse Broker',
                     content: [
                         '20 x MQTT Clients included in your plan'
@@ -79,7 +80,8 @@ export default {
                         'Requires a third-party broker to be setup'
                     ],
                     contentType: 'dash',
-                    to: { name: 'team-brokers-new' }
+                    to: { name: 'team-brokers-new' },
+                    hidden: !this.featuresCheck.isExternalMqttBrokerFeatureEnabled
                 }
             ].filter(op => !op.hidden)
         },

From a0070a9b0c9f1c9066bd7eaf2d60f1b8aa93532a Mon Sep 17 00:00:00 2001
From: cstns <cstn.serban@gmail.com>
Date: Tue, 11 Feb 2025 16:36:35 +0200
Subject: [PATCH 5/6] hides the broker toolbox if the feature flag is not set,
 forcing to default to the ff broker

---
 frontend/src/pages/team/Brokers/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/team/Brokers/index.vue b/frontend/src/pages/team/Brokers/index.vue
index 6fc6728768..3c7cf67a27 100644
--- a/frontend/src/pages/team/Brokers/index.vue
+++ b/frontend/src/pages/team/Brokers/index.vue
@@ -23,7 +23,7 @@
                 </template>
 
                 <template #tools>
-                    <section v-if="!loading && shouldDisplayTools" class="flex gap-3 flex-wrap">
+                    <section v-if="!loading && shouldDisplayTools && featuresCheck.isExternalMqttBrokerFeatureEnabled" class="flex gap-3 flex-wrap">
                         <ff-listbox
                             v-if="brokers.length > 1"
                             v-model="activeBrokerId"

From 0a19e87ef566dbc3774d0491665cd0544f3a54d8 Mon Sep 17 00:00:00 2001
From: cstns <cstn.serban@gmail.com>
Date: Tue, 11 Feb 2025 16:37:48 +0200
Subject: [PATCH 6/6] redirect to the brokers main page from the external
 broker creation page if the externalBroker feature flag is not set

---
 frontend/src/pages/team/Brokers/NewBroker.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/frontend/src/pages/team/Brokers/NewBroker.vue b/frontend/src/pages/team/Brokers/NewBroker.vue
index 369227492d..3c9bdc2066 100644
--- a/frontend/src/pages/team/Brokers/NewBroker.vue
+++ b/frontend/src/pages/team/Brokers/NewBroker.vue
@@ -4,11 +4,21 @@
 
 <script>
 
+import { mapGetters } from 'vuex'
+
 import BrokerForm from './components/BrokerForm.vue'
 
 export default {
     name: 'NewBroker',
     components: { BrokerForm },
+    computed: {
+        ...mapGetters('account', ['featuresCheck'])
+    },
+    mounted () {
+        if (!this.featuresCheck.isExternalMqttBrokerFeatureEnabled) {
+            this.$router.push({ name: 'team-brokers' })
+        }
+    },
     methods: {
         onSubmit (payload) {
             return this.$store.dispatch('product/createBroker', payload)