Skip to content

Commit

Permalink
Spotless Apply
Browse files Browse the repository at this point in the history
  • Loading branch information
Zzm0809 authored and github-actions[bot] committed Dec 27, 2023
1 parent 50bfa73 commit 17b227e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
3 changes: 2 additions & 1 deletion dinky-web/src/locales/en-US/pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,8 @@ export default {
'metrics.flink.subTask': 'SubTask',
'metrics.flink.subTask.placeholder': 'Please select a SubTask Name',
'metrics.flink.taskId': 'Dinky Job ID',
'metrics.dinky.not.open': 'Dinky Server monitoring is not enabled, please go to the Setting Center -> Global Settings -> Metrics Configuration -> Dinky JVM Monitor switch to open',
'metrics.dinky.not.open':
'Dinky Server monitoring is not enabled, please go to the Setting Center -> Global Settings -> Metrics Configuration -> Dinky JVM Monitor switch to open',

/**
*
Expand Down
3 changes: 2 additions & 1 deletion dinky-web/src/locales/zh-CN/pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,8 @@ export default {
'metrics.flink.subTask': '子任务',
'metrics.flink.subTask.placeholder': '请选择子任务名称',
'metrics.flink.taskId': 'Dinky 任务ID',
'metrics.dinky.not.open': '暂未开启 Dinky Server 监控, 请前往 配置中心 -> 全局配置 -> Metrics 配置 -> Dinky JVM Monitor 开关 进行开启',
'metrics.dinky.not.open':
'暂未开启 Dinky Server 监控, 请前往 配置中心 -> 全局配置 -> Metrics 配置 -> Dinky JVM Monitor 开关 进行开启',
/**
*
* pages
Expand Down
10 changes: 7 additions & 3 deletions dinky-web/src/pages/Metrics/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import { MetricsTimeFilter } from '@/pages/DevOps/JobDetail/data';
import JobMetricsList from '@/pages/Metrics/JobMetricsList';
import Server from '@/pages/Metrics/Server';
import { getAllConfig } from '@/pages/Metrics/service';
import { l } from '@/utils/intl';
import { PageContainer, ProCard } from '@ant-design/pro-components';
import { Alert } from 'antd';
import { useState } from 'react';
import {Alert} from "antd";
import {l} from "@/utils/intl";

export default () => {
const [timeRange, setTimeRange] = useState<MetricsTimeFilter>({
Expand Down Expand Up @@ -57,7 +57,11 @@ export default () => {
fixedHeader={true}
//todo 后面title改为下拉列表,用户自定义选择展示哪些layout,而不是全部展示
loading={showServer.loading}
subTitle={!showServer.data && <Alert message={l('metrics.dinky.not.open')} type={'warning'} banner showIcon />}
subTitle={
!showServer.data && (
<Alert message={l('metrics.dinky.not.open')} type={'warning'} banner showIcon />
)
}
header={{ extra: [<MetricsFilter onTimeSelect={onTimeSelectChange} />] }}
content={
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { EnvConfig } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/E
import { FlinkConfig } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/FlinkConfig';
import { LdapConfig } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/LdapConfig';
import { MavenConfig } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/MavenConfig';
import { MetricsConfig } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/MetricsConfig';
import { ResourcesConfig } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/ResourcesConfig';
import { handleOption, queryDataByParams } from '@/services/BusinessCrud';
import { RESPONSE_CODE } from '@/services/constants';
Expand All @@ -42,7 +43,6 @@ import { BaseConfigProperties, Settings } from '@/types/SettingCenter/data';
import { l } from '@/utils/intl';
import { ProCard } from '@ant-design/pro-components';
import { memo, useEffect, useState } from 'react';
import {MetricsConfig} from "@/pages/SettingCenter/GlobalSetting/SettingOverView/MetricsConfig";

const imgSize = 25;

Expand Down

0 comments on commit 17b227e

Please sign in to comment.