Skip to content

Commit

Permalink
Merge pull request #206 from dotnetcore/feature/client-page-support-f…
Browse files Browse the repository at this point in the history 
…ilter-by-appid-and-env

Client page support filter by env and appid
  • Loading branch information
@kklldog
kklldog authored Jan 19, 2025
2 parents f081e07 + 4fa45d0 commit 7d1010a
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 100 deletions.
8 changes: 4 additions & 4 deletions src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<AssemblyVersion>1.9.9</AssemblyVersion>
<Version>1.9.9</Version>
<PackageVersion>1.9.9</PackageVersion>
<AssemblyVersion>1.9.10</AssemblyVersion>
<Version>1.9.10</Version>
<PackageVersion>1.9.10</PackageVersion>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<FileVersion>1.9.9</FileVersion>
<FileVersion>1.9.10</FileVersion>
<Authors>kklldog</Authors>
<Company>kklldog</Company>
</PropertyGroup>
Expand Down
13 changes: 12 additions & 1 deletion src/AgileConfig.Server.Apisite/Controllers/ReportController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public IActionResult ServerNodeClients(string address)
return Json(report);
}

public async Task<IActionResult> SearchServerNodeClients(string address, int current, int pageSize)
public async Task<IActionResult> SearchServerNodeClients(string address, string appId, string env, int current, int pageSize)
{
if (current <= 0)
{
Expand Down Expand Up @@ -91,6 +91,17 @@ public async Task<IActionResult> SearchServerNodeClients(string address, int cur
}
}

// filter by env
if (!string.IsNullOrEmpty(env))
{
clients = clients.Where(x => x.Env.Contains(env, StringComparison.CurrentCultureIgnoreCase)).ToList();
}
// filter by appid
if (!string.IsNullOrEmpty(appId))
{
clients = clients.Where(x => x.AppId.Contains(appId, StringComparison.CurrentCultureIgnoreCase)).ToList();
}

var page = clients.OrderBy(i => i.Address).ThenBy(i => i.Id).Skip((current - 1) * pageSize).Take(pageSize);

return Json(new
Expand Down
183 changes: 88 additions & 95 deletions src/AgileConfig.Server.UI/react-ui-antd/src/pages/Clients/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,146 +12,142 @@ import { queryNodes } from '../Nodes/service';
import { queryClients, reloadClientConfigs, clientOffline } from './service';
const { confirm } = Modal;

const handleClientReload = async (client:any)=>{
const handleClientReload = async (client: any) => {
const intl = getIntl(getLocale());
const hide = message.loading(intl.formatMessage({id: 'refreshing'}));
const hide = message.loading(intl.formatMessage({ id: 'refreshing' }));
try {
const result = await reloadClientConfigs(client.address, client.id);
hide();
const success = result.success;
if (success) {
message.success(intl.formatMessage({id: 'refresh_success'}));
message.success(intl.formatMessage({ id: 'refresh_success' }));
} else {
message.error(result.message);
}
return success;
} catch (error) {
hide();
message.error(intl.formatMessage({id: 'refresh_fail'}));
message.error(intl.formatMessage({ id: 'refresh_fail' }));
return false;
}
}
};


const handleClientOffline = async (client:any)=>{
const handleClientOffline = async (client: any) => {
const intl = getIntl(getLocale());
const hide = message.loading(intl.formatMessage({id: 'disconnecting'}));
const hide = message.loading(intl.formatMessage({ id: 'disconnecting' }));
try {
const result = await clientOffline(client.address, client.id);
hide();
const success = result.success;
if (success) {
message.success(intl.formatMessage({id: 'disconnect_success'}));
message.success(intl.formatMessage({ id: 'disconnect_success' }));
} else {
message.error(result.message);
}
return success;
} catch (error) {
hide();
message.error(intl.formatMessage({id: 'disconnect_fail'}));
message.error(intl.formatMessage({ id: 'disconnect_fail' }));
return false;
}
}
};

const clients:React.FC = () => {
const clients: React.FC = () => {
const actionRef = useRef<ActionType>();
const [appEnums, setAppEnums] = useState<any>();
const intl = useIntl();

const getNodesForSelect = async () =>
{
const result = await queryNodes()
const arr:any[] = [];
result.data.forEach((x:{address:string})=>{
arr.push({
value: x.address,
label: x.address,
});
const getNodesForSelect = async () => {
const result = await queryNodes();
const arr: any[] = [];
result.data.forEach((x: { address: string }) => {
arr.push({
value: x.address,
label: x.address,
});
});

return arr;
}
const getAppEnums = async () =>
{
const result = await queryApps({})
};
const getAppEnums = async () => {
const result = await queryApps({});
const obj = {};
result.data?.forEach(x=>{
if(x) {
result.data?.forEach((x) => {
if (x) {
obj[x.id] = {
text: x.name
}
text: x.name,
};
}
});

return obj;
}
useEffect(()=>{
getAppEnums().then(x=> {
};
useEffect(() => {
getAppEnums().then((x) => {
console.log('app enums ', x);
setAppEnums({...x});
setAppEnums({ ...x });
});
}, []);
const columns: ProColumns[] = [
{
title: intl.formatMessage({
id: 'pages.client.table.cols.id'
id: 'pages.client.table.cols.id',
}),
dataIndex: 'id',
hideInSearch: true,
ellipsis: true
ellipsis: true,
},
{
title: intl.formatMessage({
id: 'pages.client.table.cols.node'
id: 'pages.client.table.cols.node',
}),
dataIndex: 'address',
valueType: 'select',
request: getNodesForSelect
request: getNodesForSelect,
},
{
title: '环境',
dataIndex: 'env',
},
{
title: intl.formatMessage({
id: 'pages.client.table.cols.appid'
id: 'pages.client.table.cols.appid',
}),
dataIndex: 'appId',
hideInSearch: true,
},
{
title: '环境',
dataIndex: 'env',
hideInSearch: true,
},
{
title: intl.formatMessage({
id: 'pages.client.table.cols.ip'
id: 'pages.client.table.cols.ip',
}),
dataIndex: 'ip',
hideInSearch: true,
},
{
title: intl.formatMessage({
id: 'pages.client.table.cols.name'
id: 'pages.client.table.cols.name',
}),
dataIndex: 'name',
hideInSearch: true,
},{
},
{
title: intl.formatMessage({
id: 'pages.client.table.cols.tag'
id: 'pages.client.table.cols.tag',
}),
dataIndex: 'tag',
hideInSearch: true,
},
{
title: intl.formatMessage({
id: 'pages.client.table.cols.lastRefreshTime'
id: 'pages.client.table.cols.lastRefreshTime',
}),
dataIndex: 'lastRefreshTime',
hideInSearch: true,
valueType: 'dateTime',
tip: '客户端从服务器最后一次全量拉取配置的时间'
tip: '客户端从服务器最后一次全量拉取配置的时间',
},
{
title: intl.formatMessage({
id: 'pages.client.table.cols.action'
id: 'pages.client.table.cols.action',
}),
valueType: 'option',
render: (text, record) => [
Expand All @@ -160,57 +156,54 @@ const clients:React.FC = () => {
handleClientReload(record);
}}
>
{
intl.formatMessage({
id: 'pages.client.table.cols.action.refresh'
})
}
{intl.formatMessage({
id: 'pages.client.table.cols.action.refresh',
})}
</a>,
<AuthorizedEle judgeKey={functionKeys.Client_Disconnect}>
<Button type="link" danger onClick={
()=>{
const msg = intl.formatMessage({
id: 'pages.client.disconnect_message'
}) + `【${record.id}】`;
confirm({
icon: <ExclamationCircleOutlined />,
content: msg,
async onOk() {
console.log('disconnect client ' + record.id);
const success = await handleClientOffline(record);
if (success) {
actionRef.current?.reload();
}
},
onCancel() {
},
});
}}>
{
intl.formatMessage({
id: 'pages.client.table.cols.action.disconnect'
})
}
<Button
type="link"
danger
onClick={() => {
const msg =
intl.formatMessage({
id: 'pages.client.disconnect_message',
}) + `【${record.id}】`;
confirm({
icon: <ExclamationCircleOutlined />,
content: msg,
async onOk() {
console.log('disconnect client ' + record.id);
const success = await handleClientOffline(record);
if (success) {
actionRef.current?.reload();
}
},
onCancel() {},
});
}}
>
{intl.formatMessage({
id: 'pages.client.table.cols.action.disconnect',
})}
</Button>
</AuthorizedEle>
]
}
</AuthorizedEle>,
],
},
];
return (
<PageContainer header={{ title:intl.formatMessage({id:'pages.client.header.title'}) }}>
<ProTable
search={{
labelWidth: 'auto',
}}
actionRef={actionRef}
options={
false
}
<PageContainer header={{ title: intl.formatMessage({ id: 'pages.client.header.title' }) }}>
<ProTable
search={{
labelWidth: 'auto',
}}
actionRef={actionRef}
options={false}
rowKey="id"
columns = {columns}
request = { (params, sorter, filter) => queryClients(params) }
columns={columns}
request={(params, sorter, filter) => queryClients(params)}
/>
</PageContainer>
);
}
};
export default clients;

0 comments on commit 7d1010a

Please sign in to comment.