Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(fe): import and export routes #1240

Merged
merged 28 commits into from
Jan 28, 2021
Merged

Conversation

liuxiran
Copy link
Contributor

@liuxiran liuxiran commented Jan 7, 2021

Please answer these questions before submitting a pull request


Export routes

  1. add Export OpenApi3.0 button at the footer of the route list

2021-01-08 10-22-08屏幕截图

2021-01-08 10-23-10屏幕截图

  1. support choose export file type

2021-01-08 10-26-37屏幕截图

  1. download file APISIX_routes_${moment().format('YYYYMMDDHHmmss')}.json/yaml

Import routes

  1. add Import OpenApi button at the toolbar of the route list
    image

  2. click import button, a modal show up

image

  1. upload list when import successfully

@liuxiran liuxiran marked this pull request as draft January 7, 2021 17:05
@juzhiyuan juzhiyuan added this to the 2.4 milestone Jan 7, 2021
@imjoey
Copy link
Member

imjoey commented Jan 8, 2021

@liuxiran great work. Thank you very much. Only a small piece of advice, it would be more friendly to non-Chinese developers if you could take the screenshot of the English version. 😄

@liuxiran
Copy link
Contributor Author

liuxiran commented Jan 8, 2021

@liuxiran great work. Thank you very much. Only a small piece of advice, it would be more friendly to non-Chinese developers if you could take the screenshot of the English version.

thanks a lot, the screenshots in the issue descirption have been updated ^_^

@codecov-io
Copy link

codecov-io commented Jan 8, 2021

Codecov Report

Merging #1240 (2507fa8) into master (6ee8dd1) will increase coverage by 0.27%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1240      +/-   ##
==========================================
+ Coverage   65.48%   65.75%   +0.27%     
==========================================
  Files          44       44              
  Lines        2929     2929              
==========================================
+ Hits         1918     1926       +8     
+ Misses        782      771      -11     
- Partials      229      232       +3     
Impacted Files Coverage Δ
api/internal/utils/closer.go 33.33% <0.00%> (ø)
api/internal/core/store/store.go 87.27% <0.00%> (+1.21%) ⬆️
api/internal/core/storage/etcd.go 50.50% <0.00%> (+2.02%) ⬆️
api/cmd/managerapi.go 60.29% <0.00%> (+5.88%) ⬆️

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 6ee8dd1...2507fa8. Read the comment docs.

@liuxiran liuxiran force-pushed the import_export_fe branch 2 times, most recently from 1cd72ad to 071b708 Compare January 11, 2021 18:34
@liuxiran liuxiran changed the title feat(fe): export routes feat(fe): import and export routes Jan 12, 2021
@liuxiran liuxiran force-pushed the import_export_fe branch 2 times, most recently from 827f955 to b325571 Compare January 13, 2021 09:03
@liuxiran liuxiran marked this pull request as ready for review January 13, 2021 09:03
@juzhiyuan
Copy link
Member

yarn.lock should be forced push IMO.

@liuxiran
Copy link
Contributor Author

yarn.lock should be forced push IMO.

trying to update yarn.lock

web/src/pages/Route/locales/zh-CN.ts Outdated Show resolved Hide resolved
web/src/pages/Route/List.tsx Outdated Show resolved Hide resolved
web/src/pages/Route/List.tsx Outdated Show resolved Hide resolved
web/src/pages/Route/List.tsx Outdated Show resolved Hide resolved
web/src/pages/Route/List.tsx Outdated Show resolved Hide resolved
@liuxiran
Copy link
Contributor Author

https://github.com/apache/apisix-dashboard/pull/1240/checks?check_run_id=1700366308

be skywalking e2e test failed, pls take a look when you have time, many thanks~! @nic-chen @starsz

@starsz
Copy link
Contributor

starsz commented Jan 14, 2021

https://github.com/apache/apisix-dashboard/pull/1240/checks?check_run_id=1700366308

be skywalking e2e test failed, pls take a look when you have time, many thanks~! @nic-chen @starsz

Sorry, I am not very familiar with this.
@nic-chen Can you help to deal with it? Otherwise, I will deal with it when I am free.

@juzhiyuan
Copy link
Member

wait for the other 2 backends PRs.

@liuxiran
Copy link
Contributor Author

as all the related PRs have been merged and CI passed, this pr is ready, merged, thanks for all your reviews

@liuxiran liuxiran merged commit 32c3ddb into apache:master Jan 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants