This is an automated email from the ASF dual-hosted git repository.

vinci pushed a change to branch refactor
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.


    from 13d0e98  resolve conflict
     new 2ee78c7  refference droplet and write a API demo
     add 54f7a98  add tools to check ASF headers in code files. (#454)
     add 1eb1524  chore: remove unnecessary license file (#462)
     add d3678bc  Increase the checking of .conf and .toml files. And delete 
the redundant configuration of the ASF-Release.cfg file. (#461)
     add d6ba6cc  ci: Add lint (#455)
     add e2271b3  Feat: dashboard support route group (#433)
     add 885025e  feature:Independent license check operation file. (#465)
     add 66709c4  feat: support ungroup in manager api (#460)
     add 09c5be9  feat: add publish status to route in manager api (#450)
     add 13b5f0c  feat(route): add publish and offline to route (#451)
     add 361392f  feat: remove netlify (#472)
     add cf9d5ec  fix: host should not be required (#477)
     add c81f0b9  feat: added new plugin dependency (#475)
     new b1471f9  Merge remote-tracking branch 'origin/master' into refactor

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .actions/ASF-Release.cfg                           | 101 +++++
 .../ASFLicenseHeaderMarkdown.txt                   |  14 +-
 .actions/openwhisk-utilities                       |   1 +
 .github/workflows/api_ci.yml                       |   4 +
 .github/workflows/license_ci.yml                   |  23 +
 .github/workflows/multiple-node-build.yml          |  29 +-
 CONTRIBUTING.md                                    |  19 +
 LICENSE                                            |  10 -
 api/docker-compose.yml => Makefile                 |  16 +-
 USER_GUIDE.md                                      |  19 +
 api/errno/error.go                                 |   2 +
 api/filter/request_id.go                           |   3 +-
 api/go.mod                                         |  15 +-
 api/go.mod.orig                                    |  39 --
 api/go.sum                                         | 113 ++++-
 api/go.sum.orig                                    | 497 ---------------------
 api/internal/core/entity/entity.go                 |  38 +-
 api/internal/core/storage/etcd.go                  |  18 +-
 api/internal/core/store/store.go                   |  56 ++-
 api/internal/core/store/store_test.go              | 182 +++++++-
 api/internal/handler/route/route.go                | 132 ++++--
 api/internal/utils/data.go                         |   7 -
 api/log/log.go                                     |  56 +++
 api/main.go                                        |  22 +-
 api/route/base.go                                  |  18 +-
 api/route/route.go                                 | 237 ++++++++--
 api/route/route_group.go                           |  16 +
 api/route/route_group_test.go                      | 108 ++++-
 api/route/route_test.go                            | 200 +++++++++
 api/script/db/schema.sql                           |   2 +-
 api/service/route.go                               |   7 +
 api/service/route_group.go                         |  20 +-
 api/service/route_group_test.go                    | 120 +++++
 api/service/upstream_test.go                       |  16 +
 compose/apisix_conf/config.yaml                    |   1 -
 compose/dashboard_conf/nginx.conf                  |  17 +
 .../grafana_conf/provisioning/dashboards/all.yaml  |   2 +-
 .../grafana_conf/provisioning/datasources/all.yaml |   2 +-
 config/routes.ts                                   |  12 +
 docker/nginx.conf                                  |  17 +
 licenses/LICENSE-api7-dashboard.txt                | 204 ---------
 licenses/LICENSE-dag-to-lua.txt                    | 204 ---------
 package.json                                       |   8 +-
 src/helpers.tsx                                    |   5 +
 src/locales/en-US/menu.ts                          |   1 +
 src/locales/zh-CN/menu.ts                          |   1 +
 src/pages/Consumer/components/Step1.tsx            |   2 +-
 src/pages/Route/Create.less                        |   5 +
 src/pages/Route/Create.tsx                         |  31 +-
 src/pages/Route/List.tsx                           | 103 +++--
 .../Route/components/CreateStep4/CreateStep4.tsx   |   2 +-
 src/pages/Route/components/Step1/MetaView.tsx      |  63 ++-
 .../Route/components/Step1/RequestConfigView.tsx   |   1 -
 src/pages/Route/components/Step1/index.tsx         |   2 +-
 src/pages/Route/components/Step3/index.tsx         |  38 +-
 src/pages/Route/constants.ts                       |   3 +
 src/pages/Route/locales/en-US.ts                   |  18 +-
 src/pages/Route/locales/zh-CN.ts                   |  17 +-
 src/pages/Route/service.ts                         |  13 +
 src/pages/Route/transform.ts                       |  17 +-
 src/pages/Route/typing.d.ts                        |   8 +
 src/pages/{Upstream => RouteGroup}/Create.tsx      |  39 +-
 src/pages/{Upstream => RouteGroup}/List.tsx        |  38 +-
 .../components/Preview.tsx                         |   0
 .../{Consumer => RouteGroup}/components/Step1.tsx  |  43 +-
 src/pages/{Upstream => RouteGroup}/constants.ts    |  18 +-
 src/pages/{Consumer => RouteGroup}/index.ts        |   2 +
 src/pages/RouteGroup/locales/en-US.ts              |  45 ++
 src/pages/RouteGroup/locales/zh-CN.ts              |  45 ++
 src/pages/{Upstream => RouteGroup}/service.ts      |  15 +-
 .../typingd.d.ts => RouteGroup/typing.d.ts}        |  10 +-
 src/pages/User/index.ts                            |  17 +
 src/pages/User/locales/en-US.ts                    |  17 +
 src/pages/User/locales/zh-CN.ts                    |  17 +
 src/pages/User/typing.d.ts                         |  17 +
 yarn.lock                                          |  52 ++-
 76 files changed, 1973 insertions(+), 1359 deletions(-)
 create mode 100644 .actions/ASF-Release.cfg
 rename netlify.toml => .actions/ASFLicenseHeaderMarkdown.txt (79%)
 create mode 160000 .actions/openwhisk-utilities
 create mode 100644 .github/workflows/license_ci.yml
 copy api/docker-compose.yml => Makefile (64%)
 delete mode 100644 api/go.mod.orig
 delete mode 100644 api/go.sum.orig
 delete mode 100644 api/internal/utils/data.go
 create mode 100644 api/route/route_test.go
 create mode 100644 api/service/route_group_test.go
 delete mode 100644 licenses/LICENSE-api7-dashboard.txt
 delete mode 100644 licenses/LICENSE-dag-to-lua.txt
 copy src/pages/{Upstream => RouteGroup}/Create.tsx (64%)
 copy src/pages/{Upstream => RouteGroup}/List.tsx (68%)
 copy src/pages/{Upstream => RouteGroup}/components/Preview.tsx (100%)
 copy src/pages/{Consumer => RouteGroup}/components/Step1.tsx (57%)
 copy src/pages/{Upstream => RouteGroup}/constants.ts (79%)
 copy src/pages/{Consumer => RouteGroup}/index.ts (87%)
 create mode 100644 src/pages/RouteGroup/locales/en-US.ts
 create mode 100644 src/pages/RouteGroup/locales/zh-CN.ts
 copy src/pages/{Upstream => RouteGroup}/service.ts (72%)
 copy src/pages/{Setting/typingd.d.ts => RouteGroup/typing.d.ts} (86%)

Reply via email to