You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ju...@apache.org on 2020/06/05 14:24:55 UTC
[incubator-apisix-dashboard] branch next updated: fix some issue
for creating route
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git
The following commit(s) were added to refs/heads/next by this push:
new 620162d fix some issue for creating route
620162d is described below
commit 620162d7f9feba757621c0fceea4eb8f39153c94
Author: juzhiyuan <jj...@gmail.com>
AuthorDate: Fri Jun 5 22:24:26 2020 +0800
fix some issue for creating route
---
src/app.tsx | 3 ++-
src/pages/Routes/List.tsx | 18 ++++++++++--------
src/pages/Routes/components/ResultView/ResultView.tsx | 5 +----
src/pages/Routes/service.ts | 2 +-
src/pages/Routes/transform.ts | 8 ++++----
src/pages/Routes/typing.d.ts | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/app.tsx b/src/app.tsx
index be1c18c..6faa1f1 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -68,7 +68,8 @@ const codeMessage = {
const errorHandler = (error: { response: Response; data: any }): Promise<Response> => {
const { response } = error;
if (response && response.status) {
- const errorText = error.data.message || error.data.error_msg || codeMessage[response.status];
+ const errorText =
+ error.data.msg || error.data.message || error.data.error_msg || codeMessage[response.status];
notification.error({
message: `请求错误，错误码： ${error.data.errorCode || response.status}`,
diff --git a/src/pages/Routes/List.tsx b/src/pages/Routes/List.tsx
index cc6d6dc..3ff532f 100644
--- a/src/pages/Routes/List.tsx
+++ b/src/pages/Routes/List.tsx
@@ -13,18 +13,20 @@ const RouteList: React.FC = () => {
const columns: ProColumns<ListItem<RouteModule.BaseData>>[] = [
{
- title: 'ID',
- dataIndex: 'id',
- sortOrder: 'descend',
- hideInSearch: true,
- },
- {
title: '名称',
dataIndex: 'name',
},
{
+ title: '优先级',
+ dataIndex: 'priority',
+ },
+ {
title: '描述',
- dataIndex: 'desc',
+ dataIndex: 'description',
+ },
+ {
+ title: '更新时间',
+ dataIndex: 'update_time',
},
{
title: '操作',
@@ -61,7 +63,7 @@ const RouteList: React.FC = () => {
<PageHeaderWrapper>
<ProTable<ListItem<RouteModule.BaseData>>
actionRef={ref}
- rowKey="id"
+ rowKey="name"
request={() => fetchRouteList()}
columns={columns}
search={false}
diff --git a/src/pages/Routes/components/ResultView/ResultView.tsx b/src/pages/Routes/components/ResultView/ResultView.tsx
index 3297040..d975695 100644
--- a/src/pages/Routes/components/ResultView/ResultView.tsx
+++ b/src/pages/Routes/components/ResultView/ResultView.tsx
@@ -5,7 +5,7 @@ type Props = {
onReset?(): void;
};
-const ResultView: React.FC<Props> = ({ onReset }) => (
+const ResultView: React.FC<Props> = () => (
<Result
status="success"
title="提交成功"
@@ -17,9 +17,6 @@ const ResultView: React.FC<Props> = ({ onReset }) => (
>
返回路由列表
</Button>,
- <Button key="create" onClick={onReset}>
- 创建新路由
- </Button>,
]}
/>
);
diff --git a/src/pages/Routes/service.ts b/src/pages/Routes/service.ts
index a7e5b5c..495188a 100644
--- a/src/pages/Routes/service.ts
+++ b/src/pages/Routes/service.ts
@@ -10,7 +10,7 @@ export const createRoute = (data: Pick<RouteModule.Data, 'data'>) =>
export const updateRoute = (rid: number, data: Pick<RouteModule.Data, 'data'>, wid = 0) =>
request(`/workspaces/${wid}/routes/${rid}`, {
- method: 'PUT',
+ method: 'POST',
data: transformStepData(data),
});
diff --git a/src/pages/Routes/transform.ts b/src/pages/Routes/transform.ts
index 008e41e..6b7a813 100644
--- a/src/pages/Routes/transform.ts
+++ b/src/pages/Routes/transform.ts
@@ -15,7 +15,7 @@ export const transformStepData = ({
let redirect: RouteModule.Redirect = {};
if (step1Data.forceHttps) {
- redirect = { redirect_to_https: true };
+ redirect = { http_to_https: true };
} else if (step1Data.redirectURI !== '') {
redirect = {
code: step1Data.redirectCode,
@@ -66,10 +66,9 @@ export const transformStepData = ({
}
// 未启用 redirect
- if (!redirect.uri && !redirect.redirect_to_https) {
+ if (!redirect.uri) {
// 移除前端部分自定义变量
return omit(data, [
- 'redirect',
'advancedMatchingRules',
'upstreamHostList',
'upstreamPath',
@@ -79,6 +78,7 @@ export const transformStepData = ({
'redirectURI',
'redirectCode',
'forceHttps',
+ Object.keys(redirect).length === 0 ? 'redirect' : '',
]);
}
@@ -120,7 +120,7 @@ export const transformRouteData = (data: RouteModule.Body) => {
paths: uris,
methods,
advancedMatchingRules: transformVarsToRules(vars),
- forceHttps: Boolean(redirect.redirect_to_https),
+ forceHttps: Boolean(redirect.http_to_https),
};
if (redirect.uri) {
diff --git a/src/pages/Routes/typing.d.ts b/src/pages/Routes/typing.d.ts
index a19273b..98b921c 100644
--- a/src/pages/Routes/typing.d.ts
+++ b/src/pages/Routes/typing.d.ts
@@ -82,7 +82,7 @@ declare namespace RouteModule {
type Redirect = {
code?: number;
uri?: string;
- redirect_to_https?: boolean;
+ http_to_https?: boolean;
};
// Request Body or Response Data for API