Sync code from refs/heads/dev/1.10.5 to enterprise

src/components/Buttons/SearchButton.vue

@@ -1,7 +1,7 @@
 <template>
   <el-button type="primary" plain :icon="Search" v-if="noText"></el-button>
   <el-button type="primary" plain :icon="Search" v-else>
-    <template>{{ tl('search') }}</template>
+    {{ tl('search') }}
   </el-button>
 </template>
 

src/hooks/Rule/bridge/useDeleteBridge.ts

@@ -11,8 +11,6 @@ interface DeleteBridgeResult {
   showSecondConfirm: Ref<boolean>
   usingBridgeRules: Ref<string[]>
   currentDeleteBridgeId: Ref<string>
-  currentDelName: Ref<string>
-  showDeleteWebhookAssociatedTip: Ref<boolean>
   handleDeleteSuc: () => void
   handleDeleteBridge: (data: BridgeItem) => Promise<void>
 }
@@ -24,8 +22,6 @@ export default (deletedCallBack: () => void): DeleteBridgeResult => {
   const usingBridgeRules: Ref<Array<string>> = ref([])
   const currentDeleteBridgeId = ref('')
 
-  const currentDelName = ref('')
-  const showDeleteWebhookAssociatedTip = ref(false)
   const { judgeIsWebhookAction } = useWebhookUtils()
 
   const handleDeleteSuc = () => {
@@ -43,8 +39,6 @@ export default (deletedCallBack: () => void): DeleteBridgeResult => {
   const { deleteAction } = useHandleActionItem()
   const handleDeleteBridge = async (item: BridgeItem) => {
     if (judgeIsWebhookAction(item)) {
-      currentDelName.value = item.name
-      showDeleteWebhookAssociatedTip.value = true
       return
     }
     if (item.rules?.length) {
@@ -71,8 +65,6 @@ export default (deletedCallBack: () => void): DeleteBridgeResult => {
     showSecondConfirm,
     usingBridgeRules,
     currentDeleteBridgeId,
-    currentDelName,
-    showDeleteWebhookAssociatedTip,
     handleDeleteSuc,
     handleDeleteBridge,
   }

src/hooks/Rule/connector/useHandleConnectorItem.ts

@@ -34,8 +34,6 @@ interface ConnectorHandlerResult {
   isTesting: Ref<boolean>
   testConnectivity: (data: NowConnector) => Promise<void>
   showDelTip: Ref<boolean>
-  currentDelName: Ref<string>
-  showDeleteWebhookAssociatedTip: Ref<boolean>
   handleDeleteConnector: (data: Connector, callback: () => void | Promise<void>) => Promise<void>
 }
 
@@ -138,18 +136,14 @@ export default (): ConnectorHandlerResult => {
     return confirmDel(() => deleteConnector(id))
   }
 
-  const currentDelName = ref('')
-  const showDeleteWebhookAssociatedTip = ref(false)
   const { judgeIsWebhookConnector } = useWebhookUtils()
 
   const handleDeleteConnector = async (
     connector: Connector,
     callback: () => void | Promise<void>,
   ) => {
-    const { id, actions, sources, name } = connector
+    const { id, actions, sources } = connector
     if (judgeIsWebhookConnector(connector)) {
-      currentDelName.value = name
-      showDeleteWebhookAssociatedTip.value = true
       return
     }
     if ((actions && actions.length) || (sources && sources.length)) {
@@ -180,8 +174,6 @@ export default (): ConnectorHandlerResult => {
     isTesting,
     testConnectivity,
     showDelTip,
-    currentDelName,
-    showDeleteWebhookAssociatedTip,
     handleDeleteConnector,
   }
 }

src/views/Auth/components/AuthzManager.vue

@@ -24,9 +24,7 @@
         </template>
       </div>
       <el-tooltip :content="$t('Base.add')" placement="top">
-        <CreateButton class="icon-button" @click="handleAdd"  >
-          <template v-if="false"></template>
-        </CreateButton>
+        <CreateButton class="icon-button" @click="handleAdd" no-text />
       </el-tooltip>
     </div>
     <el-table

src/views/RuleEngine/Bridge/BridgeDetail.vue

@@ -138,11 +138,6 @@
       :id="currentDeleteBridgeId"
       @submitted="handleDeleteSuc"
     />
-    <DeleteWebhookAssociatedTip
-      v-model="showDeleteWebhookAssociatedTip"
-      type="action"
-      :name="currentDelName"
-    />
   </div>
 </template>
 
@@ -164,7 +159,6 @@ import _ from 'lodash'
 import type { Ref } from 'vue'
 import { computed, defineExpose, defineProps, onMounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import DeleteWebhookAssociatedTip from '../components/DeleteWebhookAssociatedTip.vue'
 import TargetItemStatus from '../components/TargetItemStatus.vue'
 import BridgeItemOverview from './Components/BridgeItemOverview.vue'
 import DeleteBridgeSecondConfirm from './Components/DeleteBridgeSecondConfirm.vue'
@@ -364,8 +358,6 @@ const {
   showSecondConfirm,
   usingBridgeRules,
   currentDeleteBridgeId,
-  showDeleteWebhookAssociatedTip,
-  currentDelName,
   handleDeleteSuc,
   handleDeleteBridge,
 } = useDeleteBridge(goBack)

src/views/RuleEngine/Bridge/DataBridge.vue

@@ -95,11 +95,6 @@
     :direction="BridgeDirection.Egress"
     @submitted="handleDeleteSuc"
   />
-  <DeleteWebhookAssociatedTip
-    v-model="showDeleteWebhookAssociatedTip"
-    type="action"
-    :name="currentDelName"
-  />
 </template>
 
 <script lang="ts" setup>
@@ -115,7 +110,6 @@ import { ElMessageBox, ElMessage as M } from 'element-plus'
 import type { Ref } from 'vue'
 import { onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
-import DeleteWebhookAssociatedTip from '../components/DeleteWebhookAssociatedTip.vue'
 import OperateWebhookAssociatedPopover from '../components/OperateWebhookAssociatedPopover.vue'
 import TableItemDropDown from '../components/TableItemDropDown.vue'
 import TargetItemStatus from '../components/TargetItemStatus.vue'
@@ -178,8 +172,6 @@ const {
   showSecondConfirm,
   usingBridgeRules,
   currentDeleteBridgeId,
-  currentDelName,
-  showDeleteWebhookAssociatedTip,
   handleDeleteSuc,
   handleDeleteBridge,
 } = useDeleteBridge(listBridge)

src/views/RuleEngine/Connector/Connector.vue

@@ -107,11 +107,6 @@
     <CreateRuleWithConnector v-model="showCreateRuleDialog" :connector="createdConnector" />
   </div>
   <DelConnectorTip v-model="showDelTip" :connector="currentConnector" />
-  <DeleteWebhookAssociatedTip
-    v-model="showDeleteWebhookAssociatedTip"
-    type="connector"
-    :name="currentDelName"
-  />
   <DisableConnectorConfirm
     v-model="showDisableConfirm"
     :connector="(currentConnector as Connector)"
@@ -129,7 +124,6 @@ import { ConnectionStatus } from '@/types/enum'
 import { BridgeItem, Connector } from '@/types/rule'
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
-import DeleteWebhookAssociatedTip from '../components/DeleteWebhookAssociatedTip.vue'
 import OperateWebhookAssociatedPopover from '../components/OperateWebhookAssociatedPopover.vue'
 import TableItemDropDown from '../components/TableItemDropDown.vue'
 import TargetItemStatus from '../components/TargetItemStatus.vue'
@@ -174,8 +168,6 @@ const {
   currentConnector,
   handleToggleConnectorEnable,
   showDelTip,
-  currentDelName,
-  showDeleteWebhookAssociatedTip,
 } = useHandleConnectorItem()
 const { judgeIsWebhookConnector } = useWebhookUtils()
 

src/views/RuleEngine/Connector/ConnectorDetail.vue

@@ -111,11 +111,6 @@
   </div>
   <CopySubmitDialog v-model="showNameInputDialog" :target="copyTarget" />
   <DelConnectorTip v-model="showDelTip" :connector="connectorData" />
-  <DeleteWebhookAssociatedTip
-    v-model="showDeleteWebhookAssociatedTip"
-    type="connector"
-    :name="connectorData.name"
-  />
   <DisableConnectorConfirm
     v-model="showDisableConfirm"
     :connector="(currentConnector as Connector)"
@@ -145,7 +140,6 @@ import { lowerCase } from 'lodash'
 import { computed, defineProps, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import CopySubmitDialog from '../components/CopySubmitDialog.vue'
-import DeleteWebhookAssociatedTip from '../components/DeleteWebhookAssociatedTip.vue'
 import TargetItemStatus from '../components/TargetItemStatus.vue'
 import DelConnectorTip from './components/DelConnectorTip.vue'
 import useConnectorFormComponent from './components/useConnectorFormComponent'
@@ -204,7 +198,6 @@ const {
   testConnectivity,
   handleDeleteConnector,
   showDelTip,
-  showDeleteWebhookAssociatedTip,
 } = useHandleConnectorItem()
 
 /* Webhook associated */

src/views/RuleEngine/Rule/Rule.vue

@@ -94,11 +94,6 @@
       </div>
     </div>
   </div>
-  <DeleteWebhookAssociatedTip
-    v-model="showDeleteWebhookAssociatedTip"
-    type="rule"
-    :name="currentDelId"
-  />
   <DeleteRuleConfirm v-model="showDeleteConfirm" :rule="currentRule" @submitted="handleDeleteSuc" />
 </template>
 
@@ -116,7 +111,6 @@ import type { Ref } from 'vue'
 import { onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
-import DeleteWebhookAssociatedTip from '../components/DeleteWebhookAssociatedTip.vue'
 import OperateWebhookAssociatedPopover from '../components/OperateWebhookAssociatedPopover.vue'
 import TableItemDropDown from '../components/TableItemDropDown.vue'
 import DeleteRuleConfirm from './components/DeleteRuleConfirm.vue'
@@ -175,8 +169,6 @@ const copyRuleItem = (rule: RuleItem) => {
   router.push({ name: 'rule-create', query: { target: rule.id, action: 'copy' } })
 }
 
-const currentDelId = ref('')
-const showDeleteWebhookAssociatedTip = ref(false)
 const { judgeIsWebhookRule } = useWebhookUtils()
 
 const showDeleteConfirm = ref(false)
@@ -187,8 +179,6 @@ const deleteRule = async (rule: RuleItem) => {
     return
   }
   if (judgeIsWebhookRule(rule)) {
-    currentDelId.value = id
-    showDeleteWebhookAssociatedTip.value = true
     return
   }
   currentRule.value = rule

src/views/RuleEngine/Rule/RuleDetail.vue

@@ -77,11 +77,6 @@
     </el-tabs>
     <CopySubmitDialog :target="copyTarget" v-model="showNameInputDialog" />
   </div>
-  <DeleteWebhookAssociatedTip
-    v-model="showDeleteWebhookAssociatedTip"
-    type="rule"
-    :name="currentDelId"
-  />
   <DeleteRuleConfirm v-model="showDeleteConfirm" :rule="currentRule" @submitted="handleDeleteSuc" />
 </template>
 
@@ -104,7 +99,6 @@ import { computed, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRoute, useRouter } from 'vue-router'
 import CopySubmitDialog from '../components/CopySubmitDialog.vue'
-import DeleteWebhookAssociatedTip from '../components/DeleteWebhookAssociatedTip.vue'
 import RuleForm from '../components/RuleForm.vue'
 import DeleteRuleConfirm from './components/DeleteRuleConfirm.vue'
 import RuleItemOverview from './components/RuleItemOverview.vue'
@@ -172,8 +166,6 @@ const enableOrDisableRule = async () => {
   }
 }
 
-const currentDelId = ref('')
-const showDeleteWebhookAssociatedTip = ref(false)
 const { judgeIsWebhookRule } = useWebhookUtils()
 
 /* Webhook associated */
@@ -188,8 +180,6 @@ const showDeleteConfirm = ref(false)
 const currentRule = ref<undefined | RuleItem>(undefined)
 const deleteRule = async () => {
   if (isWebhookRule.value) {
-    currentDelId.value = id
-    showDeleteWebhookAssociatedTip.value = true
     return
   }
   currentRule.value = ruleInfo.value