From 808a081e6d29956bb21a50b5ec828563704942c4 Mon Sep 17 00:00:00 2001
From: juzhiyuan <juzhiyuan@apache.org>
Date: Thu, 18 Feb 2021 13:12:05 +0800
Subject: [PATCH 1/2] feat: added tip for Plugin module

---
 web/src/components/Plugin/PluginPage.tsx   | 12 ++++++++++++
 web/src/components/Plugin/locales/en-US.ts | 20 ++++++++++++++++++++
 web/src/components/Plugin/locales/zh-CN.ts | 20 ++++++++++++++++++++
 web/src/locales/en-US.ts                   |  2 ++
 web/src/locales/zh-CN.ts                   |  2 ++
 5 files changed, 56 insertions(+)
 create mode 100644 web/src/components/Plugin/locales/en-US.ts
 create mode 100644 web/src/components/Plugin/locales/zh-CN.ts

diff --git a/web/src/components/Plugin/PluginPage.tsx b/web/src/components/Plugin/PluginPage.tsx
index 6798f5f623..e5404fbd67 100644
--- a/web/src/components/Plugin/PluginPage.tsx
+++ b/web/src/components/Plugin/PluginPage.tsx
@@ -18,6 +18,7 @@ import React, { useEffect, useState } from 'react';
 import { Anchor, Layout, Card, Button } from 'antd';
 import { PanelSection } from '@api7-dashboard/ui';
 import { omit, orderBy } from 'lodash';
+import { useIntl } from 'umi';
 
 import PluginDetail from './PluginDetail';
 import { fetchList } from './service';
