From 261ecc258abe13b57386ea7a67a43dafe9343179 Mon Sep 17 00:00:00 2001 From: beanlee Date: Thu, 30 Apr 2020 10:29:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(config):=20=E6=96=B0=E5=A2=9E=20prettie?= =?UTF-8?q?rrc=20=E7=A1=AE=E4=BF=9D=E6=9C=AC=E5=9C=B0=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC=E4=B8=80=E8=87=B4=EF=BC=9B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20ts-server=20=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=81=BF=E5=85=8D=20?= =?UTF-8?q?import=20--jsx=20no-set=20=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/rocketact-web-console/.prettierrc | 4 ++++ packages/rocketact-web-console/tsconfig-server.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 packages/rocketact-web-console/.prettierrc diff --git a/packages/rocketact-web-console/.prettierrc b/packages/rocketact-web-console/.prettierrc new file mode 100644 index 0000000..8d95c2d --- /dev/null +++ b/packages/rocketact-web-console/.prettierrc @@ -0,0 +1,4 @@ +{ + "semi": true, + "singleQuote": false +} diff --git a/packages/rocketact-web-console/tsconfig-server.json b/packages/rocketact-web-console/tsconfig-server.json index 09c9b7c..dbe903a 100644 --- a/packages/rocketact-web-console/tsconfig-server.json +++ b/packages/rocketact-web-console/tsconfig-server.json @@ -10,7 +10,7 @@ // ] /* Specify library files to be included in the compilation. */, // "allowJs": true, /* Allow javascript files to be compiled. */ // "checkJs": true, /* Report errors in .js files. */ - // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ + "jsx": "react", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ // "declaration": true, /* Generates corresponding '.d.ts' file. */ // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ // "sourceMap": true /* Generates corresponding '.map' file. */, From a214cb7e920856af71ea04fbcfcd118f0997fffd Mon Sep 17 00:00:00 2001 From: beanlee Date: Thu, 30 Apr 2020 11:03:26 +0800 Subject: [PATCH 2/4] fix(client): ignore ts-check --- .../src/client/components/ProxyRulesTable.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/rocketact-web-console/src/client/components/ProxyRulesTable.tsx b/packages/rocketact-web-console/src/client/components/ProxyRulesTable.tsx index 4b9a9e2..f1914e1 100644 --- a/packages/rocketact-web-console/src/client/components/ProxyRulesTable.tsx +++ b/packages/rocketact-web-console/src/client/components/ProxyRulesTable.tsx @@ -1,3 +1,4 @@ +// @ts-nocheck import React from "react"; import { Table, Switch } from "antd"; From e5c3e2f50b27ca5542fe1a14b3c15bb21eb3982d Mon Sep 17 00:00:00 2001 From: beanlee Date: Thu, 30 Apr 2020 11:19:56 +0800 Subject: [PATCH 3/4] feat(webconsole): add button to toggle all proxy rules enable or not --- packages/rocketact-web-console/package.json | 2 +- .../src/client/api/index.ts | 7 +++++ .../src/client/routes/apiProxy.tsx | 27 +++++++++++++++++++ .../src/server/proxyAPI.ts | 13 +++++++++ 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/packages/rocketact-web-console/package.json b/packages/rocketact-web-console/package.json index df24e3a..ff85010 100644 --- a/packages/rocketact-web-console/package.json +++ b/packages/rocketact-web-console/package.json @@ -1,6 +1,6 @@ { "name": "rocketact-web-console", - "version": "1.1.8", + "version": "1.1.9", "description": "Rocketact Web Console", "main": "index.js", "keywords": [ diff --git a/packages/rocketact-web-console/src/client/api/index.ts b/packages/rocketact-web-console/src/client/api/index.ts index 6361da2..75b4034 100644 --- a/packages/rocketact-web-console/src/client/api/index.ts +++ b/packages/rocketact-web-console/src/client/api/index.ts @@ -113,6 +113,12 @@ function updateProxyRule(ruleId: string, rule: IProxyRule) { .then(handleResponse); } +function toggleAllProxyRuleEnable(enabled: boolean) { + return axios + .put(`${API_BASE}/api-proxy/rules/enable`, { enabled }) + .then(handleResponse); +} + function toggleProxyRuleState(ruleId: string, enabled: boolean) { return axios .put(`${API_BASE}/api-proxy/rule/${ruleId}/enabled`, { enabled }) @@ -138,5 +144,6 @@ export { deleteProxyRule, updateProxyRule, toggleProxyRuleState, + toggleAllProxyRuleEnable, moveProxyRule }; diff --git a/packages/rocketact-web-console/src/client/routes/apiProxy.tsx b/packages/rocketact-web-console/src/client/routes/apiProxy.tsx index 834f45e..d8409d1 100644 --- a/packages/rocketact-web-console/src/client/routes/apiProxy.tsx +++ b/packages/rocketact-web-console/src/client/routes/apiProxy.tsx @@ -5,6 +5,8 @@ import ProxyRulesTabel from "../components/ProxyRulesTable"; const JSONInput = require("react-json-editor-ajrm/index").default; import { Button, Modal, Select, Input, message } from "antd"; +const ButtonGroup = Button.Group; + export interface IProxyRule { ruleId: string; match: string; @@ -52,6 +54,7 @@ class APIProxyRoute extends React.Component< this.modify = this.modify.bind(this); this.toggleState = this.toggleState.bind(this); this.move = this.move.bind(this); + this.toggleAllEnable = this.toggleAllEnable.bind(this); } componentDidMount() { @@ -78,6 +81,18 @@ class APIProxyRoute extends React.Component< }); } + toggleAllEnable(enabled: boolean) { + API.toggleAllProxyRuleEnable(enabled).then(() => { + this.setState({ + rules: this.state.rules.map(rule => { + return Object.assign({}, rule, { + enabled + }); + }) + }); + }); + } + modify(ruleId: string) { this.setState({ showRuleEditorModal: !this.state.showRuleEditorModal, @@ -142,6 +157,18 @@ class APIProxyRoute extends React.Component< > Create new rule +    + + + +

