Browse Source

Merge pull request #872 from Budibase/switching-bug

Switching bug
pull/873/head
Martin McKeaveney 6 years ago
committed by GitHub
parent
commit
d4cc142a1b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      packages/builder/src/components/backend/DataTable/DataTable.svelte
  2. 5
      packages/server/src/api/controllers/application.js
  3. 2
      packages/standard-components/package.json
  4. 6
      packages/standard-components/src/DataGrid/Component.svelte
  5. 1
      packages/standard-components/src/index.js

2
packages/builder/src/components/backend/DataTable/DataTable.svelte

@ -31,7 +31,7 @@
<Table {title} {schema} {data} allowEditing={true} {loading}>
<CreateColumnButton />
{#if Object.keys(schema).length > 0}
{#if schema && Object.keys(schema).length > 0}
<CreateRowButton />
<CreateViewButton />
<ExportButton view={tableView} />

5
packages/server/src/api/controllers/application.js

@ -79,7 +79,10 @@ exports.fetch = async function(ctx) {
if (apps.length === 0) {
ctx.body = []
} else {
ctx.body = await Promise.all(apps)
const response = await Promise.allSettled(apps)
ctx.body = response
.filter(result => result.status === "fulfilled")
.map(({ value }) => value)
}
}

2
packages/standard-components/package.json

@ -36,7 +36,7 @@
"gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691",
"dependencies": {
"@budibase/bbui": "^1.50.1",
"@budibase/svelte-ag-grid": "^0.0.13",
"@budibase/svelte-ag-grid": "^0.0.16",
"@fortawesome/fontawesome-free": "^5.14.0",
"@svelteschool/svelte-forms": "^0.7.0",
"apexcharts": "^3.22.1",

6
packages/standard-components/src/DataGrid/Component.svelte

@ -140,12 +140,6 @@
}
</script>
<svelte:head>
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css" />
</svelte:head>
<div class="container" style="--grid-height: {height}px">
{#if dataLoaded}
{#if canAddDelete}

1
packages/standard-components/src/index.js

@ -1,4 +1,5 @@
import "@budibase/bbui/dist/bbui.css"
import "flatpickr/dist/flatpickr.css"
export { default as container } from "./Container.svelte"
export { default as text } from "./Text.svelte"

Loading…
Cancel
Save