[incubator-apisix-dashboard] branch next updated: feat: remove workspaces

[ju...@apache.org]

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 1098228  feat: remove workspaces
1098228 is described below

commit 1098228d325e66e3f2bbd583b75803ad672b83c6
Author: juzhiyuan <jj...@gmail.com>
AuthorDate: Fri Jun 12 11:04:06 2020 +0800

    feat: remove workspaces
---
 src/components/PluginForm/transformer.ts |  1 -
 src/pages/Routes/service.ts              | 17 ++++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/components/PluginForm/transformer.ts b/src/components/PluginForm/transformer.ts
index 8300173..dddbac5 100644
--- a/src/components/PluginForm/transformer.ts
+++ b/src/components/PluginForm/transformer.ts
@@ -25,7 +25,6 @@ export const transformSchemaFromAPI = (
       ...schema,
       properties: {
         enabled: {
-          // TODO: i18n
           type: 'boolean',
           default: false,
         },
diff --git a/src/pages/Routes/service.ts b/src/pages/Routes/service.ts
index 9049d62..38150c4 100644
--- a/src/pages/Routes/service.ts
+++ b/src/pages/Routes/service.ts
@@ -2,24 +2,23 @@ import { request } from 'umi';
 
 import { transformStepData, transformRouteData } from './transform';
 
-export const createRoute = (data: Pick<RouteModule.Data, 'data'>, wid = 0) =>
-  request(`/workspaces/${wid}/routes`, {
+export const createRoute = (data: Pick<RouteModule.Data, 'data'>) =>
+  request(`/routes`, {
     method: 'POST',
     data: transformStepData(data),
   });
 
-export const updateRoute = (rid: number, data: Pick<RouteModule.Data, 'data'>, wid = 0) =>
-  request(`/workspaces/${wid}/routes/${rid}`, {
+export const updateRoute = (rid: number, data: Pick<RouteModule.Data, 'data'>) =>
+  request(`/routes/${rid}`, {
     method: 'PUT',
     data: transformStepData(data),
   });
 
-export const fetchRoute = (rid: number, wid = 0) =>
-  request(`/workspaces/${wid}/routes/${rid}`).then((data) => transformRouteData(data));
+export const fetchRoute = (rid: number) =>
+  request(`/routes/${rid}`).then((data) => transformRouteData(data));
 
-export const fetchRouteList = (wid = 0) => request(`/workspaces/${wid}/routes?page=1&size=100000`);
+export const fetchRouteList = () => request(`/routes?page=1&size=100000`);
 
-export const removeRoute = (rid: number, wid = 0) =>
-  request(`/workspaces/${wid}/routes/${rid}`, { method: 'DELETE' });
+export const removeRoute = (rid: number) => request(`/routes/${rid}`, { method: 'DELETE' });
 
 export const fetchPluginList = () => request('/plugins');