Add save selection, name search and bulk transfer to the saves table

Rows get checkboxes and the header checkbox selects every save matching
the name search, including those on other pages. Selected saves can be
copied or moved to another instance in one go, with copy on by default.

Closes #1253

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
bbassieandClaude Opus 5.5 committed 2026-11-21 19:06:38 +00:00
1 parent 516dc1b945
commit 73d70cbc91
1 file changed
+81 -24
+81 -24
View File
@@ -10,6 +10,7 @@ import * as lib from "@clusterio/lib";
import { useAccount } from "../model/account"; import { useAccount } from "../model/account";
import useTableQueryState from "../util/useTableQueryState"; import useTableQueryState from "../util/useTableQueryState";
import useColumnSearch from "../util/useColumnSearch";
import ControlContext from "./ControlContext"; import ControlContext from "./ControlContext";
import CreateSaveModal from "./CreateSaveModal"; import CreateSaveModal from "./CreateSaveModal";
import SectionHeader from "./SectionHeader"; import SectionHeader from "./SectionHeader";
@@ -107,17 +108,46 @@ function CopyModal(props: ModalProps) {
} }
function TransferModal(props: ModalProps) { type TransferModalProps = {
disabled: boolean;
saves: lib.SaveDetails[];
instanceId: number;
buttonText?: string;
onDone?: (failed: string[]) => void;
};
function TransferModal(props: TransferModalProps) {
let account = useAccount(); let account = useAccount();
let control = useContext(ControlContext); let control = useContext(ControlContext);
let [open, setOpen] = useState(false); let [open, setOpen] = useState(false);
let [form] = Form.useForm(); let [form] = Form.useForm();
let [instances] = useInstances(); let [instances] = useInstances();
const single = props.saves.length === 1 ? props.saves[0] : undefined;
const canCopy = account.hasPermission("core.instance.save.copy");
async function transfer(values: { targetInstanceId: number, transferredName?: string, copy: boolean }) {
const failed: string[] = [];
for (const save of props.saves) {
try {
await control.send(new lib.InstanceTransferSaveRequest(
props.instanceId,
save.name,
values.targetInstanceId,
(single && values.transferredName) || save.name,
values.copy,
));
} catch (err: any) {
failed.push(save.name);
notifyErrorHandler(`Error transfering ${save.name}`)(err);
}
}
return failed;
}
return <> return <>
<Button disabled={props.disabled} onClick={() => setOpen(true)}>Transfer</Button> <Button disabled={props.disabled} onClick={() => setOpen(true)}>{props.buttonText ?? "Transfer"}</Button>
<Modal <Modal
title="Transfer save" title={single ? "Transfer save" : `Transfer ${props.saves.length} saves`}
okText="Transfer" okText="Transfer"
open={open} open={open}
onOk={() => form.submit()} onOk={() => form.submit()}
@@ -128,22 +158,17 @@ function TransferModal(props: ModalProps) {
form={form} form={form}
labelCol={{ span: 6 }} labelCol={{ span: 6 }}
wrapperCol={{ span: 18 }} wrapperCol={{ span: 18 }}
initialValues={{ transferredName: props.save.name, copy: false }} initialValues={{ transferredName: single?.name, copy: !single && canCopy }}
onFinish={values => { onFinish={values => {
setOpen(false); setOpen(false);
let hide = message.loading("Transferring save...", 0); let hide = message.loading(single ? "Transferring save..." : "Transferring saves...", 0);
control.send(new lib.InstanceTransferSaveRequest( transfer(values).then(failed => {
props.instanceId, if (failed.length < props.saves.length) {
props.save.name, message.success(failed.length ? "Transfer partially complete" : "Transfer complete");
values.targetInstanceId, }
values.transferredName || props.save.name,
values.copy,
)).then(() => {
message.success("Transfer complete");
form.resetFields(); form.resetFields();
}).catch( props.onDone?.(failed);
notifyErrorHandler("Error transfering save") }).finally(() => hide());
).finally(() => hide());
}} }}
> >
<Form.Item <Form.Item
@@ -170,23 +195,21 @@ function TransferModal(props: ModalProps) {
</Select.Option>)} </Select.Option>)}
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item {single && <Form.Item
name="transferredName" name="transferredName"
label="Transferred name" label="Transferred name"
> >
<Input <Input
disabled={!account.hasAnyPermission("core.instance.save.rename", "core.instance.save.copy")} disabled={!account.hasAnyPermission("core.instance.save.rename", "core.instance.save.copy")}
/> />
</Form.Item> </Form.Item>}
<Form.Item <Form.Item
name="copy" name="copy"
valuePropName="checked" valuePropName="checked"
label="Copy" label="Copy"
tooltip="Copy instead of moving the save to the new instance." tooltip="Copy instead of moving the save to the new instance."
> >
<Checkbox <Checkbox disabled={!canCopy} />
disabled={!account.hasPermission("core.instance.save.copy")}
/>
</Form.Item> </Form.Item>
</Form> </Form>
</Modal> </Modal>
@@ -203,6 +226,17 @@ export default function SavesList(props: { instance: lib.InstanceDetails }) {
const tableState = useTableQueryState<lib.SaveDetails>({ const tableState = useTableQueryState<lib.SaveDetails>({
namespace: "save", defaultSortKey: "mtimeMs", defaultSortOrder: "descend", pagination: { defaultPageSize: 10 }, namespace: "save", defaultSortKey: "mtimeMs", defaultSortOrder: "descend", pagination: { defaultPageSize: 10 },
}); });
const nameSearch = useColumnSearch<lib.SaveDetails>(tableState, "name", save => save.name, "Search saves");
const [selectedNames, setSelectedNames] = useState<string[]>([]);
const saveList = [...saves.values()];
const selectedSaves = saveList.filter(save => selectedNames.includes(save.name));
const nameFilter = tableState.filteredValue("name")?.[0]?.toLowerCase();
const visibleNames = saveList
.filter(save => !nameFilter || save.name.toLowerCase().includes(nameFilter))
.map(save => save.name);
const visibleSelected = visibleNames.filter(name => selectedNames.includes(name)).length;
const canTransfer = account.hasPermission("core.instance.save.transfer");
let hostOffline = ["unassigned", "unknown"].includes(props.instance.status!); let hostOffline = ["unassigned", "unknown"].includes(props.instance.status!);
const saveTable = <Table const saveTable = <Table
@@ -219,6 +253,8 @@ export default function SavesList(props: { instance: lib.InstanceDetails }) {
</>, </>,
sorter: (a, b) => a.name.localeCompare(b.name), sorter: (a, b) => a.name.localeCompare(b.name),
sortOrder: tableState.sortOrder("name"), sortOrder: tableState.sortOrder("name"),
filteredValue: tableState.filteredValue("name"),
...nameSearch,
}, },
{ {
title: "Size", title: "Size",
@@ -237,10 +273,24 @@ export default function SavesList(props: { instance: lib.InstanceDetails }) {
sortOrder: tableState.sortOrder("mtimeMs"), sortOrder: tableState.sortOrder("mtimeMs"),
}, },
]} ]}
dataSource={[...saves.values()]} dataSource={saveList}
pagination={tableState.pagination} pagination={tableState.pagination}
onChange={tableState.onChange} onChange={tableState.onChange}
rowKey={save => save.name} rowKey={save => save.name}
rowSelection={canTransfer ? {
selectedRowKeys: selectedSaves.map(save => save.name),
onChange: keys => setSelectedNames(keys as string[]),
// Select all covers every save matching the search, not just the current page.
columnTitle: <Checkbox
disabled={!visibleNames.length}
checked={visibleNames.length > 0 && visibleSelected === visibleNames.length}
indeterminate={visibleSelected > 0 && visibleSelected < visibleNames.length}
onChange={e => setSelectedNames(e.target.checked
? [...new Set([...selectedNames, ...visibleNames])]
: selectedNames.filter(name => !visibleNames.includes(name))
)}
/>,
} : undefined}
expandable={{ expandable={{
columnWidth: 33, columnWidth: 33,
expandRowByClick: true, expandRowByClick: true,
@@ -281,8 +331,8 @@ export default function SavesList(props: { instance: lib.InstanceDetails }) {
); );
}} }}
>Download</Button>} >Download</Button>}
{account.hasPermission("core.instance.save.transfer") && <TransferModal {canTransfer && <TransferModal
disabled={hostOffline} instanceId={props.instance.id!} save={save} disabled={hostOffline} instanceId={props.instance.id!} saves={[save]}
/>} />}
{account.hasPermission("core.instance.save.delete") && <Popconfirm {account.hasPermission("core.instance.save.delete") && <Popconfirm
title="Permanently delete save?" title="Permanently delete save?"
@@ -320,6 +370,13 @@ export default function SavesList(props: { instance: lib.InstanceDetails }) {
return <div> return <div>
<SectionHeader title="Saves" extra={<Space wrap> <SectionHeader title="Saves" extra={<Space wrap>
{canTransfer && selectedSaves.length > 0 && <TransferModal
disabled={hostOffline}
instanceId={props.instance.id!}
saves={selectedSaves}
buttonText={`Transfer ${selectedSaves.length} selected`}
onDone={failed => setSelectedNames(failed)}
/>}
{account.hasPermission("core.instance.save.upload") && <Upload {...uploadProps} > {account.hasPermission("core.instance.save.upload") && <Upload {...uploadProps} >
<UploadButton disabled={hostOffline}> <UploadButton disabled={hostOffline}>
Upload save Upload save