Merge branch 'dev/1.9.0' into enterprise

src/hooks/Rule/rule/useDebugRule.ts

@@ -4,7 +4,7 @@ import { getKeywordsFromSQL } from '@/common/tools'
 import useI18nTl from '@/hooks/useI18nTl'
 import useSyncPolling from '@/hooks/useSyncPolling'
 import { TraceRecord } from '@/types/diagnose'
-import { LogTraceFormatter, RuleInputType, TraceEncodeType } from '@/types/enum'
+import { EventForRule, LogTraceFormatter, RuleInputType, TraceEncodeType } from '@/types/enum'
 import { BasicRule, BridgeItem, RuleEvent, RuleItem } from '@/types/rule'
 import { ElMessageBox } from 'element-plus'
 import { cloneDeep, debounce, isArray, isEqual, isFunction, mergeWith, startCase } from 'lodash'
@@ -386,6 +386,8 @@ export const useMockData = (
   const setDataType = (type: RuleInputType, firstInput: string) => {
     if (type === RuleInputType.Topic) {
       dataType.value = TOPIC_EVENT
+    } else if (type === RuleInputType.Bridge) {
+      dataType.value = EventForRule.MessagePublish
     } else {
       dataType.value = firstInput
     }

src/hooks/Rule/rule/useFormatDebugLog.ts

@@ -44,6 +44,17 @@ const EXCLUDED_LOGS = [
   LogMsg.AsyncSendMsgToRemoteNode,
 ]
 
+const RULE_LOGS = [
+  LogMsg.RuleActivated,
+  LogMsg.SQLSelectClauseException,
+  LogMsg.SQLWhereClauseException,
+  LogMsg.SQLForeachClauseException,
+  LogMsg.SQLIncaseClauseException,
+  LogMsg.ApplyRuleFailed,
+  LogMsg.SQLYieldedResult,
+  LogMsg.SQLYieldedNoResult,
+]
+
 export interface LogItem {
   time: string
   msg: LogMsg
@@ -132,6 +143,16 @@ const detectActionLogArrResult = (logArr: Array<LogItem>): LogResult => {
   return logArr.every(detectLogItemResult) ? LogResult.OK : LogResult.Error
 }
 
+const neededInfoMap = new Map([
+  [LogMsg.RuleActivated, 'meta.input'],
+  [LogMsg.SQLYieldedResult, 'meta.result'],
+  [LogMsg.SQLSelectClauseException, 'meta'],
+  [LogMsg.SQLWhereClauseException, 'meta'],
+  [LogMsg.SQLForeachClauseException, 'meta'],
+  [LogMsg.SQLIncaseClauseException, 'meta'],
+  [LogMsg.ApplyRuleFailed, 'meta'],
+])
+
 export default () => {
   const convertLogStrToLogArr = (logStr: string): Array<LogItem> =>
     logStr
@@ -151,7 +172,7 @@ export default () => {
   const getLogTypeAndTarget = (
     log: LogItem,
   ): { target: string; type: LogTargetTypeValue; targetInfo?: TargetLog['targetInfo'] } => {
-    if (log.meta.action_info) {
+    if (log.meta.action_info && !RULE_LOGS.includes(log.msg)) {
       const { type, name, func, args } = log.meta.action_info
       if (type && name) {
         return {
@@ -172,15 +193,6 @@ export default () => {
     return { target: log.meta.rule_id || log.meta.rule_ids?.[0], type: LogTargetType.Rule }
   }
 
-  const neededInfoMap = new Map([
-    [LogMsg.RuleActivated, 'meta.input'],
-    [LogMsg.SQLYieldedResult, 'meta.result'],
-    [LogMsg.SQLSelectClauseException, 'meta'],
-    [LogMsg.SQLWhereClauseException, 'meta'],
-    [LogMsg.SQLForeachClauseException, 'meta'],
-    [LogMsg.SQLIncaseClauseException, 'meta'],
-    [LogMsg.ApplyRuleFailed, 'meta'],
-  ])
   const ruleLogMsgOrder: Map<string, number> = new Map([[LogMsg.RuleActivated, 99]])
   const handleRuleExecLogInfo: TargetLogGenerator = (log) => {
     return Object.keys(log)
@@ -294,7 +306,7 @@ export default () => {
     if (EXCLUDED_LOGS.includes(log.msg)) {
       needBeDropped = true
     }
-    if (/connector/i.test(log.msg) && log.meta.connector) {
+    if (/connector/i.test(log.msg) && !log.meta.action_info) {
       needBeDropped = true
     }
     if (/msg =>/.test(log.msg) && !log.meta.action_info) {
@@ -439,7 +451,8 @@ export const useShowLog = () => {
     if (logMsg === LogMsg.SQLYieldedNoResult) {
       return `SQL ${tl('failedNoResult')}`
     }
-    if (logContent.reason) {
+    const infoKey = neededInfoMap.get(logMsg as LogMsg)
+    if ((infoKey === 'meta' && logContent.reason) || (!infoKey && logContent.meta.reason)) {
       return `SQL ${tl('failedException')}\n${logContent.reason}`
     }
   }

src/hooks/Rule/rule/useRuleEvents.ts

@@ -56,6 +56,7 @@ export default (): {
       }
       return Promise.resolve(eventList)
     } catch (error) {
+      commit('SET_RULE_EVENT_REQUEST', null)
       return Promise.reject(error)
     }
   }

src/views/Clients/components/ClientFieldSelect.vue

@@ -114,9 +114,11 @@ const reset = () => {
 </script>
 
 <style lang="scss">
-.table-dropdown-btn {
-  // FIXME: style of plain primary button
-  height: 30px;
+.client-field-select {
+  .table-dropdown-btn {
+    // FIXME: style of plain primary button
+    height: 30px;
+  }
 }
 .client-field-select-dropdown {
   padding: 4px;

src/views/RuleEngine/components/MockDataDrawer.vue

@@ -53,10 +53,10 @@ import InfoTooltip from '@/components/InfoTooltip.vue'
 import { useMockData } from '@/hooks/Rule/rule/useDebugRule'
 import useI18nTl from '@/hooks/useI18nTl'
 import { BridgeItem } from '@/types/rule'
-import { PropType, WritableComputedRef, computed, defineEmits, defineProps, ref, watch } from 'vue'
+import { CaretRight, RefreshRight } from '@element-plus/icons-vue'
+import { PropType, WritableComputedRef, computed, defineEmits, defineProps, watch } from 'vue'
 import FromSelect from '../components/FromSelect.vue'
 import TestSQLContextForm from './TestSQLContextForm.vue'
-import { CaretRight, RefreshRight } from '@element-plus/icons-vue'
 
 const props = defineProps({
   modelValue: {

src/views/RuleEngine/components/RuleTest.vue

@@ -111,6 +111,7 @@ const openMockDataDrawer = () => {
 }
 const handleSubmitMockData = async (context: Record<string, any>) => {
   try {
+    isSubmittingMockData.value = true
     await submitMockDataForTestRule(props.ruleData.id, context)
     setCbAfterPolling(scrollLogToBottom)
     showMockDataDrawer.value = false