OpenWF/SpaceNinjaServer
16
13
Fork 17
Code Issues 38 Pull Requests 4 Actions 1 Packages Projects Releases Activity

feat(webui): disambiguate gear and resource with the same name for add items (#2127)
All checks were successful
Build / build (push) Successful in 45s
Details
Build Docker image / docker (push) Successful in 1m11s
Details

Browse Source 
Closes #2097

Reviewed-on: #2127
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
This commit is contained in:
Sainan 2025-06-07 02:17:27 -07:00 committed by Sainan
parent 4118528603
commit 65387ccdea
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/controllers/custom/getItemListsController.ts
View File

@ -25,6 +25,7 @@ import allIncarnons from "@/static/fixed_responses/allIncarnonList.json";
interface ListedItem { interface ListedItem {
uniqueName: string; uniqueName: string;
name: string; name: string;
subtype?: string;
fusionLimit?: number; fusionLimit?: number;
exalted?: string[]; exalted?: string[];
badReason?: "starter" | "frivolous" | "notraw"; badReason?: "starter" | "frivolous" | "notraw";
@ -175,7 +176,8 @@ const getItemListsController: RequestHandler = (req, response) => {
) { ) {
res.miscitems.push({ res.miscitems.push({
uniqueName: uniqueName, uniqueName: uniqueName,
name: name name: name,
subtype: "Resource"
}); });
} }
} }
@ -193,7 +195,8 @@ const getItemListsController: RequestHandler = (req, response) => {
for (const [uniqueName, item] of Object.entries(ExportGear)) { for (const [uniqueName, item] of Object.entries(ExportGear)) {
res.miscitems.push({ res.miscitems.push({
uniqueName: uniqueName, uniqueName: uniqueName,
name: getString(item.name, lang) name: getString(item.name, lang),
subtype: "Gear"
}); });
} }
const recipeNameTemplate = getString("/Lotus/Language/Items/BlueprintAndItem", lang); const recipeNameTemplate = getString("/Lotus/Language/Items/BlueprintAndItem", lang);

28
static/webui/script.js
View File

@ -312,7 +312,7 @@ function fetchItemList() {
document.getElementById("changeSyndicate").appendChild(option); document.getElementById("changeSyndicate").appendChild(option);
}); });
} else { } else {
const nameSet = new Set(); const nameToItems = {};
items.forEach(item => { items.forEach(item => {
item.name = item.name.replace(/<.+>/g, "").trim(); item.name = item.name.replace(/<.+>/g, "").trim();
if ("badReason" in item) { if ("badReason" in item) {
@ -322,6 +322,11 @@ function fetchItemList() {
item.name += " " + loc("code_badItem"); item.name += " " + loc("code_badItem");
} }
} }
nameToItems[item.name] ??= [];
nameToItems[item.name].push(item);
});
items.forEach(item => {
if (type == "ModularParts") { if (type == "ModularParts") {
const supportedModularParts = [ const supportedModularParts = [
"LWPT_HB_DECK", "LWPT_HB_DECK",
@ -360,15 +365,26 @@ function fetchItemList() {
.appendChild(option); .appendChild(option);
} }
} else if (item.badReason != "notraw") { } else if (item.badReason != "notraw") {
if (nameSet.has(item.name)) { const ambiguous = nameToItems[item.name].length > 1;
//console.log(`Not adding ${item.uniqueName} to datalist for ${type} due to duplicate display name: ${item.name}`); let canDisambiguate = true;
} else { if (ambiguous) {
nameSet.add(item.name); for (const i2 of nameToItems[item.name]) {
if (!i2.subtype) {
canDisambiguate = false;
break;
}
}
}
if (!ambiguous || canDisambiguate || nameToItems[item.name][0] == item) {
const option = document.createElement("option"); const option = document.createElement("option");
option.setAttribute("data-key", item.uniqueName); option.setAttribute("data-key", item.uniqueName);
option.value = item.name; option.value = item.name;
if (ambiguous && canDisambiguate) {
option.value += " (" + item.subtype + ")";
}
document.getElementById("datalist-" + type).appendChild(option); document.getElementById("datalist-" + type).appendChild(option);
} else {
//console.log(`Not adding ${item.uniqueName} to datalist for ${type} due to duplicate display name: ${item.name}`);
} }
} }
itemMap[item.uniqueName] = { ...item, type }; itemMap[item.uniqueName] = { ...item, type };