This is an automated email from the ASF dual-hosted git repository.
bzp2010 pushed a change to branch next
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
from 0ea58192 chore: remove unused validator (#2575)
add e68982a6 chore: merge master branch to next branch on 220810 (#2580)
No new revisions were added by this update.
Summary of changes:
.github/workflows/frontend-e2e-test.yml | 13 ++-
.github/workflows/frontend-plugin-e2e-test.yml | 98 ----------------------
README.md | 4 +
api/conf/conf.yaml | 3 +-
docs/en/latest/USER_GUIDE.md | 2 +
.../dashboard-smoketest.spec.js | 0
.../lang-switch-language.spec.js} | 0
...ate-create-edit-delete-plugin-template.spec.js} | 0
...late-create-plugin-template-with-route.spec.js} | 0
...proto-create_and_edit_and_delete_proto.spec.js} | 0
.../proto-table-auto-jump-when-no-data.spec.js} | 0
.../rawDataEditor-test-rawDataEditor.spec.js} | 0
.../service-create-edit-delete-service.spec.js} | 0
...ice-create-service-with-chash-upstream.spec.js} | 0
...reate-service-with-not-select-upstream.spec.js} | 0
...ervice-with-service-discovery-upstream.spec.js} | 0
.../service-edit-service-with-upstream.spec.js} | 0
.../service-save-paginator-status.spec.js} | 2 +-
.../service-table-auto-jump-when-no-data.spec.js} | 0
.../{settings => rest}/settings-smoketest.spec.js | 0
.../{ssl => rest}/ssl-smoketest.spec.js | 0
.../upstream-create_and_delete_upstream.spec.js} | 0
...nd_edit_upstream_with_custom_chash_key.spec.js} | 0
...create_and_edit_upstream_with_no_nodes.spec.js} | 0
.../upstream-table-auto-jump-when-no-data.spec.js} | 0
.../login.spec.js => rest/user-login.spec.js} | 0
.../logout.spec.js => rest/user-logout.spec.js} | 0
...ch-route.spec.js => batch-delete-route.spec.js} | 81 +++++++-----------
web/src/locales/en-US/component.ts | 1 +
web/src/locales/tr-TR/component.ts | 1 +
web/src/locales/zh-CN/component.ts | 1 +
web/src/pages/Route/List.tsx | 32 ++++++-
web/src/pages/Route/locales/en-US.ts | 4 +
web/src/pages/Route/locales/tr-TR.ts | 4 +
web/src/pages/Route/locales/zh-CN.ts | 4 +
web/src/pages/Route/service.ts | 2 +-
36 files changed, 90 insertions(+), 162 deletions(-)
delete mode 100644 .github/workflows/frontend-plugin-e2e-test.yml
rename web/cypress/integration/{dashboard => rest}/dashboard-smoketest.spec.js
(100%)
rename web/cypress/integration/{lang/switch-language.spec.js =>
rest/lang-switch-language.spec.js} (100%)
rename
web/cypress/integration/{pluginTemplate/create-edit-delete-plugin-template.spec.js
=> rest/pluginTemplate-create-edit-delete-plugin-template.spec.js} (100%)
rename
web/cypress/integration/{pluginTemplate/create-plugin-template-with-route.spec.js
=> rest/pluginTemplate-create-plugin-template-with-route.spec.js} (100%)
rename web/cypress/integration/{proto/create_and_edit_and_delete_proto.spec.js
=> rest/proto-create_and_edit_and_delete_proto.spec.js} (100%)
rename web/cypress/integration/{proto/table-auto-jump-when-no-data.spec.js =>
rest/proto-table-auto-jump-when-no-data.spec.js} (100%)
rename web/cypress/integration/{rawDataEditor/test-rawDataEditor.spec.js =>
rest/rawDataEditor-test-rawDataEditor.spec.js} (100%)
rename web/cypress/integration/{service/create-edit-delete-service.spec.js =>
rest/service-create-edit-delete-service.spec.js} (100%)
rename
web/cypress/integration/{service/create-service-with-chash-upstream.spec.js =>
rest/service-create-service-with-chash-upstream.spec.js} (100%)
rename
web/cypress/integration/{service/create-service-with-not-select-upstream.spec.js
=> rest/service-create-service-with-not-select-upstream.spec.js} (100%)
rename
web/cypress/integration/{service/create-service-with-service-discovery-upstream.spec.js
=> rest/service-create-service-with-service-discovery-upstream.spec.js} (100%)
rename web/cypress/integration/{service/edit-service-with-upstream.spec.js =>
rest/service-edit-service-with-upstream.spec.js} (100%)
rename web/cypress/integration/{service/save-paginator-status.spec.js =>
rest/service-save-paginator-status.spec.js} (98%)
rename web/cypress/integration/{service/table-auto-jump-when-no-data.spec.js
=> rest/service-table-auto-jump-when-no-data.spec.js} (100%)
rename web/cypress/integration/{settings => rest}/settings-smoketest.spec.js
(100%)
rename web/cypress/integration/{ssl => rest}/ssl-smoketest.spec.js (100%)
rename web/cypress/integration/{upstream/create_and_delete_upstream.spec.js =>
rest/upstream-create_and_delete_upstream.spec.js} (100%)
rename
web/cypress/integration/{upstream/create_and_edit_upstream_with_custom_chash_key.spec.js
=> rest/upstream-create_and_edit_upstream_with_custom_chash_key.spec.js} (100%)
rename
web/cypress/integration/{upstream/create_and_edit_upstream_with_no_nodes.spec.js
=> rest/upstream-create_and_edit_upstream_with_no_nodes.spec.js} (100%)
rename web/cypress/integration/{upstream/table-auto-jump-when-no-data.spec.js
=> rest/upstream-table-auto-jump-when-no-data.spec.js} (100%)
rename web/cypress/integration/{user/login.spec.js => rest/user-login.spec.js}
(100%)
rename web/cypress/integration/{user/logout.spec.js =>
rest/user-logout.spec.js} (100%)
copy web/cypress/integration/route/{search-route.spec.js =>
batch-delete-route.spec.js} (67%)
