Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: split yueshu and nebulagraph #248

Merged
merged 1 commit into from
Apr 25, 2023
Merged

feat: split yueshu and nebulagraph #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/config/locale/en-US/base.json → src/config/locale/en-US/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"baseLineModalTitle": "Baseline Edit",
"spaceChartAllInstance": "All Instances",
"spaceChartInstance": "instance",
Expand Down
4 changes: 2 additions & 2 deletions src/config/locale/en-US/common.json → src/config/locale/en-US/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"account": "Account Login",
"login": "Log In",
"logout": "Logout",
Expand Down Expand Up @@ -42,7 +42,7 @@
"community": "Community"
},
"noData": "No Data",
"powerInfo": "Powered by NebulaGraph",
"powerInfo": `Powered by NebulaGraph`,
"configServer": {
"host": "Graphd IP address",
"port": "Port"
Expand Down
2 changes: 1 addition & 1 deletion src/config/locale/en-US/component.json → src/config/locale/en-US/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"dashboardDetail": {
"5min": "5 Min",
"1hour": "1 Hour",
Expand Down
2 changes: 1 addition & 1 deletion src/config/locale/en-US/configServer.json → src/config/locale/en-US/configServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"connect": "Connect",
"host": "Host",
"username": "Username",
Expand Down
2 changes: 1 addition & 1 deletion src/config/locale/en-US/description.json → src/config/locale/en-US/description.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"module": "The name of the service",
"moduleName": "The name of the parameter",
"moduleType": "The data type of Value",
Expand Down
2 changes: 1 addition & 1 deletion src/config/locale/en-US/device.json → src/config/locale/en-US/device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"title": "Machine",
"overview": "Overview",
"cpu": "CPU",
Expand Down
18 changes: 9 additions & 9 deletions src/config/locale/en-US/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import common from './common.json';
import component from './component.json';
import configServer from './configServer.json';
import description from './description.json';
import device from './device.json';
import metric_description from './metric_description.json';
import rules from './rules.json';
import service from './service.json';
import base from './base.json';
import common from './common';
import component from './component';
import configServer from './configServer';
import description from './description';
import device from './device';
import metric_description from './metric_description';
import rules from './rules';
import service from './service';
import base from './base';

const enUS = {
common,
Expand Down
3 changes: 2 additions & 1 deletion ...nfig/locale/en-US/metric_description.json → ...config/locale/en-US/metric_description.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"cpu_utilization": "The percentage of used CPU",
"cpu_idle": "The percentage of idled CPU",
"cpu_io_wait_used": "The percentage of CPU waiting for IO operations",
Expand Down Expand Up @@ -183,6 +183,7 @@
"graphd_queries": "Graphd Query",
"graphd_sessions": "Graphd Session",
"process_memory": "Process Memory Usage",
"process_context_open_file_desc": "Context Switch & open file desc",
"process_resource": "Process Disk Read/Write Bytes",
"process_cpu": "Process Cpu Usage",
"process_context_switch": "Process Context Switch & open file desc",
Expand Down
2 changes: 1 addition & 1 deletion src/config/locale/en-US/rules.json → src/config/locale/en-US/rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"usernameRequired": "Username Required",
"passwordRequired": "Password Required",
"versionRequired":"Enter the nebula version"
Expand Down
2 changes: 1 addition & 1 deletion src/config/locale/en-US/service.json → src/config/locale/en-US/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"serviceStatus": "Status(now)",
"version": "Nebula version",
"normal": "Normal",
Expand Down
2 changes: 1 addition & 1 deletion src/config/locale/zh-CN/base.json → src/config/locale/zh-CN/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"baseLineModalTitle": "基线设置",
"spaceChartAllInstance": "全部实例",
"spaceChartInstance": "实例",
Expand Down
4 changes: 2 additions & 2 deletions src/config/locale/zh-CN/common.json → src/config/locale/zh-CN/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"account": "账户登录",
"login": "登录",
"logout": "登出",
Expand Down Expand Up @@ -42,7 +42,7 @@
"community": "社区版"
},
"noData": "没有数据",
"powerInfo": "版权归 NebulaGraph 所有",
"powerInfo": `版权归 NebulaGraph 所有`,
"configServer": {
"host": "Graphd IP 地址",
"port": "端口号"
Expand Down
2 changes: 1 addition & 1 deletion src/config/locale/zh-CN/component.json → src/config/locale/zh-CN/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"dashboardDetail": {
"5min": "5分钟",
"1hour": "1小时",
Expand Down
2 changes: 1 addition & 1 deletion src/config/locale/zh-CN/configServer.json → src/config/locale/zh-CN/configServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"connect": "连接",
"host": "Host",
"username": "用户名",
Expand Down
2 changes: 1 addition & 1 deletion src/config/locale/zh-CN/description.json → src/config/locale/zh-CN/description.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"module": "服务",
"moduleName": "参数名称",
"moduleType": "参数类型",
Expand Down
2 changes: 1 addition & 1 deletion src/config/locale/zh-CN/device.json → src/config/locale/zh-CN/device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"title": "机器",
"overview": "概览",
"cpu": "CPU",
Expand Down
18 changes: 9 additions & 9 deletions src/config/locale/zh-CN/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import common from './common.json';
import component from './component.json';
import configServer from './configServer.json';
import description from './description.json';
import device from './device.json';
import metric_description from './metric_description.json';
import rules from './rules.json';
import service from './service.json';
import base from './base.json';
import common from './common';
import component from './component';
import configServer from './configServer';
import description from './description';
import device from './device';
import metric_description from './metric_description';
import rules from './rules';
import service from './service';
import base from './base';

const zhCN = {
common,
Expand Down
2 changes: 1 addition & 1 deletion ...nfig/locale/zh-CN/metric_description.json → ...config/locale/zh-CN/metric_description.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"cpu_utilization": "CPU已使用百分比",
"cpu_idle": "CPU总空闲百分比",
"cpu_io_wait_used": "等待IO操作使用的CPU百分比",
Expand Down
4 changes: 2 additions & 2 deletions src/config/locale/zh-CN/rules.json → src/config/locale/zh-CN/rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
export default {
"usernameRequired": "请输入用户名",
"passwordRequired": "请输入密码",
"versionRequired":"请输入 NebulaGraph 版本"
"versionRequired":`请输入 ${process.env.PRODUCT_NAME} 版本`
}
2 changes: 1 addition & 1 deletion src/config/locale/zh-CN/service.json → src/config/locale/zh-CN/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
export default {
"serviceStatus": "当前服务状态",
"normal": "正常",
"overload": "超负荷",
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Login/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class ConfigServerForm extends React.Component<IProps> {
<div className="right">
<img src={nebulaLogo} className="logo" />
<div className="title">
<p>NebulaGraph</p>
<p>{process.env.PRODUCT_NAME}</p>
<p>Dashboard</p>
</div>
<p className="form-header">{intl.get('common.account')}</p>
Expand Down
44 changes: 22 additions & 22 deletions src/pages/ServiceDashboard/defaultPanelConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
type: ServiceName.GRAPHD,
panels: [
{
title: intl.get('metric_description.graphd_latency'),
title: intl.get('metric_description.overview_label.graphd_latency'),
valueType: VALUE_TYPE.latency,
space: '',
key: 'graphd_latency',
Expand All @@ -41,7 +41,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.graphd_sessions'),
title: intl.get('metric_description.overview_label.graphd_sessions'),
valueType: VALUE_TYPE.number,
space: '',
key: 'graphd_sessions',
Expand Down Expand Up @@ -69,7 +69,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.graphd_queries'),
title: intl.get('metric_description.overview_label.graphd_queries'),
valueType: VALUE_TYPE.number,
space: '',
key: 'graphd_queries',
Expand Down Expand Up @@ -101,7 +101,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.process_disk'),
title: intl.get('metric_description.overview_label.process_disk'),
valueType: VALUE_TYPE.byte,
key: 'process_disk',
space: '',
Expand All @@ -117,7 +117,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.process_cpu'),
title: intl.get('metric_description.overview_label.process_cpu'),
valueType: VALUE_TYPE.percentage,
key: 'process_cpu',
queries: [
Expand All @@ -128,7 +128,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.process_memory'),
title: intl.get('metric_description.overview_label.process_memory'),
valueType: VALUE_TYPE.byte,
key: 'process_memory',
queries: [
Expand All @@ -139,7 +139,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.process_context_open_file_desc'),
title: intl.get('metric_description.overview_label.process_context_open_file_desc'),
valueType: VALUE_TYPE.number,
key: 'process_context_open_file_desc',
queries: [
Expand All @@ -159,7 +159,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
type: ServiceName.METAD,
panels: [
{
title: intl.get('metric_description.metad_latency'),
title: intl.get('metric_description.overview_label.metad_latency'),
valueType: VALUE_TYPE.latency,
key: 'metad_latency',
queries: [
Expand Down Expand Up @@ -194,7 +194,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.metad_nums'),
title: intl.get('metric_description.overview_label.metad_nums'),
valueType: VALUE_TYPE.number,
key: 'metad_nums',
queries: [
Expand All @@ -217,7 +217,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.process_disk'),
title: intl.get('metric_description.overview_label.process_disk'),
valueType: VALUE_TYPE.byte,
key: 'process_disk',
queries: [
Expand All @@ -232,7 +232,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.process_cpu'),
title: intl.get('metric_description.overview_label.process_cpu'),
valueType: VALUE_TYPE.percentage,
key: 'process_cpu',
queries: [
Expand All @@ -243,7 +243,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.process_memory'),
title: intl.get('metric_description.overview_label.process_memory'),
valueType: VALUE_TYPE.byte,
key: 'process_memory',
queries: [
Expand All @@ -254,7 +254,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.process_context_open_file_desc'),
title: intl.get('metric_description.overview_label.process_context_open_file_desc'),
valueType: VALUE_TYPE.number,
key: 'process_context_open_file_desc',
queries: [
Expand All @@ -274,7 +274,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
type: ServiceName.STORAGED,
panels: [
{
title: intl.get('metric_description.storage_latency'),
title: intl.get('metric_description.overview_label.storage_latency'),
valueType: VALUE_TYPE.latency,
key: 'storage_latency',
queries: [
Expand Down Expand Up @@ -325,7 +325,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.storaged_edge_nums'),
title: intl.get('metric_description.overview_label.storaged_edge_nums'),
valueType: VALUE_TYPE.number,
key: 'storaged_edge_nums',
queries: [
Expand All @@ -340,7 +340,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.storaged_vertices_nums'),
title: intl.get('metric_description.overview_label.storaged_vertices_nums'),
valueType: VALUE_TYPE.number,
key: 'storaged_vertices_nums',
queries: [
Expand All @@ -355,7 +355,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.storaged_tag_and_dst_nums'),
title: intl.get('metric_description.overview_label.storaged_tag_and_dst_nums'),
valueType: VALUE_TYPE.number,
key: 'storaged_tag_and_dst_nums',
queries: [
Expand All @@ -378,7 +378,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.storaged_other_nums'),
title: intl.get('metric_description.overview_label.storaged_other_nums'),
valueType: VALUE_TYPE.number,
key: 'storaged_other_nums',
queries: [
Expand Down Expand Up @@ -413,7 +413,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.process_disk'),
title: intl.get('metric_description.overview_label.process_disk'),
valueType: VALUE_TYPE.byte,
key: 'process_disk',
queries: [
Expand All @@ -428,7 +428,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.process_cpu'),
title: intl.get('metric_description.overview_label.process_cpu'),
valueType: VALUE_TYPE.percentage,
key: 'process_cpu',
queries: [
Expand All @@ -439,7 +439,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.process_memory'),
title: intl.get('metric_description.overview_label.process_memory'),
valueType: VALUE_TYPE.byte,
key: 'process_memory',
queries: [
Expand All @@ -450,7 +450,7 @@ export const defaultServicePanelConfigData: ServicePanelConfigItem[] = [
]
},
{
title: intl.get('metric_description.process_context_open_file_desc'),
title: intl.get('metric_description.overview_label.process_context_open_file_desc'),
valueType: VALUE_TYPE.number,
key: 'process_context_open_file_desc',
queries: [
Expand Down
3 changes: 2 additions & 1 deletion src/typings.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ declare module '*.module.less' {
export default content;
}

declare var VERSION_TYPE: any;
declare var VERSION_TYPE: any;
declare let CurrentClusterType: any;
Loading