From f677a1d61b48ba720d33113f27e2f2eb6f947e2e Mon Sep 17 00:00:00 2001 From: Sirttas Date: Sat, 18 May 2024 21:12:11 +0200 Subject: [PATCH] cleanup acquisitions --- .../acquisition/AcquisitionResultTable.vue | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/market/acquisition/AcquisitionResultTable.vue b/src/market/acquisition/AcquisitionResultTable.vue index f4f7819..000a6ea 100644 --- a/src/market/acquisition/AcquisitionResultTable.vue +++ b/src/market/acquisition/AcquisitionResultTable.vue @@ -44,29 +44,29 @@ const marketTaxStore = useMarketTaxStore(); const threshold = useStorage('market-acquisition-threshold', 10); const filter = ref(""); const { sortedArray, headerProps } = useSort(computed(() => { - if (props.showAll) { - return props.items - .filter(r => r.type.name.toLowerCase().includes(filter.value.toLowerCase())) - .map(r => { - const precentProfit = marketTaxStore.calculateProfit(r.price, r.sell); +const filteredItems = props.items.filter(r => r.type.name.toLowerCase().includes(filter.value.toLowerCase())); - return { - type: r, - typeID: r.type.id, - name: r.type.name, - buy: r.buy, - sell: r.sell, - price: r.price, - remaining: r.remaining, - quantity: r.quantity, - precentProfit, - iskProfit: r.price * precentProfit * r.remaining - }; - }); + if (props.showAll) { + return filteredItems.map(r => { + const precentProfit = marketTaxStore.calculateProfit(r.price, r.sell); + + return { + type: r, + typeID: r.type.id, + name: r.type.name, + buy: r.buy, + sell: r.sell, + price: r.price, + remaining: r.remaining, + quantity: r.quantity, + precentProfit, + iskProfit: r.price * precentProfit * r.remaining + }; + }); } const list: Result[] = []; - const groups = Map.groupBy(props.items.filter(r => r.type.name.toLowerCase().includes(filter.value.toLowerCase())), r => r.type); + const groups = Map.groupBy(filteredItems, r => r.type); groups.forEach((group, type) => { const oldest = group.reduce((acc: AcquiredType | undefined, r: AcquiredType) => (acc && acc.date < r.date) ? acc : r, undefined);