Skip to content

Commit 96381b2

Browse files
committed
Fix search results table display
1 parent 68f0094 commit 96381b2

File tree

1 file changed

+15
-22
lines changed

1 file changed

+15
-22
lines changed

client/src/views/Dashboard.vue

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
<BaseTable :data="user.dashboard.filters" :fields="fields.tableViews" />
3737
</BaseCard>
3838

39-
<ValidationObserver v-slot="{ passes }" @submit.prevent slim>
40-
<BaseCard :title="$t('searchRecords')">
39+
<BaseCard :title="$t('searchRecords')">
40+
<ValidationObserver v-slot="{ passes }" @submit.prevent slim>
4141
<div class="card-container">
4242
<div class="columns">
4343
<div class="column is-6">
4444
<VField :label="$t('searchTermLabel')" rules="required">
45-
<b-input v-model="searchInput" />
45+
<b-input v-model.lazy="searchInput" />
4646
</VField>
4747
</div>
4848
<div class="column is-6">
@@ -53,19 +53,19 @@
5353
</div>
5454
</div>
5555
</div>
56+
</ValidationObserver>
5657

57-
<BaseCard v-for="searchTable in searchTables" :title="searchTable.name" :key="'searchResults'+searchTable.id">
58-
<!-- <div>{{ searchTableResults[searchTable.id] }}</div> -->
59-
<BaseTableAsync
60-
:table="searchTable"
61-
:tableEntries="searchTableResults[searchTable.id] || {}"
62-
@update="updateTableEntries(searchTable.id)"
63-
tableActionsComponent="ActionsTableSearch"
64-
/>
65-
</BaseCard>
66-
58+
<BaseCard v-for="searchTable in searchTables" :title="searchTable.name" :key="'searchResultCard'+searchTable.id">
59+
<BaseTableAsync
60+
:key="'searchResultTable'+searchTable.id"
61+
:table="searchTable"
62+
:tableEntries="searchTableResults[searchTable.id] || {}"
63+
@update="updateTableEntries(searchTable.id)"
64+
tableActionsComponent="ActionsTableSearch"
65+
/>
6766
</BaseCard>
68-
</ValidationObserver>
67+
68+
</BaseCard>
6969

7070
</div>
7171
</template>
@@ -188,7 +188,7 @@ export default {
188188
},
189189
updateTableEntries(tableId) {
190190
TableService.getEntries(tableId, {search: this.searchTerm}).then(response => {
191-
this.searchTableResults[tableId] = response
191+
this.$set(this.searchTableResults, tableId, response)
192192
})
193193
},
194194
submitSearch() {
@@ -207,20 +207,13 @@ export default {
207207
this.searchTableIds = resultTableIds
208208
209209
let resultTables = []
210-
// let results = {}
211210
this.searchTableIds.forEach(tableId => {
212211
TableService.getTable(tableId).then(response => {
213212
resultTables.push(response)
214213
})
215-
// TableService.getEntries(tableId, {search: this.searchTerm}).then(response => {
216-
// results[tableId] = response
217-
// })
218214
this.updateTableEntries(tableId)
219215
})
220-
// this.searchTableResults = results
221-
// console.log('Search table results', this.searchTableResults)
222216
this.searchTables = resultTables
223-
console.log('Search tables', this.searchTables)
224217
})
225218
}
226219
}

0 commit comments

Comments
 (0)