From 73d70cbc910f41d584f50cdc0b7dd5e39156c4fc Mon Sep 17 00:00:00 2001 From: bbassie <17990055+bbassie@users.noreply.github.com> Date: Sat, 21 Nov 2026 19:06:38 +0000 Subject: [PATCH 1/3] 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 --- packages/web_ui/src/components/SavesList.tsx | 105 ++++++++++++++----- 1 file changed, 81 insertions(+), 24 deletions(-) diff --git a/packages/web_ui/src/components/SavesList.tsx b/packages/web_ui/src/components/SavesList.tsx index 79d3e3ba..37d083ce 100644 --- a/packages/web_ui/src/components/SavesList.tsx +++ b/packages/web_ui/src/components/SavesList.tsx @@ -10,6 +10,7 @@ import * as lib from "@clusterio/lib"; import { useAccount } from "../model/account"; import useTableQueryState from "../util/useTableQueryState"; +import useColumnSearch from "../util/useColumnSearch"; import ControlContext from "./ControlContext"; import CreateSaveModal from "./CreateSaveModal"; 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 control = useContext(ControlContext); let [open, setOpen] = useState(false); let [form] = Form.useForm(); 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 <> - + form.submit()} @@ -128,22 +158,17 @@ function TransferModal(props: ModalProps) { form={form} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }} - initialValues={{ transferredName: props.save.name, copy: false }} + initialValues={{ transferredName: single?.name, copy: !single && canCopy }} onFinish={values => { setOpen(false); - let hide = message.loading("Transferring save...", 0); - control.send(new lib.InstanceTransferSaveRequest( - props.instanceId, - props.save.name, - values.targetInstanceId, - values.transferredName || props.save.name, - values.copy, - )).then(() => { - message.success("Transfer complete"); + let hide = message.loading(single ? "Transferring save..." : "Transferring saves...", 0); + transfer(values).then(failed => { + if (failed.length < props.saves.length) { + message.success(failed.length ? "Transfer partially complete" : "Transfer complete"); + } form.resetFields(); - }).catch( - notifyErrorHandler("Error transfering save") - ).finally(() => hide()); + props.onDone?.(failed); + }).finally(() => hide()); }} > )} - - + } - + @@ -203,6 +226,17 @@ export default function SavesList(props: { instance: lib.InstanceDetails }) { const tableState = useTableQueryState({ namespace: "save", defaultSortKey: "mtimeMs", defaultSortOrder: "descend", pagination: { defaultPageSize: 10 }, }); + const nameSearch = useColumnSearch(tableState, "name", save => save.name, "Search saves"); + const [selectedNames, setSelectedNames] = useState([]); + + 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!); const saveTable = , sorter: (a, b) => a.name.localeCompare(b.name), sortOrder: tableState.sortOrder("name"), + filteredValue: tableState.filteredValue("name"), + ...nameSearch, }, { title: "Size", @@ -237,10 +273,24 @@ export default function SavesList(props: { instance: lib.InstanceDetails }) { sortOrder: tableState.sortOrder("mtimeMs"), }, ]} - dataSource={[...saves.values()]} + dataSource={saveList} pagination={tableState.pagination} onChange={tableState.onChange} 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: 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={{ columnWidth: 33, expandRowByClick: true, @@ -281,8 +331,8 @@ export default function SavesList(props: { instance: lib.InstanceDetails }) { ); }} >Download} - {account.hasPermission("core.instance.save.transfer") && } {account.hasPermission("core.instance.save.delete") && + {canTransfer && selectedSaves.length > 0 && setSelectedNames(failed)} + />} {account.hasPermission("core.instance.save.upload") && Upload save From cd2933417a1fc7cf3869d376907ba7e509a68531 Mon Sep 17 00:00:00 2001 From: bbassie <17990055+bbassie@users.noreply.github.com> Date: Sat, 21 Nov 2026 21:04:04 +0000 Subject: [PATCH 2/3] Add bulk copy, download and delete for selected saves Copy picks name-2.zip, name-3.zip and so on, skipping names already taken, because the host refuses to overwrite on copy. Downloads use a link with the download attribute so several in a row do not cancel each other. Co-Authored-By: Claude Opus 5.5 --- packages/web_ui/src/components/SavesList.tsx | 153 +++++++++++++++---- 1 file changed, 122 insertions(+), 31 deletions(-) diff --git a/packages/web_ui/src/components/SavesList.tsx b/packages/web_ui/src/components/SavesList.tsx index 37d083ce..c7644a77 100644 --- a/packages/web_ui/src/components/SavesList.tsx +++ b/packages/web_ui/src/components/SavesList.tsx @@ -1,7 +1,7 @@ import React, { useContext, useState } from "react"; import { message, Button, Checkbox, Form, Input, Modal, - Popconfirm, Select, Space, Table, Tooltip, Upload, + Popconfirm, Select, Space, Table, Tooltip, Typography, Upload, } from "antd"; import CaretLeftOutlined from "@ant-design/icons/CaretLeftOutlined"; import LeftOutlined from "@ant-design/icons/LeftOutlined"; @@ -11,6 +11,7 @@ import * as lib from "@clusterio/lib"; import { useAccount } from "../model/account"; import useTableQueryState from "../util/useTableQueryState"; import useColumnSearch from "../util/useColumnSearch"; +import type { Control } from "../util/websocket"; import ControlContext from "./ControlContext"; import CreateSaveModal from "./CreateSaveModal"; import SectionHeader from "./SectionHeader"; @@ -108,11 +109,50 @@ function CopyModal(props: ModalProps) { } +/** Runs action on each save in turn, returning the names that failed. */ +async function forEachSave( + saves: lib.SaveDetails[], + action: (save: lib.SaveDetails) => Promise, + errorText: string, +) { + const failed: string[] = []; + for (const save of saves) { + try { + await action(save); + } catch (err: any) { + failed.push(save.name); + notifyErrorHandler(`${errorText} ${save.name}`)(err); + } + } + return failed; +} + +function downloadSave(control: Control, instanceId: number, name: string) { + return control.send(new lib.InstanceDownloadSaveRequest(instanceId, name)).then(streamId => { + let url = new URL(webRoot, document.location.href); + url.pathname += `api/stream/${streamId}`; + // A download link instead of navigating, so several downloads do not cancel each other. + const link = document.createElement("a"); + link.href = url.href; + link.download = name; + link.click(); + }); +} + +function unusedSaveName(name: string, taken: Set) { + const base = name.replace(/\.zip$/, ""); + for (let i = 2; ; i++) { + const candidate = `${base}-${i}.zip`; + if (!taken.has(candidate)) { + return candidate; + } + } +} + type TransferModalProps = { disabled: boolean; saves: lib.SaveDetails[]; instanceId: number; - buttonText?: string; onDone?: (failed: string[]) => void; }; @@ -125,27 +165,18 @@ function TransferModal(props: TransferModalProps) { 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; + function transfer(values: { targetInstanceId: number, transferredName?: string, copy: boolean }) { + return forEachSave(props.saves, save => control.send(new lib.InstanceTransferSaveRequest( + props.instanceId, + save.name, + values.targetInstanceId, + (single && values.transferredName) || save.name, + values.copy, + )), "Error transfering"); } return <> - + void; +}; + +function BulkActions(props: BulkActionsProps) { + const account = useAccount(); + const control = useContext(ControlContext); + const [running, setRunning] = useState(); + const count = props.saves.length; + + function run(name: string, action: (save: lib.SaveDetails) => Promise, errorText: string) { + setRunning(name); + forEachSave(props.saves, action, errorText) + .then(props.onDone) + .finally(() => setRunning(undefined)); + } + + function copy() { + const taken = new Set(props.allNames); + run("copy", save => { + const destination = unusedSaveName(save.name, taken); + taken.add(destination); + return control.send(new lib.InstanceCopySaveRequest(props.instanceId, save.name, destination)); + }, "Error copying"); + } + + const disabled = props.disabled || running !== undefined; + return + {count} selected + {account.hasPermission("core.instance.save.copy") && } + {account.hasPermission("core.instance.save.download") && } + {account.hasPermission("core.instance.save.transfer") && } + {account.hasPermission("core.instance.save.delete") && run("delete", save => control.send( + new lib.InstanceDeleteSaveRequest(props.instanceId, save.name) + ), "Error deleting")} + > + + } + ; +} + + export default function SavesList(props: { instance: lib.InstanceDetails }) { let account = useAccount(); let control = useContext(ControlContext); @@ -237,6 +328,12 @@ export default function SavesList(props: { instance: lib.InstanceDetails }) { .map(save => save.name); const visibleSelected = visibleNames.filter(name => selectedNames.includes(name)).length; const canTransfer = account.hasPermission("core.instance.save.transfer"); + const canSelect = account.hasAnyPermission( + "core.instance.save.copy", + "core.instance.save.download", + "core.instance.save.transfer", + "core.instance.save.delete", + ); let hostOffline = ["unassigned", "unknown"].includes(props.instance.status!); const saveTable =
save.name} - rowSelection={canTransfer ? { + rowSelection={canSelect ? { 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. @@ -320,13 +417,7 @@ export default function SavesList(props: { instance: lib.InstanceDetails }) { {account.hasPermission("core.instance.save.download") && } {account.hasPermission("core.instance.save.download") &&