Add sorting to web interface tables

Add sort options to the slave, instance, user, role and plugins tables.
This commit is contained in:
Hornwitser committed 2021-09-27 03:45:52 +02:00
1 parent bfcb57002d
commit 714e590496
5 files changed
+39 -7

No files matched your search

@@ -11,6 +11,8 @@ import { useInstanceList } from "../model/instance";
import { notifyErrorHandler } from "../util/notify"; import { notifyErrorHandler } from "../util/notify";
import { useSlaveList } from "../model/slave"; import { useSlaveList } from "../model/slave";
const strcmp = new Intl.Collator(undefined, { numerice: "true", sensitivity: "base" }).compare;
function CreateInstanceButton(props) { function CreateInstanceButton(props) {
let control = useContext(ControlContext); let control = useContext(ControlContext);
@@ -64,6 +66,14 @@ export default function InstancesPage() {
let [slaveList] = useSlaveList(); let [slaveList] = useSlaveList();
let [instanceList] = useInstanceList(); let [instanceList] = useInstanceList();
function slaveName(slaveId) {
let slave = slaveList.find(s => s.id === slaveId);
if (slave) {
return slave.name;
}
return String(slaveId);
}
return <PageLayout nav={[{ name: "Instances" }]}> return <PageLayout nav={[{ name: "Instances" }]}>
<PageHeader <PageHeader
className="site-page-header" className="site-page-header"
@@ -76,21 +86,19 @@ export default function InstancesPage() {
{ {
title: "Name", title: "Name",
dataIndex: "name", dataIndex: "name",
defaultSortOrder: "ascend",
sorter: (a, b) => strcmp(a["name"], b["name"]),
}, },
{ {
title: "Assigned Slave", title: "Assigned Slave",
key: "assigned_slave", key: "assigned_slave",
render: instance => { render: instance => slaveName(instance["assigned_slave"]),
let slave = slaveList.find(s => s.id === instance.assigned_slave); sorter: (a, b) => strcmp(slaveName(a["assigned_slave"]), slaveName(b["assigned_slave"])),
if (slave) {
return slave.name;
}
return instance.assigned_slave;
},
}, },
{ {
title: "Status", title: "Status",
dataIndex: "status", dataIndex: "status",
sorter: (a, b) => strcmp(a["status"], b["status"]),
}, },
]} ]}
dataSource={instanceList} dataSource={instanceList}
@@ -6,6 +6,8 @@ import notify from "../util/notify";
import ControlContext from "./ControlContext"; import ControlContext from "./ControlContext";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
const strcmp = new Intl.Collator(undefined, { numerice: "true", sensitivity: "base" }).compare;
export default function PluginsPage() { export default function PluginsPage() {
let plugins = useContext(ControlContext).plugins; let plugins = useContext(ControlContext).plugins;
@@ -47,6 +49,8 @@ export default function PluginsPage() {
title: "Name", title: "Name",
key: "name", key: "name",
render: plugin => (plugin.info ? plugin.info.title : plugin.meta.name), render: plugin => (plugin.info ? plugin.info.title : plugin.meta.name),
defaultSortOrder: "ascend",
sorter: (a, b) => strcmp(a.info ? a.info.title : a.meta.name, b.info ? b.info.title : b.meta.name),
}, },
{ {
title: "Version", title: "Version",
@@ -60,11 +64,13 @@ export default function PluginsPage() {
} }
return plugin.package.version; return plugin.package.version;
}, },
sorter: (a, b) => strcmp(a.meta.version, b.meta.version),
}, },
{ {
title: "Loaded", title: "Loaded",
dataIndex: ["meta", "loaded"], dataIndex: ["meta", "loaded"],
render: loaded => (loaded ? "Yes" : null), render: loaded => (loaded ? "Yes" : null),
sorter: (a, b) => a.loaded - b.loaded,
responsive: ["sm"], responsive: ["sm"],
}, },
]} ]}
@@ -9,6 +9,8 @@ import ControlContext from "./ControlContext";
import { notifyErrorHandler } from "../util/notify"; import { notifyErrorHandler } from "../util/notify";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
const strcmp = new Intl.Collator(undefined, { numerice: "true", sensitivity: "base" }).compare;
function CreateRoleButton() { function CreateRoleButton() {
let control = useContext(ControlContext); let control = useContext(ControlContext);
@@ -81,6 +83,7 @@ export default function RolesPage() {
{ {
title: "Name", title: "Name",
dataIndex: "name", dataIndex: "name",
sorter: (a, b) => strcmp(a["name"], b["name"]),
}, },
{ {
title: "Description", title: "Description",
@@ -9,6 +9,8 @@ import PageLayout from "./PageLayout";
import { useSlaveList } from "../model/slave"; import { useSlaveList } from "../model/slave";
import { notifyErrorHandler } from "../util/notify"; import { notifyErrorHandler } from "../util/notify";
const strcmp = new Intl.Collator(undefined, { numerice: "true", sensitivity: "base" }).compare;
function GenerateSlaveTokenButton(props) { function GenerateSlaveTokenButton(props) {
let control = useContext(ControlContext); let control = useContext(ControlContext);
@@ -86,19 +88,25 @@ export default function SlavesPage() {
{ {
title: "Name", title: "Name",
dataIndex: "name", dataIndex: "name",
defaultSortOrder: "ascend",
sorter: (a, b) => strcmp(a["name"], b["name"]),
}, },
{ {
title: "Agent", title: "Agent",
dataIndex: "agent", dataIndex: "agent",
sorter: (a, b) => strcmp(a["agent"], b["agent"]),
responsive: ["lg"],
}, },
{ {
title: "Version", title: "Version",
dataIndex: "version", dataIndex: "version",
sorter: (a, b) => strcmp(a["version"], b["version"]),
}, },
{ {
title: "Connected", title: "Connected",
key: "connected", key: "connected",
render: slave => slave["connected"] && "Yes", render: slave => slave["connected"] && "Yes",
sorter: (a, b) => a["connected"] - b["connected"],
}, },
]} ]}
dataSource={slaveList} dataSource={slaveList}
@@ -9,6 +9,8 @@ import ControlContext from "./ControlContext";
import { notifyErrorHandler } from "../util/notify"; import { notifyErrorHandler } from "../util/notify";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
const strcmp = new Intl.Collator(undefined, { numerice: "true", sensitivity: "base" }).compare;
function CreateUserButton() { function CreateUserButton() {
let control = useContext(ControlContext); let control = useContext(ControlContext);
@@ -80,6 +82,8 @@ export default function UsersPage() {
{ {
title: "Name", title: "Name",
dataIndex: "name", dataIndex: "name",
defaultSortOrder: "ascend",
sorter: (a, b) => strcmp(a["name"], b["name"]),
}, },
{ {
title: "Roles", title: "Roles",
@@ -90,18 +94,21 @@ export default function UsersPage() {
title: "Admin", title: "Admin",
key: "admin", key: "admin",
render: user => user["is_admin"] && "yes", render: user => user["is_admin"] && "yes",
sorter: (a, b) => a["is_admin"] - b["is_admin"],
responsive: ["lg"], responsive: ["lg"],
}, },
{ {
title: "Whitelisted", title: "Whitelisted",
key: "whitelisted", key: "whitelisted",
render: user => user["is_whitelisted"] && "yes", render: user => user["is_whitelisted"] && "yes",
sorter: (a, b) => a["is_whitelisted"] - b["is_whitelisted"],
responsive: ["lg"], responsive: ["lg"],
}, },
{ {
title: "Banned", title: "Banned",
key: "banned", key: "banned",
render: user => user["is_banned"] && "yes", render: user => user["is_banned"] && "yes",
sorter: (a, b) => a["is_banned"] - b["is_banned"],
responsive: ["lg"], responsive: ["lg"],
}, },
]} ]}