@@ -54,6 +55,8 @@ const PluginPage: React.FC<Props> = ({
   type = 'scoped',
   onChange = () => {},
 }) => {
+  const { formatMessage } = useIntl();
+
   const [pluginList, setPluginList] = useState<PluginComponent.Meta[]>([]);
   const [name, setName] = useState<string>(NEVER_EXIST_PLUGIN_FLAG);
   const [typeList, setTypeList] = useState<string[]>([]);
@@ -101,6 +104,15 @@ const PluginPage: React.FC<Props> = ({
         </Anchor>
       </Sider>
       <Content style={{ padding: '0 10px', backgroundColor: '#fff', minHeight: 1400 }}>
+        {formatMessage({ id: 'component.plugin.tip1' })}
+        <a
+          href="https://github.com/apache/apisix-dashboard/blob/master/docs/FAQ.md#4-after-modifying-the-plugin-schema-or-creating-a-custom-plugin-in-apache-apisix-why-cant-i-find-it-on-the-dashboard"
+          target="_blank"
+          rel="noreferrer"
+        >
+          {formatMessage({ id: 'component.plugin.tip2' })}
+        </a>
+        <br />
         {typeList.map((typeItem) => {
           return (
             <PanelSection
diff --git a/web/src/components/Plugin/locales/en-US.ts b/web/src/components/Plugin/locales/en-US.ts
new file mode 100644
index 0000000000..8690c6ee1a
--- /dev/null
+++ b/web/src/components/Plugin/locales/en-US.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+export default {
+  'component.plugin.tip1': 'After customizing the plugin, you need to update schema.json.',
+  'component.plugin.tip2': 'How to update?',
+};
diff --git a/web/src/components/Plugin/locales/zh-CN.ts b/web/src/components/Plugin/locales/zh-CN.ts
new file mode 100644
index 0000000000..b91e6ac15f
--- /dev/null
+++ b/web/src/components/Plugin/locales/zh-CN.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+export default {
+  'component.plugin.tip1': '自定义插件后（修改、新增、删除等），需更新 schema.json。',
+  'component.plugin.tip2': '如何更新？',
+};
diff --git a/web/src/locales/en-US.ts b/web/src/locales/en-US.ts
index 3ca50eb651..887df00f37 100644
--- a/web/src/locales/en-US.ts
+++ b/web/src/locales/en-US.ts
@@ -23,6 +23,7 @@ import pwa from './en-US/pwa';
 import settingDrawer from './en-US/settingDrawer';
 import settings from './en-US/setting';
 import PluginOrchestration from '../components/PluginOrchestration/locales/en-US';
+import Plugin from '../components/Plugin/locales/en-US';
 
 export default {
   'navBar.lang': 'Languages',
@@ -38,4 +39,5 @@ export default {
   ...component,
   ...ActionBarEnUS,
   ...PluginOrchestration,
+  ...Plugin,
 };
diff --git a/web/src/locales/zh-CN.ts b/web/src/locales/zh-CN.ts
index 030cbcb47d..c7989e2a23 100644
--- a/web/src/locales/zh-CN.ts
+++ b/web/src/locales/zh-CN.ts
@@ -23,6 +23,7 @@ import pwa from './zh-CN/pwa';
 import settingDrawer from './zh-CN/settingDrawer';
 import settings from './zh-CN/setting';
 import PluginOrchestration from '../components/PluginOrchestration/locales/zh-CN';
+import Plugin from '../components/Plugin/locales/zh-CN';
 
 export default {
   'navBar.lang': '语言',
@@ -38,4 +39,5 @@ export default {
   ...component,
   ...ActionBarZhCN,
   ...PluginOrchestration,
+  ...Plugin,
 };

From 009919527acd6a0266ec5190ed89af1aeb6a5ab5 Mon Sep 17 00:00:00 2001
From: juzhiyuan <juzhiyuan@apache.org>
Date: Thu, 18 Feb 2021 13:14:23 +0800
Subject: [PATCH 2/2] feat: added tip for Plugin module

---
 web/src/components/Plugin/PluginPage.tsx   | 18 +++++++++---------
 web/src/components/Plugin/locales/en-US.ts |  2 +-
 web/src/components/Plugin/locales/zh-CN.ts |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/web/src/components/Plugin/PluginPage.tsx b/web/src/components/Plugin/PluginPage.tsx
index e5404fbd67..a8a811733a 100644
--- a/web/src/components/Plugin/PluginPage.tsx
+++ b/web/src/components/Plugin/PluginPage.tsx
@@ -104,15 +104,6 @@ const PluginPage: React.FC<Props> = ({
         </Anchor>
       </Sider>
       <Content style={{ padding: '0 10px', backgroundColor: '#fff', minHeight: 1400 }}>
-        {formatMessage({ id: 'component.plugin.tip1' })}
-        <a
-          href="https://github.com/apache/apisix-dashboard/blob/master/docs/FAQ.md#4-after-modifying-the-plugin-schema-or-creating-a-custom-plugin-in-apache-apisix-why-cant-i-find-it-on-the-dashboard"
-          target="_blank"
-          rel="noreferrer"
-        >
-          {formatMessage({ id: 'component.plugin.tip2' })}
-        </a>
-        <br />
         {typeList.map((typeItem) => {
           return (
             <PanelSection
@@ -170,6 +161,15 @@ const PluginPage: React.FC<Props> = ({
             </PanelSection>
           );
         })}
+        <br />
+        {formatMessage({ id: 'component.plugin.tip1' })}
+        <a
+          href="https://github.com/apache/apisix-dashboard/blob/master/docs/FAQ.md#4-after-modifying-the-plugin-schema-or-creating-a-custom-plugin-in-apache-apisix-why-cant-i-find-it-on-the-dashboard"
+          target="_blank"
+          rel="noreferrer"
+        >
+          {formatMessage({ id: 'component.plugin.tip2' })}
+        </a>
       </Content>
     </>
   );
diff --git a/web/src/components/Plugin/locales/en-US.ts b/web/src/components/Plugin/locales/en-US.ts
index 8690c6ee1a..00e968950b 100644
--- a/web/src/components/Plugin/locales/en-US.ts
+++ b/web/src/components/Plugin/locales/en-US.ts
@@ -15,6 +15,6 @@
  * limitations under the License.
  */
 export default {
-  'component.plugin.tip1': 'After customizing the plugin, you need to update schema.json.',
+  'component.plugin.tip1': 'NOTE: After customizing the plugin, you need to update schema.json.',
   'component.plugin.tip2': 'How to update?',
 };
diff --git a/web/src/components/Plugin/locales/zh-CN.ts b/web/src/components/Plugin/locales/zh-CN.ts
index b91e6ac15f..d4d9b6464a 100644
--- a/web/src/components/Plugin/locales/zh-CN.ts
+++ b/web/src/components/Plugin/locales/zh-CN.ts
@@ -15,6 +15,6 @@
  * limitations under the License.
  */
 export default {
-  'component.plugin.tip1': '自定义插件后（修改、新增、删除等），需更新 schema.json。',
+  'component.plugin.tip1': '注意：自定义插件后（修改、新增、删除等），需更新 schema.json。',
   'component.plugin.tip2': '如何更新？',
 };