bug fixes=

This commit is contained in:
Martin McKeaveney 2020-03-25 10:59:47 +00:00
parent 88db9bbc02
commit 0d0685cd48
4 changed files with 28 additions and 32 deletions

View File

@ -39,8 +39,8 @@ export const getBackendUiStore = () => {
})
},
records: {
delete: record => store.update(state => {
state.selectedView.records = state.selectedView.records.filter(({ id }) => id !== record.id)
delete: () => store.update(state => {
state.selectedView = state.selectedView
return state
}),
view: record => store.update(state => {

View File

@ -13,7 +13,6 @@
const ITEMS_PER_PAGE = 10
let selectedView = ""
let modalOpen = false
let data = []
let headers = []
@ -28,21 +27,20 @@
appname: $store.appname,
instanceId: $backendUiStore.selectedDatabase.id,
}
// $: data =
// $backendUiStore.selectedDatabase &&
// $backendUiStore.selectedView.records.slice(
// currentPage * ITEMS_PER_PAGE,
// currentPage * ITEMS_PER_PAGE + ITEMS_PER_PAGE
// )
$: fetchRecordsForView(
$backendUiStore.selectedView,
$backendUiStore.selectedDatabase
).then(records => {
data = records
data = records || []
headers = getSchema($backendUiStore.selectedView).map(get("name"))
})
$: paginatedData = data.slice(
currentPage * ITEMS_PER_PAGE,
currentPage * ITEMS_PER_PAGE + ITEMS_PER_PAGE
)
const childViewsForRecord = compose(
flatten,
map("indexes"),
@ -52,10 +50,13 @@
const getSchema = getIndexSchema($store.hierarchy)
async function fetchRecordsForView(view, instance) {
if (!view.name) return
const viewName = $backendUiStore.selectedRecord
? `${$backendUiStore.selectedRecord.type}/`
? `${$backendUiStore.selectedRecord.type}/${$backendUiStore.selectedRecord.id}/${view.name}`
: view.name
return await api.fetchDataForView(view.name, {
return await api.fetchDataForView(viewName, {
appname: $store.appname,
instanceId: instance.id,
})
@ -68,19 +69,20 @@
return state
})
}
onMount(() => {
if (views.length) {
backendUiStore.actions.views.select(views[0])
}
})
</script>
<section>
<div class="table-controls">
<h4 class="budibase__title--3">{last($backendUiStore.breadcrumbs)}</h4>
<Select
icon="ri-eye-line"
on:change={e => {
const view = e.target.value
backendUiStore.actions.views.select(view)
}}>
<Select icon="ri-eye-line" bind:value={$backendUiStore.selectedView}>
{#each views as view}
<option value={view.name}>{view.name}</option>
<option value={view}>{view.name}</option>
{/each}
</Select>
</div>
@ -94,10 +96,10 @@
</tr>
</thead>
<tbody>
{#if data.length === 0}
{#if paginatedData.length === 0}
<div class="no-data">No Data.</div>
{/if}
{#each data as row}
{#each paginatedData as row}
<tr class="hoverable">
<td>
<div class="uk-inline">
@ -135,9 +137,11 @@
</tbody>
</table>
<TablePagination
{data}
bind:currentPage
pageItemCount={data.length}
{ITEMS_PER_PAGE} />
{ITEMS_PER_PAGE}
/>
</section>
<style>

View File

@ -1,13 +1,13 @@
<script>
import { backendUiStore } from "../../builderStore"
export let data
export let currentPage
export let pageItemCount
export let ITEMS_PER_PAGE
let numPages = 0
$: data = $backendUiStore.selectedView.records
$: numPages = Math.ceil(data.length / ITEMS_PER_PAGE)
const next = () => {

View File

@ -29,15 +29,7 @@
currentAppInfo
)
backendUiStore.update(state => {
const idx = findIndex(state.selectedView.records, {
id: recordResponse.id
})
if (idx > 0) {
state.selectedView.records.splice(idx, 1, recordResponse)
} else {
state.selectedView.records.push(recordResponse)
}
state.selectedView = state.selectedView
return state
})
onClosed()