diff --git a/packages/controller/src/ControlConnection.ts b/packages/controller/src/ControlConnection.ts index 05c1e833..9f48aa53 100644 --- a/packages/controller/src/ControlConnection.ts +++ b/packages/controller/src/ControlConnection.ts @@ -631,7 +631,8 @@ export default class ControlConnection extends BaseConnection { * @param request - The request object containing factorioVersion. */ async handleModPortalGetAllRequest(request: lib.ModPortalGetAllRequest) { - const cacheKey = `${request.factorioVersion}-${request.hide_deprecated}`; + const hideDeprecated = request.hide_deprecated ?? false; + const cacheKey = `${request.factorioVersion}-${hideDeprecated}`; const cachedData = this._controller.modPortalCache.get(cacheKey); const cacheDuration = this._controller.config.get("controller.mod_portal_cache_duration_minutes") * 60 * 1000; @@ -644,7 +645,7 @@ export default class ControlConnection extends BaseConnection { const mods = await lib.ModStore.fetchAllModsFromPortal( request.factorioVersion, this._controller.config.get("controller.mod_portal_page_size"), - request.hide_deprecated + hideDeprecated ); this._controller.modPortalCache.set(cacheKey, { timestamp: Date.now(), data: mods }); // The Response class is defined inline within the Request class diff --git a/packages/web_ui/src/components/InstanceViewPage.tsx b/packages/web_ui/src/components/InstanceViewPage.tsx index e6d6fae1..9d3f1be3 100644 --- a/packages/web_ui/src/components/InstanceViewPage.tsx +++ b/packages/web_ui/src/components/InstanceViewPage.tsx @@ -181,7 +181,7 @@ function InstanceButtons(props: { instance: lib.InstanceDetails }) { function confirmDelete() { Modal.confirm({ autoFocusButton: "cancel", - content: "Permamently delete instance and server saves?", + content: "Permanently delete instance and server saves?", okText: "Delete", okButtonProps: { danger: true }, onOk: () => { diff --git a/packages/web_ui/src/components/ModsPage.tsx b/packages/web_ui/src/components/ModsPage.tsx index 731a90a0..89cd26e7 100644 --- a/packages/web_ui/src/components/ModsPage.tsx +++ b/packages/web_ui/src/components/ModsPage.tsx @@ -11,7 +11,7 @@ import * as lib from "@clusterio/lib"; import { useAccount } from "../model/account"; import { useMods } from "../model/mods"; -import { useModPacks } from "../model/mod_pack"; +import { useDefaultModPack, useModPacks } from "../model/mod_pack"; import { notifyErrorHandler } from "../util/notify"; import ControlContext from "./ControlContext"; import PageHeader from "./PageHeader"; @@ -143,6 +143,16 @@ function CreateModPackButton() { ; } +function defaultSearchVersion(modPack?: lib.ModPack): lib.MajorMinorVersion { + if (modPack) { + const version = lib.normaliseMajorMinorVersion(modPack.factorioVersion); + if ((lib.ApiVersions as readonly string[]).includes(version)) { + return version; + } + } + return lib.ApiVersions[lib.ApiVersions.length - 1]; +} + function SearchModsButton() { const control = useContext(ControlContext); const account = useAccount(); @@ -150,7 +160,9 @@ function SearchModsButton() { const [form] = Form.useForm(); const nameInputRef = useRef(null); const [searchText, setSearchText] = useState(""); - const [factorioVersion, setFactorioVersion] = useState("2.0"); + const defaultModPack = useDefaultModPack(); + const [pickedVersion, setPickedVersion] = useState(); + const factorioVersion = pickedVersion ?? defaultSearchVersion(defaultModPack); // State for all mods fetched from backend const [allMods, setAllMods] = useState([]); @@ -274,22 +286,20 @@ function SearchModsButton() { return filtered.length; }, [allMods, searchText]); - // Update search text and factorio version from form + // Update search text from form const handleSearch = (changedValues: any, allValues: any) => { const nameValue = allValues.name; - const versionValue = allValues.factorioVersion as lib.MajorMinorVersion | undefined; - - // Only trigger state updates if values actually changed if (nameValue !== searchText) { setSearchText(nameValue || ""); + setPage(1); } - if (versionValue && versionValue !== factorioVersion) { - setFactorioVersion(versionValue); + }; + + const handleVersionChange = (version: lib.MajorMinorVersion) => { + if (version !== factorioVersion) { + setPickedVersion(version); setAllMods([]); // Clear mods when version changes, useEffect will fetch new ones setLoading(true); // Show loading indicator immediately - } - // Reset page only if search text or version changed - if (nameValue !== searchText || (versionValue && versionValue !== factorioVersion)) { setPage(1); } }; @@ -349,16 +359,13 @@ function SearchModsButton() { labelCol={{ span: 6 }} wrapperCol={{ span: 18 }} onValuesChange={handleSearch} - initialValues={{ factorioVersion: factorioVersion, name: searchText }} + initialValues={{ name: searchText }} > - - {lib.ApiVersions.map(version => ( {version} diff --git a/test/controller/ControlConnection.test.js b/test/controller/ControlConnection.test.js index c3bac0c7..ef9eb78a 100644 --- a/test/controller/ControlConnection.test.js +++ b/test/controller/ControlConnection.test.js @@ -123,6 +123,43 @@ describe("controller/src/ControlConnection", function() { }); }); + describe(".handleModPortalGetAllRequest()", function() { + let mockController; + let _fetch; + let urls; + + beforeEach(function() { + mockController = { + config: new lib.ControllerConfig("controller"), + modPortalCache: new Map(), + }; + urls = []; + _fetch = global.fetch; + global.fetch = async url => { + urls.push(new URL(url)); + return { ok: true, json: async () => ({ results: [], pagination: { page_count: 1 } }) }; + }; + }); + afterEach(function() { + global.fetch = _fetch; + }); + + async function getAll(request) { + return await ControlConnection.prototype.handleModPortalGetAllRequest.call( + { _controller: mockController }, request, + ); + } + + it("treats a missing hide_deprecated as false", async function() { + await getAll(new lib.ModPortalGetAllRequest("2.1")); + assert.deepEqual([...mockController.modPortalCache.keys()], ["2.1-false"]); + assert.equal(urls[0].searchParams.get("hide_deprecated"), "false"); + + await getAll(new lib.ModPortalGetAllRequest("2.1", false)); + assert.equal(urls.length, 1, "explicit false should hit the cache"); + }); + }); + describe(".handleInstanceCreateRequest()", function() { let mockController;