Merge pull request #665 from mjashanks/fixes

Bugfixes
2024-07-05 06:20:55 +12:00 · 2020-10-06 21:50:56 +01:00 · 2020-10-06 21:50:56 +01:00 · e9ecafb3e1
parent f5102d95bb 46cd413c58
commit e9ecafb3e1
23 changed files with 7384 additions and 47 deletions
--- a/packages/builder/cypress/integration/createView.spec.js
+++ b/packages/builder/cypress/integration/createView.spec.js
@ -47,8 +47,9 @@ context('Create a View', () => {

    it('creates a stats calculation view based on age', () => {
      cy.contains("Calculate").click()
-      cy.get(".menu-container").find("select").first().select("Statistics")
-      cy.get(".menu-container").find("select").eq(1).select("age")
+      // we may reinstate this - have commented this dropdown for now as there is only one option
+      //cy.get(".menu-container").find("select").first().select("Statistics")
+      cy.get(".menu-container").find("select").eq(0).select("age")
      cy.contains("Save").click()
      cy.get("thead th").should(($headers) => {
        expect($headers).to.have.length(7)
--- a/packages/builder/src/components/database/DataTable/ModelDataTable.svelte
+++ b/packages/builder/src/components/database/DataTable/ModelDataTable.svelte
@ -10,7 +10,6 @@
  import AttachmentList from "./AttachmentList.svelte"
  import TablePagination from "./TablePagination.svelte"
  import Spinner from "components/common/Spinner.svelte"
-  import { DeleteRecordModal, CreateEditRecordModal } from "./modals"
  import RowPopover from "./popovers/Row.svelte"
  import ColumnPopover from "./popovers/Column.svelte"
  import ViewPopover from "./popovers/View.svelte"
--- a/packages/builder/src/components/database/DataTable/Table.svelte
+++ b/packages/builder/src/components/database/DataTable/Table.svelte
@ -8,7 +8,6 @@
  import ActionButton from "components/common/ActionButton.svelte"
  import AttachmentList from "./AttachmentList.svelte"
  import TablePagination from "./TablePagination.svelte"
-  import { DeleteRecordModal, CreateEditRecordModal } from "./modals"
  import RowPopover from "./popovers/Row.svelte"
  import ColumnPopover from "./popovers/Column.svelte"
  import ViewPopover from "./popovers/View.svelte"
--- a/packages/builder/src/components/database/DataTable/ViewDataTable.svelte
+++ b/packages/builder/src/components/database/DataTable/ViewDataTable.svelte
@ -9,7 +9,6 @@
  import ActionButton from "components/common/ActionButton.svelte"
  import LinkedRecord from "./LinkedRecord.svelte"
  import TablePagination from "./TablePagination.svelte"
-  import { DeleteRecordModal, CreateEditRecordModal } from "./modals"
  import RowPopover from "./popovers/Row.svelte"
  import ColumnPopover from "./popovers/Column.svelte"
  import ViewPopover from "./popovers/View.svelte"
--- a/packages/builder/src/components/database/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/database/DataTable/modals/CreateEditColumn.svelte
@ -24,11 +24,7 @@
  }

  let originalName = field.name
-
-  $: required =
-    field.constraints &&
-    field.constraints.presence &&
-    !field.constraints.presence.allowEmpty
+  $: required = field && field.constraints && field.constraints.presence

  async function saveColumn() {
    backendUiStore.update(state => {
@ -50,6 +46,14 @@
    field.type = type
    field.constraints = constraints
  }
+
+  const getPresence = required => (required ? { allowEmpty: false } : false)
+
+  const requiredChanged = ev => {
+    const req = ev.target.checked
+    field.constraints.presence = req ? { allowEmpty: false } : false
+    required = req
+  }
 </script>

 <div class="actions">
@ -68,10 +72,7 @@
  <div class="info">
    <div class="field">
      <label>Required</label>
-      <input
-        type="checkbox"
-        bind:checked={required}
-        on:change={() => (field.constraints.presence.allowEmpty = required)} />
+      <input type="checkbox" checked={required} on:change={requiredChanged} />
    </div>

    {#if field.type === 'string' && field.constraints}
--- a/packages/builder/src/components/database/DataTable/popovers/Calculate.svelte
+++ b/packages/builder/src/components/database/DataTable/popovers/Calculate.svelte
@ -9,7 +9,6 @@
  } from "@budibase/bbui"
  import { backendUiStore } from "builderStore"
  import { notifier } from "builderStore/store/notifications"
-  import CreateEditRecord from "../modals/CreateEditRecord.svelte"
  import analytics from "analytics"

  const CALCULATIONS = [
@ -34,6 +33,7 @@
    )

  function saveView() {
+    if (!view.calculation) view.calculation = "stats"
    backendUiStore.actions.views.save(view)
    notifier.success(`View ${view.name} saved.`)
    analytics.captureEvent("Added View Calculate", { field: view.field })
@ -50,14 +50,15 @@
 <Popover bind:this={dropdown} {anchor} align="left">
  <h5>Calculate</h5>
  <div class="input-group-row">
-    <p>The</p>
+    <!-- <p>The</p>
    <Select secondary thin bind:value={view.calculation}>
      <option value="">Choose an option</option>
      {#each CALCULATIONS as calculation}
        <option value={calculation.key}>{calculation.name}</option>
      {/each}
    </Select>
-    <p>of</p>
+    <p>of</p> -->
+    <p>The statistics of</p>
    <Select secondary thin bind:value={view.field}>
      <option value="">Choose an option</option>
      {#each fields as field}
@ -86,7 +87,7 @@

  .input-group-row {
    display: grid;
-    grid-template-columns: 50px 1fr 20px 1fr;
+    grid-template-columns: auto 1fr 20px 1fr;
    gap: var(--spacing-s);
    margin-bottom: var(--spacing-l);
    align-items: center;
--- a/packages/builder/src/components/database/DataTable/popovers/Filter.svelte
+++ b/packages/builder/src/components/database/DataTable/popovers/Filter.svelte
@ -6,10 +6,10 @@
    Icon,
    Input,
    Select,
+    DatePicker,
  } from "@budibase/bbui"
  import { backendUiStore } from "builderStore"
  import { notifier } from "builderStore/store/notifications"
-  import CreateEditRecord from "../modals/CreateEditRecord.svelte"
  import analytics from "analytics"

  const CONDITIONS = [
@ -81,11 +81,38 @@

  function isMultipleChoice(field) {
    return (
-      viewModel.schema[field].constraints &&
-      viewModel.schema[field].constraints.inclusion &&
-      viewModel.schema[field].constraints.inclusion.length
+      (viewModel.schema[field].constraints &&
+        viewModel.schema[field].constraints.inclusion &&
+        viewModel.schema[field].constraints.inclusion.length) ||
+      viewModel.schema[field].type === "boolean"
    )
  }
+
+  function fieldOptions(field) {
+    return viewModel.schema[field].type === "string"
+      ? viewModel.schema[field].constraints.inclusion
+      : [true, false]
+  }
+
+  function isDate(field) {
+    return viewModel.schema[field].type === "datetime"
+  }
+
+  function isNumber(field) {
+    return viewModel.schema[field].type === "number"
+  }
+
+  const fieldChanged = filter => ev => {
+    // reset if type changed
+    if (
+      filter.key &&
+      ev.target.value &&
+      viewModel.schema[filter.key].type !==
+        viewModel.schema[ev.target.value].type
+    ) {
+      filter.value = ""
+    }
+  }
 </script>

 <div bind:this={anchor}>
@ -112,7 +139,11 @@
          {/each}
        </Select>
      {/if}
-      <Select secondary thin bind:value={filter.key}>
+      <Select
+        secondary
+        thin
+        bind:value={filter.key}
+        on:change={fieldChanged(filter)}>
        <option value="">Choose an option</option>
        {#each fields as field}
          <option value={field}>{field}</option>
@ -126,10 +157,21 @@
      </Select>
      {#if filter.key && isMultipleChoice(filter.key)}
        <Select secondary thin bind:value={filter.value}>
-          {#each viewModel.schema[filter.key].constraints.inclusion as option}
-            <option value={option}>{option}</option>
+          <option value="">Choose an option</option>
+          {#each fieldOptions(filter.key) as option}
+            <option value={option}>{option.toString()}</option>
          {/each}
        </Select>
+      {:else if filter.key && isDate(filter.key)}
+        <DatePicker
+          bind:value={filter.value}
+          placeholder={filter.key || fields[0]} />
+      {:else if filter.key && isNumber(filter.key)}
+        <Input
+          thin
+          bind:value={filter.value}
+          placeholder={filter.key || fields[0]}
+          type="number" />
      {:else}
        <Input
          thin
--- a/packages/builder/src/components/database/DataTable/popovers/GroupBy.svelte
+++ b/packages/builder/src/components/database/DataTable/popovers/GroupBy.svelte
@ -9,7 +9,6 @@
  } from "@budibase/bbui"
  import { backendUiStore } from "builderStore"
  import { notifier } from "builderStore/store/notifications"
-  import CreateEditRecord from "../modals/CreateEditRecord.svelte"

  const CALCULATIONS = [
    {
--- a/packages/builder/src/components/database/DataTable/popovers/View.svelte
+++ b/packages/builder/src/components/database/DataTable/popovers/View.svelte
@ -10,7 +10,6 @@
  import { goto } from "@sveltech/routify"
  import { backendUiStore } from "builderStore"
  import { notifier } from "builderStore/store/notifications"
-  import CreateEditRecord from "../modals/CreateEditRecord.svelte"
  import analytics from "analytics"

  let anchor
--- a/packages/builder/src/components/nav/ModelNavigator/CreateTable.svelte
+++ b/packages/builder/src/components/nav/ModelNavigator/CreateTable.svelte
@ -33,9 +33,9 @@
    })
    notifier.success(`Table ${name} created successfully.`)
    $goto(`./model/${model._id}`)
+    analytics.captureEvent("Table Created", { name })
    name = ""
    dropdown.hide()
-    analytics.captureEvent("Table Created", { name })
    loading = false
  }

--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@ -147,7 +147,7 @@
      })
      const appJson = await appResp.json()
      analytics.captureEvent("App Created", {
-        name,
+        name: $createAppStore.values.applicationName,
        appId: appJson._id,
        template,
      })
--- a/packages/builder/src/components/start/Steps/API.svelte
+++ b/packages/builder/src/components/start/Steps/API.svelte
@ -11,7 +11,7 @@
    on:input={() => (blurred.api = true)}
    label="API Key"
    name="apiKey"
-    placeholder="Enter your API Key"
+    placeholder="Use command-V to paste your API Key"
    type="password"
    error={blurred.api && validationErrors.apiKey} />
  <a target="_blank" href="https://portal.budi.live/">Get API Key</a>
--- a/packages/builder/src/components/start/Steps/User.svelte
+++ b/packages/builder/src/components/start/Steps/User.svelte
@ -19,7 +19,7 @@
    label="Password"
    name="password"
    placeholder="Password"
-    type="pasword"
+    type="password"
    error={blurred.password && validationErrors.password} />
  <Select secondary name="accessLevelId">
    <option value="ADMIN">Admin</option>
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@ -6,7 +6,7 @@ export const FIELDS = {
    constraints: {
      type: "string",
      length: {},
-      presence: { allowEmpty: true },
+      presence: false,
    },
  },
  NUMBER: {
@ -15,7 +15,7 @@ export const FIELDS = {
    type: "number",
    constraints: {
      type: "number",
-      presence: { allowEmpty: true },
+      presence: false,
      numericality: { greaterThanOrEqualTo: "", lessThanOrEqualTo: "" },
    },
  },
@ -25,7 +25,7 @@ export const FIELDS = {
    type: "boolean",
    constraints: {
      type: "boolean",
-      presence: { allowEmpty: true },
+      presence: false,
    },
  },
  // OPTIONS: {
@ -44,7 +44,7 @@ export const FIELDS = {
    constraints: {
      type: "string",
      length: {},
-      presence: { allowEmpty: true },
+      presence: false,
      datetime: {
        latest: "",
        earliest: "",
@ -57,7 +57,7 @@ export const FIELDS = {
    type: "attachment",
    constraints: {
      type: "array",
-      presence: { allowEmpty: true },
+      presence: false,
    },
  },
  // LINKED_FIELDS: {
--- a/packages/builder/src/pages/[application]/backend/model/[selectedModel]/index.svelte
+++ b/packages/builder/src/pages/[application]/backend/model/[selectedModel]/index.svelte
@ -5,7 +5,6 @@
  import { backendUiStore } from "builderStore"
  import ActionButton from "components/common/ActionButton.svelte"
  import * as api from "components/database/DataTable/api"
-  import { CreateEditRecordModal } from "components/database/DataTable/modals"

  const { open, close } = getContext("simple-modal")

--- a/packages/builder/src/pages/[application]/backend/view/[selectedView]/index.svelte
+++ b/packages/builder/src/pages/[application]/backend/view/[selectedView]/index.svelte
@ -5,7 +5,6 @@
  import { backendUiStore } from "builderStore"
  import ActionButton from "components/common/ActionButton.svelte"
  import * as api from "components/database/DataTable/api"
-  import { CreateEditRecordModal } from "components/database/DataTable/modals"

  const { open, close } = getContext("simple-modal")

--- a/packages/server/src/api/controllers/record.js
+++ b/packages/server/src/api/controllers/record.js
@ -1,6 +1,7 @@
 const CouchDB = require("../../db")
 const validateJs = require("validate.js")
 const { getRecordParams, generateRecordID } = require("../../db/utils")
+const { cloneDeep } = require("lodash")

 const MODEL_VIEW_BEGINS_WITH = "all_model:"

@ -31,10 +32,12 @@ validateJs.extend(validateJs.validators.datetime, {

 exports.patch = async function(ctx) {
  const db = new CouchDB(ctx.user.instanceId)
-  const record = await db.get(ctx.params.id)
+  let record = await db.get(ctx.params.id)
  const model = await db.get(record.modelId)
  const patchfields = ctx.request.body

+  record = coerceRecordValues(record, model)
+
  for (let key in patchfields) {
    if (!model.schema[key]) continue
    record[key] = patchfields[key]
@ -64,7 +67,7 @@ exports.patch = async function(ctx) {

 exports.save = async function(ctx) {
  const db = new CouchDB(ctx.user.instanceId)
-  const record = ctx.request.body
+  let record = ctx.request.body
  record.modelId = ctx.params.modelId

  if (!record._rev && !record._id) {
@ -73,6 +76,8 @@ exports.save = async function(ctx) {

  const model = await db.get(record.modelId)

+  record = coerceRecordValues(record, model)
+
  const validateResult = await validate({
    record,
    model,
@ -231,3 +236,50 @@ async function validate({ instanceId, modelId, record, model }) {
  }
  return { valid: Object.keys(errors).length === 0, errors }
 }
+
+function coerceRecordValues(rec, model) {
+  const record = cloneDeep(rec)
+  for (let [key, value] of Object.entries(record)) {
+    const field = model.schema[key]
+    if (!field) continue
+
+    // eslint-disable-next-line no-prototype-builtins
+    if (TYPE_TRANSFORM_MAP[field.type].hasOwnProperty(value)) {
+      record[key] = TYPE_TRANSFORM_MAP[field.type][value]
+    } else if (TYPE_TRANSFORM_MAP[field.type].parse) {
+      record[key] = TYPE_TRANSFORM_MAP[field.type].parse(value)
+    }
+  }
+  return record
+}
+
+const TYPE_TRANSFORM_MAP = {
+  string: {
+    "": "",
+    [null]: "",
+    [undefined]: undefined,
+  },
+  number: {
+    "": null,
+    [null]: null,
+    [undefined]: undefined,
+    parse: n => parseFloat(n),
+  },
+  datetime: {
+    "": null,
+    [undefined]: undefined,
+    [null]: null,
+  },
+  attachment: {
+    "": [],
+    [null]: [],
+    [undefined]: undefined,
+  },
+  boolean: {
+    "": null,
+    [null]: null,
+    [undefined]: undefined,
+    true: true,
+    false: false,
+  },
+}
--- a/packages/server/src/api/controllers/view/viewBuilder.js
+++ b/packages/server/src/api/controllers/view/viewBuilder.js
@ -61,8 +61,11 @@ function parseFilterExpression(filters) {
        `doc["${filter.key}"].${TOKEN_MAP[filter.condition]}("${filter.value}")`
      )
    } else {
+      const value =
+        typeof filter.value == "string" ? `"${filter.value}"` : filter.value
+
      expression.push(
-        `doc["${filter.key}"] ${TOKEN_MAP[filter.condition]} "${filter.value}"`
+        `doc["${filter.key}"] ${TOKEN_MAP[filter.condition]} ${value}`
      )
    }
  }
--- a/packages/server/src/api/routes/tests/couchTestUtils.js
+++ b/packages/server/src/api/routes/tests/couchTestUtils.js
@ -46,13 +46,13 @@ exports.createModel = async (request, appId, instanceId, model) => {
    key: "name",
    schema: {
      name: {
-        type: "text",
+        type: "string",
        constraints: {
          type: "string",
        },
      },
      description: {
-        type: "text",
+        type: "string",
        constraints: {
          type: "string",
        },
--- a/packages/server/src/api/routes/tests/model.spec.js
+++ b/packages/server/src/api/routes/tests/model.spec.js
@ -180,7 +180,7 @@ describe("/models", () => {
        key: "name",
        schema: {
          name: {
-            type: "text",
+            type: "string",
            constraints: {
              type: "string",
            },
--- a/packages/server/src/api/routes/tests/record.spec.js
+++ b/packages/server/src/api/routes/tests/record.spec.js
@ -38,7 +38,7 @@ describe("/records", () => {

  const createRecord = async r => 
    await request
-      .post(`/api/${model._id}/records`)
+      .post(`/api/${r ? r.modelId : record.modelId}/records`)
      .send(r || record)
      .set(defaultHeaders(app._id, instance._id))
      .expect('Content-Type', /json/)
@ -152,6 +152,95 @@ describe("/records", () => {
        .expect('Content-Type', /json/)
        .expect(404)
    })
+
+    it("record values are coerced", async () => {
+      const str = {type:"string", constraints: { type: "string", presence: false }}
+      const attachment = {type:"attachment", constraints: { type: "array", presence: false }}
+      const bool = {type:"boolean", constraints: { type: "boolean", presence: false }}
+      const number = {type:"number", constraints: { type: "number", presence: false }}
+      const datetime = {type:"datetime", constraints: { type: "string", presence: false, datetime: {earliest:"", latest: ""}  }}
+
+      model = await createModel(request, app._id, instance._id, {
+        name: "TestModel2",
+        type: "model",
+        key: "name",
+        schema: {
+          name: str,
+          stringUndefined: str,
+          stringNull: str,
+          stringString: str,
+          numberEmptyString: number,
+          numberNull: number,
+          numberUndefined: number,
+          numberString: number,
+          datetimeEmptyString: datetime,
+          datetimeNull: datetime,
+          datetimeUndefined: datetime,
+          datetimeString: datetime,
+          datetimeDate: datetime,
+          boolNull: bool,
+          boolEmpty: bool,
+          boolUndefined: bool,
+          boolString: bool,
+          boolBool: bool,
+          attachmentNull : attachment,
+          attachmentUndefined : attachment,
+          attachmentEmpty : attachment,
+        },
+      })
+
+      record = {
+        name: "Test Record",
+        stringUndefined: undefined,
+        stringNull: null,
+        stringString: "i am a string",
+        numberEmptyString: "",
+        numberNull: null,
+        numberUndefined: undefined,
+        numberString: "123",
+        numberNumber: 123,
+        datetimeEmptyString: "",
+        datetimeNull: null,
+        datetimeUndefined: undefined,
+        datetimeString: "1984-04-20T00:00:00.000Z",
+        datetimeDate: new Date("1984-04-20"),
+        boolNull: null,
+        boolEmpty: "",
+        boolUndefined: undefined,
+        boolString: "true",
+        boolBool: true,
+        modelId: model._id,
+        attachmentNull : null,
+        attachmentUndefined : undefined,
+        attachmentEmpty : "",
+      }
+
+      const id = (await createRecord(record)).body._id
+
+      const saved = (await loadRecord(id)).body
+
+      expect(saved.stringUndefined).toBe(undefined)
+      expect(saved.stringNull).toBe("")
+      expect(saved.stringString).toBe("i am a string")
+      expect(saved.numberEmptyString).toBe(null)
+      expect(saved.numberNull).toBe(null)
+      expect(saved.numberUndefined).toBe(undefined)
+      expect(saved.numberString).toBe(123)
+      expect(saved.numberNumber).toBe(123)
+      expect(saved.datetimeEmptyString).toBe(null)
+      expect(saved.datetimeNull).toBe(null)
+      expect(saved.datetimeUndefined).toBe(undefined)
+      expect(saved.datetimeString).toBe(new Date(record.datetimeString).toISOString())
+      expect(saved.datetimeDate).toBe(record.datetimeDate.toISOString())
+      expect(saved.boolNull).toBe(null)
+      expect(saved.boolEmpty).toBe(null)
+      expect(saved.boolUndefined).toBe(undefined)
+      expect(saved.boolString).toBe(true)
+      expect(saved.boolBool).toBe(true)
+      expect(saved.attachmentNull).toEqual([])
+      expect(saved.attachmentUndefined).toBe(undefined)
+      expect(saved.attachmentEmpty).toEqual([])
+    })
  })

  describe("patch", () => {
--- a/packages/server/src/api/routes/tests/view.spec.js
+++ b/packages/server/src/api/routes/tests/view.spec.js
@ -69,13 +69,13 @@ describe("/views", () => {
          filters: [],
          schema: {
            name: {
-              type: "text",
+              type: "string",
              constraints: {
                type: "string" 
              },
            },
            description: {
-              type: "text",
+              type: "string",
              constraints: {
                type: "string" 
              },
--- a/packages/server/yarn.lock.orig
+++ b/packages/server/yarn.lock.orig