Reimplement PageHeader

Implement our own version ofwhe PageHeader component, due to it being
removed from ant design v5.
This commit is contained in:
Hornwitser committed 2023-07-27 17:37:27 +02:00
1 parent 789c02b5c7
commit 8d98eaf3a5
13 files changed
+59 -61

No files matched your search

@@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { Descriptions, PageHeader, Spin, Tag, Typography } from "antd"; import { Descriptions, Spin, Tag, Typography } from "antd";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import InstanceList from "./InstanceList"; import InstanceList from "./InstanceList";
@@ -7,6 +7,7 @@ import LogConsole from "./LogConsole";
import { useAccount } from "../model/account"; import { useAccount } from "../model/account";
import { useInstanceList } from "../model/instance"; import { useInstanceList } from "../model/instance";
import { useHost } from "../model/host"; import { useHost } from "../model/host";
import PageHeader from "./PageHeader";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
import PluginExtra from "./PluginExtra"; import PluginExtra from "./PluginExtra";
@@ -29,19 +30,13 @@ export default function HostViewPage(props) {
if (host.missing) { if (host.missing) {
return <PageLayout nav={nav}> return <PageLayout nav={nav}>
<PageHeader <PageHeader title={hostId} />
className="site-page-header"
title={hostId}
/>
<p>Host with id {hostId} was not found on the controller.</p> <p>Host with id {hostId} was not found on the controller.</p>
</PageLayout>; </PageLayout>;
} }
return <PageLayout nav={nav}> return <PageLayout nav={nav}>
<PageHeader <PageHeader title={host.name || hostId} />
className="site-page-header"
title={host.name || hostId}
/>
<Descriptions bordered size="small" column={{ xs: 1, sm: 2, xl: 4 }}> <Descriptions bordered size="small" column={{ xs: 1, sm: 2, xl: 4 }}>
<Descriptions.Item label="Name">{host["name"]}</Descriptions.Item> <Descriptions.Item label="Name">{host["name"]}</Descriptions.Item>
+2 -2
View File
@@ -1,12 +1,13 @@
import React, { useContext, useRef, useState, useEffect } from "react"; import React, { useContext, useRef, useState, useEffect } from "react";
import { useHistory } from "react-router-dom"; import { useHistory } from "react-router-dom";
import { Button, Form, InputNumber, Modal, PageHeader, Table, Tag, Typography } from "antd"; import { Button, Form, InputNumber, Modal, Table, Tag, Typography } from "antd";
import CopyOutlined from "@ant-design/icons/lib/icons/CopyOutlined"; import CopyOutlined from "@ant-design/icons/lib/icons/CopyOutlined";
import { libData } from "@clusterio/lib"; import { libData } from "@clusterio/lib";
import { useAccount } from "../model/account"; import { useAccount } from "../model/account";
import ControlContext from "./ControlContext"; import ControlContext from "./ControlContext";
import PageHeader from "./PageHeader";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
import PluginExtra from "./PluginExtra"; import PluginExtra from "./PluginExtra";
import { useHostList } from "../model/host"; import { useHostList } from "../model/host";
@@ -182,7 +183,6 @@ export default function HostsPage() {
return <PageLayout nav={[{ name: "Hosts" }]}> return <PageLayout nav={[{ name: "Hosts" }]}>
<PageHeader <PageHeader
className="site-page-header"
title="Hosts" title="Hosts"
extra={account.hasPermission("core.host.generate_token") && <GenerateHostTokenButton />} extra={account.hasPermission("core.host.generate_token") && <GenerateHostTokenButton />}
/> />
@@ -1,6 +1,6 @@
import React, { useContext, useState } from "react"; import React, { useContext, useState } from "react";
import { useHistory, useParams } from "react-router-dom"; import { useHistory, useParams } from "react-router-dom";
import { Alert, Button, Descriptions, Dropdown, Menu, Modal, PageHeader, Space, Spin, Typography } from "antd"; import { Alert, Button, Descriptions, Dropdown, Menu, Modal, Space, Spin, Typography } from "antd";
import DeleteOutlined from "@ant-design/icons/DeleteOutlined"; import DeleteOutlined from "@ant-design/icons/DeleteOutlined";
import DownOutlined from "@ant-design/icons/DownOutlined"; import DownOutlined from "@ant-design/icons/DownOutlined";
@@ -8,6 +8,7 @@ import { libData } from "@clusterio/lib";
import { useAccount } from "../model/account"; import { useAccount } from "../model/account";
import ControlContext from "./ControlContext"; import ControlContext from "./ControlContext";
import PageHeader from "./PageHeader";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
import PluginExtra from "./PluginExtra"; import PluginExtra from "./PluginExtra";
import InstanceConfigTree from "./InstanceConfigTree"; import InstanceConfigTree from "./InstanceConfigTree";
@@ -187,7 +188,6 @@ export default function InstanceViewPage(props) {
return <PageLayout nav={nav}> return <PageLayout nav={nav}>
<PageHeader <PageHeader
className="site-page-header"
title={instance.name} title={instance.name}
extra={instanceButtons} extra={instanceButtons}
/> />
@@ -1,11 +1,12 @@
import React, { useContext, useState } from "react"; import React, { useContext, useState } from "react";
import { useHistory } from "react-router-dom"; import { useHistory } from "react-router-dom";
import { Button, Form, Input, Modal, PageHeader } from "antd"; import { Button, Form, Input, Modal } from "antd";
import { libConfig, libData } from "@clusterio/lib"; import { libConfig, libData } from "@clusterio/lib";
import { useAccount } from "../model/account"; import { useAccount } from "../model/account";
import ControlContext from "./ControlContext"; import ControlContext from "./ControlContext";
import PageHeader from "./PageHeader";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
import PluginExtra from "./PluginExtra"; import PluginExtra from "./PluginExtra";
import { useInstanceList } from "../model/instance"; import { useInstanceList } from "../model/instance";
@@ -65,7 +66,6 @@ export default function InstancesPage() {
return <PageLayout nav={[{ name: "Instances" }]}> return <PageLayout nav={[{ name: "Instances" }]}>
<PageHeader <PageHeader
className="site-page-header"
title="Instances" title="Instances"
extra={<> extra={<>
{account.hasPermission("core.instance.create") && <CreateInstanceButton />} {account.hasPermission("core.instance.create") && <CreateInstanceButton />}
@@ -1,7 +1,7 @@
import React, { Fragment, memo, useCallback, useEffect, useContext, useRef, useState } from "react"; import React, { Fragment, memo, useCallback, useEffect, useContext, useRef, useState } from "react";
import { useHistory, useParams } from "react-router-dom"; import { useHistory, useParams } from "react-router-dom";
import { import {
Button, Card, Checkbox, Col, ConfigProvider, Descriptions, Form, Input, PageHeader, Pagination, Button, Card, Checkbox, Col, ConfigProvider, Descriptions, Form, Input, Pagination,
Popconfirm, Row, Table, Tag, Typography, Select, Skeleton, Space, Spin, Switch, Modal, Tooltip, Popconfirm, Row, Table, Tag, Typography, Select, Skeleton, Space, Spin, Switch, Modal, Tooltip,
} from "antd"; } from "antd";
import InfoCircleOutlined from "@ant-design/icons/InfoCircleOutlined"; import InfoCircleOutlined from "@ant-design/icons/InfoCircleOutlined";
@@ -20,6 +20,7 @@ import { useModPack } from "../model/mod_pack";
import { useModList } from "../model/mods"; import { useModList } from "../model/mods";
import { useClipboard } from "../util/clipboard"; import { useClipboard } from "../util/clipboard";
import notify, { notifyErrorHandler } from "../util/notify"; import notify, { notifyErrorHandler } from "../util/notify";
import PageHeader from "./PageHeader";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
import SectionHeader from "./SectionHeader"; import SectionHeader from "./SectionHeader";
import ModDetails from "./ModDetails"; import ModDetails from "./ModDetails";
@@ -682,27 +683,20 @@ export default function ModPackViewPage() {
let nav = [{ name: "Mods", path: "/mods" }, { name: "Mod Packs" }, { name: modPack.name || modPackId }]; let nav = [{ name: "Mods", path: "/mods" }, { name: "Mod Packs" }, { name: modPack.name || modPackId }];
if (modifiedModPack.loading) { if (modifiedModPack.loading) {
return <PageLayout nav={nav}> return <PageLayout nav={nav}>
<PageHeader <PageHeader title={modPackId} />
className="site-page-header"
title={modPackId}
/>
<Spin size="large" /> <Spin size="large" />
</PageLayout>; </PageLayout>;
} }
if (modifiedModPack.missing) { if (modifiedModPack.missing) {
return <PageLayout nav={nav}> return <PageLayout nav={nav}>
<PageHeader <PageHeader title="Mod Pack Not Found" />
className="site-page-header"
title="Mod Pack Not Found"
/>
<p>Mod pack with id {modPackId} was not found on the controller.</p> <p>Mod pack with id {modPackId} was not found on the controller.</p>
</PageLayout>; </PageLayout>;
} }
return <PageLayout nav={nav}> return <PageLayout nav={nav}>
<PageHeader <PageHeader
className="site-page-header"
title={modPack.name} title={modPack.name}
extra={<Space> extra={<Space>
<ExportButton modPack={modifiedModPack}/> <ExportButton modPack={modifiedModPack}/>
+3 -5
View File
@@ -1,6 +1,6 @@
import React, { Fragment, useState, useContext } from "react"; import React, { Fragment, useState, useContext } from "react";
import { useHistory } from "react-router-dom"; import { useHistory } from "react-router-dom";
import { Button, Form, Input, Modal, PageHeader, Popconfirm, Space, Table, Typography, Upload } from "antd"; import { Button, Form, Input, Modal, Popconfirm, Space, Table, Typography, Upload } from "antd";
import ImportOutlined from "@ant-design/icons/ImportOutlined"; import ImportOutlined from "@ant-design/icons/ImportOutlined";
import PlusOutlined from "@ant-design/icons/PlusOutlined"; import PlusOutlined from "@ant-design/icons/PlusOutlined";
import UploadOutlined from "@ant-design/icons/UploadOutlined"; import UploadOutlined from "@ant-design/icons/UploadOutlined";
@@ -12,6 +12,7 @@ import { useModList } from "../model/mods";
import { useModPackList } from "../model/mod_pack"; import { useModPackList } from "../model/mod_pack";
import { notifyErrorHandler } from "../util/notify"; import { notifyErrorHandler } from "../util/notify";
import ControlContext from "./ControlContext"; import ControlContext from "./ControlContext";
import PageHeader from "./PageHeader";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
import PluginExtra from "./PluginExtra"; import PluginExtra from "./PluginExtra";
import SectionHeader from "./SectionHeader"; import SectionHeader from "./SectionHeader";
@@ -184,10 +185,7 @@ export default function ModsPage() {
} }
return <PageLayout nav={[{ name: "Mods" }]}> return <PageLayout nav={[{ name: "Mods" }]}>
<PageHeader <PageHeader title="Mods" />
className="site-page-header"
title="Mods"
/>
<SectionHeader <SectionHeader
title="Mod Packs" title="Mod Packs"
extra={<Space> extra={<Space>
@@ -0,0 +1,8 @@
import React from "react";
export default function PageHeader(props) {
return <div className="page-header">
<h2 className="page-header-title">{props.title}</h2>
{props.extra && <div className="page-header-extra">{props.extra}</div>}
</div>;
}
@@ -1,12 +1,13 @@
import React, { useEffect, useContext, useState } from "react"; import React, { useEffect, useContext, useState } from "react";
import { useHistory, useParams } from "react-router-dom"; import { useHistory, useParams } from "react-router-dom";
import { Button, Checkbox, Form, Input, PageHeader, Popconfirm, Spin } from "antd"; import { Button, Checkbox, Form, Input, Popconfirm, Spin } from "antd";
import DeleteOutlined from "@ant-design/icons/DeleteOutlined"; import DeleteOutlined from "@ant-design/icons/DeleteOutlined";
import { libData, libUsers } from "@clusterio/lib"; import { libData, libUsers } from "@clusterio/lib";
import { useAccount } from "../model/account"; import { useAccount } from "../model/account";
import ControlContext from "./ControlContext"; import ControlContext from "./ControlContext";
import PageHeader from "./PageHeader";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
import PluginExtra from "./PluginExtra"; import PluginExtra from "./PluginExtra";
import { notifyErrorHandler } from "../util/notify"; import { notifyErrorHandler } from "../util/notify";
@@ -53,20 +54,14 @@ export default function RoleViewPage() {
let nav = [{ name: "Roles", path: "/roles" }, { name: role["name"] || roleId }]; let nav = [{ name: "Roles", path: "/roles" }, { name: role["name"] || roleId }];
if (role.loading) { if (role.loading) {
return <PageLayout nav={nav}> return <PageLayout nav={nav}>
<PageHeader <PageHeader title={roleId} />
className="site-page-header"
title={roleId}
/>
<Spin size="large" /> <Spin size="large" />
</PageLayout>; </PageLayout>;
} }
if (role.missing) { if (role.missing) {
return <PageLayout nav={nav}> return <PageLayout nav={nav}>
<PageHeader <PageHeader title="Role not found" />
className="site-page-header"
title="Role not found"
/>
<p>Role with id {roleId} was not found on the controller.</p> <p>Role with id {roleId} was not found on the controller.</p>
</PageLayout>; </PageLayout>;
} }
@@ -101,7 +96,6 @@ export default function RoleViewPage() {
}} }}
> >
<PageHeader <PageHeader
className="site-page-header"
title={role["name"]} title={role["name"]}
extra={<> extra={<>
{canUpdate && <Button type={edited ? "primary" : "default"} htmlType="submit">Apply</Button>} {canUpdate && <Button type={edited ? "primary" : "default"} htmlType="submit">Apply</Button>}
+2 -2
View File
@@ -1,12 +1,13 @@
import React, { useContext, useEffect, useState } from "react"; import React, { useContext, useEffect, useState } from "react";
import { useHistory } from "react-router-dom"; import { useHistory } from "react-router-dom";
import { Button, Form, Input, Modal, PageHeader, Table } from "antd"; import { Button, Form, Input, Modal, Table } from "antd";
import { libData } from "@clusterio/lib"; import { libData } from "@clusterio/lib";
import { useAccount } from "../model/account"; import { useAccount } from "../model/account";
import ControlContext from "./ControlContext"; import ControlContext from "./ControlContext";
import { notifyErrorHandler } from "../util/notify"; import { notifyErrorHandler } from "../util/notify";
import PageHeader from "./PageHeader";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
import PluginExtra from "./PluginExtra"; import PluginExtra from "./PluginExtra";
@@ -73,7 +74,6 @@ export default function RolesPage() {
return <PageLayout nav={[{ name: "Roles" }]}> return <PageLayout nav={[{ name: "Roles" }]}>
<PageHeader <PageHeader
className="site-page-header"
title="Roles" title="Roles"
extra={account.hasPermission("core.role.create") && <CreateRoleButton />} extra={account.hasPermission("core.role.create") && <CreateRoleButton />}
/> />
@@ -1,7 +1,7 @@
import React, { useEffect, useContext, useState } from "react"; import React, { useEffect, useContext, useState } from "react";
import { useHistory, useParams } from "react-router-dom"; import { useHistory, useParams } from "react-router-dom";
import { import {
Button, Col, Descriptions, Form, Input, PageHeader, Popconfirm, Button, Col, Descriptions, Form, Input, Popconfirm,
Row, Table, Tag, Select, Space, Spin, Switch, Row, Table, Tag, Select, Space, Spin, Switch,
} from "antd"; } from "antd";
import DeleteOutlined from "@ant-design/icons/DeleteOutlined"; import DeleteOutlined from "@ant-design/icons/DeleteOutlined";
@@ -11,6 +11,7 @@ import { libErrors, libData } from "@clusterio/lib";
import { useAccount } from "../model/account"; import { useAccount } from "../model/account";
import { useInstanceList } from "../model/instance"; import { useInstanceList } from "../model/instance";
import ControlContext from "./ControlContext"; import ControlContext from "./ControlContext";
import PageHeader from "./PageHeader";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
import PluginExtra from "./PluginExtra"; import PluginExtra from "./PluginExtra";
import SectionHeader from "./SectionHeader"; import SectionHeader from "./SectionHeader";
@@ -62,20 +63,14 @@ export default function UserViewPage() {
let nav = [{ name: "Users", path: "/users" }, { name: userName }]; let nav = [{ name: "Users", path: "/users" }, { name: userName }];
if (user.loading) { if (user.loading) {
return <PageLayout nav={nav}> return <PageLayout nav={nav}>
<PageHeader <PageHeader title={userName} />
className="site-page-header"
title={userName}
/>
<Spin size="large" /> <Spin size="large" />
</PageLayout>; </PageLayout>;
} }
if (user.missing) { if (user.missing) {
return <PageLayout nav={nav}> return <PageLayout nav={nav}>
<PageHeader <PageHeader title="User not found" />
className="site-page-header"
title="User not found"
/>
<p>User with name {userName} was not found on the controller.</p> <p>User with name {userName} was not found on the controller.</p>
</PageLayout>; </PageLayout>;
} }
@@ -112,7 +107,6 @@ export default function UserViewPage() {
return <PageLayout nav={nav}> return <PageLayout nav={nav}>
<PageHeader <PageHeader
className="site-page-header"
title={<Space> title={<Space>
{userName} {userName}
<span> <span>
+2 -2
View File
@@ -1,6 +1,6 @@
import React, { useEffect, useContext, useState } from "react"; import React, { useEffect, useContext, useState } from "react";
import { useHistory } from "react-router-dom"; import { useHistory } from "react-router-dom";
import { Button, Form, Input, Modal, PageHeader, Space, Table, Tag } from "antd"; import { Button, Form, Input, Modal, Space, Table, Tag } from "antd";
import { libData } from "@clusterio/lib"; import { libData } from "@clusterio/lib";
@@ -8,6 +8,7 @@ import { useAccount } from "../model/account";
import ControlContext from "./ControlContext"; import ControlContext from "./ControlContext";
import { notifyErrorHandler } from "../util/notify"; import { notifyErrorHandler } from "../util/notify";
import { formatDuration } from "../util/time_format"; import { formatDuration } from "../util/time_format";
import PageHeader from "./PageHeader";
import PageLayout from "./PageLayout"; import PageLayout from "./PageLayout";
import PluginExtra from "./PluginExtra"; import PluginExtra from "./PluginExtra";
import { formatLastSeen, sortLastSeen, useUserList } from "../model/user"; import { formatLastSeen, sortLastSeen, useUserList } from "../model/user";
@@ -73,7 +74,6 @@ export default function UsersPage() {
return <PageLayout nav={[{ name: "Users" }]}> return <PageLayout nav={[{ name: "Users" }]}>
<PageHeader <PageHeader
className="site-page-header"
title="Users" title="Users"
extra={account.hasPermission("core.user.create") && <CreateUserButton />} extra={account.hasPermission("core.user.create") && <CreateUserButton />}
/> />
+21 -7
View File
@@ -67,29 +67,43 @@ body {
padding-right: 64px; padding-right: 64px;
} }
.site-page-header { .page-header {
padding: 0 0 16px; padding: 0 0 16px;
} }
.section-header { .site-layout-content > h2:first-child {
margin-top: 0;
}
.section-header, .page-header {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
}
.section-header {
margin-top: 16px; margin-top: 16px;
margin-bottom: 8px; margin-bottom: 8px;
} }
.section-header-title { .section-header-title, .page-header-title {
flex: auto; flex: auto;
overflow: hidden; overflow: hidden;
font-weight: bold;
font-size: 16px;
line-height: 1.5715;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.section-header-extra { .section-header-title {
font-weight: bold;
font-size: 16px;
line-height: 1.5715;
}
.page-header-title {
margin: 4px 0;
}
.section-header-extra, .page-header-extra {
margin-left: auto; margin-left: auto;
} }
+1
View File
@@ -23,6 +23,7 @@ export { default as InstanceStatusTag } from "./components/InstanceStatusTag";
export { default as StartStopInstanceButton } from "./components/StartStopInstanceButton"; export { default as StartStopInstanceButton } from "./components/StartStopInstanceButton";
export { statusColors } from "./components/InstanceStatusTag"; export { statusColors } from "./components/InstanceStatusTag";
export { default as PageHeader } from "./components/PageHeader";
export { default as PageLayout } from "./components/PageLayout"; export { default as PageLayout } from "./components/PageLayout";
export { default as SavesList } from "./components/SavesList"; export { default as SavesList } from "./components/SavesList";
export { default as SectionHeader } from "./components/SectionHeader"; export { default as SectionHeader } from "./components/SectionHeader";