Skip to content

Commit 3b632a5

Browse files
committed
Clear coin list before opening new collection or apply filter
1 parent 2d5857f commit 3b632a5

2 files changed

Lines changed: 28 additions & 15 deletions

File tree

frontend/src/App.vue

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,16 @@ const openFile = async (file, connection_type) => {
7070
if (!file)
7171
return;
7272
73-
collectionFilters.value = {'status': [], 'country': [], 'series': [], 'type': [], 'period': [], 'mint': []}
74-
isOpened = true;
73+
watch(coinListViewRef, (newVal) => {
74+
if (newVal) {
75+
coinListViewRef.value.clear()
76+
}
77+
})
78+
7579
await router.replace('/')
80+
isOpened = true;
81+
82+
collectionFilters.value = {'status': [], 'country': [], 'series': [], 'type': [], 'period': [], 'mint': []}
7683
let ret = null
7784
7885
if (connection_type === 'remote') {
@@ -90,7 +97,7 @@ const openFile = async (file, connection_type) => {
9097
collectionSettings.value = ret.collectionSettings;
9198
collectionFilters.value = ret.collectionFilters;
9299
93-
coinListViewRef.value.onOpenFile()
100+
await coinListViewRef.value.onOpenFile()
94101
}
95102
}
96103

frontend/src/components/CoinListView.vue

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,6 @@ onUnmounted(async () => {
4343
})
4444
4545
const onOpenFile = async () => {
46-
searchVal.value = null
47-
sortedBy.value = null
48-
reverseSort.value = false
49-
selectedStatus.value = null
50-
selectedCountry.value = null
51-
selectedSeries.value = null
52-
selectedType.value = null
53-
selectedPeriod.value = null
54-
selectedMint.value = null
55-
images.value = []
56-
coinsList.value = []
5746
coinsList.value = await service.loadCoins()
5847
images.value = new Array(coinsList.value.length).fill('')
5948
@@ -70,8 +59,23 @@ const onOpenFile = async () => {
7059
fields.value.push('period')
7160
}
7261
62+
const clear = async () => {
63+
searchVal.value = null
64+
sortedBy.value = null
65+
reverseSort.value = false
66+
selectedStatus.value = null
67+
selectedCountry.value = null
68+
selectedSeries.value = null
69+
selectedType.value = null
70+
selectedPeriod.value = null
71+
selectedMint.value = null
72+
images.value = []
73+
coinsList.value = []
74+
}
75+
7376
defineExpose({
74-
onOpenFile
77+
onOpenFile,
78+
clear
7579
})
7680
7781
function generateDescription( coin_data ) {
@@ -94,6 +98,8 @@ function generateDescription( coin_data ) {
9498
}
9599
96100
const onChanged = async () => {
101+
images.value = []
102+
coinsList.value = []
97103
coinsList.value = await service.loadCoins(
98104
searchVal.value,
99105
sortedBy.value,

0 commit comments

Comments
 (0)