Browse Source

tidy up

master
Martin McKeaveney 6 years ago
parent
commit
580ae3fb4c
  1. 5
      packages/client/src/api/datasources.js
  2. 3
      packages/standard-components/src/Search.svelte

5
packages/client/src/api/datasources.js

@ -7,10 +7,7 @@ import { enrichRows } from "./rows"
export const searchTable = async ({ tableId, search, pagination }) => { export const searchTable = async ({ tableId, search, pagination }) => {
const rows = await searchTableData({ tableId, search, pagination }) const rows = await searchTableData({ tableId, search, pagination })
return rows return await enrichRows(rows, tableId)
// TODO
// Enrich rows so they can displayed properly
// return await enrichRows(rows, tableId)
} }
/** /**

3
packages/standard-components/src/Search.svelte

@ -28,7 +28,6 @@
let page = 0 let page = 0
$: fetchData(table, page) $: fetchData(table, page)
$: searchable = [...(table.indexes || []), ...columns]
// omit empty strings // omit empty strings
$: parsedSearch = Object.keys(search).reduce( $: parsedSearch = Object.keys(search).reduce(
(acc, next) => (acc, next) =>
@ -114,14 +113,12 @@
<p>{noRowsMessage}</p> <p>{noRowsMessage}</p>
{/if} {/if}
<div class="pagination"> <div class="pagination">
<!-- <Button primary on:click={previousPage}>First</Button> -->
{#if page > 0} {#if page > 0}
<Button primary on:click={previousPage}>Back</Button> <Button primary on:click={previousPage}>Back</Button>
{/if} {/if}
{#if rows.length === pageSize} {#if rows.length === pageSize}
<Button primary on:click={nextPage}>Next</Button> <Button primary on:click={nextPage}>Next</Button>
{/if} {/if}
<!-- <Button primary on:click={previousPage}>Last</Button> -->
</div> </div>
</div> </div>

Loading…
Cancel
Save