CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-09-28 23:31:43 +12:00
Code Issues Projects Releases Wiki Activity

Adding the ability to create options based on CSV, this will use the import data to create options.

Browse source
This commit is contained in:
mike12345567 2021-05-18 22:14:27 +01:00
parent 0e9a2c8e9b
commit 48b7a31c2a
8 changed files with 47 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/bbui/src/Typography/Body.svelte
View file

@ -8,7 +8,7 @@
</script>
<p
style="{textAlign ? `text-align:${textAlign}` : ``}"
style={textAlign ? `text-align:${textAlign}` : ``}
class:noPadding
class="spectrum-Body spectrum-Body--size{size}"
class:spectrum-Body--serif={serif}

2
packages/bbui/src/Typography/Heading.svelte
View file

@ -8,7 +8,7 @@
</script>
<h1
style="{textAlign ? `text-align:${textAlign}` : ``}"
style={textAlign ? `text-align:${textAlign}` : ``}
class:noPadding
class="spectrum-Heading spectrum-Heading--size{size}"
>

12
packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
View file

@ -1,5 +1,5 @@
<script>
import { Select, Label } from "@budibase/bbui"
import { Select } from "@budibase/bbui"
import { notifications } from "@budibase/bbui"
import { FIELDS } from "constants/backend"
import api from "builderStore/api"
@ -99,15 +99,19 @@
const typeOptions = [
{
label: "Text",
value: "string",
value: FIELDS.STRING.type,
},
{
label: "Number",
value: "number",
value: FIELDS.NUMBER.type,
},
{
label: "Date",
value: "datetime",
value: FIELDS.DATETIME.type,
},
{
label: "Options",
value: FIELDS.OPTIONS.type,
},
]
</script>

15
packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
View file

@ -3,7 +3,14 @@
import { store } from "builderStore"
import { tables } from "stores/backend"
import { notifications } from "@budibase/bbui"
import { Input, Label, ModalContent, Toggle, Divider } from "@budibase/bbui"
import {
Input,
Label,
ModalContent,
Toggle,
Divider,
Layout,
} from "@budibase/bbui"
import TableDataImport from "../TableDataImport.svelte"
import analytics from "analytics"
import screenTemplates from "builderStore/store/screenTemplates"
@ -123,8 +130,10 @@
bind:value={createAutoscreens}
/>
<div>
<Label grey extraSmall>Create Table from CSV (Optional)</Label>
<TableDataImport bind:dataImport />
<Layout gap="XS" noPadding>
<Label grey extraSmall>Create Table from CSV (Optional)</Label>
<TableDataImport bind:dataImport />
</Layout>
</div>
</ModalContent>

8
packages/builder/src/components/login/ForgotForm.svelte
View file

@ -30,12 +30,14 @@
<Layout gap="XS" noPadding>
<Heading textAlign="center">Forgotten your password?</Heading>
<Body size="S" textAlign="center">
No problem! Just enter your account's email address and we'll send
you a link to reset it.
No problem! Just enter your account's email address and we'll send you
a link to reset it.
</Body>
<Input label="Email" bind:value={email} />
</Layout>
<Button cta on:click={forgot} disabled={!email}>Reset your password</Button>
<Button cta on:click={forgot} disabled={!email}
>Reset your password</Button
>
</Layout>
</div>
</div>

5
packages/builder/src/components/login/ResetForm.svelte
View file

@ -16,7 +16,6 @@
} catch (err) {
notifications.error("Unable to reset password")
}
}
</script>
@ -33,7 +32,9 @@
</Body>
<PasswordRepeatInput bind:password bind:error />
</Layout>
<Button cta on:click={reset} disabled={error || !resetCode}>Reset your password</Button>
<Button cta on:click={reset} disabled={error || !resetCode}
>Reset your password</Button
>
</Layout>
</div>
</div>

17
packages/server/src/api/controllers/table/utils.js
View file

@ -6,7 +6,7 @@ const {
InternalTables,
} = require("../../../db/utils")
const { isEqual } = require("lodash/fp")
const { AutoFieldSubTypes } = require("../../../constants")
const { AutoFieldSubTypes, FieldTypes } = require("../../../constants")
const { inputProcessing } = require("../../../utilities/rowProcessor")
const { USERS_TABLE_SCHEMA } = require("../../../constants")
@ -72,18 +72,21 @@ exports.handleDataImport = async (appId, user, table, dataImport) => {
row._id = generateRowID(table._id)
row.tableId = table._id
const processed = inputProcessing(user, table, row)
table = processed.table
row = processed.row
// these auto-fields will never actually link anywhere (always builder)
for (let [fieldName, schema] of Object.entries(table.schema)) {
// check whether the options need to be updated for inclusion as part of the data import
if (
schema.autocolumn &&
(schema.subtype === AutoFieldSubTypes.CREATED_BY ||
schema.subtype === AutoFieldSubTypes.UPDATED_BY)
schema.type === FieldTypes.OPTIONS &&
(!schema.constraints.inclusion ||
schema.constraints.inclusion.indexOf(row[fieldName]) === -1)
) {
delete row[fieldName]
schema.constraints.inclusion = [
...schema.constraints.inclusion,
row[fieldName],
]
}
}
table = processed.table
data[i] = row
}

12
packages/server/src/utilities/csvParser.js
View file

@ -1,14 +1,16 @@
const csv = require("csvtojson")
const { FieldTypes } = require("../constants")
const VALIDATORS = {
string: () => true,
number: attribute => !isNaN(Number(attribute)),
datetime: attribute => !isNaN(new Date(attribute).getTime()),
[FieldTypes.STRING]: () => true,
[FieldTypes.OPTIONS]: () => true,
[FieldTypes.NUMBER]: attribute => !isNaN(Number(attribute)),
[FieldTypes.DATETIME]: attribute => !isNaN(new Date(attribute).getTime()),
}
const PARSERS = {
number: attribute => Number(attribute),
datetime: attribute => new Date(attribute).toISOString(),
[FieldTypes.NUMBER]: attribute => Number(attribute),
[FieldTypes.DATETIME]: attribute => new Date(attribute).toISOString(),
}
function parse(csvString, parsers) {