diff --git a/src/components/table/sort.spec.ts b/src/components/table/sort.spec.ts index 7ef695b..2504400 100644 --- a/src/components/table/sort.spec.ts +++ b/src/components/table/sort.spec.ts @@ -3,42 +3,42 @@ import { ref } from 'vue' import { useSort } from './sort' describe('useSort', () => { - const array = ref([{ key1: 'b', key2: 'a' }, { key1: 'a', key2: 'b' }]) + const array = ref([{ key1: 'b', key2: 'a' }, { key1: 'a', key2: 'b' }]) - test('Returns expected properties with default options', () => { - const { sortedArray, headerProps, showColumn } = useSort(array) + test('Returns expected properties with default options', () => { + const { sortedArray, headerProps, showColumn } = useSort(array) - expect(sortedArray).toBeDefined() - expect(headerProps).toBeDefined() - expect(showColumn).toBeDefined() - }) + expect(sortedArray).toBeDefined() + expect(headerProps).toBeDefined() + expect(showColumn).toBeDefined() + }) - test('Returns expected properties with custom options', () => { - const { sortedArray, headerProps, showColumn } = useSort(array, { defaultSortKey: 'key1', defaultSortDirection: 'asc' }) + test('Returns expected properties with custom options', () => { + const { sortedArray, headerProps, showColumn } = useSort(array, { defaultSortKey: 'key1', defaultSortDirection: 'asc' }) - expect(sortedArray.value[0].key1).toBe('a') - expect(headerProps.value.currentSortKey).toBe('key1') - expect(headerProps.value.sortDirection).toBe('asc') - expect(showColumn('key1')).toBe(true) - }) + expect(sortedArray.value[0].key1).toBe('a') + expect(headerProps.value.currentSortKey).toBe('key1') + expect(headerProps.value.sortDirection).toBe('asc') + expect(showColumn('key1')).toBe(true) + }) - test('Sorts array in ascending order', () => { - const { sortedArray, headerProps } = useSort(array, { defaultSortKey: 'key1', defaultSortDirection: 'asc' }) + test('Sorts array in ascending order', () => { + const { sortedArray, headerProps } = useSort(array, { defaultSortKey: 'key1', defaultSortDirection: 'asc' }) - headerProps.value.onSort('key1', 'asc') - expect(sortedArray.value[0].key1).toBe('a') - }) + headerProps.value.onSort('key1', 'asc') + expect(sortedArray.value[0].key1).toBe('a') + }) - test('Sorts array in descending order', () => { - const { sortedArray, headerProps } = useSort(array, { defaultSortKey: 'key1', defaultSortDirection: 'desc' }) + test('Sorts array in descending order', () => { + const { sortedArray, headerProps } = useSort(array, { defaultSortKey: 'key1', defaultSortDirection: 'desc' }) - headerProps.value.onSort('key1', 'desc') - expect(sortedArray.value[0].key1).toBe('b') - }) + headerProps.value.onSort('key1', 'desc') + expect(sortedArray.value[0].key1).toBe('b') + }) - test('Hides ignored columns', () => { - const { showColumn } = useSort(array, { ignoredColums: ['key1'] }) + test('Hides ignored columns', () => { + const { showColumn } = useSort(array, { ignoredColums: ['key1'] }) - expect(showColumn('key1')).toBe(false) - }) + expect(showColumn('key1')).toBe(false) + }) }) \ No newline at end of file diff --git a/src/market/acquisition/acquisition.ts b/src/market/acquisition/acquisition.ts index 78baee9..5409ebf 100644 --- a/src/market/acquisition/acquisition.ts +++ b/src/market/acquisition/acquisition.ts @@ -1,7 +1,7 @@ import { useAuthStore } from "@/auth"; import { marbasAxiosInstance } from "@/service"; import { defineStore } from "pinia"; -import { computed, onMounted, ref } from "vue"; +import { computed, ref } from "vue"; export type AcquiredMarketItem = { id: number; @@ -60,9 +60,7 @@ export const useAcquiredItemStore = defineStore('market-acquisition', () => { await marbasAxiosInstance.put(`${endpoint}/${item.id}`, item); }; - onMounted(async () => { - acquiredItems.value = (await marbasAxiosInstance.get(endpoint)).data.filter(item => item.remaining > 0); - }); + marbasAxiosInstance.get(endpoint).then(res => acquiredItems.value = res.data.filter(item => item.remaining > 0)); return { items, addAcquiredItem, removeAcquiredItem }; }); \ No newline at end of file diff --git a/src/service.ts b/src/service.ts index 9af37d0..d567383 100644 --- a/src/service.ts +++ b/src/service.ts @@ -8,7 +8,10 @@ export const logResource = (a: AxiosInstance) => { log.debug(`[${r.config.method?.toUpperCase()}] ${r.config.url}`); return r; }, e => { - log.error(`[${e.config.method?.toUpperCase()}] ${e.config.url} failed with ${e.response?.status} ${e.response?.statusText}`); + if (e instanceof Error) { + log.error(e.message); + } + log.error(`[${e.config?.method?.toUpperCase()}] ${e.config?.url} failed with ${e.response?.status} ${e.response?.statusText}`); return Promise.reject(e); }); }