feat: add proxy-mirror plugin form #1725

LiteSun · 2021-04-09T04:44:14Z

Please answer these questions before submitting a pull request, or your PR will get closed.

Why submit this pull request?

Bugfix
New feature provided
Improve performance
Backport patches

What changes will this PR take into?

Add proxy-mirror plugin form

Related issues

Checklist:

Did you explain what problem does this PR solve? Or what new features have been added?
Have you added corresponding test cases?
Have you modified the corresponding document?
Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

codecov-io · 2021-04-09T06:25:28Z

Codecov Report

Merging #1725 (02baecd) into master (c68e2d2) will increase coverage by 0.06%.
The diff coverage is 100.00%.

❗ Current head 02baecd differs from pull request most recent head 2b13d81. Consider uploading reports for the commit 2b13d81 to get more accurate results

@@            Coverage Diff             @@
##           master    #1725      +/-   ##
==========================================
+ Coverage   72.01%   72.07%   +0.06%     
==========================================
  Files         160      161       +1     
  Lines        5820     5826       +6     
  Branches      651      652       +1     
==========================================
+ Hits         4191     4199       +8     
+ Misses       1385     1383       -2     
  Partials      244      244

Flag	Coverage Δ
backend-e2e-test	`62.30% <ø> (ø)`
backend-e2e-test-ginkgo	`49.29% <ø> (+0.22%)`	⬆️
backend-unit-test	`52.29% <ø> (ø)`
frontend-e2e-test	`72.68% <100.00%> (+0.13%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
web/src/components/Plugin/UI/plugin.tsx	`69.23% <100.00%> (+5.59%)`	⬆️
web/src/components/Plugin/UI/proxy-mirror.tsx	`100.00% <100.00%> (ø)`
web/src/components/Plugin/PluginDetail.tsx	`59.54% <0.00%> (+1.52%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c68e2d2...2b13d81. Read the comment docs.

membphis · 2021-04-09T10:11:13Z

Can you provide a screenshot of the effect?

LiteSun · 2021-04-09T11:30:01Z

Can you provide a screenshot of the effect?

sure.

juzhiyuan

#1724

juzhiyuan · 2021-04-10T14:17:59Z

Please file a new PR to update the Drawer:

i18n
Form Style

LiteSun · 2021-04-11T03:36:52Z

Please file a new PR to update the Drawer:

i18n

Form Style

updated.

web/cypress/integration/consumer/create-consumer-with-proxy-mirror-form.spec.js

moonming · 2021-04-12T00:07:22Z

web/cypress/integration/consumer/create-consumer-with-proxy-mirror-form.spec.js

+  const data = {
+    correctHost: 'http://127.0.0.1',
+    wrongHost: '127.0.0.1:1999'
+  }


Please write directly in the test case, not this layer of data structure

TBH, I think it's more intuitive to write it this way.

moonming · 2021-04-12T00:07:46Z

web/cypress/integration/consumer/create-consumer-with-proxy-mirror-form.spec.js

+    wrongHost: '127.0.0.1:1999'
+  }
+
+  it('creates consumer with proxy-mirror form', function () {


why we need consumer？

web/cypress/support/commands.js

web/src/components/Plugin/UI/plugin.tsx

moonming · 2021-04-12T00:13:30Z

web/src/components/Plugin/locales/zh-CN.ts

@@ -21,4 +21,7 @@ export default {
  'component.step.select.pluginTemplate.select.option': '手动配置',
  'component.plugin.pluginTemplate.tip1': '1. 若路由已配置插件，则插件模板数据将与已配置的插件数据合并。',
  'component.plugin.pluginTemplate.tip2': '2. 插件模板相同的插件会覆盖掉原有的插件。',
+
+  // proxxy-mirror
+  'component.pluginForm.proxy-mirror.host.tooltip': '指定镜像服务地址，例如：http://127.0.0.1:9797（地址中需要包含 schema ：http或https，不能包含 URI 部分）',


You should add judgment on the front end

Here is tip for user

the front-end will do a schema check on the data entered by the user

moonming · 2021-04-12T00:15:49Z

web/cypress/integration/consumer/create-consumer-with-proxy-mirror-form.spec.js

+    cy.contains(this.domSelector.pluginCard, 'key-auth').within(() => {
+      cy.contains('Enable').click({
+        force: true,
+      });
+    });
+    cy.focused(this.domSelector.drawer).should('exist');
+    cy.get(this.domSelector.disabledSwitcher).click();
+    // edit codemirror
+    cy.get(this.domSelector.codeMirror)
+      .first()
+      .then((editor) => {
+        editor[0].CodeMirror.setValue(
+          JSON.stringify({
+            key: 'test',
+          }),
+        );
+        cy.contains('button', 'Submit').click();
+      });
+


why we need key-auth plugin？

This is because an authentication plugin is required when creating a Consumer.

web/src/components/Plugin/locales/zh-CN.ts

netlify · 2021-04-12T14:15:36Z

Deploy preview for apisix-dashboard ready!

Built with commit 43a6890

https://deploy-preview-1725--apisix-dashboard.netlify.app

juzhiyuan

As you could see, we only have one field host here, but with the same contents 3 times. It's ok to update them in a new PR, GitHub Action is too slow to run..

web/src/components/Plugin/UI/proxy-mirror.tsx

web/src/components/Plugin/locales/en-US.ts

web/src/components/Plugin/locales/zh-CN.ts

juzhiyuan · 2021-04-14T09:16:15Z

web/src/components/Plugin/UI/proxy-mirror.tsx

+      <Form.Item
+        label="host"
+        name="host"
+        extra={formatMessage({ id: 'component.pluginForm.proxy-mirror.host.extra' })}


Because we have tooltip, so we don't need this extra.

LiteSun added 3 commits April 9, 2021 12:41

feat: add proxy-mirror form

1acb995

feat: update

8136c15

fix: ci

11bf7f9

LiteSun added 2 commits April 9, 2021 15:12

feat: update ci

f02d0c5

fix: ci

28ba08f

LiteSun requested review from juzhiyuan, liuxiran, bzp2010, Jaycean and imjoey April 9, 2021 08:58

feat: add proxy-mirror plugin form

457dccb

LiteSun added 2 commits April 9, 2021 19:28

fix: ci

2b743e1

fix: lint

2b71a7e

LiteSun and others added 2 commits April 9, 2021 20:40

fix: ci

f10c60a

Merge branch 'master' into proxy-mirror-form

ae5a3dc

LiteSun added the plugin form label Apr 9, 2021

juzhiyuan approved these changes Apr 9, 2021

View reviewed changes

LiteSun added 8 commits April 10, 2021 10:50

test: update

0d7b781

fix: ci unstable

81e1107

Merge branch 'fix-fe-ci' into proxy-mirror-form

f0b596c

fix: ci

3f3045c

fix: ci

4c59311

fix: ci

8143999

fix: ci

34c9921

Merge branch 'fix-fe-ci' into proxy-mirror-form

12b5500

bzp2010 approved these changes Apr 10, 2021

View reviewed changes

LiteSun added 3 commits April 11, 2021 11:33

feat: update i18n

54d1ccd

Merge remote-tracking branch 'upstream/master' into proxy-mirror-form

d84d919

fix: lint

814892b

Merge branch 'master' into proxy-mirror-form

2b5df55

membphis approved these changes Apr 11, 2021

View reviewed changes

moonming requested changes Apr 12, 2021

View reviewed changes

juzhiyuan reviewed Apr 12, 2021

View reviewed changes

web/src/components/Plugin/locales/zh-CN.ts Show resolved Hide resolved

LiteSun mentioned this pull request Apr 12, 2021

Provide better field, field descriptions for UIForm #1724

Open

3 tasks

LiteSun added 2 commits April 12, 2021 21:42

Merge branch 'master' into proxy-mirror-form

86ec8a6

feat: add rule tip

53e7ac3

LiteSun added 3 commits April 12, 2021 22:47

feat: udpate test case

2b13d81

test: add create-route-with-proxy-mirror-form.spec

dd5d849

feat: update

6191a40

LiteSun requested a review from moonming April 13, 2021 00:22

Merge branch 'master' into proxy-mirror-form

4b4ff42

juzhiyuan approved these changes Apr 14, 2021

View reviewed changes

moonming approved these changes Apr 14, 2021

View reviewed changes

Merge branch 'master' into proxy-mirror-form

43a6890

juzhiyuan merged commit 14166d9 into apache:master Apr 14, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add proxy-mirror plugin form #1725

feat: add proxy-mirror plugin form #1725

LiteSun commented Apr 9, 2021 •

edited

Loading

codecov-io commented Apr 9, 2021 •

edited

Loading

membphis commented Apr 9, 2021

LiteSun commented Apr 9, 2021

juzhiyuan left a comment

juzhiyuan commented Apr 10, 2021

LiteSun commented Apr 11, 2021

moonming Apr 12, 2021

LiteSun Apr 12, 2021

moonming Apr 12, 2021

moonming Apr 12, 2021

LiteSun Apr 12, 2021

moonming Apr 12, 2021

LiteSun Apr 12, 2021

netlify bot commented Apr 12, 2021 •

edited

Loading

juzhiyuan left a comment

juzhiyuan Apr 14, 2021

feat: add proxy-mirror plugin form #1725

feat: add proxy-mirror plugin form #1725

Conversation

LiteSun commented Apr 9, 2021 • edited Loading

codecov-io commented Apr 9, 2021 • edited Loading

Codecov Report

membphis commented Apr 9, 2021

LiteSun commented Apr 9, 2021

juzhiyuan left a comment

Choose a reason for hiding this comment

juzhiyuan commented Apr 10, 2021

LiteSun commented Apr 11, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

netlify bot commented Apr 12, 2021 • edited Loading

juzhiyuan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LiteSun commented Apr 9, 2021 •

edited

Loading

codecov-io commented Apr 9, 2021 •

edited

Loading

netlify bot commented Apr 12, 2021 •

edited

Loading