fix(webhook): toggle connector enable state when toggling webhook ena…

…ble state
emqx · Jan 23, 2025 · 75dfab3 · 75dfab3
1 parent 877b12c
commit 75dfab3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/hooks/Rule/connector/useComponentsHandlers.ts b/src/hooks/Rule/connector/useComponentsHandlers.ts
@@ -136,7 +136,7 @@ export default (
       }
     }
     const i18nPrefix = getI18nPrefix(BridgeType.MQTT)
-    if (comRet?.static_clientids.items.properties) {
+    if (comRet?.static_clientids?.items?.properties) {
       const props = comRet.static_clientids.items.properties
       if (props.ids) {
         setLabelAndDesc(props.ids, `${i18nPrefix}ids`)

diff --git a/src/hooks/Webhook/useWebhookItem.ts b/src/hooks/Webhook/useWebhookItem.ts
@@ -1,5 +1,5 @@
 import { deleteAction, putActionEnable } from '@/api/action'
-import { deleteConnector } from '@/api/connector'
+import { deleteConnector, putConnectorEnable } from '@/api/connector'
 import { deleteRules, updateRules } from '@/api/ruleengine'
 import { WebhookItem } from '@/types/webhook'
 import { ElMessage as M, ElMessageBox as MB } from 'element-plus'
@@ -8,7 +8,7 @@ import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 export default (): {
-  toggleWebhookEnableStatus: (webhook: WebhookItem) => Promise<[any, any]>
+  toggleWebhookEnableStatus: (webhook: WebhookItem) => Promise<[any, any, any]>
   deleteLoading: Ref<boolean>
   deleteWebhook: (webhook: WebhookItem) => Promise<void>
 } => {
@@ -23,6 +23,7 @@ export default (): {
     return await Promise.all([
       toggleBridgeEnableStatus(webhook.action.id, enable),
       toggleRuleEnableStatus(webhook.rule.id, enable),
+      putConnectorEnable(webhook.connector.id, enable),
     ])
   }