check for service mode when querying child bridge status

homebridge · Nov 16, 2024 · 0f5993e · 0f5993e
1 parent 722915e
commit 0f5993e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to `homebridge-config-ui-x` will be documented in this file.
 ### Other Changes
 
 - migrate `@zajsf/*` to `@ng-formworks/*` for plugin schema forms
+- check for service mode when querying child bridge status
 
 ### Homebridge Dependencies
 

diff --git a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.ts b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.ts
@@ -438,7 +438,7 @@ export class CustomPluginsComponent implements OnInit, OnDestroy {
           return
         }
 
-        if (!['homebridge', 'homebridge-config-ui-x'].includes(this.plugin.name)) {
+        if (!['homebridge', 'homebridge-config-ui-x'].includes(this.plugin.name) && this.$settings.env.serviceMode) {
           await this.getChildBridges()
           if (this.childBridges.length > 0) {
             this.$activeModal.close()

diff --git a/ui/src/app/core/manage-plugins/manage-plugin/manage-plugin.component.ts b/ui/src/app/core/manage-plugins/manage-plugin/manage-plugin.component.ts
@@ -249,6 +249,9 @@ export class ManagePluginComponent implements OnInit, OnDestroy {
   }
 
   async getChildBridges(): Promise<void> {
+    if (!this.$settings.env.serviceMode) {
+      return
+    }
     const data: any[] = await firstValueFrom(this.$api.get('/status/homebridge/child-bridges'))
     data.forEach((bridge) => {
       if (this.pluginName === bridge.plugin) {

diff --git a/ui/src/app/core/manage-plugins/manual-config/manual-config.component.ts b/ui/src/app/core/manage-plugins/manual-config/manual-config.component.ts
@@ -219,7 +219,7 @@ export class ManualConfigComponent implements OnInit {
         return
       }
 
-      if (!['homebridge', 'homebridge-config-ui-x'].includes(this.plugin.name)) {
+      if (!['homebridge', 'homebridge-config-ui-x'].includes(this.plugin.name) && this.$settings.env.serviceMode) {
         await this.getChildBridges()
         if (this.childBridges.length > 0) {
           this.$activeModal.close()

diff --git a/ui/src/app/core/manage-plugins/plugin-config/plugin-config.component.ts b/ui/src/app/core/manage-plugins/plugin-config/plugin-config.component.ts
@@ -111,7 +111,7 @@ export class PluginConfigComponent implements OnInit {
         }
       }
 
-      if (!['homebridge', 'homebridge-config-ui-x'].includes(this.plugin.name)) {
+      if (!['homebridge', 'homebridge-config-ui-x'].includes(this.plugin.name) && this.$settings.env.serviceMode) {
         await this.getChildBridges()
         if (this.childBridges.length > 0) {
           this.$activeModal.close()