Skip to content

Commit

Permalink
Feat:added pluginChart (#415)
Browse files Browse the repository at this point in the history 
* merge master (#1)

* add: Determine duplicate names api for route & upstream (#305)

* fix: transaction in routes and upstreams (#306)

* add transaction for ssl and consumer (#308)

* update ci/cd for api (#307)

* update github actions for api ci cd

* fix: working-directory

* fix error

* fix: step name

* fix: mysql config for github action

* test

* use default config

* test: add e2e test for ssl and consumer (#309)

* test: add e2e test for ssl and consumer

* fix:  change assert to avoid  the mutual influence of route and service test

* remove useless code

* Feat: added Route Consumer and Upstream (#304)

* feat: added routes

* feat: added Consumer

* feat: added upstream

* feat: update SSL

* fix: routes

* feat: added commit command

* feat(route): set empty array for upstreamHeaderList

* fix: e2e test use the same function to set up router (#310)

* fix: return all objects when search route & upstream (#311)

* fix: route search

* fix: upstream search

* fix(deploy): added missing yarn.lock

* fix: proxy-rewrite plugin in upstream (#312)

* fix(SSL): search api

* docs: added tips when deployment

* feat(Deploy): use node alpine image

* fix(Route): set required field for custom redirect

* fix(Route): check if redirect is empty object

* fix(Deploy): add Python installation in dockerfile (#316)

Signed-off-by: imjoey <[email protected]>

* fix(Route): update desc for status code

* fix: proxy-path default type is static (#318)

* add proxyRewrite test (#319)

* feat: bump dependencies version (#320)

* feat(Deploy): update Dockerfile

* feat(Deploy): update Deploy Dockerfile

* feat(Pages): update pages (#324)

* feat(Pages): update pages

* chore: update routes

* fix(Route): omit upstream_id when not exist

* i18n consumer (#325)

* i18n ssl (#335)

* nationalization PluginPage component (#323)

* i18n upstream (#334)

* feat(i18n): set module (#336)

* i18n set

* change set to setting

* feat(i18n): metrics module (#326)

* i18n metrics

* combine import

* feat(i18n): route module (#327)

* i18n route

* combine import

* doc: sync config.yaml from the latest version of APISIX (#344)

* i18n route (#342)

* i18n actionbar (#343)

* fix: transform vars error (#347)

* feat(i18n): pluginpage component (#345)

* i18n pluginpage

* change pluginpage to PluginPage

* feature: support run in mac system (#349)

* combine import (#348)

* i18n menu (#351)

* i18n PluginPage (#350)

* feat: prepare to release (#352)

* feat(ManagerAPI): added ASF header

* feat(FE): aded ASF Header

* feat(FE): added ASF header

* fix(FE): update PluginDrawer

* feat: remove some images

* feat: added LICENSE

* feat: update Version

* feat: added NOTICE & CODE_OF_CONDUCT

* feat: added initial CHANGELOG

* feat: rename CODE_OF_CONDUCT

* feat: revert version

* feat: update LICENSE

* feat: update License

* feat(conf): update default preview API (#353)

* doc:  add install doc for manager-api (#355)

* doc: add install doc for manager-api

* doc: modify folder from build to run

* doc: add ASF header

* fix(ci): resolve lint failures (#354)

* fix(deploy): failed to start manager_api (#363)

Signed-off-by: imjoey <[email protected]>

* feat(i18n): modify some i18n according to the proposal#331 (#366)

* Create CONTRIBUTING.md (#368)

* Create CONTRIBUTING.md

* Create ISSUE_TEMPLATE

* Create PULL_REQUEST_TEMPLATE

* doc: remove all ‘incubator’ (#367)

* feat(deploy): set gen-config-yaml.sh executable (#362)

This also would simplify the docs.

Signed-off-by: imjoey <[email protected]>

* feat(i18n): Use auto load i18n (#332) (#371)

* Create ci.yml (#372)

* feat: release 1.5 (#364)

* Feat release 1.5 (#358)

* feat(doc): update README

* feat: update CHANGELOG

* doc: add usage of dashbaord

* Revert "doc: add usage of dashbaord"

This reverts commit 5a08c7f.

* feat(Doc): update deployment

* feat(Doc): update the deployment

* feat(Doc): update the deployment

* feat: remove incubator text

* doc: modify doc for manager-api runing in local

* feat(Doc): update README

* doc: check env variables and give run.sh power to execute

* feat(Doc): update Deployment

* feat(Doc): update deployment

* doc: modify manager-api build

* feat: update ignore file

Co-authored-by: kv <[email protected]>
Co-authored-by: 琚致远 <[email protected]>

* feat: cherry-pick 4fd0ce7

* feat(compose): remove images

* feat: added line

Co-authored-by: kv <[email protected]>
Co-authored-by: 琚致远 <[email protected]>

* feat: Unified access entrance, only the dashboard port is exposed to … (#370)

* feat: Unified access entrance, only the dashboard port is exposed to the outside

* add EOL

* docs: create I18N_USER_GUIDE.md (#373)

* docs: create I18N_USER_GUIDE.md

* docs: modify I18N_USER_GUIDE.md

* feat(Doc): added deploy doc for docker (#376)

* feat(Doc): added deploy doc for docker

* feat: added CD

* feat(Netlify): added proxy

* feat: update API

* feat: remove console

* feat(Netlify): update redirect rule

* feat: update README

* feat: update README

* update go module proxy (#378)

* Update README.md (#379)

* Update README.md

* Update README.md

* Create Preview.md

* feat(Doc): added snapshots for Preview

* feat(Doc): update images

* feat(Doc): update images

* Update README.md

* Update netlify.toml

* feat(route): route add params mapping feature (#375) (#377)

* feat(doc): update deploy manually doc

* fix: mv config.yml to config-default.yml in the latest version of apisix (#383)

* fix: wget config-default.yaml the output file need to be named config.yaml (#384)

* fix #386 wget special output file use -O (#387)

* feat(authentication): create authentication module (#330)

* feat(authentication): create module typing definition

* feat(authentication): create Login page

* feat(authentication): update typing definition

* feat(authentication): add centent to Login page

* feat(authentication): update typing definition

* feat(authentication): update Login page to add Password and Test method

* feat(authentication): update typing definition to add check and submit function

* feat(authentication): move Test login method to Example

* feat(authentication): add check and submit function

* feat(authentication): add submit function in Login page

* feat(authentication): add test to Password login method

* feat(authentication): change example LoginMethod text

* feat(authentication): add i18n content

* feat(authentication): redirect to index when login success

* feat(i18n): update i18n file import
remove import i18n file of user module manually and try auto import by umi.js

* feat(authentication): create authentication configure items

* fix(authentication): fix logging filter
write back request body for read by PostForm function

* feat(authentication): create authentication controller

* feat(authentication): update dependencies

* fix(authentication): fix logging filter

* feat(authentication): change to session for authentication

* feat(authentication): create authentication filter
use authentication filter to check every request

* feat(authentication): create unit test case

* fix(authentication): change HTTP code when authentication fail request

* feat(authentication): add jwt dependency

* feat(authentication): create session configures

* feat(authentication): change cookie-based session to jwt

* feat(authentication): change cors Access-Control-Allow-Headers header

* feat(authentication): change login page path and error handler

* feat(authentication): create request interceptor to add Authorization header

* feat(authentication): connect to backend login API and i18n

* feat(authentication): create logout page

* feat(authentication): add redirect query to back previous page

* feat(authentication): update LoginMethod definition for logout

* feat(authentication): add logout button

* feat(authentication): improve login page

* fix: clean codes

* fix(authentication): fix unit test crash

* feat(authentication): remove API url setting

* feat(authentication): improve session check

* feat(authentication): redirect to login page when not exist token

* fix: clean codes and add ASF header

* feat(User): update prefix

* fix(ci): fix preview environment (#388)

* fix README typo (#389)

* fix(ci): fix read configuration file path in docker (#390)

* doc: Introducing manager-api (#391)

* Update nginx.conf

* Update Dockerfile

* Revert "Update Dockerfile"

This reverts commit ea827bf.

* fix: preview mysql pwd was wrong (#393)

* README in Chinese (#398)

* feat(doc): added Chinese version of README

* fix(README.zh-CN.md): fix wrong link

* fix(README.zh-CN.md): add link to README.md

* fix(README.zh-CN.md): sync with README.md

* fix(README.zh-CN.md): Fix some translation errors

* fix: dashboard /user/login get error code 405 (#397)

* fix: fix dashboard /user/login get error code 405

* fix: modify nginx according to giphoo proposal

* fix(authentication): change Apache APISIX copyright (#401)

* fix: configure only necessary items, such as etcd host (#405)

* fix: configure only necessary items, such as etcd host

* fix: configure only necessary items, such as etcd host

* fix end of line

* fix: using default admin key (#408)

* fix:  we need conf.json when deploying manager-api in local  (#409)

* fix: we need conf.json when deploying manager-api in loal

* fix: log error when starting manager failed

* fix: click create ssl prestep not response (#407)

* fix: submit setting grafanaURl without validation (#413)

* feat: support generate `script` for APISIX (#411)

* feat: support generate `script` for APISIX

* not run in `/root` dir

* add  `config.yaml` for APISIX

* fix path

* fix(authentication): change login api url (#414)

* fix(authentication): change manager API login path

* fix(authentication): change authentication unit test

* fix(authentication): clean nginx.conf codes

* fix(authentication): change login URL of front end

* fix(authentication): change authentication filter rule

Co-authored-by: kv <[email protected]>
Co-authored-by: nic-chen <[email protected]>
Co-authored-by: 琚致远 <[email protected]>
Co-authored-by: juzhiyuan <[email protected]>
Co-authored-by: Joey <[email protected]>
Co-authored-by: bzp2010 <[email protected]>
Co-authored-by: TikWind <[email protected]>
Co-authored-by: Lien <[email protected]>
Co-authored-by: Rapiz <[email protected]>
Co-authored-by: liuxiran <[email protected]>
Co-authored-by: jie <[email protected]>
Co-authored-by: Rapiz <[email protected]>
Co-authored-by: 琚致远 <[email protected]>
Co-authored-by: Tusdasa翼 <[email protected]>
Co-authored-by: Shuyang Wu <[email protected]>
Co-authored-by: Baoyuan <[email protected]>

* feat: added pluginChart

* feat: update LICENSE

Co-authored-by: kv <[email protected]>
Co-authored-by: nic-chen <[email protected]>
Co-authored-by: 琚致远 <[email protected]>
Co-authored-by: juzhiyuan <[email protected]>
Co-authored-by: Joey <[email protected]>
Co-authored-by: bzp2010 <[email protected]>
Co-authored-by: TikWind <[email protected]>
Co-authored-by: Lien <[email protected]>
Co-authored-by: Rapiz <[email protected]>
Co-authored-by: liuxiran <[email protected]>
Co-authored-by: jie <[email protected]>
Co-authored-by: Rapiz <[email protected]>
Co-authored-by: 琚致远 <[email protected]>
Co-authored-by: Tusdasa翼 <[email protected]>
Co-authored-by: Shuyang Wu <[email protected]>
Co-authored-by: Baoyuan <[email protected]>
  • Loading branch information
@LiteSun @gxthrj
@nic-chen @juzhiyuan @imjoey @bzp2010 @TikWind @lilien1010 @liuxiran @jie123108 @rapiz1 @tusdasa @Yiyiyimu @Baoyuantop
17 people authored Aug 27, 2020
1 parent 9a2cd71 commit 4336873
Show file tree
Hide file tree
Showing 9 changed files with 5,165 additions and 4,511 deletions.
3 changes: 2 additions & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,5 @@ Apache 2.0 licenses
The following components are provided under the Apache 2.0 License. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.

files from dag-to-lua: https://github.com/api7/dag-to-lua Apache 2.0
files from dag-to-lua: https://github.com/api7/dag-to-lua Apache 2.0
files from api7-dashboard: https://github.com/api7/dashboard-components Apache 2.0
204 changes: 204 additions & 0 deletions licenses/LICENSE-api7-dashboard.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
Copyright (c) 2019 ShenZhen ZhiLiu Technology Co., Ltd
Copyright (c) 2017 Julien Desgats

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
4 changes: 4 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
"@ant-design/icons": "^4.0.0",
"@ant-design/pro-layout": "^6.0.0",
"@ant-design/pro-table": "^2.4.0",
"@api7-dashboard/plugin": "^1.0.0",
"@api7-dashboard/pluginchart": "^1.0.4",
"@api7-dashboard/ui": "^1.0.0",
"@rjsf/antd": "2.2.0",
"@rjsf/core": "2.2.0",
"antd": "^4.4.0",
Expand All @@ -67,6 +70,7 @@
"path-to-regexp": "2.4.0",
"qs": "^6.9.0",
"react": "^16.8.6",
"react-device-detect": "^1.12.1",
"react-dom": "^16.8.6",
"react-helmet-async": "^1.0.4",
"umi": "^3.1.2",
Expand Down
44 changes: 37 additions & 7 deletions src/pages/Route/Create.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { useIntl } from 'umi';

import ActionBar from '@/components/ActionBar';
import PluginPage from '@/components/PluginPage';
import { transformer as chartTransformer } from '@api7-dashboard/pluginchart';

import {
create,
Expand All @@ -32,11 +32,14 @@ import {
} from './service';
import Step1 from './components/Step1';
import Step2 from './components/Step2';
import Step3 from './components/Step3';

import CreateStep4 from './components/CreateStep4';
import {
DEFAULT_STEP_1_DATA,
DEFAULT_STEP_2_DATA,
DEFAULT_STEP_3_DATA,
INIT_CHART,
} from './constants';
import ResultView from './components/ResultView';
import styles from './Create.less';
Expand All @@ -50,12 +53,19 @@ type Props = {
};

const Page: React.FC<Props> = (props) => {

const { formatMessage } = useIntl();

const STEP_HEADER_2 = [formatMessage({ id: 'route.constants.define.api.request' }), formatMessage({ id: 'route.constants.preview' })];
const STEP_HEADER_2 = [
formatMessage({ id: 'route.constants.define.api.request' }),
formatMessage({ id: 'route.constants.preview' }),
];

const STEP_HEADER_4 = [formatMessage({ id: 'route.constants.define.api.request' }), formatMessage({ id: 'route.constants.define.api.backend.serve' }), formatMessage({ id: 'route.constants.plugin.configuration' }), formatMessage({ id: 'route.constants.preview' })];
const STEP_HEADER_4 = [
formatMessage({ id: 'route.constants.define.api.request' }),
formatMessage({ id: 'route.constants.define.api.backend.serve' }),
formatMessage({ id: 'route.constants.plugin.configuration' }),
formatMessage({ id: 'route.constants.preview' }),
];

const [step1Data, setStep1Data] = useState(DEFAULT_STEP_1_DATA);
const [step2Data, setStep2Data] = useState(DEFAULT_STEP_2_DATA);
Expand All @@ -69,6 +79,8 @@ const Page: React.FC<Props> = (props) => {
const [step, setStep] = useState(1);
const [stepHeader, setStepHeader] = useState(STEP_HEADER_4);

const [chart, setChart] = useState(INIT_CHART);

const routeData = {
step1Data,
step2Data,
Expand Down Expand Up @@ -154,9 +166,16 @@ const Page: React.FC<Props> = (props) => {

if (step === 3) {
return (
<PluginPage
data={routeData.step3Data.plugins}
onChange={(data) => setStep3Data({ plugins: data })}
<Step3
data={routeData.step3Data}
onChange={({ mode, data }) => {
if (mode === 'NORMAL') {
setStep3Data({ plugins: data, script: {} });
setChart(INIT_CHART);
} else {
setChart(data);
}
}}
/>
);
}
Expand Down Expand Up @@ -185,6 +204,15 @@ const Page: React.FC<Props> = (props) => {
}
};

const savePlugins = () => {
if (Object.keys(chart.nodes).length) {
const transformChart = chartTransformer(chart);
setStep3Data({ script: { ...transformChart, chart }, plugins: {} });
} else {
setStep3Data({ ...step3Data, script: {} });
}
};

if (nextStep === 1) {
setStep(nextStep);
}
Expand All @@ -202,6 +230,7 @@ const Page: React.FC<Props> = (props) => {
});
});
} else {
savePlugins();
setStep(nextStep);
}
return;
Expand All @@ -220,6 +249,7 @@ const Page: React.FC<Props> = (props) => {
}

if (nextStep === 4) {
savePlugins();
setStep(nextStep);
}

Expand Down
54 changes: 54 additions & 0 deletions src/pages/Route/components/Step3/index.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import React, { useState } from 'react';
import { Radio, Tooltip } from 'antd';
import { QuestionCircleOutlined } from '@ant-design/icons';
import { isChrome } from 'react-device-detect';
import { PluginPage, PluginPageType } from '@api7-dashboard/plugin';
import PluginChart from '@api7-dashboard/pluginchart';

type Props = {
data: PluginPageType.PluginData;
onChange(data: PluginPageType.PluginData): void;
};

type Mode = 'NORMAL' | 'DRAW';

const Page: React.FC<Props> = ({ data, onChange }) => {
const { plugins = {}, script = {} } = data;

// NOTE: Currently only compatible with chrome
const type = Object.keys(script).length === 0 || !isChrome ? 'NORMAL' : 'DRAW';
const [mode, setMode] = useState<Mode>(type);

return (
<>
<div style={{ display: 'flex', alignItems: 'center' }}>
<Radio.Group
value={mode}
onChange={(e) => {
setMode(e.target.value);
}}
>
<Radio.Button value="NORMAL">普通模式</Radio.Button>
<Radio.Button value="DRAW" disabled={!isChrome}>
插件编排
</Radio.Button>
</Radio.Group>
{Boolean(!isChrome) && (
<div style={{ marginLeft: '10px' }}>
<Tooltip placement="right" title="插件编排仅支持 Chorme 浏览器">
<QuestionCircleOutlined />
</Tooltip>
</div>
)}
</div>
{Boolean(mode === 'NORMAL') && (
<PluginPage data={plugins} onChange={(item) => onChange({ mode, data: item })} />
)}
{Boolean(mode === 'DRAW') && (
<PluginChart data={script.chart} onChange={(item) => onChange({ mode, data: item })} />
)}
</>
);
};

export default Page;
Loading

0 comments on commit 4336873

Please sign in to comment.