Skip to content

Commit

Permalink
fixed bugs (#703)
Browse files Browse the repository at this point in the history
  • Loading branch information
@TianWuwt
TianWuwt authored Jan 8, 2025
1 parent 82f41e2 commit bf11911
Show file tree
Hide file tree
Showing 5 changed files with 151 additions and 100 deletions.
10 changes: 8 additions & 2 deletions ui/src/i18n/strings/en-US.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@
"OBDashboard.components.customModal.UpgradeModal.VersionUpgrade": "Version Upgrade",
"OBDashboard.components.customModal.UpgradeModal.Image": "Image",
"OBDashboard.components.customModal.UpgradeModal.PleaseEnterAnImage": "Please enter an image!",
"OBDashboard.Cluster.New.BackUp.PleaseEnter": "Please enter",
"OBDashboard.Cluster.New.BackUp.PleaseEnter.A": "For example, 172.17.x.x",
"OBDashboard.Cluster.New.BackUp.PleaseEnter.B": "For example, /opt/nfs",
"OBDashboard.Cluster.New.BasicInfo.EnterAResourceName": "Enter a resource name",
"OBDashboard.Cluster.New.Monitor.PleaseEnter": "Please enter",
"OBDashboard.Cluster.New.Observer.EnterAnImage": "Enter an image",
Expand Down Expand Up @@ -1248,5 +1249,10 @@
"src.pages.Tenant.Detail.Overview.892E62C7": "Deletion protection modified successfully",
"src.pages.Tenant.Detail.Overview.EE772326": "Deletion protection",
"src.pages.Overview.E15A1FED": "metrics-server has not been installed in the K8s cluster, and the usage of node resources cannot be obtained.",
"src.pages.Cluster.Detail.Overview.FF85D01F": "Unmanaged Successfully"
"src.pages.Cluster.Detail.Overview.FF85D01F": "Unmanaged Successfully",
"src.pages.Cluster.New.AE7F8E70": "Please select {topologyConfiguration} Key",
"src.pages.Cluster.New.5344AD47": "Please select {topologyConfiguration} Operator",
"src.pages.Cluster.New.870724D5": "Please select {topologyConfiguration} Value",
"src.pages.Cluster.New.AC56EBD8": "Please select PodAffinity Type",
"src.pages.Cluster.New.9DDB4176": "Please select the Tolerations Effect"
}
10 changes: 8 additions & 2 deletions ui/src/i18n/strings/zh-CN.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@
"OBDashboard.components.customModal.UpgradeModal.VersionUpgrade": "版本升级",
"OBDashboard.components.customModal.UpgradeModal.Image": "镜像",
"OBDashboard.components.customModal.UpgradeModal.PleaseEnterAnImage": "请输入镜像!",
"OBDashboard.Cluster.New.BackUp.PleaseEnter": "请输入",
"OBDashboard.Cluster.New.BackUp.PleaseEnter.A": "例如 172.17.x.x",
"OBDashboard.Cluster.New.BackUp.PleaseEnter.B": "例如 /opt/nfs",
"OBDashboard.Cluster.New.BasicInfo.EnterAResourceName": "请输入资源名",
"OBDashboard.Cluster.New.Monitor.PleaseEnter": "请输入",
"OBDashboard.Cluster.New.Observer.EnterAnImage": "请输入镜像",
Expand Down Expand Up @@ -1270,5 +1271,10 @@
"src.pages.Tenant.Detail.Overview.892E62C7": "修改删除保护已成功",
"src.pages.Tenant.Detail.Overview.EE772326": "删除保护",
"src.pages.Overview.E15A1FED": "K8s 集群中尚未安装 metrics-server，无法获取节点资源用量",
"src.pages.Cluster.Detail.Overview.FF85D01F": "解除托管已成功"
"src.pages.Cluster.Detail.Overview.FF85D01F": "解除托管已成功",
"src.pages.Cluster.New.AE7F8E70": "请选择 {topologyConfiguration} Key",
"src.pages.Cluster.New.5344AD47": "请选择 {topologyConfiguration} Operator",
"src.pages.Cluster.New.870724D5": "请选择 {topologyConfiguration} Value",
"src.pages.Cluster.New.AC56EBD8": "请选择 PodAffinity Type",
"src.pages.Cluster.New.9DDB4176": "请选择 Tolerations Effect"
}
130 changes: 50 additions & 80 deletions ui/src/pages/Cluster/Detail/Overview/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
Dropdown,
Form,
Input,
Menu,
MenuProps,
Row,
Select,
Expand Down Expand Up @@ -79,7 +78,7 @@ const ClusterOverview: React.FC = () => {
// obcluster 的 parameters 里面加了个 specValue 的字段，
// 如果 specValue 不等于 value，状态写 "不匹配" (黄色tag)，如果两个值相等，写"已匹配"(绿色tag)
const findSpec = parameters?.find(
(item: any) => element.value === item.specValue,
(item: any) => item.value === item.specValue,
);
if (!isEmpty(findSpec)) {
return { ...element, accordance: true };
Expand Down Expand Up @@ -206,65 +205,36 @@ const ClusterOverview: React.FC = () => {
const items: MenuProps['items'] = [
{
key: 'AddZone',
label: (
<Button
disabled={
!isEmpty(clusterDetail) && clusterDetail?.status !== 'running'
}
type="text"
>
{intl.formatMessage({
id: 'dashboard.Detail.Overview.AddZone',
defaultMessage: '新增Zone',
})}
</Button>
),
label: intl.formatMessage({
id: 'dashboard.Detail.Overview.AddZone',
defaultMessage: '新增Zone',
}),

disabled: !isEmpty(clusterDetail) && clusterDetail?.status !== 'running',
},
{
key: 'Upgrade',
label: (
<Button
type="text"
disabled={
!isEmpty(clusterDetail) && clusterDetail?.status !== 'running'
}
>
{intl.formatMessage({
id: 'OBDashboard.Detail.Overview.Upgrade',
defaultMessage: '升级',
})}
</Button>
),
label: intl.formatMessage({
id: 'OBDashboard.Detail.Overview.Upgrade',
defaultMessage: '升级',
}),
disabled: !isEmpty(clusterDetail) && clusterDetail?.status !== 'running',
},
{
key: 'delete',
label: (
<Button
type="text"
disabled={
!isEmpty(clusterDetail) &&
(clusterDetail?.status === 'deleting' || deletionProtection)
}
danger
>
{intl.formatMessage({
id: 'OBDashboard.Detail.Overview.Delete',
defaultMessage: '删除',
})}
</Button>
),
label: intl.formatMessage({
id: 'OBDashboard.Detail.Overview.Delete',
defaultMessage: '删除',
}),
danger: true,
disabled:
!isEmpty(clusterDetail) &&
(clusterDetail?.status === 'deleting' || deletionProtection),
},
{
key: 'nfs',
label: (
<Button
type="text"
disabled={
!isEmpty(clusterDetail) &&
(clusterDetail?.status !== 'running' ||
!clusterDetail?.supportStaticIP)
}
>
<span>
{removeNFS
? intl.formatMessage({
id: 'src.pages.Cluster.Detail.Overview.C47B9DA4',
Expand All @@ -274,8 +244,12 @@ const ClusterOverview: React.FC = () => {
id: 'src.pages.Cluster.Detail.Overview.6B97ABB6',
defaultMessage: '挂载 NFS 资源',
})}
</Button>
</span>
),
disabled:
isEmpty(clusterDetail) ||
clusterDetail?.status !== 'running' ||
!clusterDetail?.supportStaticIP,
},
];

Expand All @@ -287,29 +261,15 @@ const ClusterOverview: React.FC = () => {
}),
extra: access.obclusterwrite
? [
<Dropdown
overlayStyle={{ marginRight: 24 }}
placement="bottomRight"
overlay={
<Menu>
{items.map((item) => (
<Menu.Item
key={`${item.key}`}
onClick={() => menuChange(item)}
>
{item.label}
</Menu.Item>
))}
</Menu>
}
>
<Dropdown menu={{ items, onClick: menuChange }}>
<Button>
{intl.formatMessage({
id: 'src.pages.Cluster.Detail.Overview.A0A43F50',
defaultMessage: '集群管理',
})}

<DownOutlined />
<Space>
{intl.formatMessage({
id: 'src.pages.Cluster.Detail.Overview.A0A43F50',
defaultMessage: '集群管理',
})}
<DownOutlined />
</Space>
</Button>
</Dropdown>,
]
Expand Down Expand Up @@ -768,26 +728,36 @@ const ClusterOverview: React.FC = () => {
);
}
if (
name !== undefined &&
controlParameter !== undefined &&
accordance !== undefined
) {
if (controlParameter === true) {
setParametersData(
controlParameterContent?.filter(
(item) =>
item.name?.includes(name.trim()) &&
item.accordance === accordance,
(item) => item.accordance === accordance,
),
);
} else {
setParametersData([]);
}
}

if (
name !== undefined &&
controlParameter !== undefined &&
accordance !== undefined
) {
if (controlParameter === true) {
setParametersData(
newParametersData?.filter(
controlParameterContent?.filter(
(item) =>
item.name?.includes(name.trim()) &&
item.controlParameter === false,
item.accordance === accordance,
),
);
} else {
// 未托管的，没有状态，因此为空
setParametersData([]);
}
}
});
Expand Down
8 changes: 4 additions & 4 deletions ui/src/pages/Cluster/New/BackUp.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ export default function BackUp() {
>
<Input
placeholder={intl.formatMessage({
id: 'OBDashboard.Cluster.New.BackUp.PleaseEnter',
defaultMessage: '请输入',
id: 'OBDashboard.Cluster.New.BackUp.PleaseEnter.A',
defaultMessage: '例如 172.17.x.x',
})}
/>
</Form.Item>
Expand All @@ -58,8 +58,8 @@ export default function BackUp() {
>
<Input
placeholder={intl.formatMessage({
id: 'OBDashboard.Cluster.New.BackUp.PleaseEnter',
defaultMessage: '请输入',
id: 'OBDashboard.Cluster.New.BackUp.PleaseEnter.B',
defaultMessage: '例如 /opt/nfs',
})}
/>
</Form.Item>
Expand Down
Loading

0 comments on commit bf11911

Please sign in to comment.