diff --git a/src/market/acquisition/AcquisitionResultTable.vue b/src/market/acquisition/AcquisitionResultTable.vue index e3f28b3..4977c21 100644 --- a/src/market/acquisition/AcquisitionResultTable.vue +++ b/src/market/acquisition/AcquisitionResultTable.vue @@ -3,8 +3,8 @@ import {SliderCheckbox} from '@/components'; import {SortableHeader, useSort, VirtualScrollTable} from '@/components/table'; import {getListedSellTypeIds, MarketType, MarketTypeLabel, TaxInput, useMarketTaxStore} from "@/market"; import {MinusIcon, PlusIcon} from '@heroicons/vue/24/outline'; -import {computedAsync, useStorage} from '@vueuse/core'; -import {computed, ref} from 'vue'; +import {useStorage} from '@vueuse/core'; +import {computed, ref, watch} from 'vue'; import {AcquiredType} from './AcquiredType'; import AcquisitionQuartilesTooltip from './AcquisitionQuartilesTooltip.vue'; import {formatEveDate, formatIsk, percentFormater} from "@/formaters.ts"; @@ -67,7 +67,10 @@ const columnsToIgnore = computed(() => { const marketTaxStore = useMarketTaxStore(); const ledgersStore = useLedgersStore(); -const listedTypeIds = computedAsync(getListedSellTypeIds, new Set()); +const listedTypeIds = ref(new Set()); +watch(() => props.items, async () => { + listedTypeIds.value = await getListedSellTypeIds(); +}, { immediate: true }); const threshold = useStorage('market-acquisition-threshold', 10); const filter = ref(""); @@ -75,7 +78,7 @@ const unlistedOnly = ref(false); const matchesFilter = (r: AcquiredType) => r.type.name.toLowerCase().includes(filter.value.toLowerCase()) && (!unlistedOnly.value || !listedTypeIds.value.has(r.type.id)); -const { sortedArray, headerProps, showColumn } = useSort(computed(() => { +const results = computed(() => { const filteredItems = props.items.filter(matchesFilter); if (props.showAll) { @@ -133,7 +136,8 @@ const { sortedArray, headerProps, showColumn } = useSort(computed(() => }); }); return list; -}), { +}); +const { sortedArray, headerProps, showColumn } = useSort(results, { defaultSortKey: props.defaultSortKey, defaultSortDirection: 'desc', ignoredColumns: columnsToIgnore