diff --git a/.github/workflows/backend-cli-test.yml b/.github/workflows/backend-cli-test.yml index e0398c3c8f..5181ed7579 100644 --- a/.github/workflows/backend-cli-test.yml +++ b/.github/workflows/backend-cli-test.yml @@ -3,10 +3,10 @@ name: Backend CLI Test on: push: branches: - - master + - v2.3 pull_request: branches: - - master + - v2.3 jobs: run-test: diff --git a/.github/workflows/backend-e2e-test.yml b/.github/workflows/backend-e2e-test.yml index 7ba1cbddfc..4bffa9c153 100644 --- a/.github/workflows/backend-e2e-test.yml +++ b/.github/workflows/backend-e2e-test.yml @@ -3,10 +3,10 @@ name: Backend E2E Test on: push: branches: - - master + - v2.3 pull_request: branches: - - master + - v2.3 jobs: run-test: diff --git a/.github/workflows/backend-unit-test.yml b/.github/workflows/backend-unit-test.yml index 40d7dbf0f6..c02e9ed5fd 100644 --- a/.github/workflows/backend-unit-test.yml +++ b/.github/workflows/backend-unit-test.yml @@ -3,10 +3,10 @@ name: Backend Unit Test on: push: branches: - - master + - v2.3 pull_request: branches: - - master + - v2.3 jobs: run-test: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 04e2699f01..c76fa02b43 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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' diff --git a/.github/workflows/deploy-with-docker.yml b/.github/workflows/deploy-with-docker.yml index 5fa7e9d741..5dc741d014 100644 --- a/.github/workflows/deploy-with-docker.yml +++ b/.github/workflows/deploy-with-docker.yml @@ -3,7 +3,7 @@ name: Test and Deploy with Docker on: push: branches: - - master + - v2.3 jobs: build: diff --git a/.github/workflows/frontend-e2e-test.yml b/.github/workflows/frontend-e2e-test.yml index a785058585..85f87cf94c 100644 --- a/.github/workflows/frontend-e2e-test.yml +++ b/.github/workflows/frontend-e2e-test.yml @@ -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 diff --git a/.github/workflows/gitleaks.yml b/.github/workflows/gitleaks.yml index ad9fd414c2..776ff8624e 100644 --- a/.github/workflows/gitleaks.yml +++ b/.github/workflows/gitleaks.yml @@ -5,10 +5,10 @@ name: gitLeaks on: push: branches: - - master + - v2.3 pull_request: branches: - - master + - v2.3 jobs: gitleaks: diff --git a/.github/workflows/go-lint.yml b/.github/workflows/go-lint.yml index c579dd25d8..8f2fc1c837 100644 --- a/.github/workflows/go-lint.yml +++ b/.github/workflows/go-lint.yml @@ -1,11 +1,12 @@ name: go-lint + on: push: branches: - - master + - v2.3 pull_request: branches: - - master + - v2.3 jobs: golangci: diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 09b2cbaac1..af29983979 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -3,10 +3,10 @@ name: License checker on: push: branches: - - master + - v2.3 pull_request: branches: - - master + - v2.3 jobs: check-license: diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index b821fa26bb..701118631f 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -3,10 +3,10 @@ name: Release Test on: push: branches: - - master + - v2.3 pull_request: branches: - - master + - v2.3 jobs: run-test: diff --git a/.github/workflows/spellchecker.yml b/.github/workflows/spellchecker.yml index 6b246517f8..0be20a835e 100644 --- a/.github/workflows/spellchecker.yml +++ b/.github/workflows/spellchecker.yml @@ -2,7 +2,7 @@ name: spellchecker on: pull_request: branches: - - master + - v2.3 jobs: misspell: name: runner/misspell diff --git a/.github/workflows/test-frontend-multiple-node-build.yml b/.github/workflows/test-frontend-multiple-node-build.yml index e1f78da14f..01c3bfdbda 100644 --- a/.github/workflows/test-frontend-multiple-node-build.yml +++ b/.github/workflows/test-frontend-multiple-node-build.yml @@ -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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d3927102e..ce3398a022 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ # Table of Contents +- [2.3.0](#230) - [2.2.0](#220) - [2.1.1](#211) - [2.1.0](#210) @@ -26,6 +27,30 @@ - [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 diff --git a/docs/deploy.md b/docs/deploy.md index 2fc2eaebd8..f4e50487dd 100644 --- a/docs/deploy.md +++ b/docs/deploy.md @@ -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 diff --git a/web/src/pages/Route/components/DebugViews/DebugDrawView.tsx b/web/src/pages/Route/components/DebugViews/DebugDrawView.tsx index daf516d097..ff40afaada 100644 --- a/web/src/pages/Route/components/DebugViews/DebugDrawView.tsx +++ b/web/src/pages/Route/components/DebugViews/DebugDrawView.tsx @@ -82,7 +82,7 @@ const DebugDrawView: React.FC = (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':