Skip to content

Commit 26feac2

Browse files
authored
optimize: optimize links in the console header (apache#6243)
1 parent 2363715 commit 26feac2

File tree

5 files changed

+14
-22
lines changed

5 files changed

+14
-22
lines changed

changes/en-us/2.x.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ Add changes here for all PR submitted to the 2.x branch.
4646
- [[#6201](https://github.com/apache/incubator-seata/pull/6201)] restore required_status_checks kept to remove context validation
4747
- [[#6218](https://github.com/apache/incubator-seata/pull/6218)] remove Seata-Docker link
4848
- [[#6227](https://github.com/apache/incubator-seata/pull/6227)] validate that the primary key is free of illegal characters
49-
- [[#6004](https://github.com/seata/seata/pull/6004)] optimize RM TM startup connect server fail fast
49+
- [[#6004](https://github.com/apache/incubator-seata/pull/6004)] optimize RM TM startup connect server fail fast
50+
- [[#6243](https://github.com/apache/incubator-seata/pull/6243)] optimize links in the console header
5051

5152
### security:
5253
- [[#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.
5657

5758
### test:
5859
- [[#6081](https://github.com/apache/incubator-seata/pull/6081)] add `test-os.yml` for testing the OS
59-
- [[#PR_NO](https://github.com/apache/incubator-seata/pull/PR_NO)] A brief and accurate description of PR
6060
- [[#6125](https://github.com/apache/incubator-seata/pull/6125)] unbind xid in TransactionTemplateTest
6161
- [[#6157](https://github.com/apache/incubator-seata/pull/6157)] increase common module unit test coverage
6262

@@ -82,5 +82,6 @@ Thanks to these contributors for their code commits. Please report an unintended
8282
- [AlbumenJ](https://github.com/AlbumenJ)
8383
- [dreamskyvision](https://github.com/dreamskyvision)
8484
- [jsbxyyx](https://github.com/jsbxyyx)
85+
- [liuqiufeng](https://github.com/liuqiufeng)
8586

8687
Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

changes/zh-cn/2.x.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@
3838
- [[#6184](https://github.com/apache/incubator-seata/pull/6184)] 更新NOTICE文件
3939
- [[#6192](https://github.com/apache/incubator-seata/pull/6192)] 移除无用文件
4040
- [[#6194](https://github.com/apache/incubator-seata/pull/6194)] 修复 asf.yaml 解析错误问题
41-
- [[#6116](https://github.com/seata/seata/pull/6116)] 重写NettyPoolKey的hashcode和equals,修复了channel对象池重复构建问题
41+
- [[#6116](https://github.com/apache/incubator-seata/pull/6116)] 重写NettyPoolKey的hashcode和equals,修复了channel对象池重复构建问题
4242
- [[#6154](https://github.com/apache/incubator-seata/pull/6154)] 控制台日志优化 "kubectl logs -f"
4343
- [[#6116](https://github.com/apache/incubator-seata/pull/6116)] 重写NettyPoolKey的hashcode和equals,修复了channel对象池重复构建问题
4444
- [[#6195](https://github.com/apache/incubator-seata/pull/6195)] 更新 change log 中的 seata url 为 apache/incubator-seata
4545
- [[#6200](https://github.com/apache/incubator-seata/pull/6200)] 去除required_status_checks检查
4646
- [[#6201](https://github.com/apache/incubator-seata/pull/6201)] 恢复required_status_checks但去除context校验
4747
- [[#6218](https://github.com/apache/incubator-seata/pull/6218)] 移除Seata-Docker链接
4848
- [[#6227](https://github.com/apache/incubator-seata/pull/6227)] 校验pk中不含逗号
49-
- [[#6004](https://github.com/seata/seata/pull/6004)] 优化RM,TM连接server快速失败
49+
- [[#6004](https://github.com/apache/incubator-seata/pull/6004)] 优化RM,TM连接server快速失败
50+
- [[#6243](https://github.com/apache/incubator-seata/pull/6243)] 优化控制台页眉中的链接
5051

5152
### security:
5253
- [[#6069](https://github.com/apache/incubator-seata/pull/6069)] 升级Guava依赖版本,修复安全漏洞
@@ -81,5 +82,6 @@
8182
- [AlbumenJ](https://github.com/AlbumenJ)
8283
- [dreamskyvision](https://github.com/dreamskyvision)
8384
- [jsbxyyx](https://github.com/jsbxyyx)
85+
- [liuqiufeng](https://github.com/liuqiufeng)
8486

8587
同时,我们收到了社区反馈的很多有价值的issue和建议,非常感谢大家。

console/src/main/resources/static/console-fe/src/components/Header/Header.tsx

+7-16
Original file line numberDiff line numberDiff line change
@@ -92,35 +92,26 @@ class Header extends React.Component<PropsType, StateType> {
9292
console.log('props:', this.props);
9393
const {
9494
home,
95-
cloud,
9695
docs,
9796
blog,
9897
community,
9998
download,
10099
sagaStatemachineDesigner,
101100
languageSwitchButton,
102101
} = locale;
103-
const BASE_URL = `https://seata.io/${language.toLocaleLowerCase()}/`;
102+
const BASE_URL =
103+
language === enUsKey ? 'https://seata.apache.org/' : 'https://seata.apache.org/zh-cn/';
104104
const NAV_MENU = [
105105
{ id: 1, title: home, link: BASE_URL },
106-
{
107-
id: 2,
108-
title: cloud,
109-
link: `https://www.aliyun.com/product/aliware/mse?spm=seata-website.topbar.0.0.0`,
110-
},
111-
{ id: 3, title: docs, link: `${BASE_URL}docs/overview/what-is-seata.html` },
112-
{ id: 4, title: blog, link: `${BASE_URL}blog/index.html` },
113-
{ id: 5, title: community, link: `${BASE_URL}community/index.html` },
114-
{ id: 6, title: download, link: `${BASE_URL}blog/download.html` },
106+
{ id: 2, title: docs, link: `${BASE_URL}docs/overview/what-is-seata/` },
107+
{ id: 3, title: blog, link: `${BASE_URL}blog` },
108+
{ id: 4, title: community, link: `${BASE_URL}community` },
109+
{ id: 5, title: download, link: `${BASE_URL}unversioned/download/seata-server` },
115110
];
116111
return (
117112
<header className="header-container header-container-primary">
118113
<div className="header-body">
119-
<a
120-
href={`https://seata.io/${language.toLocaleLowerCase()}/`}
121-
target="_blank"
122-
rel="noopener noreferrer"
123-
>
114+
<a href={BASE_URL} target="_blank" rel="noopener noreferrer">
124115
<img
125116
src="img/seata_logo.png"
126117
className="logo"

console/src/main/resources/static/console-fe/src/locales/en-us.ts

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ const enUs: ILocale = {
2626
},
2727
Header: {
2828
home: 'HOME',
29-
cloud: 'CLOUD',
3029
docs: 'DOCS',
3130
blog: 'BLOG',
3231
community: 'COMMUNITY',

console/src/main/resources/static/console-fe/src/locales/zh-cn.ts

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ const zhCn: ILocale = {
2626
},
2727
Header: {
2828
home: '首页',
29-
cloud: 'Seata企业版',
3029
docs: '文档',
3130
blog: '博客',
3231
community: '社区',

0 commit comments

Comments
 (0)