diff --git a/package.json b/package.json
index 79935c5dce..10cebbd720 100644
--- a/package.json
+++ b/package.json
@@ -28,5 +28,8 @@
"format": "prettier --write \"{,!(node_modules)/**/}*.{js,jsx,svelte}\"",
"test:e2e": "lerna run cy:test",
"test:e2e:ci": "lerna run cy:ci"
+ },
+ "dependencies": {
+ "@fortawesome/fontawesome": "^1.1.8"
}
}
diff --git a/packages/builder/package.json b/packages/builder/package.json
index c19d1b649e..c71e5b328b 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -66,6 +66,7 @@
"@budibase/bbui": "^1.33.0",
"@budibase/client": "^0.1.21",
"@budibase/colorpicker": "^1.0.1",
+ "@fortawesome/fontawesome-free": "^5.14.0",
"@sentry/browser": "5.19.1",
"@svelteschool/svelte-forms": "^0.7.0",
"britecharts": "^2.16.0",
diff --git a/packages/builder/src/builderStore/api.js b/packages/builder/src/builderStore/api.js
index 116222409f..a33a695028 100644
--- a/packages/builder/src/builderStore/api.js
+++ b/packages/builder/src/builderStore/api.js
@@ -1,7 +1,8 @@
-const apiCall = method => async (url, body) => {
- const headers = {
- "Content-Type": "application/json",
- }
+const apiCall = method => async (
+ url,
+ body,
+ headers = { "Content-Type": "application/json" }
+) => {
const response = await fetch(url, {
method: method,
body: body && JSON.stringify(body),
diff --git a/packages/builder/src/builderStore/buildStateOrigins.js b/packages/builder/src/builderStore/buildStateOrigins.js
deleted file mode 100644
index d368b3656e..0000000000
--- a/packages/builder/src/builderStore/buildStateOrigins.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * buildStateOrigins
- *
- * Builds an object that details all the bound state in the application, and what updates it.
- *
- * @param screenDefinition - the screen definition metadata.
- * @returns {Object} an object with the client state values and how they are managed.
- */
-export const buildStateOrigins = screenDefinition => {
- const origins = {}
-
- function traverse(propValue) {
- for (let key in propValue) {
- if (!Array.isArray(propValue[key])) continue
-
- if (key === "_children") propValue[key].forEach(traverse)
-
- for (let element of propValue[key]) {
- if (element["##eventHandlerType"] === "Set State")
- origins[element.parameters.path] = element
- }
- }
- }
-
- traverse(screenDefinition.props)
-
- return origins
-}
diff --git a/packages/builder/src/builderStore/store/backend.js b/packages/builder/src/builderStore/store/backend.js
index 4b7058a8b9..bbfbcd4726 100644
--- a/packages/builder/src/builderStore/store/backend.js
+++ b/packages/builder/src/builderStore/store/backend.js
@@ -28,6 +28,11 @@ export const getBackendUiStore = () => {
},
},
records: {
+ save: () =>
+ store.update(state => {
+ state.selectedView = state.selectedView
+ return state
+ }),
delete: () =>
store.update(state => {
state.selectedView = state.selectedView
diff --git a/packages/builder/src/components/common/Dropzone.svelte b/packages/builder/src/components/common/Dropzone.svelte
new file mode 100644
index 0000000000..a356ff811f
--- /dev/null
+++ b/packages/builder/src/components/common/Dropzone.svelte
@@ -0,0 +1,299 @@
+
+
+
+
+ {#if selectedImage}
+ -
+
+
+
+ {selectedImage.name}
+
+
+ {#if selectedImage.size <= BYTES_IN_MB}
+ {selectedImage.size / BYTES_IN_KB}KB
+ {:else}{selectedImage.size / BYTES_IN_MB}MB{/if}
+
+
+
+
+
+ {#if selectedImageIdx !== 0}
+
+
+
+ {/if}
+ 
+ {#if selectedImageIdx !== files.length - 1}
+
+
+
+ {/if}
+
+ {/if}
+
+
+
+
+
+ {#each files as file}
+
+ {#if FILE_TYPES.IMAGE.includes(file.extension.toLowerCase())}
+
+ {:else}
+
+
.{file.extension}
+
{file.name}
+ {/if}
+
+ {/each}
+
{#if schema[header].type === 'link'}
+ {:else if schema[header].type === 'attachment'}
+
{:else}{getOr('', header, row)}{/if}
|
{/each}
@@ -108,6 +111,7 @@
section {
margin-bottom: 20px;
}
+
.title {
font-size: 24px;
font-weight: 600;
diff --git a/packages/builder/src/components/database/DataTable/Table.svelte b/packages/builder/src/components/database/DataTable/Table.svelte
index d3fdc63046..4d6563d8bd 100644
--- a/packages/builder/src/components/database/DataTable/Table.svelte
+++ b/packages/builder/src/components/database/DataTable/Table.svelte
@@ -6,7 +6,7 @@
import api from "builderStore/api"
import { Button, Icon } from "@budibase/bbui"
import ActionButton from "components/common/ActionButton.svelte"
- import LinkedRecord from "./LinkedRecord.svelte"
+ import AttachmentList from "./AttachmentList.svelte"
import TablePagination from "./TablePagination.svelte"
import { DeleteRecordModal, CreateEditRecordModal } from "./modals"
import RowPopover from "./popovers/Row.svelte"
@@ -59,7 +59,11 @@
{#each paginatedData as row}
{#each columns as header}
- | {getOr('', header, row)} |
+
+ {#if schema[header].type === 'attachment'}
+
+ {:else}{getOr('', header, row)}{/if}
+ |
{/each}
{/each}
diff --git a/packages/builder/src/components/database/DataTable/modals/CreateEditRecord.svelte b/packages/builder/src/components/database/DataTable/modals/CreateEditRecord.svelte
index 32df16ed7f..8edecd913c 100644
--- a/packages/builder/src/components/database/DataTable/modals/CreateEditRecord.svelte
+++ b/packages/builder/src/components/database/DataTable/modals/CreateEditRecord.svelte
@@ -1,5 +1,5 @@
diff --git a/packages/builder/src/components/database/DataTable/modals/RecordFieldControl.svelte b/packages/builder/src/components/database/DataTable/modals/RecordFieldControl.svelte
index ed56618e3e..991a5fea63 100644
--- a/packages/builder/src/components/database/DataTable/modals/RecordFieldControl.svelte
+++ b/packages/builder/src/components/database/DataTable/modals/RecordFieldControl.svelte
@@ -1,9 +1,10 @@
+
+
+
+
+
+
+
+
+ {#each alphabet as letter, idx}
+ switchLetter(letter)}>
+ {letter}
+
+ {#if idx !== alphabet.length - 1}
+ -
+ {/if}
+ {/each}
+
+
+
+
+
+
+ {#if pagedIcons.length > 0}
+
+ {#if !loading}
+ {#each pagedIcons as icon}
+
(value = icon.value)}>
+
+
+
+
{icon.label}
+
+ {/each}
+ {/if}
+
+ {:else}
+
+
+ {`There is no icons for this ${searchTerm ? 'search' : 'page'}`}
+
+
+ {/if}
+
+