This is an automated email from the ASF dual-hosted git repository.
jimin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 26feac27af optimize: optimize links in the console header (#6243)
26feac27af is described below
commit 26feac27af3ad95d707633b4b8369d7c96557edd
Author: liuqiufeng <[email protected]>
AuthorDate: Sat Jan 6 02:42:01 2024 +0800
optimize: optimize links in the console header (#6243)
---
changes/en-us/2.x.md | 5 +++--
changes/zh-cn/2.x.md | 6 ++++--
.../console-fe/src/components/Header/Header.tsx | 23 +++++++---------------
.../static/console-fe/src/locales/en-us.ts | 1 -
.../static/console-fe/src/locales/zh-cn.ts | 1 -
5 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 212713e365..64b45f46e3 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -46,7 +46,8 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6201](https://github.com/apache/incubator-seata/pull/6201)] restore
required_status_checks kept to remove context validation
- [[#6218](https://github.com/apache/incubator-seata/pull/6218)] remove
Seata-Docker link
- [[#6227](https://github.com/apache/incubator-seata/pull/6227)] validate that
the primary key is free of illegal characters
-- [[#6004](https://github.com/seata/seata/pull/6004)] optimize RM TM startup
connect server fail fast
+- [[#6004](https://github.com/apache/incubator-seata/pull/6004)] optimize RM
TM startup connect server fail fast
+- [[#6243](https://github.com/apache/incubator-seata/pull/6243)] optimize
links in the console header
### security:
- [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava
dependencies to fix security vulnerabilities
@@ -56,7 +57,6 @@ Add changes here for all PR submitted to the 2.x branch.
### test:
- [[#6081](https://github.com/apache/incubator-seata/pull/6081)] add
`test-os.yml` for testing the OS
-- [[#PR_NO](https://github.com/apache/incubator-seata/pull/PR_NO)] A brief and
accurate description of PR
- [[#6125](https://github.com/apache/incubator-seata/pull/6125)] unbind xid in
TransactionTemplateTest
- [[#6157](https://github.com/apache/incubator-seata/pull/6157)] increase
common module unit test coverage
@@ -82,5 +82,6 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [AlbumenJ](https://github.com/AlbumenJ)
- [dreamskyvision](https://github.com/dreamskyvision)
- [jsbxyyx](https://github.com/jsbxyyx)
+- [liuqiufeng](https://github.com/liuqiufeng)
Also, we receive many valuable issues, questions and advices from our
community. Thanks for you all.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 033e850c5a..84fe561a2f 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -38,7 +38,7 @@
- [[#6184](https://github.com/apache/incubator-seata/pull/6184)] 更新NOTICE文件
- [[#6192](https://github.com/apache/incubator-seata/pull/6192)] 移除无用文件
- [[#6194](https://github.com/apache/incubator-seata/pull/6194)] 修复 asf.yaml
解析错误问题
-- [[#6116](https://github.com/seata/seata/pull/6116)]
重写NettyPoolKey的hashcode和equals，修复了channel对象池重复构建问题
+- [[#6116](https://github.com/apache/incubator-seata/pull/6116)]
重写NettyPoolKey的hashcode和equals，修复了channel对象池重复构建问题
- [[#6154](https://github.com/apache/incubator-seata/pull/6154)] 控制台日志优化
"kubectl logs -f"
- [[#6116](https://github.com/apache/incubator-seata/pull/6116)]
重写NettyPoolKey的hashcode和equals，修复了channel对象池重复构建问题
- [[#6195](https://github.com/apache/incubator-seata/pull/6195)] 更新 change log
中的 seata url 为 apache/incubator-seata
@@ -46,7 +46,8 @@
- [[#6201](https://github.com/apache/incubator-seata/pull/6201)]
恢复required_status_checks但去除context校验
- [[#6218](https://github.com/apache/incubator-seata/pull/6218)]
移除Seata-Docker链接
- [[#6227](https://github.com/apache/incubator-seata/pull/6227)] 校验pk中不含逗号
-- [[#6004](https://github.com/seata/seata/pull/6004)] 优化RM,TM连接server快速失败
+- [[#6004](https://github.com/apache/incubator-seata/pull/6004)]
优化RM,TM连接server快速失败
+- [[#6243](https://github.com/apache/incubator-seata/pull/6243)] 优化控制台页眉中的链接
### security:
- [[#6069](https://github.com/apache/incubator-seata/pull/6069)]
升级Guava依赖版本，修复安全漏洞
@@ -81,5 +82,6 @@
- [AlbumenJ](https://github.com/AlbumenJ)
- [dreamskyvision](https://github.com/dreamskyvision)
- [jsbxyyx](https://github.com/jsbxyyx)
+- [liuqiufeng](https://github.com/liuqiufeng)
同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
diff --git
a/console/src/main/resources/static/console-fe/src/components/Header/Header.tsx
b/console/src/main/resources/static/console-fe/src/components/Header/Header.tsx
index bdbd0d6348..4703a58944 100644
---
a/console/src/main/resources/static/console-fe/src/components/Header/Header.tsx
+++
b/console/src/main/resources/static/console-fe/src/components/Header/Header.tsx
@@ -92,7 +92,6 @@ class Header extends React.Component<PropsType, StateType> {
console.log('props:', this.props);
const {
home,
- cloud,
docs,
blog,
community,
@@ -100,27 +99,19 @@ class Header extends React.Component<PropsType, StateType>
{
sagaStatemachineDesigner,
languageSwitchButton,
} = locale;
- const BASE_URL = `https://seata.io/${language.toLocaleLowerCase()}/`;
+ const BASE_URL =
+ language === enUsKey ? 'https://seata.apache.org/' :
'https://seata.apache.org/zh-cn/';
const NAV_MENU = [
{ id: 1, title: home, link: BASE_URL },
- {
- id: 2,
- title: cloud,
- link:
`https://www.aliyun.com/product/aliware/mse?spm=seata-website.topbar.0.0.0`,
- },
- { id: 3, title: docs, link:
`${BASE_URL}docs/overview/what-is-seata.html` },
- { id: 4, title: blog, link: `${BASE_URL}blog/index.html` },
- { id: 5, title: community, link: `${BASE_URL}community/index.html` },
- { id: 6, title: download, link: `${BASE_URL}blog/download.html` },
+ { id: 2, title: docs, link: `${BASE_URL}docs/overview/what-is-seata/` },
+ { id: 3, title: blog, link: `${BASE_URL}blog` },
+ { id: 4, title: community, link: `${BASE_URL}community` },
+ { id: 5, title: download, link:
`${BASE_URL}unversioned/download/seata-server` },
];
return (
<header className="header-container header-container-primary">
<div className="header-body">
- <a
- href={`https://seata.io/${language.toLocaleLowerCase()}/`}
- target="_blank"
- rel="noopener noreferrer"
- >
+ <a href={BASE_URL} target="_blank" rel="noopener noreferrer">
<img
src="img/seata_logo.png"
className="logo"
diff --git a/console/src/main/resources/static/console-fe/src/locales/en-us.ts
b/console/src/main/resources/static/console-fe/src/locales/en-us.ts
index 383f79db1d..58e3a8fba0 100644
--- a/console/src/main/resources/static/console-fe/src/locales/en-us.ts
+++ b/console/src/main/resources/static/console-fe/src/locales/en-us.ts
@@ -26,7 +26,6 @@ const enUs: ILocale = {
},
Header: {
home: 'HOME',
- cloud: 'CLOUD',
docs: 'DOCS',
blog: 'BLOG',
community: 'COMMUNITY',
diff --git a/console/src/main/resources/static/console-fe/src/locales/zh-cn.ts
b/console/src/main/resources/static/console-fe/src/locales/zh-cn.ts
index edd95000f6..e2ed430d51 100644
--- a/console/src/main/resources/static/console-fe/src/locales/zh-cn.ts
+++ b/console/src/main/resources/static/console-fe/src/locales/zh-cn.ts
@@ -26,7 +26,6 @@ const zhCn: ILocale = {
},
Header: {
home: '首页',
- cloud: 'Seata企业版',
docs: '文档',
blog: '博客',
community: '社区',
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
