Merge pull request #2813 from emqx/dev/1.9.2

Sync code from refs/heads/dev/1.9.2 to enterprise
emqx · Jul 12, 2024 · 2710b41 · 2710b41
2 parents f068898 + 173e6e4
commit 2710b41
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/src/types/schemas/authentication.schemas.ts b/src/types/schemas/authentication.schemas.ts
@@ -1225,6 +1225,8 @@ export const AuthnJwtJwksMechanism = {
   jwt: 'jwt',
 } as const
 
+export type AuthnJwtJwksHeaders = { [key: string]: any }
+
 export type AuthnJwtJwksUseJwks = typeof AuthnJwtJwksUseJwks[keyof typeof AuthnJwtJwksUseJwks]
 
 // eslint-disable-next-line @typescript-eslint/no-redeclare
@@ -1235,6 +1237,7 @@ export const AuthnJwtJwksUseJwks = {
 export interface AuthnJwtJwks {
   use_jwks: AuthnJwtJwksUseJwks
   endpoint: string
+  headers?: AuthnJwtJwksHeaders
   pool_size?: number
   refresh_interval?: number
   ssl?: EmqxSslClientOpts

diff --git a/src/types/schemas/gatewayAuthentication.schemas.ts b/src/types/schemas/gatewayAuthentication.schemas.ts
@@ -1126,6 +1126,8 @@ export const AuthnJwtJwksMechanism = {
   jwt: 'jwt',
 } as const
 
+export type AuthnJwtJwksHeaders = { [key: string]: any }
+
 export type AuthnJwtJwksUseJwks = typeof AuthnJwtJwksUseJwks[keyof typeof AuthnJwtJwksUseJwks]
 
 // eslint-disable-next-line @typescript-eslint/no-redeclare
@@ -1136,6 +1138,7 @@ export const AuthnJwtJwksUseJwks = {
 export interface AuthnJwtJwks {
   use_jwks: AuthnJwtJwksUseJwks
   endpoint: string
+  headers?: AuthnJwtJwksHeaders
   pool_size?: number
   refresh_interval?: number
   ssl?: EmqxSslClientOpts

diff --git a/src/types/schemas/gatewayListeners.schemas.ts b/src/types/schemas/gatewayListeners.schemas.ts
@@ -1825,6 +1825,8 @@ export const AuthnJwtJwksMechanism = {
   jwt: 'jwt',
 } as const
 
+export type AuthnJwtJwksHeaders = { [key: string]: any }
+
 export type AuthnJwtJwksUseJwks = typeof AuthnJwtJwksUseJwks[keyof typeof AuthnJwtJwksUseJwks]
 
 // eslint-disable-next-line @typescript-eslint/no-redeclare
@@ -1835,6 +1837,7 @@ export const AuthnJwtJwksUseJwks = {
 export interface AuthnJwtJwks {
   use_jwks: AuthnJwtJwksUseJwks
   endpoint: string
+  headers?: AuthnJwtJwksHeaders
   pool_size?: number
   refresh_interval?: number
   ssl?: EmqxSslClientOpts

diff --git a/src/views/Clients/ClientDetails.vue b/src/views/Clients/ClientDetails.vue
@@ -298,7 +298,7 @@ const clientsOrganizied = {
       'connected_at',
       'disconnected_at',
     ],
-    session: ['subscriptions', 'mqueue', 'inflight', 'heap_size', 'reductions'],
+    session: ['subscriptions', 'heap_size', 'reductions'],
     bytes: ['recv_oct', 'send_oct'],
     packets: ['recv_cnt', 'send_cnt', 'recv_pkt'],
     messages: ['send_lw_pkt'],
@@ -330,7 +330,7 @@ const clientsOrganizied = {
       'connected_at',
       'disconnected_at',
     ],
-    session: ['subscriptions', 'mqueue', 'inflight', 'heap_size', 'reductions'],
+    session: ['subscriptions', 'heap_size', 'reductions'],
     bytes: ['recv_oct', 'send_oct'],
     packets: ['recv_cnt', 'send_cnt', 'recv_pkt', 'send_pkt'],
     messages: [],

diff --git a/src/views/Gateway/Gateway.vue b/src/views/Gateway/Gateway.vue
@@ -191,6 +191,7 @@ export default defineComponent({
 
 <style lang="scss">
 .gateway {
+  padding-bottom: 24px;
   .el-table {
     .status {
       color: #00b299;