mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-18 15:33:12 +09:00
Show the mod pack an instance uses in the web UI (#1177)
InstanceDetails now carries factorio.mod_pack_id as modPackId, so the instance list and pages can show it without fetching each config. The web UI resolves an unset value to the controller default and tags it "Default". The name links to the mod pack page. Closes #852 Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
6eaf48aefe
commit
d250394580
9 files changed
+138
-2
No files matched your search
@@ -7,12 +7,14 @@ import type { ColumnType } from "antd/es/table/interface";
|
||||
import { useAccount } from "../model/account";
|
||||
import { useSystems } from "../model/system";
|
||||
import { useHosts } from "../model/host";
|
||||
import { useDefaultModPack, useModPacks } from "../model/mod_pack";
|
||||
import { RestartRequired } from "./system_metrics";
|
||||
import InstanceStatusTag from "./InstanceStatusTag";
|
||||
import InstanceModPack from "./InstanceModPack";
|
||||
import InstanceControlButton, { InstanceControlButtonPermissions } from "./InstanceControlButton";
|
||||
import * as lib from "@clusterio/lib";
|
||||
import Link from "./Link";
|
||||
import { instancePublicAddress } from "../util/instance";
|
||||
import { instanceModPack, instancePublicAddress } from "../util/instance";
|
||||
import useTableQueryState from "../util/useTableQueryState";
|
||||
import useColumnSearch from "../util/useColumnSearch";
|
||||
import useRowNavigation from "../util/useRowNavigation";
|
||||
@@ -29,6 +31,8 @@ export default function InstanceList(props: InstanceListProps) {
|
||||
let account = useAccount();
|
||||
let [hosts] = useHosts();
|
||||
const [systems] = useSystems();
|
||||
const [modPacks] = useModPacks();
|
||||
const defaultModPack = useDefaultModPack();
|
||||
const tableState = useTableQueryState<lib.InstanceDetails>({
|
||||
namespace: "instance", defaultSortKey: "name",
|
||||
});
|
||||
@@ -44,6 +48,15 @@ export default function InstanceList(props: InstanceListProps) {
|
||||
return hosts.get(hostId)?.name ?? String(hostId);
|
||||
}
|
||||
|
||||
function modPackOf(instance: lib.InstanceDetails) {
|
||||
return instanceModPack(instance.modPackId, modPacks, defaultModPack);
|
||||
}
|
||||
|
||||
function modPackName(instance: lib.InstanceDetails) {
|
||||
const { id, modPack } = modPackOf(instance);
|
||||
return modPack?.name ?? (id !== undefined ? String(id) : "");
|
||||
}
|
||||
|
||||
function integerFactorioVersionOrDefault(instance: lib.InstanceDetails) {
|
||||
const v = instance.factorioVersion;
|
||||
if (v && lib.isPartialVersion(v)) {
|
||||
@@ -115,6 +128,15 @@ export default function InstanceList(props: InstanceListProps) {
|
||||
sortOrder: tableState.sortOrder("version"),
|
||||
responsive: ["xl"],
|
||||
},
|
||||
{
|
||||
title: "Mod Pack",
|
||||
key: "modPack",
|
||||
className: "table-link-cell",
|
||||
render: (_, instance) => <InstanceModPack resolved={modPackOf(instance)} />,
|
||||
sorter: (a, b) => strcmp(modPackName(a), modPackName(b)),
|
||||
sortOrder: tableState.sortOrder("modPack"),
|
||||
responsive: ["lg"],
|
||||
},
|
||||
{
|
||||
title: "Status",
|
||||
key: "status",
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
import React from "react";
|
||||
import { Space, Tag, Tooltip } from "antd";
|
||||
|
||||
import Link from "./Link";
|
||||
import type { ResolvedModPack } from "../util/instance";
|
||||
|
||||
export default function InstanceModPack(props: { resolved: ResolvedModPack }) {
|
||||
const { id, modPack, isDefault } = props.resolved;
|
||||
if (id === undefined) {
|
||||
return <em>Controller default</em>;
|
||||
}
|
||||
return <Space size="small">
|
||||
<Link to={`/mods/mod-packs/${id}/view`} onClick={e => e.stopPropagation()}>
|
||||
{modPack?.name ?? id}
|
||||
</Link>
|
||||
{isDefault && <Tooltip title="Not set on this instance, the controller default mod pack is used">
|
||||
<Tag>Default</Tag>
|
||||
</Tooltip>}
|
||||
</Space>;
|
||||
}
|
||||
@@ -31,7 +31,9 @@ import { CreateInstanceButton } from "./InstancesPage";
|
||||
import { useHost } from "../model/host";
|
||||
import InstanceStatusTag from "./InstanceStatusTag";
|
||||
import Link from "./Link";
|
||||
import { instancePublicAddress } from "../util/instance";
|
||||
import { instanceModPack, instancePublicAddress } from "../util/instance";
|
||||
import { useDefaultModPack, useModPacks } from "../model/mod_pack";
|
||||
import InstanceModPack from "./InstanceModPack";
|
||||
import useLocalStorage from "../util/useLocalStorage";
|
||||
import useResourceState from "../util/useResourceState";
|
||||
import { MetricRelativeDate } from "./system_metrics";
|
||||
@@ -60,9 +62,18 @@ function TemplateDescription(props: { instance: Readonly<lib.InstanceDetails> })
|
||||
{props.instance.templateId !== undefined && <Descriptions.Item label="Template">
|
||||
<TemplateLink id={props.instance.templateId} />
|
||||
</Descriptions.Item>}
|
||||
<Descriptions.Item label="Mod Pack">
|
||||
<ModPackDescription modPackId={props.instance.modPackId} />
|
||||
</Descriptions.Item>
|
||||
</Descriptions>;
|
||||
}
|
||||
|
||||
function ModPackDescription(props: { modPackId?: number }) {
|
||||
const [modPacks] = useModPacks();
|
||||
const defaultModPack = useDefaultModPack();
|
||||
return <InstanceModPack resolved={instanceModPack(props.modPackId, modPacks, defaultModPack)} />;
|
||||
}
|
||||
|
||||
function TemplateLink(props: { id: number }) {
|
||||
const [template] = useInstance(props.id);
|
||||
return <Link to={`/instances/${props.id}/view`}>{template?.name ?? props.id}</Link>;
|
||||
@@ -117,6 +128,9 @@ function InstanceDescription(props: InstanceDescriptionProps) {
|
||||
<Descriptions.Item label="Version">
|
||||
{instance.factorioVersion ?? "unknown"}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="Mod Pack">
|
||||
<ModPackDescription modPackId={instance.modPackId} />
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="Last Start Time">
|
||||
<MetricRelativeDate timeMs={instance.startedAtMs}/>
|
||||
</Descriptions.Item>
|
||||
|
||||
@@ -9,3 +9,29 @@ export function instancePublicAddress(instance: lib.InstanceDetails, host?: lib.
|
||||
}
|
||||
return `${host.publicAddress}:${instance.gamePort}`;
|
||||
}
|
||||
|
||||
export type ResolvedModPack = {
|
||||
/** ID of the mod pack, undefined if the default is used and not known */
|
||||
id?: number;
|
||||
modPack?: lib.ModPack;
|
||||
isDefault: boolean;
|
||||
};
|
||||
|
||||
/** Resolve the mod pack an instance starts with, falling back to the controller default */
|
||||
export function instanceModPack(
|
||||
modPackId: number | undefined,
|
||||
modPacks: ReadonlyMap<number, lib.ModPack>,
|
||||
defaultModPack?: lib.ModPack,
|
||||
): ResolvedModPack {
|
||||
if (modPackId !== undefined) {
|
||||
return { id: modPackId, modPack: modPacks.get(modPackId), isDefault: false };
|
||||
}
|
||||
if (!defaultModPack) {
|
||||
return { isDefault: true };
|
||||
}
|
||||
return {
|
||||
id: defaultModPack.id,
|
||||
modPack: modPacks.get(defaultModPack.id) ?? defaultModPack,
|
||||
isDefault: true,
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user