From 137c3ccdeca6afd56946e973374d36b0d99fbc24 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 26 Oct 2020 09:37:53 +0000 Subject: [PATCH] tidy up --- .../components/backend/DataTable/Table.svelte | 41 +++++++++++++++++++ .../DataTable/TableHeader/TableHeader.svelte | 2 - .../backend/DataTable/cells/cellRenderers.js | 8 ---- .../backend/DataTable/cells/tableCache.js | 20 --------- 4 files changed, 41 insertions(+), 30 deletions(-) delete mode 100644 packages/builder/src/components/backend/DataTable/cells/tableCache.js diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte index fd3d11598a..ab405156c6 100644 --- a/packages/builder/src/components/backend/DataTable/Table.svelte +++ b/packages/builder/src/components/backend/DataTable/Table.svelte @@ -107,6 +107,7 @@ justify-content: flex-start; align-items: center; } + .title > span { margin-right: var(--spacing-xs); } @@ -129,4 +130,44 @@ font-weight: 600; color: var(--ink); } + + :global(.ag-filter) { + padding: var(--spacing-l); + outline: none; + box-sizing: border-box; + color: var(--ink); + border: var(--border-dark); + border-radius: var(--border-radius-m); + background: #fff; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.15); + } + + :global(.ag-menu) { + border: none; + } + + :global(.ag-menu input) { + color: var(--ink) !important; + font-size: var(--font-size-s); + border-radius: var(--border-radius-s); + border: none; + background-color: var(--grey-2) !important; + padding: var(--spacing-m); + margin: 0; + outline: none; + font-family: var(--font-sans); + border: var(--border-transparent); + } + + :global(.ag-picker-field-display) { + color: var(--ink) !important; + font-size: var(--font-size-s); + border-radius: var(--border-radius-s); + border: none; + background-color: var(--grey-2) !important; + padding: var(--spacing-m); + font-family: var(--font-sans); + border: var(--border-transparent); + transition: all 0.2s ease-in-out; + } diff --git a/packages/builder/src/components/backend/DataTable/TableHeader/TableHeader.svelte b/packages/builder/src/components/backend/DataTable/TableHeader/TableHeader.svelte index 86ff73bd23..72ad6efa0a 100644 --- a/packages/builder/src/components/backend/DataTable/TableHeader/TableHeader.svelte +++ b/packages/builder/src/components/backend/DataTable/TableHeader/TableHeader.svelte @@ -14,8 +14,6 @@ export let enableSorting = true export let showColumnMenu export let progressSort - export let gridApi - export let enableMenu = true let menuButton let sortDirection = "" diff --git a/packages/builder/src/components/backend/DataTable/cells/cellRenderers.js b/packages/builder/src/components/backend/DataTable/cells/cellRenderers.js index 463123d577..e0a450b370 100644 --- a/packages/builder/src/components/backend/DataTable/cells/cellRenderers.js +++ b/packages/builder/src/components/backend/DataTable/cells/cellRenderers.js @@ -1,7 +1,6 @@ import AttachmentList from "./AttachmentCell.svelte" import EditRowPopover from "../popovers/RowPopover.svelte" import RelationshipDisplay from "./RelationshipCell.svelte" -// import BooleanCell from "./BooleanCell.svelte" const renderers = { attachment: attachmentRenderer, @@ -42,13 +41,6 @@ function attachmentRenderer(options, constraints, editable) { }, }) - // const deleteFile = event => { - // const newFilesArray = params.value.filter(file => file !== event.detail) - // params.setValue(newFilesArray) - // } - - // attachmentInstance.$on("delete", deleteFile) - return container } } diff --git a/packages/builder/src/components/backend/DataTable/cells/tableCache.js b/packages/builder/src/components/backend/DataTable/cells/tableCache.js deleted file mode 100644 index 01a07b42db..0000000000 --- a/packages/builder/src/components/backend/DataTable/cells/tableCache.js +++ /dev/null @@ -1,20 +0,0 @@ -import api from "builderStore/api" - -let cache = {} - -async function fetchTable(id) { - const FETCH_TABLE_URL = `/api/tables/${id}` - const response = await api.get(FETCH_TABLE_URL) - return await response.json() -} - -export async function getTable(tableId) { - if (!tableId) { - return null - } - if (!cache[tableId]) { - cache[tableId] = fetchTable(tableId) - cache[tableId] = await cache[tableId] - } - return await cache[tableId] -}