feat: add rawDataEditor #1601

LiteSun · 2021-03-16T11:46:25Z

Please answer these questions before submitting a pull request

Why submit this pull request?
Bugfix
New feature provided
Improve performance
Backport patches
Related issues
Resolves support to show raw data for Route, Upstream, Service and so on #1399

Bugfix

Description
How to fix?

New feature or improvement

Describe the details and related test reports.

Please add the corresponding test cases if necessary.

Backport patches

Why need to backport?
Source branch
Related commits and pull requests
Target branch

codecov-io · 2021-03-16T14:13:07Z

Codecov Report

Merging #1601 (2f4bf52) into master (76f083a) will increase coverage by 1.38%.
The diff coverage is 73.91%.

@@            Coverage Diff             @@
##           master    #1601      +/-   ##
==========================================
+ Coverage   72.32%   73.70%   +1.38%     
==========================================
  Files         134       87      -47     
  Lines        5647     2620    -3027     
  Branches      651      665      +14     
==========================================
- Hits         4084     1931    -2153     
+ Misses       1319      689     -630     
+ Partials      244        0     -244

Flag	Coverage Δ
backend-e2e-test	`?`
backend-e2e-test-ginkgo	`?`
backend-unit-test	`?`
frontend-e2e-test	`73.70% <73.91%> (-0.03%)`	⬇️

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

Impacted Files	Coverage Δ
...pages/Route/components/Step1/MatchingRulesView.tsx	`52.74% <ø> (ø)`
web/src/components/RawDataEditor/RawDataEditor.tsx	`37.73% <31.57%> (-15.21%)`	⬇️
web/src/pages/Consumer/List.tsx	`90.00% <94.44%> (+4.81%)`	⬆️
web/src/pages/Route/List.tsx	`84.51% <94.44%> (+1.41%)`	⬆️
web/src/pages/Service/List.tsx	`97.43% <94.44%> (+1.28%)`	⬆️
web/src/pages/Upstream/List.tsx	`90.00% <94.44%> (+4.81%)`	⬆️
web/src/constants.ts	`100.00% <100.00%> (ø)`
web/src/pages/Route/service.ts	`88.88% <100.00%> (+0.65%)`	⬆️
web/src/helpers.tsx	`77.04% <0.00%> (-3.28%)`	⬇️
api/cmd/manager/main.go
... and 49 more

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 76f083a...2f4bf52. Read the comment docs.

…ator-apisix-dashboard into feat-rawDataEditor

juzhiyuan · 2021-03-19T12:54:42Z

also cc @guoqqqi to review

web/cypress/integration/rawDataEditor/test-rawDataEditor.spec.js

liuxiran · 2021-03-20T16:39:18Z

in my local env, there is a problem:

test steps:

raw edit a route, change the code mirror mode to yaml, submit
create with editor, cancel
raw edit a route, you will see the problem.

it would be better to recover the code mirror mode to json when open the raw data editor.

juzhiyuan · 2021-03-20T16:42:56Z

cc @LiteSun to check

LiteSun · 2021-03-21T00:46:54Z

in my local env, there is a problem:

test steps:

raw edit a route, change the code mirror mode to yaml, submit

create with editor, cancel

raw edit a route, you will see the problem.

it would be better to recover the code mirror mode to json when open the raw data editor.

ok, many thanks. I will fix it.

web/src/components/RawDataEditor/RawDataEditor.tsx

juzhiyuan · 2021-03-21T05:39:08Z

web/cypress/integration/rawDataEditor/test-rawDataEditor.spec.js

