Merge branch 'origin'

* origin: chore: disable debug/pprof interface (apache#2339) feat: add upstream id in form (apache#2321)
fitphp · Feb 27, 2022 · 1682bf2 · 1682bf2
2 parents 44ea87f + 46c56f4
commit 1682bf2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/api/internal/route.go b/api/internal/route.go
@@ -21,7 +21,7 @@ import (
 	"github.com/apisix/manager-api/internal/handler/statistic"
 	"path/filepath"
 
-	"github.com/gin-contrib/pprof"
+	// "github.com/gin-contrib/pprof"
 	"github.com/gin-contrib/static"
 	"github.com/gin-gonic/gin"
 
@@ -95,7 +95,7 @@ func SetUpRouter() *gin.Engine {
 		h.ApplyRoute(r)
 	}
 
-	pprof.Register(r)
+	// pprof.Register(r)
 
 	return r
 }
diff --git a/web/cypress/integration/upstream/create_and_edit_upstream_with_custom_chash_key.spec.js b/web/cypress/integration/upstream/create_and_edit_upstream_with_custom_chash_key.spec.js
@@ -83,6 +83,7 @@ context('Create and Delete Upstream With Custom CHash Key', () => {
     cy.contains('Next').click();
     cy.contains('Submit').click();
     cy.get(selector.notification).should('contain', data.createUpstreamSuccess);
+    cy.contains('.ant-table-cell', 'ID').should('be.visible');
     cy.url().should('contains', 'upstream/list');
   });
 

diff --git a/web/src/pages/Upstream/List.tsx b/web/src/pages/Upstream/List.tsx
@@ -51,6 +51,11 @@ const Page: React.FC = () => {
   }, [window.location.search]);
 
   const columns: ProColumns<UpstreamModule.ResponseBody>[] = [
+    {
+      title: formatMessage({ id: 'page.upstream.list.id' }),
+      dataIndex: 'id',
+      hideInSearch: true,
+    },
     {
       title: formatMessage({ id: 'page.upstream.list.name' }),
       dataIndex: 'name',

diff --git a/web/src/pages/Upstream/locales/en-US.ts b/web/src/pages/Upstream/locales/en-US.ts
@@ -76,6 +76,7 @@ export default {
   'page.upstream.create.basic.info': 'Basic Information',
   'page.upstream.create.preview': 'Preview',
 
+  'page.upstream.list.id': 'ID',
   'page.upstream.list.name': 'Name',
   'page.upstream.list.type': 'Type',
   'page.upstream.list.description': 'Description',

diff --git a/web/src/pages/Upstream/locales/zh-CN.ts b/web/src/pages/Upstream/locales/zh-CN.ts
@@ -75,6 +75,7 @@ export default {
   'page.upstream.create.basic.info': '基础信息',
   'page.upstream.create.preview': '预览',
 
+  'page.upstream.list.id': 'ID',
   'page.upstream.list.name': '名称',
   'page.upstream.list.type': '类型',
   'page.upstream.list.description': '描述',