Merge pull request #59 from drkshrk/feature/character-tab-improvements

Character tab improvements & Bug Fix: sortable/resizable tables, filters, inventory item editing

Author: Red-Blink

console/api/src/duneDb.js

@@ -29,6 +29,7 @@ import {
 
 const MAX_INTEL_POINTS = 2779;
 const MAX_TABLE_PREVIEW_ROWS = 10000;
+const INVENTORY_EDITABLE_COLUMNS = new Set(["stack_size", "quality_level", "position_index", "current_durability", "max_durability"]);
 let craftingRecipeCatalogCache = null;
 
 export class UnsupportedCapabilityError extends Error {
@@ -1504,7 +1505,17 @@ export async function playerProfile(db, id) {
     left join dune.accounts ac on ac.id = a.owner_account_id
     where a.id = $1`, [actorId]);
   if (!result.rows[0]) throw new Error("Player not found");
-  return { capabilities: await playerCapabilities(db), player: result.rows[0] };
+  const row = result.rows[0];
+  const [factions, guilds] = await Promise.all([
+    leadershipFactions(db).catch(() => new Map()),
+    leadershipGuilds(db).catch(() => new Map())
+  ]);
+  const controllerId = String(row.player_controller_id || "");
+  const actorIdKey = String(row.actor_id || "");
+  const accountIdKey = String(row.account_id || "");
+  row.faction = factions.get(controllerId) || factions.get(actorIdKey) || "Unassigned";
+  row.guild = guilds.get(controllerId) || guilds.get(actorIdKey) || guilds.get(accountIdKey) || "Unavailable";
+  return { capabilities: await playerCapabilities(db), player: row };
 }
 
 export async function playerInventory(db, id) {
@@ -1517,7 +1528,11 @@ export async function playerInventory(db, id) {
            i.position_index,
            i.inventory_id,
            coalesce((i.stats->'FItemStackAndDurabilityStats'->1->>'CurrentDurability'), null) as current_durability,
-           coalesce((i.stats->'FItemStackAndDurabilityStats'->1->>'MaxDurability'), null) as max_durability,
+           coalesce(
+             nullif((i.stats->'FItemStackAndDurabilityStats'->1->>'MaxDurability')::numeric, 0),
+             nullif((i.stats->'FItemStackAndDurabilityStats'->1->>'DecayedMaxDurability')::numeric, 0),
+             null
+           ) as max_durability,
            i.stats
     from dune.items i
     join dune.inventories inv on i.inventory_id = inv.id
@@ -2526,6 +2541,40 @@ export async function deleteInventoryItem(db, playerId, itemId) {
   });
 }
 
+export async function updateInventoryItem(db, playerId, itemId, values) {
+  await requireCapability(await supportsInventoryEdit(db), "Inventory edit requires dune.items and dune.inventories.");
+  const safeItemId = intParam(itemId, "item id", 1);
+  const nextValues = Object.fromEntries(Object.entries(values || {}).filter(([key]) => INVENTORY_EDITABLE_COLUMNS.has(key)));
+  return db.transaction(async (tx) => {
+    const player = await resolvePlayerMutationTarget(tx, playerId);
+    const owned = await tx.query(`
+      select i.id, i.stats
+      from dune.items i
+      join dune.inventories inv on inv.id = i.inventory_id
+      where i.id = $1 and inv.actor_id = $2
+      for update`, [safeItemId, player.actorId]);
+    if (!owned.rows[0]) throw new Error("Inventory item was not found in the selected player's directly-owned inventory");
+
+    const hasMax = Object.prototype.hasOwnProperty.call(nextValues, "max_durability") && nextValues.max_durability !== null && nextValues.max_durability !== "";
+    const hasCurrent = Object.prototype.hasOwnProperty.call(nextValues, "current_durability") && nextValues.current_durability !== null && nextValues.current_durability !== "";
+    if (hasMax || hasCurrent) {
+      const stats = owned.rows[0].stats || {};
+      const durability = { ...(stats.FItemStackAndDurabilityStats?.[1] || {}) };
+      const maxKey = Object.prototype.hasOwnProperty.call(durability, "MaxDurability") ? "MaxDurability" : "DecayedMaxDurability";
+      const nextMax = numberParam(hasMax ? nextValues.max_durability : durability[maxKey], "max durability", 0, 100);
+      const nextCurrent = numberParam(hasCurrent ? nextValues.current_durability : durability.CurrentDurability, "current durability", 0, nextMax);
+      durability.CurrentDurability = nextCurrent;
+      durability[maxKey] = nextMax;
+      nextValues.stats = { ...stats, FItemStackAndDurabilityStats: [stats.FItemStackAndDurabilityStats?.[0] || [], durability] };
+    }
+    delete nextValues.current_durability;
+    delete nextValues.max_durability;
+
+    const rowId = JSON.stringify({ pk: { id: safeItemId } });
+    return updateTableRow(tx, "dune", "items", rowId, nextValues);
+  });
+}
+
 export async function giveItemToStorage(db, storageId, { itemName = "", itemId = "", templateId = "", quantity = 1, quality = 0 }) {
   await requireCapability(await supportsStorageGiveItem(db), "Storage give-item requires compatible dune.inventories and dune.items insert columns.");
   const target = intParam(storageId, "storage id", 1);
@@ -2740,6 +2789,7 @@ async function playerCapabilities(db) {
     craftingRecipes: await supportsCraftingRecipes(db),
     researchItems: await supportsResearchItems(db),
     inventoryDelete: await supportsInventoryDelete(db),
+    inventoryEdit: await supportsInventoryEdit(db),
     repairGear: await supportsRepairGear(db),
     repairVehicleDecay: await supportsRepairVehicleDecay(db),
     refuelVehicle: await supportsRefuelVehicle(db),
@@ -2938,6 +2988,10 @@ async function supportsInventoryDelete(db) {
     await functionExists(db, "dune.delete_item(bigint)");
 }
 
+async function supportsInventoryEdit(db) {
+  return await tableExists(db, "items") && await tableExists(db, "inventories");
+}
+
 async function supportsStorageGiveItem(db) {
   if (!(await tableExists(db, "items")) || !(await tableExists(db, "inventories"))) return false;
   const inventoryColumns = await columnsFor(db, "inventories");

console/api/src/server.js

@@ -438,6 +438,7 @@ async function handleApi(req, res) {
   if (path.match(/^\/api\/players\/[^/]+\/repair-vehicle-decay$/) && req.method === "POST") return playerDbMutation(req, res, path, "players.repair-vehicle-decay", "REPAIR VEHICLE DECAY", (playerId, body) => duneDb.repairVehicleDecay(db, playerId, body));
   if (path.match(/^\/api\/players\/[^/]+\/refuel-vehicle$/) && req.method === "POST") return playerDbMutation(req, res, path, "players.refuel-vehicle", "REFUEL VEHICLE", (playerId, body) => duneDb.refuelVehicle(db, playerId, body));
   if (path.match(/^\/api\/players\/[^/]+\/inventory\/[^/]+$/) && req.method === "DELETE") return inventoryDeleteRoute(req, res, path);
+  if (path.match(/^\/api\/players\/[^/]+\/inventory\/[^/]+$/) && req.method === "PATCH") return inventoryUpdateRoute(req, res, path);
   if (path.match(/^\/api\/players\/[^/]+\/crafting-recipes$/)) return dbPlayerRoute(res, path, duneDb.playerCraftingRecipes);
   if (path.match(/^\/api\/players\/[^/]+\/research-items$/)) return dbPlayerRoute(res, path, duneDb.playerResearchItems);
   if (path.match(/^\/api\/players\/[^/]+\/journey$/)) return dbPlayerRoute(res, path, (database, playerId) => duneDb.playerJourney(database, playerId, journeyTagsData));
@@ -1560,6 +1561,13 @@ async function inventoryDeleteRoute(req, res, path) {
   return directDbMutation(req, res, "players.inventory-delete", "DELETE ITEM", () => duneDb.deleteInventoryItem(db, playerId, itemId), { playerId, itemId });
 }
 
+async function inventoryUpdateRoute(req, res, path) {
+  const parts = path.split("/");
+  const playerId = decodeURIComponent(parts[3]);
+  const itemId = decodeURIComponent(parts[5]);
+  return directDbMutation(req, res, "players.inventory-update", "SAVE ITEM", (body) => duneDb.updateInventoryItem(db, playerId, itemId, body.values), { playerId, itemId });
+}
+
 async function storageGiveItemRoute(req, res, path) {
   const storageId = decodeURIComponent(path.split("/")[3]);
   return directDbMutation(req, res, "storage.give-item", "GIVE ITEM TO STORAGE", async (body) => {