diff --git a/e2e/server/docker-compose.common.yml b/e2e/server/docker-compose.common.yml index 7296533699..dcd26b18c5 100644 --- a/e2e/server/docker-compose.common.yml +++ b/e2e/server/docker-compose.common.yml @@ -27,7 +27,7 @@ services: - apisix etcd: - image: bitnami/etcd:3.5 + image: bitnamilegacy/etcd:3.5.11 restart: always volumes: - etcd_data:/bitnami/etcd diff --git a/src/apis/secrets.ts b/src/apis/secrets.ts index 46ec643494..df077738ad 100644 --- a/src/apis/secrets.ts +++ b/src/apis/secrets.ts @@ -42,10 +42,14 @@ export const getSecretListReq = (req: AxiosInstance, params: PageSearchType) => params, }) .then((v) => { - const { list, ...rest } = v.data; + const data = v.data; + const rawList = data?.list; + const parsedList = Array.isArray(rawList) + ? rawList.map(preParseSecretItem) + : []; return { - ...rest, - list: list.map(preParseSecretItem), + total: typeof data?.total === 'number' ? data.total : 0, + list: parsedList, }; }); diff --git a/src/components/form/Editor.tsx b/src/components/form/Editor.tsx index d2832d3354..b846f94de0 100644 --- a/src/components/form/Editor.tsx +++ b/src/components/form/Editor.tsx @@ -16,7 +16,7 @@ */ import { InputWrapper, type InputWrapperProps, Skeleton } from '@mantine/core'; import { Editor } from '@monaco-editor/react'; -import clsx from 'clsx'; +import cx from 'clsx'; import { useEffect, useMemo, useRef, useState } from 'react'; import { type FieldValues, @@ -132,7 +132,7 @@ export const FormItemEditor = ( )}