feat(trade): filter by attribute requirements in Trader pane

Adds an "Include unusable" checkbox (off by default) to the Trader pane
that hides search results whose Str/Dex/Int (or Omni) requirements the
build cannot meet once equipped. Filtering is applied across all sort
modes and cached per result to avoid redundant calcFunc calls. When
filtering drops every result, the dropdown and total-price state are
cleared and a dedicated notice is shown.

Adds a matching "Attributes Requirements" checkbox (on by default) to
the TradeQueryGenerator popup. When enabled, the shortfall (build
requirement minus build attribute) is inserted as pseudo.pseudo_total_*
min filters in the generated query so trade search only returns items
that cover the missing attributes.

Also hardens UI state transitions around filtered results: the result
dropdown selection callback guards against stale indices, the section
anchor preserves its base Y when the scrollbar offsets it, and empty
sorted results no longer crash UpdateDropdownList / UpdateControlsWithItems.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: mcagnion

src/Classes/TradeQuery.lua

@@ -34,6 +34,7 @@ local TradeQueryClass = newClass("TradeQuery", function(self, itemsTab)
 	-- default set of trade item sort selection
 	self.slotTables = { }
 	self.pbItemSortSelectionIndex = 1
+	self.hideResultsFailingAttributeRequirements = false
 	self.pbCurrencyConversion = { }
 	self.currencyConversionTradeMap = { }
 	self.lastCurrencyConversionRequest = 0
@@ -368,6 +369,20 @@ Highest Weight - Displays the order retrieved from trade]]
 	self.controls.itemSortSelection:SetSel(self.pbItemSortSelectionIndex, true)
 	self.controls.itemSortSelectionLabel = new("LabelControl", {"TOPRIGHT", self.controls.itemSortSelection, "TOPLEFT"}, {-4, 0, 56, 16}, "^7Sort By:")
 
+	-- Hide fetched results that would leave unmet attribute requirements unless unchecked.
+	local hideAttributeRequirementsLabel = "^7Hide results failing attribute requirements"
+	local hideAttributeRequirementsLabelWidth = DrawStringWidth(row_height - 4, "VAR", hideAttributeRequirementsLabel) + 5
+	local hideAttributeRequirementsRect = {24 + hideAttributeRequirementsLabelWidth, 0, row_height, row_height}
+	self.controls.hideAttributeRequirementsCheck = new("CheckBoxControl", {"LEFT", self.controls.tradeTypeSelection, "RIGHT"}, hideAttributeRequirementsRect, hideAttributeRequirementsLabel, function(state)
+		self.hideResultsFailingAttributeRequirements = state
+		for row_idx, _ in pairs(self.resultTbl) do
+			self:UpdateControlsWithItems(row_idx)
+		end
+	end)
+	self.controls.hideAttributeRequirementsCheck.tooltipText = "Hide fetched results when equipping the item would leave unmet Str/Dex/Int/Omniscience attribute requirements.\nUnchecked: show those results after fetching."
+	self.hideResultsFailingAttributeRequirements = self.hideResultsFailingAttributeRequirements == true
+	self.controls.hideAttributeRequirementsCheck.state = self.hideResultsFailingAttributeRequirements
+
 	-- Realm selection
 	self.controls.realmLabel = new("LabelControl", {"LEFT", self.controls.setSelect, "RIGHT"}, {18, 0, 20, row_height - 4}, "^7Realm:")
 	self.controls.realm = new("DropDownControl", {"LEFT", self.controls.realmLabel, "RIGHT"}, {6, 0, 150, row_height}, self.realmDropList, function(index, value)
@@ -464,7 +479,9 @@ Highest Weight - Displays the order retrieved from trade]]
 		t_insert(slotTables, { slotName = self.itemsTab.sockets[nodeId].label, nodeId = nodeId })
 	end
 
-	self.controls.sectionAnchor = new("LabelControl", {"LEFT", self.controls.tradeTypeSelection, "LEFT"}, {0, row_vertical_padding + row_height, 0, 0}, "")
+	-- Base Y offset for sectionAnchor (used to preserve position when scrollbar shifts it)
+	local sectionAnchorBaseY = row_vertical_padding + row_height
+	self.controls.sectionAnchor = new("LabelControl", {"LEFT", self.controls.tradeTypeSelection, "LEFT"}, {0, sectionAnchorBaseY, 0, 0}, "")
 	top_pane_alignment_ref = {"TOPLEFT", self.controls.sectionAnchor, "TOPLEFT"}
 	local scrollBarShown = #slotTables > 21 -- clipping starts beyond this
 	-- dynamically hide rows that are above or below the scrollBar
