Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/server/docker-compose.common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions src/apis/secrets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
});

Expand Down
4 changes: 2 additions & 2 deletions src/components/form/Editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -132,7 +132,7 @@ export const FormItemEditor = <T extends FieldValues>(
)}
<Editor
wrapperProps={{
className: clsx(
className: cx(
'editor-wrapper',
restField.disabled && 'editor-wrapper--disabled'
),
Expand Down
3 changes: 2 additions & 1 deletion vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ export default defineConfig({
// as an example, if you want to use the e2e server as the api server,
proxy: {
[API_PREFIX]: {
target: 'http://localhost:6174',
target:
process.env.APISIX_ADMIN_URL || 'http://localhost:9180',
changeOrigin: true,
},
},
Expand Down
Loading