Merge remote-tracking branch 'origin/enterprise-2.2.x' into enterprise

Author: Kinplemelon

package.json

@@ -19,9 +19,9 @@
   "dependencies": {
     "@element-plus/icons-vue": "^1.1.0",
     "@emqx/shared-ui-components": "~0.0.17",
-    "@emqx/shared-ui-constants": "~0.0.10",
-    "@emqx/shared-ui-i18n": "~0.0.74",
-    "@emqx/shared-ui-utils": "~0.0.25",
+    "@emqx/shared-ui-constants": "~0.0.11",
+    "@emqx/shared-ui-i18n": "~0.0.78",
+    "@emqx/shared-ui-utils": "~0.0.26",
     "@highlightjs/vue-plugin": "^2.1.0",
     "@vue-flow/core": "^1.20.1",
     "ajv": "^8.17.1",

pnpm-lock.yaml

@@ -23,11 +23,11 @@ export const getGlobalCertBundleInfo = (name: string): Promise<CertBundleInfo> =
 
 export const deleteGlobalCertBundle = (
   name: string,
-  options?: { kind?: CertKind; forceDelete?: boolean },
+  options?: { kind?: CertKind },
 ): Promise<void> => {
-  const { kind, forceDelete } = options ?? {}
+  const { kind } = options ?? {}
   return http.delete(`/certs/global/name/${encodeURIComponent(name)}`, {
-    params: { kind, ...(forceDelete ? { force_delete: true } : {}) },
+    params: { kind },
     errorsHandleCustom: CERT_CUSTOM_ERRORS,
   })
 }
@@ -57,13 +57,13 @@ export const getNamespaceCertBundleInfo = (
 export const deleteNamespaceCertBundle = (
   namespace: string,
   name: string,
-  options?: { kind?: CertKind; forceDelete?: boolean },
+  options?: { kind?: CertKind },
 ): Promise<void> => {
-  const { kind, forceDelete } = options ?? {}
+  const { kind } = options ?? {}
   return http.delete(
     `/certs/ns/${encodeURIComponent(namespace)}/name/${encodeURIComponent(name)}`,
     {
-      params: { kind, ...(forceDelete ? { force_delete: true } : {}) },
+      params: { kind },
       errorsHandleCustom: CERT_CUSTOM_ERRORS,
     },
   )

src/api/tlsManagement.ts

@@ -360,6 +360,7 @@ export const SEARCH_FORM_RES_PROPS = { sm: 12, md: 12, lg: 6 }
 const defaultUnexposedConfig = {
   zone: 'default',
   access_rules: ['allow all'],
+  allow_log_packet_data_from: '',
   enable_authn: true,
 }
 

src/common/constants.ts

@@ -1,21 +1,11 @@
 import type { DashboardScopes, UnsetScopes } from '@/types/systemModule'
 
 export const UNSET_SCOPES: UnsetScopes = 'unset'
-export const LEGACY_UNSET_SCOPES = UNSET_SCOPES
 
 export const isUnsetScopes = (scopes: unknown): scopes is UnsetScopes => scopes === UNSET_SCOPES
 
-export const isLegacyUnsetScopes = isUnsetScopes
-
 export const normalizeScopes = (scopes: DashboardScopes): string[] | undefined =>
   Array.isArray(scopes) ? scopes : undefined
 
 export const hasSelectedScopes = (scopes: DashboardScopes): scopes is string[] =>
   Array.isArray(scopes) && scopes.length > 0
-
-export const sanitizeScopesForSubmit = <T extends { scopes?: DashboardScopes }>(data: T): T => {
-  if (!Array.isArray(data.scopes) || data.scopes.length === 0) {
-    delete data.scopes
-  }
-  return data
-}

src/common/scopes.ts

@@ -32,7 +32,6 @@
     v-model="isInUseDialogShow"
     :referencing-configs="certInUseError?.referencingConfigs"
     is-cert-file
-    @force-delete="handleForceDelete"
   />
 </template>
 
@@ -147,7 +146,7 @@ const isSubmitting = ref(false)
 const isInUseDialogShow = ref(false)
 const certInUseError = ref<CertInUseError | null>(null)
 
-const { submitCertBundle, removeUselessCerts, forceRemoveCerts } = useCertBundle()
+const { submitCertBundle, removeUselessCerts } = useCertBundle()
 
 const finishSubmit = () => {
   const message = isEditing.value ? t('Base.updateSuccess') : t('Base.createSuccess')
@@ -165,7 +164,7 @@ const submit = async () => {
       try {
         await removeUselessCerts(formData.value, initialFormData)
       } catch (removeError: any) {
-        if (removeError?.failedKinds) {
+        if (removeError?.referencingConfigs) {
           certInUseError.value = removeError
           isInUseDialogShow.value = true
           return
@@ -180,16 +179,4 @@ const submit = async () => {
     isSubmitting.value = false
   }
 }
-
-const handleForceDelete = async () => {
-  if (!certInUseError.value) {
-    return
-  }
-  try {
-    await forceRemoveCerts(formData.value, certInUseError.value.failedKinds)
-    finishSubmit()
-  } catch (error) {
-    //
-  }
-}
 </script>

src/components/TLSConfig/CertBundleDrawer.vue

@@ -37,23 +37,20 @@
     <template v-if="confMethod === CertBundleType.Regular">
       <el-form-item prop="chain" label="TLS Cert">
         <CertFileInput
-          class="TLS-input"
           v-model="record.chain"
           :is-edit="isEditing"
           :placeholder="t('Base.certPlaceholder')"
         />
       </el-form-item>
       <el-form-item prop="key" label="TLS Key">
         <CertFileInput
-          class="TLS-input"
           v-model="record.key"
           :is-edit="isEditing"
           :placeholder="t('Base.keyFilePlaceholder')"
         />
       </el-form-item>
       <el-form-item prop="key_password" :label="t('Base.keyPassword')">
         <CertFileInput
-          class="TLS-input"
           v-model="record.key_password"
           :is-edit="isEditing"
           :placeholder="t('Base.keyFilePlaceholder')"
@@ -72,7 +69,6 @@
 
     <el-form-item v-else prop="acc_key" :label="t('Base.acmeKey')">
       <CertFileInput
-        class="TLS-input"
         v-model="record.acc_key"
         :is-edit="isEditing"
         :accept="`${CER_FILE_ACCEPTS},.json`"
@@ -81,7 +77,6 @@
 
     <el-form-item prop="ca" label="CA Cert">
       <CertFileInput
-        class="TLS-input"
         v-model="record.ca"
         :is-edit="isEditing"
         :placeholder="t('Base.certPlaceholder')"

src/components/TLSConfig/CertBundleForm.vue

@@ -29,9 +29,6 @@
     </ul>
     <template #footer>
       <CancelButton @click="isVisible = false" />
-      <el-button type="danger" @click="handleForceDelete">
-        {{ tl('forceDelete') }}
-      </el-button>
     </template>
   </el-dialog>
 </template>
@@ -58,7 +55,6 @@ const props = defineProps<{
 
 const emit = defineEmits<{
   (e: 'update:modelValue', value: boolean): void
-  (e: 'forceDelete'): void
 }>()
 
 const { tl } = useI18nTl('BasicConfig')
@@ -196,11 +192,6 @@ const moduleGroups = computed((): RefGroup[] => {
     },
   )
 })
-
-const handleForceDelete = () => {
-  isVisible.value = false
-  emit('forceDelete')
-}
 </script>
 
 <style lang="scss">

src/components/TLSConfig/CertBundleInUseDialog.vue

@@ -78,6 +78,9 @@ export default (
     'required_acks',
     'partition_count_refresh_interval',
     'max_inflight',
+    'max_batch_age',
+    'max_retries',
+    'reconnect_delay',
     'query_mode',
     'sync_query_timeout',
     'buffer',
@@ -383,7 +386,7 @@ export default (
       fieldStartIndex,
     ),
     [BridgeType.BigQuery]: createOrderObj(
-      getPathArrInParameters(['dataset', 'table']),
+      getPathArrInParameters(['project_id', 'dataset', 'table']),
       fieldStartIndex,
     ),
     [BridgeType.Bigtable]: createOrderObj(

src/hooks/Rule/bridge/useSchemaBridgePropsLayout.ts

@@ -65,6 +65,7 @@ export default (
     'allow_auto_topic_creation',
     'min_metadata_refresh_interval',
     'metadata_request_timeout',
+    'request_timeout',
     'socket_opts.sndbuf',
     'socket_opts.recbuf',
     'socket_opts.tcp_keepalive',