@@ -542,7 +559,7 @@ Highest Weight - Displays the order retrieved from trade]]
 	local function scrollBarFunc()
 		self.controls.scrollBar.height = self.pane_height-100
 		self.controls.scrollBar:SetContentDimension(self.pane_height-100, self.effective_rows_height)
-		self.controls.sectionAnchor.y = -self.controls.scrollBar.offset
+		self.controls.sectionAnchor.y = sectionAnchorBaseY - self.controls.scrollBar.offset
 	end
 	main:OpenPopup(pane_width, self.pane_height, "Trader", self.controls, nil, nil, "close", (scrollBarShown and scrollBarFunc or nil))
 end
@@ -626,7 +643,7 @@ function TradeQueryClass:SetStatWeights(previousSelectionList)
 		for row_idx in pairs(self.resultTbl) do
 			self:UpdateControlsWithItems(row_idx)
 		end
-    end)
+	end)
 	controls.cancel = new("ButtonControl", { "BOTTOM", nil, "BOTTOM" }, { 0, -10, 80, 20 }, "Cancel", function()
 		if previousSelectionList and #previousSelectionList > 0 then
 			self.statSortSelectionList = copyTable(previousSelectionList, true)
@@ -719,6 +736,25 @@ function TradeQueryClass:ReduceOutput(output)
 	return smallOutput
 end
 
+function TradeQueryClass:GetReplacementSlotName(row_idx)
+	local slotTbl = self.slotTables[row_idx]
+	if not slotTbl then
+		return nil
+	end
+	if slotTbl.nodeId then
+		return "Jewel " .. tostring(slotTbl.nodeId)
+	end
+	if slotTbl.replacementSlotName then
+		return slotTbl.replacementSlotName
+	end
+	if slotTbl.fullName then
+		return slotTbl.fullName
+	end
+	if self.itemsTab.slots and self.itemsTab.slots[slotTbl.slotName] then
+		return slotTbl.slotName
+	end
+end
+
 -- Method to evaluate a result by getting it's output and weight
 function TradeQueryClass:GetResultEvaluation(row_idx, result_index, calcFunc, baseOutput)
 	local result = self.resultTbl[row_idx][result_index]
@@ -738,7 +774,7 @@ function TradeQueryClass:GetResultEvaluation(row_idx, result_index, calcFunc, ba
 		self.onlyWeightedBaseOutput[row_idx][result_index] = onlyWeightedBaseOutput
 		self.lastComparedWeightList[row_idx][result_index] = self.statSortSelectionList
 	end
-	local slotName = self.slotTables[row_idx].nodeId and "Jewel " .. tostring(self.slotTables[row_idx].nodeId) or self.slotTables[row_idx].slotName
+	local slotName = self:GetReplacementSlotName(row_idx) or self.slotTables[row_idx].slotName
 	if slotName == "Megalomaniac" then
 		local addedNodes = {}
 		for nodeName in (result.item_string.."\r\n"):gmatch("1 Added Passive Skill is (.-)\r?\n") do
@@ -776,18 +812,34 @@ function TradeQueryClass:UpdateDropdownList(row_idx)
 
 	if not self.resultTbl[row_idx] then return end
 
-	for result_index = 1, #self.resultTbl[row_idx] do
-
-		local pb_index = self.sortedResultTbl[row_idx][result_index].index
-		local result = self.resultTbl[row_idx][pb_index]
-		local price = string.format(" %s(%d %s)", colorCodes["CURRENCY"], result.amount, result.currency)
-		local item = new("Item", result.item_string)
-		table.insert(dropdownLabels, colorCodes[item.rarity] .. item.name .. price)
+	-- Iterate the sorted (and potentially filtered) list so attribute-filtered rows are omitted from the dropdown
+	for _, sorted in ipairs(self.sortedResultTbl[row_idx] or {}) do
+		if sorted and sorted.index and self.resultTbl[row_idx][sorted.index] then
+			local result = self.resultTbl[row_idx][sorted.index]
+			local price = string.format(" %s(%d %s)", colorCodes["CURRENCY"], result.amount, result.currency)
+			local item = new("Item", result.item_string)
+			table.insert(dropdownLabels, colorCodes[item.rarity] .. item.name .. price)
+		end
+	end
+	if self.controls["resultDropdown".. row_idx] then
+		self.controls["resultDropdown".. row_idx].selIndex = 1
+		self.controls["resultDropdown".. row_idx]:SetList(dropdownLabels)
 	end
-	self.controls["resultDropdown".. row_idx].selIndex = 1
-	self.controls["resultDropdown".. row_idx]:SetList(dropdownLabels)
 end
 function TradeQueryClass:UpdateControlsWithItems(row_idx)
+	local results = self.resultTbl[row_idx]
+	if not results or #results == 0 then
+		self.sortedResultTbl[row_idx] = {}
+		if self.controls["resultDropdown".. row_idx] then
+			self.controls["resultDropdown".. row_idx]:SetList({})
+			self.controls["resultDropdown".. row_idx].selIndex = 1
+		end
+		self.itemIndexTbl[row_idx] = nil
+		self.totalPrice[row_idx] = nil
+		self.controls.fullPrice.label = "Total Price: " .. self:GetTotalPriceString()
+		return
+	end
+
 	local sortMode = self.itemSortSelectionList[self.pbItemSortSelectionIndex]
 	local sortedItems, errMsg = self:SortFetchResults(row_idx, sortMode)
 	if errMsg == "MissingConversionRates" then
@@ -800,6 +852,18 @@ function TradeQueryClass:UpdateControlsWithItems(row_idx)
 	else
 		self:SetNotice(self.controls.pbNotice, "")
 	end
+	if not sortedItems or #sortedItems == 0 then
+		self:SetNotice(self.controls.pbNotice, "No usable results (attribute requirements)")
+		self.sortedResultTbl[row_idx] = {}
+		if self.controls["resultDropdown".. row_idx] then
+			self.controls["resultDropdown".. row_idx]:SetList({})
+			self.controls["resultDropdown".. row_idx].selIndex = 1
+		end
+		self.itemIndexTbl[row_idx] = nil
+		self.totalPrice[row_idx] = nil
+		self.controls.fullPrice.label = "Total Price: " .. self:GetTotalPriceString()
+		return
+	end
 
 	self.sortedResultTbl[row_idx] = sortedItems
 	local pb_index = self.sortedResultTbl[row_idx][1].index
@@ -827,6 +891,39 @@ end
 -- Method to sort the fetched results
 function TradeQueryClass:SortFetchResults(row_idx, mode)
 	local calcFunc, baseOutput
+	local attrReqCache = {}
+	local slotName = self:GetReplacementSlotName(row_idx)
+	local results = self.resultTbl[row_idx]
+	if not results or #results == 0 then
+		return {}
+	end
+
+	-- Returns true if the candidate item meets its attribute requirements when equipped
+	local function meetsAttributeRequirements(result_index)
+		if not self.hideResultsFailingAttributeRequirements or not slotName then
+			return true
+		end
+		if attrReqCache[result_index] ~= nil then
+			return attrReqCache[result_index]
+		end
+		if not calcFunc then
+			calcFunc, baseOutput = self.itemsTab.build.calcsTab:GetMiscCalculator()
+		end
+		local item = new("Item", self.resultTbl[row_idx][result_index].item_string)
+		local output = calcFunc({ repSlotName = slotName, repItem = item })
+		local ok
+		if output.ReqOmni then
+			ok = (output.ReqOmni or 0) <= (output.Omni or 0)
+		else
+			local function attrOk(reqKey, attrKey)
+				return (output[reqKey] or 0) <= (output[attrKey] or 0)
+			end
+			ok = attrOk("ReqStr", "Str") and attrOk("ReqDex", "Dex") and attrOk("ReqInt", "Int")
+		end
+		attrReqCache[result_index] = ok
+		return ok
+	end
+
 	local function getResultWeight(result_index)
 		if not calcFunc then
 			calcFunc, baseOutput = self.itemsTab.build.calcsTab:GetMiscCalculator()
@@ -854,13 +951,17 @@ function TradeQueryClass:SortFetchResults(row_idx, mode)
 	local newTbl = {}
 	if mode == self.sortModes.Weight then
 		for index, _ in pairs(self.resultTbl[row_idx]) do
-			t_insert(newTbl, { outputAttr = index, index = index })
+			if meetsAttributeRequirements(index) then
+				t_insert(newTbl, { outputAttr = index, index = index })
+			end
 		end
 		return newTbl
 	elseif mode == self.sortModes.StatValue  then
 		for result_index = 1, #self.resultTbl[row_idx] do
 			--ConPrintf("%.3f", getResultWeight(result_index))
-			t_insert(newTbl, { outputAttr = getResultWeight(result_index), index = result_index })
+			if meetsAttributeRequirements(result_index) then
+				t_insert(newTbl, { outputAttr = getResultWeight(result_index), index = result_index })
+			end
 		end
 		table.sort(newTbl, function(a,b) return a.outputAttr > b.outputAttr end)
 	elseif mode == self.sortModes.StatValuePrice then
@@ -880,9 +981,11 @@ function TradeQueryClass:SortFetchResults(row_idx, mode)
 
 			-- scaling factor for price
 			local k = 0.03
-			t_insert(newTbl,
-				{ outputAttr = getResultWeight(result_index) - k * math.log(priceTable[result_index], 10), index =
-				result_index })
+			if meetsAttributeRequirements(result_index) then
+				t_insert(newTbl,
+					{ outputAttr = getResultWeight(result_index) - k * math.log(priceTable[result_index], 10), index =
+					result_index })
+			end
 		end
 		table.sort(newTbl, function(a,b) return a.outputAttr > b.outputAttr end)
 	elseif mode == self.sortModes.Price then
@@ -891,7 +994,9 @@ function TradeQueryClass:SortFetchResults(row_idx, mode)
 			return nil, "MissingConversionRates"
 		end
 		for result_index, price in pairs(priceTable) do
-			t_insert(newTbl, { outputAttr = price, index = result_index })
+			if meetsAttributeRequirements(result_index) then
+				t_insert(newTbl, { outputAttr = price, index = result_index })
+			end
 		end
 		table.sort(newTbl, function(a,b) return a.outputAttr < b.outputAttr end)
 	else
@@ -945,6 +1050,7 @@ function TradeQueryClass:PriceItemRowDisplay(row_idx, top_pane_alignment_ref, ro
 						slotTbl.slotName and (self.itemsTab.slots[slotTbl.slotName] or
 						slotTbl.slotName == "Watcher's Eye" and self:findValidSlotForWatchersEye() or
 						slotTbl.fullName and self.itemsTab.slots[slotTbl.fullName]) -- fullName for Abyssal Sockets
+	slotTbl.replacementSlotName = activeSlot and activeSlot.slotName or slotTbl.fullName or nil
 	local nameColor = slotTbl.unique and colorCodes.UNIQUE or "^7"
 	controls["name"..row_idx] = new("LabelControl", top_pane_alignment_ref, {0, row_idx*(row_height + row_vertical_padding), 100, row_height - 4}, nameColor..slotTbl.slotName)
 	controls["bestButton"..row_idx] = new("ButtonControl", { "LEFT", controls["name"..row_idx], "LEFT"}, {100 + 8, 0, 80, row_height}, "Find best", function()
@@ -1076,8 +1182,10 @@ function TradeQueryClass:PriceItemRowDisplay(row_idx, top_pane_alignment_ref, ro
 	end)
 	controls["changeButton"..row_idx].shown = function() return self.resultTbl[row_idx] end
 	controls["resultDropdown"..row_idx] = new("DropDownControl", { "TOPLEFT", controls["changeButton"..row_idx], "TOPRIGHT"}, {8, 0, 325, row_height}, {}, function(index)
-		self.itemIndexTbl[row_idx] = self.sortedResultTbl[row_idx][index].index
-		self:SetFetchResultReturn(row_idx, self.itemIndexTbl[row_idx])
+		if self.sortedResultTbl[row_idx] and self.sortedResultTbl[row_idx][index] then
+			self.itemIndexTbl[row_idx] = self.sortedResultTbl[row_idx][index].index
+			self:SetFetchResultReturn(row_idx, self.itemIndexTbl[row_idx])
+		end
 	end)
 	self:UpdateDropdownList(row_idx)
 	local function addMegalomaniacCompareToTooltipIfApplicable(tooltip, result_index)
@@ -1117,8 +1225,17 @@ function TradeQueryClass:PriceItemRowDisplay(row_idx, top_pane_alignment_ref, ro
 		tooltip:AddSeparator(10)
 		tooltip:AddLine(16, string.format("^7Price: %s %s", result.amount, result.currency))
 	end
+	local function getSelectedResult()
+		local selected_result_index = self.itemIndexTbl[row_idx]
+		local rowResults = self.resultTbl[row_idx]
+		return selected_result_index and rowResults and rowResults[selected_result_index], selected_result_index
+	end
 	controls["importButton"..row_idx] = new("ButtonControl", { "TOPLEFT", controls["resultDropdown"..row_idx], "TOPRIGHT"}, {8, 0, 100, row_height}, "Import Item", function()
-		self.itemsTab:CreateDisplayItemFromRaw(self.resultTbl[row_idx][self.itemIndexTbl[row_idx]].item_string)
+		local itemResult = getSelectedResult()
+		if not itemResult or not itemResult.item_string then
+			return
+		end
+		self.itemsTab:CreateDisplayItemFromRaw(itemResult.item_string)
 		local item = self.itemsTab.displayItem
 		-- pass "true" to not auto equip it as we will have our own logic
 		self.itemsTab:AddDisplayItem(true)
@@ -1133,8 +1250,8 @@ function TradeQueryClass:PriceItemRowDisplay(row_idx, top_pane_alignment_ref, ro
 	end)
 	controls["importButton"..row_idx].tooltipFunc = function(tooltip)
 		tooltip:Clear()
-		local selected_result_index = self.itemIndexTbl[row_idx]
-		local item_string = self.resultTbl[row_idx][selected_result_index].item_string
+		local itemResult, selected_result_index = getSelectedResult()
+		local item_string = itemResult and itemResult.item_string
 		if selected_result_index and item_string then
 			-- TODO: item parsing bug caught here.
 			-- item.baseName is nil and throws error in the following AddItemTooltip func
@@ -1150,12 +1267,13 @@ function TradeQueryClass:PriceItemRowDisplay(row_idx, top_pane_alignment_ref, ro
 		end
 	end
 	controls["importButton"..row_idx].enabled = function()
-		return self.itemIndexTbl[row_idx] and self.resultTbl[row_idx][self.itemIndexTbl[row_idx]].item_string ~= nil
+		local itemResult = getSelectedResult()
+		return itemResult and itemResult.item_string ~= nil
 	end
 	-- Whisper so we can copy to clipboard
 	controls["whisperButton" .. row_idx] = new("ButtonControl",
 		{ "TOPLEFT", controls["importButton" .. row_idx], "TOPRIGHT" }, { 8, 0, 170, row_height }, function()
-			local itemResult = self.itemIndexTbl[row_idx] and self.resultTbl[row_idx][self.itemIndexTbl[row_idx]]
+			local itemResult = getSelectedResult()
 
 			if not itemResult then return "" end
 
@@ -1169,7 +1287,10 @@ function TradeQueryClass:PriceItemRowDisplay(row_idx, top_pane_alignment_ref, ro
 			end
 
 		end, function()
-			local itemResult = self.itemIndexTbl[row_idx] and self.resultTbl[row_idx][self.itemIndexTbl[row_idx]]
+			local itemResult = getSelectedResult()
+			if not itemResult then
+				return
+			end
 			if  itemResult.whisper then
 				Copy(itemResult.whisper)
 			else
@@ -1199,7 +1320,10 @@ function TradeQueryClass:PriceItemRowDisplay(row_idx, top_pane_alignment_ref, ro
 	controls["whisperButton" .. row_idx].tooltipFunc = function(tooltip)
 		tooltip:Clear()
 		tooltip.center = true
-		local itemResult = self.itemIndexTbl[row_idx] and self.resultTbl[row_idx][self.itemIndexTbl[row_idx]]
+		local itemResult = getSelectedResult()
+		if not itemResult then
+			return
+		end
 		local text = itemResult.whisper and "Copies the item purchase whisper to the clipboard" or
 			"Opens the search page to show the item"
 		tooltip:AddLine(16, text)