+    const domSelector = this.domSelector;
+    menuList.forEach(function (item) {
+      cy.visit('/');
+      cy.contains(item).click();


get is faster than contain? @guoqqqi

No, after many tests I found that it is not.

juzhiyuan

also cc @guoqqqi to review this PR (feature & test)

web/src/components/RawDataEditor/RawDataEditor.tsx

web/src/pages/Route/typing.d.ts

web/src/pages/Service/service.ts

web/src/pages/Upstream/service.ts

web/src/pages/Service/service.ts

liuxiran · 2021-03-21T15:19:16Z

for the be e2e errors, may need @nic-chen @starsz @Jaycean help

Jaycean · 2021-03-21T16:51:00Z

for the be e2e errors, may need @nic-chen @starsz @Jaycean help

This is APISIX delete consumer.id Error caused by field incompatibility, @nic-chen has been created PR #1638 repaired it, waiting for merge repair.

nic-chen · 2021-03-21T23:55:48Z

for the be e2e errors, may need @nic-chen @starsz @Jaycean help

This is APISIX delete consumer.id Error caused by field incompatibility, @nic-chen has been created PR #1638 repaired it, waiting for merge repair.

yes, please help review PR #1638

LiteSun · 2021-03-22T01:37:01Z

Just sync master branch code and all CI passed. Please review when you have time.😆 @nic-chen @starsz @bzp2010

starsz · 2021-03-22T02:37:50Z

Just sync master branch code and all CI passed. Please review when you have time.😆 @nic-chen @starsz @bzp2010

Sorry, I can't review the frontend PR.

LiteSun · 2021-03-22T03:11:17Z

ping~ @Jaycean @bzp2010

LiteSun · 2021-03-22T04:06:53Z

Thanks to all the reviewers ~

LiteSun added 3 commits March 16, 2021 19:45

feat: add rawDataEditor in route

bb88802

feat: update consumer service upstream rawDataEditor

e7e03b5

feat: update

cdde5c5

LiteSun added 2 commits March 17, 2021 14:42

feat: FE testcase

fa4ffa3

fix: lint

a5263cc

LiteSun marked this pull request as ready for review March 18, 2021 01:05

Merge branch 'master' into feat-rawDataEditor

064f45e

LiteSun marked this pull request as draft March 18, 2021 09:11

LiteSun added 3 commits March 18, 2021 17:17

fix: e2e testcase

71b9a21

feat: update

7dc6b39

fix: lint

29c4d14

LiteSun marked this pull request as ready for review March 19, 2021 02:55

LiteSun and others added 3 commits March 19, 2021 10:59

Merge branch 'master' into feat-rawDataEditor

3a6362c

feat: update route

2ab8ba3

Merge branch 'feat-rawDataEditor' of https://github.com/LiteSun/incub…

553344c

…ator-apisix-dashboard into feat-rawDataEditor

nic-chen requested review from juzhiyuan, liuxiran, bzp2010 and imjoey March 19, 2021 10:40

liuxiran reviewed Mar 20, 2021

View reviewed changes

web/cypress/integration/rawDataEditor/test-rawDataEditor.spec.js Outdated Show resolved Hide resolved

LiteSun added 3 commits March 21, 2021 11:00

fix: codeMirrorMode error

cdc24f2

feat: update rawDateEditor testcase

9f88681

Merge branch 'master' into feat-rawDataEditor

8fcf661

juzhiyuan reviewed Mar 21, 2021

View reviewed changes

web/src/components/RawDataEditor/RawDataEditor.tsx Show resolved Hide resolved

juzhiyuan reviewed Mar 21, 2021

View reviewed changes

guoqqqi reviewed Mar 21, 2021

View reviewed changes

web/src/components/RawDataEditor/RawDataEditor.tsx Show resolved Hide resolved

web/src/pages/Route/typing.d.ts Outdated Show resolved Hide resolved

web/src/pages/Service/service.ts Outdated Show resolved Hide resolved

web/src/pages/Upstream/service.ts Outdated Show resolved Hide resolved

feat: format codes

eb7116f

juzhiyuan approved these changes Mar 21, 2021

View reviewed changes

LiteSun requested review from nic-chen and starsz March 21, 2021 10:53

liuxiran reviewed Mar 21, 2021

View reviewed changes

web/src/pages/Service/service.ts Outdated Show resolved Hide resolved

LiteSun added 2 commits March 21, 2021 21:34

feat: filter delete fields when open editor

152a76a

fix: lint

2f4bf52

liuxiran approved these changes Mar 21, 2021

View reviewed changes

Merge branch 'master' into feat-rawDataEditor

5a60669

LiteSun changed the title ~~feat: add rawDataEditor in route~~ feat: add rawDataEditor Mar 22, 2021

LiteSun requested a review from Jaycean March 22, 2021 03:11

bzp2010 approved these changes Mar 22, 2021

View reviewed changes

Jaycean approved these changes Mar 22, 2021

View reviewed changes

LiteSun merged commit 548bbe3 into apache:master Mar 22, 2021

LiteSun deleted the feat-rawDataEditor branch March 22, 2021 04:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add rawDataEditor #1601

feat: add rawDataEditor #1601

LiteSun commented Mar 16, 2021 •

edited

Loading

codecov-io commented Mar 16, 2021 •

edited

Loading

juzhiyuan commented Mar 19, 2021

liuxiran commented Mar 20, 2021

juzhiyuan commented Mar 20, 2021

LiteSun commented Mar 21, 2021

juzhiyuan Mar 21, 2021

guoqqqi Mar 21, 2021

juzhiyuan Mar 21, 2021

juzhiyuan left a comment

liuxiran commented Mar 21, 2021

Jaycean commented Mar 21, 2021

nic-chen commented Mar 21, 2021

LiteSun commented Mar 22, 2021 •

edited

Loading

starsz commented Mar 22, 2021

LiteSun commented Mar 22, 2021

LiteSun commented Mar 22, 2021

feat: add rawDataEditor #1601

feat: add rawDataEditor #1601

Conversation

LiteSun commented Mar 16, 2021 • edited Loading

Bugfix

New feature or improvement

Please add the corresponding test cases if necessary.

Backport patches

codecov-io commented Mar 16, 2021 • edited Loading

Codecov Report

juzhiyuan commented Mar 19, 2021

liuxiran commented Mar 20, 2021

juzhiyuan commented Mar 20, 2021

LiteSun commented Mar 21, 2021

juzhiyuan Mar 21, 2021

Choose a reason for hiding this comment

guoqqqi Mar 21, 2021

Choose a reason for hiding this comment

juzhiyuan Mar 21, 2021

Choose a reason for hiding this comment

juzhiyuan left a comment

Choose a reason for hiding this comment

liuxiran commented Mar 21, 2021

Jaycean commented Mar 21, 2021

nic-chen commented Mar 21, 2021

LiteSun commented Mar 22, 2021 • edited Loading

starsz commented Mar 22, 2021

LiteSun commented Mar 22, 2021

LiteSun commented Mar 22, 2021

LiteSun commented Mar 16, 2021 •

edited

Loading

codecov-io commented Mar 16, 2021 •

edited

Loading

LiteSun commented Mar 22, 2021 •

edited

Loading