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

manger api with front web #1259

Closed
wants to merge 10 commits into from
4 changes: 2 additions & 2 deletions .github/workflows/backend-cli-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Backend CLI Test
on:
push:
branches:
- master
- v2.3
pull_request:
branches:
- master
- v2.3

jobs:
run-test:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backend-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Backend E2E Test
on:
push:
branches:
- master
- v2.3
pull_request:
branches:
- master
- v2.3

jobs:
run-test:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backend-unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Backend Unit Test
on:
push:
branches:
- master
- v2.3
pull_request:
branches:
- master
- v2.3

jobs:
run-test:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [master]
branches: [v2.3]
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
branches: [v2.3]
schedule:
- cron: '18 23 * * 0'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-with-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test and Deploy with Docker
on:
push:
branches:
- master
- v2.3

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/frontend-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Frontend e2e test
on:
push:
branches:
- master
- v2.3
pull_request:
branches:
- master
- v2.3
defaults:
run:
working-directory: web
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gitleaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ name: gitLeaks
on:
push:
branches:
- master
- v2.3
pull_request:
branches:
- master
- v2.3

jobs:
gitleaks:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/go-lint.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name: go-lint

on:
push:
branches:
- master
- v2.3
pull_request:
branches:
- master
- v2.3

jobs:
golangci:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/license-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: License checker
on:
push:
branches:
- master
- v2.3
pull_request:
branches:
- master
- v2.3

jobs:
check-license:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Release Test
on:
push:
branches:
- master
- v2.3
pull_request:
branches:
- master
- v2.3

jobs:
run-test:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spellchecker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: spellchecker
on:
pull_request:
branches:
- master
- v2.3
jobs:
misspell:
name: runner/misspell
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-frontend-multiple-node-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
name: Test building web in multiple node version

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
# events but only for the v2.3 branch
on:
push:
branches:
- master
- v2.3
pull_request:
branches:
- master
- v2.3

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,38 @@

# Table of Contents

- [2.3.0](#230)
- [2.2.0](#220)
- [2.1.1](#211)
- [2.1.0](#210)
- [2.0.0](#200)
- [1.5.0](#150)
- [1.0.0](#100)

# 2.3.0

### Core

* Support to use absolute path in conf.WebDir. [#1055](https://github.com/apache/apisix-dashboard/pull/1055)
* Support to search route by label. [#1061](https://github.com/apache/apisix-dashboard/pull/1061)
* Support server info preview. [#958](https://github.com/apache/apisix-dashboard/pull/958) [#949](https://github.com/apache/apisix-dashboard/pull/949)
* Support search route by labels. [#1061](https://github.com/apache/apisix-dashboard/pull/1061)
* Support custom port for Upstream module. [#1078](https://github.com/apache/apisix-dashboard/pull/1078)
* Support to show plugin type and other properties [#1111](https://github.com/apache/apisix-dashboard/pull/1111)
* Support websocket for Route module. [#1079](https://github.com/apache/apisix-dashboard/pull/1079)
* Support Service module on the frontend. [#1089](https://github.com/apache/apisix-dashboard/pull/1089)
* Support group for Route module. [#999](https://github.com/apache/apisix-dashboard/pull/999)
* Support Global Plugin. [#1057](https://github.com/apache/apisix-dashboard/pull/1057) [#1106](https://github.com/apache/apisix-dashboard/pull/1106)
* Support Version Manager. [#1157](https://github.com/apache/apisix-dashboard/pull/1157)
* Use Cobra as the cli scafford. [#773](https://github.com/apache/apisix-dashboard/pull/773)
* Remove Lua dependency. [#1083](https://github.com/apache/apisix-dashboard/pull/1083)
* Improve E2E testcases for the backend. [#1012](https://github.com/apache/apisix-dashboard/pull/1012), [#1123](https://github.com/apache/apisix-dashboard/pull/1123)
* Improve E2E testcases for the frontend. [#1074](https://github.com/apache/apisix-dashboard/pull/1074)
* Improve online debug. [#979](https://github.com/apache/apisix-dashboard/pull/979)
* Improve Route publish/offline. [#1081](https://github.com/apache/apisix-dashboard/pull/1081) [#991](https://github.com/apache/apisix-dashboard/pull/991)
* Improve plugin module for the frontend. [#1047](https://github.com/apache/apisix-dashboard/pull/1047) [#978](https://github.com/apache/apisix-dashboard/pull/978)
* Fix error occurred when enable or disable existing SSL [#1064](https://github.com/apache/apisix-dashboard/pull/1064)
* Fix the problem that route created by Admin API (without ID) cannot be shown in Manager API. [#1063](https://github.com/apache/apisix-dashboard/pull/1063)

# 2.2.0

Expand Down
2 changes: 1 addition & 1 deletion docs/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ $ go env -w GOPROXY=https://goproxy.cn,direct
## Clone the project

```sh
$ git clone -b v2.2 https://github.com/apache/apisix-dashboard.git
$ git clone -b v2.3 https://github.com/apache/apisix-dashboard.git
```

## Build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const DebugDrawView: React.FC<RouteModule.DebugDrawProps> = (props) => {
let transformDataJson: object;
const formData: RouteModule.debugRequestParamsFormData[] = bodyForm.getFieldsValue().params;
if (methodWithoutBody.includes(httpMethod)) {
return undefined
return undefined;
}
switch (bodyType) {
case 'x-www-form-urlencoded':
Expand Down