自己可以禁用安装的插件以及全局禁用插件的样式改动

Author: veedrin

app/dashboard/api/axios.js

@@ -28,7 +28,9 @@ axios.get = (url, overrideHeaders = {}) => {
         credentials: 'include',
         headers: { ...headers, ...overrideHeaders },
     }).then(res => {
-        return res.json();
+        if (res.status !== 204) {
+            return res.json();
+        }
     }).catch(err => {
         notify({ message: String(err), notifyType: NOTIFY_TYPE.ERROR });
     });

app/dashboard/api/plugin.js

@@ -1,7 +1,11 @@
 import axios from './axios';
 
-export const getEnablePlugin = () => {
-    return axios.get('/user-plugin/enable/list');
+export const getInstalledPlugin = () => {
+    return axios.get('/user-plugin/install/list');
+}
+
+export const getInstalledDisabledPlugin = () => {
+    return axios.get('/user-plugin/global_disable/list');
 }
 
 export const getBuiltinPlugin = () => {
@@ -32,12 +36,12 @@ export const uninstallPlugin = (data) => {
     return axios.put('/user-plugin/enable', data);
 }
 
-export const updatePluginVersion = (data) => {
-    return axios.post('/user-plugin/version', data);
+export const switchPluginEnable = ({ pluginId, status }) => {
+    return axios.put(`/user-plugin/enable_status?pluginId=${pluginId}&status=${status}`);
 }
 
-export const switchPluginEnable = (data) => {
-    return axios.put('/user-plugin/enable', data);
+export const updatePluginVersion = (data) => {
+    return axios.post('/user-plugin/version', data);
 }
 
 export const publishPlugin = (data) => {

app/dashboard/i18n/en_US/global.json

@@ -8,7 +8,7 @@
     "changelog": "Changelog",
     "plugin": "Plugin Management",
     "thirdparty": "Third Party",
-    "builtin": "Builtin",
+    "builtin": "Built-in",
     "mine": "Developed By Me",
     "tencentCloudDevPlatform": "Tencent Cloud Dev Platform",
     "devPlatform": "Dev Platform",
@@ -74,7 +74,5 @@
     "period": ".",
     "globalTip": "You have not set a username yet. Please set a username first, which will be your unique identifier on this platform.",
     "submitting": "Submitting...",
-    "eventStreamBulletin1": "Dear developer, due to ",
-    "eventStreamBulletin2": "[ event-stream package event ]",
-    "eventStreamBulletin3": " Impact, your plugin needs to manually delete the `yarn.lock` file and reinstall the dependencies, then push the code to release a new version or pre-release."
+    "remove": "Remove"
 }

app/dashboard/i18n/en_US/plugin.json

@@ -40,6 +40,7 @@
     "searchPlugin": "Search Plugins",
     "userCount": " person rating",
     "published": "Published",
+    "disabled": "Disabled",
     "newVersion": "New Version",
     "nowPrePublish": "You are currently using a Pre-Publish version. ",
     "status0": "Your plugin has not been published yet and is not visible to the outside world. You can publish the plugin by clicking「Publish」below.",
@@ -70,5 +71,8 @@
     "preStat3": "The last Pre-Publish build failed. ",
     "preStat3Click": "See details.",
     "preStat3Desc": "The last pre-publish build failed, you can modify the code and re-publish it. The build log is as follows:",
-    "preStat3Action": "Pre-Publish Again"
+    "preStat3Action": "Pre-Publish Again",
+    "pluginDisabled": "Disabled due to non-compliance",
+    "pluginDisabledStatus": "Your plugin has been disabled due to non-compliance.",
+    "pluginDisabledTip": "The plugin has been disabled and cannot be published."
 }

app/dashboard/i18n/zh_CN/global.json

@@ -74,7 +74,5 @@
     "period": "。",
     "globalTip": "您还没有设置用户名，请先设置用户名，该用户名将作为您在该平台上的唯一标识。",
     "submitting": "提交中...",
-    "eventStreamBulletin1": "尊敬的开发者，由于受 ",
-    "eventStreamBulletin2": "[ event-stream 包事件 ]",
-    "eventStreamBulletin3": " 影响，您的插件需要手动删除 `yarn.lock` 文件并重新安装依赖，再推送代码发布新版本或预发布。"
+    "remove": "移除"
 }

app/dashboard/i18n/zh_CN/plugin.json

@@ -18,8 +18,8 @@
     "creatingPlugin": "正在创建插件...",
     "hasPrePublish": "该插件已经预发布，您可以在自己的所有工作空间预览该插件。",
     "cancelPrePublish": "关闭预发布",
-    "cannotPublishForAuditing": "上次发布正在审核中，暂时无法发布",
-    "cannotPublishForBuilding": "上次发布正在构建中，暂时无法发布",
+    "cannotPublishForAuditing": "上次发布正在审核中，暂时无法发布。",
+    "cannotPublishForBuilding": "上次发布正在构建中，暂时无法发布。",
     "publishing": "正在发布...",
     "pluginSet": "插件设置",
     "basicSet": "基本设置",
@@ -40,6 +40,7 @@
     "searchPlugin": "搜索插件",
     "userCount": "人评分",
     "published": "已发布",
+    "disabled": "已被禁用",
     "newVersion": "新版本",
     "nowPrePublish": "您目前使用的是预发布版本。",
     "status0": "您的插件尚未发布版本，处于对外不可见状态，您可以点击下方「发布」来发布插件。",
@@ -70,5 +71,8 @@
     "preStat3": "上次预发布构建失败。",
     "preStat3Click": "查看详情",
     "preStat3Desc": "上次预发布构建失败，您可以修改代码后重新预发布。构建日志如下：",
-    "preStat3Action": "重新预发布"
+    "preStat3Action": "重新预发布",
+    "pluginDisabled": "该插件因不符合规范已被禁用",
+    "pluginDisabledStatus": "您的插件因不符合规范已被禁用。",
+    "pluginDisabledTip": "插件已被禁用，无法发布。"
 }

app/dashboard/share/switch/Switch.js

@@ -0,0 +1,37 @@
+import React, { PureComponent } from 'react';
+
+import './switch.css';
+
+class Switch extends PureComponent {
+    state = {
+        on: this.props.on,
+        loading: false,
+    }
+
+    render() {
+        const { loading } = this.state;
+        const { on } = this.props;
+        return (
+            <div className={`dash-switch${on ? ' on' : ''}${loading ? ' loading' : ''}`} onClick={this.handleClick}>
+                <div className="circle">
+                    <div className="moon"></div>
+                </div>
+            </div>
+        );
+    }
+
+    handleClick = () => {
+        const { on, handler } = this.props;
+        this.setState({ on, loading: true });
+        handler();
+    }
+
+    componentDidUpdate() {
+        const { on, loading } = this.state;
+        if (on !== this.props.on && loading) {
+            this.setState({ loading: false });
+        }
+    }
+}
+
+export default Switch;

app/dashboard/share/switch/index.js

@@ -0,0 +1,3 @@
+import Switch from './Switch';
+
+export default Switch;

app/dashboard/share/switch/switch.css

@@ -0,0 +1,58 @@
+.dash-switch {
+    width: 38px;
+    height: 18px;
+    border-radius: 9px;
+    background-color: #252526;
+    cursor: pointer;
+    transition: background-color .2s ease;
+    position: relative;
+}
+.dash-switch.loading {
+    background-color: #2d2d2d;
+}
+.dash-switch.on {
+    background-color: #337ab7;
+}
+.dash-switch.on.loading {
+    background-color: #37648c;
+}
+.dash-switch .circle {
+    width: 12px;
+    height: 12px;
+    border-radius: 50%;
+    background-color: #fff;
+    overflow: hidden;
+    transition: left .2s ease;
+    position: absolute;
+    top: 3px;
+    left: 3px;
+}
+.dash-switch.loading .circle {
+    background-color: #ccc;
+}
+.dash-switch.on .circle {
+    left: 23px;
+}
+.dash-switch .circle .moon {
+    display: none;
+    width: 10px;
+    height: 10px;
+    border: 2px solid;
+    border-color: #999 transparent transparent transparent;
+    border-radius: 50%;
+    animation: loading 1s linear infinite;
+    position: absolute;
+    top: 1px;
+    left: 1px;
+}
+.dash-switch.loading .circle .moon {
+    display: block;
+}
+@keyframes loading {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+}

app/dashboard/view/home/Home.js

@@ -24,7 +24,7 @@ class Home extends Component {
         super(props);
         this.state = {
             loaded: false,
-            isMaskOn: true,
+            isMaskOn: false,
             isBellOn: false,
             isProfileOn: false,
         };
@@ -34,7 +34,7 @@ class Home extends Component {
     render() {
         const { loaded, isMaskOn, isBellOn, isProfileOn } = this.state;
         const { isMbarOn, wsCount, hideMbar } = this.props;
-        if (loaded && isMaskOn) {
+        if (isMaskOn) {
             return <Mask />;
         }
         return (
@@ -59,13 +59,13 @@ class Home extends Component {
                         <NavLink className="nav-item" activeClassName="active" to="/dashboard/plugin">{i18n('global.plugin')}</NavLink>
                         <NavLink className="nav-item" activeClassName="active" to="/dashboard/setting">{i18n('global.setting')}</NavLink>
                     </div>
-                    {!isMaskOn && <Bell on={isBellOn} togglePanel={this.toggleBellPanel} />}
-                    {!isMaskOn && <Profile on={isProfileOn} togglePanel={this.toggleProfilePanel} />}
+                    {loaded && !isMaskOn && <Bell on={isBellOn} togglePanel={this.toggleBellPanel} />}
+                    {loaded && !isMaskOn && <Profile on={isProfileOn} togglePanel={this.toggleProfilePanel} />}
                 </div>
                 <div className="dash-main">
                     <Banner />
                     <div className="dash-view">
-                        {!isMaskOn && (
+                        {loaded && !isMaskOn && (
                             <Switch>
                                 <Route exact path="/dashboard/workspace" component={Workspace}></Route>
                                 <Route exact path="/dashboard/workspace/create" component={Create}></Route>
@@ -117,9 +117,10 @@ class Home extends Component {
             if (res.code === 0) {
                 if (!/^dtid_[a-z0-9]+/i.test(res.data.global_key)) {
                     this.props.logIn(res.data);
-                    this.setState({ isMaskOn: false });
                     // 获取工作空间数量信息
                     this.fetchWorkspaceCount();
+                } else {
+                    this.setState({ isMaskOn: true });
                 }
             } else {
                 window.top.postMessage({ path: '/intro' }, '*');