{ }); }); +/** + * modify the enabled of all rules + */ +proxyAPI.put("/rules/enable", (req, res) => { + ruleCache = ruleCache.map(rule => { + return Object.assign({}, rule, { enabled: req.body.enabled }); + }); + + res.json({ + success: true + }); +}); + /** * modify detail info of specific rule */ From 4ff413cb9b45c396a2791fbf1000e49556a3ab48 Mon Sep 17 00:00:00 2001 From: beanlee Date: Thu, 30 Apr 2020 18:02:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix(webconsole):=20=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=A1=B5=E5=8A=A0=E8=BD=BD=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/rocketact-web-console/package.json | 2 +- .../src/client/routes/dependencies.tsx | 6 ++++++ .../rocketact-web-console/src/client/stores/dependencies.ts | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/rocketact-web-console/package.json b/packages/rocketact-web-console/package.json index ff85010..562cd69 100644 --- a/packages/rocketact-web-console/package.json +++ b/packages/rocketact-web-console/package.json @@ -1,6 +1,6 @@ { "name": "rocketact-web-console", - "version": "1.1.9", + "version": "1.1.10", "description": "Rocketact Web Console", "main": "index.js", "keywords": [ diff --git a/packages/rocketact-web-console/src/client/routes/dependencies.tsx b/packages/rocketact-web-console/src/client/routes/dependencies.tsx index dde9508..98d8cbf 100644 --- a/packages/rocketact-web-console/src/client/routes/dependencies.tsx +++ b/packages/rocketact-web-console/src/client/routes/dependencies.tsx @@ -52,6 +52,12 @@ class Dependencies extends React.Component< this.refreshOnClosePackageInstaller = false; } + componentDidMount() { + if (this.props.store.main && this.props.store.main.length === 0) { + dependenciesStore.refresh(); + } + } + remove(name: string) { globalLoadingStore.show(`Removing ${name}...`); API.uninstall(name) diff --git a/packages/rocketact-web-console/src/client/stores/dependencies.ts b/packages/rocketact-web-console/src/client/stores/dependencies.ts index 551322d..0a29fb6 100644 --- a/packages/rocketact-web-console/src/client/stores/dependencies.ts +++ b/packages/rocketact-web-console/src/client/stores/dependencies.ts @@ -108,5 +108,5 @@ const store = observable( } ); -store.refresh(); +// store.refresh(); export default store;